From 135a322f44708b1187d37ea4b6859b5d82113e89 Mon Sep 17 00:00:00 2001
From: kongzy <kongzy>
Date: 星期三, 14 八月 2024 11:00:30 +0800
Subject: [PATCH] update gitignore
---
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/CheckTaskData.java | 26
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerCheckLogServiceImpl.java | 192
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/Data.java | 36
src/main/resources/mybatis/doublePrevention/PreventCJReportResultDataRepository.xml | 26
src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportPointRepository.java | 18
src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckItemMapper.java | 44
src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/RiskOldInfoQueryRespDTO.java | 432
src/main/java/com/ruoyi/doublePrevention/entity/SPI/SPIDataReqBO.java | 124
src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportConfigRepository.java | 46
src/main/resources/mybatis/doublePrevention/PreventRiskDangerCheckLogMapper.xml | 2
src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerInfo.java | 166
src/main/resources/mybatis/doublePrevention/PreventRiskDangerConfirmLogMapper.xml | 68
src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java | 480
src/main/resources/application-dev.yml | 39
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskAnaUnitService.java | 64
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportConfig.java | 188
src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbCheckConfig.java | 44
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckTaskFromWork.java | 224
src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerCheckLogRepository.java | 98
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportCheckRecordFromTaskServiceImpl.java | 162
src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckScoreMapper.java | 38
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskControlMeasureServiceImpl.java | 140
src/main/java/com/ruoyi/project/tr/specialCheck/service/TbBaseCheckService.java | 50
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/SpecialCheckTaskLogReportDTO.java | 64
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventOverhaulLogServiceImpl.java | 494
src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckTaskLogUpdateBO.java | 88
src/main/java/com/ruoyi/project/tr/specialCheck/service/SpecialCheckItemDangerLogService.java | 52
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckRecordFromTask.java | 178
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportConfigLogService.java | 32
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskJobAndMeasureService.java | 84
pom.xml | 2
src/main/resources/application-guotai-prod.yml | 9
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckScoreAndDangerLogQueryDTO.java | 136
src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java | 2784 ++--
src/main/resources/mybatis/doublePrevention/PreventCJReportConfigLogMapper.xml | 60
src/main/java/com/ruoyi/doublePrevention/entity/SPI/SPIDataForPieChartRespDTO.java | 40
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerInfoService.java | 104
src/main/java/com/ruoyi/project/tr/specialCheck/Test/TaskReportScheduleTest.java | 472
src/main/java/com/ruoyi/doublePrevention/exception/BusinessException.java | 80
src/main/java/com/ruoyi/doublePrevention/repository/PreventOverhaulLogRepository.java | 58
src/main/java/com/ruoyi/doublePrevention/utilsCJ/AesGcm256Util.java | 298
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/ItemDownloadRespBO.java | 34
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportCheckRecordFromTaskService.java | 76
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportConfigLogServiceImpl.java | 56
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/ErrorMsgDetails.java | 62
src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportResultDataRepository.java | 18
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportResultDataService.java | 14
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerInfoServiceImpl.java | 176
src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckTaskLogMapper.java | 62
src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbBaseCheckItemBO.java | 62
src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskCheckUnit.java | 144
src/main/java/com/ruoyi/doublePrevention/enums/StatusEnum.java | 70
src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportOverhaulLogRepository.java | 36
src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckTaskLogEditBO.java | 102
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/Page.java | 26
src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbBaseCheckScoreBO.java | 70
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbBaseCheckItemDTO.java | 72
src/main/resources/application.yml | 33
src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogUpdateReqBO.java | 82
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckItemDangerLogDTO.java | 154
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerConfirmLogServiceImpl.java | 94
src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckTaskFromWorkRepository.java | 88
src/main/resources/mybatis/doublePrevention/PreventCJReportOverhaulMapper.xml | 136
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckRecordFromTaskDTO.java | 122
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerCheckAndMeasureService.java | 44
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskEventService.java | 64
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/CheckItemData.java | 40
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/TbBaseCheckTaskDownloadBO.java | 34
src/main/resources/mybatis/doublePrevention/PreventCJReportRiskControlMeasureMapper.xml | 224
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskEventServiceImpl.java | 148
src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckItemLogEditBO.java | 110
src/main/java/com/ruoyi/doublePrevention/entity/SPI/TroubleLevel.java | 112
src/main/resources/mybatis/doublePrevention/PreventCJReportRiskAnaUnitMapper.xml | 146
src/main/java/com/ruoyi/doublePrevention/enums/E.java | 72
src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerConfirmLogRepository.java | 36
src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogReqBO.java | 108
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskCheckUnitServiceImpl.java | 92
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckItemLogQueryDTO.java | 102
src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckTaskServiceImpl.java | 460
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskAnaUnit.java | 418
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/ItemDownloadRespDTO.java | 22
src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskAnaUnitRepository.java | 66
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportOverhaulLogService.java | 30
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportOverhaulLogServiceImpl.java | 66
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckItemLogDTO.java | 110
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportConfigService.java | 46
src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskControlMeasureRepository.java | 78
src/main/java/com/ruoyi/doublePrevention/repository/RiskOldInfoRepository.java | 40
src/main/java/com/ruoyi/doublePrevention/scheduls/SearchRectifyDateSchedule.java | 310
src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbCheckConfigMapper.java | 24
src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml | 182
src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbBaseCheckTaskBO.java | 74
src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckTaskLog.java | 104
src/main/java/com/ruoyi/doublePrevention/service/baseService/RiskAndPeopleInfoService.java | 28
src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckTaskMapper.java | 46
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportOverhaulLog.java | 168
src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskUnitUuid.java | 194
src/main/java/com/ruoyi/doublePrevention/service/RiskService.java | 368
.gitignore | 1
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventTaskUnitAndMeasureServiceImpl.java | 26
src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckItemDangerLogUpdateBO.java | 152
src/main/java/com/ruoyi/doublePrevention/repository/param/HandlerCJReportParam.java | 84
src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java | 1830 +-
src/main/java/com/ruoyi/doublePrevention/controller/RiskAndPeopleInfoController.java | 78
src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerCheckLog.java | 108
src/test/ReportTest.java | 26
src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventOverhaulLogRespDTO.java | 138
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportPointDTO.java | 336
src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportConfigLogRepository.java | 28
src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckScoreAndDangerLogServiceImpl.java | 574
src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckItemDangerLogBO.java | 140
src/main/java/com/ruoyi/project/tr/OverhaulLog/controller/OverhaulLogController.java | 288
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportDangerInfo.java | 302
src/main/java/com/ruoyi/doublePrevention/entity/PreventTaskType.java | 164
src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckTask.java | 80
src/main/java/com/ruoyi/doublePrevention/repository/PreventTaskUnitAndMeasureRepository.java | 20
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportCheckTaskFromWorkServiceImpl.java | 198
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckTaskLogDateDTO.java | 86
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportDangerInfoService.java | 66
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskUnitUuidServiceImpl.java | 150
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbBaseCheckTaskDTO.java | 78
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventTaskTypeService.java | 28
src/main/java/com/ruoyi/doublePrevention/repository/PreventTaskTypeRepository.java | 34
src/main/java/com/ruoyi/doublePrevention/repository/param/PreventReportConfigUpdateParams.java | 140
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/RiskAndPeopleInfoServiceImpl.java | 328
src/main/resources/mybatis/doublePrevention/PreventRiskCheckUnitMapper.xml | 78
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerConfirmLogService.java | 30
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportDangerInfoDTO.java | 252
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportPointService.java | 14
src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckRecordFromTaskRepository.java | 88
src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerConfirmLog.java | 62
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportResultDataServiceImpl.java | 32
src/main/java/com/ruoyi/doublePrevention/entity/PreventOverhaulLog.java | 190
src/main/java/com/ruoyi/doublePrevention/entity/dto/req/RiskAndPeopleInfoReqBO.java | 34
src/main/java/com/ruoyi/doublePrevention/repository/RiskAndPeopleInfoRepository.java | 34
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckScoreAndDangerLogDTO.java | 134
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/SpecialCheckItemDangerLogReportDTO.java | 92
src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckCompany.java | 64
src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckScoreAndDangerLog.java | 136
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportResultData.java | 134
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/CJReportResultData.java | 90
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskEvent.java | 366
src/main/java/com/ruoyi/project/tr/specialCheck/Test/SpecialCheckTaskDownload.java | 670
src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckItemDangerLogMapper.java | 58
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckTaskLogDTO.java | 96
src/main/java/com/ruoyi/doublePrevention/service/baseService/RiskOldInfoService.java | 28
src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/HandlerSpecialCheckReportParam.java | 46
src/main/java/com/ruoyi/project/tr/specialCheck/Test/ItemDangerReportScheduleTest.java | 448
src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/RiskAndPeopleInfoDTO.java | 246
src/main/resources/mybatis/doublePrevention/RiskAndPeopleMapper.xml | 126
src/main/java/com/ruoyi/doublePrevention/entity/RiskAndPeopleInfo.java | 320
src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java | 1815 +-
src/main/resources/mybatis/doublePrevention/PreventOverhaulMapper.xml | 268
src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskJobAndMeasure.java | 242
src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskUnitUuidRepository.java | 84
src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckCompanyMapper.java | 20
src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java | 110
src/main/java/com/ruoyi/doublePrevention/entity/RiskOldInfo.java | 1216 +-
src/main/resources/mybatis/doublePrevention/PreventCJReportConfigMapper.xml | 62
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskJobAndMeasureServiceImpl.java | 174
src/main/resources/mybatis/doublePrevention/PreventCJReportRiskEventMapper.xml | 198
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/ScoreDownloadRespBO.java | 34
src/main/java/com/ruoyi/doublePrevention/repository/param/PreventPointAndMeasureParams.java | 84
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportPoint.java | 460
src/main/java/com/ruoyi/doublePrevention/scheduls/DateSchedule.java | 546
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskCheckUnitService.java | 62
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventReportConfigServiceImpl.java | 86
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerCheckAndMeasureServiceImpl.java | 90
src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckScoreAndDangerLogMapper.java | 66
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportOverhaulLogDTO.java | 122
src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerCheckAndMeasure.java | 94
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/CheckScoreData.java | 40
src/main/resources/mybatis/doublePrevention/PreventCJReportCheckRecordFromTaskMapper.xml | 188
src/main/java/com/ruoyi/doublePrevention/repository/param/HandlerReportParam.java | 84
src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckTaskLogBO.java | 98
src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckScore.java | 68
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbBaseCheckScoreDTO.java | 64
src/main/java/com/ruoyi/project/tr/HiddenDangerCheckJob/util/AbstractQuartzJob.java | 2
src/main/java/com/ruoyi/doublePrevention/scheduls/RectifyDateSchedule.java | 534
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportPointServiceImpl.java | 22
src/main/java/com/ruoyi/doublePrevention/exception/AusinessException.java | 80
src/main/java/com/ruoyi/project/system/user/test.java | 42
src/main/resources/logback.xml | 62
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/service/impl/HiddenDangerCheckServiceImpl.java | 11
src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskEventRepository.java | 82
src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskCheckUnitRepository.java | 52
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerCheckLogService.java | 88
src/main/java/com/ruoyi/project/tr/specialCheck/service/SpecialCheckScoreAndDangerDangerLogService.java | 50
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportConfigLog.java | 194
src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckItemDangerLog.java | 158
src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/RiskAndPeopleInfoRespDTO.java | 128
src/main/resources/mybatis/doublePrevention/PreventTaskTypeMapper.xml | 64
src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckItem.java | 80
src/main/java/com/ruoyi/project/tr/specialCheck/service/SpecialCheckTaskService.java | 48
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckTaskFromWorkDTO.java | 182
TR.iml | 8
src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckItemLog.java | 112
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskControlMeasure.java | 488
src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskJobAndMeasureRepository.java | 90
src/main/java/com/ruoyi/doublePrevention/entity/dto/req/RiskOldInfoQueryReqDTO.java | 112
src/main/java/com/ruoyi/doublePrevention/enums/CJReportEnum.java | 58
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventTaskUnitAndMeasureService.java | 12
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskUnitUuidService.java | 76
src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckItemLogMapper.java | 60
src/main/resources/mybatis/doublePrevention/PreventCJReportPointMapper.xml | 162
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskAnaUnitDTO.java | 276
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportConfigServiceImpl.java | 86
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventTaskTypeServiceImpl.java | 64
src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckScoreAndDangerLogEditBO.java | 120
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportDangerInfoServiceImpl.java | 140
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskEventDTO.java | 230
src/main/java/com/ruoyi/doublePrevention/entity/PreventTaskUnitAndMeasure.java | 264
src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportDangerInfoRepository.java | 80
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportCheckTaskFromWorkService.java | 84
src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskControlMeasureDTO.java | 352
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/ScoreDownloadRespDTO.java | 26
src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml | 300
src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/TbBaseCheckServiceImpl.java | 244
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/RiskOldInfoServiceImpl.java | 154
src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogInsertReqBO.java | 72
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskControlMeasureService.java | 64
src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerCheckAndMeasureRepository.java | 48
src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckScoreAndDangerLogRespDTO.java | 124
src/main/java/com/ruoyi/doublePrevention/entity/SPI/SPIDataRespDTO.java | 34
src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventRiskCheckUnitRespDTO.java | 530
src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerInfoRepository.java | 102
src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckScoreAndDangerLogQueryBO.java | 124
src/main/java/com/ruoyi/doublePrevention/entity/SPI/TroubleData.java | 142
src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventOverhaulLogService.java | 56
src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskAnaUnitServiceImpl.java | 144
230 files changed, 18,177 insertions(+), 18,163 deletions(-)
diff --git a/.gitignore b/.gitignore
index 27cc8bb..6ce245d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
+logs/
diff --git a/TR.iml b/TR.iml
new file mode 100644
index 0000000..219cba0
--- /dev/null
+++ b/TR.iml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+ <component name="AdditionalModuleElements">
+ <content url="file://$MODULE_DIR$" dumb="true">
+ <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
+ </content>
+ </component>
+</module>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index df5cfa6..2eaf6fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,6 +67,7 @@
<scope>test</scope>
</dependency>
+
<!-- SpringBoot 拦截器 -->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -96,6 +97,7 @@
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
+<!-- <version>5.1.40</version>-->
</dependency>
<!-- SpringBoot集成mybatis框架 -->
diff --git a/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java b/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java
index 0cae30b..fc96181 100644
--- a/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java
+++ b/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java
@@ -1,55 +1,55 @@
-package com.ruoyi.common.utils;
-
-import org.springframework.beans.BeanUtils;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class BeanCopyUtils {
-
- private BeanCopyUtils() {
- }
-
- /**练习
- public static Object copyBean(Object source, Class clazz) {
- //创建目标对象
- Object result = null;
- try {
- result = clazz.newInstance();
- //实现属性copy
- BeanUtils.copyProperties(source, result);
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- //返回结果
- return result;
- }*/
-
- public static <V> V copyBean(Object source,Class<V> clazz) {
- //创建目标对象
- V result = null;
- try {
- result = clazz.newInstance();
- //实现属性copy
- BeanUtils.copyProperties(source, result);
- } catch (Exception e) {
- e.printStackTrace();
- }
- //返回结果
- return result;
- }
-
- /**练习
- * public static <V> List<V> copyBeanList(List<Object> list, Class<V> clazz){
- return list.stream()
- .map(o -> copyBean(o, clazz))
- .collect(Collectors.toList());
- }*/
-
- public static <O,V> List<V> copyBeanList(List<O> list, Class<V> clazz){
- return list.stream()
- .map(o -> copyBean(o, clazz))
- .collect(Collectors.toList());
- }
-}
+package com.ruoyi.common.utils;
+
+import org.springframework.beans.BeanUtils;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class BeanCopyUtils {
+
+ private BeanCopyUtils() {
+ }
+
+ /**练习
+ public static Object copyBean(Object source, Class clazz) {
+ //创建目标对象
+ Object result = null;
+ try {
+ result = clazz.newInstance();
+ //实现属性copy
+ BeanUtils.copyProperties(source, result);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ //返回结果
+ return result;
+ }*/
+
+ public static <V> V copyBean(Object source,Class<V> clazz) {
+ //创建目标对象
+ V result = null;
+ try {
+ result = clazz.newInstance();
+ //实现属性copy
+ BeanUtils.copyProperties(source, result);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ //返回结果
+ return result;
+ }
+
+ /**练习
+ * public static <V> List<V> copyBeanList(List<Object> list, Class<V> clazz){
+ return list.stream()
+ .map(o -> copyBean(o, clazz))
+ .collect(Collectors.toList());
+ }*/
+
+ public static <O,V> List<V> copyBeanList(List<O> list, Class<V> clazz){
+ return list.stream()
+ .map(o -> copyBean(o, clazz))
+ .collect(Collectors.toList());
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/controller/RiskAndPeopleInfoController.java b/src/main/java/com/ruoyi/doublePrevention/controller/RiskAndPeopleInfoController.java
index 52ab6fb..1d17fb7 100644
--- a/src/main/java/com/ruoyi/doublePrevention/controller/RiskAndPeopleInfoController.java
+++ b/src/main/java/com/ruoyi/doublePrevention/controller/RiskAndPeopleInfoController.java
@@ -1,39 +1,39 @@
-package com.ruoyi.doublePrevention.controller;
-
-import com.ruoyi.doublePrevention.entity.dto.req.RiskAndPeopleInfoReqBO;
-import com.ruoyi.doublePrevention.entity.dto.resp.RiskAndPeopleInfoRespDTO;
-import com.ruoyi.doublePrevention.service.baseService.RiskAndPeopleInfoService;
-import com.ruoyi.doublePrevention.vo.ResultVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-
-@RestController
-@RequestMapping("/riskAndPeople")
-public class RiskAndPeopleInfoController {
-
- @Autowired
- private RiskAndPeopleInfoService riskAndPeopleInfoService;
-
- /**
- * 查看包保责任制信息 及统计信息
- */
- @PostMapping("/selectRiskAndPeoplePage")
- public ResultVO<RiskAndPeopleInfoRespDTO> listRiskAndPeoplePage(@RequestBody RiskAndPeopleInfoReqBO reqBO){
- ResultVO resultVO = new ResultVO<>();
- resultVO.setCode("200");
- resultVO.setMsg("查询成功");
-
- ResultVO<RiskAndPeopleInfoRespDTO> result = riskAndPeopleInfoService.listRiskAndPeoplePage(reqBO);
-
- resultVO.setPageSize(result.getPageSize());
- resultVO.setPageNum(result.getPageNum());
- resultVO.setCount(result.getCount());
- resultVO.setData(result.getData());
-
- return resultVO;
- }
-}
+package com.ruoyi.doublePrevention.controller;
+
+import com.ruoyi.doublePrevention.entity.dto.req.RiskAndPeopleInfoReqBO;
+import com.ruoyi.doublePrevention.entity.dto.resp.RiskAndPeopleInfoRespDTO;
+import com.ruoyi.doublePrevention.service.baseService.RiskAndPeopleInfoService;
+import com.ruoyi.doublePrevention.vo.ResultVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@RestController
+@RequestMapping("/riskAndPeople")
+public class RiskAndPeopleInfoController {
+
+ @Autowired
+ private RiskAndPeopleInfoService riskAndPeopleInfoService;
+
+ /**
+ * 查看包保责任制信息 及统计信息
+ */
+ @PostMapping("/selectRiskAndPeoplePage")
+ public ResultVO<RiskAndPeopleInfoRespDTO> listRiskAndPeoplePage(@RequestBody RiskAndPeopleInfoReqBO reqBO){
+ ResultVO resultVO = new ResultVO<>();
+ resultVO.setCode("200");
+ resultVO.setMsg("查询成功");
+
+ ResultVO<RiskAndPeopleInfoRespDTO> result = riskAndPeopleInfoService.listRiskAndPeoplePage(reqBO);
+
+ resultVO.setPageSize(result.getPageSize());
+ resultVO.setPageNum(result.getPageNum());
+ resultVO.setCount(result.getCount());
+ resultVO.setData(result.getData());
+
+ return resultVO;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/CJReportResultData.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/CJReportResultData.java
index 3639da3..94a73ae 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/CJReportResultData.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/CJReportResultData.java
@@ -1,45 +1,45 @@
-package com.ruoyi.doublePrevention.entity.CJReport.CJdto;
-
-
-
-
-public class CJReportResultData{
-
- /**
- * 返回code
- * */
- private String code;
- /**
- *
- * */
- private String data;
- /**
- * 上报数据来源标识
- * */
- private String errorMsg;
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- public String getData() {
- return data;
- }
-
- public void setData(String data) {
- this.data = data;
- }
-
- public String getErrorMsg() {
- return errorMsg;
- }
-
- public void setErrorMsg(String errorMsg) {
- this.errorMsg = errorMsg;
- }
-
-}
+package com.ruoyi.doublePrevention.entity.CJReport.CJdto;
+
+
+
+
+public class CJReportResultData{
+
+ /**
+ * 返回code
+ * */
+ private String code;
+ /**
+ *
+ * */
+ private String data;
+ /**
+ * 上报数据来源标识
+ * */
+ private String errorMsg;
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ public String getData() {
+ return data;
+ }
+
+ public void setData(String data) {
+ this.data = data;
+ }
+
+ public String getErrorMsg() {
+ return errorMsg;
+ }
+
+ public void setErrorMsg(String errorMsg) {
+ this.errorMsg = errorMsg;
+ }
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/Data.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/Data.java
index cb0a34b..47afc24 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/Data.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/Data.java
@@ -1,18 +1,18 @@
-package com.ruoyi.doublePrevention.entity.CJReport.CJdto;
-
-
-import java.io.Serializable;
-import java.util.List;
-
-public class Data {
-
- private List<ErrorMsgDetails> errorMsgDetails;
-
- public List<ErrorMsgDetails> getErrorMsgDetails() {
- return errorMsgDetails;
- }
-
- public void setErrorMsgDetails(List<ErrorMsgDetails> errorMsgDetails) {
- this.errorMsgDetails = errorMsgDetails;
- }
-}
+package com.ruoyi.doublePrevention.entity.CJReport.CJdto;
+
+
+import java.io.Serializable;
+import java.util.List;
+
+public class Data {
+
+ private List<ErrorMsgDetails> errorMsgDetails;
+
+ public List<ErrorMsgDetails> getErrorMsgDetails() {
+ return errorMsgDetails;
+ }
+
+ public void setErrorMsgDetails(List<ErrorMsgDetails> errorMsgDetails) {
+ this.errorMsgDetails = errorMsgDetails;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/ErrorMsgDetails.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/ErrorMsgDetails.java
index 6880584..91651bc 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/ErrorMsgDetails.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/ErrorMsgDetails.java
@@ -1,31 +1,31 @@
-package com.ruoyi.doublePrevention.entity.CJReport.CJdto;
-
-import java.io.Serializable;
-
-public class ErrorMsgDetails{
-
- /**
- * 存在错误的数据id
- * */
- private String id;
- /**
- * 错误信息
- * */
- private String msg;
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getMsg() {
- return msg;
- }
-
- public void setMsg(String msg) {
- this.msg = msg;
- }
-}
+package com.ruoyi.doublePrevention.entity.CJReport.CJdto;
+
+import java.io.Serializable;
+
+public class ErrorMsgDetails{
+
+ /**
+ * 存在错误的数据id
+ * */
+ private String id;
+ /**
+ * 错误信息
+ * */
+ private String msg;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getMsg() {
+ return msg;
+ }
+
+ public void setMsg(String msg) {
+ this.msg = msg;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckRecordFromTaskDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckRecordFromTaskDTO.java
index 314b3d8..15dc210 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckRecordFromTaskDTO.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckRecordFromTaskDTO.java
@@ -1,61 +1,61 @@
-package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;
-
-import lombok.Data;
-
-@Data
-public class CJReportCheckRecordFromTaskDTO {
- /**
- * 主键
- */
- private String id;
- /**
- * 公司编码
- */
- private String companyCode;
- /**
- * 隐患排查作业UUID
- */
- private String checkTaskId;
- /**
- * 排查时间
- */
- private String checkTime;
-
- private String mobileMe;
-
- private String isDefend;
- /**
- * 创建人
- */
- private String createBy;
- /**
- * 创建人手机号
- */
- private String createByMobile;
-
-
-
-// /**
-// * 排 查 结 果
-// */
-// private String checkStatus;
-// /**
-// * 修改人手机号
-// */
-// private String updateByMobile;
-// /**
-// * 创建时间
-// */
-// private String createDate;
-// /**
-// * 最后修改时间
-// */
-// private String updateDate;
-// /**
-// * 修改人
-// */
-// private String updateBy;
-
-
-}
-
+package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;
+
+import lombok.Data;
+
+@Data
+public class CJReportCheckRecordFromTaskDTO {
+ /**
+ * 主键
+ */
+ private String id;
+ /**
+ * 公司编码
+ */
+ private String companyCode;
+ /**
+ * 隐患排查作业UUID
+ */
+ private String checkTaskId;
+ /**
+ * 排查时间
+ */
+ private String checkTime;
+
+ private String mobileMe;
+
+ private String isDefend;
+ /**
+ * 创建人
+ */
+ private String createBy;
+ /**
+ * 创建人手机号
+ */
+ private String createByMobile;
+
+
+
+// /**
+// * 排 查 结 果
+// */
+// private String checkStatus;
+// /**
+// * 修改人手机号
+// */
+// private String updateByMobile;
+// /**
+// * 创建时间
+// */
+// private String createDate;
+// /**
+// * 最后修改时间
+// */
+// private String updateDate;
+// /**
+// * 修改人
+// */
+// private String updateBy;
+
+
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckTaskFromWorkDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckTaskFromWorkDTO.java
index 06b91e8..126c254 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckTaskFromWorkDTO.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportCheckTaskFromWorkDTO.java
@@ -1,91 +1,91 @@
-package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-
-@Data
-public class CJReportCheckTaskFromWorkDTO implements Serializable {
- /**
- * 主键
- */
- private String id;
- /**
- * 公司编码
- */
- private String companyCode;
- /**
- * 管控措施UUID
- */
- private String riskMeasureId;
- /**
- * 隐患排查内容
- */
- private String troubleshootContent;
- /**
- * 巡检周期
- */
- private Integer checkCycle;
- /**
- * 巡检周期单位 小时，日，月，年
- */
- private String checkCycleUnit;
-
- /**
- *任务开始时间
- * 指该任 务首次开始执行的时间，必填
- */
- private String taskStartTime;
- /**
- *当巡检周期是小时的时候为必填
- */
- private String workStartTime;
- /**
- *当巡检周期是小时的时候为必填
- */
- private String workEndTime;
- /**
- *工作日类型(每天：0；法定工作日(除法定
- * 放假以外的所有)：1 ；非法定工作日(除了放假的时候)：2)
- */
- private String workDayType;
- /**
- *任务类型 任务类型(日常任务： 0；主要负责人
- * 任务：1 ；技术负责人任务：2；操作负责人任务：3；) 默认为日常任务：
- * 0
- */
- private String workType;
- /**
- *包保任务对应项 当任务类型为主要负责人任务、
- * 技术负责人任务、操作负责人任务时，此项为必填。
- */
- private String taskNum;
-
-
- /**
- * 删除标志：0-有效，1-删除
- */
- private String deleted;
- /**
- * 创建时间
- */
- private String createDate;
- /**
- * 创建人
- */
- private String createBy;
- /**
- * 最后修改时间
- */
- private String updateDate;
- /**
- * 修改人
- */
- private String updateBy;
-
-
-}
-
+package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+@Data
+public class CJReportCheckTaskFromWorkDTO implements Serializable {
+ /**
+ * 主键
+ */
+ private String id;
+ /**
+ * 公司编码
+ */
+ private String companyCode;
+ /**
+ * 管控措施UUID
+ */
+ private String riskMeasureId;
+ /**
+ * 隐患排查内容
+ */
+ private String troubleshootContent;
+ /**
+ * 巡检周期
+ */
+ private Integer checkCycle;
+ /**
+ * 巡检周期单位 小时，日，月，年
+ */
+ private String checkCycleUnit;
+
+ /**
+ *任务开始时间
+ * 指该任 务首次开始执行的时间，必填
+ */
+ private String taskStartTime;
+ /**
+ *当巡检周期是小时的时候为必填
+ */
+ private String workStartTime;
+ /**
+ *当巡检周期是小时的时候为必填
+ */
+ private String workEndTime;
+ /**
+ *工作日类型(每天：0；法定工作日(除法定
+ * 放假以外的所有)：1 ；非法定工作日(除了放假的时候)：2)
+ */
+ private String workDayType;
+ /**
+ *任务类型 任务类型(日常任务： 0；主要负责人
+ * 任务：1 ；技术负责人任务：2；操作负责人任务：3；) 默认为日常任务：
+ * 0
+ */
+ private String workType;
+ /**
+ *包保任务对应项 当任务类型为主要负责人任务、
+ * 技术负责人任务、操作负责人任务时，此项为必填。
+ */
+ private String taskNum;
+
+
+ /**
+ * 删除标志：0-有效，1-删除
+ */
+ private String deleted;
+ /**
+ * 创建时间
+ */
+ private String createDate;
+ /**
+ * 创建人
+ */
+ private String createBy;
+ /**
+ * 最后修改时间
+ */
+ private String updateDate;
+ /**
+ * 修改人
+ */
+ private String updateBy;
+
+
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportDangerInfoDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportDangerInfoDTO.java
index f861f3a..aae52fa 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportDangerInfoDTO.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportDangerInfoDTO.java
@@ -1,126 +1,126 @@
-package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-public class CJReportDangerInfoDTO{
- /**
- * 主键
- */
- private String id;
- /**
- * 公司编码
- */
- private String companyCode;
- /**
- * 安全风险分析对象编码
- */
- private String hazardCode;
- /**
- * 管控措施 ID-->管控措施UUID
- */
- private String riskMeasureId;
- /**
- * 隐患排查记录 ID-->隐患排查任务UUID
- */
- private String checkRecordId;
- /**
- * 隐患名称
- */
- private String dangerName;
- /**
- * 隐患等级
- */
- private String dangerLevel;
- /**
- * 隐患来源
- */
- private String dangerSrc;
- /**
- * 隐患治理类型
- */
- private String dangerManageType;
- /**
- * 隐患描述
- */
- private String dangerDesc;
- /**
- * 隐患产生原因
- */
- private String dangerReason;
- /**
- * 控制措施
- */
- private String controlMeasures;
- /**
- * 资金
- */
- private String cost;
- /**
- * 隐患治理期限
- */
- private String dangerManageDeadline;
- /**
- * 隐患状态
- */
- private String dangerState;
- /**
- * 隐患类型
- */
- private String hazardDangerType;
- /**
- * 隐患类别(其他隐患0 ;主要负责人隐患1;技术负责人隐患2 ;操作负责人隐患3
- */
- private String hazardCategory;
- /**
- * 登记人姓名
- */
- private String registrant;
- /**
- * 登记时间
- */
- private String registTime;
- /**
- * 整改责任人姓名
- */
- private String liablePerson;
- /**
- * 验收人
- */
- private String checkAcceptPerson;
- /**
- * 验收情况
- */
- private String checkAcceptComment;
- /**
- * 验收时间
- */
- private String checkAcceptTime;
- /**
- * 删除标志：0-有效，1-删除
- */
- private String deleted;
- /**
- * 创建时间
- */
- private String createDate;
- /**
- * 创建人
- */
- private String createBy;
- /**
- * 最后修改时间
- */
- private String updateDate;
- /**
- * 修改人
- */
- private String updateBy;
-
-
-}
-
+package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class CJReportDangerInfoDTO{
+ /**
+ * 主键
+ */
+ private String id;
+ /**
+ * 公司编码
+ */
+ private String companyCode;
+ /**
+ * 安全风险分析对象编码
+ */
+ private String hazardCode;
+ /**
+ * 管控措施 ID-->管控措施UUID
+ */
+ private String riskMeasureId;
+ /**
+ * 隐患排查记录 ID-->隐患排查任务UUID
+ */
+ private String checkRecordId;
+ /**
+ * 隐患名称
+ */
+ private String dangerName;
+ /**
+ * 隐患等级
+ */
+ private String dangerLevel;
+ /**
+ * 隐患来源
+ */
+ private String dangerSrc;
+ /**
+ * 隐患治理类型
+ */
+ private String dangerManageType;
+ /**
+ * 隐患描述
+ */
+ private String dangerDesc;
+ /**
+ * 隐患产生原因
+ */
+ private String dangerReason;
+ /**
+ * 控制措施
+ */
+ private String controlMeasures;
+ /**
+ * 资金
+ */
+ private String cost;
+ /**
+ * 隐患治理期限
+ */
+ private String dangerManageDeadline;
+ /**
+ * 隐患状态
+ */
+ private String dangerState;
+ /**
+ * 隐患类型
+ */
+ private String hazardDangerType;
+ /**
+ * 隐患类别(其他隐患0 ;主要负责人隐患1;技术负责人隐患2 ;操作负责人隐患3
+ */
+ private String hazardCategory;
+ /**
+ * 登记人姓名
+ */
+ private String registrant;
+ /**
+ * 登记时间
+ */
+ private String registTime;
+ /**
+ * 整改责任人姓名
+ */
+ private String liablePerson;
+ /**
+ * 验收人
+ */
+ private String checkAcceptPerson;
+ /**
+ * 验收情况
+ */
+ private String checkAcceptComment;
+ /**
+ * 验收时间
+ */
+ private String checkAcceptTime;
+ /**
+ * 删除标志：0-有效，1-删除
+ */
+ private String deleted;
+ /**
+ * 创建时间
+ */
+ private String createDate;
+ /**
+ * 创建人
+ */
+ private String createBy;
+ /**
+ * 最后修改时间
+ */
+ private String updateDate;
+ /**
+ * 修改人
+ */
+ private String updateBy;
+
+
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportOverhaulLogDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportOverhaulLogDTO.java
index 359ae4e..c362b9b 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportOverhaulLogDTO.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportOverhaulLogDTO.java
@@ -1,61 +1,61 @@
-package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;
-
-import lombok.Data;
-
-
-@Data
-public class CJReportOverhaulLogDTO {
-
- /**
- * 主键
- */
- private String id;
- /**
- * 公司编码
- */
- private String companyCode;
- /**
- * 风险分析对象编码
- */
- private String hazardCode;
- /**
- * 所属安全风险分析单元uuid
- */
- private String riskUnitId;
- /**
- * 装置停用或者检维修开始时间
- */
- private String stopStartTime;
- /**
- * 装置停用或者检维修结束时间
- */
- private String stopEndTime;
- /**
- * 描述停用原因
- */
- private String stopReason;
- /**
- * 创建时间
- */
- private String createDate;
- /**
- * 创建人
- */
- private String createBy;
- /**
- * 最后修改时间
- */
- private String updateDate;
- /**
- * 修改人
- */
- private String updateBy;
-
-
-// /**
-// * 删除标志：0-有效，1-删除
-// */
-// private String deleted;
-
-
-}
+package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;
+
+import lombok.Data;
+
+
+@Data
+public class CJReportOverhaulLogDTO {
+
+ /**
+ * 主键
+ */
+ private String id;
+ /**
+ * 公司编码
+ */
+ private String companyCode;
+ /**
+ * 风险分析对象编码
+ */
+ private String hazardCode;
+ /**
+ * 所属安全风险分析单元uuid
+ */
+ private String riskUnitId;
+ /**
+ * 装置停用或者检维修开始时间
+ */
+ private String stopStartTime;
+ /**
+ * 装置停用或者检维修结束时间
+ */
+ private String stopEndTime;
+ /**
+ * 描述停用原因
+ */
+ private String stopReason;
+ /**
+ * 创建时间
+ */
+ private String createDate;
+ /**
+ * 创建人
+ */
+ private String createBy;
+ /**
+ * 最后修改时间
+ */
+ private String updateDate;
+ /**
+ * 修改人
+ */
+ private String updateBy;
+
+
+// /**
+// * 删除标志：0-有效，1-删除
+// */
+// private String deleted;
+
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportPointDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportPointDTO.java
index 7649d04..1f30fe2 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportPointDTO.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportPointDTO.java
@@ -1,168 +1,168 @@
-package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.util.Date;
-
-//@TableName("prevent_cj_report_point")
-public class CJReportPointDTO implements Serializable {
- /**
- * 主键
- */
- private String id;
- /**
- * 公司编码
- */
- private String companyCode;
- /**
- * 删除标志：0-未删除、1-已删除、2-更新
- */
- private String deleted;
- /**
- * 创建时间
- */
- private Date createDate;
- /**
- * 创建人
- */
- private String createBy;
- /**
- * 最后修改时间
- */
- private Date updateDate;
- /**
- * 修改人
- */
- private String updateBy;
- /**
- * 风险单元
- */
- private String riskUnitIds;
- /**
- * 风险事件
- */
- private String riskEventIds;
- /**
- * 管控措施
- */
- private String riskMeasureIds;
- /**
- * 责任部门
- */
- private String hazardDep;
- /**
- * 安全风险分析对象编码
- */
- private String hazardCode;
- /**
- * 责任人姓名
- */
- private String hazardLiablePerson;
-
- public String getRiskUnitIds() {
- return riskUnitIds;
- }
-
- public void setRiskUnitIds(String riskUnitIds) {
- this.riskUnitIds = riskUnitIds;
- }
-
- public String getRiskEventIds() {
- return riskEventIds;
- }
-
- public void setRiskEventIds(String riskEventIds) {
- this.riskEventIds = riskEventIds;
- }
-
- public String getRiskMeasureIds() {
- return riskMeasureIds;
- }
-
- public void setRiskMeasureIds(String riskMeasureIds) {
- this.riskMeasureIds = riskMeasureIds;
- }
-
- public String getHazardCode() {
- return hazardCode;
- }
-
- public void setHazardCode(String hazardCode) {
- this.hazardCode = hazardCode;
- }
-
- public String getHazardDep() {
- return hazardDep;
- }
-
- public void setHazardDep(String hazardDep) {
- this.hazardDep = hazardDep;
- }
-
- public String getHazardLiablePerson() {
- return hazardLiablePerson;
- }
-
- public void setHazardLiablePerson(String hazardLiablePerson) {
- this.hazardLiablePerson = hazardLiablePerson;
- }
-
- public String getDeleted() {
- return deleted;
- }
- public void setDeleted(String deleted) {
- this.deleted = deleted;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getCompanyCode() {
- return companyCode;
- }
-
- public void setCompanyCode(String companyCode) {
- this.companyCode = companyCode;
- }
-
- public Date getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(Date createDate) {
- this.createDate = createDate;
- }
-
- public String getCreateBy() {
- return createBy;
- }
-
- public void setCreateBy(String createBy) {
- this.createBy = createBy;
- }
-
- public Date getUpdateDate() {
- return updateDate;
- }
-
- public void setUpdateDate(Date updateDate) {
- this.updateDate = updateDate;
- }
-
- public String getUpdateBy() {
- return updateBy;
- }
-
- public void setUpdateBy(String updateBy) {
- this.updateBy = updateBy;
- }
-
-
-}
-
+package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+//@TableName("prevent_cj_report_point")
+public class CJReportPointDTO implements Serializable {
+ /**
+ * 主键
+ */
+ private String id;
+ /**
+ * 公司编码
+ */
+ private String companyCode;
+ /**
+ * 删除标志：0-未删除、1-已删除、2-更新
+ */
+ private String deleted;
+ /**
+ * 创建时间
+ */
+ private Date createDate;
+ /**
+ * 创建人
+ */
+ private String createBy;
+ /**
+ * 最后修改时间
+ */
+ private Date updateDate;
+ /**
+ * 修改人
+ */
+ private String updateBy;
+ /**
+ * 风险单元
+ */
+ private String riskUnitIds;
+ /**
+ * 风险事件
+ */
+ private String riskEventIds;
+ /**
+ * 管控措施
+ */
+ private String riskMeasureIds;
+ /**
+ * 责任部门
+ */
+ private String hazardDep;
+ /**
+ * 安全风险分析对象编码
+ */
+ private String hazardCode;
+ /**
+ * 责任人姓名
+ */
+ private String hazardLiablePerson;
+
+ public String getRiskUnitIds() {
+ return riskUnitIds;
+ }
+
+ public void setRiskUnitIds(String riskUnitIds) {
+ this.riskUnitIds = riskUnitIds;
+ }
+
+ public String getRiskEventIds() {
+ return riskEventIds;
+ }
+
+ public void setRiskEventIds(String riskEventIds) {
+ this.riskEventIds = riskEventIds;
+ }
+
+ public String getRiskMeasureIds() {
+ return riskMeasureIds;
+ }
+
+ public void setRiskMeasureIds(String riskMeasureIds) {
+ this.riskMeasureIds = riskMeasureIds;
+ }
+
+ public String getHazardCode() {
+ return hazardCode;
+ }
+
+ public void setHazardCode(String hazardCode) {
+ this.hazardCode = hazardCode;
+ }
+
+ public String getHazardDep() {
+ return hazardDep;
+ }
+
+ public void setHazardDep(String hazardDep) {
+ this.hazardDep = hazardDep;
+ }
+
+ public String getHazardLiablePerson() {
+ return hazardLiablePerson;
+ }
+
+ public void setHazardLiablePerson(String hazardLiablePerson) {
+ this.hazardLiablePerson = hazardLiablePerson;
+ }
+
+ public String getDeleted() {
+ return deleted;
+ }
+ public void setDeleted(String deleted) {
+ this.deleted = deleted;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getCompanyCode() {
+ return companyCode;
+ }
+
+ public void setCompanyCode(String companyCode) {
+ this.companyCode = companyCode;
+ }
+
+ public Date getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(Date createDate) {
+ this.createDate = createDate;
+ }
+
+ public String getCreateBy() {
+ return createBy;
+ }
+
+ public void setCreateBy(String createBy) {
+ this.createBy = createBy;
+ }
+
+ public Date getUpdateDate() {
+ return updateDate;
+ }
+
+ public void setUpdateDate(Date updateDate) {
+ this.updateDate = updateDate;
+ }
+
+ public String getUpdateBy() {
+ return updateBy;
+ }
+
+ public void setUpdateBy(String updateBy) {
+ this.updateBy = updateBy;
+ }
+
+
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskAnaUnitDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskAnaUnitDTO.java
index 5c7e590..c788e0a 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskAnaUnitDTO.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskAnaUnitDTO.java
@@ -1,138 +1,138 @@
-package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;
-
-
-public class CJReportRiskAnaUnitDTO {
- /**
- * 主键
- */
- private String id;
- /**
- * 公司编码
- */
- private String companyCode;
- /**
- * 安全风险分析对象编码
- */
- private String hazardCode;
- /**
- * 安全风险分析单元名称
- */
- private String riskUnitName;
- /**
- * 责任部门
- */
- private String hazardDep;
- /**
- * 责任人姓名
- */
- private String hazardLiablePerson;
- /**
- * 删除标志：0-有效，1-删除
- */
- private String deleted;
- /**
- * 创建时间
- */
- private String createDate;
- /**
- * 创建人
- */
- private String createBy;
- /**
- * 最后修改时间
- */
- private String updateDate;
- /**
- * 修改人
- */
- private String updateBy;
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getCompanyCode() {
- return companyCode;
- }
-
- public void setCompanyCode(String companyCode) {
- this.companyCode = companyCode;
- }
-
- public String getRiskUnitName() {
- return riskUnitName;
- }
-
- public void setRiskUnitName(String riskUnitName) {
- this.riskUnitName = riskUnitName;
- }
-
- public String getHazardCode() {
- return hazardCode;
- }
-
- public void setHazardCode(String hazardCode) {
- this.hazardCode = hazardCode;
- }
-
- public String getHazardDep() {
- return hazardDep;
- }
-
- public void setHazardDep(String hazardDep) {
- this.hazardDep = hazardDep;
- }
-
- public String getHazardLiablePerson() {
- return hazardLiablePerson;
- }
-
- public void setHazardLiablePerson(String hazardLiablePerson) {
- this.hazardLiablePerson = hazardLiablePerson;
- }
-
- public String getCreateBy() {
- return createBy;
- }
-
- public void setCreateBy(String createBy) {
- this.createBy = createBy;
- }
-
- public String getUpdateBy() {
- return updateBy;
- }
-
- public void setUpdateBy(String updateBy) {
- this.updateBy = updateBy;
- }
-
- public String getDeleted() {
- return deleted;
- }
-
- public void setDeleted(String deleted) {
- this.deleted = deleted;
- }
-
- public String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
- public String getUpdateDate() {
- return updateDate;
- }
-
- public void setUpdateDate(String updateDate) {
- this.updateDate = updateDate;
- }
-}
-
+package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;
+
+
+public class CJReportRiskAnaUnitDTO {
+ /**
+ * 主键
+ */
+ private String id;
+ /**
+ * 公司编码
+ */
+ private String companyCode;
+ /**
+ * 安全风险分析对象编码
+ */
+ private String hazardCode;
+ /**
+ * 安全风险分析单元名称
+ */
+ private String riskUnitName;
+ /**
+ * 责任部门
+ */
+ private String hazardDep;
+ /**
+ * 责任人姓名
+ */
+ private String hazardLiablePerson;
+ /**
+ * 删除标志：0-有效，1-删除
+ */
+ private String deleted;
+ /**
+ * 创建时间
+ */
+ private String createDate;
+ /**
+ * 创建人
+ */
+ private String createBy;
+ /**
+ * 最后修改时间
+ */
+ private String updateDate;
+ /**
+ * 修改人
+ */
+ private String updateBy;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getCompanyCode() {
+ return companyCode;
+ }
+
+ public void setCompanyCode(String companyCode) {
+ this.companyCode = companyCode;
+ }
+
+ public String getRiskUnitName() {
+ return riskUnitName;
+ }
+
+ public void setRiskUnitName(String riskUnitName) {
+ this.riskUnitName = riskUnitName;
+ }
+
+ public String getHazardCode() {
+ return hazardCode;
+ }
+
+ public void setHazardCode(String hazardCode) {
+ this.hazardCode = hazardCode;
+ }
+
+ public String getHazardDep() {
+ return hazardDep;
+ }
+
+ public void setHazardDep(String hazardDep) {
+ this.hazardDep = hazardDep;
+ }
+
+ public String getHazardLiablePerson() {
+ return hazardLiablePerson;
+ }
+
+ public void setHazardLiablePerson(String hazardLiablePerson) {
+ this.hazardLiablePerson = hazardLiablePerson;
+ }
+
+ public String getCreateBy() {
+ return createBy;
+ }
+
+ public void setCreateBy(String createBy) {
+ this.createBy = createBy;
+ }
+
+ public String getUpdateBy() {
+ return updateBy;
+ }
+
+ public void setUpdateBy(String updateBy) {
+ this.updateBy = updateBy;
+ }
+
+ public String getDeleted() {
+ return deleted;
+ }
+
+ public void setDeleted(String deleted) {
+ this.deleted = deleted;
+ }
+
+ public String getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(String createDate) {
+ this.createDate = createDate;
+ }
+
+ public String getUpdateDate() {
+ return updateDate;
+ }
+
+ public void setUpdateDate(String updateDate) {
+ this.updateDate = updateDate;
+ }
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskControlMeasureDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskControlMeasureDTO.java
index 4cfc0d1..2231758 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskControlMeasureDTO.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskControlMeasureDTO.java
@@ -1,176 +1,176 @@
-package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;
-
-import java.io.Serializable;
-
-public class CJReportRiskControlMeasureDTO implements Serializable {
- /**
- * 主键
- */
- private String id;
- /**
- * 公司编码
- */
- private String companyCode;
- /**
- * 风险事件单元 UUID
- */
- private String riskEventId;
- /**
- * 管控方式
- */
- private String dataSrc;
- /**
- * 管控措施描述
- */
- private String riskMeasureDesc;
- /**
- * 隐患排查内容
- */
- private String troubleshootContent;
- /**
- * 管控措施分类1
- */
- private String classify1;
- /**
- * 管控措施分类2
- */
- private String classify2;
- /**
- * 管控措施分类3
- */
- private String classify3;
-
- /**
- * 删除标志：0-有效，1-删除
- */
- private String deleted;
- /**
- * 创建时间
- */
- private String createDate;
- /**
- * 创建人
- */
- private String createBy;
- /**
- * 最后修改时间
- */
- private String updateDate;
- /**
- * 修改人
- */
- private String updateBy;
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getCompanyCode() {
- return companyCode;
- }
-
- public void setCompanyCode(String companyCode) {
- this.companyCode = companyCode;
- }
-
- public String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
- public String getUpdateDate() {
- return updateDate;
- }
-
- public void setUpdateDate(String updateDate) {
- this.updateDate = updateDate;
- }
-
- public String getCreateBy() {
- return createBy;
- }
-
- public void setCreateBy(String createBy) {
- this.createBy = createBy;
- }
-
- public String getUpdateBy() {
- return updateBy;
- }
-
- public void setUpdateBy(String updateBy) {
- this.updateBy = updateBy;
- }
-
- public String getRiskEventId() {
- return riskEventId;
- }
-
- public void setRiskEventId(String riskEventId) {
- this.riskEventId = riskEventId;
- }
-
- public String getDataSrc() {
- return dataSrc;
- }
-
- public void setDataSrc(String dataSrc) {
- this.dataSrc = dataSrc;
- }
-
- public String getRiskMeasureDesc() {
- return riskMeasureDesc;
- }
-
- public void setRiskMeasureDesc(String riskMeasureDesc) {
- this.riskMeasureDesc = riskMeasureDesc;
- }
-
- public String getTroubleshootContent() {
- return troubleshootContent;
- }
-
- public void setTroubleshootContent(String troubleshootContent) {
- this.troubleshootContent = troubleshootContent;
- }
-
- public String getDeleted() {
- return deleted;
- }
-
- public void setDeleted(String deleted) {
- this.deleted = deleted;
- }
-
- public String getClassify1() {
- return classify1;
- }
-
- public void setClassify1(String classify1) {
- this.classify1 = classify1;
- }
-
- public String getClassify2() {
- return classify2;
- }
-
- public void setClassify2(String classify2) {
- this.classify2 = classify2;
- }
-
- public String getClassify3() {
- return classify3;
- }
-
- public void setClassify3(String classify3) {
- this.classify3 = classify3;
- }
-}
-
+package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;
+
+import java.io.Serializable;
+
+public class CJReportRiskControlMeasureDTO implements Serializable {
+ /**
+ * 主键
+ */
+ private String id;
+ /**
+ * 公司编码
+ */
+ private String companyCode;
+ /**
+ * 风险事件单元 UUID
+ */
+ private String riskEventId;
+ /**
+ * 管控方式
+ */
+ private String dataSrc;
+ /**
+ * 管控措施描述
+ */
+ private String riskMeasureDesc;
+ /**
+ * 隐患排查内容
+ */
+ private String troubleshootContent;
+ /**
+ * 管控措施分类1
+ */
+ private String classify1;
+ /**
+ * 管控措施分类2
+ */
+ private String classify2;
+ /**
+ * 管控措施分类3
+ */
+ private String classify3;
+
+ /**
+ * 删除标志：0-有效，1-删除
+ */
+ private String deleted;
+ /**
+ * 创建时间
+ */
+ private String createDate;
+ /**
+ * 创建人
+ */
+ private String createBy;
+ /**
+ * 最后修改时间
+ */
+ private String updateDate;
+ /**
+ * 修改人
+ */
+ private String updateBy;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getCompanyCode() {
+ return companyCode;
+ }
+
+ public void setCompanyCode(String companyCode) {
+ this.companyCode = companyCode;
+ }
+
+ public String getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(String createDate) {
+ this.createDate = createDate;
+ }
+
+ public String getUpdateDate() {
+ return updateDate;
+ }
+
+ public void setUpdateDate(String updateDate) {
+ this.updateDate = updateDate;
+ }
+
+ public String getCreateBy() {
+ return createBy;
+ }
+
+ public void setCreateBy(String createBy) {
+ this.createBy = createBy;
+ }
+
+ public String getUpdateBy() {
+ return updateBy;
+ }
+
+ public void setUpdateBy(String updateBy) {
+ this.updateBy = updateBy;
+ }
+
+ public String getRiskEventId() {
+ return riskEventId;
+ }
+
+ public void setRiskEventId(String riskEventId) {
+ this.riskEventId = riskEventId;
+ }
+
+ public String getDataSrc() {
+ return dataSrc;
+ }
+
+ public void setDataSrc(String dataSrc) {
+ this.dataSrc = dataSrc;
+ }
+
+ public String getRiskMeasureDesc() {
+ return riskMeasureDesc;
+ }
+
+ public void setRiskMeasureDesc(String riskMeasureDesc) {
+ this.riskMeasureDesc = riskMeasureDesc;
+ }
+
+ public String getTroubleshootContent() {
+ return troubleshootContent;
+ }
+
+ public void setTroubleshootContent(String troubleshootContent) {
+ this.troubleshootContent = troubleshootContent;
+ }
+
+ public String getDeleted() {
+ return deleted;
+ }
+
+ public void setDeleted(String deleted) {
+ this.deleted = deleted;
+ }
+
+ public String getClassify1() {
+ return classify1;
+ }
+
+ public void setClassify1(String classify1) {
+ this.classify1 = classify1;
+ }
+
+ public String getClassify2() {
+ return classify2;
+ }
+
+ public void setClassify2(String classify2) {
+ this.classify2 = classify2;
+ }
+
+ public String getClassify3() {
+ return classify3;
+ }
+
+ public void setClassify3(String classify3) {
+ this.classify3 = classify3;
+ }
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskEventDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskEventDTO.java
index 7e81d77..5cc2dd7 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskEventDTO.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/CJdto/HandlerDO/CJReportRiskEventDTO.java
@@ -1,115 +1,115 @@
-package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;
-
-
-import java.io.Serializable;
-
-public class CJReportRiskEventDTO implements Serializable {
- /**
- * 主键
- */
- private String id;
- /**
- * 公司编码
- */
- private String companyCode;
- /**
- * 关联风险分析单元UUID
- */
- private String riskUnitId;
- /**
- * 风险事件名称
- */
- private String riskEventName;
- /**
- * 删除标志：0-有效，1-删除
- */
- private String deleted;
- /**
- * 创建时间
- */
- private String createDate;
- /**
- * 创建人
- */
- private String createBy;
- /**
- * 最后修改时间
- */
- private String updateDate;
- /**
- * 修改人
- */
- private String updateBy;
-
- public String getDeleted() {
- return deleted;
- }
- public void setDeleted(String deleted) {
- this.deleted = deleted;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getCompanyCode() {
- return companyCode;
- }
-
- public void setCompanyCode(String companyCode) {
- this.companyCode = companyCode;
- }
-
- public String getRiskEventName() {
- return riskEventName;
- }
-
- public void setRiskEventName(String riskEventName) {
- this.riskEventName = riskEventName;
- }
-
- public String getRiskUnitId() {
- return riskUnitId;
- }
-
- public void setRiskUnitId(String riskUnitId) {
- this.riskUnitId = riskUnitId;
- }
-
- public String getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(String createDate) {
- this.createDate = createDate;
- }
-
- public String getCreateBy() {
- return createBy;
- }
-
- public void setCreateBy(String createBy) {
- this.createBy = createBy;
- }
-
- public String getUpdateDate() {
- return updateDate;
- }
-
- public void setUpdateDate(String updateDate) {
- this.updateDate = updateDate;
- }
-
- public String getUpdateBy() {
- return updateBy;
- }
-
- public void setUpdateBy(String updateBy) {
- this.updateBy = updateBy;
- }
-}
-
+package com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO;
+
+
+import java.io.Serializable;
+
+public class CJReportRiskEventDTO implements Serializable {
+ /**
+ * 主键
+ */
+ private String id;
+ /**
+ * 公司编码
+ */
+ private String companyCode;
+ /**
+ * 关联风险分析单元UUID
+ */
+ private String riskUnitId;
+ /**
+ * 风险事件名称
+ */
+ private String riskEventName;
+ /**
+ * 删除标志：0-有效，1-删除
+ */
+ private String deleted;
+ /**
+ * 创建时间
+ */
+ private String createDate;
+ /**
+ * 创建人
+ */
+ private String createBy;
+ /**
+ * 最后修改时间
+ */
+ private String updateDate;
+ /**
+ * 修改人
+ */
+ private String updateBy;
+
+ public String getDeleted() {
+ return deleted;
+ }
+ public void setDeleted(String deleted) {
+ this.deleted = deleted;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getCompanyCode() {
+ return companyCode;
+ }
+
+ public void setCompanyCode(String companyCode) {
+ this.companyCode = companyCode;
+ }
+
+ public String getRiskEventName() {
+ return riskEventName;
+ }
+
+ public void setRiskEventName(String riskEventName) {
+ this.riskEventName = riskEventName;
+ }
+
+ public String getRiskUnitId() {
+ return riskUnitId;
+ }
+
+ public void setRiskUnitId(String riskUnitId) {
+ this.riskUnitId = riskUnitId;
+ }
+
+ public String getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(String createDate) {
+ this.createDate = createDate;
+ }
+
+ public String getCreateBy() {
+ return createBy;
+ }
+
+ public void setCreateBy(String createBy) {
+ this.createBy = createBy;
+ }
+
+ public String getUpdateDate() {
+ return updateDate;
+ }
+
+ public void setUpdateDate(String updateDate) {
+ this.updateDate = updateDate;
+ }
+
+ public String getUpdateBy() {
+ return updateBy;
+ }
+
+ public void setUpdateBy(String updateBy) {
+ this.updateBy = updateBy;
+ }
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckRecordFromTask.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckRecordFromTask.java
index fd688eb..7a38d94 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckRecordFromTask.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckRecordFromTask.java
@@ -1,89 +1,89 @@
-package com.ruoyi.doublePrevention.entity.CJReport;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("prevent_cj_report_check_record_from_task")
-public class PreventCJReportCheckRecordFromTask implements Serializable {
- /**
- * 主键
- */
- @TableId(value = "id" , type = IdType.AUTO)
- private Integer indexId;
- /**
- * 主键
- */
- private String id;
- /**
- * 公司编码
- */
- private String companyCode;
- /**
- * 删除标志：0-有效，1-删除
- */
- private String deleted;
- /**
- * 创建时间
- */
- private Date createDate;
- /**
- * 创建人
- */
- private String createBy;
- /**
- * 最后修改时间
- */
- private Date updateDate;
- /**
- * 修改人
- */
- private String updateBy;
- /**
- * 隐患排查作业UUID
- */
- private String checkTaskId;
- /**
- * 排 查 结 果
- */
- private String checkStatus;
- /**
- * 排查时间
- */
- private Date checkTime;
- /**
- * 修改人手机号
- */
- private String updateByMobile;
- /**
- * 创建人人手机号
- */
- private String createByMobile;
- /**
- * 上报时间
- */
- private Date reportTime;
- /**
- * 上报状态 1-待上报；2-已上报；3-不上报
- */
- private Byte reportStatus;
- /**
- * 数据来源 1-本系统排查任务产生；2-同步数据
- */
- private Byte dataSource;
- /**
- * taskId
- */
- private Long taskId;
-
- private String mobileCode;
-
- private String defend;
-
-}
-
+package com.ruoyi.doublePrevention.entity.CJReport;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("prevent_cj_report_check_record_from_task")
+public class PreventCJReportCheckRecordFromTask implements Serializable {
+ /**
+ * 主键
+ */
+ @TableId(value = "id" , type = IdType.AUTO)
+ private Integer indexId;
+ /**
+ * 主键
+ */
+ private String id;
+ /**
+ * 公司编码
+ */
+ private String companyCode;
+ /**
+ * 删除标志：0-有效，1-删除
+ */
+ private String deleted;
+ /**
+ * 创建时间
+ */
+ private Date createDate;
+ /**
+ * 创建人
+ */
+ private String createBy;
+ /**
+ * 最后修改时间
+ */
+ private Date updateDate;
+ /**
+ * 修改人
+ */
+ private String updateBy;
+ /**
+ * 隐患排查作业UUID
+ */
+ private String checkTaskId;
+ /**
+ * 排 查 结 果
+ */
+ private String checkStatus;
+ /**
+ * 排查时间
+ */
+ private Date checkTime;
+ /**
+ * 修改人手机号
+ */
+ private String updateByMobile;
+ /**
+ * 创建人人手机号
+ */
+ private String createByMobile;
+ /**
+ * 上报时间
+ */
+ private Date reportTime;
+ /**
+ * 上报状态 1-待上报；2-已上报；3-不上报
+ */
+ private Byte reportStatus;
+ /**
+ * 数据来源 1-本系统排查任务产生；2-同步数据
+ */
+ private Byte dataSource;
+ /**
+ * taskId
+ */
+ private Long taskId;
+
+ private String mobileCode;
+
+ private String defend;
+
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckTaskFromWork.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckTaskFromWork.java
index 9db06ce..c3a6264 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckTaskFromWork.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportCheckTaskFromWork.java
@@ -1,112 +1,112 @@
-package com.ruoyi.doublePrevention.entity.CJReport;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("prevent_cj_report_check_task_from_work")
-public class PreventCJReportCheckTaskFromWork implements Serializable {
- /**
- * 主键
- */
- @TableId(value = "id" , type = IdType.AUTO)
- private Integer indexId;
- /**
- * 主键
- */
- private String id;
- /**
- * 公司编码
- */
- private String companyCode;
- /**
- * 删除标志：0-有效，1-删除
- */
- private String deleted;
- /**
- * 创建时间
- */
- private Date createDate;
- /**
- * 创建人
- */
- private String createBy;
- /**
- * 最后修改时间
- */
- private Date updateDate;
- /**
- * 修改人
- */
- private String updateBy;
- /**
- * 管控措施UUID
- */
- private String riskMeasureId;
- /**
- * 巡检周期
- */
- private Integer checkCycle;
- /**
- * 巡检周期单位 小时，日，月，年
- */
- private String checkCycleUnit;
- /**
- * 上报时间
- */
- private Date reportTime;
- /**
- * 上报状态 1-待上报；2-已上报；3-不上报
- */
- private Byte reportStatus;
- /**
- * 数据来源 1-本系统排查任务产生；2-同步数据
- */
- private Byte dataSource;
- /**
- * workId
- */
- private Long workId;
-
-
- /**
- * 隐患排查内容
- */
- private String troubleshootContent;
- /**
- *任务开始时间
- * 指该任 务首次开始执行的时间，必填
- */
- private Date taskStartTime;
- /**
- *当巡检周期是小时的时候为必填
- */
- private String workStartTime;
- /**
- *当巡检周期是小时的时候为必填
- */
- private String workEndTime;
- /**
- *工作日类型(每天：0；法定工作日(除法定
- * 放假以外的所有)：1 ；非法定工作日(除了放假的时候)：2)
- */
- private String workDayType;
- /**
- *任务类型 任务类型(日常任务： 0；主要负责人
- * 任务：1 ；技术负责人任务：2；操作负责人任务：3；) 默认为日常任务：
- * 0
- */
- private String workType;
- /**
- *包保任务对应项 当任务类型为主要负责人任务、
- * 技术负责人任务、操作负责人任务时，此项为必填。
- */
- private String taskNum;
-
-}
-
+package com.ruoyi.doublePrevention.entity.CJReport;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("prevent_cj_report_check_task_from_work")
+public class PreventCJReportCheckTaskFromWork implements Serializable {
+ /**
+ * 主键
+ */
+ @TableId(value = "id" , type = IdType.AUTO)
+ private Integer indexId;
+ /**
+ * 主键
+ */
+ private String id;
+ /**
+ * 公司编码
+ */
+ private String companyCode;
+ /**
+ * 删除标志：0-有效，1-删除
+ */
+ private String deleted;
+ /**
+ * 创建时间
+ */
+ private Date createDate;
+ /**
+ * 创建人
+ */
+ private String createBy;
+ /**
+ * 最后修改时间
+ */
+ private Date updateDate;
+ /**
+ * 修改人
+ */
+ private String updateBy;
+ /**
+ * 管控措施UUID
+ */
+ private String riskMeasureId;
+ /**
+ * 巡检周期
+ */
+ private Integer checkCycle;
+ /**
+ * 巡检周期单位 小时，日，月，年
+ */
+ private String checkCycleUnit;
+ /**
+ * 上报时间
+ */
+ private Date reportTime;
+ /**
+ * 上报状态 1-待上报；2-已上报；3-不上报
+ */
+ private Byte reportStatus;
+ /**
+ * 数据来源 1-本系统排查任务产生；2-同步数据
+ */
+ private Byte dataSource;
+ /**
+ * workId
+ */
+ private Long workId;
+
+
+ /**
+ * 隐患排查内容
+ */
+ private String troubleshootContent;
+ /**
+ *任务开始时间
+ * 指该任 务首次开始执行的时间，必填
+ */
+ private Date taskStartTime;
+ /**
+ *当巡检周期是小时的时候为必填
+ */
+ private String workStartTime;
+ /**
+ *当巡检周期是小时的时候为必填
+ */
+ private String workEndTime;
+ /**
+ *工作日类型(每天：0；法定工作日(除法定
+ * 放假以外的所有)：1 ；非法定工作日(除了放假的时候)：2)
+ */
+ private String workDayType;
+ /**
+ *任务类型 任务类型(日常任务： 0；主要负责人
+ * 任务：1 ；技术负责人任务：2；操作负责人任务：3；) 默认为日常任务：
+ * 0
+ */
+ private String workType;
+ /**
+ *包保任务对应项 当任务类型为主要负责人任务、
+ * 技术负责人任务、操作负责人任务时，此项为必填。
+ */
+ private String taskNum;
+
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportConfig.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportConfig.java
index dca5f91..77615c1 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportConfig.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportConfig.java
@@ -1,94 +1,94 @@
-package com.ruoyi.doublePrevention.entity.CJReport;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
-
-@TableName("prevent_cj_report_config")
-public class PreventCJReportConfig {
-
- /**
- * 主键
- */
- private Integer id;
- /**
- * 上报开关：0-开启；1-关闭
- */
- private Byte reportState;
- /**
- * 上报方式：0-手动；1-自动
- */
- private Byte reportType;
- /**
- * 上报数据
- */
- private String reportData;
- /**
- * 上报数据名称
- */
- private String reportDataName;
- /**
- * 最后修改时间
- */
- private Date gmtModitify;
- /**
- * 修改人
- */
- private String lastEditUserName;
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Byte getReportState() {
- return reportState;
- }
-
- public void setReportState(Byte reportState) {
- this.reportState = reportState;
- }
-
- public Byte getReportType() {
- return reportType;
- }
-
- public void setReportType(Byte reportType) {
- this.reportType = reportType;
- }
-
- public String getReportData() {
- return reportData;
- }
-
- public void setReportData(String reportData) {
- this.reportData = reportData;
- }
-
- public String getReportDataName() {
- return reportDataName;
- }
-
- public void setReportDataName(String reportDataName) {
- this.reportDataName = reportDataName;
- }
-
- public Date getGmtModitify() {
- return gmtModitify;
- }
-
- public void setGmtModitify(Date gmtModitify) {
- this.gmtModitify = gmtModitify;
- }
-
- public String getLastEditUserName() {
- return lastEditUserName;
- }
-
- public void setLastEditUserName(String lastEditUserName) {
- this.lastEditUserName = lastEditUserName;
- }
-}
+package com.ruoyi.doublePrevention.entity.CJReport;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
+
+@TableName("prevent_cj_report_config")
+public class PreventCJReportConfig {
+
+ /**
+ * 主键
+ */
+ private Integer id;
+ /**
+ * 上报开关：0-开启；1-关闭
+ */
+ private Byte reportState;
+ /**
+ * 上报方式：0-手动；1-自动
+ */
+ private Byte reportType;
+ /**
+ * 上报数据
+ */
+ private String reportData;
+ /**
+ * 上报数据名称
+ */
+ private String reportDataName;
+ /**
+ * 最后修改时间
+ */
+ private Date gmtModitify;
+ /**
+ * 修改人
+ */
+ private String lastEditUserName;
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Byte getReportState() {
+ return reportState;
+ }
+
+ public void setReportState(Byte reportState) {
+ this.reportState = reportState;
+ }
+
+ public Byte getReportType() {
+ return reportType;
+ }
+
+ public void setReportType(Byte reportType) {
+ this.reportType = reportType;
+ }
+
+ public String getReportData() {
+ return reportData;
+ }
+
+ public void setReportData(String reportData) {
+ this.reportData = reportData;
+ }
+
+ public String getReportDataName() {
+ return reportDataName;
+ }
+
+ public void setReportDataName(String reportDataName) {
+ this.reportDataName = reportDataName;
+ }
+
+ public Date getGmtModitify() {
+ return gmtModitify;
+ }
+
+ public void setGmtModitify(Date gmtModitify) {
+ this.gmtModitify = gmtModitify;
+ }
+
+ public String getLastEditUserName() {
+ return lastEditUserName;
+ }
+
+ public void setLastEditUserName(String lastEditUserName) {
+ this.lastEditUserName = lastEditUserName;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportConfigLog.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportConfigLog.java
index 4988630..1bf1f43 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportConfigLog.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportConfigLog.java
@@ -1,97 +1,97 @@
-package com.ruoyi.doublePrevention.entity.CJReport;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
-
-@TableName("prevent_cj_report_config_log")
-public class PreventCJReportConfigLog {
-
- /**
- * 主键
- */
- @TableId(value = "id" , type = IdType.AUTO)
- private Long id;
- /**
- * 上报开关：0-开启；1-关闭
- */
- private Byte reportState;
- /**
- * 上报方式：0-手动；1-自动
- */
- private Byte reportType;
- /**
- * 上报数据
- */
- private String reportData;
- /**
- * 上报数据名称
- */
- private String reportDataName;
- /**
- * 最后修改时间
- */
- private Date gmtModitify;
- /**
- * 修改人
- */
- private String lastEditUserName;
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public Byte getReportState() {
- return reportState;
- }
-
- public void setReportState(Byte reportState) {
- this.reportState = reportState;
- }
-
- public Byte getReportType() {
- return reportType;
- }
-
- public void setReportType(Byte reportType) {
- this.reportType = reportType;
- }
-
- public String getReportData() {
- return reportData;
- }
-
- public void setReportData(String reportData) {
- this.reportData = reportData;
- }
-
- public String getReportDataName() {
- return reportDataName;
- }
-
- public void setReportDataName(String reportDataName) {
- this.reportDataName = reportDataName;
- }
-
- public Date getGmtModitify() {
- return gmtModitify;
- }
-
- public void setGmtModitify(Date gmtModitify) {
- this.gmtModitify = gmtModitify;
- }
-
- public String getLastEditUserName() {
- return lastEditUserName;
- }
-
- public void setLastEditUserName(String lastEditUserName) {
- this.lastEditUserName = lastEditUserName;
- }
-}
+package com.ruoyi.doublePrevention.entity.CJReport;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
+
+@TableName("prevent_cj_report_config_log")
+public class PreventCJReportConfigLog {
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id" , type = IdType.AUTO)
+ private Long id;
+ /**
+ * 上报开关：0-开启；1-关闭
+ */
+ private Byte reportState;
+ /**
+ * 上报方式：0-手动；1-自动
+ */
+ private Byte reportType;
+ /**
+ * 上报数据
+ */
+ private String reportData;
+ /**
+ * 上报数据名称
+ */
+ private String reportDataName;
+ /**
+ * 最后修改时间
+ */
+ private Date gmtModitify;
+ /**
+ * 修改人
+ */
+ private String lastEditUserName;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Byte getReportState() {
+ return reportState;
+ }
+
+ public void setReportState(Byte reportState) {
+ this.reportState = reportState;
+ }
+
+ public Byte getReportType() {
+ return reportType;
+ }
+
+ public void setReportType(Byte reportType) {
+ this.reportType = reportType;
+ }
+
+ public String getReportData() {
+ return reportData;
+ }
+
+ public void setReportData(String reportData) {
+ this.reportData = reportData;
+ }
+
+ public String getReportDataName() {
+ return reportDataName;
+ }
+
+ public void setReportDataName(String reportDataName) {
+ this.reportDataName = reportDataName;
+ }
+
+ public Date getGmtModitify() {
+ return gmtModitify;
+ }
+
+ public void setGmtModitify(Date gmtModitify) {
+ this.gmtModitify = gmtModitify;
+ }
+
+ public String getLastEditUserName() {
+ return lastEditUserName;
+ }
+
+ public void setLastEditUserName(String lastEditUserName) {
+ this.lastEditUserName = lastEditUserName;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportDangerInfo.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportDangerInfo.java
index 7520bbe..86d7dd2 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportDangerInfo.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportDangerInfo.java
@@ -1,151 +1,151 @@
-package com.ruoyi.doublePrevention.entity.CJReport;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("prevent_cj_report_danger_info")
-public class PreventCJReportDangerInfo implements Serializable {
- /**
- * 主键
- */
- @TableId(value = "id" , type = IdType.AUTO)
- private Integer indexId;
- /**
- * 主键
- */
- private String id;
- /**
- * 公司编码
- */
- private String companyCode;
- /**
- * 删除标志：0-有效，1-删除
- */
- private String deleted;
- /**
- * 创建时间
- */
- private Date createDate;
- /**
- * 创建人
- */
- private String createBy;
- /**
- * 最后修改时间
- */
- private Date updateDate;
- /**
- * 修改人
- */
- private String updateBy;
- /**
- * 安全风险分析对象编码
- */
- private String hazardCode;
- /**
- * 管控措施 ID-->管控措施UUID
- */
- private String riskMeasureId;
- /**
- * 隐患排查记录 ID-->隐患排查任务UUID
- */
- private String checkRecordId;
- /**
- * 隐患名称
- */
- private String dangerName;
- /**
- * 隐患等级
- */
- private String dangerLevel;
- /**
- * 隐患来源
- */
- private String dangerSrc;
- /**
- * 隐患治理类型
- */
- private String dangerManageType;
- /**
- * 隐患描述
- */
- private String dangerDesc;
- /**
- * 隐患产生原因
- */
- private String dangerReason;
- /**
- * 控制措施
- */
- private String controlMeasures;
- /**
- * 资金
- */
- private String cost;
- /**
- * 隐患治理期限
- */
- private Date dangerManageDeadline;
- /**
- * 隐患状态
- */
- private String dangerState;
- /**
- * 隐患类型
- */
- private String hazardDangerType;
- /**
- * 登记人姓名
- */
- private String registrant;
- /**
- * 登记时间
- */
- private Date registTime;
- /**
- * 整改责任人姓名
- */
- private String liablePerson;
- /**
- * 验收人
- */
- private String checkAcceptPerson;
- /**
- * 验收情况
- */
- private String checkAcceptComment;
- /**
- * 验收时间
- */
- private Date checkAcceptTime;
- /**
- * 上报时间
- */
- private Date reportTime;
- /**
- * 上报状态 1-待上报；2-已上报；3-不上报
- */
- private Byte reportStatus;
- /**
- * 数据来源 1-本系统排查任务产生；2-同步数据
- */
- private Byte dataSource;
- /**
- * 数据来源 1-本系统排查任务产生；2-同步数据
- */
- private Long dangerManagerId;
- /**
- * 隐患类别(其他隐患0 ;主要负责人隐患1;技术负责人隐患2 ;操作负责人隐患3
- */
- private String hazardCategory;
-
-
-
-}
-
+package com.ruoyi.doublePrevention.entity.CJReport;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("prevent_cj_report_danger_info")
+public class PreventCJReportDangerInfo implements Serializable {
+ /**
+ * 主键
+ */
+ @TableId(value = "id" , type = IdType.AUTO)
+ private Integer indexId;
+ /**
+ * 主键
+ */
+ private String id;
+ /**
+ * 公司编码
+ */
+ private String companyCode;
+ /**
+ * 删除标志：0-有效，1-删除
+ */
+ private String deleted;
+ /**
+ * 创建时间
+ */
+ private Date createDate;
+ /**
+ * 创建人
+ */
+ private String createBy;
+ /**
+ * 最后修改时间
+ */
+ private Date updateDate;
+ /**
+ * 修改人
+ */
+ private String updateBy;
+ /**
+ * 安全风险分析对象编码
+ */
+ private String hazardCode;
+ /**
+ * 管控措施 ID-->管控措施UUID
+ */
+ private String riskMeasureId;
+ /**
+ * 隐患排查记录 ID-->隐患排查任务UUID
+ */
+ private String checkRecordId;
+ /**
+ * 隐患名称
+ */
+ private String dangerName;
+ /**
+ * 隐患等级
+ */
+ private String dangerLevel;
+ /**
+ * 隐患来源
+ */
+ private String dangerSrc;
+ /**
+ * 隐患治理类型
+ */
+ private String dangerManageType;
+ /**
+ * 隐患描述
+ */
+ private String dangerDesc;
+ /**
+ * 隐患产生原因
+ */
+ private String dangerReason;
+ /**
+ * 控制措施
+ */
+ private String controlMeasures;
+ /**
+ * 资金
+ */
+ private String cost;
+ /**
+ * 隐患治理期限
+ */
+ private Date dangerManageDeadline;
+ /**
+ * 隐患状态
+ */
+ private String dangerState;
+ /**
+ * 隐患类型
+ */
+ private String hazardDangerType;
+ /**
+ * 登记人姓名
+ */
+ private String registrant;
+ /**
+ * 登记时间
+ */
+ private Date registTime;
+ /**
+ * 整改责任人姓名
+ */
+ private String liablePerson;
+ /**
+ * 验收人
+ */
+ private String checkAcceptPerson;
+ /**
+ * 验收情况
+ */
+ private String checkAcceptComment;
+ /**
+ * 验收时间
+ */
+ private Date checkAcceptTime;
+ /**
+ * 上报时间
+ */
+ private Date reportTime;
+ /**
+ * 上报状态 1-待上报；2-已上报；3-不上报
+ */
+ private Byte reportStatus;
+ /**
+ * 数据来源 1-本系统排查任务产生；2-同步数据
+ */
+ private Byte dataSource;
+ /**
+ * 数据来源 1-本系统排查任务产生；2-同步数据
+ */
+ private Long dangerManagerId;
+ /**
+ * 隐患类别(其他隐患0 ;主要负责人隐患1;技术负责人隐患2 ;操作负责人隐患3
+ */
+ private String hazardCategory;
+
+
+
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportOverhaulLog.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportOverhaulLog.java
index 8ab05f5..0f5967a 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportOverhaulLog.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportOverhaulLog.java
@@ -1,84 +1,84 @@
-package com.ruoyi.doublePrevention.entity.CJReport;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-@TableName("prevent_cj_report_overhaul_log")
-public class PreventCJReportOverhaulLog {
-
- /**
- * 主键
- */
- @TableId(value = "id" , type = IdType.AUTO)
- private Integer indexId;
-
- /**
- * 主键
- */
- private String id;
- /**
- * 删除标志：0-有效，1-删除
- */
- private String deleted;
- /**
- * 公司编码
- */
- private String companyCode;
- /**
- * 风险分析对象编码
- */
- private String hazardCode;
- /**
- * 所属安全风险分析单元uuid
- */
- private String riskUnitId;
- /**
- * 装置停用或者检维修开始时间
- */
- private Date stopStartTime;
- /**
- * 装置停用或者检维修结束时间
- */
- private Date stopEndTime;
- /**
- * 描述停用原因
- */
- private String stopReason;
-
- /**
- * 上报时间
- */
- private Date reportTime;
- /**
- * 上报状态 1-待上报；2-已上报；3-不上报
- */
- private Byte reportStatus;
- /**
- * 数据来源 1-本系统排查任务产生；2-同步数据
- */
- private Byte dataSource;
-
- /**
- * 创建时间
- */
- private Date createDate;
- /**
- * 创建人
- */
- private String createBy;
- /**
- * 最后修改时间
- */
- private Date updateDate;
- /**
- * 修改人
- */
- private String updateBy;
-
-
-}
+package com.ruoyi.doublePrevention.entity.CJReport;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("prevent_cj_report_overhaul_log")
+public class PreventCJReportOverhaulLog {
+
+ /**
+ * 主键
+ */
+ @TableId(value = "id" , type = IdType.AUTO)
+ private Integer indexId;
+
+ /**
+ * 主键
+ */
+ private String id;
+ /**
+ * 删除标志：0-有效，1-删除
+ */
+ private String deleted;
+ /**
+ * 公司编码
+ */
+ private String companyCode;
+ /**
+ * 风险分析对象编码
+ */
+ private String hazardCode;
+ /**
+ * 所属安全风险分析单元uuid
+ */
+ private String riskUnitId;
+ /**
+ * 装置停用或者检维修开始时间
+ */
+ private Date stopStartTime;
+ /**
+ * 装置停用或者检维修结束时间
+ */
+ private Date stopEndTime;
+ /**
+ * 描述停用原因
+ */
+ private String stopReason;
+
+ /**
+ * 上报时间
+ */
+ private Date reportTime;
+ /**
+ * 上报状态 1-待上报；2-已上报；3-不上报
+ */
+ private Byte reportStatus;
+ /**
+ * 数据来源 1-本系统排查任务产生；2-同步数据
+ */
+ private Byte dataSource;
+
+ /**
+ * 创建时间
+ */
+ private Date createDate;
+ /**
+ * 创建人
+ */
+ private String createBy;
+ /**
+ * 最后修改时间
+ */
+ private Date updateDate;
+ /**
+ * 修改人
+ */
+ private String updateBy;
+
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportPoint.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportPoint.java
index e1c63b0..e9b3372 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportPoint.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportPoint.java
@@ -1,230 +1,230 @@
-package com.ruoyi.doublePrevention.entity.CJReport;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@TableName("prevent_cj_report_point")
-public class PreventCJReportPoint implements Serializable {
- /**
- * 主键
- */
- @TableId(value = "id" , type = IdType.AUTO)
- private Integer indexId;
- /**
- * 主键
- */
- private String id;
- /**
- * 公司编码
- */
- private String companyCode;
- /**
- * 删除标志：0-未删除、1-已删除、2-更新
- */
- private String deleted;
- /**
- * 创建时间
- */
- private Date createDate;
- /**
- * 创建人
- */
- private String createBy;
- /**
- * 最后修改时间
- */
- private Date updateDate;
- /**
- * 修改人
- */
- private String updateBy;
- /**
- * 风险单元
- */
- private String riskUnitIds;
- /**
- * 风险事件
- */
- private String riskEventIds;
- /**
- * 管控措施
- */
- private String riskMeasureIds;
- /**
- * 责任部门
- */
- private String hazardDep;
- /**
- * 安全风险分析对象编码
- */
- private String hazardCode;
- /**
- * 责任人姓名
- */
- private String hazardLiablePerson;
- /**
- * 上报时间
- */
- private Date reportTime;
- /**
- * 上报状态 1-待上报；2-已上报；3-不上报
- */
- private Byte reportStatus;
- /**
- * 数据来源 1-本系统排查任务产生；2-同步数据
- */
- private Byte dataSource;
- /**
- * 风险事件id
- */
- private Long riskEventId;
-
- public String getRiskUnitIds() {
- return riskUnitIds;
- }
-
- public void setRiskUnitIds(String riskUnitIds) {
- this.riskUnitIds = riskUnitIds;
- }
-
- public String getRiskEventIds() {
- return riskEventIds;
- }
-
- public void setRiskEventIds(String riskEventIds) {
- this.riskEventIds = riskEventIds;
- }
-
- public String getRiskMeasureIds() {
- return riskMeasureIds;
- }
-
- public void setRiskMeasureIds(String riskMeasureIds) {
- this.riskMeasureIds = riskMeasureIds;
- }
-
- public String getHazardCode() {
- return hazardCode;
- }
-
- public void setHazardCode(String hazardCode) {
- this.hazardCode = hazardCode;
- }
-
- public String getHazardDep() {
- return hazardDep;
- }
-
- public void setHazardDep(String hazardDep) {
- this.hazardDep = hazardDep;
- }
-
- public String getHazardLiablePerson() {
- return hazardLiablePerson;
- }
-
- public void setHazardLiablePerson(String hazardLiablePerson) {
- this.hazardLiablePerson = hazardLiablePerson;
- }
-
- public Long getRiskEventId() {
- return riskEventId;
- }
-
- public void setRiskEventId(Long riskEventId) {
- this.riskEventId = riskEventId;
- }
-
- public String getDeleted() {
- return deleted;
- }
- public void setDeleted(String deleted) {
- this.deleted = deleted;
- }
-
- public Integer getIndexId() {
- return indexId;
- }
-
- public void setIndexId(Integer indexId) {
- this.indexId = indexId;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getCompanyCode() {
- return companyCode;
- }
-
- public void setCompanyCode(String companyCode) {
- this.companyCode = companyCode;
- }
-
- public Date getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(Date createDate) {
- this.createDate = createDate;
- }
-
- public String getCreateBy() {
- return createBy;
- }
-
- public void setCreateBy(String createBy) {
- this.createBy = createBy;
- }
-
- public Date getUpdateDate() {
- return updateDate;
- }
-
- public void setUpdateDate(Date updateDate) {
- this.updateDate = updateDate;
- }
-
- public String getUpdateBy() {
- return updateBy;
- }
-
- public void setUpdateBy(String updateBy) {
- this.updateBy = updateBy;
- }
-
- public Date getReportTime() {
- return reportTime;
- }
-
- public void setReportTime(Date reportTime) {
- this.reportTime = reportTime;
- }
-
- public Byte getReportStatus() {
- return reportStatus;
- }
-
- public void setReportStatus(Byte reportStatus) {
- this.reportStatus = reportStatus;
- }
-
- public Byte getDataSource() {
- return dataSource;
- }
-
- public void setDataSource(Byte dataSource) {
- this.dataSource = dataSource;
- }
-
-}
-
+package com.ruoyi.doublePrevention.entity.CJReport;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@TableName("prevent_cj_report_point")
+public class PreventCJReportPoint implements Serializable {
+ /**
+ * 主键
+ */
+ @TableId(value = "id" , type = IdType.AUTO)
+ private Integer indexId;
+ /**
+ * 主键
+ */
+ private String id;
+ /**
+ * 公司编码
+ */
+ private String companyCode;
+ /**
+ * 删除标志：0-未删除、1-已删除、2-更新
+ */
+ private String deleted;
+ /**
+ * 创建时间
+ */
+ private Date createDate;
+ /**
+ * 创建人
+ */
+ private String createBy;
+ /**
+ * 最后修改时间
+ */
+ private Date updateDate;
+ /**
+ * 修改人
+ */
+ private String updateBy;
+ /**
+ * 风险单元
+ */
+ private String riskUnitIds;
+ /**
+ * 风险事件
+ */
+ private String riskEventIds;
+ /**
+ * 管控措施
+ */
+ private String riskMeasureIds;
+ /**
+ * 责任部门
+ */
+ private String hazardDep;
+ /**
+ * 安全风险分析对象编码
+ */
+ private String hazardCode;
+ /**
+ * 责任人姓名
+ */
+ private String hazardLiablePerson;
+ /**
+ * 上报时间
+ */
+ private Date reportTime;
+ /**
+ * 上报状态 1-待上报；2-已上报；3-不上报
+ */
+ private Byte reportStatus;
+ /**
+ * 数据来源 1-本系统排查任务产生；2-同步数据
+ */
+ private Byte dataSource;
+ /**
+ * 风险事件id
+ */
+ private Long riskEventId;
+
+ public String getRiskUnitIds() {
+ return riskUnitIds;
+ }
+
+ public void setRiskUnitIds(String riskUnitIds) {
+ this.riskUnitIds = riskUnitIds;
+ }
+
+ public String getRiskEventIds() {
+ return riskEventIds;
+ }
+
+ public void setRiskEventIds(String riskEventIds) {
+ this.riskEventIds = riskEventIds;
+ }
+
+ public String getRiskMeasureIds() {
+ return riskMeasureIds;
+ }
+
+ public void setRiskMeasureIds(String riskMeasureIds) {
+ this.riskMeasureIds = riskMeasureIds;
+ }
+
+ public String getHazardCode() {
+ return hazardCode;
+ }
+
+ public void setHazardCode(String hazardCode) {
+ this.hazardCode = hazardCode;
+ }
+
+ public String getHazardDep() {
+ return hazardDep;
+ }
+
+ public void setHazardDep(String hazardDep) {
+ this.hazardDep = hazardDep;
+ }
+
+ public String getHazardLiablePerson() {
+ return hazardLiablePerson;
+ }
+
+ public void setHazardLiablePerson(String hazardLiablePerson) {
+ this.hazardLiablePerson = hazardLiablePerson;
+ }
+
+ public Long getRiskEventId() {
+ return riskEventId;
+ }
+
+ public void setRiskEventId(Long riskEventId) {
+ this.riskEventId = riskEventId;
+ }
+
+ public String getDeleted() {
+ return deleted;
+ }
+ public void setDeleted(String deleted) {
+ this.deleted = deleted;
+ }
+
+ public Integer getIndexId() {
+ return indexId;
+ }
+
+ public void setIndexId(Integer indexId) {
+ this.indexId = indexId;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getCompanyCode() {
+ return companyCode;
+ }
+
+ public void setCompanyCode(String companyCode) {
+ this.companyCode = companyCode;
+ }
+
+ public Date getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(Date createDate) {
+ this.createDate = createDate;
+ }
+
+ public String getCreateBy() {
+ return createBy;
+ }
+
+ public void setCreateBy(String createBy) {
+ this.createBy = createBy;
+ }
+
+ public Date getUpdateDate() {
+ return updateDate;
+ }
+
+ public void setUpdateDate(Date updateDate) {
+ this.updateDate = updateDate;
+ }
+
+ public String getUpdateBy() {
+ return updateBy;
+ }
+
+ public void setUpdateBy(String updateBy) {
+ this.updateBy = updateBy;
+ }
+
+ public Date getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(Date reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public Byte getReportStatus() {
+ return reportStatus;
+ }
+
+ public void setReportStatus(Byte reportStatus) {
+ this.reportStatus = reportStatus;
+ }
+
+ public Byte getDataSource() {
+ return dataSource;
+ }
+
+ public void setDataSource(Byte dataSource) {
+ this.dataSource = dataSource;
+ }
+
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportResultData.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportResultData.java
index b31dd5f..ebbbf6a 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportResultData.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportResultData.java
@@ -1,67 +1,67 @@
-package com.ruoyi.doublePrevention.entity.CJReport;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-//import com.gkhy.safePlatform.doublePrevention.entity.CJReport.CJdto.ErrorMsgDetails;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 未确定使用哪种方式，可以使用众泰的存储结果的方法
- * */
-@TableName("prevent_cj_report_result_data")
-public class PreventCJReportResultData {
-
- /**
- * 主键id
- * */
- @TableId(value = "id" , type = IdType.AUTO)
- private Long id;
- /**
- * 返回code
- * */
- private String code;
-// /**
-// * 返回的一个list集合
-// * */
-// private List<ErrorMsgDetails> data;
- /**
- * 上报数据来源标识
- * */
- private String errorMsg;
-
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
-// public List<ErrorMsgDetails> getData() {
-// return data;
-// }
-//
-// public void setData(List<ErrorMsgDetails> data) {
-// this.data = data;
-// }
-
- public String getErrorMsg() {
- return errorMsg;
- }
-
- public void setErrorMsg(String errorMsg) {
- this.errorMsg = errorMsg;
- }
-}
+package com.ruoyi.doublePrevention.entity.CJReport;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+//import com.gkhy.safePlatform.doublePrevention.entity.CJReport.CJdto.ErrorMsgDetails;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 未确定使用哪种方式，可以使用众泰的存储结果的方法
+ * */
+@TableName("prevent_cj_report_result_data")
+public class PreventCJReportResultData {
+
+ /**
+ * 主键id
+ * */
+ @TableId(value = "id" , type = IdType.AUTO)
+ private Long id;
+ /**
+ * 返回code
+ * */
+ private String code;
+// /**
+// * 返回的一个list集合
+// * */
+// private List<ErrorMsgDetails> data;
+ /**
+ * 上报数据来源标识
+ * */
+ private String errorMsg;
+
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+// public List<ErrorMsgDetails> getData() {
+// return data;
+// }
+//
+// public void setData(List<ErrorMsgDetails> data) {
+// this.data = data;
+// }
+
+ public String getErrorMsg() {
+ return errorMsg;
+ }
+
+ public void setErrorMsg(String errorMsg) {
+ this.errorMsg = errorMsg;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskAnaUnit.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskAnaUnit.java
index 3287958..89d2b45 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskAnaUnit.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskAnaUnit.java
@@ -1,209 +1,209 @@
-package com.ruoyi.doublePrevention.entity.CJReport;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@TableName("prevent_cj_report_risk_ana_unit")
-public class PreventCJReportRiskAnaUnit implements Serializable {
- /**
- * 主键
- */
- @TableId(value = "id" , type = IdType.AUTO)
- private Integer indexId;
- /**
- * 主键
- */
- private String id;
- /**
- * 公司编码
- */
- private String companyCode;
- /**
- * 安全风险分析单元名称
- */
- private String riskUnitName;
- /**
- * 安全风险分析对象编码
- */
- private String hazardCode;
- /**
- * 责任部门
- */
- private String hazardDep;
- /**
- * 责任人姓名
- */
- private String hazardLiablePerson;
- /**
- * 删除标志：0-有效，1-删除
- */
- private String deleted;
- /**
- * 创建时间
- */
- private Date createDate;
- /**
- * 创建人
- */
- private String createBy;
- /**
- * 最后修改时间
- */
- private Date updateDate;
- /**
- * 修改人
- */
- private String updateBy;
- /**
- * 上报时间
- */
- private Date reportTime;
- /**
- * 上报状态 1-待上报；2-已上报；3-不上报
- */
- private Byte reportStatus;
- /**
- * 数据来源 1-本系统排查任务产生；2-同步数据
- */
- private Byte dataSource;
- /**
- * 风险分析单元id
- */
- private Long riskUnitId;
-
- public Long getRiskUnitId() {
- return riskUnitId;
- }
-
- public void setRiskUnitId(Long riskUnitId) {
- this.riskUnitId = riskUnitId;
- }
-
- public String getDeleted() {
- return deleted;
- }
-
- public void setDeleted(String deleted) {
- this.deleted = deleted;
- }
-
- public Byte getReportStatus() {
- return reportStatus;
- }
-
- public void setReportStatus(Byte reportStatus) {
- this.reportStatus = reportStatus;
- }
-
- public Byte getDataSource() {
- return dataSource;
- }
-
- public void setDataSource(Byte dataSource) {
- this.dataSource = dataSource;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getCompanyCode() {
- return companyCode;
- }
-
- public void setCompanyCode(String companyCode) {
- this.companyCode = companyCode;
- }
-
- public String getRiskUnitName() {
- return riskUnitName;
- }
-
- public void setRiskUnitName(String riskUnitName) {
- this.riskUnitName = riskUnitName;
- }
-
- public Integer getIndexId() {
- return indexId;
- }
-
- public void setIndexId(Integer indexId) {
- this.indexId = indexId;
- }
-
- public String getHazardCode() {
- return hazardCode;
- }
-
- public void setHazardCode(String hazardCode) {
- this.hazardCode = hazardCode;
- }
-
- public String getHazardDep() {
- return hazardDep;
- }
-
- public void setHazardDep(String hazardDep) {
- this.hazardDep = hazardDep;
- }
-
- public String getHazardLiablePerson() {
- return hazardLiablePerson;
- }
-
- public void setHazardLiablePerson(String hazardLiablePerson) {
- this.hazardLiablePerson = hazardLiablePerson;
- }
-
- public Date getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(Date createDate) {
- this.createDate = createDate;
- }
-
- public String getCreateBy() {
- return createBy;
- }
-
- public void setCreateBy(String createBy) {
- this.createBy = createBy;
- }
-
- public Date getUpdateDate() {
- return updateDate;
- }
-
- public void setUpdateDate(Date updateDate) {
- this.updateDate = updateDate;
- }
-
- public String getUpdateBy() {
- return updateBy;
- }
-
- public void setUpdateBy(String updateBy) {
- this.updateBy = updateBy;
- }
-
- public Date getReportTime() {
- return reportTime;
- }
-
- public void setReportTime(Date reportTime) {
- this.reportTime = reportTime;
- }
-
-
-}
-
+package com.ruoyi.doublePrevention.entity.CJReport;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@TableName("prevent_cj_report_risk_ana_unit")
+public class PreventCJReportRiskAnaUnit implements Serializable {
+ /**
+ * 主键
+ */
+ @TableId(value = "id" , type = IdType.AUTO)
+ private Integer indexId;
+ /**
+ * 主键
+ */
+ private String id;
+ /**
+ * 公司编码
+ */
+ private String companyCode;
+ /**
+ * 安全风险分析单元名称
+ */
+ private String riskUnitName;
+ /**
+ * 安全风险分析对象编码
+ */
+ private String hazardCode;
+ /**
+ * 责任部门
+ */
+ private String hazardDep;
+ /**
+ * 责任人姓名
+ */
+ private String hazardLiablePerson;
+ /**
+ * 删除标志：0-有效，1-删除
+ */
+ private String deleted;
+ /**
+ * 创建时间
+ */
+ private Date createDate;
+ /**
+ * 创建人
+ */
+ private String createBy;
+ /**
+ * 最后修改时间
+ */
+ private Date updateDate;
+ /**
+ * 修改人
+ */
+ private String updateBy;
+ /**
+ * 上报时间
+ */
+ private Date reportTime;
+ /**
+ * 上报状态 1-待上报；2-已上报；3-不上报
+ */
+ private Byte reportStatus;
+ /**
+ * 数据来源 1-本系统排查任务产生；2-同步数据
+ */
+ private Byte dataSource;
+ /**
+ * 风险分析单元id
+ */
+ private Long riskUnitId;
+
+ public Long getRiskUnitId() {
+ return riskUnitId;
+ }
+
+ public void setRiskUnitId(Long riskUnitId) {
+ this.riskUnitId = riskUnitId;
+ }
+
+ public String getDeleted() {
+ return deleted;
+ }
+
+ public void setDeleted(String deleted) {
+ this.deleted = deleted;
+ }
+
+ public Byte getReportStatus() {
+ return reportStatus;
+ }
+
+ public void setReportStatus(Byte reportStatus) {
+ this.reportStatus = reportStatus;
+ }
+
+ public Byte getDataSource() {
+ return dataSource;
+ }
+
+ public void setDataSource(Byte dataSource) {
+ this.dataSource = dataSource;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getCompanyCode() {
+ return companyCode;
+ }
+
+ public void setCompanyCode(String companyCode) {
+ this.companyCode = companyCode;
+ }
+
+ public String getRiskUnitName() {
+ return riskUnitName;
+ }
+
+ public void setRiskUnitName(String riskUnitName) {
+ this.riskUnitName = riskUnitName;
+ }
+
+ public Integer getIndexId() {
+ return indexId;
+ }
+
+ public void setIndexId(Integer indexId) {
+ this.indexId = indexId;
+ }
+
+ public String getHazardCode() {
+ return hazardCode;
+ }
+
+ public void setHazardCode(String hazardCode) {
+ this.hazardCode = hazardCode;
+ }
+
+ public String getHazardDep() {
+ return hazardDep;
+ }
+
+ public void setHazardDep(String hazardDep) {
+ this.hazardDep = hazardDep;
+ }
+
+ public String getHazardLiablePerson() {
+ return hazardLiablePerson;
+ }
+
+ public void setHazardLiablePerson(String hazardLiablePerson) {
+ this.hazardLiablePerson = hazardLiablePerson;
+ }
+
+ public Date getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(Date createDate) {
+ this.createDate = createDate;
+ }
+
+ public String getCreateBy() {
+ return createBy;
+ }
+
+ public void setCreateBy(String createBy) {
+ this.createBy = createBy;
+ }
+
+ public Date getUpdateDate() {
+ return updateDate;
+ }
+
+ public void setUpdateDate(Date updateDate) {
+ this.updateDate = updateDate;
+ }
+
+ public String getUpdateBy() {
+ return updateBy;
+ }
+
+ public void setUpdateBy(String updateBy) {
+ this.updateBy = updateBy;
+ }
+
+ public Date getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(Date reportTime) {
+ this.reportTime = reportTime;
+ }
+
+
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskControlMeasure.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskControlMeasure.java
index 96edb53..5a60e91 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskControlMeasure.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskControlMeasure.java
@@ -1,244 +1,244 @@
-package com.ruoyi.doublePrevention.entity.CJReport;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@TableName("prevent_cj_report_risk_control_measure")
-public class PreventCJReportRiskControlMeasure implements Serializable {
- /**
- * 主键
- */
- @TableId(value = "id" , type = IdType.AUTO)
- private Integer indexId;
- /**
- * 主键
- */
- private String id;
- /**
- * 公司编码
- */
- private String companyCode;
- /**
- * 删除标志：0-有效，1-删除
- */
- private String deleted;
- /**
- * 创建时间
- */
- private Date createDate;
- /**
- * 创建人
- */
- private String createBy;
- /**
- * 最后修改时间
- */
- private Date updateDate;
- /**
- * 修改人
- */
- private String updateBy;
- /**
- * 风险事件单元 UUID
- */
- private String riskEventId;
- /**
- * 管控方式
- */
- private String dataSrc;
- /**
- * 管控措施描述
- */
- private String riskMeasureDesc;
- /**
- * 隐患排查内容
- */
- private String troubleshootContent;
- /**
- * 管控措施分类1
- */
- private String classify1;
- /**
- * 管控措施分类2
- */
- private String classify2;
- /**
- * 管控措施分类3
- */
- private String classify3;
- /**
- * 上报时间
- */
- private Date reportTime;
- /**
- * 上报状态 1-待上报；2-已上报；3-不上报
- */
- private Byte reportStatus;
- /**
- * 数据来源 1-本系统排查任务产生；2-同步数据
- */
- private Byte dataSource;
- /**
- * 管控措施id
- */
- private Long riskMeasureId;
-
- public Long getRiskMeasureId() {
- return riskMeasureId;
- }
-
- public void setRiskMeasureId(Long riskMeasureId) {
- this.riskMeasureId = riskMeasureId;
- }
-
- public Integer getIndexId() {
- return indexId;
- }
-
- public void setIndexId(Integer indexId) {
- this.indexId = indexId;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getCompanyCode() {
- return companyCode;
- }
-
- public void setCompanyCode(String companyCode) {
- this.companyCode = companyCode;
- }
-
-
- public Date getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(Date createDate) {
- this.createDate = createDate;
- }
-
- public String getCreateBy() {
- return createBy;
- }
-
- public void setCreateBy(String createBy) {
- this.createBy = createBy;
- }
-
- public Date getUpdateDate() {
- return updateDate;
- }
-
- public void setUpdateDate(Date updateDate) {
- this.updateDate = updateDate;
- }
-
- public String getUpdateBy() {
- return updateBy;
- }
-
- public void setUpdateBy(String updateBy) {
- this.updateBy = updateBy;
- }
-
- public String getRiskEventId() {
- return riskEventId;
- }
-
- public void setRiskEventId(String riskEventId) {
- this.riskEventId = riskEventId;
- }
-
- public String getDataSrc() {
- return dataSrc;
- }
-
- public void setDataSrc(String dataSrc) {
- this.dataSrc = dataSrc;
- }
-
- public String getRiskMeasureDesc() {
- return riskMeasureDesc;
- }
-
- public void setRiskMeasureDesc(String riskMeasureDesc) {
- this.riskMeasureDesc = riskMeasureDesc;
- }
-
- public String getTroubleshootContent() {
- return troubleshootContent;
- }
-
- public void setTroubleshootContent(String troubleshootContent) {
- this.troubleshootContent = troubleshootContent;
- }
-
- public String getDeleted() {
- return deleted;
- }
-
- public void setDeleted(String deleted) {
- this.deleted = deleted;
- }
-
- public String getClassify1() {
- return classify1;
- }
-
- public void setClassify1(String classify1) {
- this.classify1 = classify1;
- }
-
- public String getClassify2() {
- return classify2;
- }
-
- public void setClassify2(String classify2) {
- this.classify2 = classify2;
- }
-
- public String getClassify3() {
- return classify3;
- }
-
- public void setClassify3(String classify3) {
- this.classify3 = classify3;
- }
-
- public Date getReportTime() {
- return reportTime;
- }
-
- public void setReportTime(Date reportTime) {
- this.reportTime = reportTime;
- }
-
- public Byte getReportStatus() {
- return reportStatus;
- }
-
- public void setReportStatus(Byte reportStatus) {
- this.reportStatus = reportStatus;
- }
-
- public Byte getDataSource() {
- return dataSource;
- }
-
- public void setDataSource(Byte dataSource) {
- this.dataSource = dataSource;
- }
-
-}
-
+package com.ruoyi.doublePrevention.entity.CJReport;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@TableName("prevent_cj_report_risk_control_measure")
+public class PreventCJReportRiskControlMeasure implements Serializable {
+ /**
+ * 主键
+ */
+ @TableId(value = "id" , type = IdType.AUTO)
+ private Integer indexId;
+ /**
+ * 主键
+ */
+ private String id;
+ /**
+ * 公司编码
+ */
+ private String companyCode;
+ /**
+ * 删除标志：0-有效，1-删除
+ */
+ private String deleted;
+ /**
+ * 创建时间
+ */
+ private Date createDate;
+ /**
+ * 创建人
+ */
+ private String createBy;
+ /**
+ * 最后修改时间
+ */
+ private Date updateDate;
+ /**
+ * 修改人
+ */
+ private String updateBy;
+ /**
+ * 风险事件单元 UUID
+ */
+ private String riskEventId;
+ /**
+ * 管控方式
+ */
+ private String dataSrc;
+ /**
+ * 管控措施描述
+ */
+ private String riskMeasureDesc;
+ /**
+ * 隐患排查内容
+ */
+ private String troubleshootContent;
+ /**
+ * 管控措施分类1
+ */
+ private String classify1;
+ /**
+ * 管控措施分类2
+ */
+ private String classify2;
+ /**
+ * 管控措施分类3
+ */
+ private String classify3;
+ /**
+ * 上报时间
+ */
+ private Date reportTime;
+ /**
+ * 上报状态 1-待上报；2-已上报；3-不上报
+ */
+ private Byte reportStatus;
+ /**
+ * 数据来源 1-本系统排查任务产生；2-同步数据
+ */
+ private Byte dataSource;
+ /**
+ * 管控措施id
+ */
+ private Long riskMeasureId;
+
+ public Long getRiskMeasureId() {
+ return riskMeasureId;
+ }
+
+ public void setRiskMeasureId(Long riskMeasureId) {
+ this.riskMeasureId = riskMeasureId;
+ }
+
+ public Integer getIndexId() {
+ return indexId;
+ }
+
+ public void setIndexId(Integer indexId) {
+ this.indexId = indexId;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getCompanyCode() {
+ return companyCode;
+ }
+
+ public void setCompanyCode(String companyCode) {
+ this.companyCode = companyCode;
+ }
+
+
+ public Date getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(Date createDate) {
+ this.createDate = createDate;
+ }
+
+ public String getCreateBy() {
+ return createBy;
+ }
+
+ public void setCreateBy(String createBy) {
+ this.createBy = createBy;
+ }
+
+ public Date getUpdateDate() {
+ return updateDate;
+ }
+
+ public void setUpdateDate(Date updateDate) {
+ this.updateDate = updateDate;
+ }
+
+ public String getUpdateBy() {
+ return updateBy;
+ }
+
+ public void setUpdateBy(String updateBy) {
+ this.updateBy = updateBy;
+ }
+
+ public String getRiskEventId() {
+ return riskEventId;
+ }
+
+ public void setRiskEventId(String riskEventId) {
+ this.riskEventId = riskEventId;
+ }
+
+ public String getDataSrc() {
+ return dataSrc;
+ }
+
+ public void setDataSrc(String dataSrc) {
+ this.dataSrc = dataSrc;
+ }
+
+ public String getRiskMeasureDesc() {
+ return riskMeasureDesc;
+ }
+
+ public void setRiskMeasureDesc(String riskMeasureDesc) {
+ this.riskMeasureDesc = riskMeasureDesc;
+ }
+
+ public String getTroubleshootContent() {
+ return troubleshootContent;
+ }
+
+ public void setTroubleshootContent(String troubleshootContent) {
+ this.troubleshootContent = troubleshootContent;
+ }
+
+ public String getDeleted() {
+ return deleted;
+ }
+
+ public void setDeleted(String deleted) {
+ this.deleted = deleted;
+ }
+
+ public String getClassify1() {
+ return classify1;
+ }
+
+ public void setClassify1(String classify1) {
+ this.classify1 = classify1;
+ }
+
+ public String getClassify2() {
+ return classify2;
+ }
+
+ public void setClassify2(String classify2) {
+ this.classify2 = classify2;
+ }
+
+ public String getClassify3() {
+ return classify3;
+ }
+
+ public void setClassify3(String classify3) {
+ this.classify3 = classify3;
+ }
+
+ public Date getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(Date reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public Byte getReportStatus() {
+ return reportStatus;
+ }
+
+ public void setReportStatus(Byte reportStatus) {
+ this.reportStatus = reportStatus;
+ }
+
+ public Byte getDataSource() {
+ return dataSource;
+ }
+
+ public void setDataSource(Byte dataSource) {
+ this.dataSource = dataSource;
+ }
+
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskEvent.java b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskEvent.java
index 7156867..b3a9bb3 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskEvent.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/CJReport/PreventCJReportRiskEvent.java
@@ -1,183 +1,183 @@
-package com.ruoyi.doublePrevention.entity.CJReport;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@TableName("prevent_cj_report_risk_event")
-public class PreventCJReportRiskEvent implements Serializable {
- /**
- * 主键
- */
- @TableId(value = "id" , type = IdType.AUTO)
- private Integer indexId;
- /**
- * 主键
- */
- private String id;
- /**
- * 公司编码
- */
- private String companyCode;
- /**
- * 风险事件名称
- */
- private String riskEventName;
- /**
- * 关联风险分析单元UUID
- */
- private String riskUnitId;
- /**
- * 删除标志：0-有效，1-删除
- */
- private String deleted;
- /**
- * 创建时间
- */
- private Date createDate;
- /**
- * 创建人
- */
- private String createBy;
- /**
- * 最后修改时间
- */
- private Date updateDate;
- /**
- * 修改人
- */
- private String updateBy;
- /**
- * 上报时间
- */
- private Date reportTime;
- /**
- * 上报状态 1-待上报；2-已上报；3-不上报
- */
- private Byte reportStatus;
- /**
- * 数据来源 1-本系统排查任务产生；2-同步数据
- */
- private Byte dataSource;
- /**
- * 风险事件id
- */
- private Long riskEventId;
-
-
- public Long getRiskEventId() {
- return riskEventId;
- }
-
- public void setRiskEventId(Long riskEventId) {
- this.riskEventId = riskEventId;
- }
-
- public String getDeleted() {
- return deleted;
- }
- public void setDeleted(String deleted) {
- this.deleted = deleted;
- }
-
- public Integer getIndexId() {
- return indexId;
- }
-
- public void setIndexId(Integer indexId) {
- this.indexId = indexId;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getCompanyCode() {
- return companyCode;
- }
-
- public void setCompanyCode(String companyCode) {
- this.companyCode = companyCode;
- }
-
- public String getRiskEventName() {
- return riskEventName;
- }
-
- public void setRiskEventName(String riskEventName) {
- this.riskEventName = riskEventName;
- }
-
- public String getRiskUnitId() {
- return riskUnitId;
- }
-
- public void setRiskUnitId(String riskUnitId) {
- this.riskUnitId = riskUnitId;
- }
-
- public Date getCreateDate() {
- return createDate;
- }
-
- public void setCreateDate(Date createDate) {
- this.createDate = createDate;
- }
-
- public String getCreateBy() {
- return createBy;
- }
-
- public void setCreateBy(String createBy) {
- this.createBy = createBy;
- }
-
- public Date getUpdateDate() {
- return updateDate;
- }
-
- public void setUpdateDate(Date updateDate) {
- this.updateDate = updateDate;
- }
-
- public String getUpdateBy() {
- return updateBy;
- }
-
- public void setUpdateBy(String updateBy) {
- this.updateBy = updateBy;
- }
-
- public Date getReportTime() {
- return reportTime;
- }
-
- public void setReportTime(Date reportTime) {
- this.reportTime = reportTime;
- }
-
- public Byte getReportStatus() {
- return reportStatus;
- }
-
- public void setReportStatus(Byte reportStatus) {
- this.reportStatus = reportStatus;
- }
-
- public Byte getDataSource() {
- return dataSource;
- }
-
- public void setDataSource(Byte dataSource) {
- this.dataSource = dataSource;
- }
-
-}
-
+package com.ruoyi.doublePrevention.entity.CJReport;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@TableName("prevent_cj_report_risk_event")
+public class PreventCJReportRiskEvent implements Serializable {
+ /**
+ * 主键
+ */
+ @TableId(value = "id" , type = IdType.AUTO)
+ private Integer indexId;
+ /**
+ * 主键
+ */
+ private String id;
+ /**
+ * 公司编码
+ */
+ private String companyCode;
+ /**
+ * 风险事件名称
+ */
+ private String riskEventName;
+ /**
+ * 关联风险分析单元UUID
+ */
+ private String riskUnitId;
+ /**
+ * 删除标志：0-有效，1-删除
+ */
+ private String deleted;
+ /**
+ * 创建时间
+ */
+ private Date createDate;
+ /**
+ * 创建人
+ */
+ private String createBy;
+ /**
+ * 最后修改时间
+ */
+ private Date updateDate;
+ /**
+ * 修改人
+ */
+ private String updateBy;
+ /**
+ * 上报时间
+ */
+ private Date reportTime;
+ /**
+ * 上报状态 1-待上报；2-已上报；3-不上报
+ */
+ private Byte reportStatus;
+ /**
+ * 数据来源 1-本系统排查任务产生；2-同步数据
+ */
+ private Byte dataSource;
+ /**
+ * 风险事件id
+ */
+ private Long riskEventId;
+
+
+ public Long getRiskEventId() {
+ return riskEventId;
+ }
+
+ public void setRiskEventId(Long riskEventId) {
+ this.riskEventId = riskEventId;
+ }
+
+ public String getDeleted() {
+ return deleted;
+ }
+ public void setDeleted(String deleted) {
+ this.deleted = deleted;
+ }
+
+ public Integer getIndexId() {
+ return indexId;
+ }
+
+ public void setIndexId(Integer indexId) {
+ this.indexId = indexId;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getCompanyCode() {
+ return companyCode;
+ }
+
+ public void setCompanyCode(String companyCode) {
+ this.companyCode = companyCode;
+ }
+
+ public String getRiskEventName() {
+ return riskEventName;
+ }
+
+ public void setRiskEventName(String riskEventName) {
+ this.riskEventName = riskEventName;
+ }
+
+ public String getRiskUnitId() {
+ return riskUnitId;
+ }
+
+ public void setRiskUnitId(String riskUnitId) {
+ this.riskUnitId = riskUnitId;
+ }
+
+ public Date getCreateDate() {
+ return createDate;
+ }
+
+ public void setCreateDate(Date createDate) {
+ this.createDate = createDate;
+ }
+
+ public String getCreateBy() {
+ return createBy;
+ }
+
+ public void setCreateBy(String createBy) {
+ this.createBy = createBy;
+ }
+
+ public Date getUpdateDate() {
+ return updateDate;
+ }
+
+ public void setUpdateDate(Date updateDate) {
+ this.updateDate = updateDate;
+ }
+
+ public String getUpdateBy() {
+ return updateBy;
+ }
+
+ public void setUpdateBy(String updateBy) {
+ this.updateBy = updateBy;
+ }
+
+ public Date getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(Date reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public Byte getReportStatus() {
+ return reportStatus;
+ }
+
+ public void setReportStatus(Byte reportStatus) {
+ this.reportStatus = reportStatus;
+ }
+
+ public Byte getDataSource() {
+ return dataSource;
+ }
+
+ public void setDataSource(Byte dataSource) {
+ this.dataSource = dataSource;
+ }
+
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/PreventOverhaulLog.java b/src/main/java/com/ruoyi/doublePrevention/entity/PreventOverhaulLog.java
index d7a2395..cb204ce 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/PreventOverhaulLog.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/PreventOverhaulLog.java
@@ -1,95 +1,95 @@
-package com.ruoyi.doublePrevention.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@Data
-@TableName("prevent_overhaul_log")
-public class PreventOverhaulLog implements Serializable {
- private static final long serialVersionUID = -61793617513430361L;
-
- /**
- * 主键id
- * */
- @TableId(value = "id" , type = IdType.AUTO)
- private Long id;
-
-
- private String uuid;
- /**
- * 删除标志：0-有效，1-删除
- */
- private Byte deleteStatus;
- /**
- * 创建时间
- */
- private Date gmtCreate;
- /**
- * 最后修改时间
- */
- private Date gmtModitify;
- /**
- * 创建人
- */
- private String createByUserName;
- /**
- * 修改人
- */
- private String lastEditUserName;
- /**
- * 所属安全风险分析单元id
- */
- private Long riskUnitId;
- /**
- * 所属安全风险分析单元uuid
- */
- private String riskUnitUuid;
- /**
- * 企业id
- */
- private Long enterpriseId;
- /**
- * 企业uuid
- */
- private String enterpriseUuid;
-
- /**
- * 装置停用或者检维修开始时间
- */
- private Date stopStartTime;
- /**
- * 装置停用或者检维修结束时间
- */
- private Date stopEndTime;
- /**
- * 描述停用原因
- */
- private String stopReason;
- /**
- * 风险分析对象编码
- */
- private String hazardCode;
-
- /**
- * 同步时间
- */
- private Date reportTime;
- /**
- * 同步数据修改时间
- */
- private Date updateReportDataTime;
- /**
- * 上报状态 1-待上报；2-已上报；3-不上报
- */
- private Byte reportStatus;
- /**
- * 上报开关 1-上报；2-不上报
- */
- private Byte reportSwitch;
-
-}
+package com.ruoyi.doublePrevention.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("prevent_overhaul_log")
+public class PreventOverhaulLog implements Serializable {
+ private static final long serialVersionUID = -61793617513430361L;
+
+ /**
+ * 主键id
+ * */
+ @TableId(value = "id" , type = IdType.AUTO)
+ private Long id;
+
+
+ private String uuid;
+ /**
+ * 删除标志：0-有效，1-删除
+ */
+ private Byte deleteStatus;
+ /**
+ * 创建时间
+ */
+ private Date gmtCreate;
+ /**
+ * 最后修改时间
+ */
+ private Date gmtModitify;
+ /**
+ * 创建人
+ */
+ private String createByUserName;
+ /**
+ * 修改人
+ */
+ private String lastEditUserName;
+ /**
+ * 所属安全风险分析单元id
+ */
+ private Long riskUnitId;
+ /**
+ * 所属安全风险分析单元uuid
+ */
+ private String riskUnitUuid;
+ /**
+ * 企业id
+ */
+ private Long enterpriseId;
+ /**
+ * 企业uuid
+ */
+ private String enterpriseUuid;
+
+ /**
+ * 装置停用或者检维修开始时间
+ */
+ private Date stopStartTime;
+ /**
+ * 装置停用或者检维修结束时间
+ */
+ private Date stopEndTime;
+ /**
+ * 描述停用原因
+ */
+ private String stopReason;
+ /**
+ * 风险分析对象编码
+ */
+ private String hazardCode;
+
+ /**
+ * 同步时间
+ */
+ private Date reportTime;
+ /**
+ * 同步数据修改时间
+ */
+ private Date updateReportDataTime;
+ /**
+ * 上报状态 1-待上报；2-已上报；3-不上报
+ */
+ private Byte reportStatus;
+ /**
+ * 上报开关 1-上报；2-不上报
+ */
+ private Byte reportSwitch;
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskCheckUnit.java b/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskCheckUnit.java
index 237817e..1b77ae5 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskCheckUnit.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskCheckUnit.java
@@ -1,72 +1,72 @@
-package com.ruoyi.doublePrevention.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-@TableName("prevent_risk_check_unit")
-public class PreventRiskCheckUnit {
-
- /**
- * 主键
- * */
- @TableId(value = "id" , type = IdType.AUTO)
- private Long id;
- /**
- * uuid
- * */
- private String uuid;
- /**
- * 原-检查点id
- * */
- private Long baseCheckPointId;
- /**
- * 管控措施id
- * */
- private Long controlMeasureId;
- /**
- * 风险点-单元-基础清单 id
- * */
- private Long riskId;
-
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getUuid() {
- return uuid;
- }
-
- public void setUuid(String uuid) {
- this.uuid = uuid;
- }
-
- public Long getBaseCheckPointId() {
- return baseCheckPointId;
- }
-
- public void setBaseCheckPointId(Long baseCheckPointId) {
- this.baseCheckPointId = baseCheckPointId;
- }
-
- public Long getControlMeasureId() {
- return controlMeasureId;
- }
-
- public void setControlMeasureId(Long controlMeasureId) {
- this.controlMeasureId = controlMeasureId;
- }
-
- public Long getRiskId() {
- return riskId;
- }
-
- public void setRiskId(Long riskId) {
- this.riskId = riskId;
- }
-}
+package com.ruoyi.doublePrevention.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+@TableName("prevent_risk_check_unit")
+public class PreventRiskCheckUnit {
+
+ /**
+ * 主键
+ * */
+ @TableId(value = "id" , type = IdType.AUTO)
+ private Long id;
+ /**
+ * uuid
+ * */
+ private String uuid;
+ /**
+ * 原-检查点id
+ * */
+ private Long baseCheckPointId;
+ /**
+ * 管控措施id
+ * */
+ private Long controlMeasureId;
+ /**
+ * 风险点-单元-基础清单 id
+ * */
+ private Long riskId;
+
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getUuid() {
+ return uuid;
+ }
+
+ public void setUuid(String uuid) {
+ this.uuid = uuid;
+ }
+
+ public Long getBaseCheckPointId() {
+ return baseCheckPointId;
+ }
+
+ public void setBaseCheckPointId(Long baseCheckPointId) {
+ this.baseCheckPointId = baseCheckPointId;
+ }
+
+ public Long getControlMeasureId() {
+ return controlMeasureId;
+ }
+
+ public void setControlMeasureId(Long controlMeasureId) {
+ this.controlMeasureId = controlMeasureId;
+ }
+
+ public Long getRiskId() {
+ return riskId;
+ }
+
+ public void setRiskId(Long riskId) {
+ this.riskId = riskId;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerCheckAndMeasure.java b/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerCheckAndMeasure.java
index ccdc213..2dacf54 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerCheckAndMeasure.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerCheckAndMeasure.java
@@ -1,47 +1,47 @@
-package com.ruoyi.doublePrevention.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-
-@Data
-@TableName("prevent_risk_danger_check_and_measure")
-public class PreventRiskDangerCheckAndMeasure {
-
- /**
- * 主键
- * */
- @TableId(value = "id" , type = IdType.AUTO)
- private Long id;
- /**
- * 核查任务id
- * */
- private Long checkId;
- /**
- * 核查任务附属表id
- * */
- private Long dangerCheckPointId;
- /**
- * 核查点id
- * */
- private Long baseCheckPointId;
- /**
- * 管控措施id
- * */
- private Long controlMeasureId;
- /**
- * job id
- * */
- private String checkContent;
- /**
- * 排查结果：0-正常，1-存在隐患，2-未处理，3其他
- * */
- private Byte checkResult;
- /**
- * 排查上报信息
- * */
- private String checkDesc;
-
-}
+package com.ruoyi.doublePrevention.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+
+@Data
+@TableName("prevent_risk_danger_check_and_measure")
+public class PreventRiskDangerCheckAndMeasure {
+
+ /**
+ * 主键
+ * */
+ @TableId(value = "id" , type = IdType.AUTO)
+ private Long id;
+ /**
+ * 核查任务id
+ * */
+ private Long checkId;
+ /**
+ * 核查任务附属表id
+ * */
+ private Long dangerCheckPointId;
+ /**
+ * 核查点id
+ * */
+ private Long baseCheckPointId;
+ /**
+ * 管控措施id
+ * */
+ private Long controlMeasureId;
+ /**
+ * job id
+ * */
+ private String checkContent;
+ /**
+ * 排查结果：0-正常，1-存在隐患，2-未处理，3其他
+ * */
+ private Byte checkResult;
+ /**
+ * 排查上报信息
+ * */
+ private String checkDesc;
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerCheckLog.java b/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerCheckLog.java
index 4844819..af6db6d 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerCheckLog.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerCheckLog.java
@@ -1,54 +1,54 @@
-package com.ruoyi.doublePrevention.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-@Data
-@TableName("prevent_risk_danger_check_log")
-public class PreventRiskDangerCheckLog {
-
- /**
- * 主键
- * */
- @TableId(value = "id" , type = IdType.AUTO)
- private Long id;
- /**
- * uuid
- * */
- private String uuid;
- /**
- * 排查任务id
- * */
- private Long checkId;
- /**
- * 排查结果：0-正常，1-存在隐患，2-未处理，3其他
- * */
- private Byte checkStatus;
- /**
- * job id
- * */
- private Long jobId;
- /**
- * 同步时间
- */
- private Date reportTime;
- /**
- * 同步数据修改时间
- */
- private Date updateReportDataTime;
- /**
- * 上报状态 1-待上报；2-已上报；3-不上报；4-变更需上传
- */
- private Byte reportStatus;
- /**
- * 上报开关 1-上报；2-不上报
- */
- private Byte reportSwitch;
-
- private Long mobileCode;
-
- private Long dangerCheckPointId;
-}
+package com.ruoyi.doublePrevention.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+@Data
+@TableName("prevent_risk_danger_check_log")
+public class PreventRiskDangerCheckLog {
+
+ /**
+ * 主键
+ * */
+ @TableId(value = "id" , type = IdType.AUTO)
+ private Long id;
+ /**
+ * uuid
+ * */
+ private String uuid;
+ /**
+ * 排查任务id
+ * */
+ private Long checkId;
+ /**
+ * 排查结果：0-正常，1-存在隐患，2-未处理，3其他
+ * */
+ private Byte checkStatus;
+ /**
+ * job id
+ * */
+ private Long jobId;
+ /**
+ * 同步时间
+ */
+ private Date reportTime;
+ /**
+ * 同步数据修改时间
+ */
+ private Date updateReportDataTime;
+ /**
+ * 上报状态 1-待上报；2-已上报；3-不上报；4-变更需上传
+ */
+ private Byte reportStatus;
+ /**
+ * 上报开关 1-上报；2-不上报
+ */
+ private Byte reportSwitch;
+
+ private Long mobileCode;
+
+ private Long dangerCheckPointId;
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerConfirmLog.java b/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerConfirmLog.java
index 97cdf98..873677e 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerConfirmLog.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerConfirmLog.java
@@ -1,31 +1,31 @@
-package com.ruoyi.doublePrevention.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-@TableName("prevent_risk_danger_confirm_log")
-public class PreventRiskDangerConfirmLog {
-
- /**
- * 主键
- * */
- @TableId(value = "id" , type = IdType.AUTO)
- private Long id;
-
- private Long dangerCheckPointId;
-
- private Long confirmUserId;
-
- private String confirmUser;
-
- private LocalDateTime confirmTime;
-
- private Integer confirmResult;
-
- private String confirmOpinion;
-}
+package com.ruoyi.doublePrevention.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@TableName("prevent_risk_danger_confirm_log")
+public class PreventRiskDangerConfirmLog {
+
+ /**
+ * 主键
+ * */
+ @TableId(value = "id" , type = IdType.AUTO)
+ private Long id;
+
+ private Long dangerCheckPointId;
+
+ private Long confirmUserId;
+
+ private String confirmUser;
+
+ private LocalDateTime confirmTime;
+
+ private Integer confirmResult;
+
+ private String confirmOpinion;
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerInfo.java b/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerInfo.java
index 0644d37..920a712 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerInfo.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskDangerInfo.java
@@ -1,83 +1,83 @@
-package com.ruoyi.doublePrevention.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-
-import java.util.Date;
-@Data
-public class PreventRiskDangerInfo {
-
- /**
- * 主键
- * */
- @TableId(value = "id" , type = IdType.AUTO)
- private Long id;
- /**
- * Uuid
- * */
- private String Uuid;
- /**
- * 核查任务附属表id
- * */
- private Long dangerCheckPointId;
- /**
- * hazard_code 风先分析对象编码（风险分析单元编码）
- * */
- private String hazardCode;
- /**
- * 隐患来源
- * 1-日常排查；2-综合性排查；3-专业性排查;4-季节性排查；5-重点时段及节假日前排查
- * 6-事故类比排查；7-复产复工前排查;8-外聘专家诊断式排查；9-管控措施实效;10-其他
- * */
- private Byte dangerSrc;
- /**
- * 隐患描述
- * */
- private String dangerDesc;
- /**
- * 隐患产生的原因
- * */
- private String dangerReason;
- /**
- * 隐患类型
- * 1-安全；2-工艺；3-电气；4-仪表
- * 5-消防；6-总图；7-设备；8其他
- * */
- private Byte hazardDangerType;
- /**
- * 隐患状态
- * 0-整改中
- * 1-待验收
- * 2-延期整改
- * 3-超期未整改
- * 9-已验收
- */
- private Byte dangerState;
- /**
- * 延期标识 1-正常；2-延期；
- * */
- private Byte timeoutFlag;
- /**
- * 隐患造成的结果：1-无；2-轻伤；3-重伤；4-死亡
- */
- private Byte dangerResult;
- /**
- * 同步时间
- */
- private Date reportTime;
- /**
- * 同步数据修改时间
- */
- private Date updateReportDataTime;
- /**
- * 上报状态 1-待上报；2-已上报；3-不上报；4-变更需上传
- */
- private Byte reportStatus;
- /**
- * 上报开关 1-上报；2-不上报
- */
- private Byte reportSwitch;
-
-
-}
+package com.ruoyi.doublePrevention.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import java.util.Date;
+@Data
+public class PreventRiskDangerInfo {
+
+ /**
+ * 主键
+ * */
+ @TableId(value = "id" , type = IdType.AUTO)
+ private Long id;
+ /**
+ * Uuid
+ * */
+ private String Uuid;
+ /**
+ * 核查任务附属表id
+ * */
+ private Long dangerCheckPointId;
+ /**
+ * hazard_code 风先分析对象编码（风险分析单元编码）
+ * */
+ private String hazardCode;
+ /**
+ * 隐患来源
+ * 1-日常排查；2-综合性排查；3-专业性排查;4-季节性排查；5-重点时段及节假日前排查
+ * 6-事故类比排查；7-复产复工前排查;8-外聘专家诊断式排查；9-管控措施实效;10-其他
+ * */
+ private Byte dangerSrc;
+ /**
+ * 隐患描述
+ * */
+ private String dangerDesc;
+ /**
+ * 隐患产生的原因
+ * */
+ private String dangerReason;
+ /**
+ * 隐患类型
+ * 1-安全；2-工艺；3-电气；4-仪表
+ * 5-消防；6-总图；7-设备；8其他
+ * */
+ private Byte hazardDangerType;
+ /**
+ * 隐患状态
+ * 0-整改中
+ * 1-待验收
+ * 2-延期整改
+ * 3-超期未整改
+ * 9-已验收
+ */
+ private Byte dangerState;
+ /**
+ * 延期标识 1-正常；2-延期；
+ * */
+ private Byte timeoutFlag;
+ /**
+ * 隐患造成的结果：1-无；2-轻伤；3-重伤；4-死亡
+ */
+ private Byte dangerResult;
+ /**
+ * 同步时间
+ */
+ private Date reportTime;
+ /**
+ * 同步数据修改时间
+ */
+ private Date updateReportDataTime;
+ /**
+ * 上报状态 1-待上报；2-已上报；3-不上报；4-变更需上传
+ */
+ private Byte reportStatus;
+ /**
+ * 上报开关 1-上报；2-不上报
+ */
+ private Byte reportSwitch;
+
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskJobAndMeasure.java b/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskJobAndMeasure.java
index 26af45e..87e3149 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskJobAndMeasure.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskJobAndMeasure.java
@@ -1,121 +1,121 @@
-package com.ruoyi.doublePrevention.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
-
-@TableName("prevent_risk_job_and_measure")
-public class PreventRiskJobAndMeasure {
-
- /**
- * 主键
- * */
- @TableId(value = "id" , type = IdType.AUTO)
- private Long id;
- /**
- * job ID
- * */
- private Long jobId;
- /**
- * job uuid
- * */
- private String jobUuid;
- /**
- * 管控措施 ID
- * */
- private Long measureId;
- /**
- * 管控措施 uuid
- * */
- private String measureUuid;
- /**
- * 同步时间
- */
- private Date reportTime;
- /**
- * 同步数据修改时间
- */
- private Date updateReportDataTime;
- /**
- * 上报状态 1-待上报；2-已上报；3-不上报；4-变更需上传
- */
- private Byte reportStatus;
- /**
- * 上报开关 1-上报；2-不上报
- */
- private Byte reportSwitch;
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public Long getJobId() {
- return jobId;
- }
-
- public void setJobId(Long jobId) {
- this.jobId = jobId;
- }
-
- public String getJobUuid() {
- return jobUuid;
- }
-
- public void setJobUuid(String jobUuid) {
- this.jobUuid = jobUuid;
- }
-
- public Long getMeasureId() {
- return measureId;
- }
-
- public void setMeasureId(Long measureId) {
- this.measureId = measureId;
- }
-
- public String getMeasureUuid() {
- return measureUuid;
- }
-
- public void setMeasureUuid(String measureUuid) {
- this.measureUuid = measureUuid;
- }
-
- public Date getReportTime() {
- return reportTime;
- }
-
- public void setReportTime(Date reportTime) {
- this.reportTime = reportTime;
- }
-
- public Date getUpdateReportDataTime() {
- return updateReportDataTime;
- }
-
- public void setUpdateReportDataTime(Date updateReportDataTime) {
- this.updateReportDataTime = updateReportDataTime;
- }
-
- public Byte getReportStatus() {
- return reportStatus;
- }
-
- public void setReportStatus(Byte reportStatus) {
- this.reportStatus = reportStatus;
- }
-
- public Byte getReportSwitch() {
- return reportSwitch;
- }
-
- public void setReportSwitch(Byte reportSwitch) {
- this.reportSwitch = reportSwitch;
- }
-}
+package com.ruoyi.doublePrevention.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
+
+@TableName("prevent_risk_job_and_measure")
+public class PreventRiskJobAndMeasure {
+
+ /**
+ * 主键
+ * */
+ @TableId(value = "id" , type = IdType.AUTO)
+ private Long id;
+ /**
+ * job ID
+ * */
+ private Long jobId;
+ /**
+ * job uuid
+ * */
+ private String jobUuid;
+ /**
+ * 管控措施 ID
+ * */
+ private Long measureId;
+ /**
+ * 管控措施 uuid
+ * */
+ private String measureUuid;
+ /**
+ * 同步时间
+ */
+ private Date reportTime;
+ /**
+ * 同步数据修改时间
+ */
+ private Date updateReportDataTime;
+ /**
+ * 上报状态 1-待上报；2-已上报；3-不上报；4-变更需上传
+ */
+ private Byte reportStatus;
+ /**
+ * 上报开关 1-上报；2-不上报
+ */
+ private Byte reportSwitch;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Long getJobId() {
+ return jobId;
+ }
+
+ public void setJobId(Long jobId) {
+ this.jobId = jobId;
+ }
+
+ public String getJobUuid() {
+ return jobUuid;
+ }
+
+ public void setJobUuid(String jobUuid) {
+ this.jobUuid = jobUuid;
+ }
+
+ public Long getMeasureId() {
+ return measureId;
+ }
+
+ public void setMeasureId(Long measureId) {
+ this.measureId = measureId;
+ }
+
+ public String getMeasureUuid() {
+ return measureUuid;
+ }
+
+ public void setMeasureUuid(String measureUuid) {
+ this.measureUuid = measureUuid;
+ }
+
+ public Date getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(Date reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public Date getUpdateReportDataTime() {
+ return updateReportDataTime;
+ }
+
+ public void setUpdateReportDataTime(Date updateReportDataTime) {
+ this.updateReportDataTime = updateReportDataTime;
+ }
+
+ public Byte getReportStatus() {
+ return reportStatus;
+ }
+
+ public void setReportStatus(Byte reportStatus) {
+ this.reportStatus = reportStatus;
+ }
+
+ public Byte getReportSwitch() {
+ return reportSwitch;
+ }
+
+ public void setReportSwitch(Byte reportSwitch) {
+ this.reportSwitch = reportSwitch;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskUnitUuid.java b/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskUnitUuid.java
index d1fb278..e15f499 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskUnitUuid.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/PreventRiskUnitUuid.java
@@ -1,97 +1,97 @@
-package com.ruoyi.doublePrevention.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
-
-@TableName("prevent_risk_unit_uuid")
-public class PreventRiskUnitUuid {
-
- /**
- * 主键
- * */
- @TableId(value = "id" , type = IdType.AUTO)
- private Long id;
- /**
- * 风险分析单元（设施区域）id
- * */
- private Long riskUnitId;
- /**
- * 风险分析单元（设施区域）Uuid
- * */
- private String riskUnitUuid;
- /**
- * 同步时间
- */
- private Date reportTime;
- /**
- * 同步数据修改时间
- */
- private Date updateReportDataTime;
- /**
- * 上报状态 1-待上报；2-已上报；3-不上报；4-变更需上传
- */
- private Byte reportStatus;
- /**
- * 上报开关 1-上报；2-不上报
- */
- private Byte reportSwitch;
-
- public Date getReportTime() {
- return reportTime;
- }
-
- public void setReportTime(Date reportTime) {
- this.reportTime = reportTime;
- }
-
- public Date getUpdateReportDataTime() {
- return updateReportDataTime;
- }
-
- public void setUpdateReportDataTime(Date updateReportDataTime) {
- this.updateReportDataTime = updateReportDataTime;
- }
-
- public Byte getReportStatus() {
- return reportStatus;
- }
-
- public void setReportStatus(Byte reportStatus) {
- this.reportStatus = reportStatus;
- }
-
- public Byte getReportSwitch() {
- return reportSwitch;
- }
-
- public void setReportSwitch(Byte reportSwitch) {
- this.reportSwitch = reportSwitch;
- }
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public Long getRiskUnitId() {
- return riskUnitId;
- }
-
- public void setRiskUnitId(Long riskUnitId) {
- this.riskUnitId = riskUnitId;
- }
-
- public String getRiskUnitUuid() {
- return riskUnitUuid;
- }
-
- public void setRiskUnitUuid(String riskUnitUuid) {
- this.riskUnitUuid = riskUnitUuid;
- }
-}
+package com.ruoyi.doublePrevention.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
+
+@TableName("prevent_risk_unit_uuid")
+public class PreventRiskUnitUuid {
+
+ /**
+ * 主键
+ * */
+ @TableId(value = "id" , type = IdType.AUTO)
+ private Long id;
+ /**
+ * 风险分析单元（设施区域）id
+ * */
+ private Long riskUnitId;
+ /**
+ * 风险分析单元（设施区域）Uuid
+ * */
+ private String riskUnitUuid;
+ /**
+ * 同步时间
+ */
+ private Date reportTime;
+ /**
+ * 同步数据修改时间
+ */
+ private Date updateReportDataTime;
+ /**
+ * 上报状态 1-待上报；2-已上报；3-不上报；4-变更需上传
+ */
+ private Byte reportStatus;
+ /**
+ * 上报开关 1-上报；2-不上报
+ */
+ private Byte reportSwitch;
+
+ public Date getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(Date reportTime) {
+ this.reportTime = reportTime;
+ }
+
+ public Date getUpdateReportDataTime() {
+ return updateReportDataTime;
+ }
+
+ public void setUpdateReportDataTime(Date updateReportDataTime) {
+ this.updateReportDataTime = updateReportDataTime;
+ }
+
+ public Byte getReportStatus() {
+ return reportStatus;
+ }
+
+ public void setReportStatus(Byte reportStatus) {
+ this.reportStatus = reportStatus;
+ }
+
+ public Byte getReportSwitch() {
+ return reportSwitch;
+ }
+
+ public void setReportSwitch(Byte reportSwitch) {
+ this.reportSwitch = reportSwitch;
+ }
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Long getRiskUnitId() {
+ return riskUnitId;
+ }
+
+ public void setRiskUnitId(Long riskUnitId) {
+ this.riskUnitId = riskUnitId;
+ }
+
+ public String getRiskUnitUuid() {
+ return riskUnitUuid;
+ }
+
+ public void setRiskUnitUuid(String riskUnitUuid) {
+ this.riskUnitUuid = riskUnitUuid;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/PreventTaskType.java b/src/main/java/com/ruoyi/doublePrevention/entity/PreventTaskType.java
index cb22dc5..854dbe2 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/PreventTaskType.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/PreventTaskType.java
@@ -1,83 +1,83 @@
-package com.ruoyi.doublePrevention.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-@TableName("prevent_task_type")
-public class PreventTaskType {
- /**
- * 主键id
- * */
- @TableId(value = "id" , type = IdType.AUTO)
- private Long id;
-
- private Long jobId;
-
- private String jobName;
-
- private Long taskId;
-
- private String jobUuid;
-
- private Byte type;
-
- private Byte deleteStatus;
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public Long getJobId() {
- return jobId;
- }
-
- public void setJobId(Long jobId) {
- this.jobId = jobId;
- }
-
- public String getJobName() {
- return jobName;
- }
-
- public void setJobName(String jobName) {
- this.jobName = jobName;
- }
-
- public Long getTaskId() {
- return taskId;
- }
-
- public void setTaskId(Long taskId) {
- this.taskId = taskId;
- }
-
- public String getJobUuid() {
- return jobUuid;
- }
-
- public void setJobUuid(String jobUuid) {
- this.jobUuid = jobUuid;
- }
-
- public Byte getType() {
- return type;
- }
-
- public void setType(Byte type) {
- this.type = type;
- }
-
- public Byte getDeleteStatus() {
- return deleteStatus;
- }
-
- public void setDeleteStatus(Byte deleteStatus) {
- this.deleteStatus = deleteStatus;
- }
+package com.ruoyi.doublePrevention.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@TableName("prevent_task_type")
+public class PreventTaskType {
+ /**
+ * 主键id
+ * */
+ @TableId(value = "id" , type = IdType.AUTO)
+ private Long id;
+
+ private Long jobId;
+
+ private String jobName;
+
+ private Long taskId;
+
+ private String jobUuid;
+
+ private Byte type;
+
+ private Byte deleteStatus;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Long getJobId() {
+ return jobId;
+ }
+
+ public void setJobId(Long jobId) {
+ this.jobId = jobId;
+ }
+
+ public String getJobName() {
+ return jobName;
+ }
+
+ public void setJobName(String jobName) {
+ this.jobName = jobName;
+ }
+
+ public Long getTaskId() {
+ return taskId;
+ }
+
+ public void setTaskId(Long taskId) {
+ this.taskId = taskId;
+ }
+
+ public String getJobUuid() {
+ return jobUuid;
+ }
+
+ public void setJobUuid(String jobUuid) {
+ this.jobUuid = jobUuid;
+ }
+
+ public Byte getType() {
+ return type;
+ }
+
+ public void setType(Byte type) {
+ this.type = type;
+ }
+
+ public Byte getDeleteStatus() {
+ return deleteStatus;
+ }
+
+ public void setDeleteStatus(Byte deleteStatus) {
+ this.deleteStatus = deleteStatus;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/PreventTaskUnitAndMeasure.java b/src/main/java/com/ruoyi/doublePrevention/entity/PreventTaskUnitAndMeasure.java
index cc66760..827b3eb 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/PreventTaskUnitAndMeasure.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/PreventTaskUnitAndMeasure.java
@@ -1,133 +1,133 @@
-package com.ruoyi.doublePrevention.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
-
-@TableName("prevent_task_unit_and_measure")
-public class PreventTaskUnitAndMeasure {
- /**
- * 主键id
- * */
- @TableId(value = "id" , type = IdType.AUTO)
- private Long id;
- /**
- * 排查任务Id
- * */
- private Long taskUnitId;
- /**
- * 管控措施Id
- * */
- private Long measureId;
- /**
- * 排查任务UUID
- * */
- private String taskUnitUuid;
- /**
- * 管控措施UUID
- * */
- private String measureUuid;
- /**
- * 创建时间
- */
- private Date gmtCreate;
- /**
- * 最后修改时间
- */
- private Date gmtModitify;
- /**
- * 创建人
- */
- private String createByUserName;
- /**
- * 修改人
- */
- private String lastEditUserName;
- /**
- * 删除标志：0-有效，1-删除
- */
- private Byte deleteStatus;
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public Long getTaskUnitId() {
- return taskUnitId;
- }
-
- public void setTaskUnitId(Long taskUnitId) {
- this.taskUnitId = taskUnitId;
- }
-
- public Long getMeasureId() {
- return measureId;
- }
-
- public void setMeasureId(Long measureId) {
- this.measureId = measureId;
- }
-
- public String getTaskUnitUuid() {
- return taskUnitUuid;
- }
-
- public void setTaskUnitUuid(String taskUnitUuid) {
- this.taskUnitUuid = taskUnitUuid;
- }
-
- public String getMeasureUuid() {
- return measureUuid;
- }
-
- public void setMeasureUuid(String measureUuid) {
- this.measureUuid = measureUuid;
- }
-
- public Date getGmtCreate() {
- return gmtCreate;
- }
-
- public void setGmtCreate(Date gmtCreate) {
- this.gmtCreate = gmtCreate;
- }
-
- public Date getGmtModitify() {
- return gmtModitify;
- }
-
- public void setGmtModitify(Date gmtModitify) {
- this.gmtModitify = gmtModitify;
- }
-
- public String getCreateByUserName() {
- return createByUserName;
- }
-
- public void setCreateByUserName(String createByUserName) {
- this.createByUserName = createByUserName;
- }
-
- public String getLastEditUserName() {
- return lastEditUserName;
- }
-
- public void setLastEditUserName(String lastEditUserName) {
- this.lastEditUserName = lastEditUserName;
- }
-
- public Byte getDeleteStatus() {
- return deleteStatus;
- }
-
- public void setDeleteStatus(Byte deleteStatus) {
- this.deleteStatus = deleteStatus;
- }
-
+package com.ruoyi.doublePrevention.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
+
+@TableName("prevent_task_unit_and_measure")
+public class PreventTaskUnitAndMeasure {
+ /**
+ * 主键id
+ * */
+ @TableId(value = "id" , type = IdType.AUTO)
+ private Long id;
+ /**
+ * 排查任务Id
+ * */
+ private Long taskUnitId;
+ /**
+ * 管控措施Id
+ * */
+ private Long measureId;
+ /**
+ * 排查任务UUID
+ * */
+ private String taskUnitUuid;
+ /**
+ * 管控措施UUID
+ * */
+ private String measureUuid;
+ /**
+ * 创建时间
+ */
+ private Date gmtCreate;
+ /**
+ * 最后修改时间
+ */
+ private Date gmtModitify;
+ /**
+ * 创建人
+ */
+ private String createByUserName;
+ /**
+ * 修改人
+ */
+ private String lastEditUserName;
+ /**
+ * 删除标志：0-有效，1-删除
+ */
+ private Byte deleteStatus;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Long getTaskUnitId() {
+ return taskUnitId;
+ }
+
+ public void setTaskUnitId(Long taskUnitId) {
+ this.taskUnitId = taskUnitId;
+ }
+
+ public Long getMeasureId() {
+ return measureId;
+ }
+
+ public void setMeasureId(Long measureId) {
+ this.measureId = measureId;
+ }
+
+ public String getTaskUnitUuid() {
+ return taskUnitUuid;
+ }
+
+ public void setTaskUnitUuid(String taskUnitUuid) {
+ this.taskUnitUuid = taskUnitUuid;
+ }
+
+ public String getMeasureUuid() {
+ return measureUuid;
+ }
+
+ public void setMeasureUuid(String measureUuid) {
+ this.measureUuid = measureUuid;
+ }
+
+ public Date getGmtCreate() {
+ return gmtCreate;
+ }
+
+ public void setGmtCreate(Date gmtCreate) {
+ this.gmtCreate = gmtCreate;
+ }
+
+ public Date getGmtModitify() {
+ return gmtModitify;
+ }
+
+ public void setGmtModitify(Date gmtModitify) {
+ this.gmtModitify = gmtModitify;
+ }
+
+ public String getCreateByUserName() {
+ return createByUserName;
+ }
+
+ public void setCreateByUserName(String createByUserName) {
+ this.createByUserName = createByUserName;
+ }
+
+ public String getLastEditUserName() {
+ return lastEditUserName;
+ }
+
+ public void setLastEditUserName(String lastEditUserName) {
+ this.lastEditUserName = lastEditUserName;
+ }
+
+ public Byte getDeleteStatus() {
+ return deleteStatus;
+ }
+
+ public void setDeleteStatus(Byte deleteStatus) {
+ this.deleteStatus = deleteStatus;
+ }
+
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/RiskAndPeopleInfo.java b/src/main/java/com/ruoyi/doublePrevention/entity/RiskAndPeopleInfo.java
index 0c40994..0c230a3 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/RiskAndPeopleInfo.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/RiskAndPeopleInfo.java
@@ -1,160 +1,160 @@
-package com.ruoyi.doublePrevention.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 包保责任制
- */
-@Data
-@TableName("risk_and_people_info")
-public class RiskAndPeopleInfo implements Serializable {
- private static final long serialVersionUID = -61793617513430361L;
-
- @TableId(value = "id" , type = IdType.AUTO)
- private Long id;
- /**
- * 行政区划
- */
- private String areaCode;
- /**
- * 公司名称
- */
- private String companyName;
- /**
- * 企业类型
- */
- private String companyNature;
- /**
- * 企业类型名称
- */
- private String companyNatureName;
- /**
- *
- */
- private String hazardId;
- /**
- * 危险源编码
- */
- private String hazardCode;
- /**
- * 危险源名称
- */
- private String hazardName;
- /**
- * 风险等级（数字）
- */
- private String hazardRank;
- /**
- * 风险等级（汉字）
- */
- private String hazardRankName;
- /**
- * 园区名称
- */
- private String parkName;
-
- /**
- *主要责任人id
- */
- private Long mainLiabilityPersonId;
- /**
- * 主要责任人姓名
- */
- private String mainLiabilityPersonName;
- /**
- * 主要责任人类型
- */
- private String mainLiabilityPersonType;
- /**
- * 主要责任人电话
- */
- private Long mainLiabilityPersonPhone;
- /**
- * 主要责任人职务
- */
- private String mainLiabilityPersonJob;
- /**
- * 主要责任人任务
- */
- private String mainLiabilityPersonWork;
-
- /**
- *技术责任人id
- */
- private Long technologyLiabilityPersonId;
- /**
- * 技术责任人姓名
- */
- private String technologyLiabilityPersonName;
- /**
- * 技术责任人类型
- */
- private String technologyLiabilityPersonType;
- /**
- * 技术责任人电话
- */
- private Long technologyLiabilityPersonPhone;
- /**
- * 技术责任人职务
- */
- private String technologyLiabilityPersonJob;
- /**
- * 技术责任人任务
- */
- private String technologyLiabilityPersonWork;
-
- /**
- *操作责任人id
- */
- private Long handleLiabilityPersonId;
- /**
- * 操作责任人姓名
- */
- private String handleLiabilityPersonName;
- /**
- * 操作责任人类型
- */
- private String handleLiabilityPersonType;
- /**
- * 操作责任人电话
- */
- private Long handleLiabilityPersonPhone;
- /**
- * 操作责任人职务
- */
- private String handleLiabilityPersonJob;
- /**
- * 操作责任人任务
- */
- private String handleLiabilityPersonWork;
-
-
-
- /**
- * 创建时间
- */
- private Date gmtCreate;
- /**
- * 最后修改时间
- */
- private Date gmtModitify;
- /**
- * 创建人
- */
- private String createByUserName;
- /**
- * 修改人
- */
- private String lastEditUserName;
- /**
- * 删除标志：0-有效，1-删除
- */
- private Byte deleteStatus;
-}
-
+package com.ruoyi.doublePrevention.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 包保责任制
+ */
+@Data
+@TableName("risk_and_people_info")
+public class RiskAndPeopleInfo implements Serializable {
+ private static final long serialVersionUID = -61793617513430361L;
+
+ @TableId(value = "id" , type = IdType.AUTO)
+ private Long id;
+ /**
+ * 行政区划
+ */
+ private String areaCode;
+ /**
+ * 公司名称
+ */
+ private String companyName;
+ /**
+ * 企业类型
+ */
+ private String companyNature;
+ /**
+ * 企业类型名称
+ */
+ private String companyNatureName;
+ /**
+ *
+ */
+ private String hazardId;
+ /**
+ * 危险源编码
+ */
+ private String hazardCode;
+ /**
+ * 危险源名称
+ */
+ private String hazardName;
+ /**
+ * 风险等级（数字）
+ */
+ private String hazardRank;
+ /**
+ * 风险等级（汉字）
+ */
+ private String hazardRankName;
+ /**
+ * 园区名称
+ */
+ private String parkName;
+
+ /**
+ *主要责任人id
+ */
+ private Long mainLiabilityPersonId;
+ /**
+ * 主要责任人姓名
+ */
+ private String mainLiabilityPersonName;
+ /**
+ * 主要责任人类型
+ */
+ private String mainLiabilityPersonType;
+ /**
+ * 主要责任人电话
+ */
+ private Long mainLiabilityPersonPhone;
+ /**
+ * 主要责任人职务
+ */
+ private String mainLiabilityPersonJob;
+ /**
+ * 主要责任人任务
+ */
+ private String mainLiabilityPersonWork;
+
+ /**
+ *技术责任人id
+ */
+ private Long technologyLiabilityPersonId;
+ /**
+ * 技术责任人姓名
+ */
+ private String technologyLiabilityPersonName;
+ /**
+ * 技术责任人类型
+ */
+ private String technologyLiabilityPersonType;
+ /**
+ * 技术责任人电话
+ */
+ private Long technologyLiabilityPersonPhone;
+ /**
+ * 技术责任人职务
+ */
+ private String technologyLiabilityPersonJob;
+ /**
+ * 技术责任人任务
+ */
+ private String technologyLiabilityPersonWork;
+
+ /**
+ *操作责任人id
+ */
+ private Long handleLiabilityPersonId;
+ /**
+ * 操作责任人姓名
+ */
+ private String handleLiabilityPersonName;
+ /**
+ * 操作责任人类型
+ */
+ private String handleLiabilityPersonType;
+ /**
+ * 操作责任人电话
+ */
+ private Long handleLiabilityPersonPhone;
+ /**
+ * 操作责任人职务
+ */
+ private String handleLiabilityPersonJob;
+ /**
+ * 操作责任人任务
+ */
+ private String handleLiabilityPersonWork;
+
+
+
+ /**
+ * 创建时间
+ */
+ private Date gmtCreate;
+ /**
+ * 最后修改时间
+ */
+ private Date gmtModitify;
+ /**
+ * 创建人
+ */
+ private String createByUserName;
+ /**
+ * 修改人
+ */
+ private String lastEditUserName;
+ /**
+ * 删除标志：0-有效，1-删除
+ */
+ private Byte deleteStatus;
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/RiskOldInfo.java b/src/main/java/com/ruoyi/doublePrevention/entity/RiskOldInfo.java
index 2d676ce..a10326e 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/RiskOldInfo.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/RiskOldInfo.java
@@ -1,608 +1,608 @@
-package com.ruoyi.doublePrevention.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
-import java.io.Serializable;
-
-/**
- * (RiskOldInfo)实体类
- *
- * @author makejava
- * @since 2023-03-20 15:33:46
- */
-@TableName("risk_old_info")
-public class RiskOldInfo implements Serializable {
- private static final long serialVersionUID = -61793617513430361L;
-
- @TableId(value = "id" , type = IdType.AUTO)
- private Long id;
- /**
- * 2上报人部门
- */
- private String reportDep;
- /**
- * 3上报人职务
- */
- private String reportPeopleJob;
- /**
- * 4上报人
- */
- private String reportPeople;
- /**
- * 5发现人
- */
- private String findPeople;
- /**
- * 6发现时间
- */
- private Date findTime;
- /**
- * 7隐患内容
- */
- private String riskDesc;
- /**
- * 8隐患位置
- */
- private String riskSite;
- /**
- * 9隐患类型
- */
- private String riskType;
- /**
- * 10隐患级别
- */
- private String riskLevel;
- /**
- * 11隐患所在部门
- */
- private String riskDep;
- /**
- * 12检查类型
- */
- private String checkType;
- /**
- * 13专业
- */
- private String major;
- /**
- * 14责任人部门
- */
- private String liabilityDep;
- /**
- * 15责任人
- */
- private String liabilityPeople;
- /**
- * 16责任人职务
- */
- private String liabilityPeopleJob;
- /**
- * 17整改时间
- */
- private Date rectifyTime;
- /**
- * 18允许延期时间
- */
- private Date rectifyTimeout;
- /**
- * 19负责人部门
- */
- private String leadDep;
- /**
- * 20负责人职务
- */
- private String leadJob;
- /**
- * 21整改人部门
- */
- private String rectifyDep;
- /**
- * 22整改人职务
- */
- private String rectifyPeopleJob;
- /**
- * 23整改人
- */
- private String rectifyPeople;
- /**
- * 24整改措施
- */
- private String rectifyMeasure;
- /**
- * 25整改开始时间
- */
- private Date rectifyStartTime;
- /**
- * 26整改完成时间
- */
- private Date rectifyFinishTime;
- /**
- * 27整改情况
- */
- private String rectifyDesc;
- /**
- * 28资金
- */
- private Double cost;
- /**
- * 29预案
- */
- private String plan;
- /**
- * 30防范措施
- */
- private String precautionMeasure;
- /**
- * 31验收时间
- */
- private Date acceptTime;
- /**
- * 32验收说明
- */
- private String acceptDesc;
- /**
- * 33验收部门
- */
- private String acceptDep;
- /**
- * 34验收人
- */
- private String acceptPeople;
- /**
- * 35验收人职务
- */
- private String acceptPeopleJob;
- /**
- * 36销号人部门
- */
- private String cancelDep;
- /**
- * 37销号人
- */
- private String cancelPeople;
- /**
- * 38销号人职务
- */
- private String cancelPeopleJob;
- /**
- * 39延期申请人
- */
- private String applyPeople;
- /**
- * 40申请时间
- */
- private Date applyTime;
- /**
- * 41申请理由
- */
- private String applyDesc;
- /**
- * 42申请-备注
- */
- private String applyNote;
- /**
- * 43申请延期时间
- */
- private Date applyTimeoutTime;
- /**
- * 44申请处理人
- */
- private String applyDealPeople;
- /**
- * 45申请处理时间
- */
- private Date appleDealTime;
- /**
- * 46流转责任部门
- */
- private String exchangeLeadDep;
- /**
- * 47流转责任人
- */
- private String exchangeLeadPeople;
- /**
- * 48流转责任人职务
- */
- private String exchangeLeadPeopleJob;
- /**
- * 49流转备注
- */
- private String exchangeDesc;
-
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getReportDep() {
- return reportDep;
- }
-
- public void setReportDep(String reportDep) {
- this.reportDep = reportDep;
- }
-
- public String getReportPeopleJob() {
- return reportPeopleJob;
- }
-
- public void setReportPeopleJob(String reportPeopleJob) {
- this.reportPeopleJob = reportPeopleJob;
- }
-
- public String getReportPeople() {
- return reportPeople;
- }
-
- public void setReportPeople(String reportPeople) {
- this.reportPeople = reportPeople;
- }
-
- public String getFindPeople() {
- return findPeople;
- }
-
- public void setFindPeople(String findPeople) {
- this.findPeople = findPeople;
- }
-
- public Date getFindTime() {
- return findTime;
- }
-
- public void setFindTime(Date findTime) {
- this.findTime = findTime;
- }
-
- public String getRiskDesc() {
- return riskDesc;
- }
-
- public void setRiskDesc(String riskDesc) {
- this.riskDesc = riskDesc;
- }
-
- public String getRiskSite() {
- return riskSite;
- }
-
- public void setRiskSite(String riskSite) {
- this.riskSite = riskSite;
- }
-
- public String getRiskType() {
- return riskType;
- }
-
- public void setRiskType(String riskType) {
- this.riskType = riskType;
- }
-
- public String getRiskLevel() {
- return riskLevel;
- }
-
- public void setRiskLevel(String riskLevel) {
- this.riskLevel = riskLevel;
- }
-
- public String getRiskDep() {
- return riskDep;
- }
-
- public void setRiskDep(String riskDep) {
- this.riskDep = riskDep;
- }
-
- public String getCheckType() {
- return checkType;
- }
-
- public void setCheckType(String checkType) {
- this.checkType = checkType;
- }
-
- public String getMajor() {
- return major;
- }
-
- public void setMajor(String major) {
- this.major = major;
- }
-
- public String getLiabilityDep() {
- return liabilityDep;
- }
-
- public void setLiabilityDep(String liabilityDep) {
- this.liabilityDep = liabilityDep;
- }
-
- public String getLiabilityPeople() {
- return liabilityPeople;
- }
-
- public void setLiabilityPeople(String liabilityPeople) {
- this.liabilityPeople = liabilityPeople;
- }
-
- public String getLiabilityPeopleJob() {
- return liabilityPeopleJob;
- }
-
- public void setLiabilityPeopleJob(String liabilityPeopleJob) {
- this.liabilityPeopleJob = liabilityPeopleJob;
- }
-
- public Date getRectifyTime() {
- return rectifyTime;
- }
-
- public void setRectifyTime(Date rectifyTime) {
- this.rectifyTime = rectifyTime;
- }
-
- public Date getRectifyTimeout() {
- return rectifyTimeout;
- }
-
- public void setRectifyTimeout(Date rectifyTimeout) {
- this.rectifyTimeout = rectifyTimeout;
- }
-
- public String getLeadDep() {
- return leadDep;
- }
-
- public void setLeadDep(String leadDep) {
- this.leadDep = leadDep;
- }
-
- public String getLeadJob() {
- return leadJob;
- }
-
- public void setLeadJob(String leadJob) {
- this.leadJob = leadJob;
- }
-
- public String getRectifyDep() {
- return rectifyDep;
- }
-
- public void setRectifyDep(String rectifyDep) {
- this.rectifyDep = rectifyDep;
- }
-
- public String getRectifyPeopleJob() {
- return rectifyPeopleJob;
- }
-
- public void setRectifyPeopleJob(String rectifyPeopleJob) {
- this.rectifyPeopleJob = rectifyPeopleJob;
- }
-
- public String getRectifyPeople() {
- return rectifyPeople;
- }
-
- public void setRectifyPeople(String rectifyPeople) {
- this.rectifyPeople = rectifyPeople;
- }
-
- public String getRectifyMeasure() {
- return rectifyMeasure;
- }
-
- public void setRectifyMeasure(String rectifyMeasure) {
- this.rectifyMeasure = rectifyMeasure;
- }
-
- public Date getRectifyStartTime() {
- return rectifyStartTime;
- }
-
- public void setRectifyStartTime(Date rectifyStartTime) {
- this.rectifyStartTime = rectifyStartTime;
- }
-
- public Date getRectifyFinishTime() {
- return rectifyFinishTime;
- }
-
- public void setRectifyFinishTime(Date rectifyFinishTime) {
- this.rectifyFinishTime = rectifyFinishTime;
- }
-
- public String getRectifyDesc() {
- return rectifyDesc;
- }
-
- public void setRectifyDesc(String rectifyDesc) {
- this.rectifyDesc = rectifyDesc;
- }
-
- public Double getCost() {
- return cost;
- }
-
- public void setCost(Double cost) {
- this.cost = cost;
- }
-
- public String getPlan() {
- return plan;
- }
-
- public void setPlan(String plan) {
- this.plan = plan;
- }
-
- public String getPrecautionMeasure() {
- return precautionMeasure;
- }
-
- public void setPrecautionMeasure(String precautionMeasure) {
- this.precautionMeasure = precautionMeasure;
- }
-
- public Date getAcceptTime() {
- return acceptTime;
- }
-
- public void setAcceptTime(Date acceptTime) {
- this.acceptTime = acceptTime;
- }
-
- public String getAcceptDesc() {
- return acceptDesc;
- }
-
- public void setAcceptDesc(String acceptDesc) {
- this.acceptDesc = acceptDesc;
- }
-
- public String getAcceptDep() {
- return acceptDep;
- }
-
- public void setAcceptDep(String acceptDep) {
- this.acceptDep = acceptDep;
- }
-
- public String getAcceptPeople() {
- return acceptPeople;
- }
-
- public void setAcceptPeople(String acceptPeople) {
- this.acceptPeople = acceptPeople;
- }
-
- public String getAcceptPeopleJob() {
- return acceptPeopleJob;
- }
-
- public void setAcceptPeopleJob(String acceptPeopleJob) {
- this.acceptPeopleJob = acceptPeopleJob;
- }
-
- public String getCancelDep() {
- return cancelDep;
- }
-
- public void setCancelDep(String cancelDep) {
- this.cancelDep = cancelDep;
- }
-
- public String getCancelPeople() {
- return cancelPeople;
- }
-
- public void setCancelPeople(String cancelPeople) {
- this.cancelPeople = cancelPeople;
- }
-
- public String getCancelPeopleJob() {
- return cancelPeopleJob;
- }
-
- public void setCancelPeopleJob(String cancelPeopleJob) {
- this.cancelPeopleJob = cancelPeopleJob;
- }
-
- public String getApplyPeople() {
- return applyPeople;
- }
-
- public void setApplyPeople(String applyPeople) {
- this.applyPeople = applyPeople;
- }
-
- public Date getApplyTime() {
- return applyTime;
- }
-
- public void setApplyTime(Date applyTime) {
- this.applyTime = applyTime;
- }
-
- public String getApplyDesc() {
- return applyDesc;
- }
-
- public void setApplyDesc(String applyDesc) {
- this.applyDesc = applyDesc;
- }
-
- public String getApplyNote() {
- return applyNote;
- }
-
- public void setApplyNote(String applyNote) {
- this.applyNote = applyNote;
- }
-
- public Date getApplyTimeoutTime() {
- return applyTimeoutTime;
- }
-
- public void setApplyTimeoutTime(Date applyTimeoutTime) {
- this.applyTimeoutTime = applyTimeoutTime;
- }
-
- public String getApplyDealPeople() {
- return applyDealPeople;
- }
-
- public void setApplyDealPeople(String applyDealPeople) {
- this.applyDealPeople = applyDealPeople;
- }
-
- public Date getAppleDealTime() {
- return appleDealTime;
- }
-
- public void setAppleDealTime(Date appleDealTime) {
- this.appleDealTime = appleDealTime;
- }
-
- public String getExchangeLeadDep() {
- return exchangeLeadDep;
- }
-
- public void setExchangeLeadDep(String exchangeLeadDep) {
- this.exchangeLeadDep = exchangeLeadDep;
- }
-
- public String getExchangeLeadPeople() {
- return exchangeLeadPeople;
- }
-
- public void setExchangeLeadPeople(String exchangeLeadPeople) {
- this.exchangeLeadPeople = exchangeLeadPeople;
- }
-
- public String getExchangeLeadPeopleJob() {
- return exchangeLeadPeopleJob;
- }
-
- public void setExchangeLeadPeopleJob(String exchangeLeadPeopleJob) {
- this.exchangeLeadPeopleJob = exchangeLeadPeopleJob;
- }
-
- public String getExchangeDesc() {
- return exchangeDesc;
- }
-
- public void setExchangeDesc(String exchangeDesc) {
- this.exchangeDesc = exchangeDesc;
- }
-}
-
+package com.ruoyi.doublePrevention.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * (RiskOldInfo)实体类
+ *
+ * @author makejava
+ * @since 2023-03-20 15:33:46
+ */
+@TableName("risk_old_info")
+public class RiskOldInfo implements Serializable {
+ private static final long serialVersionUID = -61793617513430361L;
+
+ @TableId(value = "id" , type = IdType.AUTO)
+ private Long id;
+ /**
+ * 2上报人部门
+ */
+ private String reportDep;
+ /**
+ * 3上报人职务
+ */
+ private String reportPeopleJob;
+ /**
+ * 4上报人
+ */
+ private String reportPeople;
+ /**
+ * 5发现人
+ */
+ private String findPeople;
+ /**
+ * 6发现时间
+ */
+ private Date findTime;
+ /**
+ * 7隐患内容
+ */
+ private String riskDesc;
+ /**
+ * 8隐患位置
+ */
+ private String riskSite;
+ /**
+ * 9隐患类型
+ */
+ private String riskType;
+ /**
+ * 10隐患级别
+ */
+ private String riskLevel;
+ /**
+ * 11隐患所在部门
+ */
+ private String riskDep;
+ /**
+ * 12检查类型
+ */
+ private String checkType;
+ /**
+ * 13专业
+ */
+ private String major;
+ /**
+ * 14责任人部门
+ */
+ private String liabilityDep;
+ /**
+ * 15责任人
+ */
+ private String liabilityPeople;
+ /**
+ * 16责任人职务
+ */
+ private String liabilityPeopleJob;
+ /**
+ * 17整改时间
+ */
+ private Date rectifyTime;
+ /**
+ * 18允许延期时间
+ */
+ private Date rectifyTimeout;
+ /**
+ * 19负责人部门
+ */
+ private String leadDep;
+ /**
+ * 20负责人职务
+ */
+ private String leadJob;
+ /**
+ * 21整改人部门
+ */
+ private String rectifyDep;
+ /**
+ * 22整改人职务
+ */
+ private String rectifyPeopleJob;
+ /**
+ * 23整改人
+ */
+ private String rectifyPeople;
+ /**
+ * 24整改措施
+ */
+ private String rectifyMeasure;
+ /**
+ * 25整改开始时间
+ */
+ private Date rectifyStartTime;
+ /**
+ * 26整改完成时间
+ */
+ private Date rectifyFinishTime;
+ /**
+ * 27整改情况
+ */
+ private String rectifyDesc;
+ /**
+ * 28资金
+ */
+ private Double cost;
+ /**
+ * 29预案
+ */
+ private String plan;
+ /**
+ * 30防范措施
+ */
+ private String precautionMeasure;
+ /**
+ * 31验收时间
+ */
+ private Date acceptTime;
+ /**
+ * 32验收说明
+ */
+ private String acceptDesc;
+ /**
+ * 33验收部门
+ */
+ private String acceptDep;
+ /**
+ * 34验收人
+ */
+ private String acceptPeople;
+ /**
+ * 35验收人职务
+ */
+ private String acceptPeopleJob;
+ /**
+ * 36销号人部门
+ */
+ private String cancelDep;
+ /**
+ * 37销号人
+ */
+ private String cancelPeople;
+ /**
+ * 38销号人职务
+ */
+ private String cancelPeopleJob;
+ /**
+ * 39延期申请人
+ */
+ private String applyPeople;
+ /**
+ * 40申请时间
+ */
+ private Date applyTime;
+ /**
+ * 41申请理由
+ */
+ private String applyDesc;
+ /**
+ * 42申请-备注
+ */
+ private String applyNote;
+ /**
+ * 43申请延期时间
+ */
+ private Date applyTimeoutTime;
+ /**
+ * 44申请处理人
+ */
+ private String applyDealPeople;
+ /**
+ * 45申请处理时间
+ */
+ private Date appleDealTime;
+ /**
+ * 46流转责任部门
+ */
+ private String exchangeLeadDep;
+ /**
+ * 47流转责任人
+ */
+ private String exchangeLeadPeople;
+ /**
+ * 48流转责任人职务
+ */
+ private String exchangeLeadPeopleJob;
+ /**
+ * 49流转备注
+ */
+ private String exchangeDesc;
+
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public String getReportDep() {
+ return reportDep;
+ }
+
+ public void setReportDep(String reportDep) {
+ this.reportDep = reportDep;
+ }
+
+ public String getReportPeopleJob() {
+ return reportPeopleJob;
+ }
+
+ public void setReportPeopleJob(String reportPeopleJob) {
+ this.reportPeopleJob = reportPeopleJob;
+ }
+
+ public String getReportPeople() {
+ return reportPeople;
+ }
+
+ public void setReportPeople(String reportPeople) {
+ this.reportPeople = reportPeople;
+ }
+
+ public String getFindPeople() {
+ return findPeople;
+ }
+
+ public void setFindPeople(String findPeople) {
+ this.findPeople = findPeople;
+ }
+
+ public Date getFindTime() {
+ return findTime;
+ }
+
+ public void setFindTime(Date findTime) {
+ this.findTime = findTime;
+ }
+
+ public String getRiskDesc() {
+ return riskDesc;
+ }
+
+ public void setRiskDesc(String riskDesc) {
+ this.riskDesc = riskDesc;
+ }
+
+ public String getRiskSite() {
+ return riskSite;
+ }
+
+ public void setRiskSite(String riskSite) {
+ this.riskSite = riskSite;
+ }
+
+ public String getRiskType() {
+ return riskType;
+ }
+
+ public void setRiskType(String riskType) {
+ this.riskType = riskType;
+ }
+
+ public String getRiskLevel() {
+ return riskLevel;
+ }
+
+ public void setRiskLevel(String riskLevel) {
+ this.riskLevel = riskLevel;
+ }
+
+ public String getRiskDep() {
+ return riskDep;
+ }
+
+ public void setRiskDep(String riskDep) {
+ this.riskDep = riskDep;
+ }
+
+ public String getCheckType() {
+ return checkType;
+ }
+
+ public void setCheckType(String checkType) {
+ this.checkType = checkType;
+ }
+
+ public String getMajor() {
+ return major;
+ }
+
+ public void setMajor(String major) {
+ this.major = major;
+ }
+
+ public String getLiabilityDep() {
+ return liabilityDep;
+ }
+
+ public void setLiabilityDep(String liabilityDep) {
+ this.liabilityDep = liabilityDep;
+ }
+
+ public String getLiabilityPeople() {
+ return liabilityPeople;
+ }
+
+ public void setLiabilityPeople(String liabilityPeople) {
+ this.liabilityPeople = liabilityPeople;
+ }
+
+ public String getLiabilityPeopleJob() {
+ return liabilityPeopleJob;
+ }
+
+ public void setLiabilityPeopleJob(String liabilityPeopleJob) {
+ this.liabilityPeopleJob = liabilityPeopleJob;
+ }
+
+ public Date getRectifyTime() {
+ return rectifyTime;
+ }
+
+ public void setRectifyTime(Date rectifyTime) {
+ this.rectifyTime = rectifyTime;
+ }
+
+ public Date getRectifyTimeout() {
+ return rectifyTimeout;
+ }
+
+ public void setRectifyTimeout(Date rectifyTimeout) {
+ this.rectifyTimeout = rectifyTimeout;
+ }
+
+ public String getLeadDep() {
+ return leadDep;
+ }
+
+ public void setLeadDep(String leadDep) {
+ this.leadDep = leadDep;
+ }
+
+ public String getLeadJob() {
+ return leadJob;
+ }
+
+ public void setLeadJob(String leadJob) {
+ this.leadJob = leadJob;
+ }
+
+ public String getRectifyDep() {
+ return rectifyDep;
+ }
+
+ public void setRectifyDep(String rectifyDep) {
+ this.rectifyDep = rectifyDep;
+ }
+
+ public String getRectifyPeopleJob() {
+ return rectifyPeopleJob;
+ }
+
+ public void setRectifyPeopleJob(String rectifyPeopleJob) {
+ this.rectifyPeopleJob = rectifyPeopleJob;
+ }
+
+ public String getRectifyPeople() {
+ return rectifyPeople;
+ }
+
+ public void setRectifyPeople(String rectifyPeople) {
+ this.rectifyPeople = rectifyPeople;
+ }
+
+ public String getRectifyMeasure() {
+ return rectifyMeasure;
+ }
+
+ public void setRectifyMeasure(String rectifyMeasure) {
+ this.rectifyMeasure = rectifyMeasure;
+ }
+
+ public Date getRectifyStartTime() {
+ return rectifyStartTime;
+ }
+
+ public void setRectifyStartTime(Date rectifyStartTime) {
+ this.rectifyStartTime = rectifyStartTime;
+ }
+
+ public Date getRectifyFinishTime() {
+ return rectifyFinishTime;
+ }
+
+ public void setRectifyFinishTime(Date rectifyFinishTime) {
+ this.rectifyFinishTime = rectifyFinishTime;
+ }
+
+ public String getRectifyDesc() {
+ return rectifyDesc;
+ }
+
+ public void setRectifyDesc(String rectifyDesc) {
+ this.rectifyDesc = rectifyDesc;
+ }
+
+ public Double getCost() {
+ return cost;
+ }
+
+ public void setCost(Double cost) {
+ this.cost = cost;
+ }
+
+ public String getPlan() {
+ return plan;
+ }
+
+ public void setPlan(String plan) {
+ this.plan = plan;
+ }
+
+ public String getPrecautionMeasure() {
+ return precautionMeasure;
+ }
+
+ public void setPrecautionMeasure(String precautionMeasure) {
+ this.precautionMeasure = precautionMeasure;
+ }
+
+ public Date getAcceptTime() {
+ return acceptTime;
+ }
+
+ public void setAcceptTime(Date acceptTime) {
+ this.acceptTime = acceptTime;
+ }
+
+ public String getAcceptDesc() {
+ return acceptDesc;
+ }
+
+ public void setAcceptDesc(String acceptDesc) {
+ this.acceptDesc = acceptDesc;
+ }
+
+ public String getAcceptDep() {
+ return acceptDep;
+ }
+
+ public void setAcceptDep(String acceptDep) {
+ this.acceptDep = acceptDep;
+ }
+
+ public String getAcceptPeople() {
+ return acceptPeople;
+ }
+
+ public void setAcceptPeople(String acceptPeople) {
+ this.acceptPeople = acceptPeople;
+ }
+
+ public String getAcceptPeopleJob() {
+ return acceptPeopleJob;
+ }
+
+ public void setAcceptPeopleJob(String acceptPeopleJob) {
+ this.acceptPeopleJob = acceptPeopleJob;
+ }
+
+ public String getCancelDep() {
+ return cancelDep;
+ }
+
+ public void setCancelDep(String cancelDep) {
+ this.cancelDep = cancelDep;
+ }
+
+ public String getCancelPeople() {
+ return cancelPeople;
+ }
+
+ public void setCancelPeople(String cancelPeople) {
+ this.cancelPeople = cancelPeople;
+ }
+
+ public String getCancelPeopleJob() {
+ return cancelPeopleJob;
+ }
+
+ public void setCancelPeopleJob(String cancelPeopleJob) {
+ this.cancelPeopleJob = cancelPeopleJob;
+ }
+
+ public String getApplyPeople() {
+ return applyPeople;
+ }
+
+ public void setApplyPeople(String applyPeople) {
+ this.applyPeople = applyPeople;
+ }
+
+ public Date getApplyTime() {
+ return applyTime;
+ }
+
+ public void setApplyTime(Date applyTime) {
+ this.applyTime = applyTime;
+ }
+
+ public String getApplyDesc() {
+ return applyDesc;
+ }
+
+ public void setApplyDesc(String applyDesc) {
+ this.applyDesc = applyDesc;
+ }
+
+ public String getApplyNote() {
+ return applyNote;
+ }
+
+ public void setApplyNote(String applyNote) {
+ this.applyNote = applyNote;
+ }
+
+ public Date getApplyTimeoutTime() {
+ return applyTimeoutTime;
+ }
+
+ public void setApplyTimeoutTime(Date applyTimeoutTime) {
+ this.applyTimeoutTime = applyTimeoutTime;
+ }
+
+ public String getApplyDealPeople() {
+ return applyDealPeople;
+ }
+
+ public void setApplyDealPeople(String applyDealPeople) {
+ this.applyDealPeople = applyDealPeople;
+ }
+
+ public Date getAppleDealTime() {
+ return appleDealTime;
+ }
+
+ public void setAppleDealTime(Date appleDealTime) {
+ this.appleDealTime = appleDealTime;
+ }
+
+ public String getExchangeLeadDep() {
+ return exchangeLeadDep;
+ }
+
+ public void setExchangeLeadDep(String exchangeLeadDep) {
+ this.exchangeLeadDep = exchangeLeadDep;
+ }
+
+ public String getExchangeLeadPeople() {
+ return exchangeLeadPeople;
+ }
+
+ public void setExchangeLeadPeople(String exchangeLeadPeople) {
+ this.exchangeLeadPeople = exchangeLeadPeople;
+ }
+
+ public String getExchangeLeadPeopleJob() {
+ return exchangeLeadPeopleJob;
+ }
+
+ public void setExchangeLeadPeopleJob(String exchangeLeadPeopleJob) {
+ this.exchangeLeadPeopleJob = exchangeLeadPeopleJob;
+ }
+
+ public String getExchangeDesc() {
+ return exchangeDesc;
+ }
+
+ public void setExchangeDesc(String exchangeDesc) {
+ this.exchangeDesc = exchangeDesc;
+ }
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/SPI/SPIDataForPieChartRespDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/SPI/SPIDataForPieChartRespDTO.java
index 4378f94..8ba7770 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/SPI/SPIDataForPieChartRespDTO.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/SPI/SPIDataForPieChartRespDTO.java
@@ -1,20 +1,20 @@
-package com.ruoyi.doublePrevention.entity.SPI;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class SPIDataForPieChartRespDTO {
-
-
- private TroubleLevel troubleLevel;
-
- public TroubleLevel getTroubleLevel() {
- return troubleLevel;
- }
-
- public void setTroubleLevel(TroubleLevel troubleLevel) {
- this.troubleLevel = troubleLevel;
- }
-}
+package com.ruoyi.doublePrevention.entity.SPI;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SPIDataForPieChartRespDTO {
+
+
+ private TroubleLevel troubleLevel;
+
+ public TroubleLevel getTroubleLevel() {
+ return troubleLevel;
+ }
+
+ public void setTroubleLevel(TroubleLevel troubleLevel) {
+ this.troubleLevel = troubleLevel;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/SPI/SPIDataReqBO.java b/src/main/java/com/ruoyi/doublePrevention/entity/SPI/SPIDataReqBO.java
index 10e7b2b..a4b8c76 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/SPI/SPIDataReqBO.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/SPI/SPIDataReqBO.java
@@ -1,62 +1,62 @@
-package com.ruoyi.doublePrevention.entity.SPI;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class SPIDataReqBO {
-
- private String key;
-
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
- private LocalDateTime startTime;
-
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
- private LocalDateTime endTime;
-
- private String year;
-
- private String month;
-
- public String getKey() {
- return key;
- }
-
- public void setKey(String key) {
- this.key = key;
- }
-
- public LocalDateTime getStartTime() {
- return startTime;
- }
-
- public void setStartTime(LocalDateTime startTime) {
- this.startTime = startTime;
- }
-
- public LocalDateTime getEndTime() {
- return endTime;
- }
-
- public void setEndTime(LocalDateTime endTime) {
- this.endTime = endTime;
- }
-
- public String getYear() {
- return year;
- }
-
- public void setYear(String year) {
- this.year = year;
- }
-
- public String getMonth() {
- return month;
- }
-
- public void setMonth(String month) {
- this.month = month;
- }
-}
+package com.ruoyi.doublePrevention.entity.SPI;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class SPIDataReqBO {
+
+ private String key;
+
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime startTime;
+
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime endTime;
+
+ private String year;
+
+ private String month;
+
+ public String getKey() {
+ return key;
+ }
+
+ public void setKey(String key) {
+ this.key = key;
+ }
+
+ public LocalDateTime getStartTime() {
+ return startTime;
+ }
+
+ public void setStartTime(LocalDateTime startTime) {
+ this.startTime = startTime;
+ }
+
+ public LocalDateTime getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(LocalDateTime endTime) {
+ this.endTime = endTime;
+ }
+
+ public String getYear() {
+ return year;
+ }
+
+ public void setYear(String year) {
+ this.year = year;
+ }
+
+ public String getMonth() {
+ return month;
+ }
+
+ public void setMonth(String month) {
+ this.month = month;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/SPI/SPIDataRespDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/SPI/SPIDataRespDTO.java
index 3d73878..f151132 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/SPI/SPIDataRespDTO.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/SPI/SPIDataRespDTO.java
@@ -1,17 +1,17 @@
-package com.ruoyi.doublePrevention.entity.SPI;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class SPIDataRespDTO {
-
- private List<TroubleData> troubleDataList;
-
-
- public List<TroubleData> getTroubleDataList() {
- return troubleDataList;
- }
-
-}
+package com.ruoyi.doublePrevention.entity.SPI;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class SPIDataRespDTO {
+
+ private List<TroubleData> troubleDataList;
+
+
+ public List<TroubleData> getTroubleDataList() {
+ return troubleDataList;
+ }
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/SPI/TroubleData.java b/src/main/java/com/ruoyi/doublePrevention/entity/SPI/TroubleData.java
index 9eaf959..329e1e5 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/SPI/TroubleData.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/SPI/TroubleData.java
@@ -1,71 +1,71 @@
-package com.ruoyi.doublePrevention.entity.SPI;
-
-
-
-
-public class TroubleData {
-
- private String time;
- private Integer count;
- private Integer rectifyFinish;
- private Integer rectifyNotFinish;
- private Integer generalDanger;
- private Integer majorDanger;
- private Integer accept;
-
- public String getTime() {
- return time;
- }
-
- public void setTime(String time) {
- this.time = time;
- }
-
- public Integer getCount() {
- return count;
- }
-
- public void setCount(Integer count) {
- this.count = count;
- }
-
- public Integer getGeneralDanger() {
- return generalDanger;
- }
-
- public void setGeneralDanger(Integer generalDanger) {
- this.generalDanger = generalDanger;
- }
-
- public Integer getMajorDanger() {
- return majorDanger;
- }
-
- public void setMajorDanger(Integer majorDanger) {
- this.majorDanger = majorDanger;
- }
-
- public Integer getRectifyFinish() {
- return rectifyFinish;
- }
-
- public void setRectifyFinish(Integer rectifyFinish) {
- this.rectifyFinish = rectifyFinish;
- }
-
- public Integer getRectifyNotFinish() {
- return rectifyNotFinish;
- }
-
- public void setRectifyNotFinish(Integer rectifyNotFinish) {
- this.rectifyNotFinish = rectifyNotFinish;
- }
-
- public Integer getAccept() {
- return accept;
- }
-
- public void setAccept(Integer accept) {
- this.accept = accept;
- }
-}
+package com.ruoyi.doublePrevention.entity.SPI;
+
+
+
+
+public class TroubleData {
+
+ private String time;
+ private Integer count;
+ private Integer rectifyFinish;
+ private Integer rectifyNotFinish;
+ private Integer generalDanger;
+ private Integer majorDanger;
+ private Integer accept;
+
+ public String getTime() {
+ return time;
+ }
+
+ public void setTime(String time) {
+ this.time = time;
+ }
+
+ public Integer getCount() {
+ return count;
+ }
+
+ public void setCount(Integer count) {
+ this.count = count;
+ }
+
+ public Integer getGeneralDanger() {
+ return generalDanger;
+ }
+
+ public void setGeneralDanger(Integer generalDanger) {
+ this.generalDanger = generalDanger;
+ }
+
+ public Integer getMajorDanger() {
+ return majorDanger;
+ }
+
+ public void setMajorDanger(Integer majorDanger) {
+ this.majorDanger = majorDanger;
+ }
+
+ public Integer getRectifyFinish() {
+ return rectifyFinish;
+ }
+
+ public void setRectifyFinish(Integer rectifyFinish) {
+ this.rectifyFinish = rectifyFinish;
+ }
+
+ public Integer getRectifyNotFinish() {
+ return rectifyNotFinish;
+ }
+
+ public void setRectifyNotFinish(Integer rectifyNotFinish) {
+ this.rectifyNotFinish = rectifyNotFinish;
+ }
+
+ public Integer getAccept() {
+ return accept;
+ }
+
+ public void setAccept(Integer accept) {
+ this.accept = accept;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/SPI/TroubleLevel.java b/src/main/java/com/ruoyi/doublePrevention/entity/SPI/TroubleLevel.java
index 00354b5..2467b08 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/SPI/TroubleLevel.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/SPI/TroubleLevel.java
@@ -1,56 +1,56 @@
-package com.ruoyi.doublePrevention.entity.SPI;
-
-
-
-
-public class TroubleLevel {
-
- private String A;
-
- private String B;
-
- private String C;
-
- private Integer rectifyFinish;
- private Integer rectifyNotFinish;
-
- public String getA() {
- return A;
- }
-
- public void setA(String a) {
- A = a;
- }
-
- public String getB() {
- return B;
- }
-
- public void setB(String b) {
- B = b;
- }
-
- public String getC() {
- return C;
- }
-
- public void setC(String c) {
- C = c;
- }
-
- public Integer getRectifyFinish() {
- return rectifyFinish;
- }
-
- public void setRectifyFinish(Integer rectifyFinish) {
- this.rectifyFinish = rectifyFinish;
- }
-
- public Integer getRectifyNotFinish() {
- return rectifyNotFinish;
- }
-
- public void setRectifyNotFinish(Integer rectifyNotFinish) {
- this.rectifyNotFinish = rectifyNotFinish;
- }
-}
+package com.ruoyi.doublePrevention.entity.SPI;
+
+
+
+
+public class TroubleLevel {
+
+ private String A;
+
+ private String B;
+
+ private String C;
+
+ private Integer rectifyFinish;
+ private Integer rectifyNotFinish;
+
+ public String getA() {
+ return A;
+ }
+
+ public void setA(String a) {
+ A = a;
+ }
+
+ public String getB() {
+ return B;
+ }
+
+ public void setB(String b) {
+ B = b;
+ }
+
+ public String getC() {
+ return C;
+ }
+
+ public void setC(String c) {
+ C = c;
+ }
+
+ public Integer getRectifyFinish() {
+ return rectifyFinish;
+ }
+
+ public void setRectifyFinish(Integer rectifyFinish) {
+ this.rectifyFinish = rectifyFinish;
+ }
+
+ public Integer getRectifyNotFinish() {
+ return rectifyNotFinish;
+ }
+
+ public void setRectifyNotFinish(Integer rectifyNotFinish) {
+ this.rectifyNotFinish = rectifyNotFinish;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogInsertReqBO.java b/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogInsertReqBO.java
index 395d28a..fd2da49 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogInsertReqBO.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogInsertReqBO.java
@@ -1,36 +1,36 @@
-package com.ruoyi.doublePrevention.entity.dto.req;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class PreventOverhaulLogInsertReqBO {
-
- /**
- * 风险分析对象编码
- */
- private String hazardCode;
- /**
- * 所属安全风险分析单元id
- */
- private Long riskUnitId;
- /**
- * 所属安全风险分析单元uuid
- */
- private String riskUnitUuid;
- /**
- * 装置停用或者检维修开始时间
- */
- private Date stopStartTime;
- /**
- * 装置停用或者检维修结束时间
- */
- private Date stopEndTime;
- /**
- * 描述停用原因
- */
- private String stopReason;
-
-
-}
+package com.ruoyi.doublePrevention.entity.dto.req;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class PreventOverhaulLogInsertReqBO {
+
+ /**
+ * 风险分析对象编码
+ */
+ private String hazardCode;
+ /**
+ * 所属安全风险分析单元id
+ */
+ private Long riskUnitId;
+ /**
+ * 所属安全风险分析单元uuid
+ */
+ private String riskUnitUuid;
+ /**
+ * 装置停用或者检维修开始时间
+ */
+ private Date stopStartTime;
+ /**
+ * 装置停用或者检维修结束时间
+ */
+ private Date stopEndTime;
+ /**
+ * 描述停用原因
+ */
+ private String stopReason;
+
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogReqBO.java b/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogReqBO.java
index ce150c0..03a411d 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogReqBO.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogReqBO.java
@@ -1,54 +1,54 @@
-package com.ruoyi.doublePrevention.entity.dto.req;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class PreventOverhaulLogReqBO {
-
- private Integer pageNum;
-
- private Integer pageSize;
- /**
- *
- */
- private Long id;
-
- /**
- * 创建时间
- */
- private Date gmtCreate;
- /**
- * 最后修改时间
- */
- private Date gmtModitify;
- /**
- * 所属安全风险分析单元id
- */
- private Long riskUnitId;
- /**
- * 所属安全风险分析单元uuid
- */
- private String riskUnitUuid;
- /**
- * 企业id
- */
- private Long enterpriseId;
- /**
- * 企业uuid
- */
- private String enterpriseUuid;
- /**
- * 装置停用或者检维修开始时间
- */
- private Date stopStartTime;
- /**
- * 装置停用或者检维修结束时间
- */
- private Date stopEndTime;
- /**
- * 风险分析对象编码
- */
- private String hazardCode;
-}
+package com.ruoyi.doublePrevention.entity.dto.req;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class PreventOverhaulLogReqBO {
+
+ private Integer pageNum;
+
+ private Integer pageSize;
+ /**
+ *
+ */
+ private Long id;
+
+ /**
+ * 创建时间
+ */
+ private Date gmtCreate;
+ /**
+ * 最后修改时间
+ */
+ private Date gmtModitify;
+ /**
+ * 所属安全风险分析单元id
+ */
+ private Long riskUnitId;
+ /**
+ * 所属安全风险分析单元uuid
+ */
+ private String riskUnitUuid;
+ /**
+ * 企业id
+ */
+ private Long enterpriseId;
+ /**
+ * 企业uuid
+ */
+ private String enterpriseUuid;
+ /**
+ * 装置停用或者检维修开始时间
+ */
+ private Date stopStartTime;
+ /**
+ * 装置停用或者检维修结束时间
+ */
+ private Date stopEndTime;
+ /**
+ * 风险分析对象编码
+ */
+ private String hazardCode;
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogUpdateReqBO.java b/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogUpdateReqBO.java
index 6b4ceb4..770c31d 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogUpdateReqBO.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/PreventOverhaulLogUpdateReqBO.java
@@ -1,41 +1,41 @@
-package com.ruoyi.doublePrevention.entity.dto.req;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class PreventOverhaulLogUpdateReqBO {
-
- /**
- *
- */
- private Long id;
-
- /**
- * 风险分析对象编码
- */
- private String hazardCode;
- /**
- * 所属安全风险分析单元id
- */
- private Long riskUnitId;
- /**
- * 所属安全风险分析单元uuid
- */
- private String riskUnitUuid;
- /**
- * 装置停用或者检维修开始时间
- */
- private Date stopStartTime;
- /**
- * 装置停用或者检维修结束时间
- */
- private Date stopEndTime;
- /**
- * 描述停用原因
- */
- private String stopReason;
-
-
-}
+package com.ruoyi.doublePrevention.entity.dto.req;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class PreventOverhaulLogUpdateReqBO {
+
+ /**
+ *
+ */
+ private Long id;
+
+ /**
+ * 风险分析对象编码
+ */
+ private String hazardCode;
+ /**
+ * 所属安全风险分析单元id
+ */
+ private Long riskUnitId;
+ /**
+ * 所属安全风险分析单元uuid
+ */
+ private String riskUnitUuid;
+ /**
+ * 装置停用或者检维修开始时间
+ */
+ private Date stopStartTime;
+ /**
+ * 装置停用或者检维修结束时间
+ */
+ private Date stopEndTime;
+ /**
+ * 描述停用原因
+ */
+ private String stopReason;
+
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/RiskAndPeopleInfoReqBO.java b/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/RiskAndPeopleInfoReqBO.java
index 80fcbfc..66d2805 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/RiskAndPeopleInfoReqBO.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/RiskAndPeopleInfoReqBO.java
@@ -1,17 +1,17 @@
-package com.ruoyi.doublePrevention.entity.dto.req;
-
-import lombok.Data;
-
-@Data
-public class RiskAndPeopleInfoReqBO {
-
- private Integer pageNum;
-
- private Integer pageSize;
-
- private String hazardName;
-
- private String hazardRank;
-
- private Long id;
-}
+package com.ruoyi.doublePrevention.entity.dto.req;
+
+import lombok.Data;
+
+@Data
+public class RiskAndPeopleInfoReqBO {
+
+ private Integer pageNum;
+
+ private Integer pageSize;
+
+ private String hazardName;
+
+ private String hazardRank;
+
+ private Long id;
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/RiskOldInfoQueryReqDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/RiskOldInfoQueryReqDTO.java
index 695de7e..c93a199 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/RiskOldInfoQueryReqDTO.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/dto/req/RiskOldInfoQueryReqDTO.java
@@ -1,56 +1,56 @@
-package com.ruoyi.doublePrevention.entity.dto.req;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * (RiskOldInfo)实体类
- *
- * @author makejava
- * @since 2023-03-20 15:33:46
- */
-
-@Data
-public class RiskOldInfoQueryReqDTO {
-
- private Integer pageNum;
-
- private Integer pageSize;
-
- /**
- * 4上报人 --
- */
- private String reportPeople;
- /**
- * 5发现人 --
- */
- private String findPeople;
- /**
- * 6发现时间 --
- */
- private Date startTime;
- /**
- * 6发现时间 --
- */
- private Date endTime;
- /**
- * 10隐患级别 --
- */
- private String riskLevel;
- /**
- * 11隐患所在部门 --
- */
- private String riskDep;
- /**
- * 13专业 --
- */
- private String major;
- /**
- * 34验收人 --
- */
- private String acceptPeople;
-
-
-}
-
+package com.ruoyi.doublePrevention.entity.dto.req;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * (RiskOldInfo)实体类
+ *
+ * @author makejava
+ * @since 2023-03-20 15:33:46
+ */
+
+@Data
+public class RiskOldInfoQueryReqDTO {
+
+ private Integer pageNum;
+
+ private Integer pageSize;
+
+ /**
+ * 4上报人 --
+ */
+ private String reportPeople;
+ /**
+ * 5发现人 --
+ */
+ private String findPeople;
+ /**
+ * 6发现时间 --
+ */
+ private Date startTime;
+ /**
+ * 6发现时间 --
+ */
+ private Date endTime;
+ /**
+ * 10隐患级别 --
+ */
+ private String riskLevel;
+ /**
+ * 11隐患所在部门 --
+ */
+ private String riskDep;
+ /**
+ * 13专业 --
+ */
+ private String major;
+ /**
+ * 34验收人 --
+ */
+ private String acceptPeople;
+
+
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventOverhaulLogRespDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventOverhaulLogRespDTO.java
index 5e49812..6a99318 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventOverhaulLogRespDTO.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventOverhaulLogRespDTO.java
@@ -1,69 +1,69 @@
-package com.ruoyi.doublePrevention.entity.dto.resp;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class PreventOverhaulLogRespDTO {
-
- private Long id;
-
-
- private String uuid;
- /**
- * 创建时间
- */
- private Date gmtCreate;
- /**
- * 最后修改时间
- */
- private Date gmtModitify;
- /**
- * 创建人
- */
- private String createByUserName;
- /**
- * 修改人
- */
- private String lastEditUserName;
-
- /**
- * 所属安全风险分析单元
- */
- private String riskUnitName;
- /**
- * 所属安全风险分析单元id
- */
- private Long riskUnitId;
- /**
- * 所属安全风险分析单元uuid
- */
- private String riskUnitUuid;
- /**
- * 企业id
- */
- private Long enterpriseId;
- /**
- * 企业uuid
- */
- private String enterpriseUuid;
-
- /**
- * 装置停用或者检维修开始时间
- */
- private Date stopStartTime;
- /**
- * 装置停用或者检维修结束时间
- */
- private Date stopEndTime;
- /**
- * 描述停用原因
- */
- private String stopReason;
- /**
- * 风险分析对象编码
- */
- private String hazardCode;
-
-}
+package com.ruoyi.doublePrevention.entity.dto.resp;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class PreventOverhaulLogRespDTO {
+
+ private Long id;
+
+
+ private String uuid;
+ /**
+ * 创建时间
+ */
+ private Date gmtCreate;
+ /**
+ * 最后修改时间
+ */
+ private Date gmtModitify;
+ /**
+ * 创建人
+ */
+ private String createByUserName;
+ /**
+ * 修改人
+ */
+ private String lastEditUserName;
+
+ /**
+ * 所属安全风险分析单元
+ */
+ private String riskUnitName;
+ /**
+ * 所属安全风险分析单元id
+ */
+ private Long riskUnitId;
+ /**
+ * 所属安全风险分析单元uuid
+ */
+ private String riskUnitUuid;
+ /**
+ * 企业id
+ */
+ private Long enterpriseId;
+ /**
+ * 企业uuid
+ */
+ private String enterpriseUuid;
+
+ /**
+ * 装置停用或者检维修开始时间
+ */
+ private Date stopStartTime;
+ /**
+ * 装置停用或者检维修结束时间
+ */
+ private Date stopEndTime;
+ /**
+ * 描述停用原因
+ */
+ private String stopReason;
+ /**
+ * 风险分析对象编码
+ */
+ private String hazardCode;
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventRiskCheckUnitRespDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventRiskCheckUnitRespDTO.java
index 8463b33..9577d56 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventRiskCheckUnitRespDTO.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/PreventRiskCheckUnitRespDTO.java
@@ -1,265 +1,265 @@
-package com.ruoyi.doublePrevention.entity.dto.resp;
-
-import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-
-import java.util.List;
-
-public class PreventRiskCheckUnitRespDTO {
-
-
- /** id */
- private Long riskListId;
-
- /** 风险单元编号 */
- private String riskListNum;
-
- /** 风险单元名称 */
- private String riskListName;
-
- /** 是否特种(1否,2是) */
- @Excel(name = "是否特种",readConverterExp = "1=否,2=是")
- private Long riskListIsSpecial;
-
- /** 图片 */
- private String riskListImgUrl;
-
- /** 设备设施类型 */
- private Long riskListDeviceType;
-
- /** 规格/型号 */
- private String riskListDeviceModel;
-
- /** 作业活动类型 */
- private Long riskListWorkType;
-
- /** 作业频率 */
- private Long riskListWorkFrequency;
-
- private String riskListWorkFrequencyName;
-
- /** 工艺作业类型 */
- private Long riskListCraftsType;
-
- /**
- * 风险单元类型名称,(包含设备设施类型名称,作业活动类型名称,工艺节点类型名称)
- */
- private String riskTypeName;
-
- /** 节点描述 */
- private String riskListCraftsDescription;
-
- /** 区域/位置 */
- private Long regionId;
-
- /** 区域/位置名称 */
- private String regionName;
-
- /** 管辖单位/部门 */
- private Long deptId;
-
- /** 管辖部门名称 */
- private String deptName;
-
- /** 负责人 */
- private Long userId;
-
- /** 负责人名称 */
- private String userName;
-
- /** 风险单元类型(1设备设置,2作业活动,3工艺节点) */
- @Excel(name = "风险单元类型", readConverterExp = "1=设备设施,2=作业活动,3=工艺节点,4=基础清单,5=区域/作业场所")
- private Integer riskType;
-
- /** 所属公司 */
- private Long companyId;
-
- /**已评价计划数 如作为查询条件 0 代表未评价, 1 代表已评价 */
- private Integer isEvaluation;
-
- private List<PreventRiskControlMeasure> riskControlMeasures;
-
- public Long getRiskListId() {
- return riskListId;
- }
-
- public void setRiskListId(Long riskListId) {
- this.riskListId = riskListId;
- }
-
- public String getRiskListNum() {
- return riskListNum;
- }
-
- public void setRiskListNum(String riskListNum) {
- this.riskListNum = riskListNum;
- }
-
- public String getRiskListName() {
- return riskListName;
- }
-
- public void setRiskListName(String riskListName) {
- this.riskListName = riskListName;
- }
-
- public Long getRiskListIsSpecial() {
- return riskListIsSpecial;
- }
-
- public void setRiskListIsSpecial(Long riskListIsSpecial) {
- this.riskListIsSpecial = riskListIsSpecial;
- }
-
- public String getRiskListImgUrl() {
- return riskListImgUrl;
- }
-
- public void setRiskListImgUrl(String riskListImgUrl) {
- this.riskListImgUrl = riskListImgUrl;
- }
-
- public Long getRiskListDeviceType() {
- return riskListDeviceType;
- }
-
- public void setRiskListDeviceType(Long riskListDeviceType) {
- this.riskListDeviceType = riskListDeviceType;
- }
-
- public String getRiskListDeviceModel() {
- return riskListDeviceModel;
- }
-
- public void setRiskListDeviceModel(String riskListDeviceModel) {
- this.riskListDeviceModel = riskListDeviceModel;
- }
-
- public Long getRiskListWorkType() {
- return riskListWorkType;
- }
-
- public void setRiskListWorkType(Long riskListWorkType) {
- this.riskListWorkType = riskListWorkType;
- }
-
- public Long getRiskListWorkFrequency() {
- return riskListWorkFrequency;
- }
-
- public void setRiskListWorkFrequency(Long riskListWorkFrequency) {
- this.riskListWorkFrequency = riskListWorkFrequency;
- }
-
- public String getRiskListWorkFrequencyName() {
- return riskListWorkFrequencyName;
- }
-
- public void setRiskListWorkFrequencyName(String riskListWorkFrequencyName) {
- this.riskListWorkFrequencyName = riskListWorkFrequencyName;
- }
-
- public Long getRiskListCraftsType() {
- return riskListCraftsType;
- }
-
- public void setRiskListCraftsType(Long riskListCraftsType) {
- this.riskListCraftsType = riskListCraftsType;
- }
-
- public String getRiskTypeName() {
- return riskTypeName;
- }
-
- public void setRiskTypeName(String riskTypeName) {
- this.riskTypeName = riskTypeName;
- }
-
- public String getRiskListCraftsDescription() {
- return riskListCraftsDescription;
- }
-
- public void setRiskListCraftsDescription(String riskListCraftsDescription) {
- this.riskListCraftsDescription = riskListCraftsDescription;
- }
-
- public Long getRegionId() {
- return regionId;
- }
-
- public void setRegionId(Long regionId) {
- this.regionId = regionId;
- }
-
- public String getRegionName() {
- return regionName;
- }
-
- public void setRegionName(String regionName) {
- this.regionName = regionName;
- }
-
- public Long getDeptId() {
- return deptId;
- }
-
- public void setDeptId(Long deptId) {
- this.deptId = deptId;
- }
-
- public String getDeptName() {
- return deptName;
- }
-
- public void setDeptName(String deptName) {
- this.deptName = deptName;
- }
-
- public Long getUserId() {
- return userId;
- }
-
- public void setUserId(Long userId) {
- this.userId = userId;
- }
-
- public String getUserName() {
- return userName;
- }
-
- public void setUserName(String userName) {
- this.userName = userName;
- }
-
- public Integer getRiskType() {
- return riskType;
- }
-
- public void setRiskType(Integer riskType) {
- this.riskType = riskType;
- }
-
- public Long getCompanyId() {
- return companyId;
- }
-
- public void setCompanyId(Long companyId) {
- this.companyId = companyId;
- }
-
- public Integer getIsEvaluation() {
- return isEvaluation;
- }
-
- public void setIsEvaluation(Integer isEvaluation) {
- this.isEvaluation = isEvaluation;
- }
-
- public List<PreventRiskControlMeasure> getRiskControlMeasures() {
- return riskControlMeasures;
- }
-
- public void setRiskControlMeasures(List<PreventRiskControlMeasure> riskControlMeasures) {
- this.riskControlMeasures = riskControlMeasures;
- }
-}
+package com.ruoyi.doublePrevention.entity.dto.resp;
+
+import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+
+import java.util.List;
+
+public class PreventRiskCheckUnitRespDTO {
+
+
+ /** id */
+ private Long riskListId;
+
+ /** 风险单元编号 */
+ private String riskListNum;
+
+ /** 风险单元名称 */
+ private String riskListName;
+
+ /** 是否特种(1否,2是) */
+ @Excel(name = "是否特种",readConverterExp = "1=否,2=是")
+ private Long riskListIsSpecial;
+
+ /** 图片 */
+ private String riskListImgUrl;
+
+ /** 设备设施类型 */
+ private Long riskListDeviceType;
+
+ /** 规格/型号 */
+ private String riskListDeviceModel;
+
+ /** 作业活动类型 */
+ private Long riskListWorkType;
+
+ /** 作业频率 */
+ private Long riskListWorkFrequency;
+
+ private String riskListWorkFrequencyName;
+
+ /** 工艺作业类型 */
+ private Long riskListCraftsType;
+
+ /**
+ * 风险单元类型名称,(包含设备设施类型名称,作业活动类型名称,工艺节点类型名称)
+ */
+ private String riskTypeName;
+
+ /** 节点描述 */
+ private String riskListCraftsDescription;
+
+ /** 区域/位置 */
+ private Long regionId;
+
+ /** 区域/位置名称 */
+ private String regionName;
+
+ /** 管辖单位/部门 */
+ private Long deptId;
+
+ /** 管辖部门名称 */
+ private String deptName;
+
+ /** 负责人 */
+ private Long userId;
+
+ /** 负责人名称 */
+ private String userName;
+
+ /** 风险单元类型(1设备设置,2作业活动,3工艺节点) */
+ @Excel(name = "风险单元类型", readConverterExp = "1=设备设施,2=作业活动,3=工艺节点,4=基础清单,5=区域/作业场所")
+ private Integer riskType;
+
+ /** 所属公司 */
+ private Long companyId;
+
+ /**已评价计划数 如作为查询条件 0 代表未评价, 1 代表已评价 */
+ private Integer isEvaluation;
+
+ private List<PreventRiskControlMeasure> riskControlMeasures;
+
+ public Long getRiskListId() {
+ return riskListId;
+ }
+
+ public void setRiskListId(Long riskListId) {
+ this.riskListId = riskListId;
+ }
+
+ public String getRiskListNum() {
+ return riskListNum;
+ }
+
+ public void setRiskListNum(String riskListNum) {
+ this.riskListNum = riskListNum;
+ }
+
+ public String getRiskListName() {
+ return riskListName;
+ }
+
+ public void setRiskListName(String riskListName) {
+ this.riskListName = riskListName;
+ }
+
+ public Long getRiskListIsSpecial() {
+ return riskListIsSpecial;
+ }
+
+ public void setRiskListIsSpecial(Long riskListIsSpecial) {
+ this.riskListIsSpecial = riskListIsSpecial;
+ }
+
+ public String getRiskListImgUrl() {
+ return riskListImgUrl;
+ }
+
+ public void setRiskListImgUrl(String riskListImgUrl) {
+ this.riskListImgUrl = riskListImgUrl;
+ }
+
+ public Long getRiskListDeviceType() {
+ return riskListDeviceType;
+ }
+
+ public void setRiskListDeviceType(Long riskListDeviceType) {
+ this.riskListDeviceType = riskListDeviceType;
+ }
+
+ public String getRiskListDeviceModel() {
+ return riskListDeviceModel;
+ }
+
+ public void setRiskListDeviceModel(String riskListDeviceModel) {
+ this.riskListDeviceModel = riskListDeviceModel;
+ }
+
+ public Long getRiskListWorkType() {
+ return riskListWorkType;
+ }
+
+ public void setRiskListWorkType(Long riskListWorkType) {
+ this.riskListWorkType = riskListWorkType;
+ }
+
+ public Long getRiskListWorkFrequency() {
+ return riskListWorkFrequency;
+ }
+
+ public void setRiskListWorkFrequency(Long riskListWorkFrequency) {
+ this.riskListWorkFrequency = riskListWorkFrequency;
+ }
+
+ public String getRiskListWorkFrequencyName() {
+ return riskListWorkFrequencyName;
+ }
+
+ public void setRiskListWorkFrequencyName(String riskListWorkFrequencyName) {
+ this.riskListWorkFrequencyName = riskListWorkFrequencyName;
+ }
+
+ public Long getRiskListCraftsType() {
+ return riskListCraftsType;
+ }
+
+ public void setRiskListCraftsType(Long riskListCraftsType) {
+ this.riskListCraftsType = riskListCraftsType;
+ }
+
+ public String getRiskTypeName() {
+ return riskTypeName;
+ }
+
+ public void setRiskTypeName(String riskTypeName) {
+ this.riskTypeName = riskTypeName;
+ }
+
+ public String getRiskListCraftsDescription() {
+ return riskListCraftsDescription;
+ }
+
+ public void setRiskListCraftsDescription(String riskListCraftsDescription) {
+ this.riskListCraftsDescription = riskListCraftsDescription;
+ }
+
+ public Long getRegionId() {
+ return regionId;
+ }
+
+ public void setRegionId(Long regionId) {
+ this.regionId = regionId;
+ }
+
+ public String getRegionName() {
+ return regionName;
+ }
+
+ public void setRegionName(String regionName) {
+ this.regionName = regionName;
+ }
+
+ public Long getDeptId() {
+ return deptId;
+ }
+
+ public void setDeptId(Long deptId) {
+ this.deptId = deptId;
+ }
+
+ public String getDeptName() {
+ return deptName;
+ }
+
+ public void setDeptName(String deptName) {
+ this.deptName = deptName;
+ }
+
+ public Long getUserId() {
+ return userId;
+ }
+
+ public void setUserId(Long userId) {
+ this.userId = userId;
+ }
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ public Integer getRiskType() {
+ return riskType;
+ }
+
+ public void setRiskType(Integer riskType) {
+ this.riskType = riskType;
+ }
+
+ public Long getCompanyId() {
+ return companyId;
+ }
+
+ public void setCompanyId(Long companyId) {
+ this.companyId = companyId;
+ }
+
+ public Integer getIsEvaluation() {
+ return isEvaluation;
+ }
+
+ public void setIsEvaluation(Integer isEvaluation) {
+ this.isEvaluation = isEvaluation;
+ }
+
+ public List<PreventRiskControlMeasure> getRiskControlMeasures() {
+ return riskControlMeasures;
+ }
+
+ public void setRiskControlMeasures(List<PreventRiskControlMeasure> riskControlMeasures) {
+ this.riskControlMeasures = riskControlMeasures;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/RiskAndPeopleInfoDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/RiskAndPeopleInfoDTO.java
index b9d91b5..81957ef 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/RiskAndPeopleInfoDTO.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/RiskAndPeopleInfoDTO.java
@@ -1,123 +1,123 @@
-package com.ruoyi.doublePrevention.entity.dto.resp;
-
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class RiskAndPeopleInfoDTO {
-
- private Long id;
-
- private String areaCode;
-
- private String companyName;
-
- private String companyNature;
-
- private String companyNatureName;
-
- private String hazardId;
-
- private String hazardCode;
-
- private String hazardName;
-
- private String hazardRank;
-
- private String hazardRankName;
-
- private String parkName;
-
- /**
- *主要责任人id
- */
- private Long mainLiabilityPersonId;
- /**
- * 主要责任人姓名
- */
- private String mainLiabilityPersonName;
- /**
- * 主要责任人类型
- */
- private String mainLiabilityPersonType;
- /**
- * 主要责任人电话
- */
- private Long mainLiabilityPersonPhone;
- /**
- * 主要责任人职务
- */
- private String mainLiabilityPersonJob;
- /**
- * 主要责任人任务
- */
- private String mainLiabilityPersonWork;
-
- /**
- *技术责任人id
- */
- private Long technologyLiabilityPersonId;
- /**
- * 技术责任人姓名
- */
- private String technologyLiabilityPersonName;
- /**
- * 技术责任人类型
- */
- private String technologyLiabilityPersonType;
- /**
- * 技术责任人电话
- */
- private Long technologyLiabilityPersonPhone;
- /**
- * 技术责任人职务
- */
- private String technologyLiabilityPersonJob;
- /**
- * 技术责任人任务
- */
- private String technologyLiabilityPersonWork;
-
- /**
- *操作责任人id
- */
- private Long handleLiabilityPersonId;
- /**
- * 操作责任人姓名
- */
- private String handleLiabilityPersonName;
- /**
- * 操作责任人类型
- */
- private String handleLiabilityPersonType;
- /**
- * 操作责任人电话
- */
- private Long handleLiabilityPersonPhone;
- /**
- * 操作责任人职务
- */
- private String handleLiabilityPersonJob;
- /**
- * 操作责任人任务
- */
- private String handleLiabilityPersonWork;
-
- /**
- * 创建时间
- */
- private Date gmtCreate;
- /**
- * 最后修改时间
- */
- private Date gmtModitify;
- /**
- * 创建人
- */
- private String createByUserName;
- /**
- * 修改人
- */
- private String lastEditUserName;
-}
+package com.ruoyi.doublePrevention.entity.dto.resp;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class RiskAndPeopleInfoDTO {
+
+ private Long id;
+
+ private String areaCode;
+
+ private String companyName;
+
+ private String companyNature;
+
+ private String companyNatureName;
+
+ private String hazardId;
+
+ private String hazardCode;
+
+ private String hazardName;
+
+ private String hazardRank;
+
+ private String hazardRankName;
+
+ private String parkName;
+
+ /**
+ *主要责任人id
+ */
+ private Long mainLiabilityPersonId;
+ /**
+ * 主要责任人姓名
+ */
+ private String mainLiabilityPersonName;
+ /**
+ * 主要责任人类型
+ */
+ private String mainLiabilityPersonType;
+ /**
+ * 主要责任人电话
+ */
+ private Long mainLiabilityPersonPhone;
+ /**
+ * 主要责任人职务
+ */
+ private String mainLiabilityPersonJob;
+ /**
+ * 主要责任人任务
+ */
+ private String mainLiabilityPersonWork;
+
+ /**
+ *技术责任人id
+ */
+ private Long technologyLiabilityPersonId;
+ /**
+ * 技术责任人姓名
+ */
+ private String technologyLiabilityPersonName;
+ /**
+ * 技术责任人类型
+ */
+ private String technologyLiabilityPersonType;
+ /**
+ * 技术责任人电话
+ */
+ private Long technologyLiabilityPersonPhone;
+ /**
+ * 技术责任人职务
+ */
+ private String technologyLiabilityPersonJob;
+ /**
+ * 技术责任人任务
+ */
+ private String technologyLiabilityPersonWork;
+
+ /**
+ *操作责任人id
+ */
+ private Long handleLiabilityPersonId;
+ /**
+ * 操作责任人姓名
+ */
+ private String handleLiabilityPersonName;
+ /**
+ * 操作责任人类型
+ */
+ private String handleLiabilityPersonType;
+ /**
+ * 操作责任人电话
+ */
+ private Long handleLiabilityPersonPhone;
+ /**
+ * 操作责任人职务
+ */
+ private String handleLiabilityPersonJob;
+ /**
+ * 操作责任人任务
+ */
+ private String handleLiabilityPersonWork;
+
+ /**
+ * 创建时间
+ */
+ private Date gmtCreate;
+ /**
+ * 最后修改时间
+ */
+ private Date gmtModitify;
+ /**
+ * 创建人
+ */
+ private String createByUserName;
+ /**
+ * 修改人
+ */
+ private String lastEditUserName;
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/RiskAndPeopleInfoRespDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/RiskAndPeopleInfoRespDTO.java
index c7acd72..f596713 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/RiskAndPeopleInfoRespDTO.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/RiskAndPeopleInfoRespDTO.java
@@ -1,64 +1,64 @@
-package com.ruoyi.doublePrevention.entity.dto.resp;
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-
-@Data
-public class RiskAndPeopleInfoRespDTO {
- /**
- * 所有责任人所有的任务
- * */
- private Integer count;
- /**
- * 所有责任人所有完成的任务
- * */
- private Integer complete;
- /**
- * 所有任务完成率
- * */
- private BigDecimal completeRatio;
-
- /**
- * 操作责任人所有的任务
- * */
- private Integer countOfHandle;
- /**
- * 操作责任人所有完成的任务
- * */
- private Integer completeOfHandle;
- /**
- * 操作任务完成率
- * */
- private BigDecimal completeRatioOfHandle;
-
- /**
- * 技术责任人所有的任务
- * */
- private Integer countOfTechnology;
- /**
- * 技术责任人所有完成的任务
- * */
- private Integer completeOfTechnology;
- /**
- * 技术任务完成率
- * */
- private BigDecimal completeRatioOfTechnology;
-
- /**
- * 主要责任人所有的任务
- * */
- private Integer countOfMain;
- /**
- * 主要责任人所有完成的任务
- * */
- private Integer completeOfMain;
- /**
- * 主要任务完成率
- * */
- private BigDecimal completeRatioOfMain;
-
- private List<RiskAndPeopleInfoDTO> riskAndPeopleInfoDTO;
-}
+package com.ruoyi.doublePrevention.entity.dto.resp;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+
+@Data
+public class RiskAndPeopleInfoRespDTO {
+ /**
+ * 所有责任人所有的任务
+ * */
+ private Integer count;
+ /**
+ * 所有责任人所有完成的任务
+ * */
+ private Integer complete;
+ /**
+ * 所有任务完成率
+ * */
+ private BigDecimal completeRatio;
+
+ /**
+ * 操作责任人所有的任务
+ * */
+ private Integer countOfHandle;
+ /**
+ * 操作责任人所有完成的任务
+ * */
+ private Integer completeOfHandle;
+ /**
+ * 操作任务完成率
+ * */
+ private BigDecimal completeRatioOfHandle;
+
+ /**
+ * 技术责任人所有的任务
+ * */
+ private Integer countOfTechnology;
+ /**
+ * 技术责任人所有完成的任务
+ * */
+ private Integer completeOfTechnology;
+ /**
+ * 技术任务完成率
+ * */
+ private BigDecimal completeRatioOfTechnology;
+
+ /**
+ * 主要责任人所有的任务
+ * */
+ private Integer countOfMain;
+ /**
+ * 主要责任人所有完成的任务
+ * */
+ private Integer completeOfMain;
+ /**
+ * 主要任务完成率
+ * */
+ private BigDecimal completeRatioOfMain;
+
+ private List<RiskAndPeopleInfoDTO> riskAndPeopleInfoDTO;
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/RiskOldInfoQueryRespDTO.java b/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/RiskOldInfoQueryRespDTO.java
index acfe8e3..200090e 100644
--- a/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/RiskOldInfoQueryRespDTO.java
+++ b/src/main/java/com/ruoyi/doublePrevention/entity/dto/resp/RiskOldInfoQueryRespDTO.java
@@ -1,216 +1,216 @@
-package com.ruoyi.doublePrevention.entity.dto.resp;
-
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * (RiskOldInfo)实体类
- *
- * @author makejava
- * @since 2023-03-20 15:33:46
- */
-@Data
-public class RiskOldInfoQueryRespDTO {
-
-
- private Long id;
- /**
- * 2上报人部门
- */
- private String reportDep;
- /**
- * 3上报人职务
- */
- private String reportPeopleJob;
- /**
- * 4上报人
- */
- private String reportPeople;
- /**
- * 5发现人
- */
- private String findPeople;
- /**
- * 6发现时间
- */
- private Date findTime;
- /**
- * 7隐患内容
- */
- private String riskDesc;
- /**
- * 8隐患位置
- */
- private String riskSite;
- /**
- * 9隐患类型
- */
- private String riskType;
- /**
- * 10隐患级别
- */
- private String riskLevel;
- /**
- * 11隐患所在部门
- */
- private String riskDep;
- /**
- * 12检查类型
- */
- private String checkType;
- /**
- * 13专业
- */
- private String major;
- /**
- * 14责任人部门
- */
- private String liabilityDep;
- /**
- * 15责任人
- */
- private String liabilityPeople;
- /**
- * 16责任人职务
- */
- private String liabilityPeopleJob;
- /**
- * 17整改时间
- */
- private Date rectifyTime;
- /**
- * 18允许延期时间
- */
- private Date rectifyTimeout;
- /**
- * 19负责人部门
- */
- private String leadDep;
- /**
- * 20负责人职务
- */
- private String leadJob;
- /**
- * 21整改人部门
- */
- private String rectifyDep;
- /**
- * 22整改人职务
- */
- private String rectifyPeopleJob;
- /**
- * 23整改人
- */
- private String rectifyPeople;
- /**
- * 24整改措施
- */
- private String rectifyMeasure;
- /**
- * 25整改开始时间
- */
- private Date rectifyStartTime;
- /**
- * 26整改完成时间
- */
- private Date rectifyFinishTime;
- /**
- * 27整改情况
- */
- private String rectifyDesc;
- /**
- * 28资金
- */
- private Double cost;
- /**
- * 29预案
- */
- private String plan;
- /**
- * 30防范措施
- */
- private String precautionMeasure;
- /**
- * 31验收时间
- */
- private Date acceptTime;
- /**
- * 32验收说明
- */
- private String acceptDesc;
- /**
- * 33验收部门
- */
- private String acceptDep;
- /**
- * 34验收人
- */
- private String acceptPeople;
- /**
- * 35验收人职务
- */
- private String acceptPeopleJob;
- /**
- * 36销号人部门
- */
- private String cancelDep;
- /**
- * 37销号人
- */
- private String cancelPeople;
- /**
- * 38销号人职务
- */
- private String cancelPeopleJob;
- /**
- * 39延期申请人
- */
- private String applyPeople;
- /**
- * 40申请时间
- */
- private Date applyTime;
- /**
- * 41申请理由
- */
- private String applyDesc;
- /**
- * 42申请-备注
- */
- private String applyNote;
- /**
- * 43申请延期时间
- */
- private Date applyTimeoutTime;
- /**
- * 44申请处理人
- */
- private String applyDealPeople;
- /**
- * 45申请处理时间
- */
- private Date appleDealTime;
- /**
- * 46流转责任部门
- */
- private String exchangeLeadDep;
- /**
- * 47流转责任人
- */
- private String exchangeLeadPeople;
- /**
- * 48流转责任人职务
- */
- private String exchangeLeadPeopleJob;
- /**
- * 49流转备注
- */
- private String exchangeDesc;
-
-
- private long tag;
-
-
-}
-
+package com.ruoyi.doublePrevention.entity.dto.resp;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * (RiskOldInfo)实体类
+ *
+ * @author makejava
+ * @since 2023-03-20 15:33:46
+ */
+@Data
+public class RiskOldInfoQueryRespDTO {
+
+
+ private Long id;
+ /**
+ * 2上报人部门
+ */
+ private String reportDep;
+ /**
+ * 3上报人职务
+ */
+ private String reportPeopleJob;
+ /**
+ * 4上报人
+ */
+ private String reportPeople;
+ /**
+ * 5发现人
+ */
+ private String findPeople;
+ /**
+ * 6发现时间
+ */
+ private Date findTime;
+ /**
+ * 7隐患内容
+ */
+ private String riskDesc;
+ /**
+ * 8隐患位置
+ */
+ private String riskSite;
+ /**
+ * 9隐患类型
+ */
+ private String riskType;
+ /**
+ * 10隐患级别
+ */
+ private String riskLevel;
+ /**
+ * 11隐患所在部门
+ */
+ private String riskDep;
+ /**
+ * 12检查类型
+ */
+ private String checkType;
+ /**
+ * 13专业
+ */
+ private String major;
+ /**
+ * 14责任人部门
+ */
+ private String liabilityDep;
+ /**
+ * 15责任人
+ */
+ private String liabilityPeople;
+ /**
+ * 16责任人职务
+ */
+ private String liabilityPeopleJob;
+ /**
+ * 17整改时间
+ */
+ private Date rectifyTime;
+ /**
+ * 18允许延期时间
+ */
+ private Date rectifyTimeout;
+ /**
+ * 19负责人部门
+ */
+ private String leadDep;
+ /**
+ * 20负责人职务
+ */
+ private String leadJob;
+ /**
+ * 21整改人部门
+ */
+ private String rectifyDep;
+ /**
+ * 22整改人职务
+ */
+ private String rectifyPeopleJob;
+ /**
+ * 23整改人
+ */
+ private String rectifyPeople;
+ /**
+ * 24整改措施
+ */
+ private String rectifyMeasure;
+ /**
+ * 25整改开始时间
+ */
+ private Date rectifyStartTime;
+ /**
+ * 26整改完成时间
+ */
+ private Date rectifyFinishTime;
+ /**
+ * 27整改情况
+ */
+ private String rectifyDesc;
+ /**
+ * 28资金
+ */
+ private Double cost;
+ /**
+ * 29预案
+ */
+ private String plan;
+ /**
+ * 30防范措施
+ */
+ private String precautionMeasure;
+ /**
+ * 31验收时间
+ */
+ private Date acceptTime;
+ /**
+ * 32验收说明
+ */
+ private String acceptDesc;
+ /**
+ * 33验收部门
+ */
+ private String acceptDep;
+ /**
+ * 34验收人
+ */
+ private String acceptPeople;
+ /**
+ * 35验收人职务
+ */
+ private String acceptPeopleJob;
+ /**
+ * 36销号人部门
+ */
+ private String cancelDep;
+ /**
+ * 37销号人
+ */
+ private String cancelPeople;
+ /**
+ * 38销号人职务
+ */
+ private String cancelPeopleJob;
+ /**
+ * 39延期申请人
+ */
+ private String applyPeople;
+ /**
+ * 40申请时间
+ */
+ private Date applyTime;
+ /**
+ * 41申请理由
+ */
+ private String applyDesc;
+ /**
+ * 42申请-备注
+ */
+ private String applyNote;
+ /**
+ * 43申请延期时间
+ */
+ private Date applyTimeoutTime;
+ /**
+ * 44申请处理人
+ */
+ private String applyDealPeople;
+ /**
+ * 45申请处理时间
+ */
+ private Date appleDealTime;
+ /**
+ * 46流转责任部门
+ */
+ private String exchangeLeadDep;
+ /**
+ * 47流转责任人
+ */
+ private String exchangeLeadPeople;
+ /**
+ * 48流转责任人职务
+ */
+ private String exchangeLeadPeopleJob;
+ /**
+ * 49流转备注
+ */
+ private String exchangeDesc;
+
+
+ private long tag;
+
+
+}
+
diff --git a/src/main/java/com/ruoyi/doublePrevention/enums/CJReportEnum.java b/src/main/java/com/ruoyi/doublePrevention/enums/CJReportEnum.java
index 044952d..cf8dba5 100644
--- a/src/main/java/com/ruoyi/doublePrevention/enums/CJReportEnum.java
+++ b/src/main/java/com/ruoyi/doublePrevention/enums/CJReportEnum.java
@@ -1,29 +1,29 @@
-package com.ruoyi.doublePrevention.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-
-public enum CJReportEnum {
-
- SUCCESS("100", "上报全部成功"),
- SUCESS_AND_FAIL("102", "上报部分成功"),
- FAIL("103", "上报全部失败"),
-
- ;
-
- String code;
- @JsonValue
- String value;
-
- CJReportEnum(String code, String value) {
- this.code = code;
- this.value = value;
- }
-
- public String getCode() {
- return code;
- }
-
- public String getValue() {
- return value;
- }
-}
+package com.ruoyi.doublePrevention.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public enum CJReportEnum {
+
+ SUCCESS("100", "上报全部成功"),
+ SUCESS_AND_FAIL("102", "上报部分成功"),
+ FAIL("103", "上报全部失败"),
+
+ ;
+
+ String code;
+ @JsonValue
+ String value;
+
+ CJReportEnum(String code, String value) {
+ this.code = code;
+ this.value = value;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public String getValue() {
+ return value;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/enums/E.java b/src/main/java/com/ruoyi/doublePrevention/enums/E.java
index d9cfe0b..ff21271 100644
--- a/src/main/java/com/ruoyi/doublePrevention/enums/E.java
+++ b/src/main/java/com/ruoyi/doublePrevention/enums/E.java
@@ -1,36 +1,36 @@
-package com.ruoyi.doublePrevention.enums;
-
-public enum E {
-
- DATA_PARAM_NULL("B0100","数据传参为空"),
- DATA_PARAM_CHECK_INVALID("B0101","数据校验非法"),
- DATA_DATABASE_EXIST("B0111","数据记录已存在"),
- DATA_DATABASE_DUPLICATED("B0113","数据记录重复"),
- DATA_DATABASE_NO_EXISTENT("B0114","查询不到对应记录"),
- DATA_DATABASE_EXIST_BUT_NOT_VALID("B0115","记录无效"),
- DATA_BING_RELATION("B0116","数据已被绑定关系"),
- DATA_STATUS_NOT_EXIST("B0120","数据状态不存在"),
- DATA_STATUS_CHECK_INVALID("B0121","数据状态不合法"),
- DATA_OPERATION_NO_PERMISSION("B0122","数据没有操作权限"),
- NOT_DELETE("B0131","无法删除"),
- ADD_FAIL("B0132","新增失败"),
- UPDATE_FAIL("B0133","修改失败"),
- EXPORT_FAIL("B0134","导出失败！"),
-
- ;
- private String code;
- private String desc;
-
- E(String code, String desc) {
- this.code = code;
- this.desc = desc;
- }
-
- public String getCode() {
- return code;
- }
-
- public String getDesc() {
- return desc;
- }
-}
+package com.ruoyi.doublePrevention.enums;
+
+public enum E {
+
+ DATA_PARAM_NULL("B0100","数据传参为空"),
+ DATA_PARAM_CHECK_INVALID("B0101","数据校验非法"),
+ DATA_DATABASE_EXIST("B0111","数据记录已存在"),
+ DATA_DATABASE_DUPLICATED("B0113","数据记录重复"),
+ DATA_DATABASE_NO_EXISTENT("B0114","查询不到对应记录"),
+ DATA_DATABASE_EXIST_BUT_NOT_VALID("B0115","记录无效"),
+ DATA_BING_RELATION("B0116","数据已被绑定关系"),
+ DATA_STATUS_NOT_EXIST("B0120","数据状态不存在"),
+ DATA_STATUS_CHECK_INVALID("B0121","数据状态不合法"),
+ DATA_OPERATION_NO_PERMISSION("B0122","数据没有操作权限"),
+ NOT_DELETE("B0131","无法删除"),
+ ADD_FAIL("B0132","新增失败"),
+ UPDATE_FAIL("B0133","修改失败"),
+ EXPORT_FAIL("B0134","导出失败！"),
+
+ ;
+ private String code;
+ private String desc;
+
+ E(String code, String desc) {
+ this.code = code;
+ this.desc = desc;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public String getDesc() {
+ return desc;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/enums/StatusEnum.java b/src/main/java/com/ruoyi/doublePrevention/enums/StatusEnum.java
index fe3e9a7..8bca0d9 100644
--- a/src/main/java/com/ruoyi/doublePrevention/enums/StatusEnum.java
+++ b/src/main/java/com/ruoyi/doublePrevention/enums/StatusEnum.java
@@ -1,35 +1,35 @@
-package com.ruoyi.doublePrevention.enums;
-
-import com.fasterxml.jackson.annotation.JsonValue;
-
-public enum StatusEnum {
-
- DELETE_STATUS_USE((byte) 0, "正常"),
- DELETE_STATUS_DISCARD((byte) 1, "删除"),
-
- EXEC_FAIL((byte) 0, "操作失败"),
- EXEC_SUCCESS((byte) 1, "操作成功"),
-
- RECTIFY_ING((byte) 0, "整改中"),
- RECTIFY_WAIT_ACCEPT((byte) 1, "待验收"),
- RECTIFY_TIMEOUT((byte) 2, "延期整改"),
- RECTIFY_TIMEOUT_AND_FAIL((byte) 3, "超期未整改"),
- ACCEPT_SUCCESS((byte) 9, "已验收"),
- ;
- byte code;
- @JsonValue
- String value;
-
- StatusEnum(byte code, String value) {
- this.code = code;
- this.value = value;
- }
-
- public byte getCode() {
- return code;
- }
-
- public String getValue() {
- return value;
- }
-}
+package com.ruoyi.doublePrevention.enums;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public enum StatusEnum {
+
+ DELETE_STATUS_USE((byte) 0, "正常"),
+ DELETE_STATUS_DISCARD((byte) 1, "删除"),
+
+ EXEC_FAIL((byte) 0, "操作失败"),
+ EXEC_SUCCESS((byte) 1, "操作成功"),
+
+ RECTIFY_ING((byte) 0, "整改中"),
+ RECTIFY_WAIT_ACCEPT((byte) 1, "待验收"),
+ RECTIFY_TIMEOUT((byte) 2, "延期整改"),
+ RECTIFY_TIMEOUT_AND_FAIL((byte) 3, "超期未整改"),
+ ACCEPT_SUCCESS((byte) 9, "已验收"),
+ ;
+ byte code;
+ @JsonValue
+ String value;
+
+ StatusEnum(byte code, String value) {
+ this.code = code;
+ this.value = value;
+ }
+
+ public byte getCode() {
+ return code;
+ }
+
+ public String getValue() {
+ return value;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/exception/AusinessException.java b/src/main/java/com/ruoyi/doublePrevention/exception/AusinessException.java
index 5d64b98..035d643 100644
--- a/src/main/java/com/ruoyi/doublePrevention/exception/AusinessException.java
+++ b/src/main/java/com/ruoyi/doublePrevention/exception/AusinessException.java
@@ -1,40 +1,40 @@
-package com.ruoyi.doublePrevention.exception;
-
-
-import com.ruoyi.doublePrevention.enums.E;
-
-public class AusinessException extends RuntimeException {
-
- private String code;
-
- private String message;
-
- public AusinessException(String code, String message) {
- super(message);
- this.message = message;
- this.code = code;
- }
-
- public AusinessException(E e, String message) {
- super(message);
- this.message = message;
- this.code = e.getCode();
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- @Override
- public String getMessage() {
- return message;
- }
-
- public void setMessage(String message) {
- this.message = message;
- }
-}
+package com.ruoyi.doublePrevention.exception;
+
+
+import com.ruoyi.doublePrevention.enums.E;
+
+public class AusinessException extends RuntimeException {
+
+ private String code;
+
+ private String message;
+
+ public AusinessException(String code, String message) {
+ super(message);
+ this.message = message;
+ this.code = code;
+ }
+
+ public AusinessException(E e, String message) {
+ super(message);
+ this.message = message;
+ this.code = e.getCode();
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ @Override
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/exception/BusinessException.java b/src/main/java/com/ruoyi/doublePrevention/exception/BusinessException.java
index 6755d06..546dcfa 100644
--- a/src/main/java/com/ruoyi/doublePrevention/exception/BusinessException.java
+++ b/src/main/java/com/ruoyi/doublePrevention/exception/BusinessException.java
@@ -1,40 +1,40 @@
-package com.ruoyi.doublePrevention.exception;
-
-
-import com.ruoyi.doublePrevention.enums.ResultCodes;
-
-public class BusinessException extends RuntimeException {
-
- private String code;
-
- private String message;
-
- public BusinessException(ResultCodes error) {
- super(error.getDesc());
- this.code = error.getCode();
- this.message = error.getDesc();
- }
-
- public BusinessException(String code,String message) {
- super(message);
- this.code = code;
- this.message = message;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- @Override
- public String getMessage() {
- return message;
- }
-
- public void setMessage(String message) {
- this.message = message;
- }
-}
+package com.ruoyi.doublePrevention.exception;
+
+
+import com.ruoyi.doublePrevention.enums.ResultCodes;
+
+public class BusinessException extends RuntimeException {
+
+ private String code;
+
+ private String message;
+
+ public BusinessException(ResultCodes error) {
+ super(error.getDesc());
+ this.code = error.getCode();
+ this.message = error.getDesc();
+ }
+
+ public BusinessException(String code,String message) {
+ super(message);
+ this.code = code;
+ this.message = message;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ @Override
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckRecordFromTaskRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckRecordFromTaskRepository.java
index 28064b1..380271d 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckRecordFromTaskRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckRecordFromTaskRepository.java
@@ -1,44 +1,44 @@
-package com.ruoyi.doublePrevention.repository;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckRecordFromTask;
-import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-import io.lettuce.core.dynamic.annotation.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface PreventCJReportCheckRecordFromTaskRepository extends BaseMapper<PreventCJReportCheckRecordFromTask> {
-
-// /**
-// * 任务记录-分页查询
-// * */
-// IPage<PreventCJReportCheckRecordFromTask> getReportTaskFromWorkPage(Page<Object> objectPage, PreventReportCheckRecordFromTaskReqDTO queryReqDTO);
- /**
- * 任务-查询待上报
- * */
- List<PreventCJReportCheckRecordFromTask> listReportTaskRecordDate();
- /**
- * 任务-待上报状态变更
- * */
- int updateTaskReportStatus(HandlerReportParam handlerReportParam);
- /**
- * 任务-待上报状态变更 - 通过id
- * */
- int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
- /**
- * 插入任务记录
- * */
- int insertRecord(PreventCJReportCheckRecordFromTask recordFromTasks);
- /**
- * 批量插入任务记录
- * */
- int insertRecordList(@Param(value="list") List<PreventCJReportCheckRecordFromTask> recordFromTaskList);
-
- int updateCJReportStatusBatchById(List<PreventCJReportCheckRecordFromTask> cjRecordFromTasks);
-}
+package com.ruoyi.doublePrevention.repository;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckRecordFromTask;
+import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import io.lettuce.core.dynamic.annotation.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface PreventCJReportCheckRecordFromTaskRepository extends BaseMapper<PreventCJReportCheckRecordFromTask> {
+
+// /**
+// * 任务记录-分页查询
+// * */
+// IPage<PreventCJReportCheckRecordFromTask> getReportTaskFromWorkPage(Page<Object> objectPage, PreventReportCheckRecordFromTaskReqDTO queryReqDTO);
+ /**
+ * 任务-查询待上报
+ * */
+ List<PreventCJReportCheckRecordFromTask> listReportTaskRecordDate();
+ /**
+ * 任务-待上报状态变更
+ * */
+ int updateTaskReportStatus(HandlerReportParam handlerReportParam);
+ /**
+ * 任务-待上报状态变更 - 通过id
+ * */
+ int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
+ /**
+ * 插入任务记录
+ * */
+ int insertRecord(PreventCJReportCheckRecordFromTask recordFromTasks);
+ /**
+ * 批量插入任务记录
+ * */
+ int insertRecordList(@Param(value="list") List<PreventCJReportCheckRecordFromTask> recordFromTaskList);
+
+ int updateCJReportStatusBatchById(List<PreventCJReportCheckRecordFromTask> cjRecordFromTasks);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckTaskFromWorkRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckTaskFromWorkRepository.java
index 4d49232..5c199a4 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckTaskFromWorkRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportCheckTaskFromWorkRepository.java
@@ -1,44 +1,44 @@
-package com.ruoyi.doublePrevention.repository;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckTaskFromWork;
-import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface PreventCJReportCheckTaskFromWorkRepository extends BaseMapper<PreventCJReportCheckTaskFromWork> {
-
- /**
- * 任务配置 -查询待上报
- * */
- List<PreventCJReportCheckTaskFromWork> listReportTaskFromWorkDate();
- /**
- * 任务配置 -待上报状态变更
- * */
- int updateWorkReportStatus(HandlerReportParam handlerReportParam);
- /**
- * 任务配置 -待上报状态变更 -通过id
- * */
- int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
- /**
- * 插入数据
- * */
- int insertTaskFromWorkList(PreventCJReportCheckTaskFromWork cjTaskFromWork);
-
- PreventCJReportCheckTaskFromWork geByMeasureUUidAndJobId(String measureUuid, Long jobId);
-
-
-
- List<PreventCJReportCheckTaskFromWork> listWork();
-
- int updateInfo(PreventCJReportCheckTaskFromWork work);
-
- List<PreventCJReportCheckTaskFromWork> listWork1();
-
- int updateInfo1(PreventCJReportCheckTaskFromWork work);
-}
+package com.ruoyi.doublePrevention.repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckTaskFromWork;
+import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface PreventCJReportCheckTaskFromWorkRepository extends BaseMapper<PreventCJReportCheckTaskFromWork> {
+
+ /**
+ * 任务配置 -查询待上报
+ * */
+ List<PreventCJReportCheckTaskFromWork> listReportTaskFromWorkDate();
+ /**
+ * 任务配置 -待上报状态变更
+ * */
+ int updateWorkReportStatus(HandlerReportParam handlerReportParam);
+ /**
+ * 任务配置 -待上报状态变更 -通过id
+ * */
+ int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
+ /**
+ * 插入数据
+ * */
+ int insertTaskFromWorkList(PreventCJReportCheckTaskFromWork cjTaskFromWork);
+
+ PreventCJReportCheckTaskFromWork geByMeasureUUidAndJobId(String measureUuid, Long jobId);
+
+
+
+ List<PreventCJReportCheckTaskFromWork> listWork();
+
+ int updateInfo(PreventCJReportCheckTaskFromWork work);
+
+ List<PreventCJReportCheckTaskFromWork> listWork1();
+
+ int updateInfo1(PreventCJReportCheckTaskFromWork work);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportConfigLogRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportConfigLogRepository.java
index e6d078a..1951a01 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportConfigLogRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportConfigLogRepository.java
@@ -1,14 +1,14 @@
-package com.ruoyi.doublePrevention.repository;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportConfigLog;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface PreventCJReportConfigLogRepository extends BaseMapper<PreventCJReportConfigLog> {
-//
-// /** extends BaseMapper<>
-// * 数据上报配置历史记录-查询
-// */
-// IPage<PreventCJReportConfigLog> getReportConfigLogPage(Page<Object> page, PreventReportConfigLogQueryReqDTO queryReqDTO);
-}
+package com.ruoyi.doublePrevention.repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportConfigLog;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface PreventCJReportConfigLogRepository extends BaseMapper<PreventCJReportConfigLog> {
+//
+// /** extends BaseMapper<>
+// * 数据上报配置历史记录-查询
+// */
+// IPage<PreventCJReportConfigLog> getReportConfigLogPage(Page<Object> page, PreventReportConfigLogQueryReqDTO queryReqDTO);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportConfigRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportConfigRepository.java
index 267ed91..454c718 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportConfigRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportConfigRepository.java
@@ -1,23 +1,23 @@
-package com.ruoyi.doublePrevention.repository;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportConfig;
-import com.ruoyi.doublePrevention.repository.param.PreventReportConfigUpdateParams;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface PreventCJReportConfigRepository extends BaseMapper<PreventCJReportConfig> {
-
-
- /**
- * 数据上报配置-查询
- */
- List<PreventCJReportConfig> ListReportConfigs();
-
- /**
- * 数据上报配置-修改
- */
- int updateReportConfig(PreventReportConfigUpdateParams updateParams);
-}
+package com.ruoyi.doublePrevention.repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportConfig;
+import com.ruoyi.doublePrevention.repository.param.PreventReportConfigUpdateParams;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface PreventCJReportConfigRepository extends BaseMapper<PreventCJReportConfig> {
+
+
+ /**
+ * 数据上报配置-查询
+ */
+ List<PreventCJReportConfig> ListReportConfigs();
+
+ /**
+ * 数据上报配置-修改
+ */
+ int updateReportConfig(PreventReportConfigUpdateParams updateParams);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportDangerInfoRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportDangerInfoRepository.java
index 3ade7e1..696ec2d 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportDangerInfoRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportDangerInfoRepository.java
@@ -1,40 +1,40 @@
-package com.ruoyi.doublePrevention.repository;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo;
-import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface PreventCJReportDangerInfoRepository extends BaseMapper<PreventCJReportDangerInfo> {
-//
-// /**
-// * 上报数据-隐患信息-分页查询
-// */
-// IPage<PreventCJReportDangerInfo> getReportDangerInfoPage(Page<Object> objectPage, PreventReportDangerInfoReqDTO queryReqDTO);
- /**
- * 上报数据-待上报数据查询
- */
- List<PreventCJReportDangerInfo> listReportDangerDate();
- /**
- * 上报数据-待上报状态变更
- */
- int updateTaskReportStatus(HandlerReportParam handlerReportParam);
- /**
- * 上报数据-待上报状态变更-通过id
- */
- int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
- /**
- * 上报数据-插入
- */
- int insertDangerInfo(PreventCJReportDangerInfo danger);
-
- List<PreventCJReportDangerInfo> getDangerListForCheckTask();
-
- PreventCJReportDangerInfo getDangerById(String dangerId);
-}
+package com.ruoyi.doublePrevention.repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo;
+import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface PreventCJReportDangerInfoRepository extends BaseMapper<PreventCJReportDangerInfo> {
+//
+// /**
+// * 上报数据-隐患信息-分页查询
+// */
+// IPage<PreventCJReportDangerInfo> getReportDangerInfoPage(Page<Object> objectPage, PreventReportDangerInfoReqDTO queryReqDTO);
+ /**
+ * 上报数据-待上报数据查询
+ */
+ List<PreventCJReportDangerInfo> listReportDangerDate();
+ /**
+ * 上报数据-待上报状态变更
+ */
+ int updateTaskReportStatus(HandlerReportParam handlerReportParam);
+ /**
+ * 上报数据-待上报状态变更-通过id
+ */
+ int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
+ /**
+ * 上报数据-插入
+ */
+ int insertDangerInfo(PreventCJReportDangerInfo danger);
+
+ List<PreventCJReportDangerInfo> getDangerListForCheckTask();
+
+ PreventCJReportDangerInfo getDangerById(String dangerId);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportOverhaulLogRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportOverhaulLogRepository.java
index f23a210..6d14fb5 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportOverhaulLogRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportOverhaulLogRepository.java
@@ -1,18 +1,18 @@
-package com.ruoyi.doublePrevention.repository;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportOverhaulLog;
-import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface PreventCJReportOverhaulLogRepository extends BaseMapper<PreventCJReportOverhaulLog> {
-
- int insertCJOverhaulLists(PreventCJReportOverhaulLog cjOverhaulLog);
-
- List<PreventCJReportOverhaulLog> listReportOverhaulDate();
-
- int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
-}
+package com.ruoyi.doublePrevention.repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportOverhaulLog;
+import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface PreventCJReportOverhaulLogRepository extends BaseMapper<PreventCJReportOverhaulLog> {
+
+ int insertCJOverhaulLists(PreventCJReportOverhaulLog cjOverhaulLog);
+
+ List<PreventCJReportOverhaulLog> listReportOverhaulDate();
+
+ int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportPointRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportPointRepository.java
index 16401bc..e7a16e8 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportPointRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportPointRepository.java
@@ -1,9 +1,9 @@
-package com.ruoyi.doublePrevention.repository;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportPoint;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface PreventCJReportPointRepository extends BaseMapper<PreventCJReportPoint> {
-}
+package com.ruoyi.doublePrevention.repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportPoint;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface PreventCJReportPointRepository extends BaseMapper<PreventCJReportPoint> {
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportResultDataRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportResultDataRepository.java
index 4963c2e..c365cc6 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportResultDataRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportResultDataRepository.java
@@ -1,9 +1,9 @@
-package com.ruoyi.doublePrevention.repository;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportResultData;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface PreventCJReportResultDataRepository extends BaseMapper<PreventCJReportResultData> {
-}
+package com.ruoyi.doublePrevention.repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportResultData;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface PreventCJReportResultDataRepository extends BaseMapper<PreventCJReportResultData> {
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskAnaUnitRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskAnaUnitRepository.java
index 39326ef..cc94dab 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskAnaUnitRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskAnaUnitRepository.java
@@ -1,33 +1,33 @@
-package com.ruoyi.doublePrevention.repository;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskAnaUnit;
-import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface PreventCJReportRiskAnaUnitRepository extends BaseMapper<PreventCJReportRiskAnaUnit> {
-
-// /**
-// * 上报数据-风险分析单元-分页查询
-// */
-// IPage<PreventCJReportRiskAnaUnit> getReportRiskUnitPage(Page<Object> page, PreReportRiskUnitQueryReqDTO queryReqDTO);
- /**
- * 上报数据-查询待上报数据
- */
- List<PreventCJReportRiskAnaUnit> listReportUnitDate();
- /**
- * 上报数据-修改待上报
- */
- int updateReportStatus();
- /**
- * 上报数据-修改待上报-通过id
- */
- int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
- /**
- * 上报数据-插入
- */
- int insertUnitList(PreventCJReportRiskAnaUnit unit);
-}
+package com.ruoyi.doublePrevention.repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskAnaUnit;
+import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface PreventCJReportRiskAnaUnitRepository extends BaseMapper<PreventCJReportRiskAnaUnit> {
+
+// /**
+// * 上报数据-风险分析单元-分页查询
+// */
+// IPage<PreventCJReportRiskAnaUnit> getReportRiskUnitPage(Page<Object> page, PreReportRiskUnitQueryReqDTO queryReqDTO);
+ /**
+ * 上报数据-查询待上报数据
+ */
+ List<PreventCJReportRiskAnaUnit> listReportUnitDate();
+ /**
+ * 上报数据-修改待上报
+ */
+ int updateReportStatus();
+ /**
+ * 上报数据-修改待上报-通过id
+ */
+ int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
+ /**
+ * 上报数据-插入
+ */
+ int insertUnitList(PreventCJReportRiskAnaUnit unit);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskControlMeasureRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskControlMeasureRepository.java
index d777f25..f36e7e1 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskControlMeasureRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskControlMeasureRepository.java
@@ -1,39 +1,39 @@
-package com.ruoyi.doublePrevention.repository;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskControlMeasure;
-import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface PreventCJReportRiskControlMeasureRepository extends BaseMapper<PreventCJReportRiskControlMeasure> {
-
-// /**
-// * 上报数据-管控措施-分页查询
-// */
-// IPage<PreventCJReportRiskControlMeasure> getReportMeasurePage(Page<Object> objectPage, PreventReportRiskControlMeasureReqDTO queryReqDTO);
- /**
- * 批量插入
- * */
- int insertList(List<PreventCJReportRiskControlMeasure> measureLists);
-
- /**
- * 管控措施-上报数据
- * */
- List<PreventCJReportRiskControlMeasure> listReportMeasureDate();
- /**
- * 管控措施-修改上报状态
- * */
- int updateMeasureReportStatus(HandlerReportParam handlerReportParam);
- /**
- * 管控措施-修改上报状态-通过id
- * */
- int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
- /**
- * 插入管控措施上报数据
- * */
- int insertMeasureList(PreventCJReportRiskControlMeasure cjMeasure);
-}
+package com.ruoyi.doublePrevention.repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskControlMeasure;
+import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface PreventCJReportRiskControlMeasureRepository extends BaseMapper<PreventCJReportRiskControlMeasure> {
+
+// /**
+// * 上报数据-管控措施-分页查询
+// */
+// IPage<PreventCJReportRiskControlMeasure> getReportMeasurePage(Page<Object> objectPage, PreventReportRiskControlMeasureReqDTO queryReqDTO);
+ /**
+ * 批量插入
+ * */
+ int insertList(List<PreventCJReportRiskControlMeasure> measureLists);
+
+ /**
+ * 管控措施-上报数据
+ * */
+ List<PreventCJReportRiskControlMeasure> listReportMeasureDate();
+ /**
+ * 管控措施-修改上报状态
+ * */
+ int updateMeasureReportStatus(HandlerReportParam handlerReportParam);
+ /**
+ * 管控措施-修改上报状态-通过id
+ * */
+ int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
+ /**
+ * 插入管控措施上报数据
+ * */
+ int insertMeasureList(PreventCJReportRiskControlMeasure cjMeasure);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskEventRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskEventRepository.java
index 8d6432e..6de51fa 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskEventRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventCJReportRiskEventRepository.java
@@ -1,41 +1,41 @@
-package com.ruoyi.doublePrevention.repository;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskEvent;
-import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface PreventCJReportRiskEventRepository extends BaseMapper<PreventCJReportRiskEvent> {
-
-
-// /**
-// * 分页查询
-// * */
-// IPage<PreventCJReportRiskEvent> getReportRiskEventPage(Page<Object> objectPage, PreReportRiskEventQueryReqDTO queryReqDTO);
-
- /**
- * 批量插入
- * */
- int saveList(List<PreventCJReportRiskEvent> eventLists);
-
- /**
- * 上报数据-查询待上报数据
- * */
- List<PreventCJReportRiskEvent> listReportEventDate();
- /**
- * 修改上报状态
- * */
- int updateEventReportStatus(HandlerReportParam handlerReportParam);
- /**
- * 修改上报状态-通过id
- * */
- int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
- /**
- * 插入风险事件数据
- * */
- int insertEventLists(PreventCJReportRiskEvent event);
-}
+package com.ruoyi.doublePrevention.repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskEvent;
+import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface PreventCJReportRiskEventRepository extends BaseMapper<PreventCJReportRiskEvent> {
+
+
+// /**
+// * 分页查询
+// * */
+// IPage<PreventCJReportRiskEvent> getReportRiskEventPage(Page<Object> objectPage, PreReportRiskEventQueryReqDTO queryReqDTO);
+
+ /**
+ * 批量插入
+ * */
+ int saveList(List<PreventCJReportRiskEvent> eventLists);
+
+ /**
+ * 上报数据-查询待上报数据
+ * */
+ List<PreventCJReportRiskEvent> listReportEventDate();
+ /**
+ * 修改上报状态
+ * */
+ int updateEventReportStatus(HandlerReportParam handlerReportParam);
+ /**
+ * 修改上报状态-通过id
+ * */
+ int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
+ /**
+ * 插入风险事件数据
+ * */
+ int insertEventLists(PreventCJReportRiskEvent event);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventOverhaulLogRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventOverhaulLogRepository.java
index fb771de..160c5f5 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventOverhaulLogRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventOverhaulLogRepository.java
@@ -1,29 +1,29 @@
-package com.ruoyi.doublePrevention.repository;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.doublePrevention.entity.PreventOverhaulLog;
-import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogReqBO;
-import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogUpdateReqBO;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface PreventOverhaulLogRepository extends BaseMapper<PreventOverhaulLog> {
-
- List<PreventOverhaulLog> selectOverhaulLogPage(@Param("overhaulLogReqBO") PreventOverhaulLogReqBO overhaulLogReqBO);
-
- int savePreventOverhaulLog(PreventOverhaulLog preventOverhaulLog);
-
- PreventOverhaulLog getOverhaulLogById(Long id);
-
- int updateOverhaulLog(@Param("preventOverhaulLog") PreventOverhaulLog preventOverhaulLog);
-
- int deleteOverhaulLogByIds(String[] ids);
-
- List<PreventOverhaulLog> listReportOverhaulLog();
-
- int updateOverhaulReportStatus(HandlerReportParam handlerReportParam);
-}
+package com.ruoyi.doublePrevention.repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.doublePrevention.entity.PreventOverhaulLog;
+import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogReqBO;
+import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogUpdateReqBO;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface PreventOverhaulLogRepository extends BaseMapper<PreventOverhaulLog> {
+
+ List<PreventOverhaulLog> selectOverhaulLogPage(@Param("overhaulLogReqBO") PreventOverhaulLogReqBO overhaulLogReqBO);
+
+ int savePreventOverhaulLog(PreventOverhaulLog preventOverhaulLog);
+
+ PreventOverhaulLog getOverhaulLogById(Long id);
+
+ int updateOverhaulLog(@Param("preventOverhaulLog") PreventOverhaulLog preventOverhaulLog);
+
+ int deleteOverhaulLogByIds(String[] ids);
+
+ List<PreventOverhaulLog> listReportOverhaulLog();
+
+ int updateOverhaulReportStatus(HandlerReportParam handlerReportParam);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskCheckUnitRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskCheckUnitRepository.java
index e109d14..4ff5931 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskCheckUnitRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskCheckUnitRepository.java
@@ -1,26 +1,26 @@
-package com.ruoyi.doublePrevention.repository;
-
-import com.ruoyi.doublePrevention.entity.PreventRiskCheckUnit;
-import com.ruoyi.project.tr.baseCheckPoint.domain.BaseCheckPoint;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface PreventRiskCheckUnitRepository {
-
- /**
- * 保存原检查点与管控措施的对应关系
- */
- int insertPointAndMeasure(PreventRiskCheckUnit checkUnit);
-
- List<PreventRiskCheckUnit> getUnitByRiskId(String riskId);
- /**
- * 删除原检查点与管控措施的对应关系
- */
- int deletePointAndMeasure(String id);
- /**
- * 通过baseCheckPointId 查询管控措施列表
- */
- PreventRiskCheckUnit getUnitByBaseCheckPointId(Long baseCheckPointId);
-}
+package com.ruoyi.doublePrevention.repository;
+
+import com.ruoyi.doublePrevention.entity.PreventRiskCheckUnit;
+import com.ruoyi.project.tr.baseCheckPoint.domain.BaseCheckPoint;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface PreventRiskCheckUnitRepository {
+
+ /**
+ * 保存原检查点与管控措施的对应关系
+ */
+ int insertPointAndMeasure(PreventRiskCheckUnit checkUnit);
+
+ List<PreventRiskCheckUnit> getUnitByRiskId(String riskId);
+ /**
+ * 删除原检查点与管控措施的对应关系
+ */
+ int deletePointAndMeasure(String id);
+ /**
+ * 通过baseCheckPointId 查询管控措施列表
+ */
+ PreventRiskCheckUnit getUnitByBaseCheckPointId(Long baseCheckPointId);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerCheckAndMeasureRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerCheckAndMeasureRepository.java
index 04dcf25..5bf8b4e 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerCheckAndMeasureRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerCheckAndMeasureRepository.java
@@ -1,24 +1,24 @@
-package com.ruoyi.doublePrevention.repository;
-
-import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckAndMeasure;
-import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface PreventRiskDangerCheckAndMeasureRepository {
-
- /**
- * 写入核查任务检查点与管控措施信息
- * */
- int insertCheckAndMeasure(PreventRiskDangerCheckAndMeasure checkAndMeasure);
-
- List<PreventRiskDangerCheckAndMeasure> getByBaseCheckPointId(Long checkPointId);
-
- PreventRiskDangerCheckAndMeasure getByDangerCheckPointId(Long dangerCheckPointId);
-
- int updateCheckDesc(HiddenDangerCheckPoint hdcp);
-
- List<PreventRiskDangerCheckAndMeasure> getByCheckId(Long checkId);
-}
+package com.ruoyi.doublePrevention.repository;
+
+import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckAndMeasure;
+import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface PreventRiskDangerCheckAndMeasureRepository {
+
+ /**
+ * 写入核查任务检查点与管控措施信息
+ * */
+ int insertCheckAndMeasure(PreventRiskDangerCheckAndMeasure checkAndMeasure);
+
+ List<PreventRiskDangerCheckAndMeasure> getByBaseCheckPointId(Long checkPointId);
+
+ PreventRiskDangerCheckAndMeasure getByDangerCheckPointId(Long dangerCheckPointId);
+
+ int updateCheckDesc(HiddenDangerCheckPoint hdcp);
+
+ List<PreventRiskDangerCheckAndMeasure> getByCheckId(Long checkId);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerCheckLogRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerCheckLogRepository.java
index fbaa950..fbfafc8 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerCheckLogRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerCheckLogRepository.java
@@ -1,49 +1,49 @@
-package com.ruoyi.doublePrevention.repository;
-
-import com.ruoyi.doublePrevention.entity.CJReport.CJdto.Data;
-import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckLog;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-import org.springframework.stereotype.Repository;
-
-import java.util.Date;
-import java.util.List;
-
-@Repository
-public interface PreventRiskDangerCheckLogRepository {
- /**
- * 定时生成排查任务记录时，
- * 插入排查记录附属表
- */
- int insertDangerCheckLog(PreventRiskDangerCheckLog dangerCheck);
- /**
- * 删除定时核查任务
- * */
- int deleteDangerCheck(Long checkId);
-
-
-
- /**
- * 检索需要上报的任务记录
- * */
- List<PreventRiskDangerCheckLog> listReportTask();
- /**
- * 修改上报的数据状态
- * */
- int updateEventReportStatus(HandlerReportParam handlerReportParam);
- /**
- * 查询by checkId
- * */
- PreventRiskDangerCheckLog getByDangerCheckByCheckId(Long checkId);
-
- PreventRiskDangerCheckLog getByDangerCheckByJobId(Long jobId);
-
- int updateCheckLog(Long checkId, Long mobileCode);
-
- int updateTaskReportStatusByList(List<Long> ids, Byte reportStatus, Date reportTime);
-
- List<PreventRiskDangerCheckLog> listRectifyReportTask();
-
- List<PreventRiskDangerCheckLog> listSearchRectifyReportTask();
-
- int updateSearchRectifyReportTask(PreventRiskDangerCheckLog dangerCheckLog);
-}
+package com.ruoyi.doublePrevention.repository;
+
+import com.ruoyi.doublePrevention.entity.CJReport.CJdto.Data;
+import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckLog;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import org.springframework.stereotype.Repository;
+
+import java.util.Date;
+import java.util.List;
+
+@Repository
+public interface PreventRiskDangerCheckLogRepository {
+ /**
+ * 定时生成排查任务记录时，
+ * 插入排查记录附属表
+ */
+ int insertDangerCheckLog(PreventRiskDangerCheckLog dangerCheck);
+ /**
+ * 删除定时核查任务
+ * */
+ int deleteDangerCheck(Long checkId);
+
+
+
+ /**
+ * 检索需要上报的任务记录
+ * */
+ List<PreventRiskDangerCheckLog> listReportTask();
+ /**
+ * 修改上报的数据状态
+ * */
+ int updateEventReportStatus(HandlerReportParam handlerReportParam);
+ /**
+ * 查询by checkId
+ * */
+ PreventRiskDangerCheckLog getByDangerCheckByCheckId(Long checkId);
+
+ PreventRiskDangerCheckLog getByDangerCheckByJobId(Long jobId);
+
+ int updateCheckLog(Long checkId, Long mobileCode);
+
+ int updateTaskReportStatusByList(List<Long> ids, Byte reportStatus, Date reportTime);
+
+ List<PreventRiskDangerCheckLog> listRectifyReportTask();
+
+ List<PreventRiskDangerCheckLog> listSearchRectifyReportTask();
+
+ int updateSearchRectifyReportTask(PreventRiskDangerCheckLog dangerCheckLog);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerConfirmLogRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerConfirmLogRepository.java
index 6db7531..2d5a4e6 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerConfirmLogRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerConfirmLogRepository.java
@@ -1,18 +1,18 @@
-package com.ruoyi.doublePrevention.repository;
-
-
-import com.ruoyi.doublePrevention.entity.PreventRiskDangerConfirmLog;
-import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface PreventRiskDangerConfirmLogRepository {
-
-
- int saveConfirmLog(PreventRiskDangerConfirmLog confirmLog);
-
-
- List<PreventRiskDangerConfirmLog> getLogsByDangerCheckPointId(Long dangerCheckPointId);
-}
+package com.ruoyi.doublePrevention.repository;
+
+
+import com.ruoyi.doublePrevention.entity.PreventRiskDangerConfirmLog;
+import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface PreventRiskDangerConfirmLogRepository {
+
+
+ int saveConfirmLog(PreventRiskDangerConfirmLog confirmLog);
+
+
+ List<PreventRiskDangerConfirmLog> getLogsByDangerCheckPointId(Long dangerCheckPointId);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerInfoRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerInfoRepository.java
index 18da464..3d1ad90 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerInfoRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskDangerInfoRepository.java
@@ -1,51 +1,51 @@
-package com.ruoyi.doublePrevention.repository;
-
-import com.ruoyi.doublePrevention.entity.PreventRiskDangerInfo;
-import com.ruoyi.doublePrevention.entity.dto.DataCountDangerResultRespDO;
-import com.ruoyi.doublePrevention.repository.param.DataCountStartAndEndTimeParams;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.Date;
-import java.util.List;
-
-@Repository
-public interface PreventRiskDangerInfoRepository {
-
- /**
- * 新增隐患上报
- * */
- int insertDangerInfo(PreventRiskDangerInfo dangerInfo);
- /**
- * 修改隐患上报
- * */
- int updateDangerInfo(PreventRiskDangerInfo dangerInfo);
-
- int deleteDangerInfo(Long id);
- /**
- * 修改隐患整改状态
- */
- int updateDangerInfoState(PreventRiskDangerInfo dangerInfo);
-
- /**
- * @description 统计时间段内所有、死亡、重伤、轻伤的隐患数量
- */
- DataCountDangerResultRespDO listDangerResultCountByTime(@Param("startTime") Date startTime, @Param("endTime") Date endTime,@Param("depIds") List<Long> depIds);
-
-
-
- /**
- * 搜索需要上报的隐患
- */
- List<PreventRiskDangerInfo> listReportDanger();
- /**
- * 修改上报的数据的姿态
- */
- PreventRiskDangerInfo updateDangerInfoReportStatus(HandlerReportParam handlerReportParam);
- /**
- * 查询隐患附属表信息
- */
- PreventRiskDangerInfo getByHiddenDangerId(Long id);
-
-}
+package com.ruoyi.doublePrevention.repository;
+
+import com.ruoyi.doublePrevention.entity.PreventRiskDangerInfo;
+import com.ruoyi.doublePrevention.entity.dto.DataCountDangerResultRespDO;
+import com.ruoyi.doublePrevention.repository.param.DataCountStartAndEndTimeParams;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.Date;
+import java.util.List;
+
+@Repository
+public interface PreventRiskDangerInfoRepository {
+
+ /**
+ * 新增隐患上报
+ * */
+ int insertDangerInfo(PreventRiskDangerInfo dangerInfo);
+ /**
+ * 修改隐患上报
+ * */
+ int updateDangerInfo(PreventRiskDangerInfo dangerInfo);
+
+ int deleteDangerInfo(Long id);
+ /**
+ * 修改隐患整改状态
+ */
+ int updateDangerInfoState(PreventRiskDangerInfo dangerInfo);
+
+ /**
+ * @description 统计时间段内所有、死亡、重伤、轻伤的隐患数量
+ */
+ DataCountDangerResultRespDO listDangerResultCountByTime(@Param("startTime") Date startTime, @Param("endTime") Date endTime,@Param("depIds") List<Long> depIds);
+
+
+
+ /**
+ * 搜索需要上报的隐患
+ */
+ List<PreventRiskDangerInfo> listReportDanger();
+ /**
+ * 修改上报的数据的姿态
+ */
+ PreventRiskDangerInfo updateDangerInfoReportStatus(HandlerReportParam handlerReportParam);
+ /**
+ * 查询隐患附属表信息
+ */
+ PreventRiskDangerInfo getByHiddenDangerId(Long id);
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskJobAndMeasureRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskJobAndMeasureRepository.java
index 50d7b79..f228528 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskJobAndMeasureRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskJobAndMeasureRepository.java
@@ -1,45 +1,45 @@
-package com.ruoyi.doublePrevention.repository;
-
-import com.ruoyi.doublePrevention.entity.PreventRiskJobAndMeasure;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface PreventRiskJobAndMeasureRepository {
-
- /**
- * 插入管控措施与job的对应关系
- * */
- int insertJobAndMeasure(PreventRiskJobAndMeasure jobAndMeasure);
- /**
- * 查询JobAndMeasure - By JobId
- */
- PreventRiskJobAndMeasure getJobAndMeasureByJobId(Long jobId);
-
- List<PreventRiskJobAndMeasure> getJobAndMeasureListByJobId(Long jobId);
- /**
- * 删除job管控措施的附属表关联信息
- */
- int deleteJobAndMeasure(Long jobId);
-
-
-
- /**
- * 检索需要上报的隐患排查任务
- */
- List<PreventRiskJobAndMeasure> listReportWork();
- /**
- * 根据jobId查询对应的管控措施
- */
- List<PreventRiskJobAndMeasure> getMeasureListByJobId(Long jobId);
- /**
- * 修改上报状态
- */
- int updateWorkReportStatus(HandlerReportParam handlerReportParam);
-
- List<PreventRiskJobAndMeasure> listReportWorkTest();
-
- List<PreventRiskJobAndMeasure> getRectifyJobData(Long jobId);
-}
+package com.ruoyi.doublePrevention.repository;
+
+import com.ruoyi.doublePrevention.entity.PreventRiskJobAndMeasure;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface PreventRiskJobAndMeasureRepository {
+
+ /**
+ * 插入管控措施与job的对应关系
+ * */
+ int insertJobAndMeasure(PreventRiskJobAndMeasure jobAndMeasure);
+ /**
+ * 查询JobAndMeasure - By JobId
+ */
+ PreventRiskJobAndMeasure getJobAndMeasureByJobId(Long jobId);
+
+ List<PreventRiskJobAndMeasure> getJobAndMeasureListByJobId(Long jobId);
+ /**
+ * 删除job管控措施的附属表关联信息
+ */
+ int deleteJobAndMeasure(Long jobId);
+
+
+
+ /**
+ * 检索需要上报的隐患排查任务
+ */
+ List<PreventRiskJobAndMeasure> listReportWork();
+ /**
+ * 根据jobId查询对应的管控措施
+ */
+ List<PreventRiskJobAndMeasure> getMeasureListByJobId(Long jobId);
+ /**
+ * 修改上报状态
+ */
+ int updateWorkReportStatus(HandlerReportParam handlerReportParam);
+
+ List<PreventRiskJobAndMeasure> listReportWorkTest();
+
+ List<PreventRiskJobAndMeasure> getRectifyJobData(Long jobId);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskUnitUuidRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskUnitUuidRepository.java
index 2af0ef2..d037d89 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskUnitUuidRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskUnitUuidRepository.java
@@ -1,42 +1,42 @@
-package com.ruoyi.doublePrevention.repository;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.doublePrevention.entity.PreventRiskUnitUuid;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface PreventRiskUnitUuidRepository{
- /**
- * 为设施设备清单附属表添加uuid
- * */
- int insertUuid(PreventRiskUnitUuid riskUnitUuid);
- /**
- * 通过id获取uuid
- * */
- PreventRiskUnitUuid getRiskUnitUuidById(Long id);
- /**
- * 修改
- * */
- int updateRiskUnitUuid(PreventRiskUnitUuid riskUnitUuid);
- /**
- * 删除附属表信息
- */
- int deleteRiskUnit(String[] riskListIds);
-
-
-
-
- /**
- * 检索需要上报的数据
- */
- List<PreventRiskUnitUuid> listRiskAnaUnit();
- /**
- * 修改已经被检索读取完成数据的状态
- */
- int updateReportStatus(HandlerReportParam handlerReportParam);
-
- PreventRiskUnitUuid getRiskUnitUuidByUnitId(Long riskUnitId);
-}
+package com.ruoyi.doublePrevention.repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.doublePrevention.entity.PreventRiskUnitUuid;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface PreventRiskUnitUuidRepository{
+ /**
+ * 为设施设备清单附属表添加uuid
+ * */
+ int insertUuid(PreventRiskUnitUuid riskUnitUuid);
+ /**
+ * 通过id获取uuid
+ * */
+ PreventRiskUnitUuid getRiskUnitUuidById(Long id);
+ /**
+ * 修改
+ * */
+ int updateRiskUnitUuid(PreventRiskUnitUuid riskUnitUuid);
+ /**
+ * 删除附属表信息
+ */
+ int deleteRiskUnit(String[] riskListIds);
+
+
+
+
+ /**
+ * 检索需要上报的数据
+ */
+ List<PreventRiskUnitUuid> listRiskAnaUnit();
+ /**
+ * 修改已经被检索读取完成数据的状态
+ */
+ int updateReportStatus(HandlerReportParam handlerReportParam);
+
+ PreventRiskUnitUuid getRiskUnitUuidByUnitId(Long riskUnitId);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventTaskTypeRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventTaskTypeRepository.java
index 6431bda..facd118 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventTaskTypeRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventTaskTypeRepository.java
@@ -1,17 +1,17 @@
-package com.ruoyi.doublePrevention.repository;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.doublePrevention.entity.PreventTaskType;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface PreventTaskTypeRepository extends BaseMapper<PreventTaskType> {
-
- PreventTaskType getInfoByTaskId(Long taskId);
-
- List<PreventTaskType> getInfoByJobId(Long jobId);
-
- List<PreventTaskType> getAllTaskTypeList();
-}
+package com.ruoyi.doublePrevention.repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.doublePrevention.entity.PreventTaskType;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface PreventTaskTypeRepository extends BaseMapper<PreventTaskType> {
+
+ PreventTaskType getInfoByTaskId(Long taskId);
+
+ List<PreventTaskType> getInfoByJobId(Long jobId);
+
+ List<PreventTaskType> getAllTaskTypeList();
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/PreventTaskUnitAndMeasureRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/PreventTaskUnitAndMeasureRepository.java
index cf9cb58..7b06456 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/PreventTaskUnitAndMeasureRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/PreventTaskUnitAndMeasureRepository.java
@@ -1,10 +1,10 @@
-package com.ruoyi.doublePrevention.repository;
-
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface PreventTaskUnitAndMeasureRepository {
-
-}
+package com.ruoyi.doublePrevention.repository;
+
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface PreventTaskUnitAndMeasureRepository {
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/RiskAndPeopleInfoRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/RiskAndPeopleInfoRepository.java
index 1a555c1..d55a804 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/RiskAndPeopleInfoRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/RiskAndPeopleInfoRepository.java
@@ -1,17 +1,17 @@
-package com.ruoyi.doublePrevention.repository;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.doublePrevention.entity.RiskAndPeopleInfo;
-import com.ruoyi.doublePrevention.entity.dto.req.RiskAndPeopleInfoReqBO;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface RiskAndPeopleInfoRepository extends BaseMapper<RiskAndPeopleInfo> {
-
- List<RiskAndPeopleInfo> listRiskAndPeoplePage(@Param("reqBO") RiskAndPeopleInfoReqBO reqBO);
-
- RiskAndPeopleInfo selectRiskAndPeopleInfoById(Long id);
-}
+package com.ruoyi.doublePrevention.repository;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.doublePrevention.entity.RiskAndPeopleInfo;
+import com.ruoyi.doublePrevention.entity.dto.req.RiskAndPeopleInfoReqBO;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface RiskAndPeopleInfoRepository extends BaseMapper<RiskAndPeopleInfo> {
+
+ List<RiskAndPeopleInfo> listRiskAndPeoplePage(@Param("reqBO") RiskAndPeopleInfoReqBO reqBO);
+
+ RiskAndPeopleInfo selectRiskAndPeopleInfoById(Long id);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/RiskOldInfoRepository.java b/src/main/java/com/ruoyi/doublePrevention/repository/RiskOldInfoRepository.java
index b9b35ce..e14284e 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/RiskOldInfoRepository.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/RiskOldInfoRepository.java
@@ -1,20 +1,20 @@
-package com.ruoyi.doublePrevention.repository;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.doublePrevention.entity.RiskOldInfo;
-import com.ruoyi.doublePrevention.entity.dto.req.RiskOldInfoQueryReqDTO;
-import org.apache.ibatis.annotations.Param;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-
-@Repository
-public interface RiskOldInfoRepository extends BaseMapper<RiskOldInfo> {
-
-
- List<RiskOldInfo> selectOldRiskInfoPage(@Param("queryReqDTO") RiskOldInfoQueryReqDTO queryReqDTO);
-
-
-}
+package com.ruoyi.doublePrevention.repository;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.doublePrevention.entity.RiskOldInfo;
+import com.ruoyi.doublePrevention.entity.dto.req.RiskOldInfoQueryReqDTO;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+
+@Repository
+public interface RiskOldInfoRepository extends BaseMapper<RiskOldInfo> {
+
+
+ List<RiskOldInfo> selectOldRiskInfoPage(@Param("queryReqDTO") RiskOldInfoQueryReqDTO queryReqDTO);
+
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/param/HandlerCJReportParam.java b/src/main/java/com/ruoyi/doublePrevention/repository/param/HandlerCJReportParam.java
index d62cd21..c6d1f48 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/param/HandlerCJReportParam.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/param/HandlerCJReportParam.java
@@ -1,42 +1,42 @@
-package com.ruoyi.doublePrevention.repository.param;
-
-import java.util.Date;
-
-public class HandlerCJReportParam {
- /**
- * 主键
- */
- private String id;
- /**
- * 上报状态 1-待上报；2-已上报；3-不上报；4-变更需上传
- */
- private Byte reportStatus;
- /**
- * 上报时间
- */
- private Date reportTime;
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public Byte getReportStatus() {
- return reportStatus;
- }
-
- public void setReportStatus(Byte reportStatus) {
- this.reportStatus = reportStatus;
- }
-
- public Date getReportTime() {
- return reportTime;
- }
-
- public void setReportTime(Date reportTime) {
- this.reportTime = reportTime;
- }
-}
+package com.ruoyi.doublePrevention.repository.param;
+
+import java.util.Date;
+
+public class HandlerCJReportParam {
+ /**
+ * 主键
+ */
+ private String id;
+ /**
+ * 上报状态 1-待上报；2-已上报；3-不上报；4-变更需上传
+ */
+ private Byte reportStatus;
+ /**
+ * 上报时间
+ */
+ private Date reportTime;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public Byte getReportStatus() {
+ return reportStatus;
+ }
+
+ public void setReportStatus(Byte reportStatus) {
+ this.reportStatus = reportStatus;
+ }
+
+ public Date getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(Date reportTime) {
+ this.reportTime = reportTime;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/param/HandlerReportParam.java b/src/main/java/com/ruoyi/doublePrevention/repository/param/HandlerReportParam.java
index 34c8fdc..8e36c02 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/param/HandlerReportParam.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/param/HandlerReportParam.java
@@ -1,42 +1,42 @@
-package com.ruoyi.doublePrevention.repository.param;
-
-import java.util.Date;
-
-public class HandlerReportParam {
- /**
- * 主键
- */
- private Long id;
- /**
- * 上报状态 1-待上报；2-已上报；3-不上报；4-变更需上传
- */
- private Byte reportStatus;
- /**
- * 上报时间
- */
- private Date reportTime;
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public Byte getReportStatus() {
- return reportStatus;
- }
-
- public void setReportStatus(Byte reportStatus) {
- this.reportStatus = reportStatus;
- }
-
- public Date getReportTime() {
- return reportTime;
- }
-
- public void setReportTime(Date reportTime) {
- this.reportTime = reportTime;
- }
-}
+package com.ruoyi.doublePrevention.repository.param;
+
+import java.util.Date;
+
+public class HandlerReportParam {
+ /**
+ * 主键
+ */
+ private Long id;
+ /**
+ * 上报状态 1-待上报；2-已上报；3-不上报；4-变更需上传
+ */
+ private Byte reportStatus;
+ /**
+ * 上报时间
+ */
+ private Date reportTime;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Byte getReportStatus() {
+ return reportStatus;
+ }
+
+ public void setReportStatus(Byte reportStatus) {
+ this.reportStatus = reportStatus;
+ }
+
+ public Date getReportTime() {
+ return reportTime;
+ }
+
+ public void setReportTime(Date reportTime) {
+ this.reportTime = reportTime;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/param/PreventPointAndMeasureParams.java b/src/main/java/com/ruoyi/doublePrevention/repository/param/PreventPointAndMeasureParams.java
index 409373a..13c1c22 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/param/PreventPointAndMeasureParams.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/param/PreventPointAndMeasureParams.java
@@ -1,42 +1,42 @@
-package com.ruoyi.doublePrevention.repository.param;
-
-import java.util.List;
-
-public class PreventPointAndMeasureParams {
- /**
- * 原-检查点id
- * */
- private Long baseCheckPointId;
- /**
- * 管控措施id
- * */
- private Long controlMeasureId;
- /**
- * 风险点-单元-基础清单 id
- * */
- private Long riskId;
-
- public Long getBaseCheckPointId() {
- return baseCheckPointId;
- }
-
- public void setBaseCheckPointId(Long baseCheckPointId) {
- this.baseCheckPointId = baseCheckPointId;
- }
-
- public Long getControlMeasureId() {
- return controlMeasureId;
- }
-
- public void setControlMeasureId(Long controlMeasureId) {
- this.controlMeasureId = controlMeasureId;
- }
-
- public Long getRiskId() {
- return riskId;
- }
-
- public void setRiskId(Long riskId) {
- this.riskId = riskId;
- }
-}
+package com.ruoyi.doublePrevention.repository.param;
+
+import java.util.List;
+
+public class PreventPointAndMeasureParams {
+ /**
+ * 原-检查点id
+ * */
+ private Long baseCheckPointId;
+ /**
+ * 管控措施id
+ * */
+ private Long controlMeasureId;
+ /**
+ * 风险点-单元-基础清单 id
+ * */
+ private Long riskId;
+
+ public Long getBaseCheckPointId() {
+ return baseCheckPointId;
+ }
+
+ public void setBaseCheckPointId(Long baseCheckPointId) {
+ this.baseCheckPointId = baseCheckPointId;
+ }
+
+ public Long getControlMeasureId() {
+ return controlMeasureId;
+ }
+
+ public void setControlMeasureId(Long controlMeasureId) {
+ this.controlMeasureId = controlMeasureId;
+ }
+
+ public Long getRiskId() {
+ return riskId;
+ }
+
+ public void setRiskId(Long riskId) {
+ this.riskId = riskId;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/repository/param/PreventReportConfigUpdateParams.java b/src/main/java/com/ruoyi/doublePrevention/repository/param/PreventReportConfigUpdateParams.java
index 706724b..354e5f1 100644
--- a/src/main/java/com/ruoyi/doublePrevention/repository/param/PreventReportConfigUpdateParams.java
+++ b/src/main/java/com/ruoyi/doublePrevention/repository/param/PreventReportConfigUpdateParams.java
@@ -1,70 +1,70 @@
-package com.ruoyi.doublePrevention.repository.param;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
-
-@TableName("prevent_report_config")
-public class PreventReportConfigUpdateParams {
-
- /**
- * 主键
- */
- private Integer id;
- /**
- * 上报开关：1-开启；2-关闭
- */
- private Byte reportState;
- /**
- * 上报方式：0-手动；1-自动
- */
- private Byte reportType;
- /**
- * 最后修改时间
- */
- private Date gmtModitify;
- /**
- * 修改人
- */
- private String lastEditUserName;
-
- public String getLastEditUserName() {
- return lastEditUserName;
- }
-
- public void setLastEditUserName(String lastEditUserName) {
- this.lastEditUserName = lastEditUserName;
- }
-
- public Date getGmtModitify() {
- return gmtModitify;
- }
-
- public void setGmtModitify(Date gmtModitify) {
- this.gmtModitify = gmtModitify;
- }
-
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- public Byte getReportState() {
- return reportState;
- }
-
- public void setReportState(Byte reportState) {
- this.reportState = reportState;
- }
-
- public Byte getReportType() {
- return reportType;
- }
-
- public void setReportType(Byte reportType) {
- this.reportType = reportType;
- }
-}
+package com.ruoyi.doublePrevention.repository.param;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.util.Date;
+
+@TableName("prevent_report_config")
+public class PreventReportConfigUpdateParams {
+
+ /**
+ * 主键
+ */
+ private Integer id;
+ /**
+ * 上报开关：1-开启；2-关闭
+ */
+ private Byte reportState;
+ /**
+ * 上报方式：0-手动；1-自动
+ */
+ private Byte reportType;
+ /**
+ * 最后修改时间
+ */
+ private Date gmtModitify;
+ /**
+ * 修改人
+ */
+ private String lastEditUserName;
+
+ public String getLastEditUserName() {
+ return lastEditUserName;
+ }
+
+ public void setLastEditUserName(String lastEditUserName) {
+ this.lastEditUserName = lastEditUserName;
+ }
+
+ public Date getGmtModitify() {
+ return gmtModitify;
+ }
+
+ public void setGmtModitify(Date gmtModitify) {
+ this.gmtModitify = gmtModitify;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Byte getReportState() {
+ return reportState;
+ }
+
+ public void setReportState(Byte reportState) {
+ this.reportState = reportState;
+ }
+
+ public Byte getReportType() {
+ return reportType;
+ }
+
+ public void setReportType(Byte reportType) {
+ this.reportType = reportType;
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/DateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/DateSchedule.java
index 742423a..17ee292 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/DateSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/DateSchedule.java
@@ -1,273 +1,273 @@
-package com.ruoyi.doublePrevention.scheduls;
-
-
-import com.ruoyi.doublePrevention.entity.CJReport.*;
-import com.ruoyi.doublePrevention.entity.*;
-import com.ruoyi.doublePrevention.enums.E;
-import com.ruoyi.doublePrevention.enums.SyncEnum;
-import com.ruoyi.doublePrevention.exception.AusinessException;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-import com.ruoyi.doublePrevention.service.baseService.*;
-import com.ruoyi.project.system.dept.domain.Dept;
-import com.ruoyi.project.system.dept.service.IDeptService;
-import com.ruoyi.project.system.user.domain.User;
-import com.ruoyi.project.system.user.service.IUserService;
-import com.ruoyi.project.tr.HiddenDangerCheckJob.domain.HiddenDangerCheckJob;
-import com.ruoyi.project.tr.HiddenDangerCheckJob.service.IHiddenDangerCheckJobService;
-import com.ruoyi.project.tr.hiddenDangerCheck.domain.HiddenDangerCheck;
-import com.ruoyi.project.tr.hiddenDangerCheck.service.IHiddenDangerCheckService;
-import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
-import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;
-import com.ruoyi.project.tr.riskList.domain.RiskList;
-import com.ruoyi.project.tr.riskList.service.IRiskListService;
-import org.apache.commons.lang3.ObjectUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-@Component
-public class DateSchedule {
-
- private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
- public static SimpleDateFormat startFormat = new SimpleDateFormat("yyyy-MM-dd 06:30:00");
- public static SimpleDateFormat endFormat = new SimpleDateFormat("yyyy-MM-dd 23:59:59");
-
- public static SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
- @Autowired
- private PreventReportConfigService preventReportConfigService;
-
- @Autowired
- private PreventCJReportRiskAnaUnitService CJRiskAnaUnitService;
- @Autowired
- private PreventCJReportRiskEventService CJEventService;
- @Autowired
- private PreventCJReportRiskControlMeasureService CJMeasureService;
- @Autowired
- private PreventCJReportCheckTaskFromWorkService CJTaskFromWorkService;
- @Autowired
- private PreventCJReportCheckRecordFromTaskService CJTaskRecordService;
- @Autowired
- private PreventCJReportDangerInfoService CJDangerInfoService;
- @Autowired
- private PreventCJReportPointService CJPointService;
-
-
- @Autowired
- private IDeptService trDeptService; //部门服务
- @Autowired
- private IUserService trUserService; //用户服务
-
- @Autowired
- private IRiskListService trRiskAnaUnitService; //风险设备、分析单元
- @Autowired
- private PreventRiskUnitUuidService preventRiskUnitUuidService; //风险设备、分析单元附属表
-
- @Autowired
- private PreventRiskEventService preventRiskEventService;
- @Autowired
- private PreventRiskControlMeasureService preventRiskControlMeasureService;
- @Autowired
- private PreventRiskControlTemplateService preventRiskControlTemplateService;
-
- @Autowired
- private IHiddenDangerCheckJobService trHiddenDangerCheckJobService;//排查任务job
- @Autowired
- private PreventRiskJobAndMeasureService preventRiskJobAndMeasureService;//排查任务附属表
-
- @Autowired
- private IHiddenDangerCheckService trHiddenDangerCheckService;//排查任务记录
- @Autowired
- private PreventRiskDangerCheckLogService preventRiskDangerCheckLogService;//排查任务记录附属表
-
- @Autowired
- private IHiddenDangerCheckPointService trHiddenDangerCheckPointService;//隐患信息上报、整改、验收
- @Autowired
- private PreventRiskDangerInfoService preventRiskDangerInfoService;//隐患信息附属表
-
- @Autowired
- private PreventRiskCheckUnitService preventRiskCheckUnitService;//管控措施，任务清单对应关系。基础排查点附属表
- @Autowired
- private PreventRiskDangerCheckAndMeasureService riskDangerCheckAndMeasureService;//管控措施，任务清单对应关系。基础排查点附属表
-
- @Autowired
- private PreventTaskTypeService taskTypeService;//管控措施，任务清单对应关系。基础排查点附属表
-
- @Autowired
- private PreventOverhaulLogService overhaulLogService;
- @Autowired
- private PreventCJReportOverhaulLogService reportOverhaulLogService;
-
-
- @Transactional
-// @Scheduled(cron = "0 0/1 * * * ? ") // 分钟
-// @Scheduled(cron = "0/30 * * * * ?") // 30秒
-// @Scheduled(cron = "0 0 0/2 * * ?") // 小时
-
- public void searchReportDate(){
- String companyCode = "652310082";
-
-// logger.info("【日巡检】任务数据重置");
-//
-// List<PreventCJReportCheckTaskFromWork> workLists = CJTaskFromWorkService.listWork();
-// for (PreventCJReportCheckTaskFromWork work : workLists) {
-// PreventRiskControlMeasure measure = preventRiskControlMeasureService.getPreventRiskControlMeasureByUuid(work.getRiskMeasureId());
-// work.setTroubleshootContent(measure.getCheckContent());
-// work.setWorkStartTime("00:00:00");
-// work.setWorkEndTime("23:59:59");
-// int result = CJTaskFromWorkService.updateInfo(work);
-// if (result < 1){
-// throw new RuntimeException("执行出错");
-// }
-// }
-
-
-
-
-
-
-
-// logger.info("【包保责任人】任务数据重置");
-//
-// List<PreventCJReportCheckTaskFromWork> workLists1 = CJTaskFromWorkService.listWork1();
-// for (PreventCJReportCheckTaskFromWork work : workLists1) {
-// PreventRiskControlMeasure measure = preventRiskControlMeasureService.getPreventRiskControlMeasureByUuid(work.getRiskMeasureId());
-// work.setTroubleshootContent(measure.getCheckContent());
-// HiddenDangerCheckJob jobById = trHiddenDangerCheckJobService.getJobById(work.getWorkId());
-// work.setTaskStartTime(jobById.getStartTime());
-// work.setWorkDayType("2");
-// List<PreventTaskType> infoByJobId = taskTypeService.getInfoByJobId(work.getWorkId());
-// int typeTag = 0;
-// for (PreventTaskType taskType : infoByJobId) {
-// typeTag = taskType.getType();
-// }
-// work.setWorkType(String.valueOf(typeTag));
-// work.setTaskNum("1");
-// int result = CJTaskFromWorkService.updateInfo1(work);
-// if (result < 1){
-// throw new RuntimeException("执行出错");
-// }
-// }
-
-
-
-
-//
-// logger.info("任务数据重置");
-//
-// /**
-// * 4、检索 任务配置 数据 prevent_report_check_record_from_task
-// * */
-// //读取任务配置数据上报主配置信息
-// PreventReportConfig workReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_TASK_FROM_WORK.getCode());
-// //如果任务配置主配置开启上报
-// if (workReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
-// // logger.info("【##】4.检索任务配置...");
-// //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
-// List<PreventRiskJobAndMeasure> works = preventRiskJobAndMeasureService.listReportWorkTest();
-// //获取上报数据对象与list
-// List<PreventCJReportCheckTaskFromWork> CJTaskFromWorkLists = new ArrayList<>();
-// HandlerReportParam handlerReportParam = new HandlerReportParam();
-//
-// if (ObjectUtils.isNotEmpty(works)){
-// //遍历，封装数据
-// for (PreventRiskJobAndMeasure work : works) {
-// //通过work中的信息，查询主表数据
-// HiddenDangerCheckJob jobById = trHiddenDangerCheckJobService.getJobById(work.getJobId());
-// //获取数据对象
-// PreventCJReportCheckTaskFromWork CJTaskFromWork = new PreventCJReportCheckTaskFromWork();
-// //转换时间周期单位 (1小时,2日,3周,4月,5年)
-// if (jobById.getTroubleshootTypeCycleType() == 1){
-// CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
-// CJTaskFromWork.setCheckCycleUnit("小时");
-// CJTaskFromWork.setWorkStartTime("00:00:00");
-// CJTaskFromWork.setWorkEndTime("23:59:59");
-// }else if (jobById.getTroubleshootTypeCycleType() == 2){
-// CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
-// CJTaskFromWork.setCheckCycleUnit("天");
-// }else if (jobById.getTroubleshootTypeCycleType() == 3){
-// Long num = jobById.getTroubleshootTypeCycleNum() * 7;
-// CJTaskFromWork.setCheckCycle(Math.toIntExact(num));
-// CJTaskFromWork.setCheckCycleUnit("天");
-// }else if (jobById.getTroubleshootTypeCycleType() == 4){
-// CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
-// CJTaskFromWork.setCheckCycleUnit("月");
-// }else if (jobById.getTroubleshootTypeCycleType() == 5){
-// CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
-// CJTaskFromWork.setCheckCycleUnit("年");
-// }
-// //获取用户信息
-// User createUser = trUserService.getUserByLoginName(jobById.getCreateBy());
-// User updateUser = trUserService.getUserByLoginName(jobById.getUpdateBy());
-//
-// //封装上报昌吉州任务配置数据
-// CJTaskFromWork.setId(work.getJobUuid());
-// CJTaskFromWork.setCompanyCode(companyCode);
-//// if (work.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
-//// CJTaskFromWork.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
-//// }else {
-//// CJTaskFromWork.setDeleted("0");
-//// }
-// CJTaskFromWork.setCreateBy(createUser.getUserName());
-// CJTaskFromWork.setCreateDate(jobById.getCreateTime());
-// if (ObjectUtils.isEmpty(updateUser)){
-// CJTaskFromWork.setUpdateBy(createUser.getUserName());
-// CJTaskFromWork.setUpdateDate(jobById.getCreateTime());
-// }else {
-// CJTaskFromWork.setUpdateBy(updateUser.getUserName());
-// CJTaskFromWork.setUpdateDate(jobById.getCreateTime());
-// }
-//
-// CJTaskFromWork.setReportStatus((byte) 77);
-// CJTaskFromWork.setDeleted("2");//
-//
-// CJTaskFromWork.setReportTime(null);
-// CJTaskFromWork.setDataSource((byte) 1);
-// CJTaskFromWork.setRiskMeasureId(work.getMeasureUuid());
-// CJTaskFromWork.setWorkId(jobById.getJobId());
-//
-// //第二版标准新增
-// PreventRiskControlMeasure measureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(work.getMeasureId());
-// CJTaskFromWork.setTroubleshootContent(measureById.getCheckContent());
-// CJTaskFromWork.setTaskStartTime(jobById.getStartTime());
-//
-// CJTaskFromWork.setWorkDayType("0");
-// List<PreventTaskType> typeByJobId = taskTypeService.getInfoByJobId(work.getJobId());
-// int typeTag = 0;
-// for (PreventTaskType taskType : typeByJobId) {
-// typeTag = taskType.getType();
-// }
-// CJTaskFromWork.setWorkType(String.valueOf(typeTag));
-// if (typeTag !=0){
-// CJTaskFromWork.setTaskNum("1");
-// }
-// //封装数据
-// CJTaskFromWorkLists.add(CJTaskFromWork);
-// //设置原始数据上报状态
-// handlerReportParam.setId(work.getId());
-// handlerReportParam.setReportTime(new Date());
-// handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
-// preventRiskJobAndMeasureService.updateWorkReportStatus(handlerReportParam);
-// }
-// }else {
-// logger.info("【双重预防】当前无任务配置数据需要处理");
-// }
-// //写入上报昌吉州数据转换表
-// for (PreventCJReportCheckTaskFromWork CJTaskFromWorks : CJTaskFromWorkLists) {
-// CJTaskFromWorkService.insertTaskFromWorkList(CJTaskFromWorks);
-// logger.info("【双重预防】任务配置CJ：数据处理...");
-// }
-// }else {
-// logger.info("任务配置数据上报已关闭");
-// }
-//
-//
- }
-}
+package com.ruoyi.doublePrevention.scheduls;
+
+
+import com.ruoyi.doublePrevention.entity.CJReport.*;
+import com.ruoyi.doublePrevention.entity.*;
+import com.ruoyi.doublePrevention.enums.E;
+import com.ruoyi.doublePrevention.enums.SyncEnum;
+import com.ruoyi.doublePrevention.exception.AusinessException;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import com.ruoyi.doublePrevention.service.baseService.*;
+import com.ruoyi.project.system.dept.domain.Dept;
+import com.ruoyi.project.system.dept.service.IDeptService;
+import com.ruoyi.project.system.user.domain.User;
+import com.ruoyi.project.system.user.service.IUserService;
+import com.ruoyi.project.tr.HiddenDangerCheckJob.domain.HiddenDangerCheckJob;
+import com.ruoyi.project.tr.HiddenDangerCheckJob.service.IHiddenDangerCheckJobService;
+import com.ruoyi.project.tr.hiddenDangerCheck.domain.HiddenDangerCheck;
+import com.ruoyi.project.tr.hiddenDangerCheck.service.IHiddenDangerCheckService;
+import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
+import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;
+import com.ruoyi.project.tr.riskList.domain.RiskList;
+import com.ruoyi.project.tr.riskList.service.IRiskListService;
+import org.apache.commons.lang3.ObjectUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@Component
+public class DateSchedule {
+
+ private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+ public static SimpleDateFormat startFormat = new SimpleDateFormat("yyyy-MM-dd 06:30:00");
+ public static SimpleDateFormat endFormat = new SimpleDateFormat("yyyy-MM-dd 23:59:59");
+
+ public static SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+ @Autowired
+ private PreventReportConfigService preventReportConfigService;
+
+ @Autowired
+ private PreventCJReportRiskAnaUnitService CJRiskAnaUnitService;
+ @Autowired
+ private PreventCJReportRiskEventService CJEventService;
+ @Autowired
+ private PreventCJReportRiskControlMeasureService CJMeasureService;
+ @Autowired
+ private PreventCJReportCheckTaskFromWorkService CJTaskFromWorkService;
+ @Autowired
+ private PreventCJReportCheckRecordFromTaskService CJTaskRecordService;
+ @Autowired
+ private PreventCJReportDangerInfoService CJDangerInfoService;
+ @Autowired
+ private PreventCJReportPointService CJPointService;
+
+
+ @Autowired
+ private IDeptService trDeptService; //部门服务
+ @Autowired
+ private IUserService trUserService; //用户服务
+
+ @Autowired
+ private IRiskListService trRiskAnaUnitService; //风险设备、分析单元
+ @Autowired
+ private PreventRiskUnitUuidService preventRiskUnitUuidService; //风险设备、分析单元附属表
+
+ @Autowired
+ private PreventRiskEventService preventRiskEventService;
+ @Autowired
+ private PreventRiskControlMeasureService preventRiskControlMeasureService;
+ @Autowired
+ private PreventRiskControlTemplateService preventRiskControlTemplateService;
+
+ @Autowired
+ private IHiddenDangerCheckJobService trHiddenDangerCheckJobService;//排查任务job
+ @Autowired
+ private PreventRiskJobAndMeasureService preventRiskJobAndMeasureService;//排查任务附属表
+
+ @Autowired
+ private IHiddenDangerCheckService trHiddenDangerCheckService;//排查任务记录
+ @Autowired
+ private PreventRiskDangerCheckLogService preventRiskDangerCheckLogService;//排查任务记录附属表
+
+ @Autowired
+ private IHiddenDangerCheckPointService trHiddenDangerCheckPointService;//隐患信息上报、整改、验收
+ @Autowired
+ private PreventRiskDangerInfoService preventRiskDangerInfoService;//隐患信息附属表
+
+ @Autowired
+ private PreventRiskCheckUnitService preventRiskCheckUnitService;//管控措施，任务清单对应关系。基础排查点附属表
+ @Autowired
+ private PreventRiskDangerCheckAndMeasureService riskDangerCheckAndMeasureService;//管控措施，任务清单对应关系。基础排查点附属表
+
+ @Autowired
+ private PreventTaskTypeService taskTypeService;//管控措施，任务清单对应关系。基础排查点附属表
+
+ @Autowired
+ private PreventOverhaulLogService overhaulLogService;
+ @Autowired
+ private PreventCJReportOverhaulLogService reportOverhaulLogService;
+
+
+ @Transactional
+// @Scheduled(cron = "0 0/1 * * * ? ") // 分钟
+// @Scheduled(cron = "0/30 * * * * ?") // 30秒
+// @Scheduled(cron = "0 0 0/2 * * ?") // 小时
+
+ public void searchReportDate(){
+ String companyCode = "652310082";
+
+// logger.info("【日巡检】任务数据重置");
+//
+// List<PreventCJReportCheckTaskFromWork> workLists = CJTaskFromWorkService.listWork();
+// for (PreventCJReportCheckTaskFromWork work : workLists) {
+// PreventRiskControlMeasure measure = preventRiskControlMeasureService.getPreventRiskControlMeasureByUuid(work.getRiskMeasureId());
+// work.setTroubleshootContent(measure.getCheckContent());
+// work.setWorkStartTime("00:00:00");
+// work.setWorkEndTime("23:59:59");
+// int result = CJTaskFromWorkService.updateInfo(work);
+// if (result < 1){
+// throw new RuntimeException("执行出错");
+// }
+// }
+
+
+
+
+
+
+
+// logger.info("【包保责任人】任务数据重置");
+//
+// List<PreventCJReportCheckTaskFromWork> workLists1 = CJTaskFromWorkService.listWork1();
+// for (PreventCJReportCheckTaskFromWork work : workLists1) {
+// PreventRiskControlMeasure measure = preventRiskControlMeasureService.getPreventRiskControlMeasureByUuid(work.getRiskMeasureId());
+// work.setTroubleshootContent(measure.getCheckContent());
+// HiddenDangerCheckJob jobById = trHiddenDangerCheckJobService.getJobById(work.getWorkId());
+// work.setTaskStartTime(jobById.getStartTime());
+// work.setWorkDayType("2");
+// List<PreventTaskType> infoByJobId = taskTypeService.getInfoByJobId(work.getWorkId());
+// int typeTag = 0;
+// for (PreventTaskType taskType : infoByJobId) {
+// typeTag = taskType.getType();
+// }
+// work.setWorkType(String.valueOf(typeTag));
+// work.setTaskNum("1");
+// int result = CJTaskFromWorkService.updateInfo1(work);
+// if (result < 1){
+// throw new RuntimeException("执行出错");
+// }
+// }
+
+
+
+
+//
+// logger.info("任务数据重置");
+//
+// /**
+// * 4、检索 任务配置 数据 prevent_report_check_record_from_task
+// * */
+// //读取任务配置数据上报主配置信息
+// PreventReportConfig workReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_TASK_FROM_WORK.getCode());
+// //如果任务配置主配置开启上报
+// if (workReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
+// // logger.info("【##】4.检索任务配置...");
+// //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
+// List<PreventRiskJobAndMeasure> works = preventRiskJobAndMeasureService.listReportWorkTest();
+// //获取上报数据对象与list
+// List<PreventCJReportCheckTaskFromWork> CJTaskFromWorkLists = new ArrayList<>();
+// HandlerReportParam handlerReportParam = new HandlerReportParam();
+//
+// if (ObjectUtils.isNotEmpty(works)){
+// //遍历，封装数据
+// for (PreventRiskJobAndMeasure work : works) {
+// //通过work中的信息，查询主表数据
+// HiddenDangerCheckJob jobById = trHiddenDangerCheckJobService.getJobById(work.getJobId());
+// //获取数据对象
+// PreventCJReportCheckTaskFromWork CJTaskFromWork = new PreventCJReportCheckTaskFromWork();
+// //转换时间周期单位 (1小时,2日,3周,4月,5年)
+// if (jobById.getTroubleshootTypeCycleType() == 1){
+// CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
+// CJTaskFromWork.setCheckCycleUnit("小时");
+// CJTaskFromWork.setWorkStartTime("00:00:00");
+// CJTaskFromWork.setWorkEndTime("23:59:59");
+// }else if (jobById.getTroubleshootTypeCycleType() == 2){
+// CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
+// CJTaskFromWork.setCheckCycleUnit("天");
+// }else if (jobById.getTroubleshootTypeCycleType() == 3){
+// Long num = jobById.getTroubleshootTypeCycleNum() * 7;
+// CJTaskFromWork.setCheckCycle(Math.toIntExact(num));
+// CJTaskFromWork.setCheckCycleUnit("天");
+// }else if (jobById.getTroubleshootTypeCycleType() == 4){
+// CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
+// CJTaskFromWork.setCheckCycleUnit("月");
+// }else if (jobById.getTroubleshootTypeCycleType() == 5){
+// CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
+// CJTaskFromWork.setCheckCycleUnit("年");
+// }
+// //获取用户信息
+// User createUser = trUserService.getUserByLoginName(jobById.getCreateBy());
+// User updateUser = trUserService.getUserByLoginName(jobById.getUpdateBy());
+//
+// //封装上报昌吉州任务配置数据
+// CJTaskFromWork.setId(work.getJobUuid());
+// CJTaskFromWork.setCompanyCode(companyCode);
+//// if (work.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
+//// CJTaskFromWork.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
+//// }else {
+//// CJTaskFromWork.setDeleted("0");
+//// }
+// CJTaskFromWork.setCreateBy(createUser.getUserName());
+// CJTaskFromWork.setCreateDate(jobById.getCreateTime());
+// if (ObjectUtils.isEmpty(updateUser)){
+// CJTaskFromWork.setUpdateBy(createUser.getUserName());
+// CJTaskFromWork.setUpdateDate(jobById.getCreateTime());
+// }else {
+// CJTaskFromWork.setUpdateBy(updateUser.getUserName());
+// CJTaskFromWork.setUpdateDate(jobById.getCreateTime());
+// }
+//
+// CJTaskFromWork.setReportStatus((byte) 77);
+// CJTaskFromWork.setDeleted("2");//
+//
+// CJTaskFromWork.setReportTime(null);
+// CJTaskFromWork.setDataSource((byte) 1);
+// CJTaskFromWork.setRiskMeasureId(work.getMeasureUuid());
+// CJTaskFromWork.setWorkId(jobById.getJobId());
+//
+// //第二版标准新增
+// PreventRiskControlMeasure measureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(work.getMeasureId());
+// CJTaskFromWork.setTroubleshootContent(measureById.getCheckContent());
+// CJTaskFromWork.setTaskStartTime(jobById.getStartTime());
+//
+// CJTaskFromWork.setWorkDayType("0");
+// List<PreventTaskType> typeByJobId = taskTypeService.getInfoByJobId(work.getJobId());
+// int typeTag = 0;
+// for (PreventTaskType taskType : typeByJobId) {
+// typeTag = taskType.getType();
+// }
+// CJTaskFromWork.setWorkType(String.valueOf(typeTag));
+// if (typeTag !=0){
+// CJTaskFromWork.setTaskNum("1");
+// }
+// //封装数据
+// CJTaskFromWorkLists.add(CJTaskFromWork);
+// //设置原始数据上报状态
+// handlerReportParam.setId(work.getId());
+// handlerReportParam.setReportTime(new Date());
+// handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+// preventRiskJobAndMeasureService.updateWorkReportStatus(handlerReportParam);
+// }
+// }else {
+// logger.info("【双重预防】当前无任务配置数据需要处理");
+// }
+// //写入上报昌吉州数据转换表
+// for (PreventCJReportCheckTaskFromWork CJTaskFromWorks : CJTaskFromWorkLists) {
+// CJTaskFromWorkService.insertTaskFromWorkList(CJTaskFromWorks);
+// logger.info("【双重预防】任务配置CJ：数据处理...");
+// }
+// }else {
+// logger.info("任务配置数据上报已关闭");
+// }
+//
+//
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java
index 1ed2ac6..fb4ff8d 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/ExecCJReportDateSchedule.java
@@ -1,905 +1,910 @@
-package com.ruoyi.doublePrevention.scheduls;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-
-import com.ruoyi.common.utils.BeanCopyUtils;
-import com.ruoyi.doublePrevention.entity.CJReport.*;
-import com.ruoyi.doublePrevention.entity.CJReport.CJdto.CJReportResultData;
-import com.ruoyi.doublePrevention.entity.CJReport.CJdto.Data;
-import com.ruoyi.doublePrevention.entity.CJReport.CJdto.ErrorMsgDetails;
-import com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO.*;
-import com.ruoyi.doublePrevention.entity.PreventReportConfig;
-import com.ruoyi.doublePrevention.enums.CJReportEnum;
-import com.ruoyi.doublePrevention.enums.SyncEnum;
-import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
-import com.ruoyi.doublePrevention.service.baseService.*;
-import com.ruoyi.project.tr.report.service.ReportService;
-import org.apache.commons.lang3.ObjectUtils;
-import org.bouncycastle.crypto.engines.AESFastEngine;
-import org.bouncycastle.crypto.modes.GCMBlockCipher;
-import org.bouncycastle.crypto.params.AEADParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.io.*;
-import java.lang.reflect.Array;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-@Component
-public class ExecCJReportDateSchedule {
-
- private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
- @Autowired
- private ReportService reportService;
-
- @Autowired
- private PreventCJReportRiskAnaUnitService CJRiskAnaUnitService;
- @Autowired
- private PreventCJReportRiskEventService CJEventService;
- @Autowired
- private PreventCJReportRiskControlMeasureService CJMeasureService;
- @Autowired
- private PreventCJReportCheckTaskFromWorkService CJTaskFromWorkService;
- @Autowired
- private PreventCJReportCheckRecordFromTaskService CJTaskRecordService;
- @Autowired
- private PreventCJReportDangerInfoService CJDangerInfoService;
- @Autowired
- private PreventCJReportPointService CJPointService;
- @Autowired
- private PreventCJReportOverhaulLogService CJOverhaulLogService;
- @Autowired
- private PreventReportConfigService preventReportConfigService;
-
- String token = "GT6gGJV7JV";
- String key = "Bv+NeBolwqg2Pbc1yVwrZA==";
- String iv = "4QC9V8eAiB7tdlgBkMsTAw==";
-
- public static final int MAC_BIT_SIZE = 128;
-
- public static String encrypt(String plainText, byte[] key, byte[] iv) {
- String sr;
- try {
- byte[] plainBytes = plainText.getBytes(StandardCharsets.UTF_8);
- GCMBlockCipher cipher = new GCMBlockCipher(new
- AESFastEngine());
- AEADParameters parameters =
- new AEADParameters(new KeyParameter(key),
- MAC_BIT_SIZE, iv, null);
- cipher.init(true, parameters);
- byte[] encryptedBytes = new
- byte[cipher.getOutputSize(plainBytes.length)];
- int retLen = cipher.processBytes(plainBytes, 0, plainBytes.length,
- encryptedBytes, 0);
- cipher.doFinal(encryptedBytes, retLen);
- sr = Base64.getEncoder().encodeToString(encryptedBytes);
- } catch (Exception ex) {
- throw new RuntimeException(ex.getMessage());
- }
- return sr;
- }
-
-
- @Transactional
-// @Scheduled(cron = "0 0 23 * * ?") //每天晚上23点执行一次0 0 22,23 * * ?
-// @Scheduled(cron = "0 0 22,23 * * ?") //每天晚上22、23点执行一次
- @Scheduled(cron = "0 0/10 * * * ? ") // 分钟
-// @Scheduled(cron = "0/30 * * * * ?")
- public void execReportDateSchedule() throws UnsupportedEncodingException {
- logger.info("【####】上报数据开始...");
-
- HttpURLConnection con = null;
- BufferedReader buffer = null;
- int responseCode = 200;
-
- SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd HH:MM:ss");
-
- Date date = new Date();
- //格式化时间，作为token的时间戳
- SimpleDateFormat tokenDate= new SimpleDateFormat("yyyyMMddHHmmssSSS");
- String formatDate = tokenDate.format(date);
-
- logger.info("【token时间】" + formatDate);
-
- //使用风险分析单元数据上报主配置，作为自动上报开关
- PreventReportConfig reportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());
- if (reportConfig.getReportType() == 0){
- return;
- }
-
- /**
- * 1、处理安全风险分析单元数据
- * */
- logger.info("【1】安全风险分析单元-处理数据...");
- List<PreventCJReportRiskAnaUnit> CJRiskAnaUnits = CJRiskAnaUnitService.listReportUnitDate();
- if (ObjectUtils.isNotEmpty(CJRiskAnaUnits)){
- //封装上报数据,时间格式化
- List<CJReportRiskAnaUnitDTO> list = new ArrayList<>();
- for (PreventCJReportRiskAnaUnit cjRiskAnaUnit : CJRiskAnaUnits) {
- CJReportRiskAnaUnitDTO riskAnaUnit = BeanCopyUtils.copyBean(cjRiskAnaUnit, CJReportRiskAnaUnitDTO.class);
- riskAnaUnit.setCreateDate(dateFormat.format(cjRiskAnaUnit.getCreateDate()));
- riskAnaUnit.setUpdateDate(dateFormat.format(cjRiskAnaUnit.getUpdateDate()));
- list.add(riskAnaUnit);
- }
-// logger.info("【【原始数据】】" + JSONObject.toJSONString(list));
- String AESReportUnitDate = encrypt(JSONObject.toJSONString(list), key.getBytes(), iv.getBytes());
-// logger.info("【【AES加密结果】】"+ AESReportUnitDate);{0JRK`$6X.jpg)min/Desktop/所有桌面文件存放/9}AM56M10$6WX){0JRK`$6X.jpg)
- StringBuffer unitResultBuffer = null;
- //上报数据
- try {
- URL url = new URL("http://120.71.182.198:9999/v1/data/receive/unitMsg");
- //得到连接对象
- con = (HttpURLConnection) url.openConnection();
- //设置请求类型
- con.setRequestMethod("POST");
- //允许写出
- con.setDoOutput(true);
- //允许读入
- con.setDoInput(true);
- //不使用缓存
- con.setUseCaches(false);
- con.setInstanceFollowRedirects(true);
- //设置请求头
- con.setRequestProperty("X-Access-Token",token+formatDate.toString());
- //设置Content-Type，此处根据实际情况确定
- con.setRequestProperty("Content-Type", "application/json;charset=utf8");
-
- OutputStream os = con.getOutputStream();
- Map paraMap = new HashMap();
- paraMap.put("data", AESReportUnitDate); /**封装数据*/
- logger.info("【【加密请求体】】" + JSONArray.toJSON(paraMap).toString());
- //组装入参，设置请求体
- os.write(JSON.toJSONString(paraMap).getBytes());
-
- //本段日志，测试成功后，可注释掉
- if (responseCode == HttpURLConnection.HTTP_OK) {
- //得到响应流
- InputStream inputStream = con.getInputStream();
- //将响应流转换成字符串
- unitResultBuffer = new StringBuffer();
- String line;
- buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
- while ((line = buffer.readLine()) != null) {
- unitResultBuffer.append(line);
- }
- logger.info("result:" + unitResultBuffer.toString());
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- //接收返回值，保存返回值
- List<String> errorIdList= new ArrayList<>();
- //接收参数，转为对象
- CJReportResultData CJUnitResult = JSONObject.parseObject(unitResultBuffer.toString(), CJReportResultData.class);
-// Object parse = JSON.parse(CJUnitResult.getData());
- //取出需要的data部分，再次转换为对象
- Data data = JSONObject.parseObject(CJUnitResult.getData(), Data.class);
- if (ObjectUtils.isNotEmpty(data)){
- for (ErrorMsgDetails errorMsgDetail : data.getErrorMsgDetails()) {
- errorIdList.add(errorMsgDetail.getId());
- }
- }
- if (CJUnitResult.getCode().equals(CJReportEnum.SUCCESS.getCode())){
- logger.info("【#】RiskAnaUnit所有数据全部入库成功");
- for (PreventCJReportRiskAnaUnit CJRiskAnaUnit : CJRiskAnaUnits) {
- HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
- //封装数据
- handlerCJReportParam.setId(CJRiskAnaUnit.getId());
- handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
- handlerCJReportParam.setReportTime(date);
- CJRiskAnaUnitService.updateCJReportStatusById(handlerCJReportParam);
- }
- }else if (CJUnitResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
- logger.info("【#】RiskAnaUnit部分数据上传失败原因" + CJUnitResult.getErrorMsg());
-
- CJUnitResult.getData();
- //遍历数据，设置数据上报成功
- for (PreventCJReportRiskAnaUnit CJRiskAnaUnit : CJRiskAnaUnits) {
- HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
- //封装数据
- handlerCJReportParam.setId(CJRiskAnaUnit.getId());
- handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
- handlerCJReportParam.setReportTime(date);
- CJRiskAnaUnitService.updateCJReportStatusById(handlerCJReportParam);
- }
- //遍历失败数据，设置数据上报失败
- for (String failId : errorIdList) {
- //上报失败
- HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
- //封装数据
- handlerCJReportParam.setId(failId);
- handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());
- handlerCJReportParam.setReportTime(date);
- CJRiskAnaUnitService.updateCJReportStatusById(handlerCJReportParam);
- }
- }
- else if (CJUnitResult.getCode().equals(CJReportEnum.FAIL.getCode())){
- logger.info("【#】RiskAnaUnit所有数据全部入库失败");
- for (String failId : errorIdList) {
- //上报失败
- HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
- //封装数据
- handlerCJReportParam.setId(failId);
- handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());
- handlerCJReportParam.setReportTime(date);
- CJRiskAnaUnitService.updateCJReportStatusById(handlerCJReportParam);
- }
- }
- logger.info("【1】安全风险分析单元-数据处理完成");
- }else {
- logger.info("【1】风险分析单元-无数据上报昌吉州");
- }
-
-
- /**
- * 2、处理安全风险事件数据
- * */
- logger.info("【2】安全风险事件-处理数据...");
- List<PreventCJReportRiskEvent> CJEvents = CJEventService.listReportEventDate();
- if (ObjectUtils.isNotEmpty(CJEvents)){
- //封装上报数据
- List<CJReportRiskEventDTO> eventList = new ArrayList<>();
-
- for (PreventCJReportRiskEvent cjEvent : CJEvents) {
- CJReportRiskEventDTO CJReportRiskEvent = BeanCopyUtils.copyBean(cjEvent, CJReportRiskEventDTO.class);
- CJReportRiskEvent.setCreateDate(dateFormat.format(cjEvent.getCreateDate()));
- CJReportRiskEvent.setUpdateDate(dateFormat.format(cjEvent.getUpdateDate()));
- eventList.add(CJReportRiskEvent);
- }
- logger.info("【【风险事件原始数据】】" + JSONObject.toJSONString(eventList));
- //加密数据
- String AESReportUnitDate = encrypt(JSONObject.toJSONString(eventList), key.getBytes(), iv.getBytes());
-
- StringBuffer eventResultBuffer = null;
- //上报数据
- try {
- URL url = new URL("http://120.71.182.198:9999/v1/data/receive/eventMsg");
- //得到连接对象
- con = (HttpURLConnection) url.openConnection();
- //设置请求类型
- con.setRequestMethod("POST");
- //设置Content-Type，此处根据实际情况确定
- con.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
- //允许写出
- con.setDoOutput(true);
- //允许读入
- con.setDoInput(true);
- //不使用缓存
- con.setUseCaches(false);
- //设置请求头
- con.setRequestProperty("X-Access-Token",token+formatDate.toString());
- con.setInstanceFollowRedirects(true);
- OutputStream os = con.getOutputStream();
- Map paraMap = new HashMap();
- paraMap.put("data", AESReportUnitDate); /**封装数据*/
- //组装入参，设置请求体
- os.write(JSON.toJSONString(paraMap).getBytes());
- //得到响应码
- responseCode = con.getResponseCode();
- //确认响应流不为空
- if (responseCode == HttpURLConnection.HTTP_OK) {
- //得到响应流
- InputStream inputStream = con.getInputStream();
- //将响应流转换成字符串
- eventResultBuffer = new StringBuffer();
- String line;
- buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
- while ((line = buffer.readLine()) != null) {
- eventResultBuffer.append(line);
- }
- logger.info("result:" + eventResultBuffer.toString());
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- //接收返回值，保存返回值
- CJReportResultData CJEventResult = JSONObject.parseObject(eventResultBuffer.toString(), CJReportResultData.class);
-
- //接收返回值，保存返回值
- List<String> errorIdList= new ArrayList<>();
- Data data = JSONObject.parseObject(CJEventResult.getData(), Data.class);
- if (ObjectUtils.isNotEmpty(data)){
- for (ErrorMsgDetails errorMsgDetail : data.getErrorMsgDetails()) {
- errorIdList.add(errorMsgDetail.getId());
- }
- }
- if (CJEventResult.getCode().equals(CJReportEnum.SUCCESS.getCode())){
- logger.info("【#】Event所有数据全部入库成功");
- for (PreventCJReportRiskEvent CJEvent : CJEvents) {
- HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
- //封装数据
- handlerCJReportParam.setId(CJEvent.getId());
- handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
- handlerCJReportParam.setReportTime(date);
- CJEventService.updateCJReportStatusById(handlerCJReportParam);
- }
- }else if (CJEventResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
- logger.info("【#】Event部分数据上传失败原因" + CJEventResult.getErrorMsg());
- //遍历数据，上报数据设置为成功状态
- for (PreventCJReportRiskEvent CJEvent : CJEvents) {
- HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
- //封装数据
- handlerCJReportParam.setId(CJEvent.getId());
- handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
- handlerCJReportParam.setReportTime(date);
- CJEventService.updateCJReportStatusById(handlerCJReportParam);
- }
- //遍历失败数据，设置为失败状态
- for (String failId : errorIdList) {
- //上报失败
- HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
- //封装数据
- handlerCJReportParam.setId(failId);
- handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());
- handlerCJReportParam.setReportTime(date);
- CJEventService.updateCJReportStatusById(handlerCJReportParam);
- }
- } else if (CJEventResult.getCode().equals(CJReportEnum.FAIL.getCode())){
- logger.info("【#】Event所有数据全部入库失败");
- for (String failId : errorIdList) {
- //上报失败
- HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
- //封装数据
- handlerCJReportParam.setId(failId);
- handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());
- handlerCJReportParam.setReportTime(date);
- CJEventService.updateCJReportStatusById(handlerCJReportParam);
- }
- }
- logger.info("【2】安全风险事件-数据处理完成");
- }else {
- logger.info("【2】风险事件-无数据上报昌吉州");
- }
-
-
- /**
- * 3、处理风险管控措施数据
- * */
- logger.info("【3】风险管控措施-处理数据...");
- List<PreventCJReportRiskControlMeasure> CJMeasures = CJMeasureService.listReportMeasureDate();
- //封装上报数据
- List<CJReportRiskControlMeasureDTO> reportMeasureList = new ArrayList<>();
- if (ObjectUtils.isNotEmpty(CJMeasures)){
- for (PreventCJReportRiskControlMeasure cjMeasure : CJMeasures) {
- CJReportRiskControlMeasureDTO cjReportRiskControlMeasureDTO = BeanCopyUtils.copyBean(cjMeasure, CJReportRiskControlMeasureDTO.class);
- cjReportRiskControlMeasureDTO.setCreateDate(dateFormat.format(cjMeasure.getCreateDate()));
- cjReportRiskControlMeasureDTO.setUpdateDate(dateFormat.format(cjMeasure.getUpdateDate()));
- reportMeasureList.add(cjReportRiskControlMeasureDTO);
- }
- //数据上报
- String AESReportMeasure = encrypt(JSONObject.toJSONString(reportMeasureList), key.getBytes(), iv.getBytes());
-
- logger.info("【原始数据】" + JSONObject.toJSONString(reportMeasureList));
-
- StringBuffer measureResultBuffer = null;
- //上报数据
- try {
- URL url = new URL("http://120.71.182.198:9999/v1/data/receive/controlMeasuresMsg");
- //得到连接对象
- con = (HttpURLConnection) url.openConnection();
- //设置请求类型
- con.setRequestMethod("POST");
- //设置Content-Type，此处根据实际情况确定
- con.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
- //允许写出
- con.setDoOutput(true);
- //允许读入
- con.setDoInput(true);
- //不使用缓存
- con.setUseCaches(false);
- //设置请求头
- con.setRequestProperty("X-Access-Token",token+formatDate.toString());
- OutputStream os = con.getOutputStream();
- Map paraMap = new HashMap();
- paraMap.put("data", AESReportMeasure); /**封装数据*/
- //组装入参，设置请求体
- os.write(JSON.toJSONString(paraMap).getBytes());
- //得到响应码
- responseCode = con.getResponseCode();
- //本段日志，测试成功后，可注释掉
- if (responseCode == HttpURLConnection.HTTP_OK) {
- //得到响应流
- InputStream inputStream = con.getInputStream();
- //将响应流转换成字符串
- measureResultBuffer = new StringBuffer();
- String line;
- buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
- while ((line = buffer.readLine()) != null) {
- measureResultBuffer.append(line);
- }
- logger.info("result:" + measureResultBuffer.toString());
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- //接收返回值，保存返回值
- CJReportResultData CJMeasureResult = JSONObject.parseObject(measureResultBuffer.toString(), CJReportResultData.class);
- //接收返回值，保存返回值
- List<String> errorIdList= new ArrayList<>();
- Data data = JSONObject.parseObject(CJMeasureResult.getData(), Data.class);
- //保存失败结果
- if (ObjectUtils.isNotEmpty(data)){
- for (ErrorMsgDetails errorMsgDetail : data.getErrorMsgDetails()) {
- errorIdList.add(errorMsgDetail.getId());
- }
- }
- logger.info("【】管控措施-数据上报结果：" + CJMeasureResult.getCode());
- //设置所有数据上报成功
- if (CJMeasureResult.getCode().equals(CJReportEnum.SUCCESS.getCode()) || CJMeasureResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
- for (PreventCJReportRiskControlMeasure CJMeasure : CJMeasures) {
- HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
- //封装数据
- handlerCJReportParam.setId(CJMeasure.getId());
- handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
- handlerCJReportParam.setReportTime(date);
- CJMeasureService.updateCJReportStatusById(handlerCJReportParam);
- }
- }
- //设置上报失败的数据，上报失败
- if (CJMeasureResult.getCode().equals(CJReportEnum.FAIL.getCode()) || CJMeasureResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
- for (String failId : errorIdList) {
- //上报失败
- HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
- //封装数据
- handlerCJReportParam.setId(failId);
- handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());
- handlerCJReportParam.setReportTime(date);
- CJMeasureService.updateCJReportStatusById(handlerCJReportParam);
- }
- }
- logger.info("【3】风险管控措施-数据处理完成");
- }else {
- logger.info("【3】风险管控措施-无数据上报昌吉州");
- }
-
-
- /**
- * 4、处理 任务-配置 数据
- * */
- logger.info("【4】任务-处理数据...");
- List<PreventCJReportCheckTaskFromWork> CJTaskFromWorks = CJTaskFromWorkService.listReportTaskFromWorkDate();
- if(ObjectUtils.isNotEmpty(CJTaskFromWorks)){
- //封装上报数据
- List<CJReportCheckTaskFromWorkDTO> reportCheckTaskFromWorkList = new ArrayList<>();
- for (PreventCJReportCheckTaskFromWork cjTaskFromWork : CJTaskFromWorks) {
- CJReportCheckTaskFromWorkDTO cjReportCheckTaskFromWorkDTO = BeanCopyUtils.copyBean(cjTaskFromWork, CJReportCheckTaskFromWorkDTO.class);
- cjReportCheckTaskFromWorkDTO.setCreateDate(dateFormat.format(cjTaskFromWork.getCreateDate()));
- cjReportCheckTaskFromWorkDTO.setUpdateDate(dateFormat.format(cjTaskFromWork.getUpdateDate()));
- cjReportCheckTaskFromWorkDTO.setTaskStartTime(dateFormat.format(cjTaskFromWork.getCreateDate()));
- reportCheckTaskFromWorkList.add(cjReportCheckTaskFromWorkDTO);
- }
- System.out.println(Arrays.toString(reportCheckTaskFromWorkList.toArray()));
- //数据上报
- String AESReportTaskFromWork = encrypt(JSONObject.toJSONString(reportCheckTaskFromWorkList), key.getBytes(), iv.getBytes());
- StringBuffer taskFromWorkResultBuffer = null;
- //上报数据
- try {
- URL url = new URL("http://120.71.182.198:9999/v1/data/receive/measuresTaskMsg");
- //得到连接对象
- con = (HttpURLConnection) url.openConnection();
- //设置请求类型
- con.setRequestMethod("POST");
- //设置Content-Type，此处根据实际情况确定
- con.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
- //允许写出
- con.setDoOutput(true);
- //允许读入
- con.setDoInput(true);
- //不使用缓存
- con.setUseCaches(false);
- //设置请求头
- con.setRequestProperty("X-Access-Token",token+formatDate.toString());
- OutputStream os = con.getOutputStream();
- Map paraMap = new HashMap();
- paraMap.put("data", AESReportTaskFromWork);
- //组装入参，设置请求体
- os.write(JSON.toJSONString(paraMap).getBytes());
- //得到响应码
- responseCode = con.getResponseCode();
- //本段日志，测试成功后，可注释掉
- if (responseCode == HttpURLConnection.HTTP_OK) {
- //得到响应流
- InputStream inputStream = con.getInputStream();
- //将响应流转换成字符串
- taskFromWorkResultBuffer = new StringBuffer();
- String line;
- buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
- while ((line = buffer.readLine()) != null) {
- taskFromWorkResultBuffer.append(line);
- }
- logger.info("result:" + taskFromWorkResultBuffer.toString());
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- //接收返回值，保存返回值
- CJReportResultData CJTaskFromWorkResult = JSONObject.parseObject(taskFromWorkResultBuffer.toString(), CJReportResultData.class);
- //接收返回值，保存返回值
- List<String> errorIdList= new ArrayList<>();
- Data data = JSONObject.parseObject(CJTaskFromWorkResult.getData(), Data.class);
- //保存失败结果
- if (ObjectUtils.isNotEmpty(data)){
- for (ErrorMsgDetails errorMsgDetail : data.getErrorMsgDetails()) {
- errorIdList.add(errorMsgDetail.getId());
- }
- }
- logger.info("【】任务：数据上报结果：" + CJTaskFromWorkResult.getCode());
- //设置所有数据上报成功
- if (CJTaskFromWorkResult.getCode().equals(CJReportEnum.SUCCESS.getCode()) || CJTaskFromWorkResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
- for (PreventCJReportCheckTaskFromWork CJTaskFromWork : CJTaskFromWorks) {
- HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
- //封装数据
- handlerCJReportParam.setId(CJTaskFromWork.getId());
- handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
- handlerCJReportParam.setReportTime(date);
- CJTaskFromWorkService.updateCJReportStatusById(handlerCJReportParam);
- }
- }
- //设置上报失败的数据，上报失败
- if (CJTaskFromWorkResult.getCode().equals(CJReportEnum.FAIL.getCode()) || CJTaskFromWorkResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
- for (String failId : errorIdList) {
- //上报失败
- HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
- //封装数据
- handlerCJReportParam.setId(failId);
- handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());
- handlerCJReportParam.setReportTime(date);
- CJTaskFromWorkService.updateCJReportStatusById(handlerCJReportParam);
- }
- }
- logger.info("【4】任务-数据处理完成");
- }else {
- logger.info("【4】任务-无数据上报昌吉州");
- }
-
- /**
- * 5、处理 任务-记录 数据
- * */
- logger.info("【5】任务记录-处理数据...");
- List<PreventCJReportCheckRecordFromTask> CJRecordFromTasks = CJTaskRecordService.listReportTaskRecordDate();
- if (ObjectUtils.isNotEmpty(CJRecordFromTasks)){
- //封装上报数据
- List<CJReportCheckRecordFromTaskDTO> reportRecordFromTaskList = new ArrayList<>();
- for (PreventCJReportCheckRecordFromTask cjRecordFromTask : CJRecordFromTasks) {
- CJReportCheckRecordFromTaskDTO cjReportCheckRecordFromTaskDTO = BeanCopyUtils.copyBean(cjRecordFromTask, CJReportCheckRecordFromTaskDTO.class);
-// cjReportCheckRecordFromTaskDTO.setCreateDate(dateFormat.format(cjRecordFromTask.getCreateDate()));
-// cjReportCheckRecordFromTaskDTO.setUpdateDate(dateFormat.format(cjRecordFromTask.getUpdateDate()));
- cjReportCheckRecordFromTaskDTO.setCheckTime(dateFormat.format(cjRecordFromTask.getCheckTime()));
- cjReportCheckRecordFromTaskDTO.setMobileMe(cjRecordFromTask.getMobileCode());
- cjReportCheckRecordFromTaskDTO.setIsDefend(cjRecordFromTask.getDefend());
- reportRecordFromTaskList.add(cjReportCheckRecordFromTaskDTO);
- }
-// System.out.println(Arrays.toString(reportRecordFromTaskList.toArray()));
- //数据加密
- String AESReportRecordFromTask = encrypt(JSONObject.toJSONString(reportRecordFromTaskList), key.getBytes(), iv.getBytes());
- logger.info("【test】数据加密完成,开始上报数据");
- StringBuffer recordFromTaskResultBuffer = null;
- //上报数据
- try {
- URL url = new URL("http://120.71.182.198:9999/v1/data/receive/measuresTaskRecordMsg");
- //得到连接对象
- con = (HttpURLConnection) url.openConnection();
- //设置请求类型
- con.setRequestMethod("POST");
- //设置Content-Type，此处根据实际情况确定
- con.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
- //允许写出
- con.setDoOutput(true);
- //允许读入
- con.setDoInput(true);
- //不使用缓存
- con.setUseCaches(false);
- //设置请求头
- con.setRequestProperty("X-Access-Token",token+formatDate.toString());
- OutputStream os = con.getOutputStream();
- Map paraMap = new HashMap();
- paraMap.put("data", AESReportRecordFromTask);/**封装数据*/
- //组装入参，设置请求体
- os.write(JSON.toJSONString(paraMap).getBytes());
- //得到响应码
- responseCode = con.getResponseCode();
- //本段日志，测试成功后，可注释掉
- if (responseCode == HttpURLConnection.HTTP_OK) {
- //得到响应流
- InputStream inputStream = con.getInputStream();
- //将响应流转换成字符串
- recordFromTaskResultBuffer = new StringBuffer();
- String line;
- buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
- while ((line = buffer.readLine()) != null) {
- recordFromTaskResultBuffer.append(line);
- }
- logger.info("result:" + recordFromTaskResultBuffer.toString());
- }else {
- logger.info("Http结果:" + responseCode);
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- logger.info("【test】接收返回值");
- CJReportResultData CJRecordFromTaskResult = new CJReportResultData();
- try {
- CJRecordFromTaskResult = JSONObject.parseObject(recordFromTaskResultBuffer.toString(), CJReportResultData.class);
- if (ObjectUtils.isEmpty(CJRecordFromTaskResult)){
- throw new RuntimeException("返回值为空");
- }
- }catch (Exception e){
- e.printStackTrace();
- logger.info("【test】接收返回值异常");
- }
-
- //接收返回值，保存返回值
-// CJReportResultData CJRecordFromTaskResult = JSONObject.parseObject(recordFromTaskResultBuffer.toString(), CJReportResultData.class);
- //接收返回值，保存返回值
- logger.info("【test】保存上报结果");
- List<String> errorIdList= new ArrayList<>();
- Data data = JSONObject.parseObject(CJRecordFromTaskResult.getData(), Data.class);
- //保存失败结果
- if (ObjectUtils.isNotEmpty(data)){
- for (ErrorMsgDetails errorMsgDetail : data.getErrorMsgDetails()) {
- errorIdList.add(errorMsgDetail.getId());
- }
- }
- logger.info("【】CJRecordFromTask数据上报结果：" + CJRecordFromTaskResult.getCode());
- //设置所有数据上报成功
- if (CJRecordFromTaskResult.getCode().equals(CJReportEnum.SUCCESS.getCode()) || CJRecordFromTaskResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
- for (PreventCJReportCheckRecordFromTask CJRecordFromTask : CJRecordFromTasks) {
- HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
- //封装数据
- handlerCJReportParam.setId(CJRecordFromTask.getId());
- handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
- handlerCJReportParam.setReportTime(date);
- CJTaskRecordService.updateCJReportStatusById(handlerCJReportParam);
- }
- }
- //设置上报失败的数据，上报失败
- if (CJRecordFromTaskResult.getCode().equals(CJReportEnum.FAIL.getCode()) || CJRecordFromTaskResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
- for (String failId : errorIdList) {
- //上报失败
- HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
- //封装数据
- handlerCJReportParam.setId(failId);
- handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());
- handlerCJReportParam.setReportTime(date);
- CJTaskRecordService.updateCJReportStatusById(handlerCJReportParam);
- }
- }
- logger.info("【5】任务记录-数据处理完成");
- }else {
- logger.info("【5】任务记录-无数据上报昌吉州");
- }
-
- /**
- * 6、处理隐患信息数据
- * */
- logger.info("【6】隐患信息-处理数据...");
- List<PreventCJReportDangerInfo> CJDangerInfos = CJDangerInfoService.listReportDangerDate();
- if (ObjectUtils.isNotEmpty(CJDangerInfos)){
- //封装上报数据
- List<CJReportDangerInfoDTO> reportDangerInfoLists = new ArrayList<>();
- for (PreventCJReportDangerInfo cjDangerInfo : CJDangerInfos) {
- CJReportDangerInfoDTO cjReportDangerInfoDTO = BeanCopyUtils.copyBean(cjDangerInfo, CJReportDangerInfoDTO.class);
- cjReportDangerInfoDTO.setCreateDate(dateFormat.format(cjDangerInfo.getCreateDate()));
- cjReportDangerInfoDTO.setUpdateDate(dateFormat.format(cjDangerInfo.getUpdateDate()));
- if (ObjectUtils.isNotEmpty(cjDangerInfo.getCheckAcceptTime())){
- cjReportDangerInfoDTO.setCheckAcceptTime(dateFormat.format(cjDangerInfo.getCheckAcceptTime()));
- }else {
- cjReportDangerInfoDTO.setCheckAcceptTime(null);
- }
- cjReportDangerInfoDTO.setRegistTime(dateFormat.format(cjDangerInfo.getRegistTime()));
- cjReportDangerInfoDTO.setDangerManageDeadline(dateFormat.format(cjDangerInfo.getDangerManageDeadline()));
- reportDangerInfoLists.add(cjReportDangerInfoDTO);
- }
- //数据上报
- logger.info("【原始数据】" + JSONObject.toJSONString(reportDangerInfoLists));
- String AESReportDangerInfo = encrypt(JSONObject.toJSONString(reportDangerInfoLists), key.getBytes(), iv.getBytes());
- StringBuffer dangerInfoResultBuffer = null;
- //上报数据
- try {
- URL url = new URL("http://120.71.182.198:9999/v1/data/receive/dangerInvestigationMsg");
- //得到连接对象
- con = (HttpURLConnection) url.openConnection();
- //设置请求类型
- con.setRequestMethod("POST");
- //设置Content-Type，此处根据实际情况确定
- con.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
- //允许写出
- con.setDoOutput(true);
- //允许读入
- con.setDoInput(true);
- //不使用缓存
- con.setUseCaches(false);
- //设置请求头
- con.setRequestProperty("X-Access-Token",token + formatDate.toString());
- OutputStream os = con.getOutputStream();
- Map paraMap = new HashMap();
- paraMap.put("data", AESReportDangerInfo);/**封装数据*/
- //组装入参，设置请求体
- os.write(JSON.toJSONString(paraMap).getBytes());
- //得到响应码
- responseCode = con.getResponseCode();
- //本段日志，测试成功后，可注释掉
- if (responseCode == HttpURLConnection.HTTP_OK) {
- //得到响应流
- InputStream inputStream = con.getInputStream();
- //将响应流转换成字符串
- dangerInfoResultBuffer = new StringBuffer();
- String line;
- buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
- while ((line = buffer.readLine()) != null) {
- dangerInfoResultBuffer.append(line);
- }
- logger.info("result:" + dangerInfoResultBuffer.toString());
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- //接收返回值，保存返回值
- CJReportResultData CJDangerInfoResult = JSONObject.parseObject(dangerInfoResultBuffer.toString(), CJReportResultData.class);
- //接收返回值，保存返回值
- List<String> errorIdList= new ArrayList<>();
- Data data = JSONObject.parseObject(CJDangerInfoResult.getData(), Data.class);
- //保存失败结果
- if (ObjectUtils.isNotEmpty(data)){
- for (ErrorMsgDetails errorMsgDetail : data.getErrorMsgDetails()) {
- errorIdList.add(errorMsgDetail.getId());
- }
- }
- logger.info("【】CJDangerInfo数据上报结果：" + CJDangerInfoResult.getCode());
- //设置所有数据上报成功
- if (CJDangerInfoResult.getCode().equals(CJReportEnum.SUCCESS.getCode()) || CJDangerInfoResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
- for (PreventCJReportDangerInfo CJDangerInfo : CJDangerInfos) {
- HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
- //封装数据
- handlerCJReportParam.setId(CJDangerInfo.getId());
- handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
- handlerCJReportParam.setReportTime(date);
- CJDangerInfoService.updateCJReportStatusById(handlerCJReportParam);
- }
- }
- //设置上报失败的数据，上报失败
- if (CJDangerInfoResult.getCode().equals(CJReportEnum.FAIL.getCode()) || CJDangerInfoResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
- for (String failId : errorIdList) {
- //上报失败
- HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
- //封装数据
- handlerCJReportParam.setId(failId);
- handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());
- handlerCJReportParam.setReportTime(date);
- CJDangerInfoService.updateCJReportStatusById(handlerCJReportParam);
- }
- }
- logger.info("【6】隐患信息-数据处理完成");
- }else {
- logger.info("【6】隐患信息-无数据上报昌吉州");
- }
-
-
- /**
- * 7、检修停用记录信息数据
- * */
- logger.info("【7】检修停用记录-处理数据...");
- List<PreventCJReportOverhaulLog> CJOverhaulLogs = CJOverhaulLogService.listReportOverhaulDate();
- if (ObjectUtils.isNotEmpty(CJOverhaulLogs)){
- //封装上报数据
- List<CJReportOverhaulLogDTO> reportOverhaulLogDTOS = new ArrayList<>();
- for (PreventCJReportOverhaulLog cjOverhaulLog : CJOverhaulLogs) {
- CJReportOverhaulLogDTO cjReportOverhaulLogDTO = BeanCopyUtils.copyBean(cjOverhaulLog, CJReportOverhaulLogDTO.class);
-
- cjReportOverhaulLogDTO.setCreateDate(dateFormat.format(cjOverhaulLog.getCreateDate()));
- cjReportOverhaulLogDTO.setUpdateDate(dateFormat.format(cjOverhaulLog.getUpdateDate()));
- cjReportOverhaulLogDTO.setStopStartTime(dateFormat.format(cjOverhaulLog.getStopStartTime()));
- if (ObjectUtils.isNotEmpty(cjOverhaulLog.getStopEndTime())){
- cjReportOverhaulLogDTO.setStopEndTime(dateFormat.format(cjOverhaulLog.getStopEndTime()));
- }else {
- cjReportOverhaulLogDTO.setStopEndTime(null);
- }
- reportOverhaulLogDTOS.add(cjReportOverhaulLogDTO);
- }
-
- //数据上报
- logger.info("【原始数据】" + JSONObject.toJSONString(reportOverhaulLogDTOS));
- String AESReportDangerInfo = encrypt(JSONObject.toJSONString(reportOverhaulLogDTOS), key.getBytes(), iv.getBytes());
- StringBuffer dangerInfoResultBuffer = null;
- //上报数据
- try {
- URL url = new URL("http://v1/data/receive/receiveUnitStop");
- //得到连接对象
- con = (HttpURLConnection) url.openConnection();
- //设置请求类型
- con.setRequestMethod("POST");
- //设置Content-Type，此处根据实际情况确定
- con.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
- //允许写出
- con.setDoOutput(true);
- //允许读入
- con.setDoInput(true);
- //不使用缓存
- con.setUseCaches(false);
- //设置请求头
- con.setRequestProperty("X-Access-Token",token + formatDate.toString());
- OutputStream os = con.getOutputStream();
- Map paraMap = new HashMap();
- paraMap.put("data", AESReportDangerInfo);/**封装数据*/
- //组装入参，设置请求体
- os.write(JSON.toJSONString(paraMap).getBytes());
- //得到响应码
- responseCode = con.getResponseCode();
- //本段日志，测试成功后，可注释掉
- if (responseCode == HttpURLConnection.HTTP_OK) {
- //得到响应流
- InputStream inputStream = con.getInputStream();
- //将响应流转换成字符串
- dangerInfoResultBuffer = new StringBuffer();
- String line;
- buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
- while ((line = buffer.readLine()) != null) {
- dangerInfoResultBuffer.append(line);
- }
- logger.info("result:" + dangerInfoResultBuffer.toString());
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- //接收返回值，保存返回值
- CJReportResultData CJOverhaulLogResult = JSONObject.parseObject(dangerInfoResultBuffer.toString(), CJReportResultData.class);
- //接收返回值，保存返回值
- List<String> errorIdList= new ArrayList<>();
- Data data = JSONObject.parseObject(CJOverhaulLogResult.getData(), Data.class);
- //保存失败结果
- if (ObjectUtils.isNotEmpty(data)){
- for (ErrorMsgDetails errorMsgDetail : data.getErrorMsgDetails()) {
- errorIdList.add(errorMsgDetail.getId());
- }
- }
- logger.info("【】CJOverhaulLog数据上报结果：" + CJOverhaulLogResult.getCode());
- //设置所有数据上报成功
-
- if (CJOverhaulLogResult.getCode().equals(CJReportEnum.SUCCESS.getCode()) || CJOverhaulLogResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
- for (PreventCJReportOverhaulLog cjOverhaulLog : CJOverhaulLogs) {
- HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
- //封装数据
- handlerCJReportParam.setId(cjOverhaulLog.getId());
- handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
- handlerCJReportParam.setReportTime(date);
- CJOverhaulLogService.updateCJReportStatusById(handlerCJReportParam);
- }
- }
- //设置上报失败的数据，上报失败
- if (CJOverhaulLogResult.getCode().equals(CJReportEnum.FAIL.getCode()) || CJOverhaulLogResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
- for (String failId : errorIdList) {
- //上报失败
- HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
- //封装数据
- handlerCJReportParam.setId(failId);
- handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());
- handlerCJReportParam.setReportTime(date);
- CJOverhaulLogService.updateCJReportStatusById(handlerCJReportParam);
- }
- }
- logger.info("【7】检修停用记录-数据处理完成");
- }else {
- logger.info("【7】检修停用记录-无数据上报昌吉州");
- }
-
- }
-}
+package com.ruoyi.doublePrevention.scheduls;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.utils.BeanCopyUtils;
+import com.ruoyi.doublePrevention.entity.CJReport.CJdto.CJReportResultData;
+import com.ruoyi.doublePrevention.entity.CJReport.CJdto.Data;
+import com.ruoyi.doublePrevention.entity.CJReport.CJdto.ErrorMsgDetails;
+import com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO.*;
+import com.ruoyi.doublePrevention.entity.CJReport.*;
+import com.ruoyi.doublePrevention.entity.PreventReportConfig;
+import com.ruoyi.doublePrevention.enums.CJReportEnum;
+import com.ruoyi.doublePrevention.enums.SyncEnum;
+import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
+import com.ruoyi.doublePrevention.service.baseService.*;
+import com.ruoyi.project.tr.report.service.ReportService;
+import org.apache.commons.lang3.ObjectUtils;
+import org.bouncycastle.crypto.engines.AESFastEngine;
+import org.bouncycastle.crypto.modes.GCMBlockCipher;
+import org.bouncycastle.crypto.params.AEADParameters;
+import org.bouncycastle.crypto.params.KeyParameter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@Component
+public class ExecCJReportDateSchedule {
+
+ private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+ @Autowired
+ private ReportService reportService;
+
+ @Autowired
+ private PreventCJReportRiskAnaUnitService CJRiskAnaUnitService;
+ @Autowired
+ private PreventCJReportRiskEventService CJEventService;
+ @Autowired
+ private PreventCJReportRiskControlMeasureService CJMeasureService;
+ @Autowired
+ private PreventCJReportCheckTaskFromWorkService CJTaskFromWorkService;
+ @Autowired
+ private PreventCJReportCheckRecordFromTaskService CJTaskRecordService;
+ @Autowired
+ private PreventCJReportDangerInfoService CJDangerInfoService;
+ @Autowired
+ private PreventCJReportPointService CJPointService;
+ @Autowired
+ private PreventCJReportOverhaulLogService CJOverhaulLogService;
+ @Autowired
+ private PreventReportConfigService preventReportConfigService;
+
+ String token = "GT6gGJV7JV";
+ String key = "Bv+NeBolwqg2Pbc1yVwrZA==";
+ String iv = "4QC9V8eAiB7tdlgBkMsTAw==";
+
+ public static final int MAC_BIT_SIZE = 128;
+
+ public static String encrypt(String plainText, byte[] key, byte[] iv) {
+ String sr;
+ try {
+ byte[] plainBytes = plainText.getBytes(StandardCharsets.UTF_8);
+ GCMBlockCipher cipher = new GCMBlockCipher(new
+ AESFastEngine());
+ AEADParameters parameters =
+ new AEADParameters(new KeyParameter(key),
+ MAC_BIT_SIZE, iv, null);
+ cipher.init(true, parameters);
+ byte[] encryptedBytes = new
+ byte[cipher.getOutputSize(plainBytes.length)];
+ int retLen = cipher.processBytes(plainBytes, 0, plainBytes.length,
+ encryptedBytes, 0);
+ cipher.doFinal(encryptedBytes, retLen);
+ sr = Base64.getEncoder().encodeToString(encryptedBytes);
+ } catch (Exception ex) {
+ throw new RuntimeException(ex.getMessage());
+ }
+ return sr;
+ }
+
+
+ @Transactional
+// @Scheduled(cron = "0 0 23 * * ?") //每天晚上23点执行一次0 0 22,23 * * ?
+// @Scheduled(cron = "0 0 22,23 * * ?") //每天晚上22、23点执行一次
+ // @Scheduled(cron = "0 0/5 * * * ? ") // 分钟
+ // @Scheduled(cron = "0 0/5 * * * ? ")
+ @Scheduled(cron = "0 0/1 * * * ? ")
+ public void execReportDateSchedule() throws UnsupportedEncodingException {
+ logger.info("【####】上报数据开始...");
+
+ HttpURLConnection con = null;
+ BufferedReader buffer = null;
+ int responseCode = 200;
+
+ SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd HH:MM:ss");
+
+ Date date = new Date();
+ //格式化时间，作为token的时间戳
+ SimpleDateFormat tokenDate= new SimpleDateFormat("yyyyMMddHHmmssSSS");
+ String formatDate = tokenDate.format(date);
+
+ logger.info("【token时间】" + formatDate);
+
+ //使用风险分析单元数据上报主配置，作为自动上报开关
+ PreventReportConfig reportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());
+ if (reportConfig.getReportType() == 0){
+ return;
+ }
+
+ /**
+ * 1、处理安全风险分析单元数据
+ * */
+ logger.info("【1】安全风险分析单元-处理数据...");
+ List<PreventCJReportRiskAnaUnit> CJRiskAnaUnits = CJRiskAnaUnitService.listReportUnitDate();
+ if (ObjectUtils.isNotEmpty(CJRiskAnaUnits)){
+ //封装上报数据,时间格式化
+ List<CJReportRiskAnaUnitDTO> list = new ArrayList<>();
+ for (PreventCJReportRiskAnaUnit cjRiskAnaUnit : CJRiskAnaUnits) {
+ CJReportRiskAnaUnitDTO riskAnaUnit = BeanCopyUtils.copyBean(cjRiskAnaUnit, CJReportRiskAnaUnitDTO.class);
+ riskAnaUnit.setCreateDate(dateFormat.format(cjRiskAnaUnit.getCreateDate()));
+ riskAnaUnit.setUpdateDate(dateFormat.format(cjRiskAnaUnit.getUpdateDate()));
+ list.add(riskAnaUnit);
+ }
+// logger.info("【【原始数据】】" + JSONObject.toJSONString(list));
+ String AESReportUnitDate = encrypt(JSONObject.toJSONString(list), key.getBytes(), iv.getBytes());
+// logger.info("【【AES加密结果】】"+ AESReportUnitDate);{0JRK`$6X.jpg)min/Desktop/所有桌面文件存放/9}AM56M10$6WX){0JRK`$6X.jpg)
+ StringBuffer unitResultBuffer = null;
+ //上报数据
+ try {
+ URL url = new URL("http://120.71.182.198:9999/v1/data/receive/unitMsg");
+ //得到连接对象
+ con = (HttpURLConnection) url.openConnection();
+ //设置请求类型
+ con.setRequestMethod("POST");
+ //允许写出
+ con.setDoOutput(true);
+ //允许读入
+ con.setDoInput(true);
+ //不使用缓存
+ con.setUseCaches(false);
+ con.setInstanceFollowRedirects(true);
+ //设置请求头
+ con.setRequestProperty("X-Access-Token",token+formatDate.toString());
+ //设置Content-Type，此处根据实际情况确定
+ con.setRequestProperty("Content-Type", "application/json;charset=utf8");
+
+ OutputStream os = con.getOutputStream();
+ Map paraMap = new HashMap();
+ paraMap.put("data", AESReportUnitDate); /**封装数据*/
+ logger.info("【【加密请求体】】" + JSONArray.toJSON(paraMap).toString());
+ //组装入参，设置请求体
+ os.write(JSON.toJSONString(paraMap).getBytes());
+
+ //本段日志，测试成功后，可注释掉
+ if (responseCode == HttpURLConnection.HTTP_OK) {
+ //得到响应流
+ InputStream inputStream = con.getInputStream();
+ //将响应流转换成字符串
+ unitResultBuffer = new StringBuffer();
+ String line;
+ buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
+ while ((line = buffer.readLine()) != null) {
+ unitResultBuffer.append(line);
+ }
+ logger.info("result:" + unitResultBuffer.toString());
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ //接收返回值，保存返回值
+ List<String> errorIdList= new ArrayList<>();
+ //接收参数，转为对象
+ CJReportResultData CJUnitResult = JSONObject.parseObject(unitResultBuffer.toString(), CJReportResultData.class);
+// Object parse = JSON.parse(CJUnitResult.getData());
+ //取出需要的data部分，再次转换为对象
+ Data data = JSONObject.parseObject(CJUnitResult.getData(), Data.class);
+ if (ObjectUtils.isNotEmpty(data)){
+ for (ErrorMsgDetails errorMsgDetail : data.getErrorMsgDetails()) {
+ errorIdList.add(errorMsgDetail.getId());
+ }
+ }
+ if (CJUnitResult.getCode().equals(CJReportEnum.SUCCESS.getCode())){
+ logger.info("【#】RiskAnaUnit所有数据全部入库成功");
+ for (PreventCJReportRiskAnaUnit CJRiskAnaUnit : CJRiskAnaUnits) {
+ HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
+ //封装数据
+ handlerCJReportParam.setId(CJRiskAnaUnit.getId());
+ handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
+ handlerCJReportParam.setReportTime(date);
+ CJRiskAnaUnitService.updateCJReportStatusById(handlerCJReportParam);
+ }
+ }else if (CJUnitResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
+ logger.info("【#】RiskAnaUnit部分数据上传失败原因" + CJUnitResult.getErrorMsg());
+
+ CJUnitResult.getData();
+ //遍历数据，设置数据上报成功
+ for (PreventCJReportRiskAnaUnit CJRiskAnaUnit : CJRiskAnaUnits) {
+ HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
+ //封装数据
+ handlerCJReportParam.setId(CJRiskAnaUnit.getId());
+ handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
+ handlerCJReportParam.setReportTime(date);
+ CJRiskAnaUnitService.updateCJReportStatusById(handlerCJReportParam);
+ }
+ //遍历失败数据，设置数据上报失败
+ for (String failId : errorIdList) {
+ //上报失败
+ HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
+ //封装数据
+ handlerCJReportParam.setId(failId);
+ handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());
+ handlerCJReportParam.setReportTime(date);
+ CJRiskAnaUnitService.updateCJReportStatusById(handlerCJReportParam);
+ }
+ }
+ else if (CJUnitResult.getCode().equals(CJReportEnum.FAIL.getCode())){
+ logger.info("【#】RiskAnaUnit所有数据全部入库失败");
+ for (String failId : errorIdList) {
+ //上报失败
+ HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
+ //封装数据
+ handlerCJReportParam.setId(failId);
+ handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());
+ handlerCJReportParam.setReportTime(date);
+ CJRiskAnaUnitService.updateCJReportStatusById(handlerCJReportParam);
+ }
+ }
+ logger.info("【1】安全风险分析单元-数据处理完成");
+ }else {
+ logger.info("【1】风险分析单元-无数据上报昌吉州");
+ }
+
+
+ /**
+ * 2、处理安全风险事件数据
+ * */
+ logger.info("【2】安全风险事件-处理数据...");
+ List<PreventCJReportRiskEvent> CJEvents = CJEventService.listReportEventDate();
+ if (ObjectUtils.isNotEmpty(CJEvents)){
+ //封装上报数据
+ List<CJReportRiskEventDTO> eventList = new ArrayList<>();
+
+ for (PreventCJReportRiskEvent cjEvent : CJEvents) {
+ CJReportRiskEventDTO CJReportRiskEvent = BeanCopyUtils.copyBean(cjEvent, CJReportRiskEventDTO.class);
+ CJReportRiskEvent.setCreateDate(dateFormat.format(cjEvent.getCreateDate()));
+ CJReportRiskEvent.setUpdateDate(dateFormat.format(cjEvent.getUpdateDate()));
+ eventList.add(CJReportRiskEvent);
+ }
+ logger.info("【【风险事件原始数据】】" + JSONObject.toJSONString(eventList));
+ //加密数据
+ String AESReportUnitDate = encrypt(JSONObject.toJSONString(eventList), key.getBytes(), iv.getBytes());
+
+ StringBuffer eventResultBuffer = null;
+ //上报数据
+ try {
+ URL url = new URL("http://120.71.182.198:9999/v1/data/receive/eventMsg");
+ //得到连接对象
+ con = (HttpURLConnection) url.openConnection();
+ //设置请求类型
+ con.setRequestMethod("POST");
+ //设置Content-Type，此处根据实际情况确定
+ con.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
+ //允许写出
+ con.setDoOutput(true);
+ //允许读入
+ con.setDoInput(true);
+ //不使用缓存
+ con.setUseCaches(false);
+ //设置请求头
+ con.setRequestProperty("X-Access-Token",token+formatDate.toString());
+ con.setInstanceFollowRedirects(true);
+ OutputStream os = con.getOutputStream();
+ Map paraMap = new HashMap();
+ paraMap.put("data", AESReportUnitDate); /**封装数据*/
+ //组装入参，设置请求体
+ os.write(JSON.toJSONString(paraMap).getBytes());
+ //得到响应码
+ responseCode = con.getResponseCode();
+ //确认响应流不为空
+ if (responseCode == HttpURLConnection.HTTP_OK) {
+ //得到响应流
+ InputStream inputStream = con.getInputStream();
+ //将响应流转换成字符串
+ eventResultBuffer = new StringBuffer();
+ String line;
+ buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
+ while ((line = buffer.readLine()) != null) {
+ eventResultBuffer.append(line);
+ }
+ logger.info("result:" + eventResultBuffer.toString());
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ //接收返回值，保存返回值
+ CJReportResultData CJEventResult = JSONObject.parseObject(eventResultBuffer.toString(), CJReportResultData.class);
+
+ //接收返回值，保存返回值
+ List<String> errorIdList= new ArrayList<>();
+ Data data = JSONObject.parseObject(CJEventResult.getData(), Data.class);
+ if (ObjectUtils.isNotEmpty(data)){
+ for (ErrorMsgDetails errorMsgDetail : data.getErrorMsgDetails()) {
+ errorIdList.add(errorMsgDetail.getId());
+ }
+ }
+ if (CJEventResult.getCode().equals(CJReportEnum.SUCCESS.getCode())){
+ logger.info("【#】Event所有数据全部入库成功");
+ for (PreventCJReportRiskEvent CJEvent : CJEvents) {
+ HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
+ //封装数据
+ handlerCJReportParam.setId(CJEvent.getId());
+ handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
+ handlerCJReportParam.setReportTime(date);
+ CJEventService.updateCJReportStatusById(handlerCJReportParam);
+ }
+ }else if (CJEventResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
+ logger.info("【#】Event部分数据上传失败原因" + CJEventResult.getErrorMsg());
+ //遍历数据，上报数据设置为成功状态
+ for (PreventCJReportRiskEvent CJEvent : CJEvents) {
+ HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
+ //封装数据
+ handlerCJReportParam.setId(CJEvent.getId());
+ handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
+ handlerCJReportParam.setReportTime(date);
+ CJEventService.updateCJReportStatusById(handlerCJReportParam);
+ }
+ //遍历失败数据，设置为失败状态
+ for (String failId : errorIdList) {
+ //上报失败
+ HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
+ //封装数据
+ handlerCJReportParam.setId(failId);
+ handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());
+ handlerCJReportParam.setReportTime(date);
+ CJEventService.updateCJReportStatusById(handlerCJReportParam);
+ }
+ } else if (CJEventResult.getCode().equals(CJReportEnum.FAIL.getCode())){
+ logger.info("【#】Event所有数据全部入库失败");
+ for (String failId : errorIdList) {
+ //上报失败
+ HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
+ //封装数据
+ handlerCJReportParam.setId(failId);
+ handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());
+ handlerCJReportParam.setReportTime(date);
+ CJEventService.updateCJReportStatusById(handlerCJReportParam);
+ }
+ }
+ logger.info("【2】安全风险事件-数据处理完成");
+ }else {
+ logger.info("【2】风险事件-无数据上报昌吉州");
+ }
+
+
+ /**
+ * 3、处理风险管控措施数据
+ * */
+ logger.info("【3】风险管控措施-处理数据...");
+ List<PreventCJReportRiskControlMeasure> CJMeasures = CJMeasureService.listReportMeasureDate();
+ //封装上报数据
+ List<CJReportRiskControlMeasureDTO> reportMeasureList = new ArrayList<>();
+ if (ObjectUtils.isNotEmpty(CJMeasures)){
+ for (PreventCJReportRiskControlMeasure cjMeasure : CJMeasures) {
+ CJReportRiskControlMeasureDTO cjReportRiskControlMeasureDTO = BeanCopyUtils.copyBean(cjMeasure, CJReportRiskControlMeasureDTO.class);
+ cjReportRiskControlMeasureDTO.setCreateDate(dateFormat.format(cjMeasure.getCreateDate()));
+ cjReportRiskControlMeasureDTO.setUpdateDate(dateFormat.format(cjMeasure.getUpdateDate()));
+ reportMeasureList.add(cjReportRiskControlMeasureDTO);
+ }
+ //数据上报
+ String AESReportMeasure = encrypt(JSONObject.toJSONString(reportMeasureList), key.getBytes(), iv.getBytes());
+
+ logger.info("【原始数据】" + JSONObject.toJSONString(reportMeasureList));
+
+ StringBuffer measureResultBuffer = null;
+ //上报数据
+ try {
+ URL url = new URL("http://120.71.182.198:9999/v1/data/receive/controlMeasuresMsg");
+ //得到连接对象
+ con = (HttpURLConnection) url.openConnection();
+ //设置请求类型
+ con.setRequestMethod("POST");
+ //设置Content-Type，此处根据实际情况确定
+ con.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
+ //允许写出
+ con.setDoOutput(true);
+ //允许读入
+ con.setDoInput(true);
+ //不使用缓存
+ con.setUseCaches(false);
+ //设置请求头
+ con.setRequestProperty("X-Access-Token",token+formatDate.toString());
+ OutputStream os = con.getOutputStream();
+ Map paraMap = new HashMap();
+ paraMap.put("data", AESReportMeasure); /**封装数据*/
+ //组装入参，设置请求体
+ os.write(JSON.toJSONString(paraMap).getBytes());
+ //得到响应码
+ responseCode = con.getResponseCode();
+ //本段日志，测试成功后，可注释掉
+ if (responseCode == HttpURLConnection.HTTP_OK) {
+ //得到响应流
+ InputStream inputStream = con.getInputStream();
+ //将响应流转换成字符串
+ measureResultBuffer = new StringBuffer();
+ String line;
+ buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
+ while ((line = buffer.readLine()) != null) {
+ measureResultBuffer.append(line);
+ }
+ logger.info("result:" + measureResultBuffer.toString());
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ //接收返回值，保存返回值
+ CJReportResultData CJMeasureResult = JSONObject.parseObject(measureResultBuffer.toString(), CJReportResultData.class);
+ //接收返回值，保存返回值
+ List<String> errorIdList= new ArrayList<>();
+ Data data = JSONObject.parseObject(CJMeasureResult.getData(), Data.class);
+ //保存失败结果
+ if (ObjectUtils.isNotEmpty(data)){
+ for (ErrorMsgDetails errorMsgDetail : data.getErrorMsgDetails()) {
+ errorIdList.add(errorMsgDetail.getId());
+ }
+ }
+ logger.info("【】管控措施-数据上报结果：" + CJMeasureResult.getCode());
+ //设置所有数据上报成功
+ if (CJMeasureResult.getCode().equals(CJReportEnum.SUCCESS.getCode()) || CJMeasureResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
+ for (PreventCJReportRiskControlMeasure CJMeasure : CJMeasures) {
+ HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
+ //封装数据
+ handlerCJReportParam.setId(CJMeasure.getId());
+ handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
+ handlerCJReportParam.setReportTime(date);
+ CJMeasureService.updateCJReportStatusById(handlerCJReportParam);
+ }
+ }
+ //设置上报失败的数据，上报失败
+ if (CJMeasureResult.getCode().equals(CJReportEnum.FAIL.getCode()) || CJMeasureResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
+ for (String failId : errorIdList) {
+ //上报失败
+ HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
+ //封装数据
+ handlerCJReportParam.setId(failId);
+ handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());
+ handlerCJReportParam.setReportTime(date);
+ CJMeasureService.updateCJReportStatusById(handlerCJReportParam);
+ }
+ }
+ logger.info("【3】风险管控措施-数据处理完成");
+ }else {
+ logger.info("【3】风险管控措施-无数据上报昌吉州");
+ }
+
+
+ /**
+ * 4、处理 任务-配置 数据
+ * */
+ logger.info("【4】任务-处理数据...");
+ List<PreventCJReportCheckTaskFromWork> CJTaskFromWorks = CJTaskFromWorkService.listReportTaskFromWorkDate();
+ if(ObjectUtils.isNotEmpty(CJTaskFromWorks)){
+ //封装上报数据
+ List<CJReportCheckTaskFromWorkDTO> reportCheckTaskFromWorkList = new ArrayList<>();
+ for (PreventCJReportCheckTaskFromWork cjTaskFromWork : CJTaskFromWorks) {
+ CJReportCheckTaskFromWorkDTO cjReportCheckTaskFromWorkDTO = BeanCopyUtils.copyBean(cjTaskFromWork, CJReportCheckTaskFromWorkDTO.class);
+ cjReportCheckTaskFromWorkDTO.setCreateDate(dateFormat.format(cjTaskFromWork.getCreateDate()));
+ cjReportCheckTaskFromWorkDTO.setUpdateDate(dateFormat.format(cjTaskFromWork.getUpdateDate()));
+ cjReportCheckTaskFromWorkDTO.setTaskStartTime(dateFormat.format(cjTaskFromWork.getCreateDate()));
+ reportCheckTaskFromWorkList.add(cjReportCheckTaskFromWorkDTO);
+ }
+ System.out.println(Arrays.toString(reportCheckTaskFromWorkList.toArray()));
+ //数据上报
+ String AESReportTaskFromWork = encrypt(JSONObject.toJSONString(reportCheckTaskFromWorkList), key.getBytes(), iv.getBytes());
+ StringBuffer taskFromWorkResultBuffer = null;
+ //上报数据
+ try {
+ URL url = new URL("http://120.71.182.198:9999/v1/data/receive/measuresTaskMsg");
+ //得到连接对象
+ con = (HttpURLConnection) url.openConnection();
+ //设置请求类型
+ con.setRequestMethod("POST");
+ //设置Content-Type，此处根据实际情况确定
+ con.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
+ //允许写出
+ con.setDoOutput(true);
+ //允许读入
+ con.setDoInput(true);
+ //不使用缓存
+ con.setUseCaches(false);
+ //设置请求头
+ con.setRequestProperty("X-Access-Token",token+formatDate.toString());
+ OutputStream os = con.getOutputStream();
+ Map paraMap = new HashMap();
+ paraMap.put("data", AESReportTaskFromWork);
+ //组装入参，设置请求体
+ os.write(JSON.toJSONString(paraMap).getBytes());
+ //得到响应码
+ responseCode = con.getResponseCode();
+ //本段日志，测试成功后，可注释掉
+ if (responseCode == HttpURLConnection.HTTP_OK) {
+ //得到响应流
+ InputStream inputStream = con.getInputStream();
+ //将响应流转换成字符串
+ taskFromWorkResultBuffer = new StringBuffer();
+ String line;
+ buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
+ while ((line = buffer.readLine()) != null) {
+ taskFromWorkResultBuffer.append(line);
+ }
+ logger.info("result:" + taskFromWorkResultBuffer.toString());
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ //接收返回值，保存返回值
+ CJReportResultData CJTaskFromWorkResult = JSONObject.parseObject(taskFromWorkResultBuffer.toString(), CJReportResultData.class);
+ //接收返回值，保存返回值
+ List<String> errorIdList= new ArrayList<>();
+ Data data = JSONObject.parseObject(CJTaskFromWorkResult.getData(), Data.class);
+ //保存失败结果
+ if (ObjectUtils.isNotEmpty(data)){
+ for (ErrorMsgDetails errorMsgDetail : data.getErrorMsgDetails()) {
+ errorIdList.add(errorMsgDetail.getId());
+ }
+ }
+ logger.info("【】任务：数据上报结果：" + CJTaskFromWorkResult.getCode());
+ //设置所有数据上报成功
+ if (CJTaskFromWorkResult.getCode().equals(CJReportEnum.SUCCESS.getCode()) || CJTaskFromWorkResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
+ for (PreventCJReportCheckTaskFromWork CJTaskFromWork : CJTaskFromWorks) {
+ HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
+ //封装数据
+ handlerCJReportParam.setId(CJTaskFromWork.getId());
+ handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
+ handlerCJReportParam.setReportTime(date);
+ CJTaskFromWorkService.updateCJReportStatusById(handlerCJReportParam);
+ }
+ }
+ //设置上报失败的数据，上报失败
+ if (CJTaskFromWorkResult.getCode().equals(CJReportEnum.FAIL.getCode()) || CJTaskFromWorkResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
+ for (String failId : errorIdList) {
+ //上报失败
+ HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
+ //封装数据
+ handlerCJReportParam.setId(failId);
+ handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());
+ handlerCJReportParam.setReportTime(date);
+ CJTaskFromWorkService.updateCJReportStatusById(handlerCJReportParam);
+ }
+ }
+ logger.info("【4】任务-数据处理完成");
+ }else {
+ logger.info("【4】任务-无数据上报昌吉州");
+ }
+
+ /**
+ * 5、处理 任务-记录 数据
+ * */
+ logger.info("【5】任务记录-处理数据...");
+ List<PreventCJReportCheckRecordFromTask> CJRecordFromTasks = CJTaskRecordService.listReportTaskRecordDate();
+ if (ObjectUtils.isNotEmpty(CJRecordFromTasks)){
+ //封装上报数据
+ List<CJReportCheckRecordFromTaskDTO> reportRecordFromTaskList = new ArrayList<>();
+ for (PreventCJReportCheckRecordFromTask cjRecordFromTask : CJRecordFromTasks) {
+ CJReportCheckRecordFromTaskDTO cjReportCheckRecordFromTaskDTO = BeanCopyUtils.copyBean(cjRecordFromTask, CJReportCheckRecordFromTaskDTO.class);
+// cjReportCheckRecordFromTaskDTO.setCreateDate(dateFormat.format(cjRecordFromTask.getCreateDate()));
+// cjReportCheckRecordFromTaskDTO.setUpdateDate(dateFormat.format(cjRecordFromTask.getUpdateDate()));
+ cjReportCheckRecordFromTaskDTO.setCheckTime(dateFormat.format(cjRecordFromTask.getCheckTime()));
+ cjReportCheckRecordFromTaskDTO.setMobileMe(cjRecordFromTask.getMobileCode());
+ cjReportCheckRecordFromTaskDTO.setIsDefend(cjRecordFromTask.getDefend());
+ reportRecordFromTaskList.add(cjReportCheckRecordFromTaskDTO);
+ }
+// System.out.println(Arrays.toString(reportRecordFromTaskList.toArray()));
+ //数据加密
+ String AESReportRecordFromTask = encrypt(JSONObject.toJSONString(reportRecordFromTaskList), key.getBytes(), iv.getBytes());
+ logger.info("【test】数据加密完成,开始上报数据");
+
+ StringBuffer recordFromTaskResultBuffer = null;
+ //上报数据
+ try {
+ // URL url = new URL("http://120.71.182.198:9999/v1/data/receive/measuresTaskRecordMsg");
+ URL url = new URL("https://cjzjg.gtaq.com.cn:7004/v1/data/receive/measuresTaskRecordMsg"); //备用地址
+ //得到连接对象
+ con = (HttpURLConnection) url.openConnection();
+ //设置请求类型
+ con.setRequestMethod("POST");
+ //设置Content-Type，此处根据实际情况确定
+ con.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
+ // con.setRequestProperty(HTTP.CONN_DIRECTIVE,HTTP.CONN_CLOSE);
+ con.setConnectTimeout(600000);
+ con.setReadTimeout(600000);
+
+ //允许写出
+ con.setDoOutput(true);
+ //允许读入
+ con.setDoInput(true);
+ //不使用缓存
+ con.setUseCaches(false);
+ //设置请求头
+ con.setRequestProperty("X-Access-Token",token+tokenDate.format(new Date()).toString());
+ OutputStream os = con.getOutputStream();
+ Map paraMap = new HashMap();
+ paraMap.put("data", AESReportRecordFromTask);/**封装数据*/
+ //组装入参，设置请求体
+ os.write(JSON.toJSONString(paraMap).getBytes());
+ //得到响应码
+ responseCode = con.getResponseCode();
+ //本段日志，测试成功后，可注释掉
+ if (responseCode == HttpURLConnection.HTTP_OK) {
+ //得到响应流
+ InputStream inputStream = con.getInputStream();
+ //将响应流转换成字符串
+ recordFromTaskResultBuffer = new StringBuffer();
+ String line;
+ buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
+ while ((line = buffer.readLine()) != null) {
+ recordFromTaskResultBuffer.append(line);
+ }
+ logger.info("result:" + recordFromTaskResultBuffer.toString());
+ }else {
+ logger.info("Http结果:" + responseCode);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ logger.info("【test】接收返回值");
+ CJReportResultData CJRecordFromTaskResult = new CJReportResultData();
+ try {
+ CJRecordFromTaskResult = JSONObject.parseObject(recordFromTaskResultBuffer.toString(), CJReportResultData.class);
+ if (ObjectUtils.isEmpty(CJRecordFromTaskResult)){
+ throw new RuntimeException("返回值为空");
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ logger.info("【test】接收返回值异常");
+ }
+
+ //接收返回值，保存返回值
+// CJReportResultData CJRecordFromTaskResult = JSONObject.parseObject(recordFromTaskResultBuffer.toString(), CJReportResultData.class);
+ //接收返回值，保存返回值
+ logger.info("【test】保存上报结果");
+ List<String> errorIdList= new ArrayList<>();
+ Data data = JSONObject.parseObject(CJRecordFromTaskResult.getData(), Data.class);
+ //保存失败结果
+ if (ObjectUtils.isNotEmpty(data)){
+ for (ErrorMsgDetails errorMsgDetail : data.getErrorMsgDetails()) {
+ errorIdList.add(errorMsgDetail.getId());
+ }
+ }
+ logger.info("【】CJRecordFromTask数据上报结果：" + CJRecordFromTaskResult.getCode());
+ //设置所有数据上报成功
+ if (CJRecordFromTaskResult.getCode().equals(CJReportEnum.SUCCESS.getCode()) || CJRecordFromTaskResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
+ for (PreventCJReportCheckRecordFromTask CJRecordFromTask : CJRecordFromTasks) {
+ HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
+ //封装数据
+ handlerCJReportParam.setId(CJRecordFromTask.getId());
+ handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
+ handlerCJReportParam.setReportTime(date);
+ CJTaskRecordService.updateCJReportStatusById(handlerCJReportParam);
+ }
+ }
+ //设置上报失败的数据，上报失败
+ if (CJRecordFromTaskResult.getCode().equals(CJReportEnum.FAIL.getCode()) || CJRecordFromTaskResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
+ for (String failId : errorIdList) {
+ //上报失败
+ HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
+ //封装数据
+ handlerCJReportParam.setId(failId);
+ handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());
+ handlerCJReportParam.setReportTime(date);
+ CJTaskRecordService.updateCJReportStatusById(handlerCJReportParam);
+ }
+ }
+ logger.info("【5】任务记录-数据处理完成");
+ }else {
+ logger.info("【5】任务记录-无数据上报昌吉州");
+ }
+
+ /**
+ * 6、处理隐患信息数据
+ * */
+ logger.info("【6】隐患信息-处理数据...");
+ List<PreventCJReportDangerInfo> CJDangerInfos = CJDangerInfoService.listReportDangerDate();
+ if (ObjectUtils.isNotEmpty(CJDangerInfos)){
+ //封装上报数据
+ List<CJReportDangerInfoDTO> reportDangerInfoLists = new ArrayList<>();
+ for (PreventCJReportDangerInfo cjDangerInfo : CJDangerInfos) {
+ CJReportDangerInfoDTO cjReportDangerInfoDTO = BeanCopyUtils.copyBean(cjDangerInfo, CJReportDangerInfoDTO.class);
+ cjReportDangerInfoDTO.setCreateDate(dateFormat.format(cjDangerInfo.getCreateDate()));
+ cjReportDangerInfoDTO.setUpdateDate(dateFormat.format(cjDangerInfo.getUpdateDate()));
+ if (ObjectUtils.isNotEmpty(cjDangerInfo.getCheckAcceptTime())){
+ cjReportDangerInfoDTO.setCheckAcceptTime(dateFormat.format(cjDangerInfo.getCheckAcceptTime()));
+ }else {
+ cjReportDangerInfoDTO.setCheckAcceptTime(null);
+ }
+ cjReportDangerInfoDTO.setRegistTime(dateFormat.format(cjDangerInfo.getRegistTime()));
+ cjReportDangerInfoDTO.setDangerManageDeadline(dateFormat.format(cjDangerInfo.getDangerManageDeadline()));
+ reportDangerInfoLists.add(cjReportDangerInfoDTO);
+ }
+ //数据上报
+ logger.info("【原始数据】" + JSONObject.toJSONString(reportDangerInfoLists));
+ String AESReportDangerInfo = encrypt(JSONObject.toJSONString(reportDangerInfoLists), key.getBytes(), iv.getBytes());
+ StringBuffer dangerInfoResultBuffer = null;
+ //上报数据
+ try {
+ URL url = new URL("http://120.71.182.198:9999/v1/data/receive/dangerInvestigationMsg");
+ //得到连接对象
+ con = (HttpURLConnection) url.openConnection();
+ //设置请求类型
+ con.setRequestMethod("POST");
+ //设置Content-Type，此处根据实际情况确定
+ con.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
+ //允许写出
+ con.setDoOutput(true);
+ //允许读入
+ con.setDoInput(true);
+ //不使用缓存
+ con.setUseCaches(false);
+ //设置请求头
+ con.setRequestProperty("X-Access-Token",token + formatDate.toString());
+ OutputStream os = con.getOutputStream();
+ Map paraMap = new HashMap();
+ paraMap.put("data", AESReportDangerInfo);/**封装数据*/
+ //组装入参，设置请求体
+ os.write(JSON.toJSONString(paraMap).getBytes());
+ //得到响应码
+ responseCode = con.getResponseCode();
+ //本段日志，测试成功后，可注释掉
+ if (responseCode == HttpURLConnection.HTTP_OK) {
+ //得到响应流
+ InputStream inputStream = con.getInputStream();
+ //将响应流转换成字符串
+ dangerInfoResultBuffer = new StringBuffer();
+ String line;
+ buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
+ while ((line = buffer.readLine()) != null) {
+ dangerInfoResultBuffer.append(line);
+ }
+ logger.info("result:" + dangerInfoResultBuffer.toString());
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ //接收返回值，保存返回值
+ CJReportResultData CJDangerInfoResult = JSONObject.parseObject(dangerInfoResultBuffer.toString(), CJReportResultData.class);
+ //接收返回值，保存返回值
+ List<String> errorIdList= new ArrayList<>();
+ Data data = JSONObject.parseObject(CJDangerInfoResult.getData(), Data.class);
+ //保存失败结果
+ if (ObjectUtils.isNotEmpty(data)){
+ for (ErrorMsgDetails errorMsgDetail : data.getErrorMsgDetails()) {
+ errorIdList.add(errorMsgDetail.getId());
+ }
+ }
+ logger.info("【】CJDangerInfo数据上报结果：" + CJDangerInfoResult.getCode());
+ //设置所有数据上报成功
+ if (CJDangerInfoResult.getCode().equals(CJReportEnum.SUCCESS.getCode()) || CJDangerInfoResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
+ for (PreventCJReportDangerInfo CJDangerInfo : CJDangerInfos) {
+ HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
+ //封装数据
+ handlerCJReportParam.setId(CJDangerInfo.getId());
+ handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
+ handlerCJReportParam.setReportTime(date);
+ CJDangerInfoService.updateCJReportStatusById(handlerCJReportParam);
+ }
+ }
+ //设置上报失败的数据，上报失败
+ if (CJDangerInfoResult.getCode().equals(CJReportEnum.FAIL.getCode()) || CJDangerInfoResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
+ for (String failId : errorIdList) {
+ //上报失败
+ HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
+ //封装数据
+ handlerCJReportParam.setId(failId);
+ handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());
+ handlerCJReportParam.setReportTime(date);
+ CJDangerInfoService.updateCJReportStatusById(handlerCJReportParam);
+ }
+ }
+ logger.info("【6】隐患信息-数据处理完成");
+ }else {
+ logger.info("【6】隐患信息-无数据上报昌吉州");
+ }
+
+
+ /**
+ * 7、检修停用记录信息数据
+ * */
+ logger.info("【7】检修停用记录-处理数据...");
+ List<PreventCJReportOverhaulLog> CJOverhaulLogs = CJOverhaulLogService.listReportOverhaulDate();
+ if (ObjectUtils.isNotEmpty(CJOverhaulLogs)){
+ //封装上报数据
+ List<CJReportOverhaulLogDTO> reportOverhaulLogDTOS = new ArrayList<>();
+ for (PreventCJReportOverhaulLog cjOverhaulLog : CJOverhaulLogs) {
+ CJReportOverhaulLogDTO cjReportOverhaulLogDTO = BeanCopyUtils.copyBean(cjOverhaulLog, CJReportOverhaulLogDTO.class);
+
+ cjReportOverhaulLogDTO.setCreateDate(dateFormat.format(cjOverhaulLog.getCreateDate()));
+ cjReportOverhaulLogDTO.setUpdateDate(dateFormat.format(cjOverhaulLog.getUpdateDate()));
+ cjReportOverhaulLogDTO.setStopStartTime(dateFormat.format(cjOverhaulLog.getStopStartTime()));
+ if (ObjectUtils.isNotEmpty(cjOverhaulLog.getStopEndTime())){
+ cjReportOverhaulLogDTO.setStopEndTime(dateFormat.format(cjOverhaulLog.getStopEndTime()));
+ }else {
+ cjReportOverhaulLogDTO.setStopEndTime(null);
+ }
+ reportOverhaulLogDTOS.add(cjReportOverhaulLogDTO);
+ }
+
+ //数据上报
+ logger.info("【原始数据】" + JSONObject.toJSONString(reportOverhaulLogDTOS));
+ String AESReportDangerInfo = encrypt(JSONObject.toJSONString(reportOverhaulLogDTOS), key.getBytes(), iv.getBytes());
+ StringBuffer dangerInfoResultBuffer = null;
+ //上报数据
+ try {
+ URL url = new URL("http://v1/data/receive/receiveUnitStop");
+ //得到连接对象
+ con = (HttpURLConnection) url.openConnection();
+ //设置请求类型
+ con.setRequestMethod("POST");
+ //设置Content-Type，此处根据实际情况确定
+ con.setRequestProperty("Content-Type", "application/json;charset=UTF-8");
+ //允许写出
+ con.setDoOutput(true);
+ //允许读入
+ con.setDoInput(true);
+ //不使用缓存
+ con.setUseCaches(false);
+ //设置请求头
+ con.setRequestProperty("X-Access-Token",token + formatDate.toString());
+ OutputStream os = con.getOutputStream();
+ Map paraMap = new HashMap();
+ paraMap.put("data", AESReportDangerInfo);/**封装数据*/
+ //组装入参，设置请求体
+ os.write(JSON.toJSONString(paraMap).getBytes());
+ //得到响应码
+ responseCode = con.getResponseCode();
+ //本段日志，测试成功后，可注释掉
+ if (responseCode == HttpURLConnection.HTTP_OK) {
+ //得到响应流
+ InputStream inputStream = con.getInputStream();
+ //将响应流转换成字符串
+ dangerInfoResultBuffer = new StringBuffer();
+ String line;
+ buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
+ while ((line = buffer.readLine()) != null) {
+ dangerInfoResultBuffer.append(line);
+ }
+ logger.info("result:" + dangerInfoResultBuffer.toString());
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ //接收返回值，保存返回值
+ CJReportResultData CJOverhaulLogResult = JSONObject.parseObject(dangerInfoResultBuffer.toString(), CJReportResultData.class);
+ //接收返回值，保存返回值
+ List<String> errorIdList= new ArrayList<>();
+ Data data = JSONObject.parseObject(CJOverhaulLogResult.getData(), Data.class);
+ //保存失败结果
+ if (ObjectUtils.isNotEmpty(data)){
+ for (ErrorMsgDetails errorMsgDetail : data.getErrorMsgDetails()) {
+ errorIdList.add(errorMsgDetail.getId());
+ }
+ }
+ logger.info("【】CJOverhaulLog数据上报结果：" + CJOverhaulLogResult.getCode());
+ //设置所有数据上报成功
+
+ if (CJOverhaulLogResult.getCode().equals(CJReportEnum.SUCCESS.getCode()) || CJOverhaulLogResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
+ for (PreventCJReportOverhaulLog cjOverhaulLog : CJOverhaulLogs) {
+ HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
+ //封装数据
+ handlerCJReportParam.setId(cjOverhaulLog.getId());
+ handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
+ handlerCJReportParam.setReportTime(date);
+ CJOverhaulLogService.updateCJReportStatusById(handlerCJReportParam);
+ }
+ }
+ //设置上报失败的数据，上报失败
+ if (CJOverhaulLogResult.getCode().equals(CJReportEnum.FAIL.getCode()) || CJOverhaulLogResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
+ for (String failId : errorIdList) {
+ //上报失败
+ HandlerCJReportParam handlerCJReportParam = new HandlerCJReportParam();
+ //封装数据
+ handlerCJReportParam.setId(failId);
+ handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());
+ handlerCJReportParam.setReportTime(date);
+ CJOverhaulLogService.updateCJReportStatusById(handlerCJReportParam);
+ }
+ }
+ logger.info("【7】检修停用记录-数据处理完成");
+ }else {
+ logger.info("【7】检修停用记录-无数据上报昌吉州");
+ }
+
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/RectifyDateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/RectifyDateSchedule.java
index 3bd9e4b..1700d8b 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/RectifyDateSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/RectifyDateSchedule.java
@@ -1,267 +1,267 @@
-package com.ruoyi.doublePrevention.scheduls;
-
-
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckRecordFromTask;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckTaskFromWork;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo;
-import com.ruoyi.doublePrevention.entity.*;
-import com.ruoyi.doublePrevention.enums.E;
-import com.ruoyi.doublePrevention.enums.SyncEnum;
-import com.ruoyi.doublePrevention.exception.AusinessException;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-import com.ruoyi.doublePrevention.service.baseService.*;
-import com.ruoyi.project.system.dept.service.IDeptService;
-import com.ruoyi.project.system.user.domain.User;
-import com.ruoyi.project.system.user.service.IUserService;
-import com.ruoyi.project.tr.HiddenDangerCheckJob.domain.HiddenDangerCheckJob;
-import com.ruoyi.project.tr.HiddenDangerCheckJob.service.IHiddenDangerCheckJobService;
-import com.ruoyi.project.tr.hiddenDangerCheck.domain.HiddenDangerCheck;
-import com.ruoyi.project.tr.hiddenDangerCheck.service.IHiddenDangerCheckService;
-import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
-import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;
-import com.ruoyi.project.tr.riskList.service.IRiskListService;
-import org.apache.commons.lang3.ObjectUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
-
-@Component
-public class RectifyDateSchedule {
-
- private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
- public static SimpleDateFormat startFormat = new SimpleDateFormat("yyyy-MM-dd 06:30:00");
- public static SimpleDateFormat endFormat = new SimpleDateFormat("yyyy-MM-dd 23:59:59");
-
- public static SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
- @Autowired
- private PreventReportConfigService preventReportConfigService;
-
- @Autowired
- private PreventCJReportRiskAnaUnitService CJRiskAnaUnitService;
- @Autowired
- private PreventCJReportRiskEventService CJEventService;
- @Autowired
- private PreventCJReportRiskControlMeasureService CJMeasureService;
- @Autowired
- private PreventCJReportCheckTaskFromWorkService CJTaskFromWorkService;
- @Autowired
- private PreventCJReportCheckRecordFromTaskService CJTaskRecordService;
- @Autowired
- private PreventCJReportDangerInfoService CJDangerInfoService;
- @Autowired
- private PreventCJReportPointService CJPointService;
-
-
- @Autowired
- private IDeptService trDeptService; //部门服务
- @Autowired
- private IUserService trUserService; //用户服务
-
- @Autowired
- private IRiskListService trRiskAnaUnitService; //风险设备、分析单元
- @Autowired
- private PreventRiskUnitUuidService preventRiskUnitUuidService; //风险设备、分析单元附属表
-
- @Autowired
- private PreventRiskEventService preventRiskEventService;
- @Autowired
- private PreventRiskControlMeasureService preventRiskControlMeasureService;
- @Autowired
- private PreventRiskControlTemplateService preventRiskControlTemplateService;
-
- @Autowired
- private IHiddenDangerCheckJobService trHiddenDangerCheckJobService;//排查任务job
- @Autowired
- private PreventRiskJobAndMeasureService preventRiskJobAndMeasureService;//排查任务附属表
-
- @Autowired
- private IHiddenDangerCheckService trHiddenDangerCheckService;//排查任务记录
- @Autowired
- private PreventRiskDangerCheckLogService preventRiskDangerCheckLogService;//排查任务记录附属表
-
- @Autowired
- private IHiddenDangerCheckPointService trHiddenDangerCheckPointService;//隐患信息上报、整改、验收
- @Autowired
- private PreventRiskDangerInfoService preventRiskDangerInfoService;//隐患信息附属表
-
- @Autowired
- private PreventRiskCheckUnitService preventRiskCheckUnitService;//管控措施，任务清单对应关系。基础排查点附属表
- @Autowired
- private PreventRiskDangerCheckAndMeasureService riskDangerCheckAndMeasureService;//管控措施，任务清单对应关系。基础排查点附属表
-
- @Autowired
- private PreventTaskTypeService taskTypeService;//管控措施，任务清单对应关系。基础排查点附属表
-
- @Autowired
- private PreventOverhaulLogService overhaulLogService;
- @Autowired
- private PreventCJReportOverhaulLogService reportOverhaulLogService;
-
-
- @Transactional
-// @Scheduled(cron = "0/10 * * * * ?") // 30秒
- @Scheduled(cron = "0 0 0/3 * * ? ")
- public void searchReportDate(){
-
- logger.info("【双重预防】纠正...");
- int step = 1;
- String companyCode = "652310082";
-
-
- /**
- * 5、排查任务记录数据 PreventReportCheckRecordFromTask
- * */
- //读取安全风险管控措施数据上报主配置信息
- PreventReportConfig recordReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG__CHECK_RECORD.getCode());
- //如果安全风险管控措施主配置开启上报
- if (recordReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
-
-
- //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
- List<PreventRiskDangerCheckLog> tasks = preventRiskDangerCheckLogService.listRectifyReportTask();
- List<Long> taskIds = new ArrayList<>();
- //获取上报数据对象
- List<PreventCJReportCheckRecordFromTask> CJRecordFromTaskLists = new ArrayList<>();
- int tag = 0;
-// HandlerReportParam handlerReportParam = new HandlerReportParam();
-// List<HandlerReportParam> handlerReportParamList = new ArrayList<>();
- if (ObjectUtils.isNotEmpty(tasks)){
- //获取信息
- List<User> allUserList = trUserService.getAllUser();
- List<PreventTaskType> allTaskTypeList = taskTypeService.getAllTaskTypeList();
- //遍历，封装数据
- for (PreventRiskDangerCheckLog task : tasks) {
- //获取任务记录主表信息
- HiddenDangerCheck hiddenDangerCheckById = trHiddenDangerCheckService.getHiddenDangerCheckById(task.getCheckId());
- //如果已经执行过，进入方法
- if (Integer.valueOf(hiddenDangerCheckById.getScheduleCheckStatus()) == 1){
-
- List<HiddenDangerCheckPoint> hiddenDangerCheckPointList = trHiddenDangerCheckPointService.getHiddenDangerCheckPointByCheckId(task.getCheckId());
-
- //避免个别任务无检查点的情况
- if (ObjectUtils.isEmpty(hiddenDangerCheckPointList)) {
- logger.info("【双重预防】排查任务记录CJ：异常，无检查点...");
- }else {
-
- int i = 0;
- List<PreventRiskJobAndMeasure> rectifyJobDataList = preventRiskJobAndMeasureService.getRectifyJobData(task.getJobId());
- HiddenDangerCheckJob jobById = trHiddenDangerCheckJobService.getJobById(task.getJobId());
- for (HiddenDangerCheckPoint hiddenDangerCheckPoint : hiddenDangerCheckPointList) {
- //获取上报数据对象
- PreventCJReportCheckRecordFromTask CJRecordFromTask = new PreventCJReportCheckRecordFromTask();
- CJRecordFromTask.setCheckStatus("0");// 0-正常；1-存在隐患；2-未处理；3-其他
- if (Integer.valueOf(hiddenDangerCheckPoint.getWhetherDanger()) == 1){
- CJRecordFromTask.setCheckStatus("1");// 0-正常；1-存在隐患；2-未处理；3-其他
- }
-
- User createUser = new User();
- User updateUser = new User();
-
- // todo 取出所有用户信息，再循环在匹配
- for (User user : allUserList) {
- if (hiddenDangerCheckById.getCreateBy().equals(user.getLoginName())){
- createUser = user;
- }
- if (hiddenDangerCheckById.getUpdateBy().equals(user.getLoginName())){
- updateUser = user;
- }
- }
- if(ObjectUtils.isEmpty(createUser)){
- for (User user : allUserList) {
- if (hiddenDangerCheckById.getCreateBy().equals(user.getUserName())){
- createUser = user;
- }
- }
- }
-
- //封装上报昌吉州的任务数据
- CJRecordFromTask.setId(UUID.randomUUID().toString());
- CJRecordFromTask.setCompanyCode(companyCode);
- CJRecordFromTask.setCreateBy(createUser.getUserName());
- CJRecordFromTask.setCreateDate(hiddenDangerCheckById.getCreateTime());
- CJRecordFromTask.setCreateByMobile(createUser.getPhonenumber());
- if (ObjectUtils.isEmpty(updateUser)){
- CJRecordFromTask.setUpdateBy(createUser.getUserName());
- CJRecordFromTask.setUpdateDate(hiddenDangerCheckById.getCreateTime());
- CJRecordFromTask.setUpdateByMobile(createUser.getPhonenumber());
- }else {
- CJRecordFromTask.setUpdateBy(updateUser.getUserName());
- CJRecordFromTask.setUpdateDate(hiddenDangerCheckById.getUpdateTime());
- CJRecordFromTask.setUpdateByMobile(updateUser.getPhonenumber());
- }
- if (task.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
- CJRecordFromTask.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
- }else {
- CJRecordFromTask.setDeleted("0");
- }
- CJRecordFromTask.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- CJRecordFromTask.setReportTime(null);
- CJRecordFromTask.setDataSource((byte) 1);
-
- CJRecordFromTask.setCheckTaskId(rectifyJobDataList.get(i).getJobUuid());
-
- CJRecordFromTask.setCheckTime(hiddenDangerCheckById.getCheckTime());
- CJRecordFromTask.setTaskId(task.getCheckId());
- //第二版标准新增
- CJRecordFromTask.setMobileCode(task.getMobileCode().toString());
-
- int typeTag = 0;
-//
- // todo 取出所有任务信息表，再循环在匹配
- for (PreventTaskType taskType : allTaskTypeList) {
- if (taskType.getJobId().equals(task.getJobId())){
- if (taskType.getType()!= 0) {
- typeTag = 1;
- }
- }
- }
- CJRecordFromTask.setDefend(String.valueOf(typeTag));
- //封装数据
- CJRecordFromTaskLists.add(CJRecordFromTask);
- i++;
- }
-
- }
-
- int i = 1;
- taskIds.add(task.getId());
- tag ++;
- }
- System.out.println("【##】5.数据封装完成...");
-
- }
- }else {
- logger.info("【双重预防】当前无纠正记录需要处理");
- }
-
- if (CJRecordFromTaskLists.size() > 0){
- logger.info("【双重预防】纠正记录CJ：数据处理...");
- //设置原始数据状态
- int taskUpdateResult = preventRiskDangerCheckLogService.updateTaskReportStatusByList(taskIds);
- if (taskUpdateResult < taskIds.size()){
- throw new AusinessException(E.ADD_FAIL.getCode(), "排查任务记录原始数据更新失败, 取消操作");
- }
- int result = CJTaskRecordService.insertRecordList(CJRecordFromTaskLists);
- if (result < CJRecordFromTaskLists.size()){
- throw new AusinessException(E.ADD_FAIL.getCode(), "排查任务记录插入失败, 取消操作");
- }
- }
- step = 6;
- }else {
- step = 6;
- logger.info("排查任务记录数据上报已关闭");
- }
-
- }
-}
+package com.ruoyi.doublePrevention.scheduls;
+
+
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckRecordFromTask;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckTaskFromWork;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo;
+import com.ruoyi.doublePrevention.entity.*;
+import com.ruoyi.doublePrevention.enums.E;
+import com.ruoyi.doublePrevention.enums.SyncEnum;
+import com.ruoyi.doublePrevention.exception.AusinessException;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import com.ruoyi.doublePrevention.service.baseService.*;
+import com.ruoyi.project.system.dept.service.IDeptService;
+import com.ruoyi.project.system.user.domain.User;
+import com.ruoyi.project.system.user.service.IUserService;
+import com.ruoyi.project.tr.HiddenDangerCheckJob.domain.HiddenDangerCheckJob;
+import com.ruoyi.project.tr.HiddenDangerCheckJob.service.IHiddenDangerCheckJobService;
+import com.ruoyi.project.tr.hiddenDangerCheck.domain.HiddenDangerCheck;
+import com.ruoyi.project.tr.hiddenDangerCheck.service.IHiddenDangerCheckService;
+import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
+import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;
+import com.ruoyi.project.tr.riskList.service.IRiskListService;
+import org.apache.commons.lang3.ObjectUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+@Component
+public class RectifyDateSchedule {
+
+ private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+ public static SimpleDateFormat startFormat = new SimpleDateFormat("yyyy-MM-dd 06:30:00");
+ public static SimpleDateFormat endFormat = new SimpleDateFormat("yyyy-MM-dd 23:59:59");
+
+ public static SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+ @Autowired
+ private PreventReportConfigService preventReportConfigService;
+
+ @Autowired
+ private PreventCJReportRiskAnaUnitService CJRiskAnaUnitService;
+ @Autowired
+ private PreventCJReportRiskEventService CJEventService;
+ @Autowired
+ private PreventCJReportRiskControlMeasureService CJMeasureService;
+ @Autowired
+ private PreventCJReportCheckTaskFromWorkService CJTaskFromWorkService;
+ @Autowired
+ private PreventCJReportCheckRecordFromTaskService CJTaskRecordService;
+ @Autowired
+ private PreventCJReportDangerInfoService CJDangerInfoService;
+ @Autowired
+ private PreventCJReportPointService CJPointService;
+
+
+ @Autowired
+ private IDeptService trDeptService; //部门服务
+ @Autowired
+ private IUserService trUserService; //用户服务
+
+ @Autowired
+ private IRiskListService trRiskAnaUnitService; //风险设备、分析单元
+ @Autowired
+ private PreventRiskUnitUuidService preventRiskUnitUuidService; //风险设备、分析单元附属表
+
+ @Autowired
+ private PreventRiskEventService preventRiskEventService;
+ @Autowired
+ private PreventRiskControlMeasureService preventRiskControlMeasureService;
+ @Autowired
+ private PreventRiskControlTemplateService preventRiskControlTemplateService;
+
+ @Autowired
+ private IHiddenDangerCheckJobService trHiddenDangerCheckJobService;//排查任务job
+ @Autowired
+ private PreventRiskJobAndMeasureService preventRiskJobAndMeasureService;//排查任务附属表
+
+ @Autowired
+ private IHiddenDangerCheckService trHiddenDangerCheckService;//排查任务记录
+ @Autowired
+ private PreventRiskDangerCheckLogService preventRiskDangerCheckLogService;//排查任务记录附属表
+
+ @Autowired
+ private IHiddenDangerCheckPointService trHiddenDangerCheckPointService;//隐患信息上报、整改、验收
+ @Autowired
+ private PreventRiskDangerInfoService preventRiskDangerInfoService;//隐患信息附属表
+
+ @Autowired
+ private PreventRiskCheckUnitService preventRiskCheckUnitService;//管控措施，任务清单对应关系。基础排查点附属表
+ @Autowired
+ private PreventRiskDangerCheckAndMeasureService riskDangerCheckAndMeasureService;//管控措施，任务清单对应关系。基础排查点附属表
+
+ @Autowired
+ private PreventTaskTypeService taskTypeService;//管控措施，任务清单对应关系。基础排查点附属表
+
+ @Autowired
+ private PreventOverhaulLogService overhaulLogService;
+ @Autowired
+ private PreventCJReportOverhaulLogService reportOverhaulLogService;
+
+
+ @Transactional
+// @Scheduled(cron = "0/10 * * * * ?") // 30秒
+ @Scheduled(cron = "0 0 0/3 * * ? ")
+ public void searchReportDate(){
+
+ logger.info("【双重预防】纠正...");
+ int step = 1;
+ String companyCode = "652310082";
+
+
+ /**
+ * 5、排查任务记录数据 PreventReportCheckRecordFromTask
+ * */
+ //读取安全风险管控措施数据上报主配置信息
+ PreventReportConfig recordReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG__CHECK_RECORD.getCode());
+ //如果安全风险管控措施主配置开启上报
+ if (recordReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
+
+
+ //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
+ List<PreventRiskDangerCheckLog> tasks = preventRiskDangerCheckLogService.listRectifyReportTask();
+ List<Long> taskIds = new ArrayList<>();
+ //获取上报数据对象
+ List<PreventCJReportCheckRecordFromTask> CJRecordFromTaskLists = new ArrayList<>();
+ int tag = 0;
+// HandlerReportParam handlerReportParam = new HandlerReportParam();
+// List<HandlerReportParam> handlerReportParamList = new ArrayList<>();
+ if (ObjectUtils.isNotEmpty(tasks)){
+ //获取信息
+ List<User> allUserList = trUserService.getAllUser();
+ List<PreventTaskType> allTaskTypeList = taskTypeService.getAllTaskTypeList();
+ //遍历，封装数据
+ for (PreventRiskDangerCheckLog task : tasks) {
+ //获取任务记录主表信息
+ HiddenDangerCheck hiddenDangerCheckById = trHiddenDangerCheckService.getHiddenDangerCheckById(task.getCheckId());
+ //如果已经执行过，进入方法
+ if (Integer.valueOf(hiddenDangerCheckById.getScheduleCheckStatus()) == 1){
+
+ List<HiddenDangerCheckPoint> hiddenDangerCheckPointList = trHiddenDangerCheckPointService.getHiddenDangerCheckPointByCheckId(task.getCheckId());
+
+ //避免个别任务无检查点的情况
+ if (ObjectUtils.isEmpty(hiddenDangerCheckPointList)) {
+ logger.info("【双重预防】排查任务记录CJ：异常，无检查点...");
+ }else {
+
+ int i = 0;
+ List<PreventRiskJobAndMeasure> rectifyJobDataList = preventRiskJobAndMeasureService.getRectifyJobData(task.getJobId());
+ HiddenDangerCheckJob jobById = trHiddenDangerCheckJobService.getJobById(task.getJobId());
+ for (HiddenDangerCheckPoint hiddenDangerCheckPoint : hiddenDangerCheckPointList) {
+ //获取上报数据对象
+ PreventCJReportCheckRecordFromTask CJRecordFromTask = new PreventCJReportCheckRecordFromTask();
+ CJRecordFromTask.setCheckStatus("0");// 0-正常；1-存在隐患；2-未处理；3-其他
+ if (Integer.valueOf(hiddenDangerCheckPoint.getWhetherDanger()) == 1){
+ CJRecordFromTask.setCheckStatus("1");// 0-正常；1-存在隐患；2-未处理；3-其他
+ }
+
+ User createUser = new User();
+ User updateUser = new User();
+
+ // todo 取出所有用户信息，再循环在匹配
+ for (User user : allUserList) {
+ if (hiddenDangerCheckById.getCreateBy().equals(user.getLoginName())){
+ createUser = user;
+ }
+ if (hiddenDangerCheckById.getUpdateBy().equals(user.getLoginName())){
+ updateUser = user;
+ }
+ }
+ if(ObjectUtils.isEmpty(createUser)){
+ for (User user : allUserList) {
+ if (hiddenDangerCheckById.getCreateBy().equals(user.getUserName())){
+ createUser = user;
+ }
+ }
+ }
+
+ //封装上报昌吉州的任务数据
+ CJRecordFromTask.setId(UUID.randomUUID().toString());
+ CJRecordFromTask.setCompanyCode(companyCode);
+ CJRecordFromTask.setCreateBy(createUser.getUserName());
+ CJRecordFromTask.setCreateDate(hiddenDangerCheckById.getCreateTime());
+ CJRecordFromTask.setCreateByMobile(createUser.getPhonenumber());
+ if (ObjectUtils.isEmpty(updateUser)){
+ CJRecordFromTask.setUpdateBy(createUser.getUserName());
+ CJRecordFromTask.setUpdateDate(hiddenDangerCheckById.getCreateTime());
+ CJRecordFromTask.setUpdateByMobile(createUser.getPhonenumber());
+ }else {
+ CJRecordFromTask.setUpdateBy(updateUser.getUserName());
+ CJRecordFromTask.setUpdateDate(hiddenDangerCheckById.getUpdateTime());
+ CJRecordFromTask.setUpdateByMobile(updateUser.getPhonenumber());
+ }
+ if (task.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
+ CJRecordFromTask.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
+ }else {
+ CJRecordFromTask.setDeleted("0");
+ }
+ CJRecordFromTask.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ CJRecordFromTask.setReportTime(null);
+ CJRecordFromTask.setDataSource((byte) 1);
+
+ CJRecordFromTask.setCheckTaskId(rectifyJobDataList.get(i).getJobUuid());
+
+ CJRecordFromTask.setCheckTime(hiddenDangerCheckById.getCheckTime());
+ CJRecordFromTask.setTaskId(task.getCheckId());
+ //第二版标准新增
+ CJRecordFromTask.setMobileCode(task.getMobileCode().toString());
+
+ int typeTag = 0;
+//
+ // todo 取出所有任务信息表，再循环在匹配
+ for (PreventTaskType taskType : allTaskTypeList) {
+ if (taskType.getJobId().equals(task.getJobId())){
+ if (taskType.getType()!= 0) {
+ typeTag = 1;
+ }
+ }
+ }
+ CJRecordFromTask.setDefend(String.valueOf(typeTag));
+ //封装数据
+ CJRecordFromTaskLists.add(CJRecordFromTask);
+ i++;
+ }
+
+ }
+
+ int i = 1;
+ taskIds.add(task.getId());
+ tag ++;
+ }
+ System.out.println("【##】5.数据封装完成...");
+
+ }
+ }else {
+ logger.info("【双重预防】当前无纠正记录需要处理");
+ }
+
+ if (CJRecordFromTaskLists.size() > 0){
+ logger.info("【双重预防】纠正记录CJ：数据处理...");
+ //设置原始数据状态
+ int taskUpdateResult = preventRiskDangerCheckLogService.updateTaskReportStatusByList(taskIds);
+ if (taskUpdateResult < taskIds.size()){
+ throw new AusinessException(E.ADD_FAIL.getCode(), "排查任务记录原始数据更新失败, 取消操作");
+ }
+ int result = CJTaskRecordService.insertRecordList(CJRecordFromTaskLists);
+ if (result < CJRecordFromTaskLists.size()){
+ throw new AusinessException(E.ADD_FAIL.getCode(), "排查任务记录插入失败, 取消操作");
+ }
+ }
+ step = 6;
+ }else {
+ step = 6;
+ logger.info("排查任务记录数据上报已关闭");
+ }
+
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchRectifyDateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchRectifyDateSchedule.java
index f80bddf..4ada973 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchRectifyDateSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchRectifyDateSchedule.java
@@ -1,155 +1,155 @@
-package com.ruoyi.doublePrevention.scheduls;
-
-
-import com.ruoyi.doublePrevention.entity.CJReport.CJdto.Data;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckRecordFromTask;
-import com.ruoyi.doublePrevention.entity.PreventReportConfig;
-import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckLog;
-import com.ruoyi.doublePrevention.entity.PreventRiskJobAndMeasure;
-import com.ruoyi.doublePrevention.entity.PreventTaskType;
-import com.ruoyi.doublePrevention.enums.E;
-import com.ruoyi.doublePrevention.enums.SyncEnum;
-import com.ruoyi.doublePrevention.exception.AusinessException;
-import com.ruoyi.doublePrevention.service.baseService.*;
-import com.ruoyi.project.system.dept.service.IDeptService;
-import com.ruoyi.project.system.user.domain.User;
-import com.ruoyi.project.system.user.service.IUserService;
-import com.ruoyi.project.tr.HiddenDangerCheckJob.domain.HiddenDangerCheckJob;
-import com.ruoyi.project.tr.HiddenDangerCheckJob.service.IHiddenDangerCheckJobService;
-import com.ruoyi.project.tr.hiddenDangerCheck.domain.HiddenDangerCheck;
-import com.ruoyi.project.tr.hiddenDangerCheck.service.IHiddenDangerCheckService;
-import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
-import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;
-import com.ruoyi.project.tr.riskList.service.IRiskListService;
-import org.apache.commons.lang3.ObjectUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-@Component
-public class SearchRectifyDateSchedule {
-
- private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
- public static SimpleDateFormat startFormat = new SimpleDateFormat("yyyy-MM-dd 06:30:00");
- public static SimpleDateFormat endFormat = new SimpleDateFormat("yyyy-MM-dd 23:59:59");
-
- public static SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
- @Autowired
- private PreventReportConfigService preventReportConfigService;
-
- @Autowired
- private PreventCJReportRiskAnaUnitService CJRiskAnaUnitService;
- @Autowired
- private PreventCJReportRiskEventService CJEventService;
- @Autowired
- private PreventCJReportRiskControlMeasureService CJMeasureService;
- @Autowired
- private PreventCJReportCheckTaskFromWorkService CJTaskFromWorkService;
- @Autowired
- private PreventCJReportCheckRecordFromTaskService CJTaskRecordService;
- @Autowired
- private PreventCJReportDangerInfoService CJDangerInfoService;
- @Autowired
- private PreventCJReportPointService CJPointService;
-
-
- @Autowired
- private IDeptService trDeptService; //部门服务
- @Autowired
- private IUserService trUserService; //用户服务
-
- @Autowired
- private IRiskListService trRiskAnaUnitService; //风险设备、分析单元
- @Autowired
- private PreventRiskUnitUuidService preventRiskUnitUuidService; //风险设备、分析单元附属表
-
- @Autowired
- private PreventRiskEventService preventRiskEventService;
- @Autowired
- private PreventRiskControlMeasureService preventRiskControlMeasureService;
- @Autowired
- private PreventRiskControlTemplateService preventRiskControlTemplateService;
-
- @Autowired
- private IHiddenDangerCheckJobService trHiddenDangerCheckJobService;//排查任务job
- @Autowired
- private PreventRiskJobAndMeasureService preventRiskJobAndMeasureService;//排查任务附属表
-
- @Autowired
- private IHiddenDangerCheckService trHiddenDangerCheckService;//排查任务记录
- @Autowired
- private PreventRiskDangerCheckLogService preventRiskDangerCheckLogService;//排查任务记录附属表
-
- @Autowired
- private IHiddenDangerCheckPointService trHiddenDangerCheckPointService;//隐患信息上报、整改、验收
- @Autowired
- private PreventRiskDangerInfoService preventRiskDangerInfoService;//隐患信息附属表
-
- @Autowired
- private PreventRiskCheckUnitService preventRiskCheckUnitService;//管控措施，任务清单对应关系。基础排查点附属表
- @Autowired
- private PreventRiskDangerCheckAndMeasureService riskDangerCheckAndMeasureService;//管控措施，任务清单对应关系。基础排查点附属表
-
- @Autowired
- private PreventTaskTypeService taskTypeService;//管控措施，任务清单对应关系。基础排查点附属表
-
- @Autowired
- private PreventOverhaulLogService overhaulLogService;
- @Autowired
- private PreventCJReportOverhaulLogService reportOverhaulLogService;
-
-
- @Transactional
-// @Scheduled(cron = "0/10 * * * * ?") // 30秒
- @Scheduled(cron = "0 0 0/2 * * ? ")
- public void searchReportDate(){
-
- logger.info("【双重预防】纠正前置处理...");
- int step = 1;
- String companyCode = "652310082";
-
-
- /**
- *
- * */
- //读取安全风险管控措施数据上报主配置信息
- PreventReportConfig recordReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG__CHECK_RECORD.getCode());
- //如果安全风险管控措施主配置开启上报
- if (recordReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
-
- List<PreventRiskDangerCheckLog> tasks = preventRiskDangerCheckLogService.listSearchRectifyReportTask();
-
- if (ObjectUtils.isNotEmpty(tasks)){
- for (PreventRiskDangerCheckLog task : tasks) {
-
- PreventRiskDangerCheckLog dangerCheckLog = new PreventRiskDangerCheckLog();
- Calendar calendar = Calendar.getInstance();
- calendar.set(Calendar.YEAR, 2040);
- calendar.set(Calendar.MONTH, 5); // 注意月份从0开始，即0对应1月
- calendar.set(Calendar.DATE, 20);
- dangerCheckLog.setReportTime(calendar.getTime());
- dangerCheckLog.setId(task.getId());
-
- int i = preventRiskDangerCheckLogService.updateSearchRectifyReportTask(dangerCheckLog);
- if (i < 1){
- logger.info("纠正出错");
- }
- }
- }else {
- logger.info("无需纠正");
- }
-
- }else {
- logger.info("排查任务记录数据上报已关闭");
- }
-
- }
-}
+package com.ruoyi.doublePrevention.scheduls;
+
+
+import com.ruoyi.doublePrevention.entity.CJReport.CJdto.Data;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckRecordFromTask;
+import com.ruoyi.doublePrevention.entity.PreventReportConfig;
+import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckLog;
+import com.ruoyi.doublePrevention.entity.PreventRiskJobAndMeasure;
+import com.ruoyi.doublePrevention.entity.PreventTaskType;
+import com.ruoyi.doublePrevention.enums.E;
+import com.ruoyi.doublePrevention.enums.SyncEnum;
+import com.ruoyi.doublePrevention.exception.AusinessException;
+import com.ruoyi.doublePrevention.service.baseService.*;
+import com.ruoyi.project.system.dept.service.IDeptService;
+import com.ruoyi.project.system.user.domain.User;
+import com.ruoyi.project.system.user.service.IUserService;
+import com.ruoyi.project.tr.HiddenDangerCheckJob.domain.HiddenDangerCheckJob;
+import com.ruoyi.project.tr.HiddenDangerCheckJob.service.IHiddenDangerCheckJobService;
+import com.ruoyi.project.tr.hiddenDangerCheck.domain.HiddenDangerCheck;
+import com.ruoyi.project.tr.hiddenDangerCheck.service.IHiddenDangerCheckService;
+import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
+import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;
+import com.ruoyi.project.tr.riskList.service.IRiskListService;
+import org.apache.commons.lang3.ObjectUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@Component
+public class SearchRectifyDateSchedule {
+
+ private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+ public static SimpleDateFormat startFormat = new SimpleDateFormat("yyyy-MM-dd 06:30:00");
+ public static SimpleDateFormat endFormat = new SimpleDateFormat("yyyy-MM-dd 23:59:59");
+
+ public static SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+ @Autowired
+ private PreventReportConfigService preventReportConfigService;
+
+ @Autowired
+ private PreventCJReportRiskAnaUnitService CJRiskAnaUnitService;
+ @Autowired
+ private PreventCJReportRiskEventService CJEventService;
+ @Autowired
+ private PreventCJReportRiskControlMeasureService CJMeasureService;
+ @Autowired
+ private PreventCJReportCheckTaskFromWorkService CJTaskFromWorkService;
+ @Autowired
+ private PreventCJReportCheckRecordFromTaskService CJTaskRecordService;
+ @Autowired
+ private PreventCJReportDangerInfoService CJDangerInfoService;
+ @Autowired
+ private PreventCJReportPointService CJPointService;
+
+
+ @Autowired
+ private IDeptService trDeptService; //部门服务
+ @Autowired
+ private IUserService trUserService; //用户服务
+
+ @Autowired
+ private IRiskListService trRiskAnaUnitService; //风险设备、分析单元
+ @Autowired
+ private PreventRiskUnitUuidService preventRiskUnitUuidService; //风险设备、分析单元附属表
+
+ @Autowired
+ private PreventRiskEventService preventRiskEventService;
+ @Autowired
+ private PreventRiskControlMeasureService preventRiskControlMeasureService;
+ @Autowired
+ private PreventRiskControlTemplateService preventRiskControlTemplateService;
+
+ @Autowired
+ private IHiddenDangerCheckJobService trHiddenDangerCheckJobService;//排查任务job
+ @Autowired
+ private PreventRiskJobAndMeasureService preventRiskJobAndMeasureService;//排查任务附属表
+
+ @Autowired
+ private IHiddenDangerCheckService trHiddenDangerCheckService;//排查任务记录
+ @Autowired
+ private PreventRiskDangerCheckLogService preventRiskDangerCheckLogService;//排查任务记录附属表
+
+ @Autowired
+ private IHiddenDangerCheckPointService trHiddenDangerCheckPointService;//隐患信息上报、整改、验收
+ @Autowired
+ private PreventRiskDangerInfoService preventRiskDangerInfoService;//隐患信息附属表
+
+ @Autowired
+ private PreventRiskCheckUnitService preventRiskCheckUnitService;//管控措施，任务清单对应关系。基础排查点附属表
+ @Autowired
+ private PreventRiskDangerCheckAndMeasureService riskDangerCheckAndMeasureService;//管控措施，任务清单对应关系。基础排查点附属表
+
+ @Autowired
+ private PreventTaskTypeService taskTypeService;//管控措施，任务清单对应关系。基础排查点附属表
+
+ @Autowired
+ private PreventOverhaulLogService overhaulLogService;
+ @Autowired
+ private PreventCJReportOverhaulLogService reportOverhaulLogService;
+
+
+ @Transactional
+// @Scheduled(cron = "0/10 * * * * ?") // 30秒
+ @Scheduled(cron = "0 0 0/2 * * ? ")
+ public void searchReportDate(){
+
+ logger.info("【双重预防】纠正前置处理...");
+ int step = 1;
+ String companyCode = "652310082";
+
+
+ /**
+ *
+ * */
+ //读取安全风险管控措施数据上报主配置信息
+ PreventReportConfig recordReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG__CHECK_RECORD.getCode());
+ //如果安全风险管控措施主配置开启上报
+ if (recordReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
+
+ List<PreventRiskDangerCheckLog> tasks = preventRiskDangerCheckLogService.listSearchRectifyReportTask();
+
+ if (ObjectUtils.isNotEmpty(tasks)){
+ for (PreventRiskDangerCheckLog task : tasks) {
+
+ PreventRiskDangerCheckLog dangerCheckLog = new PreventRiskDangerCheckLog();
+ Calendar calendar = Calendar.getInstance();
+ calendar.set(Calendar.YEAR, 2040);
+ calendar.set(Calendar.MONTH, 5); // 注意月份从0开始，即0对应1月
+ calendar.set(Calendar.DATE, 20);
+ dangerCheckLog.setReportTime(calendar.getTime());
+ dangerCheckLog.setId(task.getId());
+
+ int i = preventRiskDangerCheckLogService.updateSearchRectifyReportTask(dangerCheckLog);
+ if (i < 1){
+ logger.info("纠正出错");
+ }
+ }
+ }else {
+ logger.info("无需纠正");
+ }
+
+ }else {
+ logger.info("排查任务记录数据上报已关闭");
+ }
+
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
index 8525d71..403716f 100644
--- a/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
+++ b/src/main/java/com/ruoyi/doublePrevention/scheduls/SearchReportDateSchedule.java
@@ -1,915 +1,915 @@
-package com.ruoyi.doublePrevention.scheduls;
-
-
-import com.ruoyi.doublePrevention.entity.*;
-import com.ruoyi.doublePrevention.entity.CJReport.*;
-import com.ruoyi.doublePrevention.enums.E;
-import com.ruoyi.doublePrevention.enums.SyncEnum;
-import com.ruoyi.doublePrevention.exception.AusinessException;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-import com.ruoyi.doublePrevention.service.baseService.*;
-import com.ruoyi.project.system.dept.domain.Dept;
-import com.ruoyi.project.system.dept.service.IDeptService;
-import com.ruoyi.project.system.user.domain.User;
-import com.ruoyi.project.system.user.service.IUserService;
-import com.ruoyi.project.tr.HiddenDangerCheckJob.domain.HiddenDangerCheckJob;
-import com.ruoyi.project.tr.HiddenDangerCheckJob.service.IHiddenDangerCheckJobService;
-import com.ruoyi.project.tr.hiddenDangerCheck.domain.HiddenDangerCheck;
-import com.ruoyi.project.tr.hiddenDangerCheck.service.IHiddenDangerCheckService;
-import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
-import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;
-import com.ruoyi.project.tr.riskList.domain.RiskList;
-import com.ruoyi.project.tr.riskList.service.IRiskListService;
-import org.apache.commons.lang3.ObjectUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-@Component
-public class SearchReportDateSchedule {
-
- private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
- public static SimpleDateFormat startFormat = new SimpleDateFormat("yyyy-MM-dd 06:30:00");
- public static SimpleDateFormat endFormat = new SimpleDateFormat("yyyy-MM-dd 23:59:59");
-
- public static SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
- @Autowired
- private PreventReportConfigService preventReportConfigService;
-
- @Autowired
- private PreventCJReportRiskAnaUnitService CJRiskAnaUnitService;
- @Autowired
- private PreventCJReportRiskEventService CJEventService;
- @Autowired
- private PreventCJReportRiskControlMeasureService CJMeasureService;
- @Autowired
- private PreventCJReportCheckTaskFromWorkService CJTaskFromWorkService;
- @Autowired
- private PreventCJReportCheckRecordFromTaskService CJTaskRecordService;
- @Autowired
- private PreventCJReportDangerInfoService CJDangerInfoService;
- @Autowired
- private PreventCJReportPointService CJPointService;
-
-
- @Autowired
- private IDeptService trDeptService; //部门服务
- @Autowired
- private IUserService trUserService; //用户服务
-
- @Autowired
- private IRiskListService trRiskAnaUnitService; //风险设备、分析单元
- @Autowired
- private PreventRiskUnitUuidService preventRiskUnitUuidService; //风险设备、分析单元附属表
-
- @Autowired
- private PreventRiskEventService preventRiskEventService;
- @Autowired
- private PreventRiskControlMeasureService preventRiskControlMeasureService;
- @Autowired
- private PreventRiskControlTemplateService preventRiskControlTemplateService;
-
- @Autowired
- private IHiddenDangerCheckJobService trHiddenDangerCheckJobService;//排查任务job
- @Autowired
- private PreventRiskJobAndMeasureService preventRiskJobAndMeasureService;//排查任务附属表
-
- @Autowired
- private IHiddenDangerCheckService trHiddenDangerCheckService;//排查任务记录
- @Autowired
- private PreventRiskDangerCheckLogService preventRiskDangerCheckLogService;//排查任务记录附属表
-
- @Autowired
- private IHiddenDangerCheckPointService trHiddenDangerCheckPointService;//隐患信息上报、整改、验收
- @Autowired
- private PreventRiskDangerInfoService preventRiskDangerInfoService;//隐患信息附属表
-
- @Autowired
- private PreventRiskCheckUnitService preventRiskCheckUnitService;//管控措施，任务清单对应关系。基础排查点附属表
- @Autowired
- private PreventRiskDangerCheckAndMeasureService riskDangerCheckAndMeasureService;//管控措施，任务清单对应关系。基础排查点附属表
-
- @Autowired
- private PreventTaskTypeService taskTypeService;//管控措施，任务清单对应关系。基础排查点附属表
-
- @Autowired
- private PreventOverhaulLogService overhaulLogService;
- @Autowired
- private PreventCJReportOverhaulLogService reportOverhaulLogService;
-
-
- @Transactional
-// @Scheduled(cron = "0 0/1 * * * ? ") // 分钟
-// @Scheduled(cron = "0/10 * * * * ?") // 30秒
- @Scheduled(cron = "0 0/25 * * * ? ") // 分钟
- public void searchReportDate(){
-
- logger.info("【双重预防】定时检索需要上报数据...");
- int step = 1;
- String companyCode = "652310082";
-
- /**
- * 1、检索风险分析单元
- * */
- //读取风险分析单元数据上报主配置信息
- PreventReportConfig unitReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());
- //如果主配置开启上报，开始
- if (unitReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
-
- logger.info("【##】1.检索风险分析单元...");
-
- //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
- List<PreventRiskUnitUuid> riskUnitUuidList = preventRiskUnitUuidService.listRiskAnaUnit();
- //获取上报数据list
-// List<PreventReportRiskAnaUnit> unitLists = new ArrayList<>();
- List<PreventCJReportRiskAnaUnit> CJUnitLists = new ArrayList<>();
- if (ObjectUtils.isNotEmpty(riskUnitUuidList)){
- HandlerReportParam handlerReportParam = new HandlerReportParam();
- //遍历，封装数据
- for (PreventRiskUnitUuid riskUnitUuid : riskUnitUuidList) {
- //查询漯安表中对应数据
- RiskList infoByRiskId = trRiskAnaUnitService.getInfoByRiskListId(riskUnitUuid.getRiskUnitId());
- //获取上报数据对象
- PreventCJReportRiskAnaUnit CJReportRiskAnaUnit = new PreventCJReportRiskAnaUnit();
-
- //此类方法已经修改，实际使用username
- User createUser = trUserService.getUserByLoginName(infoByRiskId.getCreateBy());
- User updateUser = trUserService.getUserByLoginName(infoByRiskId.getUpdateBy());
- User userById = trUserService.getUserById(infoByRiskId.getUserId());
- Dept depById = trDeptService.getDepById(infoByRiskId.getDeptId());
-
- //封装上报昌吉州的风险分析单元数据
- CJReportRiskAnaUnit.setId(riskUnitUuid.getRiskUnitUuid());//此处封装附属表的uuid
- CJReportRiskAnaUnit.setCompanyCode(companyCode);
- CJReportRiskAnaUnit.setRiskUnitName(infoByRiskId.getRiskListName());
- CJReportRiskAnaUnit.setHazardCode(infoByRiskId.getRiskListNum());
- CJReportRiskAnaUnit.setHazardDep(depById.getDeptName());
- CJReportRiskAnaUnit.setHazardLiablePerson(userById.getUserName());
- CJReportRiskAnaUnit.setDeleted("0");
-// if (riskUnitUuid.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
-// CJReportRiskAnaUnit.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
-// }else {
-// CJReportRiskAnaUnit.setDeleted(riskAnaUnit.getDeleteStatus().toString());
-// }
- CJReportRiskAnaUnit.setCreateBy(createUser.getUserName());
- CJReportRiskAnaUnit.setCreateDate(infoByRiskId.getCreateTime());
- if (ObjectUtils.isEmpty(updateUser)){
- CJReportRiskAnaUnit.setUpdateBy(createUser.getUserName());
- CJReportRiskAnaUnit.setUpdateDate(infoByRiskId.getUpdateTime());
- }else {
- CJReportRiskAnaUnit.setUpdateBy(updateUser.getUserName());
- CJReportRiskAnaUnit.setUpdateDate(infoByRiskId.getCreateTime());
- }
- CJReportRiskAnaUnit.setDataSource((byte) 1);
- CJReportRiskAnaUnit.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- CJReportRiskAnaUnit.setReportTime(null);
- CJReportRiskAnaUnit.setRiskUnitId(infoByRiskId.getRiskListId());//此处封装主表的id
- //封装数据
- CJUnitLists.add(CJReportRiskAnaUnit);
- //修改原始数据状态为待上传
- handlerReportParam.setId(riskUnitUuid.getId());//此处修改的是附属表
- handlerReportParam.setReportTime(new Date());
- handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- int result = preventRiskUnitUuidService.updateReportStatus(handlerReportParam);
- }
- }else {
- logger.info("【双重预防】当前无风险分析单元数据需要处理");
- }
- //写入昌吉州转换表
- for (PreventCJReportRiskAnaUnit CJUnit : CJUnitLists) {
- CJRiskAnaUnitService.insertUnitList(CJUnit);
- logger.info("【双重预防】1.风险分析单元CJ：数据处理...");
- }
- step = 2;
- }else {
- step = 2;
- logger.info("风险分析单元数据上报已关闭");
- }
-
-
- /**
- * 2、检索安全风险事件数据
- * */
- //读取风险分析单元数据上报主配置信息
- PreventReportConfig eventReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_EVENT.getCode());
- //如果风险事件主配置开启上报
- if (eventReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
-
- //logger.info("【##】2.检索安全风险事件...");
- //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
- List<PreventRiskEvent> riskEvents = preventRiskEventService.listReportEvent();
- //获取上报数据对象与list
- List<PreventCJReportRiskEvent> CJEventLists = new ArrayList<>();
- if (ObjectUtils.isNotEmpty(riskEvents)){
- //遍历，封装数据
- for (PreventRiskEvent riskEvent : riskEvents) {
- //String eventUuid = UUID.randomUUID().toString();
- HandlerReportParam handlerReportParam = new HandlerReportParam();
- PreventCJReportRiskEvent CJReportRiskEvent = new PreventCJReportRiskEvent();
- //封装上报昌吉州风险事件数据
- CJReportRiskEvent.setId(riskEvent.getUuid());
- CJReportRiskEvent.setCompanyCode(companyCode);
- if (riskEvent.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
- CJReportRiskEvent.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
- }else {
- CJReportRiskEvent.setDeleted("0");
- }
- CJReportRiskEvent.setCreateBy(riskEvent.getCreateByUserName());
- CJReportRiskEvent.setCreateDate(riskEvent.getGmtCreate());
- CJReportRiskEvent.setUpdateBy(riskEvent.getCreateByUserName());
- CJReportRiskEvent.setUpdateDate(riskEvent.getGmtModitify());
- CJReportRiskEvent.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- CJReportRiskEvent.setReportTime(null);
- CJReportRiskEvent.setDataSource((byte) 1);
- PreventRiskUnitUuid riskUnitUuidByUnitId = preventRiskUnitUuidService.getRiskUnitUuidByUnitId(riskEvent.getRiskUnitId());
- CJReportRiskEvent.setRiskUnitId(riskUnitUuidByUnitId.getRiskUnitUuid());
- CJReportRiskEvent.setRiskEventName(riskEvent.getRiskEventName());
- CJReportRiskEvent.setRiskEventId(riskEvent.getId());
- //封装数据
- CJEventLists.add(CJReportRiskEvent);
- //设置原始数据上报状态
- handlerReportParam.setId(riskEvent.getId());
- handlerReportParam.setReportTime(new Date());
- handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- preventRiskEventService.updateEventReportStatus(handlerReportParam);
- }
- }else {
- logger.info("【双重预防】当前无安全风险事件数据需要处理");
- }
- //写入昌吉州转换表
- for (PreventCJReportRiskEvent CJEvent : CJEventLists) {
- CJEventService.insertEventLists(CJEvent);
- logger.info("【双重预防】2.风险分析事件CJ：数据处理...");
- }
- step = 3;
- }else {
- step = 3;
- logger.info("安全风险事件数据上报已关闭");
- }
-
-
- /**
- * 3、检索安全风险管控措施数据
- * */
- //读取安全风险管控措施数据上报主配置信息
- PreventReportConfig measureReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_MEASURE.getCode());
- //如果安全风险管控措施主配置开启上报
- if (measureReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
- //logger.info("{【##】3.检索安全风险管控措施...");
-
- //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
- List<PreventRiskControlMeasure> measures = preventRiskControlMeasureService.listReportMeasure();
- //获取上报数据list
- List<PreventCJReportRiskControlMeasure> CJMeasureLists = new ArrayList<>();
- HandlerReportParam handlerReportParam = new HandlerReportParam();
-
- if (ObjectUtils.isNotEmpty(measures)){
- //遍历，封装数据
- for (PreventRiskControlMeasure measure : measures) {
- String measureUuid = UUID.randomUUID().toString();
- //获取上报数据对象
- PreventCJReportRiskControlMeasure CJReportMeasure = new PreventCJReportRiskControlMeasure();
- //转换数据
- PreventRiskControlTemplate controlTemplateById = preventRiskControlTemplateService.getControlTemplateById(measure.getClassify2());
- String classify2 = measure.getClassify1() + "-" + controlTemplateById.getOrderIndex();
-
- //封装上报昌吉州管控措施数据
- CJReportMeasure.setId(measure.getUuid());
- CJReportMeasure.setCompanyCode(companyCode);
- if (measure.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
- CJReportMeasure.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
- }else {
- CJReportMeasure.setDeleted("0");
- }
- CJReportMeasure.setCreateBy(measure.getCreateByUserName());
- CJReportMeasure.setCreateDate(measure.getGmtCreate());
- CJReportMeasure.setUpdateBy(measure.getCreateByUserName());
- CJReportMeasure.setUpdateDate(measure.getGmtModitify());
- CJReportMeasure.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- CJReportMeasure.setReportTime(null);
- CJReportMeasure.setDataSource((byte) 1);
- CJReportMeasure.setRiskEventId(measure.getRiskEventUuid());
- CJReportMeasure.setRiskMeasureDesc(measure.getMeasureDesc());
- CJReportMeasure.setDataSrc(measure.getControlType().toString());
- CJReportMeasure.setClassify1(measure.getClassify1().toString());
- CJReportMeasure.setClassify2(classify2);
- CJReportMeasure.setClassify3(measure.getClassify3());
- CJReportMeasure.setRiskMeasureId(measure.getId());
- CJReportMeasure.setTroubleshootContent(measure.getCheckContent());
-
-
- //封装数据
- CJMeasureLists.add(CJReportMeasure);
- //设置原始数据上报状态
- handlerReportParam.setId(measure.getId());
- handlerReportParam.setReportTime(new Date());
- handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- preventRiskControlMeasureService.updateMeasureReportStatus(handlerReportParam);
- }
- }else {
- logger.info("【双重预防】当前无安全风险管控措施数据需要处理");
- }
-
- step = 4;
-
- //写入上报昌吉州转换表
- for (PreventCJReportRiskControlMeasure CJMeasure : CJMeasureLists) {
- CJMeasureService.insertMeasureList(CJMeasure);
-
- logger.info("【双重预防】3.安全风险管控措施CJ：数据处理...");
- }
- }else {
- step = 4;
- logger.info("安全风险管控措施数据上报已关闭");
- }
-
- /**
- * 4、检索 任务配置 数据 prevent_report_check_record_from_task
- * */
- //读取任务配置数据上报主配置信息
- PreventReportConfig workReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_TASK_FROM_WORK.getCode());
- //如果任务配置主配置开启上报
- if (workReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
- // logger.info("【##】4.检索任务配置...");
- //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
- List<PreventRiskJobAndMeasure> works = preventRiskJobAndMeasureService.listReportWork();
- //获取上报数据对象与list
- List<PreventCJReportCheckTaskFromWork> CJTaskFromWorkLists = new ArrayList<>();
- HandlerReportParam handlerReportParam = new HandlerReportParam();
-
- if (ObjectUtils.isNotEmpty(works)){
- //遍历，封装数据
- for (PreventRiskJobAndMeasure work : works) {
- //通过work中的信息，查询主表数据
- HiddenDangerCheckJob jobById = trHiddenDangerCheckJobService.getJobById(work.getJobId());
- //获取数据对象
- PreventCJReportCheckTaskFromWork CJTaskFromWork = new PreventCJReportCheckTaskFromWork();
- //转换时间周期单位 (1小时,2日,3周,4月,5年)
- if (jobById.getTroubleshootTypeCycleType() == 1){
- CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
- CJTaskFromWork.setCheckCycleUnit("小时");
- CJTaskFromWork.setWorkStartTime("00:00:00");
- CJTaskFromWork.setWorkEndTime("23:59:59");
- }else if (jobById.getTroubleshootTypeCycleType() == 2){
- CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
- CJTaskFromWork.setCheckCycleUnit("天");
- }else if (jobById.getTroubleshootTypeCycleType() == 3){
- Long num = jobById.getTroubleshootTypeCycleNum() * 7;
- CJTaskFromWork.setCheckCycle(Math.toIntExact(num));
- CJTaskFromWork.setCheckCycleUnit("天");
- }else if (jobById.getTroubleshootTypeCycleType() == 4){
- CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
- CJTaskFromWork.setCheckCycleUnit("月");
- }else if (jobById.getTroubleshootTypeCycleType() == 5){
- CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
- CJTaskFromWork.setCheckCycleUnit("年");
- }
- //获取用户信息
- User createUser = new User();
- User updateUser = new User();
- createUser = trUserService.getUserByLoginName(jobById.getCreateBy());
- if(ObjectUtils.isEmpty(createUser)){
- createUser = trUserService.getUserByName(jobById.getCreateBy());
- }
-
- updateUser = trUserService.getUserByLoginName(jobById.getUpdateBy());
- if(ObjectUtils.isEmpty(updateUser)){
- updateUser = trUserService.getUserByName(jobById.getUpdateBy());
- }
-
- //封装上报昌吉州任务配置数据
- CJTaskFromWork.setId(work.getJobUuid());
- CJTaskFromWork.setCompanyCode(companyCode);
- if (work.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
- CJTaskFromWork.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
- }else {
- CJTaskFromWork.setDeleted("0");
- }
- CJTaskFromWork.setCreateBy(createUser.getUserName());
- CJTaskFromWork.setCreateDate(jobById.getCreateTime());
- if (ObjectUtils.isEmpty(updateUser)){
- CJTaskFromWork.setUpdateBy(createUser.getUserName());
- CJTaskFromWork.setUpdateDate(jobById.getCreateTime());
- }else {
- CJTaskFromWork.setUpdateBy(updateUser.getUserName());
- CJTaskFromWork.setUpdateDate(jobById.getCreateTime());
- }
- CJTaskFromWork.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- CJTaskFromWork.setReportTime(null);
- CJTaskFromWork.setDataSource((byte) 1);
- CJTaskFromWork.setRiskMeasureId(work.getMeasureUuid());
- CJTaskFromWork.setWorkId(jobById.getJobId());
-
- //第二版标准新增
- PreventRiskControlMeasure measureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(work.getMeasureId());
- CJTaskFromWork.setTroubleshootContent(measureById.getCheckContent());
- CJTaskFromWork.setTaskStartTime(jobById.getStartTime());
-
- CJTaskFromWork.setWorkDayType("0");
- List<PreventTaskType> typeByJobId = taskTypeService.getInfoByJobId(work.getJobId());
- int typeTag = 0;
- for (PreventTaskType taskType : typeByJobId) {
- typeTag = taskType.getType();
- }
- if (typeTag !=0){
- CJTaskFromWork.setTaskNum("1");
- }
- CJTaskFromWork.setWorkType(String.valueOf(typeTag));
-
- //封装数据
- CJTaskFromWorkLists.add(CJTaskFromWork);
- //设置原始数据上报状态
- handlerReportParam.setId(work.getId());
- handlerReportParam.setReportTime(new Date());
- handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- preventRiskJobAndMeasureService.updateWorkReportStatus(handlerReportParam);
- }
- }else {
- logger.info("【双重预防】当前无任务配置数据需要处理");
- }
- //写入上报昌吉州数据转换表
- for (PreventCJReportCheckTaskFromWork CJTaskFromWorks : CJTaskFromWorkLists) {
- CJTaskFromWorkService.insertTaskFromWorkList(CJTaskFromWorks);
- logger.info("【双重预防】任务配置CJ：数据处理...");
- }
- }else {
- step = 5;
- logger.info("任务配置数据上报已关闭");
- }
-
-
- /**
- * 5、排查任务记录数据 PreventReportCheckRecordFromTask
- * */
- //读取安全风险管控措施数据上报主配置信息
- PreventReportConfig recordReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG__CHECK_RECORD.getCode());
- //如果安全风险管控措施主配置开启上报
- if (recordReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
-
- //logger.info("【##】5.检索排查任务记录数据...");
- System.out.println("【##】5.检索排查任务记录数据...");
-
- //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
- List<PreventRiskDangerCheckLog> tasks = preventRiskDangerCheckLogService.listReportTask();
- List<Long> taskIds = new ArrayList<>();
- //获取上报数据对象
- List<PreventCJReportCheckRecordFromTask> CJRecordFromTaskLists = new ArrayList<>();
- int tag = 0;
-// HandlerReportParam handlerReportParam = new HandlerReportParam();
-// List<HandlerReportParam> handlerReportParamList = new ArrayList<>();
- if (ObjectUtils.isNotEmpty(tasks)){
- //获取信息
- List<User> allUserList = trUserService.getAllUser();
- List<PreventRiskControlMeasure> allMeasureList = preventRiskControlMeasureService.getAllMeasureList();
- List<PreventTaskType> allTaskTypeList = taskTypeService.getAllTaskTypeList();
- //遍历，封装数据
- for (PreventRiskDangerCheckLog task : tasks) {
- //获取任务记录主表信息
- HiddenDangerCheck hiddenDangerCheckById = trHiddenDangerCheckService.getHiddenDangerCheckById(task.getCheckId());
- //转换检查结果
- //如果已经执行过，进入方法
- if (Integer.valueOf(hiddenDangerCheckById.getScheduleCheckStatus()) == 1){
-
- List<HiddenDangerCheckPoint> hiddenDangerCheckPointList = trHiddenDangerCheckPointService.getHiddenDangerCheckPointByCheckId(task.getCheckId());
-
- //避免个别任务无检查点的情况
- if (ObjectUtils.isEmpty(hiddenDangerCheckPointList)) {
- logger.info("【双重预防】排查任务记录CJ：异常，无检查点...");
- }else {
- for (HiddenDangerCheckPoint hiddenDangerCheckPoint : hiddenDangerCheckPointList) {
- //获取上报数据对象
- PreventCJReportCheckRecordFromTask CJRecordFromTask = new PreventCJReportCheckRecordFromTask();
- CJRecordFromTask.setCheckStatus("0");// 0-正常；1-存在隐患；2-未处理；3-其他
- if (Integer.valueOf(hiddenDangerCheckPoint.getWhetherDanger()) == 1){
- CJRecordFromTask.setCheckStatus("1");// 0-正常；1-存在隐患；2-未处理；3-其他
- }
-
- User createUser = new User();
- User updateUser = new User();
-// createUser = trUserService.getUserByLoginName(hiddenDangerCheckById.getCreateBy());
-// if(ObjectUtils.isEmpty(createUser)){
-// createUser = trUserService.getUserByName(hiddenDangerCheckById.getCreateBy());
-// }
-// updateUser = trUserService.getUserByLoginName(hiddenDangerCheckById.getUpdateBy());
-
-
- // todo 取出所有用户信息，再循环在匹配
- for (User user : allUserList) {
- if (hiddenDangerCheckById.getCreateBy().equals(user.getLoginName())){
- createUser = user;
- }
- if (hiddenDangerCheckById.getUpdateBy().equals(user.getLoginName())){
- updateUser = user;
- }
- }
- if(ObjectUtils.isEmpty(createUser)){
- for (User user : allUserList) {
- if (hiddenDangerCheckById.getCreateBy().equals(user.getUserName())){
- createUser = user;
- }
- }
- }
-
-
-
- //封装上报昌吉州的任务数据
-// String taskUuid = UUID.randomUUID().toString();
- CJRecordFromTask.setId(UUID.randomUUID().toString());
- CJRecordFromTask.setCompanyCode(companyCode);
- CJRecordFromTask.setCreateBy(createUser.getUserName());
- CJRecordFromTask.setCreateDate(hiddenDangerCheckById.getCreateTime());
- CJRecordFromTask.setCreateByMobile(createUser.getPhonenumber());
- if (ObjectUtils.isEmpty(updateUser)){
- CJRecordFromTask.setUpdateBy(createUser.getUserName());
- CJRecordFromTask.setUpdateDate(hiddenDangerCheckById.getCreateTime());
- CJRecordFromTask.setUpdateByMobile(createUser.getPhonenumber());
- }else {
- CJRecordFromTask.setUpdateBy(updateUser.getUserName());
- CJRecordFromTask.setUpdateDate(hiddenDangerCheckById.getUpdateTime());
- CJRecordFromTask.setUpdateByMobile(updateUser.getPhonenumber());
- }
-
- if (task.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
- CJRecordFromTask.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
- }else {
- CJRecordFromTask.setDeleted("0");
- }
- CJRecordFromTask.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- CJRecordFromTask.setReportTime(null);
- CJRecordFromTask.setDataSource((byte) 1);
- List<PreventRiskDangerCheckAndMeasure> baseCheckPointAndMeasure = riskDangerCheckAndMeasureService.getByBaseCheckPointId(hiddenDangerCheckPoint.getCheckPointId());
- //获取该条记录对应的管控措施id，
- Long controlMeasureId = 1L;
- for (PreventRiskDangerCheckAndMeasure checkAndMeasure : baseCheckPointAndMeasure) {
- controlMeasureId = checkAndMeasure.getControlMeasureId();
- }
-// //获取该条记录对应的管控措施uuid
-// PreventRiskControlMeasure preventRiskControlMeasureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(controlMeasureId);
-// //通过管控措施uuid ，jobId(workId)，在任务上报表中，找到任务对应的uuid
-// PreventCJReportCheckTaskFromWork preventCJReportCheckTaskFromWork = CJTaskFromWorkService.geByMeasureUUidAndJobId(preventRiskControlMeasureById.getUuid(), task.getJobId());
-// CJRecordFromTask.setCheckTaskId(preventCJReportCheckTaskFromWork.getId());
- // todo 取出所有措施，再循环在匹配
- for (PreventRiskControlMeasure measure : allMeasureList) {
- if (controlMeasureId.equals(measure.getId())){
- //通过管控措施uuid ，jobId(workId)，在任务上报表中，找到任务对应的uuid
- PreventCJReportCheckTaskFromWork preventCJReportCheckTaskFromWork = CJTaskFromWorkService.geByMeasureUUidAndJobId(measure.getUuid(), task.getJobId());
- CJRecordFromTask.setCheckTaskId(preventCJReportCheckTaskFromWork.getId());
- }
- }
-
-
- CJRecordFromTask.setCheckTime(hiddenDangerCheckById.getCheckTime());
- CJRecordFromTask.setTaskId(task.getCheckId());
- //第二版标准新增
- CJRecordFromTask.setMobileCode(task.getMobileCode().toString());
-
- int typeTag = 0;
-// List<PreventTaskType> typeByJobIds = taskTypeService.getInfoByJobId(task.getJobId());
-// for (PreventTaskType typeByJobId : typeByJobIds) {
-// if (typeByJobId.getType()!= 0) {
-// typeTag = 1;
-// }
-// }
-
- // todo 取出所有任务信息表，再循环在匹配
- for (PreventTaskType taskType : allTaskTypeList) {
- if (taskType.getJobId().equals(task.getJobId())){
- if (taskType.getType()!= 0) {
- typeTag = 1;
- }
- }
- }
-
-
- CJRecordFromTask.setDefend(String.valueOf(typeTag));
- //封装数据
- CJRecordFromTaskLists.add(CJRecordFromTask);
- }
- }
-
- //设置原始数据上报状态
-// handlerReportParam.setId(task.getId());
-// handlerReportParam.setReportTime(new Date());
-// handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
-// handlerReportParamList.add(handlerReportParam);
-// preventRiskDangerCheckLogService.updateTaskReportStatus(handlerReportParam);
- int i = 1;
- taskIds.add(task.getId());
- tag ++;
- }
- System.out.println("【##】5.数据封装完成...");
-
- }
- }else {
- logger.info("【双重预防】当前无排查任务记录需要处理");
- }
-
- if (CJRecordFromTaskLists.size() > 0){
- logger.info("【双重预防】排查任务记录CJ：数据处理...");
- //设置原始数据状态
- int taskUpdateResult = preventRiskDangerCheckLogService.updateTaskReportStatusByList(taskIds);
- if (taskUpdateResult < taskIds.size()){
- throw new AusinessException(E.ADD_FAIL.getCode(), "排查任务记录原始数据更新失败, 取消操作");
- }
- int result = CJTaskRecordService.insertRecordList(CJRecordFromTaskLists);
- if (result < CJRecordFromTaskLists.size()){
- throw new AusinessException(E.ADD_FAIL.getCode(), "排查任务记录插入失败, 取消操作");
- }
- }
- step = 6;
- }else {
- step = 6;
- logger.info("排查任务记录数据上报已关闭");
- }
-
-
- /**
- * 6、隐患信息数据
- * */
- //读取安全风险管控措施数据上报主配置信息
- PreventReportConfig dangerReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());
- //如果安全风险管控措施主配置开启上报
- if (dangerReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
-
- //logger.info("【##】6.检索隐患数据...");
-
- //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
- List<PreventRiskDangerInfo> dangerManages = preventRiskDangerInfoService.listReportDanger();
- //获取上报数据list
- List<PreventCJReportDangerInfo> CJDangerInfoLists = new ArrayList<>();
-
- if (ObjectUtils.isNotEmpty(dangerManages)){
- HandlerReportParam handlerReportParam = new HandlerReportParam();
- //遍历，封装数据
- for (PreventRiskDangerInfo dangerManage : dangerManages) {
-
- //获取隐患信息主表信息
- HiddenDangerCheckPoint hiddenDanger = trHiddenDangerCheckPointService.getHiddenDangerCheckPointById(dangerManage.getDangerCheckPointId());
- //获取上报数据对象
- PreventCJReportDangerInfo CJDangerInfo = new PreventCJReportDangerInfo();
-
- //通过用户名，获取涉及到的各位用户的真实姓名
- User createUser = new User();
- createUser = trUserService.getUserByLoginName(hiddenDanger.getCreateBy());
-// createUser = trUserService.getUserByLoginName("guotai");
- if(ObjectUtils.isEmpty(createUser)){
- createUser = trUserService.getUserByName(hiddenDanger.getCreateBy());
- }
- User updateUser = trUserService.getUserByLoginName(hiddenDanger.getUpdateBy());
-// User updateUser = trUserService.getUserByLoginName("guotai");
- if (ObjectUtils.isNotEmpty(hiddenDanger.getRegisterUserName())){
- User registerUser = trUserService.getUserByLoginName(hiddenDanger.getRegisterUserName());
- //登记人信息
- CJDangerInfo.setRegistrant(registerUser.getUserName());//登记人
- CJDangerInfo.setRegistTime(hiddenDanger.getRegisterCreateTime());//登记时间
- }
-
- CJDangerInfo.setCost(String.valueOf(0));//初始值给0
- if (ObjectUtils.isNotEmpty(hiddenDanger.getRectifyUserName())){
- User rectifyUser = trUserService.getUserByLoginName(hiddenDanger.getRectifyUserName());
- //整改人信息
- CJDangerInfo.setLiablePerson(rectifyUser.getUserName());//整改责任人
- CJDangerInfo.setCost(hiddenDanger.getRectifyFund());//资金
- }
-
- if (ObjectUtils.isNotEmpty(hiddenDanger.getAcceptUserName())){
- //验收人信息
- CJDangerInfo.setCheckAcceptPerson(hiddenDanger.getAcceptUserName());//验收人
- CJDangerInfo.setCheckAcceptComment(hiddenDanger.getAcceptOpinion());//验收情况
- CJDangerInfo.setCheckAcceptTime(hiddenDanger.getAcceptCreateTime());//验收时间
- }
-
- //如果排查任务正常存在，封装任务相关数据
-// if (Integer.parseInt(hiddenDanger.getDangerSources()) != 2){
-// HiddenDangerCheck dangerCheckById = trHiddenDangerCheckService.getHiddenDangerCheckById(hiddenDanger.getCheckId());
-//
-// PreventRiskDangerCheckLog dangerCheckLogByCheckId = preventRiskDangerCheckLogService.getByDangerCheckByCheckId(hiddenDanger.getCheckId());
-// CJDangerInfo.setCheckRecordId(dangerCheckLogByCheckId.getUuid());//隐患排查任务记录uuid
-// //找排查点，然后查措施
-// PreventRiskCheckUnit unit = preventRiskCheckUnitService.getUnitByBaseCheckPointId(hiddenDanger.getCheckPointId());
-// //查管控措施
-// PreventRiskControlMeasure controlMeasureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(unit.getControlMeasureId());
-// CJDangerInfo.setRiskMeasureId(controlMeasureById.getUuid());//管控措施uuid
-// CJDangerInfo.setControlMeasures(controlMeasureById.getCheckContent());//控制措施 ,整改措施
-// }else {
-// CJDangerInfo.setCheckRecordId(null);
-// CJDangerInfo.setRiskMeasureId(null);
-// }
- CJDangerInfo.setCheckRecordId(null);
- CJDangerInfo.setRiskMeasureId(null);//默认无任务
- CJDangerInfo.setDeleted("0");
- CJDangerInfo.setId(dangerManage.getUuid());
- CJDangerInfo.setCompanyCode(companyCode);
- CJDangerInfo.setHazardCode(dangerManage.getHazardCode());
- CJDangerInfo.setCreateBy(createUser.getUserName());
- CJDangerInfo.setCreateDate(hiddenDanger.getCreateTime());
-
- if (ObjectUtils.isEmpty(updateUser)){
- CJDangerInfo.setUpdateBy(createUser.getUserName());
- CJDangerInfo.setUpdateDate(hiddenDanger.getCreateTime());
- }else {
- CJDangerInfo.setUpdateBy(updateUser.getUserName());
- CJDangerInfo.setUpdateDate(hiddenDanger.getUpdateTime());
- }
- // todo 2024-07-01 需要检查
- CJDangerInfo.setHazardCategory("0");
- if (dangerManage.getId() <= 383){
- PreventTaskType taskTypeInfo = taskTypeService.getInfoByTaskId(dangerManage.getId());
- int i = 1;
- CJDangerInfo.setHazardCategory(taskTypeInfo.getType().toString());
- }
- CJDangerInfo.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- CJDangerInfo.setReportTime(null);
- CJDangerInfo.setDataSource((byte) 1);
- CJDangerInfo.setDangerName(hiddenDanger.getDangerName());
- CJDangerInfo.setDangerLevel(hiddenDanger.getDangerLevel());
- CJDangerInfo.setDangerSrc(dangerManage.getDangerSrc().toString());
- if (hiddenDanger.getRectifyType().equals("1")){
- CJDangerInfo.setDangerManageType("0");
- }else {
- CJDangerInfo.setDangerManageType("1");
- }
- CJDangerInfo.setDangerDesc(hiddenDanger.getDangerDescription());
- CJDangerInfo.setDangerReason(dangerManage.getDangerReason());
- CJDangerInfo.setDangerManageDeadline(hiddenDanger.getRectifyDeadlineTime());
- if (ObjectUtils.isNotEmpty(dangerManage.getDangerState())){
- CJDangerInfo.setDangerState(dangerManage.getDangerState().toString());
- }
- CJDangerInfo.setHazardDangerType(dangerManage.getHazardDangerType().toString());
- CJDangerInfo.setDangerManagerId(dangerManage.getId());
-
- CJDangerInfoLists.add(CJDangerInfo);
- //设置原始数据上报状态
- handlerReportParam.setId(dangerManage.getId());
- handlerReportParam.setReportTime(new Date());
- handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- //修改隐患信息附属表状态
- preventRiskDangerInfoService.updateDangerInfoReportStatus(handlerReportParam);
- }
- }else {
- logger.info("【双重预防】当前无隐患信息需要处理");
- }
-
- //插入上报昌吉州转换表
- for (PreventCJReportDangerInfo CJDanger : CJDangerInfoLists) {
- logger.info("【双重预防】隐患信息插入...");
- int result = CJDangerInfoService.insert(CJDanger);
- if (result < 0){
- throw new AusinessException(E.ADD_FAIL.getCode(), "隐患信息插入失败");
- }
- logger.info("【双重预防】隐患信息：数据处理...");
- }
- }else {
- logger.info("隐患信息数据上报已关闭");
- }
-
-
-
-
-// /**
-// * 7、检索检修记录数据
-// * */
-// //读取风险分析单元数据上报主配置信息
-// PreventReportConfig overhaulReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.OVERHAUL_LOG_DANGER_INFO.getCode());
-// //如果风险事件主配置开启上报
-// if (overhaulReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
-//
-// //logger.info("【##】2.检索检修记录...");
-// //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
-// List<PreventOverhaulLog> preventOverhaulLogList = overhaulLogService.listReportOverhaulLog();
-// //获取上报数据对象与list
-// List<PreventCJReportOverhaulLog> CJOverhaulLogLists = new ArrayList<>();
-// if (ObjectUtils.isNotEmpty(preventOverhaulLogList)){
-// //遍历，封装数据
-// for (PreventOverhaulLog preventOverhaulLog : preventOverhaulLogList) {
-// HandlerReportParam handlerReportParam = new HandlerReportParam();
-// PreventCJReportOverhaulLog CJOverhaulLog = new PreventCJReportOverhaulLog();
-//
-// //封装上报昌吉州检修记录数据
-// CJOverhaulLog.setId(preventOverhaulLog.getUuid());
-// if (preventOverhaulLog.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
-// CJOverhaulLog.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
-// }else {
-// CJOverhaulLog.setDeleted("0");
-// }
-// CJOverhaulLog.setCompanyCode(companyCode);
-// CJOverhaulLog.setHazardCode(preventOverhaulLog.getHazardCode());
-// CJOverhaulLog.setRiskUnitId(preventOverhaulLog.getRiskUnitUuid());
-// CJOverhaulLog.setStopStartTime(preventOverhaulLog.getStopStartTime());
-// CJOverhaulLog.setStopEndTime(preventOverhaulLog.getStopEndTime());
-// CJOverhaulLog.setStopReason(preventOverhaulLog.getStopReason());
-// CJOverhaulLog.setCreateBy(preventOverhaulLog.getCreateByUserName());
-// CJOverhaulLog.setCreateDate(preventOverhaulLog.getGmtCreate());
-// CJOverhaulLog.setUpdateBy(preventOverhaulLog.getCreateByUserName());
-// CJOverhaulLog.setUpdateDate(preventOverhaulLog.getGmtModitify());
-// CJOverhaulLog.setReportTime(null);
-// CJOverhaulLog.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
-// CJOverhaulLog.setDataSource((byte) 1);
-//
-// //封装数据
-// CJOverhaulLogLists.add(CJOverhaulLog);
-// //设置原始数据上报状态
-// handlerReportParam.setId(preventOverhaulLog.getId());
-// handlerReportParam.setReportTime(new Date());
-// handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
-// int result = overhaulLogService.updateOverhaulReportStatus(handlerReportParam);
-// if (result < 1){
-// throw new AusinessException(E.ADD_FAIL.getCode(), "检修记录数据状态修改失败");
-// }
-// }
-// }else {
-// logger.info("【检修记录】当前无检修记录数据需要处理");
-// }
-// //写入昌吉州转换表
-// for (PreventCJReportOverhaulLog cjOverhaulLog : CJOverhaulLogLists) {
-// int result = reportOverhaulLogService.insertCJOverhaulLists(cjOverhaulLog);
-// if (result < 1){
-// throw new AusinessException(E.ADD_FAIL.getCode(), "检修记录数据状态修改失败");
-// }
-// logger.info("【检修记录】2.检修记录CJ：数据处理...");
-// }
-// step = 3;
-// }else {
-// step = 3;
-// logger.info("检修记录数据上报已关闭");
-// }
-//
-
-
-
-
-
-
-
-
-// TODO 目前应急厅没有风险点概念，此处暂时不写。目前看，风险点概念，类似管控措施，对用某个具体的风险位置
-// /**
-// * 7、检索风险点-（可能对应风险管控措施?）数据
-// * */
-// //读取风险分析单元数据上报主配置信息
-// PreventReportConfig pointReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_POINT_INFO.getCode());
-// //如果风险事件主配置开启上报
-// if (pointReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
-// //logger.info("【##】2.检索安全风险事件...");
-// //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
-// List<PreventRiskEvent> riskEvents = preventRiskEventService.listReportEvent();
-// //获取上报数据对象与list
-// List<PreventCJReportPoint> CJPointLists = new ArrayList<>();
-// if (ObjectUtils.isNotEmpty(riskEvents)){
-// //遍历，封装数据
-// for (PreventRiskEvent riskEvent : riskEvents) {
-// String pointUuid = UUID.randomUUID().toString();
-// HandlerReportParam handlerReportParam = new HandlerReportParam();
-// PreventCJReportPoint CJReportPoint = new PreventCJReportPoint();
-// //TODO 公司编码，暂时没有
-// //封装上报昌吉州风险事件数据
-// CJReportPoint.setId(pointUuid);
-// CJReportPoint.setCompanyCode("test001");
-// CJReportPoint.setDeleted(riskEvent.getDeleteStatus().toString());
-// CJReportPoint.setCreateBy(riskEvent.getCreateByUserName());
-// CJReportPoint.setCreateDate(riskEvent.getGmtCreate());
-// CJReportPoint.setUpdateBy(riskEvent.getCreateByUserName());
-// CJReportPoint.setUpdateDate(riskEvent.getGmtModitify());
-// CJReportPoint.setRiskUnitIds();
-// CJReportPoint.setRiskEventIds();
-// CJReportPoint.setRiskMeasureIds();
-// CJReportPoint.setHazardDep();
-// CJReportPoint.setHazardLiablePerson();
-// CJReportPoint.setHazardCode();
-// CJReportPoint.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
-// CJReportPoint.setReportTime(null);
-// CJReportPoint.setDataSource((byte) 1);
-// CJReportPoint.setRiskEventId(riskEvent.getId());
-// //封装数据
-// CJPointLists.add(CJReportPoint);
-// //设置原始数据上报状态
-// handlerReportParam.setId(riskEvent.getId());
-// handlerReportParam.setReportTime(new Date());
-// handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
-// preventRiskEventService.updateEventReportStatus(handlerReportParam);
-// }
-// }else {
-// logger.info("【##】当前无安全风险事件数据需要处理");
-// }
-// //写入昌吉州转换表
-// for (PreventCJReportRiskEvent CJEvent : CJEventLists) {
-// CJEventService.insertEventLists(CJEvent);
-// logger.info("【##】2.风险分析事件CJ：数据处理...");
-// }
-// step = 3;
-// }else {
-// step = 3;
-// logger.info("安全风险事件数据上报已关闭");
-// }
-
-
- }
-}
+package com.ruoyi.doublePrevention.scheduls;
+
+
+import com.ruoyi.doublePrevention.entity.*;
+import com.ruoyi.doublePrevention.entity.CJReport.*;
+import com.ruoyi.doublePrevention.enums.E;
+import com.ruoyi.doublePrevention.enums.SyncEnum;
+import com.ruoyi.doublePrevention.exception.AusinessException;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import com.ruoyi.doublePrevention.service.baseService.*;
+import com.ruoyi.project.system.dept.domain.Dept;
+import com.ruoyi.project.system.dept.service.IDeptService;
+import com.ruoyi.project.system.user.domain.User;
+import com.ruoyi.project.system.user.service.IUserService;
+import com.ruoyi.project.tr.HiddenDangerCheckJob.domain.HiddenDangerCheckJob;
+import com.ruoyi.project.tr.HiddenDangerCheckJob.service.IHiddenDangerCheckJobService;
+import com.ruoyi.project.tr.hiddenDangerCheck.domain.HiddenDangerCheck;
+import com.ruoyi.project.tr.hiddenDangerCheck.service.IHiddenDangerCheckService;
+import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
+import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;
+import com.ruoyi.project.tr.riskList.domain.RiskList;
+import com.ruoyi.project.tr.riskList.service.IRiskListService;
+import org.apache.commons.lang3.ObjectUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+@Component
+public class SearchReportDateSchedule {
+
+ private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+ public static SimpleDateFormat startFormat = new SimpleDateFormat("yyyy-MM-dd 06:30:00");
+ public static SimpleDateFormat endFormat = new SimpleDateFormat("yyyy-MM-dd 23:59:59");
+
+ public static SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+ @Autowired
+ private PreventReportConfigService preventReportConfigService;
+
+ @Autowired
+ private PreventCJReportRiskAnaUnitService CJRiskAnaUnitService;
+ @Autowired
+ private PreventCJReportRiskEventService CJEventService;
+ @Autowired
+ private PreventCJReportRiskControlMeasureService CJMeasureService;
+ @Autowired
+ private PreventCJReportCheckTaskFromWorkService CJTaskFromWorkService;
+ @Autowired
+ private PreventCJReportCheckRecordFromTaskService CJTaskRecordService;
+ @Autowired
+ private PreventCJReportDangerInfoService CJDangerInfoService;
+ @Autowired
+ private PreventCJReportPointService CJPointService;
+
+
+ @Autowired
+ private IDeptService trDeptService; //部门服务
+ @Autowired
+ private IUserService trUserService; //用户服务
+
+ @Autowired
+ private IRiskListService trRiskAnaUnitService; //风险设备、分析单元
+ @Autowired
+ private PreventRiskUnitUuidService preventRiskUnitUuidService; //风险设备、分析单元附属表
+
+ @Autowired
+ private PreventRiskEventService preventRiskEventService;
+ @Autowired
+ private PreventRiskControlMeasureService preventRiskControlMeasureService;
+ @Autowired
+ private PreventRiskControlTemplateService preventRiskControlTemplateService;
+
+ @Autowired
+ private IHiddenDangerCheckJobService trHiddenDangerCheckJobService;//排查任务job
+ @Autowired
+ private PreventRiskJobAndMeasureService preventRiskJobAndMeasureService;//排查任务附属表
+
+ @Autowired
+ private IHiddenDangerCheckService trHiddenDangerCheckService;//排查任务记录
+ @Autowired
+ private PreventRiskDangerCheckLogService preventRiskDangerCheckLogService;//排查任务记录附属表
+
+ @Autowired
+ private IHiddenDangerCheckPointService trHiddenDangerCheckPointService;//隐患信息上报、整改、验收
+ @Autowired
+ private PreventRiskDangerInfoService preventRiskDangerInfoService;//隐患信息附属表
+
+ @Autowired
+ private PreventRiskCheckUnitService preventRiskCheckUnitService;//管控措施，任务清单对应关系。基础排查点附属表
+ @Autowired
+ private PreventRiskDangerCheckAndMeasureService riskDangerCheckAndMeasureService;//管控措施，任务清单对应关系。基础排查点附属表
+
+ @Autowired
+ private PreventTaskTypeService taskTypeService;//管控措施，任务清单对应关系。基础排查点附属表
+
+ @Autowired
+ private PreventOverhaulLogService overhaulLogService;
+ @Autowired
+ private PreventCJReportOverhaulLogService reportOverhaulLogService;
+
+
+ @Transactional
+ @Scheduled(cron = "0 0/10 * * * ? ") // 分钟
+// @Scheduled(cron = "0/10 * * * * ?") // 30秒
+ // @Scheduled(cron = "0 0/25 * * * ? ") // 分钟
+ public void searchReportDate(){
+
+ logger.info("【双重预防】定时检索需要上报数据...");
+ int step = 1;
+ String companyCode = "652310082";
+
+ /**
+ * 1、检索风险分析单元
+ * */
+ //读取风险分析单元数据上报主配置信息
+ PreventReportConfig unitReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());
+ //如果主配置开启上报，开始
+ if (unitReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
+
+ logger.info("【##】1.检索风险分析单元...");
+
+ //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
+ List<PreventRiskUnitUuid> riskUnitUuidList = preventRiskUnitUuidService.listRiskAnaUnit();
+ //获取上报数据list
+// List<PreventReportRiskAnaUnit> unitLists = new ArrayList<>();
+ List<PreventCJReportRiskAnaUnit> CJUnitLists = new ArrayList<>();
+ if (ObjectUtils.isNotEmpty(riskUnitUuidList)){
+ HandlerReportParam handlerReportParam = new HandlerReportParam();
+ //遍历，封装数据
+ for (PreventRiskUnitUuid riskUnitUuid : riskUnitUuidList) {
+ //查询漯安表中对应数据
+ RiskList infoByRiskId = trRiskAnaUnitService.getInfoByRiskListId(riskUnitUuid.getRiskUnitId());
+ //获取上报数据对象
+ PreventCJReportRiskAnaUnit CJReportRiskAnaUnit = new PreventCJReportRiskAnaUnit();
+
+ //此类方法已经修改，实际使用username
+ User createUser = trUserService.getUserByLoginName(infoByRiskId.getCreateBy());
+ User updateUser = trUserService.getUserByLoginName(infoByRiskId.getUpdateBy());
+ User userById = trUserService.getUserById(infoByRiskId.getUserId());
+ Dept depById = trDeptService.getDepById(infoByRiskId.getDeptId());
+
+ //封装上报昌吉州的风险分析单元数据
+ CJReportRiskAnaUnit.setId(riskUnitUuid.getRiskUnitUuid());//此处封装附属表的uuid
+ CJReportRiskAnaUnit.setCompanyCode(companyCode);
+ CJReportRiskAnaUnit.setRiskUnitName(infoByRiskId.getRiskListName());
+ CJReportRiskAnaUnit.setHazardCode(infoByRiskId.getRiskListNum());
+ CJReportRiskAnaUnit.setHazardDep(depById.getDeptName());
+ CJReportRiskAnaUnit.setHazardLiablePerson(userById.getUserName());
+ CJReportRiskAnaUnit.setDeleted("0");
+// if (riskUnitUuid.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
+// CJReportRiskAnaUnit.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
+// }else {
+// CJReportRiskAnaUnit.setDeleted(riskAnaUnit.getDeleteStatus().toString());
+// }
+ CJReportRiskAnaUnit.setCreateBy(createUser.getUserName());
+ CJReportRiskAnaUnit.setCreateDate(infoByRiskId.getCreateTime());
+ if (ObjectUtils.isEmpty(updateUser)){
+ CJReportRiskAnaUnit.setUpdateBy(createUser.getUserName());
+ CJReportRiskAnaUnit.setUpdateDate(infoByRiskId.getUpdateTime());
+ }else {
+ CJReportRiskAnaUnit.setUpdateBy(updateUser.getUserName());
+ CJReportRiskAnaUnit.setUpdateDate(infoByRiskId.getCreateTime());
+ }
+ CJReportRiskAnaUnit.setDataSource((byte) 1);
+ CJReportRiskAnaUnit.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ CJReportRiskAnaUnit.setReportTime(null);
+ CJReportRiskAnaUnit.setRiskUnitId(infoByRiskId.getRiskListId());//此处封装主表的id
+ //封装数据
+ CJUnitLists.add(CJReportRiskAnaUnit);
+ //修改原始数据状态为待上传
+ handlerReportParam.setId(riskUnitUuid.getId());//此处修改的是附属表
+ handlerReportParam.setReportTime(new Date());
+ handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ int result = preventRiskUnitUuidService.updateReportStatus(handlerReportParam);
+ }
+ }else {
+ logger.info("【双重预防】当前无风险分析单元数据需要处理");
+ }
+ //写入昌吉州转换表
+ for (PreventCJReportRiskAnaUnit CJUnit : CJUnitLists) {
+ CJRiskAnaUnitService.insertUnitList(CJUnit);
+ logger.info("【双重预防】1.风险分析单元CJ：数据处理...");
+ }
+ step = 2;
+ }else {
+ step = 2;
+ logger.info("风险分析单元数据上报已关闭");
+ }
+
+
+ /**
+ * 2、检索安全风险事件数据
+ * */
+ //读取风险分析单元数据上报主配置信息
+ PreventReportConfig eventReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_EVENT.getCode());
+ //如果风险事件主配置开启上报
+ if (eventReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
+
+ //logger.info("【##】2.检索安全风险事件...");
+ //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
+ List<PreventRiskEvent> riskEvents = preventRiskEventService.listReportEvent();
+ //获取上报数据对象与list
+ List<PreventCJReportRiskEvent> CJEventLists = new ArrayList<>();
+ if (ObjectUtils.isNotEmpty(riskEvents)){
+ //遍历，封装数据
+ for (PreventRiskEvent riskEvent : riskEvents) {
+ //String eventUuid = UUID.randomUUID().toString();
+ HandlerReportParam handlerReportParam = new HandlerReportParam();
+ PreventCJReportRiskEvent CJReportRiskEvent = new PreventCJReportRiskEvent();
+ //封装上报昌吉州风险事件数据
+ CJReportRiskEvent.setId(riskEvent.getUuid());
+ CJReportRiskEvent.setCompanyCode(companyCode);
+ if (riskEvent.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
+ CJReportRiskEvent.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
+ }else {
+ CJReportRiskEvent.setDeleted("0");
+ }
+ CJReportRiskEvent.setCreateBy(riskEvent.getCreateByUserName());
+ CJReportRiskEvent.setCreateDate(riskEvent.getGmtCreate());
+ CJReportRiskEvent.setUpdateBy(riskEvent.getCreateByUserName());
+ CJReportRiskEvent.setUpdateDate(riskEvent.getGmtModitify());
+ CJReportRiskEvent.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ CJReportRiskEvent.setReportTime(null);
+ CJReportRiskEvent.setDataSource((byte) 1);
+ PreventRiskUnitUuid riskUnitUuidByUnitId = preventRiskUnitUuidService.getRiskUnitUuidByUnitId(riskEvent.getRiskUnitId());
+ CJReportRiskEvent.setRiskUnitId(riskUnitUuidByUnitId.getRiskUnitUuid());
+ CJReportRiskEvent.setRiskEventName(riskEvent.getRiskEventName());
+ CJReportRiskEvent.setRiskEventId(riskEvent.getId());
+ //封装数据
+ CJEventLists.add(CJReportRiskEvent);
+ //设置原始数据上报状态
+ handlerReportParam.setId(riskEvent.getId());
+ handlerReportParam.setReportTime(new Date());
+ handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ preventRiskEventService.updateEventReportStatus(handlerReportParam);
+ }
+ }else {
+ logger.info("【双重预防】当前无安全风险事件数据需要处理");
+ }
+ //写入昌吉州转换表
+ for (PreventCJReportRiskEvent CJEvent : CJEventLists) {
+ CJEventService.insertEventLists(CJEvent);
+ logger.info("【双重预防】2.风险分析事件CJ：数据处理...");
+ }
+ step = 3;
+ }else {
+ step = 3;
+ logger.info("安全风险事件数据上报已关闭");
+ }
+
+
+ /**
+ * 3、检索安全风险管控措施数据
+ * */
+ //读取安全风险管控措施数据上报主配置信息
+ PreventReportConfig measureReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_MEASURE.getCode());
+ //如果安全风险管控措施主配置开启上报
+ if (measureReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
+ //logger.info("{【##】3.检索安全风险管控措施...");
+
+ //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
+ List<PreventRiskControlMeasure> measures = preventRiskControlMeasureService.listReportMeasure();
+ //获取上报数据list
+ List<PreventCJReportRiskControlMeasure> CJMeasureLists = new ArrayList<>();
+ HandlerReportParam handlerReportParam = new HandlerReportParam();
+
+ if (ObjectUtils.isNotEmpty(measures)){
+ //遍历，封装数据
+ for (PreventRiskControlMeasure measure : measures) {
+ String measureUuid = UUID.randomUUID().toString();
+ //获取上报数据对象
+ PreventCJReportRiskControlMeasure CJReportMeasure = new PreventCJReportRiskControlMeasure();
+ //转换数据
+ PreventRiskControlTemplate controlTemplateById = preventRiskControlTemplateService.getControlTemplateById(measure.getClassify2());
+ String classify2 = measure.getClassify1() + "-" + controlTemplateById.getOrderIndex();
+
+ //封装上报昌吉州管控措施数据
+ CJReportMeasure.setId(measure.getUuid());
+ CJReportMeasure.setCompanyCode(companyCode);
+ if (measure.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
+ CJReportMeasure.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
+ }else {
+ CJReportMeasure.setDeleted("0");
+ }
+ CJReportMeasure.setCreateBy(measure.getCreateByUserName());
+ CJReportMeasure.setCreateDate(measure.getGmtCreate());
+ CJReportMeasure.setUpdateBy(measure.getCreateByUserName());
+ CJReportMeasure.setUpdateDate(measure.getGmtModitify());
+ CJReportMeasure.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ CJReportMeasure.setReportTime(null);
+ CJReportMeasure.setDataSource((byte) 1);
+ CJReportMeasure.setRiskEventId(measure.getRiskEventUuid());
+ CJReportMeasure.setRiskMeasureDesc(measure.getMeasureDesc());
+ CJReportMeasure.setDataSrc(measure.getControlType().toString());
+ CJReportMeasure.setClassify1(measure.getClassify1().toString());
+ CJReportMeasure.setClassify2(classify2);
+ CJReportMeasure.setClassify3(measure.getClassify3());
+ CJReportMeasure.setRiskMeasureId(measure.getId());
+ CJReportMeasure.setTroubleshootContent(measure.getCheckContent());
+
+
+ //封装数据
+ CJMeasureLists.add(CJReportMeasure);
+ //设置原始数据上报状态
+ handlerReportParam.setId(measure.getId());
+ handlerReportParam.setReportTime(new Date());
+ handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ preventRiskControlMeasureService.updateMeasureReportStatus(handlerReportParam);
+ }
+ }else {
+ logger.info("【双重预防】当前无安全风险管控措施数据需要处理");
+ }
+
+ step = 4;
+
+ //写入上报昌吉州转换表
+ for (PreventCJReportRiskControlMeasure CJMeasure : CJMeasureLists) {
+ CJMeasureService.insertMeasureList(CJMeasure);
+
+ logger.info("【双重预防】3.安全风险管控措施CJ：数据处理...");
+ }
+ }else {
+ step = 4;
+ logger.info("安全风险管控措施数据上报已关闭");
+ }
+
+ /**
+ * 4、检索 任务配置 数据 prevent_report_check_record_from_task
+ * */
+ //读取任务配置数据上报主配置信息
+ PreventReportConfig workReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_TASK_FROM_WORK.getCode());
+ //如果任务配置主配置开启上报
+ if (workReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
+ // logger.info("【##】4.检索任务配置...");
+ //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
+ List<PreventRiskJobAndMeasure> works = preventRiskJobAndMeasureService.listReportWork();
+ //获取上报数据对象与list
+ List<PreventCJReportCheckTaskFromWork> CJTaskFromWorkLists = new ArrayList<>();
+ HandlerReportParam handlerReportParam = new HandlerReportParam();
+
+ if (ObjectUtils.isNotEmpty(works)){
+ //遍历，封装数据
+ for (PreventRiskJobAndMeasure work : works) {
+ //通过work中的信息，查询主表数据
+ HiddenDangerCheckJob jobById = trHiddenDangerCheckJobService.getJobById(work.getJobId());
+ //获取数据对象
+ PreventCJReportCheckTaskFromWork CJTaskFromWork = new PreventCJReportCheckTaskFromWork();
+ //转换时间周期单位 (1小时,2日,3周,4月,5年)
+ if (jobById.getTroubleshootTypeCycleType() == 1){
+ CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
+ CJTaskFromWork.setCheckCycleUnit("小时");
+ CJTaskFromWork.setWorkStartTime("00:00:00");
+ CJTaskFromWork.setWorkEndTime("23:59:59");
+ }else if (jobById.getTroubleshootTypeCycleType() == 2){
+ CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
+ CJTaskFromWork.setCheckCycleUnit("天");
+ }else if (jobById.getTroubleshootTypeCycleType() == 3){
+ Long num = jobById.getTroubleshootTypeCycleNum() * 7;
+ CJTaskFromWork.setCheckCycle(Math.toIntExact(num));
+ CJTaskFromWork.setCheckCycleUnit("天");
+ }else if (jobById.getTroubleshootTypeCycleType() == 4){
+ CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
+ CJTaskFromWork.setCheckCycleUnit("月");
+ }else if (jobById.getTroubleshootTypeCycleType() == 5){
+ CJTaskFromWork.setCheckCycle(Math.toIntExact(jobById.getTroubleshootTypeCycleNum()));
+ CJTaskFromWork.setCheckCycleUnit("年");
+ }
+ //获取用户信息
+ User createUser = new User();
+ User updateUser = new User();
+ createUser = trUserService.getUserByLoginName(jobById.getCreateBy());
+ if(ObjectUtils.isEmpty(createUser)){
+ createUser = trUserService.getUserByName(jobById.getCreateBy());
+ }
+
+ updateUser = trUserService.getUserByLoginName(jobById.getUpdateBy());
+ if(ObjectUtils.isEmpty(updateUser)){
+ updateUser = trUserService.getUserByName(jobById.getUpdateBy());
+ }
+
+ //封装上报昌吉州任务配置数据
+ CJTaskFromWork.setId(work.getJobUuid());
+ CJTaskFromWork.setCompanyCode(companyCode);
+ if (work.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
+ CJTaskFromWork.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
+ }else {
+ CJTaskFromWork.setDeleted("0");
+ }
+ CJTaskFromWork.setCreateBy(createUser.getUserName());
+ CJTaskFromWork.setCreateDate(jobById.getCreateTime());
+ if (ObjectUtils.isEmpty(updateUser)){
+ CJTaskFromWork.setUpdateBy(createUser.getUserName());
+ CJTaskFromWork.setUpdateDate(jobById.getCreateTime());
+ }else {
+ CJTaskFromWork.setUpdateBy(updateUser.getUserName());
+ CJTaskFromWork.setUpdateDate(jobById.getCreateTime());
+ }
+ CJTaskFromWork.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ CJTaskFromWork.setReportTime(null);
+ CJTaskFromWork.setDataSource((byte) 1);
+ CJTaskFromWork.setRiskMeasureId(work.getMeasureUuid());
+ CJTaskFromWork.setWorkId(jobById.getJobId());
+
+ //第二版标准新增
+ PreventRiskControlMeasure measureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(work.getMeasureId());
+ CJTaskFromWork.setTroubleshootContent(measureById.getCheckContent());
+ CJTaskFromWork.setTaskStartTime(jobById.getStartTime());
+
+ CJTaskFromWork.setWorkDayType("0");
+ List<PreventTaskType> typeByJobId = taskTypeService.getInfoByJobId(work.getJobId());
+ int typeTag = 0;
+ for (PreventTaskType taskType : typeByJobId) {
+ typeTag = taskType.getType();
+ }
+ if (typeTag !=0){
+ CJTaskFromWork.setTaskNum("1");
+ }
+ CJTaskFromWork.setWorkType(String.valueOf(typeTag));
+
+ //封装数据
+ CJTaskFromWorkLists.add(CJTaskFromWork);
+ //设置原始数据上报状态
+ handlerReportParam.setId(work.getId());
+ handlerReportParam.setReportTime(new Date());
+ handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ preventRiskJobAndMeasureService.updateWorkReportStatus(handlerReportParam);
+ }
+ }else {
+ logger.info("【双重预防】当前无任务配置数据需要处理");
+ }
+ //写入上报昌吉州数据转换表
+ for (PreventCJReportCheckTaskFromWork CJTaskFromWorks : CJTaskFromWorkLists) {
+ CJTaskFromWorkService.insertTaskFromWorkList(CJTaskFromWorks);
+ logger.info("【双重预防】任务配置CJ：数据处理...");
+ }
+ }else {
+ step = 5;
+ logger.info("任务配置数据上报已关闭");
+ }
+
+
+ /**
+ * 5、排查任务记录数据 PreventReportCheckRecordFromTask
+ * */
+ //读取安全风险管控措施数据上报主配置信息
+ PreventReportConfig recordReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG__CHECK_RECORD.getCode());
+ //如果安全风险管控措施主配置开启上报
+ if (recordReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
+
+ //logger.info("【##】5.检索排查任务记录数据...");
+ System.out.println("【##】5.检索排查任务记录数据...");
+
+ //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
+ List<PreventRiskDangerCheckLog> tasks = preventRiskDangerCheckLogService.listReportTask();
+ List<Long> taskIds = new ArrayList<>();
+ //获取上报数据对象
+ List<PreventCJReportCheckRecordFromTask> CJRecordFromTaskLists = new ArrayList<>();
+ int tag = 0;
+// HandlerReportParam handlerReportParam = new HandlerReportParam();
+// List<HandlerReportParam> handlerReportParamList = new ArrayList<>();
+ if (ObjectUtils.isNotEmpty(tasks)){
+ //获取信息
+ List<User> allUserList = trUserService.getAllUser();
+ List<PreventRiskControlMeasure> allMeasureList = preventRiskControlMeasureService.getAllMeasureList();
+ List<PreventTaskType> allTaskTypeList = taskTypeService.getAllTaskTypeList();
+ //遍历，封装数据
+ for (PreventRiskDangerCheckLog task : tasks) {
+ //获取任务记录主表信息
+ HiddenDangerCheck hiddenDangerCheckById = trHiddenDangerCheckService.getHiddenDangerCheckById(task.getCheckId());
+ //转换检查结果
+ //如果已经执行过，进入方法
+ if (Integer.valueOf(hiddenDangerCheckById.getScheduleCheckStatus()) == 1){
+
+ List<HiddenDangerCheckPoint> hiddenDangerCheckPointList = trHiddenDangerCheckPointService.getHiddenDangerCheckPointByCheckId(task.getCheckId());
+
+ //避免个别任务无检查点的情况
+ if (ObjectUtils.isEmpty(hiddenDangerCheckPointList)) {
+ logger.info("【双重预防】排查任务记录CJ：异常，无检查点...");
+ }else {
+ for (HiddenDangerCheckPoint hiddenDangerCheckPoint : hiddenDangerCheckPointList) {
+ //获取上报数据对象
+ PreventCJReportCheckRecordFromTask CJRecordFromTask = new PreventCJReportCheckRecordFromTask();
+ CJRecordFromTask.setCheckStatus("0");// 0-正常；1-存在隐患；2-未处理；3-其他
+ if (Integer.valueOf(hiddenDangerCheckPoint.getWhetherDanger()) == 1){
+ CJRecordFromTask.setCheckStatus("1");// 0-正常；1-存在隐患；2-未处理；3-其他
+ }
+
+ User createUser = new User();
+ User updateUser = new User();
+// createUser = trUserService.getUserByLoginName(hiddenDangerCheckById.getCreateBy());
+// if(ObjectUtils.isEmpty(createUser)){
+// createUser = trUserService.getUserByName(hiddenDangerCheckById.getCreateBy());
+// }
+// updateUser = trUserService.getUserByLoginName(hiddenDangerCheckById.getUpdateBy());
+
+
+ // todo 取出所有用户信息，再循环在匹配
+ for (User user : allUserList) {
+ if (hiddenDangerCheckById.getCreateBy().equals(user.getLoginName())){
+ createUser = user;
+ }
+ if (hiddenDangerCheckById.getUpdateBy().equals(user.getLoginName())){
+ updateUser = user;
+ }
+ }
+ if(ObjectUtils.isEmpty(createUser)){
+ for (User user : allUserList) {
+ if (hiddenDangerCheckById.getCreateBy().equals(user.getUserName())){
+ createUser = user;
+ }
+ }
+ }
+
+
+
+ //封装上报昌吉州的任务数据
+// String taskUuid = UUID.randomUUID().toString();
+ CJRecordFromTask.setId(UUID.randomUUID().toString());
+ CJRecordFromTask.setCompanyCode(companyCode);
+ CJRecordFromTask.setCreateBy(createUser.getUserName());
+ CJRecordFromTask.setCreateDate(hiddenDangerCheckById.getCreateTime());
+ CJRecordFromTask.setCreateByMobile(createUser.getPhonenumber());
+ if (ObjectUtils.isEmpty(updateUser)){
+ CJRecordFromTask.setUpdateBy(createUser.getUserName());
+ CJRecordFromTask.setUpdateDate(hiddenDangerCheckById.getCreateTime());
+ CJRecordFromTask.setUpdateByMobile(createUser.getPhonenumber());
+ }else {
+ CJRecordFromTask.setUpdateBy(updateUser.getUserName());
+ CJRecordFromTask.setUpdateDate(hiddenDangerCheckById.getUpdateTime());
+ CJRecordFromTask.setUpdateByMobile(updateUser.getPhonenumber());
+ }
+
+ if (task.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
+ CJRecordFromTask.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
+ }else {
+ CJRecordFromTask.setDeleted("0");
+ }
+ CJRecordFromTask.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ CJRecordFromTask.setReportTime(null);
+ CJRecordFromTask.setDataSource((byte) 1);
+ List<PreventRiskDangerCheckAndMeasure> baseCheckPointAndMeasure = riskDangerCheckAndMeasureService.getByBaseCheckPointId(hiddenDangerCheckPoint.getCheckPointId());
+ //获取该条记录对应的管控措施id，
+ Long controlMeasureId = 1L;
+ for (PreventRiskDangerCheckAndMeasure checkAndMeasure : baseCheckPointAndMeasure) {
+ controlMeasureId = checkAndMeasure.getControlMeasureId();
+ }
+// //获取该条记录对应的管控措施uuid
+// PreventRiskControlMeasure preventRiskControlMeasureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(controlMeasureId);
+// //通过管控措施uuid ，jobId(workId)，在任务上报表中，找到任务对应的uuid
+// PreventCJReportCheckTaskFromWork preventCJReportCheckTaskFromWork = CJTaskFromWorkService.geByMeasureUUidAndJobId(preventRiskControlMeasureById.getUuid(), task.getJobId());
+// CJRecordFromTask.setCheckTaskId(preventCJReportCheckTaskFromWork.getId());
+ // todo 取出所有措施，再循环在匹配
+ for (PreventRiskControlMeasure measure : allMeasureList) {
+ if (controlMeasureId.equals(measure.getId())){
+ //通过管控措施uuid ，jobId(workId)，在任务上报表中，找到任务对应的uuid
+ PreventCJReportCheckTaskFromWork preventCJReportCheckTaskFromWork = CJTaskFromWorkService.geByMeasureUUidAndJobId(measure.getUuid(), task.getJobId());
+ CJRecordFromTask.setCheckTaskId(preventCJReportCheckTaskFromWork.getId());
+ }
+ }
+
+
+ CJRecordFromTask.setCheckTime(hiddenDangerCheckById.getCheckTime());
+ CJRecordFromTask.setTaskId(task.getCheckId());
+ //第二版标准新增
+ CJRecordFromTask.setMobileCode(task.getMobileCode().toString());
+
+ int typeTag = 0;
+// List<PreventTaskType> typeByJobIds = taskTypeService.getInfoByJobId(task.getJobId());
+// for (PreventTaskType typeByJobId : typeByJobIds) {
+// if (typeByJobId.getType()!= 0) {
+// typeTag = 1;
+// }
+// }
+
+ // todo 取出所有任务信息表，再循环在匹配
+ for (PreventTaskType taskType : allTaskTypeList) {
+ if (taskType.getJobId().equals(task.getJobId())){
+ if (taskType.getType()!= 0) {
+ typeTag = 1;
+ }
+ }
+ }
+
+
+ CJRecordFromTask.setDefend(String.valueOf(typeTag));
+ //封装数据
+ CJRecordFromTaskLists.add(CJRecordFromTask);
+ }
+ }
+
+ //设置原始数据上报状态
+// handlerReportParam.setId(task.getId());
+// handlerReportParam.setReportTime(new Date());
+// handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+// handlerReportParamList.add(handlerReportParam);
+// preventRiskDangerCheckLogService.updateTaskReportStatus(handlerReportParam);
+ int i = 1;
+ taskIds.add(task.getId());
+ tag ++;
+ }
+ System.out.println("【##】5.数据封装完成...");
+
+ }
+ }else {
+ logger.info("【双重预防】当前无排查任务记录需要处理");
+ }
+
+ if (CJRecordFromTaskLists.size() > 0){
+ logger.info("【双重预防】排查任务记录CJ：数据处理...");
+ //设置原始数据状态
+ int taskUpdateResult = preventRiskDangerCheckLogService.updateTaskReportStatusByList(taskIds);
+ if (taskUpdateResult < taskIds.size()){
+ throw new AusinessException(E.ADD_FAIL.getCode(), "排查任务记录原始数据更新失败, 取消操作");
+ }
+ int result = CJTaskRecordService.insertRecordList(CJRecordFromTaskLists);
+ if (result < CJRecordFromTaskLists.size()){
+ throw new AusinessException(E.ADD_FAIL.getCode(), "排查任务记录插入失败, 取消操作");
+ }
+ }
+ step = 6;
+ }else {
+ step = 6;
+ logger.info("排查任务记录数据上报已关闭");
+ }
+
+
+ /**
+ * 6、隐患信息数据
+ * */
+ //读取安全风险管控措施数据上报主配置信息
+ PreventReportConfig dangerReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());
+ //如果安全风险管控措施主配置开启上报
+ if (dangerReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
+
+ //logger.info("【##】6.检索隐患数据...");
+
+ //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
+ List<PreventRiskDangerInfo> dangerManages = preventRiskDangerInfoService.listReportDanger();
+ //获取上报数据list
+ List<PreventCJReportDangerInfo> CJDangerInfoLists = new ArrayList<>();
+
+ if (ObjectUtils.isNotEmpty(dangerManages)){
+ HandlerReportParam handlerReportParam = new HandlerReportParam();
+ //遍历，封装数据
+ for (PreventRiskDangerInfo dangerManage : dangerManages) {
+
+ //获取隐患信息主表信息
+ HiddenDangerCheckPoint hiddenDanger = trHiddenDangerCheckPointService.getHiddenDangerCheckPointById(dangerManage.getDangerCheckPointId());
+ //获取上报数据对象
+ PreventCJReportDangerInfo CJDangerInfo = new PreventCJReportDangerInfo();
+
+ //通过用户名，获取涉及到的各位用户的真实姓名
+ User createUser = new User();
+ createUser = trUserService.getUserByLoginName(hiddenDanger.getCreateBy());
+// createUser = trUserService.getUserByLoginName("guotai");
+ if(ObjectUtils.isEmpty(createUser)){
+ createUser = trUserService.getUserByName(hiddenDanger.getCreateBy());
+ }
+ User updateUser = trUserService.getUserByLoginName(hiddenDanger.getUpdateBy());
+// User updateUser = trUserService.getUserByLoginName("guotai");
+ if (ObjectUtils.isNotEmpty(hiddenDanger.getRegisterUserName())){
+ User registerUser = trUserService.getUserByLoginName(hiddenDanger.getRegisterUserName());
+ //登记人信息
+ CJDangerInfo.setRegistrant(registerUser.getUserName());//登记人
+ CJDangerInfo.setRegistTime(hiddenDanger.getRegisterCreateTime());//登记时间
+ }
+
+ CJDangerInfo.setCost(String.valueOf(0));//初始值给0
+ if (ObjectUtils.isNotEmpty(hiddenDanger.getRectifyUserName())){
+ User rectifyUser = trUserService.getUserByLoginName(hiddenDanger.getRectifyUserName());
+ //整改人信息
+ CJDangerInfo.setLiablePerson(rectifyUser.getUserName());//整改责任人
+ CJDangerInfo.setCost(hiddenDanger.getRectifyFund());//资金
+ }
+
+ if (ObjectUtils.isNotEmpty(hiddenDanger.getAcceptUserName())){
+ //验收人信息
+ CJDangerInfo.setCheckAcceptPerson(hiddenDanger.getAcceptUserName());//验收人
+ CJDangerInfo.setCheckAcceptComment(hiddenDanger.getAcceptOpinion());//验收情况
+ CJDangerInfo.setCheckAcceptTime(hiddenDanger.getAcceptCreateTime());//验收时间
+ }
+
+ //如果排查任务正常存在，封装任务相关数据
+// if (Integer.parseInt(hiddenDanger.getDangerSources()) != 2){
+// HiddenDangerCheck dangerCheckById = trHiddenDangerCheckService.getHiddenDangerCheckById(hiddenDanger.getCheckId());
+//
+// PreventRiskDangerCheckLog dangerCheckLogByCheckId = preventRiskDangerCheckLogService.getByDangerCheckByCheckId(hiddenDanger.getCheckId());
+// CJDangerInfo.setCheckRecordId(dangerCheckLogByCheckId.getUuid());//隐患排查任务记录uuid
+// //找排查点，然后查措施
+// PreventRiskCheckUnit unit = preventRiskCheckUnitService.getUnitByBaseCheckPointId(hiddenDanger.getCheckPointId());
+// //查管控措施
+// PreventRiskControlMeasure controlMeasureById = preventRiskControlMeasureService.getPreventRiskControlMeasureById(unit.getControlMeasureId());
+// CJDangerInfo.setRiskMeasureId(controlMeasureById.getUuid());//管控措施uuid
+// CJDangerInfo.setControlMeasures(controlMeasureById.getCheckContent());//控制措施 ,整改措施
+// }else {
+// CJDangerInfo.setCheckRecordId(null);
+// CJDangerInfo.setRiskMeasureId(null);
+// }
+ CJDangerInfo.setCheckRecordId(null);
+ CJDangerInfo.setRiskMeasureId(null);//默认无任务
+ CJDangerInfo.setDeleted("0");
+ CJDangerInfo.setId(dangerManage.getUuid());
+ CJDangerInfo.setCompanyCode(companyCode);
+ CJDangerInfo.setHazardCode(dangerManage.getHazardCode());
+ CJDangerInfo.setCreateBy(createUser.getUserName());
+ CJDangerInfo.setCreateDate(hiddenDanger.getCreateTime());
+
+ if (ObjectUtils.isEmpty(updateUser)){
+ CJDangerInfo.setUpdateBy(createUser.getUserName());
+ CJDangerInfo.setUpdateDate(hiddenDanger.getCreateTime());
+ }else {
+ CJDangerInfo.setUpdateBy(updateUser.getUserName());
+ CJDangerInfo.setUpdateDate(hiddenDanger.getUpdateTime());
+ }
+ // todo 2024-07-01 需要检查
+ CJDangerInfo.setHazardCategory("0");
+ if (dangerManage.getId() <= 383){
+ PreventTaskType taskTypeInfo = taskTypeService.getInfoByTaskId(dangerManage.getId());
+ int i = 1;
+ CJDangerInfo.setHazardCategory(taskTypeInfo.getType().toString());
+ }
+ CJDangerInfo.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ CJDangerInfo.setReportTime(null);
+ CJDangerInfo.setDataSource((byte) 1);
+ CJDangerInfo.setDangerName(hiddenDanger.getDangerName());
+ CJDangerInfo.setDangerLevel(hiddenDanger.getDangerLevel());
+ CJDangerInfo.setDangerSrc(dangerManage.getDangerSrc().toString());
+ if (hiddenDanger.getRectifyType().equals("1")){
+ CJDangerInfo.setDangerManageType("0");
+ }else {
+ CJDangerInfo.setDangerManageType("1");
+ }
+ CJDangerInfo.setDangerDesc(hiddenDanger.getDangerDescription());
+ CJDangerInfo.setDangerReason(dangerManage.getDangerReason());
+ CJDangerInfo.setDangerManageDeadline(hiddenDanger.getRectifyDeadlineTime());
+ if (ObjectUtils.isNotEmpty(dangerManage.getDangerState())){
+ CJDangerInfo.setDangerState(dangerManage.getDangerState().toString());
+ }
+ CJDangerInfo.setHazardDangerType(dangerManage.getHazardDangerType().toString());
+ CJDangerInfo.setDangerManagerId(dangerManage.getId());
+
+ CJDangerInfoLists.add(CJDangerInfo);
+ //设置原始数据上报状态
+ handlerReportParam.setId(dangerManage.getId());
+ handlerReportParam.setReportTime(new Date());
+ handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ //修改隐患信息附属表状态
+ preventRiskDangerInfoService.updateDangerInfoReportStatus(handlerReportParam);
+ }
+ }else {
+ logger.info("【双重预防】当前无隐患信息需要处理");
+ }
+
+ //插入上报昌吉州转换表
+ for (PreventCJReportDangerInfo CJDanger : CJDangerInfoLists) {
+ logger.info("【双重预防】隐患信息插入...");
+ int result = CJDangerInfoService.insert(CJDanger);
+ if (result < 0){
+ throw new AusinessException(E.ADD_FAIL.getCode(), "隐患信息插入失败");
+ }
+ logger.info("【双重预防】隐患信息：数据处理...");
+ }
+ }else {
+ logger.info("隐患信息数据上报已关闭");
+ }
+
+
+
+
+// /**
+// * 7、检索检修记录数据
+// * */
+// //读取风险分析单元数据上报主配置信息
+// PreventReportConfig overhaulReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.OVERHAUL_LOG_DANGER_INFO.getCode());
+// //如果风险事件主配置开启上报
+// if (overhaulReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
+//
+// //logger.info("【##】2.检索检修记录...");
+// //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
+// List<PreventOverhaulLog> preventOverhaulLogList = overhaulLogService.listReportOverhaulLog();
+// //获取上报数据对象与list
+// List<PreventCJReportOverhaulLog> CJOverhaulLogLists = new ArrayList<>();
+// if (ObjectUtils.isNotEmpty(preventOverhaulLogList)){
+// //遍历，封装数据
+// for (PreventOverhaulLog preventOverhaulLog : preventOverhaulLogList) {
+// HandlerReportParam handlerReportParam = new HandlerReportParam();
+// PreventCJReportOverhaulLog CJOverhaulLog = new PreventCJReportOverhaulLog();
+//
+// //封装上报昌吉州检修记录数据
+// CJOverhaulLog.setId(preventOverhaulLog.getUuid());
+// if (preventOverhaulLog.getReportStatus().equals(SyncEnum.SYNC_EXEC_SUCCESS.getCode())){
+// CJOverhaulLog.setDeleted("2");//数据更新状态标识，目前仅昌吉州需要 2022-08-10
+// }else {
+// CJOverhaulLog.setDeleted("0");
+// }
+// CJOverhaulLog.setCompanyCode(companyCode);
+// CJOverhaulLog.setHazardCode(preventOverhaulLog.getHazardCode());
+// CJOverhaulLog.setRiskUnitId(preventOverhaulLog.getRiskUnitUuid());
+// CJOverhaulLog.setStopStartTime(preventOverhaulLog.getStopStartTime());
+// CJOverhaulLog.setStopEndTime(preventOverhaulLog.getStopEndTime());
+// CJOverhaulLog.setStopReason(preventOverhaulLog.getStopReason());
+// CJOverhaulLog.setCreateBy(preventOverhaulLog.getCreateByUserName());
+// CJOverhaulLog.setCreateDate(preventOverhaulLog.getGmtCreate());
+// CJOverhaulLog.setUpdateBy(preventOverhaulLog.getCreateByUserName());
+// CJOverhaulLog.setUpdateDate(preventOverhaulLog.getGmtModitify());
+// CJOverhaulLog.setReportTime(null);
+// CJOverhaulLog.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+// CJOverhaulLog.setDataSource((byte) 1);
+//
+// //封装数据
+// CJOverhaulLogLists.add(CJOverhaulLog);
+// //设置原始数据上报状态
+// handlerReportParam.setId(preventOverhaulLog.getId());
+// handlerReportParam.setReportTime(new Date());
+// handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+// int result = overhaulLogService.updateOverhaulReportStatus(handlerReportParam);
+// if (result < 1){
+// throw new AusinessException(E.ADD_FAIL.getCode(), "检修记录数据状态修改失败");
+// }
+// }
+// }else {
+// logger.info("【检修记录】当前无检修记录数据需要处理");
+// }
+// //写入昌吉州转换表
+// for (PreventCJReportOverhaulLog cjOverhaulLog : CJOverhaulLogLists) {
+// int result = reportOverhaulLogService.insertCJOverhaulLists(cjOverhaulLog);
+// if (result < 1){
+// throw new AusinessException(E.ADD_FAIL.getCode(), "检修记录数据状态修改失败");
+// }
+// logger.info("【检修记录】2.检修记录CJ：数据处理...");
+// }
+// step = 3;
+// }else {
+// step = 3;
+// logger.info("检修记录数据上报已关闭");
+// }
+//
+
+
+
+
+
+
+
+
+// TODO 目前应急厅没有风险点概念，此处暂时不写。目前看，风险点概念，类似管控措施，对用某个具体的风险位置
+// /**
+// * 7、检索风险点-（可能对应风险管控措施?）数据
+// * */
+// //读取风险分析单元数据上报主配置信息
+// PreventReportConfig pointReportConfig = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_POINT_INFO.getCode());
+// //如果风险事件主配置开启上报
+// if (pointReportConfig.getReportState().equals(SyncEnum.REPORT_ON.getCode())){
+// //logger.info("【##】2.检索安全风险事件...");
+// //查询所有 选择上报的数据 && (reportTime == null 或者 reportTime < updateReportDataTime）
+// List<PreventRiskEvent> riskEvents = preventRiskEventService.listReportEvent();
+// //获取上报数据对象与list
+// List<PreventCJReportPoint> CJPointLists = new ArrayList<>();
+// if (ObjectUtils.isNotEmpty(riskEvents)){
+// //遍历，封装数据
+// for (PreventRiskEvent riskEvent : riskEvents) {
+// String pointUuid = UUID.randomUUID().toString();
+// HandlerReportParam handlerReportParam = new HandlerReportParam();
+// PreventCJReportPoint CJReportPoint = new PreventCJReportPoint();
+// //TODO 公司编码，暂时没有
+// //封装上报昌吉州风险事件数据
+// CJReportPoint.setId(pointUuid);
+// CJReportPoint.setCompanyCode("test001");
+// CJReportPoint.setDeleted(riskEvent.getDeleteStatus().toString());
+// CJReportPoint.setCreateBy(riskEvent.getCreateByUserName());
+// CJReportPoint.setCreateDate(riskEvent.getGmtCreate());
+// CJReportPoint.setUpdateBy(riskEvent.getCreateByUserName());
+// CJReportPoint.setUpdateDate(riskEvent.getGmtModitify());
+// CJReportPoint.setRiskUnitIds();
+// CJReportPoint.setRiskEventIds();
+// CJReportPoint.setRiskMeasureIds();
+// CJReportPoint.setHazardDep();
+// CJReportPoint.setHazardLiablePerson();
+// CJReportPoint.setHazardCode();
+// CJReportPoint.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+// CJReportPoint.setReportTime(null);
+// CJReportPoint.setDataSource((byte) 1);
+// CJReportPoint.setRiskEventId(riskEvent.getId());
+// //封装数据
+// CJPointLists.add(CJReportPoint);
+// //设置原始数据上报状态
+// handlerReportParam.setId(riskEvent.getId());
+// handlerReportParam.setReportTime(new Date());
+// handlerReportParam.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+// preventRiskEventService.updateEventReportStatus(handlerReportParam);
+// }
+// }else {
+// logger.info("【##】当前无安全风险事件数据需要处理");
+// }
+// //写入昌吉州转换表
+// for (PreventCJReportRiskEvent CJEvent : CJEventLists) {
+// CJEventService.insertEventLists(CJEvent);
+// logger.info("【##】2.风险分析事件CJ：数据处理...");
+// }
+// step = 3;
+// }else {
+// step = 3;
+// logger.info("安全风险事件数据上报已关闭");
+// }
+
+
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/RiskService.java b/src/main/java/com/ruoyi/doublePrevention/service/RiskService.java
index d7ba8bb..063523d 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/RiskService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/RiskService.java
@@ -1,184 +1,184 @@
-package com.ruoyi.doublePrevention.service;
-
-import com.ruoyi.doublePrevention.entity.*;
-import com.ruoyi.doublePrevention.entity.dto.req.*;
-import com.ruoyi.doublePrevention.entity.dto.resp.*;
-import com.ruoyi.doublePrevention.repository.param.PreventPointAndMeasureParams;
-import com.ruoyi.doublePrevention.vo.ResultVO;
-import com.ruoyi.project.tr.HiddenDangerCheckJob.domain.HiddenDangerCheckJob;
-import com.ruoyi.project.tr.hiddenDangerCheck.domain.HiddenDangerCheck;
-import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
-
-import java.util.List;
-
-public interface RiskService {
- /**
- * 为设施设备清单附属表添加uuid
- * */
- int insertRiskUnitUuid(Long id);
- /**
- * 修改风险清单附属表
- */
- int updateRiskUnit(Long riskListId);
- /**
- * 删除附属表信息
- */
- int deleteRiskUnit(String ids);
- /**
- * 风险事件-新增
- */
- ResultVO<PreventRiskEvent> saveRiskEvent(PreventRiskEventSaveReqDTO riskEventSaveReqDTO);
-
- /**
- * @description 风险事件-删除
- */
- ResultVO<PreventRiskEvent> deleteRiskEvent(PreventRiskEventDeleteReqDTO riskEventDeleteReqDTO);
-
- /**
- * 风险事件-修改
- */
- ResultVO<PreventRiskEvent> updateRiskEvent(PreventRiskEventUpdateReqDTO riskEventUpdateReqDTO);
-
- /**
- * @description 根据风险事件的id查询风险事件
- */
- ResultVO<PreventRiskEventRespDTO> getRiskEventById(PreventRiskEventGetReqDTO riskEventGetReqDTO);
-
- /**
- * 风险事件-分页查询
- */
- ResultVO<List<PreventRiskEventPageQueryRespDTO>> listRiskEventPage(PreventRiskEventPageQueryReqDTO riskEventQueryReqDTO);
-
- /**
- * @description 获取所有风险事件不分页
- */
- ResultVO<List<PreventRiskEventListQueryRespDTO>> listRiskEvent();
-
- /**
- * @description 新增管控措施
- */
- ResultVO<PreventRiskControlMeasure> saveRiskControlMeasure(PreventRiskControlMeasureSaveReqDTO measureSaveReqDTO);
-
- /**
- * 管控措施- 获取管控措施模板
- */
- ResultVO<List<PreventRiskMeasureTemplatesListQueryRespDTO>> listMeasureTemplates();
-
- /**
- * 管控措施-删除
- */
- ResultVO<PreventRiskControlMeasure> deleteRiskControlMeasure(PreventRiskControlMeasureDeleteReqDTO measureDeleteReqDTO);
-
- /**
- * @description 根据风险措施id查询风险措施
- */
- ResultVO<PreventRiskControlMeasureRespDTO> getRiskControlMeasure(PreventRiskControlMeasureGetReqDTO riskControlMeasureGetReqDTO);
-
- /**
- * 管控措施-修改
- */
- ResultVO<PreventRiskControlMeasure> updateRiskControlMeasure(PreventRiskControlMeasureUpdateReqDTO measureUpdateReqDTO);
-
- /**
- * 管控措施-分页查询
- */
- ResultVO<List<PreventRiskControlMeasurePageQueryRespDTO>> getRiskControlMeasurePage(PreventRiskControlMeasureQueryReqDTO measureQueryReqDTO);
- /**
- * 查询管控措施 by 基础排查清单ID
- */
- List<PreventRiskControlMeasure> getRiskControlMeasureByRiskId(Long riskListId);
- /**
- * 保存原检查点与管控措施的对应关系
- */
- int insertPointAndMeasure(PreventPointAndMeasureParams pointAndMeasureParams);
- /**
- * 删除原检查点与管控措施的对应关系
- */
- int deletePointAndMeasure(String ids);
- /**
- * 保存job管控措施的附属表
- */
- int insertJobAndMeasure(Long jobId, HiddenDangerCheckJob hiddenDangerCheckJob);
- /**
- * 修改job管控措施的附属表
- */
- int updateJobAndMeasure(HiddenDangerCheckJob hiddenDangerCheckJob);
- /**
- * 删除job管控措施的附属表
- */
- int deleteJobAndMeasure(String ids);
- /**
- * 查询Job与措施
- */
- PreventRiskJobAndMeasure getJobAndMeasure(Long jobId);
- /**
- * 定时生成排查任务记录时，
- * 插入排查记录附属表
- */
- int insertDangerCheckLog(Long checkId, HiddenDangerCheck hdc);
- /**
- * 定时生成排查任务记录时，
- * 插入检查点附属表
- */
- int insertCheckAndMeasure(Long id, HiddenDangerCheckPoint hdcp);
- /**
- * 删除定时核查任务
- * */
- int deleteDangerCheck(String ids);
-
- /**
- * 新增隐患上报
- * */
- int insertDangerInfo(Long id, HiddenDangerCheckPoint hdcp);
- /**
- * 修改隐患上报
- * */
- int updateDangerInfo(HiddenDangerCheckPoint hiddenDangerCheckPoint);
- /**
- * 删除隐患上报
- */
- int deleteDangerInfo(Long id);
-
- /**
- * 隐患判定，如果是隐患，修改为整改中
- */
- int updateDangerInfoJudge(HiddenDangerCheckPoint hiddenDangerCheckPoint);
- /**
- * 隐患整改信息 - 修改
- */
- int updateDangerInfoRectify(HiddenDangerCheckPoint hiddenDangerCheckPoint);
- /**
- * 隐患验收 - 保存验收信息
- */
- int updateDangerInfoAccept(HiddenDangerCheckPoint hiddenDangerCheckPoint);
-// /**
-// * 全流程隐患上报-附属表信息插入
-// * */
-// int insertAllDangerInfo(Long id, HiddenDangerCheckPoint hdcp);
-
- /**
- * @description 获取所有的风险分析单元的编码和姓名
- */
- List<PreventRiskUnitCodeAndNameListQueryRespDTO> listRiskUnitCodeAndName();
-
- /**
- * 管控措施-不分页查询
- */
- ResultVO<List<PreventRiskControlMeasureListQueryRespDTO>> listRiskControlMeasure();
- /**
- * 通过排查点，查找管控措施id
- */
- PreventRiskCheckUnit getRiskControlMeasureByCheckPointId(Long checkPointId);
- /**
- * 查询管控措施信息
- */
- PreventRiskControlMeasure getRiskControlMeasureInfo(Long checkPointId);
- /**
- * 查询隐患附属表信息
- */
- PreventRiskDangerInfo getDangerInfoById(Long id);
-
- int updateCheckLog(Long checkId, HiddenDangerCheckPoint hdcp);
-
- PreventRiskDangerInfo getDangerInfoByDangerCheckPointId(Long checkId);
-}
+package com.ruoyi.doublePrevention.service;
+
+import com.ruoyi.doublePrevention.entity.*;
+import com.ruoyi.doublePrevention.entity.dto.req.*;
+import com.ruoyi.doublePrevention.entity.dto.resp.*;
+import com.ruoyi.doublePrevention.repository.param.PreventPointAndMeasureParams;
+import com.ruoyi.doublePrevention.vo.ResultVO;
+import com.ruoyi.project.tr.HiddenDangerCheckJob.domain.HiddenDangerCheckJob;
+import com.ruoyi.project.tr.hiddenDangerCheck.domain.HiddenDangerCheck;
+import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
+
+import java.util.List;
+
+public interface RiskService {
+ /**
+ * 为设施设备清单附属表添加uuid
+ * */
+ int insertRiskUnitUuid(Long id);
+ /**
+ * 修改风险清单附属表
+ */
+ int updateRiskUnit(Long riskListId);
+ /**
+ * 删除附属表信息
+ */
+ int deleteRiskUnit(String ids);
+ /**
+ * 风险事件-新增
+ */
+ ResultVO<PreventRiskEvent> saveRiskEvent(PreventRiskEventSaveReqDTO riskEventSaveReqDTO);
+
+ /**
+ * @description 风险事件-删除
+ */
+ ResultVO<PreventRiskEvent> deleteRiskEvent(PreventRiskEventDeleteReqDTO riskEventDeleteReqDTO);
+
+ /**
+ * 风险事件-修改
+ */
+ ResultVO<PreventRiskEvent> updateRiskEvent(PreventRiskEventUpdateReqDTO riskEventUpdateReqDTO);
+
+ /**
+ * @description 根据风险事件的id查询风险事件
+ */
+ ResultVO<PreventRiskEventRespDTO> getRiskEventById(PreventRiskEventGetReqDTO riskEventGetReqDTO);
+
+ /**
+ * 风险事件-分页查询
+ */
+ ResultVO<List<PreventRiskEventPageQueryRespDTO>> listRiskEventPage(PreventRiskEventPageQueryReqDTO riskEventQueryReqDTO);
+
+ /**
+ * @description 获取所有风险事件不分页
+ */
+ ResultVO<List<PreventRiskEventListQueryRespDTO>> listRiskEvent();
+
+ /**
+ * @description 新增管控措施
+ */
+ ResultVO<PreventRiskControlMeasure> saveRiskControlMeasure(PreventRiskControlMeasureSaveReqDTO measureSaveReqDTO);
+
+ /**
+ * 管控措施- 获取管控措施模板
+ */
+ ResultVO<List<PreventRiskMeasureTemplatesListQueryRespDTO>> listMeasureTemplates();
+
+ /**
+ * 管控措施-删除
+ */
+ ResultVO<PreventRiskControlMeasure> deleteRiskControlMeasure(PreventRiskControlMeasureDeleteReqDTO measureDeleteReqDTO);
+
+ /**
+ * @description 根据风险措施id查询风险措施
+ */
+ ResultVO<PreventRiskControlMeasureRespDTO> getRiskControlMeasure(PreventRiskControlMeasureGetReqDTO riskControlMeasureGetReqDTO);
+
+ /**
+ * 管控措施-修改
+ */
+ ResultVO<PreventRiskControlMeasure> updateRiskControlMeasure(PreventRiskControlMeasureUpdateReqDTO measureUpdateReqDTO);
+
+ /**
+ * 管控措施-分页查询
+ */
+ ResultVO<List<PreventRiskControlMeasurePageQueryRespDTO>> getRiskControlMeasurePage(PreventRiskControlMeasureQueryReqDTO measureQueryReqDTO);
+ /**
+ * 查询管控措施 by 基础排查清单ID
+ */
+ List<PreventRiskControlMeasure> getRiskControlMeasureByRiskId(Long riskListId);
+ /**
+ * 保存原检查点与管控措施的对应关系
+ */
+ int insertPointAndMeasure(PreventPointAndMeasureParams pointAndMeasureParams);
+ /**
+ * 删除原检查点与管控措施的对应关系
+ */
+ int deletePointAndMeasure(String ids);
+ /**
+ * 保存job管控措施的附属表
+ */
+ int insertJobAndMeasure(Long jobId, HiddenDangerCheckJob hiddenDangerCheckJob);
+ /**
+ * 修改job管控措施的附属表
+ */
+ int updateJobAndMeasure(HiddenDangerCheckJob hiddenDangerCheckJob);
+ /**
+ * 删除job管控措施的附属表
+ */
+ int deleteJobAndMeasure(String ids);
+ /**
+ * 查询Job与措施
+ */
+ PreventRiskJobAndMeasure getJobAndMeasure(Long jobId);
+ /**
+ * 定时生成排查任务记录时，
+ * 插入排查记录附属表
+ */
+ int insertDangerCheckLog(Long checkId, HiddenDangerCheck hdc);
+ /**
+ * 定时生成排查任务记录时，
+ * 插入检查点附属表
+ */
+ int insertCheckAndMeasure(Long id, HiddenDangerCheckPoint hdcp);
+ /**
+ * 删除定时核查任务
+ * */
+ int deleteDangerCheck(String ids);
+
+ /**
+ * 新增隐患上报
+ * */
+ int insertDangerInfo(Long id, HiddenDangerCheckPoint hdcp);
+ /**
+ * 修改隐患上报
+ * */
+ int updateDangerInfo(HiddenDangerCheckPoint hiddenDangerCheckPoint);
+ /**
+ * 删除隐患上报
+ */
+ int deleteDangerInfo(Long id);
+
+ /**
+ * 隐患判定，如果是隐患，修改为整改中
+ */
+ int updateDangerInfoJudge(HiddenDangerCheckPoint hiddenDangerCheckPoint);
+ /**
+ * 隐患整改信息 - 修改
+ */
+ int updateDangerInfoRectify(HiddenDangerCheckPoint hiddenDangerCheckPoint);
+ /**
+ * 隐患验收 - 保存验收信息
+ */
+ int updateDangerInfoAccept(HiddenDangerCheckPoint hiddenDangerCheckPoint);
+// /**
+// * 全流程隐患上报-附属表信息插入
+// * */
+// int insertAllDangerInfo(Long id, HiddenDangerCheckPoint hdcp);
+
+ /**
+ * @description 获取所有的风险分析单元的编码和姓名
+ */
+ List<PreventRiskUnitCodeAndNameListQueryRespDTO> listRiskUnitCodeAndName();
+
+ /**
+ * 管控措施-不分页查询
+ */
+ ResultVO<List<PreventRiskControlMeasureListQueryRespDTO>> listRiskControlMeasure();
+ /**
+ * 通过排查点，查找管控措施id
+ */
+ PreventRiskCheckUnit getRiskControlMeasureByCheckPointId(Long checkPointId);
+ /**
+ * 查询管控措施信息
+ */
+ PreventRiskControlMeasure getRiskControlMeasureInfo(Long checkPointId);
+ /**
+ * 查询隐患附属表信息
+ */
+ PreventRiskDangerInfo getDangerInfoById(Long id);
+
+ int updateCheckLog(Long checkId, HiddenDangerCheckPoint hdcp);
+
+ PreventRiskDangerInfo getDangerInfoByDangerCheckPointId(Long checkId);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportCheckRecordFromTaskService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportCheckRecordFromTaskService.java
index 14ced1e..592898b 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportCheckRecordFromTaskService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportCheckRecordFromTaskService.java
@@ -1,38 +1,38 @@
-package com.ruoyi.doublePrevention.service.baseService;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckRecordFromTask;
-import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-import io.lettuce.core.dynamic.annotation.Param;
-
-import java.util.List;
-
-public interface PreventCJReportCheckRecordFromTaskService extends IService<PreventCJReportCheckRecordFromTask> {
- /**
- * 插入任务记录
- * */
- int insert(PreventCJReportCheckRecordFromTask recordFromTasks);
- /**
- * 插入任务记录
- * */
- int insertRecordList(@Param(value="list") List<PreventCJReportCheckRecordFromTask> recordFromTaskList);
-// /**
-// * 任务记录-分页查询
-// * */
-// IPage<PreventCJReportCheckRecordFromTask> getReportTaskFromWorkPage(Page<Object> objectPage, PreventReportCheckRecordFromTaskReqDTO queryReqDTO);
- /**
- * 任务-查询待上报
- * */
- List<PreventCJReportCheckRecordFromTask> listReportTaskRecordDate();
- /**PreventReportBatchService
- * 任务-待上报状态变更
- * */
- void updateTaskReportStatus(HandlerReportParam handlerReportParam);
- /**
- * 任务-待上报状态变更 - 通过id
- * */
- void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
-
- void updateCJReportStatusBatchById(List<PreventCJReportCheckRecordFromTask> cjRecordFromTasks);
-}
+package com.ruoyi.doublePrevention.service.baseService;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckRecordFromTask;
+import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import io.lettuce.core.dynamic.annotation.Param;
+
+import java.util.List;
+
+public interface PreventCJReportCheckRecordFromTaskService extends IService<PreventCJReportCheckRecordFromTask> {
+ /**
+ * 插入任务记录
+ * */
+ int insert(PreventCJReportCheckRecordFromTask recordFromTasks);
+ /**
+ * 插入任务记录
+ * */
+ int insertRecordList(@Param(value="list") List<PreventCJReportCheckRecordFromTask> recordFromTaskList);
+// /**
+// * 任务记录-分页查询
+// * */
+// IPage<PreventCJReportCheckRecordFromTask> getReportTaskFromWorkPage(Page<Object> objectPage, PreventReportCheckRecordFromTaskReqDTO queryReqDTO);
+ /**
+ * 任务-查询待上报
+ * */
+ List<PreventCJReportCheckRecordFromTask> listReportTaskRecordDate();
+ /**PreventReportBatchService
+ * 任务-待上报状态变更
+ * */
+ void updateTaskReportStatus(HandlerReportParam handlerReportParam);
+ /**
+ * 任务-待上报状态变更 - 通过id
+ * */
+ void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
+
+ void updateCJReportStatusBatchById(List<PreventCJReportCheckRecordFromTask> cjRecordFromTasks);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportCheckTaskFromWorkService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportCheckTaskFromWorkService.java
index 63574a3..bb6e13a 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportCheckTaskFromWorkService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportCheckTaskFromWorkService.java
@@ -1,42 +1,42 @@
-package com.ruoyi.doublePrevention.service.baseService;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckTaskFromWork;
-import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-
-import java.util.List;
-
-public interface PreventCJReportCheckTaskFromWorkService extends IService<PreventCJReportCheckTaskFromWork> {
-
-// /**
-// * 上报数据-任务配置-分页查询
-// */
-// IPage<PreventCJReportCheckTaskFromWork> getReportTaskFromWorkPage(Page<Object> objectPage, PreventReportCheckTaskFromWorkReqDTO queryReqDTO);
- /**
- * 插入数据
- * */
- int insertTaskFromWorkList(PreventCJReportCheckTaskFromWork taskFromWorkList);
- /**
- * 任务配置 -查询待上报
- * */
- List<PreventCJReportCheckTaskFromWork> listReportTaskFromWorkDate();
- /**
- * 任务配置 -待上报状态变更
- * */
- void updateWorkReportStatus(HandlerReportParam handlerReportParam);
- /**
- * 任务配置 -待上报状态变更 -通过id
- * */
- void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
-
- PreventCJReportCheckTaskFromWork geByMeasureUUidAndJobId(String uuid, Long jobId);
-
- List<PreventCJReportCheckTaskFromWork> listWork();
-
- int updateInfo(PreventCJReportCheckTaskFromWork work);
-
- List<PreventCJReportCheckTaskFromWork> listWork1();
-
- int updateInfo1(PreventCJReportCheckTaskFromWork work);
-}
+package com.ruoyi.doublePrevention.service.baseService;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckTaskFromWork;
+import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+
+import java.util.List;
+
+public interface PreventCJReportCheckTaskFromWorkService extends IService<PreventCJReportCheckTaskFromWork> {
+
+// /**
+// * 上报数据-任务配置-分页查询
+// */
+// IPage<PreventCJReportCheckTaskFromWork> getReportTaskFromWorkPage(Page<Object> objectPage, PreventReportCheckTaskFromWorkReqDTO queryReqDTO);
+ /**
+ * 插入数据
+ * */
+ int insertTaskFromWorkList(PreventCJReportCheckTaskFromWork taskFromWorkList);
+ /**
+ * 任务配置 -查询待上报
+ * */
+ List<PreventCJReportCheckTaskFromWork> listReportTaskFromWorkDate();
+ /**
+ * 任务配置 -待上报状态变更
+ * */
+ void updateWorkReportStatus(HandlerReportParam handlerReportParam);
+ /**
+ * 任务配置 -待上报状态变更 -通过id
+ * */
+ void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
+
+ PreventCJReportCheckTaskFromWork geByMeasureUUidAndJobId(String uuid, Long jobId);
+
+ List<PreventCJReportCheckTaskFromWork> listWork();
+
+ int updateInfo(PreventCJReportCheckTaskFromWork work);
+
+ List<PreventCJReportCheckTaskFromWork> listWork1();
+
+ int updateInfo1(PreventCJReportCheckTaskFromWork work);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportConfigLogService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportConfigLogService.java
index 77b5862..fb18b7d 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportConfigLogService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportConfigLogService.java
@@ -1,16 +1,16 @@
-package com.ruoyi.doublePrevention.service.baseService;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportConfigLog;
-
-public interface PreventCJReportConfigLogService extends IService<PreventCJReportConfigLog> {
-// /**
-// * 保存修改记录
-// * */
-// int insertOldReportConfig(PreventReportConfigLog preventReportConfigLog);
-//
-// /**
-// * 数据上报配置历史记录-查询
-// */
-// IPage<PreventCJReportConfigLog> getReportConfigLogPage(Page<Object> objectPage, PreventReportConfigLogQueryReqDTO queryReqDTO);
-}
+package com.ruoyi.doublePrevention.service.baseService;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportConfigLog;
+
+public interface PreventCJReportConfigLogService extends IService<PreventCJReportConfigLog> {
+// /**
+// * 保存修改记录
+// * */
+// int insertOldReportConfig(PreventReportConfigLog preventReportConfigLog);
+//
+// /**
+// * 数据上报配置历史记录-查询
+// */
+// IPage<PreventCJReportConfigLog> getReportConfigLogPage(Page<Object> objectPage, PreventReportConfigLogQueryReqDTO queryReqDTO);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportConfigService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportConfigService.java
index d6afc51..1ddaa2b 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportConfigService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportConfigService.java
@@ -1,23 +1,23 @@
-package com.ruoyi.doublePrevention.service.baseService;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportConfig;
-import com.ruoyi.doublePrevention.repository.param.PreventReportConfigUpdateParams;
-
-import java.util.List;
-
-public interface PreventCJReportConfigService extends IService<PreventCJReportConfig> {
-
-// /**
-// * 数据上报配置-查询
-// */
-// List<PreventCJReportConfig> ListReportConfigs();
- /**
- * 数据上报配置-修改
- */
- int updateReportConfig(PreventReportConfigUpdateParams updateParams);
- /**
- * 数据上报配置-按照id查询
- */
- PreventCJReportConfig getReportConfigById(int Id);
-}
+package com.ruoyi.doublePrevention.service.baseService;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportConfig;
+import com.ruoyi.doublePrevention.repository.param.PreventReportConfigUpdateParams;
+
+import java.util.List;
+
+public interface PreventCJReportConfigService extends IService<PreventCJReportConfig> {
+
+// /**
+// * 数据上报配置-查询
+// */
+// List<PreventCJReportConfig> ListReportConfigs();
+ /**
+ * 数据上报配置-修改
+ */
+ int updateReportConfig(PreventReportConfigUpdateParams updateParams);
+ /**
+ * 数据上报配置-按照id查询
+ */
+ PreventCJReportConfig getReportConfigById(int Id);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportDangerInfoService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportDangerInfoService.java
index a17de97..9153545 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportDangerInfoService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportDangerInfoService.java
@@ -1,33 +1,33 @@
-package com.ruoyi.doublePrevention.service.baseService;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo;
-import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-
-import java.util.List;
-
-public interface PreventCJReportDangerInfoService extends IService<PreventCJReportDangerInfo> {
- /**
- * 插入隐患信息
- * */
- int insert(PreventCJReportDangerInfo danger);
-// /**
-// * 上报数据-隐患信息-分页查询
-// */
-// IPage<PreventCJReportDangerInfo> getReportDangerInfoPage(Page<Object> objectPage, PreventReportDangerInfoReqDTO queryReqDTO);
- /**
- * 上报数据-待上报数据查询
- */
- List<PreventCJReportDangerInfo> listReportDangerDate();
- /**
- * 上报数据-待上报状态变更
- */
- void updateTaskReportStatus(HandlerReportParam handlerReportParam);
- /**
- * 上报数据-待上报状态变更-通过id
- */
- void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
-
- List<PreventCJReportDangerInfo> getDangerListForCheckTask();
-}
+package com.ruoyi.doublePrevention.service.baseService;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo;
+import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+
+import java.util.List;
+
+public interface PreventCJReportDangerInfoService extends IService<PreventCJReportDangerInfo> {
+ /**
+ * 插入隐患信息
+ * */
+ int insert(PreventCJReportDangerInfo danger);
+// /**
+// * 上报数据-隐患信息-分页查询
+// */
+// IPage<PreventCJReportDangerInfo> getReportDangerInfoPage(Page<Object> objectPage, PreventReportDangerInfoReqDTO queryReqDTO);
+ /**
+ * 上报数据-待上报数据查询
+ */
+ List<PreventCJReportDangerInfo> listReportDangerDate();
+ /**
+ * 上报数据-待上报状态变更
+ */
+ void updateTaskReportStatus(HandlerReportParam handlerReportParam);
+ /**
+ * 上报数据-待上报状态变更-通过id
+ */
+ void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
+
+ List<PreventCJReportDangerInfo> getDangerListForCheckTask();
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportOverhaulLogService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportOverhaulLogService.java
index caec879..6db905d 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportOverhaulLogService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportOverhaulLogService.java
@@ -1,15 +1,15 @@
-package com.ruoyi.doublePrevention.service.baseService;
-
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportOverhaulLog;
-import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
-
-import java.util.List;
-
-public interface PreventCJReportOverhaulLogService {
-
- int insertCJOverhaulLists(PreventCJReportOverhaulLog cjOverhaulLog);
-
- List<PreventCJReportOverhaulLog> listReportOverhaulDate();
-
- int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
-}
+package com.ruoyi.doublePrevention.service.baseService;
+
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportOverhaulLog;
+import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
+
+import java.util.List;
+
+public interface PreventCJReportOverhaulLogService {
+
+ int insertCJOverhaulLists(PreventCJReportOverhaulLog cjOverhaulLog);
+
+ List<PreventCJReportOverhaulLog> listReportOverhaulDate();
+
+ int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportPointService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportPointService.java
index c96d7f4..3b00cd9 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportPointService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportPointService.java
@@ -1,7 +1,7 @@
-package com.ruoyi.doublePrevention.service.baseService;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportPoint;
-
-public interface PreventCJReportPointService extends IService<PreventCJReportPoint> {
-}
+package com.ruoyi.doublePrevention.service.baseService;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportPoint;
+
+public interface PreventCJReportPointService extends IService<PreventCJReportPoint> {
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportResultDataService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportResultDataService.java
index 9a8c472..2ab28c4 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportResultDataService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportResultDataService.java
@@ -1,7 +1,7 @@
-package com.ruoyi.doublePrevention.service.baseService;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportResultData;
-
-public interface PreventCJReportResultDataService extends IService<PreventCJReportResultData> {
-}
+package com.ruoyi.doublePrevention.service.baseService;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportResultData;
+
+public interface PreventCJReportResultDataService extends IService<PreventCJReportResultData> {
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskAnaUnitService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskAnaUnitService.java
index 6428d5e..a61402d 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskAnaUnitService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskAnaUnitService.java
@@ -1,32 +1,32 @@
-package com.ruoyi.doublePrevention.service.baseService;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskAnaUnit;
-import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-
-import java.util.List;
-
-public interface PreventCJReportRiskAnaUnitService extends IService<PreventCJReportRiskAnaUnit> {
-
-// /**
-// * 上报数据-风险分析单元-分页查询
-// */
-// IPage<PreventCJReportRiskAnaUnit> getReportRiskUnitPage(Page<Object> objectPage, PreReportRiskUnitQueryReqDTO queryReqDTO);
- /**
- * 上报数据-插入
- */
- int insertUnitList(PreventCJReportRiskAnaUnit unitList);
- /**
- * 上报数据-查询待上报数据
- */
- List<PreventCJReportRiskAnaUnit> listReportUnitDate();
- /**
- * 上报数据-修改待上报
- */
- void updateReportStatus(HandlerReportParam handlerReportParam);
- /**
- * 上报数据-修改待上报-通过id
- */
- void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
-}
+package com.ruoyi.doublePrevention.service.baseService;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskAnaUnit;
+import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+
+import java.util.List;
+
+public interface PreventCJReportRiskAnaUnitService extends IService<PreventCJReportRiskAnaUnit> {
+
+// /**
+// * 上报数据-风险分析单元-分页查询
+// */
+// IPage<PreventCJReportRiskAnaUnit> getReportRiskUnitPage(Page<Object> objectPage, PreReportRiskUnitQueryReqDTO queryReqDTO);
+ /**
+ * 上报数据-插入
+ */
+ int insertUnitList(PreventCJReportRiskAnaUnit unitList);
+ /**
+ * 上报数据-查询待上报数据
+ */
+ List<PreventCJReportRiskAnaUnit> listReportUnitDate();
+ /**
+ * 上报数据-修改待上报
+ */
+ void updateReportStatus(HandlerReportParam handlerReportParam);
+ /**
+ * 上报数据-修改待上报-通过id
+ */
+ void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskControlMeasureService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskControlMeasureService.java
index afd2a66..163364a 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskControlMeasureService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskControlMeasureService.java
@@ -1,32 +1,32 @@
-package com.ruoyi.doublePrevention.service.baseService;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskControlMeasure;
-import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-
-import java.util.List;
-
-public interface PreventCJReportRiskControlMeasureService extends IService<PreventCJReportRiskControlMeasure> {
-
-// /**
-// * 上报数据-管控措施-分页查询
-// */
-// IPage<PreventCJReportRiskControlMeasure> getReportMeasurePage(Page<Object> objectPage, PreventReportRiskControlMeasureReqDTO queryReqDTO);
- /**
- * 插入
- * */
- int insertMeasureList(PreventCJReportRiskControlMeasure CJMeasure);
- /**
- * 管控措施-上报数据
- * */
- List<PreventCJReportRiskControlMeasure> listReportMeasureDate();
- /**
- * 管控措施-修改上报状态
- * */
- void updateMeasureReportStatus(HandlerReportParam handlerReportParam);
- /**
- * 管控措施-修改上报状态-通过id
- * */
- void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
-}
+package com.ruoyi.doublePrevention.service.baseService;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskControlMeasure;
+import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+
+import java.util.List;
+
+public interface PreventCJReportRiskControlMeasureService extends IService<PreventCJReportRiskControlMeasure> {
+
+// /**
+// * 上报数据-管控措施-分页查询
+// */
+// IPage<PreventCJReportRiskControlMeasure> getReportMeasurePage(Page<Object> objectPage, PreventReportRiskControlMeasureReqDTO queryReqDTO);
+ /**
+ * 插入
+ * */
+ int insertMeasureList(PreventCJReportRiskControlMeasure CJMeasure);
+ /**
+ * 管控措施-上报数据
+ * */
+ List<PreventCJReportRiskControlMeasure> listReportMeasureDate();
+ /**
+ * 管控措施-修改上报状态
+ * */
+ void updateMeasureReportStatus(HandlerReportParam handlerReportParam);
+ /**
+ * 管控措施-修改上报状态-通过id
+ * */
+ void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskEventService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskEventService.java
index 05ff260..db994a5 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskEventService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventCJReportRiskEventService.java
@@ -1,32 +1,32 @@
-package com.ruoyi.doublePrevention.service.baseService;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskEvent;
-import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-
-import java.util.List;
-
-public interface PreventCJReportRiskEventService extends IService<PreventCJReportRiskEvent> {
-
-// /**
-// * 分页查询
-// * */
-// IPage<PreventCJReportRiskEvent> getReportRiskEventPage(Page<Object> objectPage, PreReportRiskEventQueryReqDTO queryReqDTO);
- /**
- * 插入
- * */
- int insertEventLists(PreventCJReportRiskEvent eventList);
- /**
- * 上报数据-查询待上报数据
- * */
- List<PreventCJReportRiskEvent> listReportEventDate();
- /**
- * 修改上报状态
- * */
- int updateEventReportStatus(HandlerReportParam handlerReportParam);
- /**
- * 修改上报状态-通过id
- * */
- void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
-}
+package com.ruoyi.doublePrevention.service.baseService;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskEvent;
+import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+
+import java.util.List;
+
+public interface PreventCJReportRiskEventService extends IService<PreventCJReportRiskEvent> {
+
+// /**
+// * 分页查询
+// * */
+// IPage<PreventCJReportRiskEvent> getReportRiskEventPage(Page<Object> objectPage, PreReportRiskEventQueryReqDTO queryReqDTO);
+ /**
+ * 插入
+ * */
+ int insertEventLists(PreventCJReportRiskEvent eventList);
+ /**
+ * 上报数据-查询待上报数据
+ * */
+ List<PreventCJReportRiskEvent> listReportEventDate();
+ /**
+ * 修改上报状态
+ * */
+ int updateEventReportStatus(HandlerReportParam handlerReportParam);
+ /**
+ * 修改上报状态-通过id
+ * */
+ void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventOverhaulLogService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventOverhaulLogService.java
index 58a1d96..384fb1b 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventOverhaulLogService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventOverhaulLogService.java
@@ -1,28 +1,28 @@
-package com.ruoyi.doublePrevention.service.baseService;
-
-import com.ruoyi.doublePrevention.entity.PreventOverhaulLog;
-import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogInsertReqBO;
-import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogReqBO;
-import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogUpdateReqBO;
-import com.ruoyi.doublePrevention.entity.dto.resp.PreventOverhaulLogRespDTO;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-import com.ruoyi.doublePrevention.vo.ResultVO;
-
-import java.util.List;
-
-public interface PreventOverhaulLogService {
-
- ResultVO<PreventOverhaulLogRespDTO> selectOverhaulLogPage(PreventOverhaulLogReqBO overhaulLogReqBO);
-
- ResultVO<PreventOverhaulLog> savePreventOverhaulLog(PreventOverhaulLogInsertReqBO insertReqBO);
-
- PreventOverhaulLog getOverhaulLogById(Long id);
-
- ResultVO<PreventOverhaulLog> updateOverhaulLog(PreventOverhaulLogUpdateReqBO updateReqBO);
-
- int deleteOverhaulLogByIds(String ids);
-
- List<PreventOverhaulLog> listReportOverhaulLog();
-
- int updateOverhaulReportStatus(HandlerReportParam handlerReportParam);
-}
+package com.ruoyi.doublePrevention.service.baseService;
+
+import com.ruoyi.doublePrevention.entity.PreventOverhaulLog;
+import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogInsertReqBO;
+import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogReqBO;
+import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogUpdateReqBO;
+import com.ruoyi.doublePrevention.entity.dto.resp.PreventOverhaulLogRespDTO;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import com.ruoyi.doublePrevention.vo.ResultVO;
+
+import java.util.List;
+
+public interface PreventOverhaulLogService {
+
+ ResultVO<PreventOverhaulLogRespDTO> selectOverhaulLogPage(PreventOverhaulLogReqBO overhaulLogReqBO);
+
+ ResultVO<PreventOverhaulLog> savePreventOverhaulLog(PreventOverhaulLogInsertReqBO insertReqBO);
+
+ PreventOverhaulLog getOverhaulLogById(Long id);
+
+ ResultVO<PreventOverhaulLog> updateOverhaulLog(PreventOverhaulLogUpdateReqBO updateReqBO);
+
+ int deleteOverhaulLogByIds(String ids);
+
+ List<PreventOverhaulLog> listReportOverhaulLog();
+
+ int updateOverhaulReportStatus(HandlerReportParam handlerReportParam);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskCheckUnitService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskCheckUnitService.java
index 5f16c72..b56769c 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskCheckUnitService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskCheckUnitService.java
@@ -1,31 +1,31 @@
-package com.ruoyi.doublePrevention.service.baseService;
-
-import com.ruoyi.doublePrevention.entity.PreventRiskCheckUnit;
-import com.ruoyi.project.tr.baseCheckPoint.domain.BaseCheckPoint;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface PreventRiskCheckUnitService {
-
- /**
- * 保存原检查点与管控措施的对应关系
- */
- int insertPointAndMeasure(PreventRiskCheckUnit checkUnit);
- /**
- * 通过riskId 查询管控措施列表
- */
- List<PreventRiskCheckUnit> getUnitByRiskId(String riskId);
-
-
- /**
- * 删除原检查点与管控措施的对应关系
- */
- int deletePointAndMeasure(String id);
- /**
- * 通过baseCheckPointId 查询管控措施列表
- */
- PreventRiskCheckUnit getUnitByBaseCheckPointId(Long baseCheckPointId);
-
-}
+package com.ruoyi.doublePrevention.service.baseService;
+
+import com.ruoyi.doublePrevention.entity.PreventRiskCheckUnit;
+import com.ruoyi.project.tr.baseCheckPoint.domain.BaseCheckPoint;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface PreventRiskCheckUnitService {
+
+ /**
+ * 保存原检查点与管控措施的对应关系
+ */
+ int insertPointAndMeasure(PreventRiskCheckUnit checkUnit);
+ /**
+ * 通过riskId 查询管控措施列表
+ */
+ List<PreventRiskCheckUnit> getUnitByRiskId(String riskId);
+
+
+ /**
+ * 删除原检查点与管控措施的对应关系
+ */
+ int deletePointAndMeasure(String id);
+ /**
+ * 通过baseCheckPointId 查询管控措施列表
+ */
+ PreventRiskCheckUnit getUnitByBaseCheckPointId(Long baseCheckPointId);
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerCheckAndMeasureService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerCheckAndMeasureService.java
index fe4f497..76a9929 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerCheckAndMeasureService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerCheckAndMeasureService.java
@@ -1,22 +1,22 @@
-package com.ruoyi.doublePrevention.service.baseService;
-
-import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckAndMeasure;
-import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
-
-import java.util.List;
-
-public interface PreventRiskDangerCheckAndMeasureService {
-
- /**
- * 写入核查任务检查点与管控措施信息
- * */
- int insertCheckAndMeasure(PreventRiskDangerCheckAndMeasure checkAndMeasure);
-
- List<PreventRiskDangerCheckAndMeasure> getByBaseCheckPointId(Long checkPointId);
-
- PreventRiskDangerCheckAndMeasure getByDangerCheckPointId(Long dangerCheckPointId);
-
- int updateCheckDesc(HiddenDangerCheckPoint hdcp);
-
- List<PreventRiskDangerCheckAndMeasure> getByCheckId(Long checkId);
-}
+package com.ruoyi.doublePrevention.service.baseService;
+
+import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckAndMeasure;
+import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
+
+import java.util.List;
+
+public interface PreventRiskDangerCheckAndMeasureService {
+
+ /**
+ * 写入核查任务检查点与管控措施信息
+ * */
+ int insertCheckAndMeasure(PreventRiskDangerCheckAndMeasure checkAndMeasure);
+
+ List<PreventRiskDangerCheckAndMeasure> getByBaseCheckPointId(Long checkPointId);
+
+ PreventRiskDangerCheckAndMeasure getByDangerCheckPointId(Long dangerCheckPointId);
+
+ int updateCheckDesc(HiddenDangerCheckPoint hdcp);
+
+ List<PreventRiskDangerCheckAndMeasure> getByCheckId(Long checkId);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerCheckLogService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerCheckLogService.java
index 83f5cc2..48ccee1 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerCheckLogService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerCheckLogService.java
@@ -1,44 +1,44 @@
-package com.ruoyi.doublePrevention.service.baseService;
-
-import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckLog;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-
-import java.util.List;
-
-public interface PreventRiskDangerCheckLogService {
- /**
- * 定时生成排查任务记录时，
- * 插入排查记录附属表
- */
- int insertDangerCheckLog(PreventRiskDangerCheckLog dangerCheck);
- /**
- * 删除定时核查任务
- * */
- int deleteDangerCheck(Long checkId);
-
-
- /**
- * 检索需要上报的任务记录
- * */
- List<PreventRiskDangerCheckLog> listReportTask();
- /**
- * 修改上报的数据状态
- * */
- int updateTaskReportStatus(HandlerReportParam handlerReportParam);
- /**
- * 查询by checkId
- * */
- PreventRiskDangerCheckLog getByDangerCheckByCheckId(Long checkId);
-
- PreventRiskDangerCheckLog getByDangerCheckByJobId(Long jobId);
-
- int updateCheckLog(Long checkId, Long mobileCode);
-
- int updateTaskReportStatusByList(List<Long> taskIds);
-
- List<PreventRiskDangerCheckLog> listRectifyReportTask();
-
- List<PreventRiskDangerCheckLog> listSearchRectifyReportTask();
-
- int updateSearchRectifyReportTask(PreventRiskDangerCheckLog dangerCheckLog);
-}
+package com.ruoyi.doublePrevention.service.baseService;
+
+import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckLog;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+
+import java.util.List;
+
+public interface PreventRiskDangerCheckLogService {
+ /**
+ * 定时生成排查任务记录时，
+ * 插入排查记录附属表
+ */
+ int insertDangerCheckLog(PreventRiskDangerCheckLog dangerCheck);
+ /**
+ * 删除定时核查任务
+ * */
+ int deleteDangerCheck(Long checkId);
+
+
+ /**
+ * 检索需要上报的任务记录
+ * */
+ List<PreventRiskDangerCheckLog> listReportTask();
+ /**
+ * 修改上报的数据状态
+ * */
+ int updateTaskReportStatus(HandlerReportParam handlerReportParam);
+ /**
+ * 查询by checkId
+ * */
+ PreventRiskDangerCheckLog getByDangerCheckByCheckId(Long checkId);
+
+ PreventRiskDangerCheckLog getByDangerCheckByJobId(Long jobId);
+
+ int updateCheckLog(Long checkId, Long mobileCode);
+
+ int updateTaskReportStatusByList(List<Long> taskIds);
+
+ List<PreventRiskDangerCheckLog> listRectifyReportTask();
+
+ List<PreventRiskDangerCheckLog> listSearchRectifyReportTask();
+
+ int updateSearchRectifyReportTask(PreventRiskDangerCheckLog dangerCheckLog);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerConfirmLogService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerConfirmLogService.java
index 87ae9f7..786c1af 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerConfirmLogService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerConfirmLogService.java
@@ -1,15 +1,15 @@
-package com.ruoyi.doublePrevention.service.baseService;
-
-
-import com.ruoyi.doublePrevention.entity.PreventRiskDangerConfirmLog;
-import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
-
-import java.util.List;
-
-public interface PreventRiskDangerConfirmLogService {
-
-
- int saveConfirmLog(HiddenDangerCheckPoint hdcp);
-
- List<PreventRiskDangerConfirmLog> getLogsByDangerCheckPointId(Long dangerCheckPointId);
-}
+package com.ruoyi.doublePrevention.service.baseService;
+
+
+import com.ruoyi.doublePrevention.entity.PreventRiskDangerConfirmLog;
+import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
+
+import java.util.List;
+
+public interface PreventRiskDangerConfirmLogService {
+
+
+ int saveConfirmLog(HiddenDangerCheckPoint hdcp);
+
+ List<PreventRiskDangerConfirmLog> getLogsByDangerCheckPointId(Long dangerCheckPointId);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerInfoService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerInfoService.java
index 13194ee..70d44be 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerInfoService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskDangerInfoService.java
@@ -1,52 +1,52 @@
-package com.ruoyi.doublePrevention.service.baseService;
-
-import com.ruoyi.doublePrevention.entity.PreventRiskDangerInfo;
-import com.ruoyi.doublePrevention.entity.dto.DataCountDangerResultRespDO;
-import com.ruoyi.doublePrevention.repository.param.DataCountStartAndEndTimeParams;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-
-import java.util.Date;
-import java.util.List;
-
-public interface PreventRiskDangerInfoService {
-
- /**
- * 新增隐患上报
- * */
- int insertDangerInfo(PreventRiskDangerInfo dangerInfo);
- /**
- * 修改隐患上报
- * */
- int updateDangerInfo(PreventRiskDangerInfo dangerInfo);
-
- /**
- * 删除隐患上报
- */
- int deleteDangerInfo(Long id);
- /**
- * 修改隐患整改状态
- */
- int updateDangerInfoState(PreventRiskDangerInfo dangerInfo);
-
- /**
- * @description 统计时间段内所有、死亡、重伤、轻伤的隐患数量
- */
- DataCountDangerResultRespDO listDangerResultCountByTime(Date startTime, Date endTime, List<Long> depIds);
-
-
-
- /**
- * 搜索需要上报的隐患
- */
- List<PreventRiskDangerInfo> listReportDanger();
- /**
- * 修改上报的数据的姿态
- */
- PreventRiskDangerInfo updateDangerInfoReportStatus(HandlerReportParam handlerReportParam);
- /**
- * 查询隐患附属表信息
- */
- PreventRiskDangerInfo getByHiddenDangerId(Long id);
-
- PreventRiskDangerInfo getDangerInfoByDangerCheckPointId(Long checkId);
-}
+package com.ruoyi.doublePrevention.service.baseService;
+
+import com.ruoyi.doublePrevention.entity.PreventRiskDangerInfo;
+import com.ruoyi.doublePrevention.entity.dto.DataCountDangerResultRespDO;
+import com.ruoyi.doublePrevention.repository.param.DataCountStartAndEndTimeParams;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+
+import java.util.Date;
+import java.util.List;
+
+public interface PreventRiskDangerInfoService {
+
+ /**
+ * 新增隐患上报
+ * */
+ int insertDangerInfo(PreventRiskDangerInfo dangerInfo);
+ /**
+ * 修改隐患上报
+ * */
+ int updateDangerInfo(PreventRiskDangerInfo dangerInfo);
+
+ /**
+ * 删除隐患上报
+ */
+ int deleteDangerInfo(Long id);
+ /**
+ * 修改隐患整改状态
+ */
+ int updateDangerInfoState(PreventRiskDangerInfo dangerInfo);
+
+ /**
+ * @description 统计时间段内所有、死亡、重伤、轻伤的隐患数量
+ */
+ DataCountDangerResultRespDO listDangerResultCountByTime(Date startTime, Date endTime, List<Long> depIds);
+
+
+
+ /**
+ * 搜索需要上报的隐患
+ */
+ List<PreventRiskDangerInfo> listReportDanger();
+ /**
+ * 修改上报的数据的姿态
+ */
+ PreventRiskDangerInfo updateDangerInfoReportStatus(HandlerReportParam handlerReportParam);
+ /**
+ * 查询隐患附属表信息
+ */
+ PreventRiskDangerInfo getByHiddenDangerId(Long id);
+
+ PreventRiskDangerInfo getDangerInfoByDangerCheckPointId(Long checkId);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskJobAndMeasureService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskJobAndMeasureService.java
index a09ec59..2a8cfb5 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskJobAndMeasureService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskJobAndMeasureService.java
@@ -1,42 +1,42 @@
-package com.ruoyi.doublePrevention.service.baseService;
-
-import com.ruoyi.doublePrevention.entity.PreventRiskJobAndMeasure;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-
-import java.util.List;
-
-public interface PreventRiskJobAndMeasureService {
- /**
- * 插入管控措施与job的对应关系
- * */
- int insertJobAndMeasure(PreventRiskJobAndMeasure jobAndMeasure);
- /**
- * 查询JobAndMeasure - By JobId
- */
- PreventRiskJobAndMeasure getJobAndMeasureByJobId(Long jobId);
-
- List<PreventRiskJobAndMeasure> getJobAndMeasureListByJobId(Long jobId);
- /**
- * 删除job管控措施的附属表关联信息
- */
- int deleteJobAndMeasure(Long jobId);
-
-
-
- /**
- * 检索需要上报的隐患排查任务
- */
- List<PreventRiskJobAndMeasure> listReportWork();
- /**
- * 根据jobId查询对应的管控措施
- */
- List<PreventRiskJobAndMeasure> getMeasureListByJobId(Long jobId);
- /**
- * 修改上报状态
- */
- int updateWorkReportStatus(HandlerReportParam handlerReportParam);
-
- List<PreventRiskJobAndMeasure> listReportWorkTest();
-
- List<PreventRiskJobAndMeasure> getRectifyJobData(Long jobId);
-}
+package com.ruoyi.doublePrevention.service.baseService;
+
+import com.ruoyi.doublePrevention.entity.PreventRiskJobAndMeasure;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+
+import java.util.List;
+
+public interface PreventRiskJobAndMeasureService {
+ /**
+ * 插入管控措施与job的对应关系
+ * */
+ int insertJobAndMeasure(PreventRiskJobAndMeasure jobAndMeasure);
+ /**
+ * 查询JobAndMeasure - By JobId
+ */
+ PreventRiskJobAndMeasure getJobAndMeasureByJobId(Long jobId);
+
+ List<PreventRiskJobAndMeasure> getJobAndMeasureListByJobId(Long jobId);
+ /**
+ * 删除job管控措施的附属表关联信息
+ */
+ int deleteJobAndMeasure(Long jobId);
+
+
+
+ /**
+ * 检索需要上报的隐患排查任务
+ */
+ List<PreventRiskJobAndMeasure> listReportWork();
+ /**
+ * 根据jobId查询对应的管控措施
+ */
+ List<PreventRiskJobAndMeasure> getMeasureListByJobId(Long jobId);
+ /**
+ * 修改上报状态
+ */
+ int updateWorkReportStatus(HandlerReportParam handlerReportParam);
+
+ List<PreventRiskJobAndMeasure> listReportWorkTest();
+
+ List<PreventRiskJobAndMeasure> getRectifyJobData(Long jobId);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskUnitUuidService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskUnitUuidService.java
index 794ea26..9a8c4e6 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskUnitUuidService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskUnitUuidService.java
@@ -1,38 +1,38 @@
-package com.ruoyi.doublePrevention.service.baseService;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.doublePrevention.entity.PreventRiskUnitUuid;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-
-import java.util.List;
-
-public interface PreventRiskUnitUuidService {
- /**
- * 为设施设备清单附属表添加uuid
- * */
- int insertRiskUnitUuid(PreventRiskUnitUuid riskUnitUuid);
- /**
- * 通过id获取uuid
- * */
- PreventRiskUnitUuid getRiskUnitUuidById(Long id);
- /**
- * 修改
- * */
- int updateRiskUnitUuid(PreventRiskUnitUuid riskUnitUuid);
- /**
- * 删除附属表信息
- */
- int deleteRiskUnit(String[] riskListIds);
-
-
- /**
- * 检索需要上报的数据
- */
- List<PreventRiskUnitUuid> listRiskAnaUnit();
- /**
- * 修改已经被检索读取完成数据的状态
- */
- int updateReportStatus(HandlerReportParam handlerReportParam);
-
- PreventRiskUnitUuid getRiskUnitUuidByUnitId(Long riskUnitId);
-}
+package com.ruoyi.doublePrevention.service.baseService;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.doublePrevention.entity.PreventRiskUnitUuid;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+
+import java.util.List;
+
+public interface PreventRiskUnitUuidService {
+ /**
+ * 为设施设备清单附属表添加uuid
+ * */
+ int insertRiskUnitUuid(PreventRiskUnitUuid riskUnitUuid);
+ /**
+ * 通过id获取uuid
+ * */
+ PreventRiskUnitUuid getRiskUnitUuidById(Long id);
+ /**
+ * 修改
+ * */
+ int updateRiskUnitUuid(PreventRiskUnitUuid riskUnitUuid);
+ /**
+ * 删除附属表信息
+ */
+ int deleteRiskUnit(String[] riskListIds);
+
+
+ /**
+ * 检索需要上报的数据
+ */
+ List<PreventRiskUnitUuid> listRiskAnaUnit();
+ /**
+ * 修改已经被检索读取完成数据的状态
+ */
+ int updateReportStatus(HandlerReportParam handlerReportParam);
+
+ PreventRiskUnitUuid getRiskUnitUuidByUnitId(Long riskUnitId);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventTaskTypeService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventTaskTypeService.java
index 450b603..450eea9 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventTaskTypeService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventTaskTypeService.java
@@ -1,14 +1,14 @@
-package com.ruoyi.doublePrevention.service.baseService;
-
-import com.ruoyi.doublePrevention.entity.PreventTaskType;
-
-import java.util.List;
-
-public interface PreventTaskTypeService {
-
- PreventTaskType getInfoByTaskId(Long id);
-
- List<PreventTaskType> getInfoByJobId(Long jobId);
-
- List<PreventTaskType> getAllTaskTypeList();
-}
+package com.ruoyi.doublePrevention.service.baseService;
+
+import com.ruoyi.doublePrevention.entity.PreventTaskType;
+
+import java.util.List;
+
+public interface PreventTaskTypeService {
+
+ PreventTaskType getInfoByTaskId(Long id);
+
+ List<PreventTaskType> getInfoByJobId(Long jobId);
+
+ List<PreventTaskType> getAllTaskTypeList();
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventTaskUnitAndMeasureService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventTaskUnitAndMeasureService.java
index eb3d08a..fc09f3b 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventTaskUnitAndMeasureService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventTaskUnitAndMeasureService.java
@@ -1,6 +1,6 @@
-package com.ruoyi.doublePrevention.service.baseService;
-
-
-public interface PreventTaskUnitAndMeasureService {
-
-}
+package com.ruoyi.doublePrevention.service.baseService;
+
+
+public interface PreventTaskUnitAndMeasureService {
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/RiskAndPeopleInfoService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/RiskAndPeopleInfoService.java
index 0b3feae..67dcf64 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/RiskAndPeopleInfoService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/RiskAndPeopleInfoService.java
@@ -1,14 +1,14 @@
-package com.ruoyi.doublePrevention.service.baseService;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.doublePrevention.entity.RiskAndPeopleInfo;
-import com.ruoyi.doublePrevention.entity.dto.req.RiskAndPeopleInfoReqBO;
-import com.ruoyi.doublePrevention.entity.dto.resp.RiskAndPeopleInfoRespDTO;
-import com.ruoyi.doublePrevention.vo.ResultVO;
-
-public interface RiskAndPeopleInfoService extends IService<RiskAndPeopleInfo> {
-
- ResultVO<RiskAndPeopleInfoRespDTO> listRiskAndPeoplePage(RiskAndPeopleInfoReqBO reqBO);
-
- RiskAndPeopleInfo selectRiskAndPeopleInfoById(Long id);
-}
+package com.ruoyi.doublePrevention.service.baseService;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.doublePrevention.entity.RiskAndPeopleInfo;
+import com.ruoyi.doublePrevention.entity.dto.req.RiskAndPeopleInfoReqBO;
+import com.ruoyi.doublePrevention.entity.dto.resp.RiskAndPeopleInfoRespDTO;
+import com.ruoyi.doublePrevention.vo.ResultVO;
+
+public interface RiskAndPeopleInfoService extends IService<RiskAndPeopleInfo> {
+
+ ResultVO<RiskAndPeopleInfoRespDTO> listRiskAndPeoplePage(RiskAndPeopleInfoReqBO reqBO);
+
+ RiskAndPeopleInfo selectRiskAndPeopleInfoById(Long id);
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/RiskOldInfoService.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/RiskOldInfoService.java
index 25cb9a3..cf52f07 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/RiskOldInfoService.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/RiskOldInfoService.java
@@ -1,14 +1,14 @@
-package com.ruoyi.doublePrevention.service.baseService;
-
-
-import com.ruoyi.doublePrevention.entity.dto.req.RiskOldInfoQueryReqDTO;
-import com.ruoyi.doublePrevention.entity.dto.resp.RiskOldInfoQueryRespDTO;
-import com.ruoyi.doublePrevention.vo.ResultVO;
-
-import java.util.List;
-
-public interface RiskOldInfoService {
-
- ResultVO<RiskOldInfoQueryRespDTO> selectOldRiskInfoPage(RiskOldInfoQueryReqDTO queryReqDTO);
-
-}
+package com.ruoyi.doublePrevention.service.baseService;
+
+
+import com.ruoyi.doublePrevention.entity.dto.req.RiskOldInfoQueryReqDTO;
+import com.ruoyi.doublePrevention.entity.dto.resp.RiskOldInfoQueryRespDTO;
+import com.ruoyi.doublePrevention.vo.ResultVO;
+
+import java.util.List;
+
+public interface RiskOldInfoService {
+
+ ResultVO<RiskOldInfoQueryRespDTO> selectOldRiskInfoPage(RiskOldInfoQueryReqDTO queryReqDTO);
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportCheckRecordFromTaskServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportCheckRecordFromTaskServiceImpl.java
index 2e2be95..ba9f207 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportCheckRecordFromTaskServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportCheckRecordFromTaskServiceImpl.java
@@ -1,81 +1,81 @@
-package com.ruoyi.doublePrevention.service.baseService.impl;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckRecordFromTask;
-import com.ruoyi.doublePrevention.enums.E;
-import com.ruoyi.doublePrevention.exception.AusinessException;
-import com.ruoyi.doublePrevention.repository.PreventCJReportCheckRecordFromTaskRepository;
-import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-import com.ruoyi.doublePrevention.service.baseService.PreventCJReportCheckRecordFromTaskService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("PreventCJReportCheckRecordFromTaskService")
-public class PreventCJReportCheckRecordFromTaskServiceImpl
- extends ServiceImpl<PreventCJReportCheckRecordFromTaskRepository, PreventCJReportCheckRecordFromTask> implements PreventCJReportCheckRecordFromTaskService {
-
- @Autowired
- private PreventCJReportCheckRecordFromTaskRepository preventCJReportCheckRecordFromTaskRepository;
-
- /**
- * 批量插入任务记录
- * */
- @Override
- public int insert(PreventCJReportCheckRecordFromTask recordFromTasks) {
- return preventCJReportCheckRecordFromTaskRepository.insertRecord(recordFromTasks);
- }
-
- @Override
- public int insertRecordList(List<PreventCJReportCheckRecordFromTask> recordFromTaskList) {
- return preventCJReportCheckRecordFromTaskRepository.insertRecordList(recordFromTaskList);
- }
-
-// /**
-// * 任务记录-分页查询
-// * */
-// @Override
-// public IPage<PreventCJReportCheckRecordFromTask> getReportTaskFromWorkPage(Page<Object> objectPage, PreventReportCheckRecordFromTaskReqDTO queryReqDTO) {
-// return preventCJReportCheckRecordFromTaskRepository.getReportTaskFromWorkPage(objectPage, queryReqDTO);
-// }
-
- /**
- * 任务-查询待上报
- * */
- @Override
- public List<PreventCJReportCheckRecordFromTask> listReportTaskRecordDate() {
- return preventCJReportCheckRecordFromTaskRepository.listReportTaskRecordDate();
- }
- /**
- * 任务-待上报状态变更
- * */
- @Override
- public void updateTaskReportStatus(HandlerReportParam handlerReportParam) {
- int result = preventCJReportCheckRecordFromTaskRepository.updateTaskReportStatus(handlerReportParam);
- if (result < 1){
- throw new AusinessException(E.UPDATE_FAIL.getCode(), "修改任务配置数据上报状态失败");
- }
- }
- /**
- * 任务-待上报状态变更 - 通过id
- * */
- @Override
- public void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam) {
- int result = preventCJReportCheckRecordFromTaskRepository.updateCJReportStatusById(handlerCJReportParam);
- if (result < 1){
- throw new AusinessException(E.UPDATE_FAIL.getCode(), "修改任务配置数据上报状态失败");
- }
- }
-
- @Override
- public void updateCJReportStatusBatchById(List<PreventCJReportCheckRecordFromTask> cjRecordFromTasks) {
- int result = preventCJReportCheckRecordFromTaskRepository.updateCJReportStatusBatchById(cjRecordFromTasks);
- if (result < 1){
- throw new AusinessException(E.UPDATE_FAIL.getCode(), "修改任务配置数据上报状态失败");
- }
- }
-}
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckRecordFromTask;
+import com.ruoyi.doublePrevention.enums.E;
+import com.ruoyi.doublePrevention.exception.AusinessException;
+import com.ruoyi.doublePrevention.repository.PreventCJReportCheckRecordFromTaskRepository;
+import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import com.ruoyi.doublePrevention.service.baseService.PreventCJReportCheckRecordFromTaskService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("PreventCJReportCheckRecordFromTaskService")
+public class PreventCJReportCheckRecordFromTaskServiceImpl
+ extends ServiceImpl<PreventCJReportCheckRecordFromTaskRepository, PreventCJReportCheckRecordFromTask> implements PreventCJReportCheckRecordFromTaskService {
+
+ @Autowired
+ private PreventCJReportCheckRecordFromTaskRepository preventCJReportCheckRecordFromTaskRepository;
+
+ /**
+ * 批量插入任务记录
+ * */
+ @Override
+ public int insert(PreventCJReportCheckRecordFromTask recordFromTasks) {
+ return preventCJReportCheckRecordFromTaskRepository.insertRecord(recordFromTasks);
+ }
+
+ @Override
+ public int insertRecordList(List<PreventCJReportCheckRecordFromTask> recordFromTaskList) {
+ return preventCJReportCheckRecordFromTaskRepository.insertRecordList(recordFromTaskList);
+ }
+
+// /**
+// * 任务记录-分页查询
+// * */
+// @Override
+// public IPage<PreventCJReportCheckRecordFromTask> getReportTaskFromWorkPage(Page<Object> objectPage, PreventReportCheckRecordFromTaskReqDTO queryReqDTO) {
+// return preventCJReportCheckRecordFromTaskRepository.getReportTaskFromWorkPage(objectPage, queryReqDTO);
+// }
+
+ /**
+ * 任务-查询待上报
+ * */
+ @Override
+ public List<PreventCJReportCheckRecordFromTask> listReportTaskRecordDate() {
+ return preventCJReportCheckRecordFromTaskRepository.listReportTaskRecordDate();
+ }
+ /**
+ * 任务-待上报状态变更
+ * */
+ @Override
+ public void updateTaskReportStatus(HandlerReportParam handlerReportParam) {
+ int result = preventCJReportCheckRecordFromTaskRepository.updateTaskReportStatus(handlerReportParam);
+ if (result < 1){
+ throw new AusinessException(E.UPDATE_FAIL.getCode(), "修改任务配置数据上报状态失败");
+ }
+ }
+ /**
+ * 任务-待上报状态变更 - 通过id
+ * */
+ @Override
+ public void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam) {
+ int result = preventCJReportCheckRecordFromTaskRepository.updateCJReportStatusById(handlerCJReportParam);
+ if (result < 1){
+ throw new AusinessException(E.UPDATE_FAIL.getCode(), "修改任务配置数据上报状态失败");
+ }
+ }
+
+ @Override
+ public void updateCJReportStatusBatchById(List<PreventCJReportCheckRecordFromTask> cjRecordFromTasks) {
+ int result = preventCJReportCheckRecordFromTaskRepository.updateCJReportStatusBatchById(cjRecordFromTasks);
+ if (result < 1){
+ throw new AusinessException(E.UPDATE_FAIL.getCode(), "修改任务配置数据上报状态失败");
+ }
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportCheckTaskFromWorkServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportCheckTaskFromWorkServiceImpl.java
index 7238356..8ed8fb7 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportCheckTaskFromWorkServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportCheckTaskFromWorkServiceImpl.java
@@ -1,99 +1,99 @@
-package com.ruoyi.doublePrevention.service.baseService.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckTaskFromWork;
-import com.ruoyi.doublePrevention.enums.E;
-import com.ruoyi.doublePrevention.exception.AusinessException;
-import com.ruoyi.doublePrevention.repository.PreventCJReportCheckTaskFromWorkRepository;
-import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-import com.ruoyi.doublePrevention.service.baseService.PreventCJReportCheckTaskFromWorkService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-
-@Service("PreventCJReportCheckTaskFromWorkService")
-public class PreventCJReportCheckTaskFromWorkServiceImpl
- extends ServiceImpl<PreventCJReportCheckTaskFromWorkRepository, PreventCJReportCheckTaskFromWork> implements PreventCJReportCheckTaskFromWorkService {
-
- @Autowired
- private PreventCJReportCheckTaskFromWorkRepository preventCJReportCheckTaskFromWorkRepository;
-
-// /**
-// * 上报数据-任务配置-分页查询
-// */
-// @Override
-// public IPage<PreventCJReportCheckTaskFromWork> getReportTaskFromWorkPage(Page<Object> objectPage, PreventReportCheckTaskFromWorkReqDTO queryReqDTO) {
-// return preventCJReportCheckTaskFromWorkRepository.getReportTaskFromWorkPage(objectPage,queryReqDTO);
-// }
- /**
- * 插入数据
- * */
- @Override
- public int insertTaskFromWorkList(PreventCJReportCheckTaskFromWork CJTaskFromWork) {
- int result = preventCJReportCheckTaskFromWorkRepository.insertTaskFromWorkList(CJTaskFromWork);
- if (result < 1){
- throw new AusinessException(E.ADD_FAIL.getCode(), "CJ保存风险单元失败");
- }
- return result;
- }
-
- /**
- * 任务配置 -查询待上报
- * */
- @Override
- public List<PreventCJReportCheckTaskFromWork> listReportTaskFromWorkDate() {
- return preventCJReportCheckTaskFromWorkRepository.listReportTaskFromWorkDate();
- }
- /**
- * 任务配置 -待上报状态变更
- * */
- @Override
- public void updateWorkReportStatus(HandlerReportParam handlerReportParam) {
- int result = preventCJReportCheckTaskFromWorkRepository.updateWorkReportStatus(handlerReportParam);
- if (result < 1){
- throw new AusinessException(E.ADD_FAIL.getCode(), "任务-配置 状态变更失败");
- }
- }
-
- /**
- * 任务配置 -待上报状态变更 -通过id
- * */
- @Override
- public void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam) {
- int result = preventCJReportCheckTaskFromWorkRepository.updateCJReportStatusById(handlerCJReportParam);
- if (result < 1){
- throw new AusinessException(E.ADD_FAIL.getCode(), "任务-配置 状态变更失败");
- }
- }
-
- @Override
- public PreventCJReportCheckTaskFromWork geByMeasureUUidAndJobId(String measureUuid, Long jobId) {
- return preventCJReportCheckTaskFromWorkRepository.geByMeasureUUidAndJobId(measureUuid, jobId);
- }
-
- @Override
- public List<PreventCJReportCheckTaskFromWork> listWork() {
- return preventCJReportCheckTaskFromWorkRepository.listWork();
- }
-
- @Override
- public List<PreventCJReportCheckTaskFromWork> listWork1() {
- return preventCJReportCheckTaskFromWorkRepository.listWork1();
- }
-
-
-
- @Override
- public int updateInfo1(PreventCJReportCheckTaskFromWork work) {
- return preventCJReportCheckTaskFromWorkRepository.updateInfo1(work);
- }
-
- @Override
- public int updateInfo(PreventCJReportCheckTaskFromWork work) {
- return preventCJReportCheckTaskFromWorkRepository.updateInfo(work);
- }
-
-}
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckTaskFromWork;
+import com.ruoyi.doublePrevention.enums.E;
+import com.ruoyi.doublePrevention.exception.AusinessException;
+import com.ruoyi.doublePrevention.repository.PreventCJReportCheckTaskFromWorkRepository;
+import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import com.ruoyi.doublePrevention.service.baseService.PreventCJReportCheckTaskFromWorkService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+@Service("PreventCJReportCheckTaskFromWorkService")
+public class PreventCJReportCheckTaskFromWorkServiceImpl
+ extends ServiceImpl<PreventCJReportCheckTaskFromWorkRepository, PreventCJReportCheckTaskFromWork> implements PreventCJReportCheckTaskFromWorkService {
+
+ @Autowired
+ private PreventCJReportCheckTaskFromWorkRepository preventCJReportCheckTaskFromWorkRepository;
+
+// /**
+// * 上报数据-任务配置-分页查询
+// */
+// @Override
+// public IPage<PreventCJReportCheckTaskFromWork> getReportTaskFromWorkPage(Page<Object> objectPage, PreventReportCheckTaskFromWorkReqDTO queryReqDTO) {
+// return preventCJReportCheckTaskFromWorkRepository.getReportTaskFromWorkPage(objectPage,queryReqDTO);
+// }
+ /**
+ * 插入数据
+ * */
+ @Override
+ public int insertTaskFromWorkList(PreventCJReportCheckTaskFromWork CJTaskFromWork) {
+ int result = preventCJReportCheckTaskFromWorkRepository.insertTaskFromWorkList(CJTaskFromWork);
+ if (result < 1){
+ throw new AusinessException(E.ADD_FAIL.getCode(), "CJ保存风险单元失败");
+ }
+ return result;
+ }
+
+ /**
+ * 任务配置 -查询待上报
+ * */
+ @Override
+ public List<PreventCJReportCheckTaskFromWork> listReportTaskFromWorkDate() {
+ return preventCJReportCheckTaskFromWorkRepository.listReportTaskFromWorkDate();
+ }
+ /**
+ * 任务配置 -待上报状态变更
+ * */
+ @Override
+ public void updateWorkReportStatus(HandlerReportParam handlerReportParam) {
+ int result = preventCJReportCheckTaskFromWorkRepository.updateWorkReportStatus(handlerReportParam);
+ if (result < 1){
+ throw new AusinessException(E.ADD_FAIL.getCode(), "任务-配置 状态变更失败");
+ }
+ }
+
+ /**
+ * 任务配置 -待上报状态变更 -通过id
+ * */
+ @Override
+ public void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam) {
+ int result = preventCJReportCheckTaskFromWorkRepository.updateCJReportStatusById(handlerCJReportParam);
+ if (result < 1){
+ throw new AusinessException(E.ADD_FAIL.getCode(), "任务-配置 状态变更失败");
+ }
+ }
+
+ @Override
+ public PreventCJReportCheckTaskFromWork geByMeasureUUidAndJobId(String measureUuid, Long jobId) {
+ return preventCJReportCheckTaskFromWorkRepository.geByMeasureUUidAndJobId(measureUuid, jobId);
+ }
+
+ @Override
+ public List<PreventCJReportCheckTaskFromWork> listWork() {
+ return preventCJReportCheckTaskFromWorkRepository.listWork();
+ }
+
+ @Override
+ public List<PreventCJReportCheckTaskFromWork> listWork1() {
+ return preventCJReportCheckTaskFromWorkRepository.listWork1();
+ }
+
+
+
+ @Override
+ public int updateInfo1(PreventCJReportCheckTaskFromWork work) {
+ return preventCJReportCheckTaskFromWorkRepository.updateInfo1(work);
+ }
+
+ @Override
+ public int updateInfo(PreventCJReportCheckTaskFromWork work) {
+ return preventCJReportCheckTaskFromWorkRepository.updateInfo(work);
+ }
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportConfigLogServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportConfigLogServiceImpl.java
index 9638ce7..1d53047 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportConfigLogServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportConfigLogServiceImpl.java
@@ -1,28 +1,28 @@
-package com.ruoyi.doublePrevention.service.baseService.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportConfigLog;
-import com.ruoyi.doublePrevention.repository.PreventCJReportConfigLogRepository;
-import com.ruoyi.doublePrevention.service.baseService.PreventCJReportConfigLogService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service("PreventCJReportConfigLogService")
-public class PreventCJReportConfigLogServiceImpl extends ServiceImpl<PreventCJReportConfigLogRepository, PreventCJReportConfigLog> implements PreventCJReportConfigLogService {
-
- @Autowired
- private PreventCJReportConfigLogRepository preventCJReportConfigLogRepository;
-
-// @Override
-// public int insertOldReportConfig(PreventReportConfigLog preventReportConfigLog) {
-// return preventReportConfigLogRepository.insert(preventReportConfigLog);
-// }
-//
-// /**
-// * 数据上报配置历史记录-查询
-// */
-// @Override
-// public IPage<PreventReportConfigLog> getReportConfigLogPage(Page<Object> page, PreventReportConfigLogQueryReqDTO queryReqDTO) {
-// return preventReportConfigLogRepository.getReportConfigLogPage(page, queryReqDTO);
-// }
-}
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportConfigLog;
+import com.ruoyi.doublePrevention.repository.PreventCJReportConfigLogRepository;
+import com.ruoyi.doublePrevention.service.baseService.PreventCJReportConfigLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service("PreventCJReportConfigLogService")
+public class PreventCJReportConfigLogServiceImpl extends ServiceImpl<PreventCJReportConfigLogRepository, PreventCJReportConfigLog> implements PreventCJReportConfigLogService {
+
+ @Autowired
+ private PreventCJReportConfigLogRepository preventCJReportConfigLogRepository;
+
+// @Override
+// public int insertOldReportConfig(PreventReportConfigLog preventReportConfigLog) {
+// return preventReportConfigLogRepository.insert(preventReportConfigLog);
+// }
+//
+// /**
+// * 数据上报配置历史记录-查询
+// */
+// @Override
+// public IPage<PreventReportConfigLog> getReportConfigLogPage(Page<Object> page, PreventReportConfigLogQueryReqDTO queryReqDTO) {
+// return preventReportConfigLogRepository.getReportConfigLogPage(page, queryReqDTO);
+// }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportConfigServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportConfigServiceImpl.java
index f8cded6..c593aed 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportConfigServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportConfigServiceImpl.java
@@ -1,43 +1,43 @@
-package com.ruoyi.doublePrevention.service.baseService.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportConfig;
-import com.ruoyi.doublePrevention.repository.PreventCJReportConfigRepository;
-import com.ruoyi.doublePrevention.repository.param.PreventReportConfigUpdateParams;
-import com.ruoyi.doublePrevention.service.baseService.PreventCJReportConfigService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("PreventCJReportConfigService")
-public class PreventCJReportConfigServiceImpl extends ServiceImpl<PreventCJReportConfigRepository, PreventCJReportConfig> implements PreventCJReportConfigService {
-
- @Autowired
- private PreventCJReportConfigRepository preventCJReportConfigRepository;
-
-// /**
-// * 数据上报配置-查询
-// */
-// @Override
-// public List<PreventCJReportConfig> ListReportConfigs() {
-// return preventCJReportConfigRepository.ListReportConfigs();
-// }
-
- /**
- * 数据上报配置-修改
- */
- @Override
- public int updateReportConfig(PreventReportConfigUpdateParams updateParams) {
- return preventCJReportConfigRepository.updateReportConfig(updateParams);
- }
-
- /**
- * 数据上报配置-按照id查询
- */
- @Override
- public PreventCJReportConfig getReportConfigById(int Id) {
- return preventCJReportConfigRepository.selectById(Id);
- }
-
-}
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportConfig;
+import com.ruoyi.doublePrevention.repository.PreventCJReportConfigRepository;
+import com.ruoyi.doublePrevention.repository.param.PreventReportConfigUpdateParams;
+import com.ruoyi.doublePrevention.service.baseService.PreventCJReportConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("PreventCJReportConfigService")
+public class PreventCJReportConfigServiceImpl extends ServiceImpl<PreventCJReportConfigRepository, PreventCJReportConfig> implements PreventCJReportConfigService {
+
+ @Autowired
+ private PreventCJReportConfigRepository preventCJReportConfigRepository;
+
+// /**
+// * 数据上报配置-查询
+// */
+// @Override
+// public List<PreventCJReportConfig> ListReportConfigs() {
+// return preventCJReportConfigRepository.ListReportConfigs();
+// }
+
+ /**
+ * 数据上报配置-修改
+ */
+ @Override
+ public int updateReportConfig(PreventReportConfigUpdateParams updateParams) {
+ return preventCJReportConfigRepository.updateReportConfig(updateParams);
+ }
+
+ /**
+ * 数据上报配置-按照id查询
+ */
+ @Override
+ public PreventCJReportConfig getReportConfigById(int Id) {
+ return preventCJReportConfigRepository.selectById(Id);
+ }
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportDangerInfoServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportDangerInfoServiceImpl.java
index 4a70768..0c8da32 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportDangerInfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportDangerInfoServiceImpl.java
@@ -1,70 +1,70 @@
-package com.ruoyi.doublePrevention.service.baseService.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo;
-import com.ruoyi.doublePrevention.enums.E;
-import com.ruoyi.doublePrevention.exception.AusinessException;
-import com.ruoyi.doublePrevention.repository.PreventCJReportDangerInfoRepository;
-import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-import com.ruoyi.doublePrevention.service.baseService.PreventCJReportDangerInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("PreventCJReportDangerInfoService")
-public class PreventCJReportDangerInfoServiceImpl
- extends ServiceImpl<PreventCJReportDangerInfoRepository, PreventCJReportDangerInfo> implements PreventCJReportDangerInfoService {
-
- @Autowired
- private PreventCJReportDangerInfoRepository preventCJReportDangerInfoRepository;
-
- /**
- * 插入隐患信息
- * */
- @Override
- public int insert(PreventCJReportDangerInfo danger) {
- return preventCJReportDangerInfoRepository.insertDangerInfo(danger);
- }
-// /**
-// * 上报数据-隐患信息-分页查询
-// */
-// @Override
-// public IPage<PreventCJReportDangerInfo> getReportDangerInfoPage(Page<Object> objectPage, PreventReportDangerInfoReqDTO queryReqDTO) {
-// return preventCJReportDangerInfoRepository.getReportDangerInfoPage(objectPage, queryReqDTO);
-// }
-
- /**
- * 上报数据-待上报数据查询
- */
- @Override
- public List<PreventCJReportDangerInfo> listReportDangerDate() {
- return preventCJReportDangerInfoRepository.listReportDangerDate();
- }
- /**
- * 上报数据-待上报状态变更
- */
- @Override
- public void updateTaskReportStatus(HandlerReportParam handlerReportParam) {
- int result = preventCJReportDangerInfoRepository.updateTaskReportStatus(handlerReportParam);
- if (result < 0){
- throw new AusinessException(E.UPDATE_FAIL.getCode(), "隐患信息状态变更失败");
- }
- }
- /**
- * 上报数据-待上报状态变更-通过id
- */
- @Override
- public void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam) {
- int result = preventCJReportDangerInfoRepository.updateCJReportStatusById(handlerCJReportParam);
- if (result < 0){
- throw new AusinessException(E.UPDATE_FAIL.getCode(), "隐患信息状态变更失败");
- }
- }
-
- @Override
- public List<PreventCJReportDangerInfo> getDangerListForCheckTask() {
- return preventCJReportDangerInfoRepository.getDangerListForCheckTask();
- }
-}
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo;
+import com.ruoyi.doublePrevention.enums.E;
+import com.ruoyi.doublePrevention.exception.AusinessException;
+import com.ruoyi.doublePrevention.repository.PreventCJReportDangerInfoRepository;
+import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import com.ruoyi.doublePrevention.service.baseService.PreventCJReportDangerInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("PreventCJReportDangerInfoService")
+public class PreventCJReportDangerInfoServiceImpl
+ extends ServiceImpl<PreventCJReportDangerInfoRepository, PreventCJReportDangerInfo> implements PreventCJReportDangerInfoService {
+
+ @Autowired
+ private PreventCJReportDangerInfoRepository preventCJReportDangerInfoRepository;
+
+ /**
+ * 插入隐患信息
+ * */
+ @Override
+ public int insert(PreventCJReportDangerInfo danger) {
+ return preventCJReportDangerInfoRepository.insertDangerInfo(danger);
+ }
+// /**
+// * 上报数据-隐患信息-分页查询
+// */
+// @Override
+// public IPage<PreventCJReportDangerInfo> getReportDangerInfoPage(Page<Object> objectPage, PreventReportDangerInfoReqDTO queryReqDTO) {
+// return preventCJReportDangerInfoRepository.getReportDangerInfoPage(objectPage, queryReqDTO);
+// }
+
+ /**
+ * 上报数据-待上报数据查询
+ */
+ @Override
+ public List<PreventCJReportDangerInfo> listReportDangerDate() {
+ return preventCJReportDangerInfoRepository.listReportDangerDate();
+ }
+ /**
+ * 上报数据-待上报状态变更
+ */
+ @Override
+ public void updateTaskReportStatus(HandlerReportParam handlerReportParam) {
+ int result = preventCJReportDangerInfoRepository.updateTaskReportStatus(handlerReportParam);
+ if (result < 0){
+ throw new AusinessException(E.UPDATE_FAIL.getCode(), "隐患信息状态变更失败");
+ }
+ }
+ /**
+ * 上报数据-待上报状态变更-通过id
+ */
+ @Override
+ public void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam) {
+ int result = preventCJReportDangerInfoRepository.updateCJReportStatusById(handlerCJReportParam);
+ if (result < 0){
+ throw new AusinessException(E.UPDATE_FAIL.getCode(), "隐患信息状态变更失败");
+ }
+ }
+
+ @Override
+ public List<PreventCJReportDangerInfo> getDangerListForCheckTask() {
+ return preventCJReportDangerInfoRepository.getDangerListForCheckTask();
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportOverhaulLogServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportOverhaulLogServiceImpl.java
index 44a577e..2daf52d 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportOverhaulLogServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportOverhaulLogServiceImpl.java
@@ -1,33 +1,33 @@
-package com.ruoyi.doublePrevention.service.baseService.impl;
-
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportOverhaulLog;
-import com.ruoyi.doublePrevention.repository.PreventCJReportOverhaulLogRepository;
-import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
-import com.ruoyi.doublePrevention.service.baseService.PreventCJReportOverhaulLogService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class PreventCJReportOverhaulLogServiceImpl implements PreventCJReportOverhaulLogService {
-
- @Autowired
- private PreventCJReportOverhaulLogRepository cjReportOverhaulLogRepository;
-
-
- @Override
- public int insertCJOverhaulLists(PreventCJReportOverhaulLog cjOverhaulLog) {
- return cjReportOverhaulLogRepository.insertCJOverhaulLists(cjOverhaulLog);
- }
-
- @Override
- public List<PreventCJReportOverhaulLog> listReportOverhaulDate() {
- return cjReportOverhaulLogRepository.listReportOverhaulDate();
- }
-
- @Override
- public int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam) {
- return cjReportOverhaulLogRepository.updateCJReportStatusById(handlerCJReportParam);
- }
-}
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportOverhaulLog;
+import com.ruoyi.doublePrevention.repository.PreventCJReportOverhaulLogRepository;
+import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
+import com.ruoyi.doublePrevention.service.baseService.PreventCJReportOverhaulLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PreventCJReportOverhaulLogServiceImpl implements PreventCJReportOverhaulLogService {
+
+ @Autowired
+ private PreventCJReportOverhaulLogRepository cjReportOverhaulLogRepository;
+
+
+ @Override
+ public int insertCJOverhaulLists(PreventCJReportOverhaulLog cjOverhaulLog) {
+ return cjReportOverhaulLogRepository.insertCJOverhaulLists(cjOverhaulLog);
+ }
+
+ @Override
+ public List<PreventCJReportOverhaulLog> listReportOverhaulDate() {
+ return cjReportOverhaulLogRepository.listReportOverhaulDate();
+ }
+
+ @Override
+ public int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam) {
+ return cjReportOverhaulLogRepository.updateCJReportStatusById(handlerCJReportParam);
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportPointServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportPointServiceImpl.java
index 520386d..c606496 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportPointServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportPointServiceImpl.java
@@ -1,11 +1,11 @@
-package com.ruoyi.doublePrevention.service.baseService.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportPoint;
-import com.ruoyi.doublePrevention.repository.PreventCJReportPointRepository;
-import com.ruoyi.doublePrevention.service.baseService.PreventCJReportPointService;
-import org.springframework.stereotype.Service;
-
-@Service("PreventCJReportPointService")
-public class PreventCJReportPointServiceImpl extends ServiceImpl<PreventCJReportPointRepository, PreventCJReportPoint> implements PreventCJReportPointService {
-}
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportPoint;
+import com.ruoyi.doublePrevention.repository.PreventCJReportPointRepository;
+import com.ruoyi.doublePrevention.service.baseService.PreventCJReportPointService;
+import org.springframework.stereotype.Service;
+
+@Service("PreventCJReportPointService")
+public class PreventCJReportPointServiceImpl extends ServiceImpl<PreventCJReportPointRepository, PreventCJReportPoint> implements PreventCJReportPointService {
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportResultDataServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportResultDataServiceImpl.java
index ecd00e6..1e1c9c8 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportResultDataServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportResultDataServiceImpl.java
@@ -1,16 +1,16 @@
-package com.ruoyi.doublePrevention.service.baseService.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportResultData;
-import com.ruoyi.doublePrevention.repository.PreventCJReportResultDataRepository;
-import com.ruoyi.doublePrevention.service.baseService.PreventCJReportResultDataService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service("PreventCJReportResultDataService")
-public class PreventCJReportResultDataServiceImpl extends ServiceImpl<PreventCJReportResultDataRepository, PreventCJReportResultData> implements PreventCJReportResultDataService {
-
- @Autowired
- private PreventCJReportResultDataRepository preventCJReportResultDataRepository;
-
-}
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportResultData;
+import com.ruoyi.doublePrevention.repository.PreventCJReportResultDataRepository;
+import com.ruoyi.doublePrevention.service.baseService.PreventCJReportResultDataService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service("PreventCJReportResultDataService")
+public class PreventCJReportResultDataServiceImpl extends ServiceImpl<PreventCJReportResultDataRepository, PreventCJReportResultData> implements PreventCJReportResultDataService {
+
+ @Autowired
+ private PreventCJReportResultDataRepository preventCJReportResultDataRepository;
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskAnaUnitServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskAnaUnitServiceImpl.java
index 8c9c955..3718bdd 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskAnaUnitServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskAnaUnitServiceImpl.java
@@ -1,72 +1,72 @@
-package com.ruoyi.doublePrevention.service.baseService.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskAnaUnit;
-import com.ruoyi.doublePrevention.enums.E;
-import com.ruoyi.doublePrevention.exception.AusinessException;
-import com.ruoyi.doublePrevention.repository.PreventCJReportRiskAnaUnitRepository;
-import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-import com.ruoyi.doublePrevention.service.baseService.PreventCJReportRiskAnaUnitService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("PreventCJReportRiskAnaUnitService")
-public class PreventCJReportRiskAnaUnitServiceImpl
- extends ServiceImpl<PreventCJReportRiskAnaUnitRepository, PreventCJReportRiskAnaUnit> implements PreventCJReportRiskAnaUnitService {
-
- @Autowired
- private PreventCJReportRiskAnaUnitRepository preventCJReportRiskAnaUnitRepository;
-
-// /**
-// * 上报数据-风险分析单元-分页查询
-// */
-// @Override
-// public IPage<PreventCJReportRiskAnaUnit> getReportRiskUnitPage(Page<Object> page, PreReportRiskUnitQueryReqDTO queryReqDTO) {
-// return preventCJReportRiskAnaUnitRepository.getReportRiskUnitPage(page, queryReqDTO);
-// }
-
- /**
- * 上报数据-插入
- */
- @Override
- public int insertUnitList(PreventCJReportRiskAnaUnit unit) {
- int result = preventCJReportRiskAnaUnitRepository.insertUnitList(unit);
- if (result < 1){
- throw new AusinessException(E.ADD_FAIL.getCode(), "保存CJ风险单元失败");
- }
- return result;
- }
-
- /**
- * 上报数据-查询待上报数据
- */
- @Override
- public List<PreventCJReportRiskAnaUnit> listReportUnitDate() {
- return preventCJReportRiskAnaUnitRepository.listReportUnitDate();
- }
-
- /**
- * 上报数据-修改待上报
- */
- @Override
- public void updateReportStatus(HandlerReportParam handlerReportParam) {
- int result = preventCJReportRiskAnaUnitRepository.updateReportStatus();
- if (result < 1){
- throw new AusinessException(E.ADD_FAIL.getCode(), "CJ保存风险单元失败");
- }
- }
-
- /**
- * 上报数据-修改待上报-通过id
- */
- @Override
- public void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam) {
- int result = preventCJReportRiskAnaUnitRepository.updateCJReportStatusById(handlerCJReportParam);
- if (result < 1){
- throw new AusinessException(E.ADD_FAIL.getCode(), "CJ保存风险单元失败");
- }
- }
-}
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskAnaUnit;
+import com.ruoyi.doublePrevention.enums.E;
+import com.ruoyi.doublePrevention.exception.AusinessException;
+import com.ruoyi.doublePrevention.repository.PreventCJReportRiskAnaUnitRepository;
+import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import com.ruoyi.doublePrevention.service.baseService.PreventCJReportRiskAnaUnitService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("PreventCJReportRiskAnaUnitService")
+public class PreventCJReportRiskAnaUnitServiceImpl
+ extends ServiceImpl<PreventCJReportRiskAnaUnitRepository, PreventCJReportRiskAnaUnit> implements PreventCJReportRiskAnaUnitService {
+
+ @Autowired
+ private PreventCJReportRiskAnaUnitRepository preventCJReportRiskAnaUnitRepository;
+
+// /**
+// * 上报数据-风险分析单元-分页查询
+// */
+// @Override
+// public IPage<PreventCJReportRiskAnaUnit> getReportRiskUnitPage(Page<Object> page, PreReportRiskUnitQueryReqDTO queryReqDTO) {
+// return preventCJReportRiskAnaUnitRepository.getReportRiskUnitPage(page, queryReqDTO);
+// }
+
+ /**
+ * 上报数据-插入
+ */
+ @Override
+ public int insertUnitList(PreventCJReportRiskAnaUnit unit) {
+ int result = preventCJReportRiskAnaUnitRepository.insertUnitList(unit);
+ if (result < 1){
+ throw new AusinessException(E.ADD_FAIL.getCode(), "保存CJ风险单元失败");
+ }
+ return result;
+ }
+
+ /**
+ * 上报数据-查询待上报数据
+ */
+ @Override
+ public List<PreventCJReportRiskAnaUnit> listReportUnitDate() {
+ return preventCJReportRiskAnaUnitRepository.listReportUnitDate();
+ }
+
+ /**
+ * 上报数据-修改待上报
+ */
+ @Override
+ public void updateReportStatus(HandlerReportParam handlerReportParam) {
+ int result = preventCJReportRiskAnaUnitRepository.updateReportStatus();
+ if (result < 1){
+ throw new AusinessException(E.ADD_FAIL.getCode(), "CJ保存风险单元失败");
+ }
+ }
+
+ /**
+ * 上报数据-修改待上报-通过id
+ */
+ @Override
+ public void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam) {
+ int result = preventCJReportRiskAnaUnitRepository.updateCJReportStatusById(handlerCJReportParam);
+ if (result < 1){
+ throw new AusinessException(E.ADD_FAIL.getCode(), "CJ保存风险单元失败");
+ }
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskControlMeasureServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskControlMeasureServiceImpl.java
index 2d7a100..481e5b5 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskControlMeasureServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskControlMeasureServiceImpl.java
@@ -1,70 +1,70 @@
-package com.ruoyi.doublePrevention.service.baseService.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskControlMeasure;
-import com.ruoyi.doublePrevention.enums.E;
-import com.ruoyi.doublePrevention.exception.AusinessException;
-import com.ruoyi.doublePrevention.repository.PreventCJReportRiskControlMeasureRepository;
-import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-import com.ruoyi.doublePrevention.service.baseService.PreventCJReportRiskControlMeasureService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("PreventCJReportRiskControlMeasureService")
-public class PreventCJReportRiskControlMeasureServiceImpl
- extends ServiceImpl<PreventCJReportRiskControlMeasureRepository, PreventCJReportRiskControlMeasure> implements PreventCJReportRiskControlMeasureService {
-
- @Autowired
- private PreventCJReportRiskControlMeasureRepository preventCJReportRiskControlMeasureRepository;
-
-// /**
-// * 上报数据-管控措施-分页查询
-// */
-// @Override
-// public IPage<PreventCJReportRiskControlMeasure> getReportMeasurePage(Page<Object> objectPage, PreventReportRiskControlMeasureReqDTO queryReqDTO) {
-// return preventCJReportRiskControlMeasureRepository.getReportMeasurePage(objectPage, queryReqDTO);
-// }
- /**
- * 插入管控措施上报数据
- * */
- @Override
- public int insertMeasureList(PreventCJReportRiskControlMeasure CJMeasure) {
- int result = preventCJReportRiskControlMeasureRepository.insertMeasureList(CJMeasure);
- if (result < 1){
- throw new AusinessException(E.ADD_FAIL.getCode(), "保存风险单元失败");
- }
- return result;
- }
-
- /**
- * 管控措施-上报数据
- * */
- @Override
- public List<PreventCJReportRiskControlMeasure> listReportMeasureDate() {
- return preventCJReportRiskControlMeasureRepository.listReportMeasureDate();
- }
-
- /**
- * 管控措施-修改上报状态
- * */
- @Override
- public void updateMeasureReportStatus(HandlerReportParam handlerReportParam) {
- int result = preventCJReportRiskControlMeasureRepository.updateMeasureReportStatus(handlerReportParam);
- if (result < 1){
- throw new AusinessException(E.ADD_FAIL.getCode(), "风险单元状态更新失败");
- }
- }
- /**
- * 管控措施-修改上报状态-通过id
- * */
- @Override
- public void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam) {
- int result = preventCJReportRiskControlMeasureRepository.updateCJReportStatusById(handlerCJReportParam);
- if (result < 1){
- throw new AusinessException(E.ADD_FAIL.getCode(), "风险单元状态更新失败");
- }
- }
-}
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskControlMeasure;
+import com.ruoyi.doublePrevention.enums.E;
+import com.ruoyi.doublePrevention.exception.AusinessException;
+import com.ruoyi.doublePrevention.repository.PreventCJReportRiskControlMeasureRepository;
+import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import com.ruoyi.doublePrevention.service.baseService.PreventCJReportRiskControlMeasureService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("PreventCJReportRiskControlMeasureService")
+public class PreventCJReportRiskControlMeasureServiceImpl
+ extends ServiceImpl<PreventCJReportRiskControlMeasureRepository, PreventCJReportRiskControlMeasure> implements PreventCJReportRiskControlMeasureService {
+
+ @Autowired
+ private PreventCJReportRiskControlMeasureRepository preventCJReportRiskControlMeasureRepository;
+
+// /**
+// * 上报数据-管控措施-分页查询
+// */
+// @Override
+// public IPage<PreventCJReportRiskControlMeasure> getReportMeasurePage(Page<Object> objectPage, PreventReportRiskControlMeasureReqDTO queryReqDTO) {
+// return preventCJReportRiskControlMeasureRepository.getReportMeasurePage(objectPage, queryReqDTO);
+// }
+ /**
+ * 插入管控措施上报数据
+ * */
+ @Override
+ public int insertMeasureList(PreventCJReportRiskControlMeasure CJMeasure) {
+ int result = preventCJReportRiskControlMeasureRepository.insertMeasureList(CJMeasure);
+ if (result < 1){
+ throw new AusinessException(E.ADD_FAIL.getCode(), "保存风险单元失败");
+ }
+ return result;
+ }
+
+ /**
+ * 管控措施-上报数据
+ * */
+ @Override
+ public List<PreventCJReportRiskControlMeasure> listReportMeasureDate() {
+ return preventCJReportRiskControlMeasureRepository.listReportMeasureDate();
+ }
+
+ /**
+ * 管控措施-修改上报状态
+ * */
+ @Override
+ public void updateMeasureReportStatus(HandlerReportParam handlerReportParam) {
+ int result = preventCJReportRiskControlMeasureRepository.updateMeasureReportStatus(handlerReportParam);
+ if (result < 1){
+ throw new AusinessException(E.ADD_FAIL.getCode(), "风险单元状态更新失败");
+ }
+ }
+ /**
+ * 管控措施-修改上报状态-通过id
+ * */
+ @Override
+ public void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam) {
+ int result = preventCJReportRiskControlMeasureRepository.updateCJReportStatusById(handlerCJReportParam);
+ if (result < 1){
+ throw new AusinessException(E.ADD_FAIL.getCode(), "风险单元状态更新失败");
+ }
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskEventServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskEventServiceImpl.java
index 07dd7fc..391fdae 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskEventServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventCJReportRiskEventServiceImpl.java
@@ -1,74 +1,74 @@
-package com.ruoyi.doublePrevention.service.baseService.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskEvent;
-import com.ruoyi.doublePrevention.enums.E;
-import com.ruoyi.doublePrevention.exception.AusinessException;
-import com.ruoyi.doublePrevention.repository.PreventCJReportRiskEventRepository;
-import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-import com.ruoyi.doublePrevention.service.baseService.PreventCJReportRiskEventService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("PreventCJReportRiskEventService")
-public class PreventCJReportRiskEventServiceImpl
- extends ServiceImpl<PreventCJReportRiskEventRepository, PreventCJReportRiskEvent> implements PreventCJReportRiskEventService {
-
- @Autowired
- private PreventCJReportRiskEventRepository preventCJReportRiskEventRepository;
-
-
-// /**
-// * 分页查询
-// * */
-// @Override
-// public IPage<PreventCJReportRiskEvent> getReportRiskEventPage(Page<Object> objectPage, PreReportRiskEventQueryReqDTO queryReqDTO) {
-// return preventCJReportRiskEventRepository.getReportRiskEventPage(objectPage, queryReqDTO);
-// }
-
- /**
- * 插入
- * */
- @Override
- public int insertEventLists(PreventCJReportRiskEvent event) {
- int result = preventCJReportRiskEventRepository.insertEventLists(event);
- if (result < 1){
- throw new AusinessException(E.ADD_FAIL.getCode(), "保存CJ风险单元失败");
- }
- return result;
- }
-
- /**
- * 上报数据-查询待上报数据
- * */
- @Override
- public List<PreventCJReportRiskEvent> listReportEventDate() {
- return preventCJReportRiskEventRepository.listReportEventDate();
- }
-
- /**
- * 修改上报状态
- * */
- @Override
- public int updateEventReportStatus(HandlerReportParam handlerReportParam) {
- int result = preventCJReportRiskEventRepository.updateEventReportStatus(handlerReportParam);
- if (result < 1){
- throw new AusinessException(E.ADD_FAIL.getCode(), "修改上报-事件状态失败");
- }
- return result;
- }
-
- /**
- * 修改上报状态-通过id
- * */
- @Override
- public void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam) {
- int result = preventCJReportRiskEventRepository.updateCJReportStatusById(handlerCJReportParam);
- if (result < 1){
- throw new AusinessException(E.ADD_FAIL.getCode(), "修改上报-事件状态失败");
- }
- }
-}
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskEvent;
+import com.ruoyi.doublePrevention.enums.E;
+import com.ruoyi.doublePrevention.exception.AusinessException;
+import com.ruoyi.doublePrevention.repository.PreventCJReportRiskEventRepository;
+import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import com.ruoyi.doublePrevention.service.baseService.PreventCJReportRiskEventService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("PreventCJReportRiskEventService")
+public class PreventCJReportRiskEventServiceImpl
+ extends ServiceImpl<PreventCJReportRiskEventRepository, PreventCJReportRiskEvent> implements PreventCJReportRiskEventService {
+
+ @Autowired
+ private PreventCJReportRiskEventRepository preventCJReportRiskEventRepository;
+
+
+// /**
+// * 分页查询
+// * */
+// @Override
+// public IPage<PreventCJReportRiskEvent> getReportRiskEventPage(Page<Object> objectPage, PreReportRiskEventQueryReqDTO queryReqDTO) {
+// return preventCJReportRiskEventRepository.getReportRiskEventPage(objectPage, queryReqDTO);
+// }
+
+ /**
+ * 插入
+ * */
+ @Override
+ public int insertEventLists(PreventCJReportRiskEvent event) {
+ int result = preventCJReportRiskEventRepository.insertEventLists(event);
+ if (result < 1){
+ throw new AusinessException(E.ADD_FAIL.getCode(), "保存CJ风险单元失败");
+ }
+ return result;
+ }
+
+ /**
+ * 上报数据-查询待上报数据
+ * */
+ @Override
+ public List<PreventCJReportRiskEvent> listReportEventDate() {
+ return preventCJReportRiskEventRepository.listReportEventDate();
+ }
+
+ /**
+ * 修改上报状态
+ * */
+ @Override
+ public int updateEventReportStatus(HandlerReportParam handlerReportParam) {
+ int result = preventCJReportRiskEventRepository.updateEventReportStatus(handlerReportParam);
+ if (result < 1){
+ throw new AusinessException(E.ADD_FAIL.getCode(), "修改上报-事件状态失败");
+ }
+ return result;
+ }
+
+ /**
+ * 修改上报状态-通过id
+ * */
+ @Override
+ public void updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam) {
+ int result = preventCJReportRiskEventRepository.updateCJReportStatusById(handlerCJReportParam);
+ if (result < 1){
+ throw new AusinessException(E.ADD_FAIL.getCode(), "修改上报-事件状态失败");
+ }
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventOverhaulLogServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventOverhaulLogServiceImpl.java
index 5851b23..91f5c5d 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventOverhaulLogServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventOverhaulLogServiceImpl.java
@@ -1,247 +1,247 @@
-package com.ruoyi.doublePrevention.service.baseService.impl;
-
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
-import com.ruoyi.common.exception.BusinessException;
-import com.ruoyi.common.utils.BeanCopyUtils;
-import com.ruoyi.common.utils.text.Convert;
-import com.ruoyi.doublePrevention.entity.PreventOverhaulLog;
-import com.ruoyi.doublePrevention.entity.PreventReportConfig;
-import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogInsertReqBO;
-import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogReqBO;
-import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogUpdateReqBO;
-import com.ruoyi.doublePrevention.entity.dto.resp.PreventOverhaulLogRespDTO;
-import com.ruoyi.doublePrevention.enums.ErrorCodes;
-import com.ruoyi.doublePrevention.enums.SyncEnum;
-import com.ruoyi.doublePrevention.repository.PreventOverhaulLogRepository;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-import com.ruoyi.doublePrevention.service.baseService.PreventOverhaulLogService;
-import com.ruoyi.doublePrevention.service.baseService.PreventReportConfigService;
-import com.ruoyi.doublePrevention.vo.ResultVO;
-import com.ruoyi.project.system.user.domain.User;
-import com.ruoyi.project.tr.riskList.domain.RiskList;
-import com.ruoyi.project.tr.riskList.service.IRiskListService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
-
-import static com.ruoyi.common.utils.security.ShiroUtils.getSysUser;
-
-@Service
-public class PreventOverhaulLogServiceImpl implements PreventOverhaulLogService {
-
- @Autowired
- private PreventOverhaulLogRepository overhaulLogRepository;
- @Autowired
- private PreventReportConfigService preventReportConfigService;
- @Autowired
- private IRiskListService iRiskListService;
-
-
- @Override
- public ResultVO<PreventOverhaulLogRespDTO> selectOverhaulLogPage(PreventOverhaulLogReqBO overhaulLogReqBO) {
-
- ResultVO resultVO = new ResultVO<>();
-
- if (ObjectUtils.isEmpty(overhaulLogReqBO.getPageSize())){
- throw new BusinessException("分页信息不能为空");
- }
- if (ObjectUtils.isEmpty(overhaulLogReqBO.getPageNum())){
- throw new BusinessException("分页信息不能为空");
- }
- Integer pageIndex = overhaulLogReqBO.getPageNum();
- Integer pageSize = overhaulLogReqBO.getPageSize();
-
- Page<PreventOverhaulLog> page = PageHelper.startPage(pageIndex, pageSize);
- List<PreventOverhaulLog> preventOverhaulLogs = overhaulLogRepository.selectOverhaulLogPage(overhaulLogReqBO);
- List<PreventOverhaulLog> result = page.getResult();
-
- List<PreventOverhaulLogRespDTO> preventOverhaulLogRespDTOS = BeanCopyUtils.copyBeanList(result, PreventOverhaulLogRespDTO.class);
-
- List<RiskList> riskUnitLists = iRiskListService.getRiskUnitLists();
- for (PreventOverhaulLogRespDTO overhaulLog : preventOverhaulLogRespDTOS) {
- for (RiskList riskUnit : riskUnitLists) {
- if (overhaulLog.getRiskUnitId() == riskUnit.getRiskListId()){
- overhaulLog.setRiskUnitName(riskUnit.getRiskListName());
- }
- }
- }
-
- resultVO.setData(preventOverhaulLogRespDTOS);
- resultVO.setCount((int) page.getTotal());
- resultVO.setPageNum(page.getPageNum());
- resultVO.setPageSize(page.getPageSize());
-
- return resultVO;
- }
-
- @Override
- public ResultVO<PreventOverhaulLog> savePreventOverhaulLog(PreventOverhaulLogInsertReqBO insertReqBO) {
-
- User sysUser = getSysUser();
- ResultVO resultVO = new ResultVO<>();
- resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
-
-
- if (ObjectUtils.isEmpty(insertReqBO.getRiskUnitId())){
- throw new RuntimeException("安全风险分析单元为空");
- }
- if (ObjectUtils.isEmpty(insertReqBO.getStopStartTime())){
- throw new RuntimeException("装置停用或者检维修开始时间为空");
- }
- if (ObjectUtils.isEmpty(insertReqBO.getStopEndTime())){
- throw new RuntimeException("装置停用或者检维修结束时间为空");
- }
- if (insertReqBO.getStopReason().isEmpty()){
- throw new RuntimeException("停用原因为空");
- }
-
- Date date = new Date();
- String uuid = UUID.randomUUID().toString();
-
- PreventOverhaulLog preventOverhaulLog = BeanCopyUtils.copyBean(insertReqBO, PreventOverhaulLog.class);
-
- preventOverhaulLog.setUuid(uuid);
- preventOverhaulLog.setDeleteStatus((byte) 0);
- preventOverhaulLog.setCreateByUserName(sysUser.getUserName());
- preventOverhaulLog.setGmtCreate(date);
- preventOverhaulLog.setLastEditUserName(sysUser.getUserName());
- preventOverhaulLog.setGmtModitify(date);
-
- //todo 对所属企业id和uuid没有进行设置
- PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());
- //设置上报时间为空
- preventOverhaulLog.setReportTime(null);
- //设置本条数据上报更新时间
- preventOverhaulLog.setUpdateReportDataTime(date);
- //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
- if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
- && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
- //设置上报状态为-等待上报
- preventOverhaulLog.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- //设置本条数据上报开关为-开启
- preventOverhaulLog.setReportSwitch(SyncEnum.REPORT_ON.getCode());
- //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
- }else {
- //设置上报状态为-不上报
- preventOverhaulLog.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
- //设置本条数据上报开关为-关闭
- preventOverhaulLog.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
- }
-
- int result = overhaulLogRepository.savePreventOverhaulLog(preventOverhaulLog);
-
- resultVO.setCount(result);
- resultVO.setCode("200");
- resultVO.setMsg("保存成功");
-
- return resultVO;
- }
-
- /**
- * 查询 by id
- * */
- @Override
- public PreventOverhaulLog getOverhaulLogById(Long id) {
- return overhaulLogRepository.getOverhaulLogById(id);
- }
-
- /**
- * 修改保存
- * */
- @Override
- public ResultVO<PreventOverhaulLog> updateOverhaulLog(PreventOverhaulLogUpdateReqBO updateReqBO) {
-
-
- User sysUser = getSysUser();
- ResultVO resultVO = new ResultVO<>();
- resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
-
- resultVO.setCode("200");
- resultVO.setMsg("保存成功");
-
- if (ObjectUtils.isEmpty(updateReqBO.getId())){
- throw new RuntimeException("所选记录不能为空");
- }
- PreventOverhaulLog overhaulLogById = overhaulLogRepository.getOverhaulLogById(updateReqBO.getId());
- if (ObjectUtils.isEmpty(overhaulLogById)){
- throw new RuntimeException("记录不存在或已被被删除");
- }
- if (ObjectUtils.isEmpty(updateReqBO.getRiskUnitId())){
- throw new RuntimeException("安全风险分析单元为空");
- }
- if (ObjectUtils.isEmpty(updateReqBO.getStopStartTime())){
- throw new RuntimeException("装置停用或者检维修开始时间为空");
- }
- if (ObjectUtils.isEmpty(updateReqBO.getStopEndTime())){
- throw new RuntimeException("装置停用或者检维修结束时间为空");
- }
- if (updateReqBO.getStopReason().isEmpty()){
- throw new RuntimeException("停用原因为空");
- }
-
- Date date = new Date();
- String uuid = UUID.randomUUID().toString();
-
- PreventOverhaulLog preventOverhaulLog = BeanCopyUtils.copyBean(updateReqBO, PreventOverhaulLog.class);
-
- preventOverhaulLog.setUuid(uuid);
- preventOverhaulLog.setDeleteStatus((byte) 0);
- preventOverhaulLog.setLastEditUserName(sysUser.getUserName());
- preventOverhaulLog.setGmtModitify(date);
- preventOverhaulLog.setLastEditUserName(sysUser.getUserName());
- preventOverhaulLog.setGmtModitify(date);
-
-
- //todo 对所属企业id和uuid没有进行设置
- PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());
- //设置上报时间为空
- preventOverhaulLog.setReportTime(null);
- //设置本条数据上报更新时间
- preventOverhaulLog.setUpdateReportDataTime(date);
- //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
- if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
- && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
- //设置上报状态为-等待上报
- preventOverhaulLog.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- //设置本条数据上报开关为-开启
- preventOverhaulLog.setReportSwitch(SyncEnum.REPORT_ON.getCode());
- //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
- }else {
- //设置上报状态为-不上报
- preventOverhaulLog.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
- //设置本条数据上报开关为-关闭
- preventOverhaulLog.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
- }
-
- int result = overhaulLogRepository.updateOverhaulLog(preventOverhaulLog);
- if (result < 1){
- throw new RuntimeException("操作失败");
- }
-
- resultVO.setCount(result);
-
- return resultVO;
- }
-
- @Override
- public int deleteOverhaulLogByIds(String ids) {
- return overhaulLogRepository.deleteOverhaulLogByIds(Convert.toStrArray(ids));
- }
-
- @Override
- public List<PreventOverhaulLog> listReportOverhaulLog() {
- return overhaulLogRepository.listReportOverhaulLog();
- }
-
- @Override
- public int updateOverhaulReportStatus(HandlerReportParam handlerReportParam) {
- return overhaulLogRepository.updateOverhaulReportStatus(handlerReportParam);
- }
-
-
-}
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.ruoyi.common.exception.BusinessException;
+import com.ruoyi.common.utils.BeanCopyUtils;
+import com.ruoyi.common.utils.text.Convert;
+import com.ruoyi.doublePrevention.entity.PreventOverhaulLog;
+import com.ruoyi.doublePrevention.entity.PreventReportConfig;
+import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogInsertReqBO;
+import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogReqBO;
+import com.ruoyi.doublePrevention.entity.dto.req.PreventOverhaulLogUpdateReqBO;
+import com.ruoyi.doublePrevention.entity.dto.resp.PreventOverhaulLogRespDTO;
+import com.ruoyi.doublePrevention.enums.ErrorCodes;
+import com.ruoyi.doublePrevention.enums.SyncEnum;
+import com.ruoyi.doublePrevention.repository.PreventOverhaulLogRepository;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import com.ruoyi.doublePrevention.service.baseService.PreventOverhaulLogService;
+import com.ruoyi.doublePrevention.service.baseService.PreventReportConfigService;
+import com.ruoyi.doublePrevention.vo.ResultVO;
+import com.ruoyi.project.system.user.domain.User;
+import com.ruoyi.project.tr.riskList.domain.RiskList;
+import com.ruoyi.project.tr.riskList.service.IRiskListService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+import static com.ruoyi.common.utils.security.ShiroUtils.getSysUser;
+
+@Service
+public class PreventOverhaulLogServiceImpl implements PreventOverhaulLogService {
+
+ @Autowired
+ private PreventOverhaulLogRepository overhaulLogRepository;
+ @Autowired
+ private PreventReportConfigService preventReportConfigService;
+ @Autowired
+ private IRiskListService iRiskListService;
+
+
+ @Override
+ public ResultVO<PreventOverhaulLogRespDTO> selectOverhaulLogPage(PreventOverhaulLogReqBO overhaulLogReqBO) {
+
+ ResultVO resultVO = new ResultVO<>();
+
+ if (ObjectUtils.isEmpty(overhaulLogReqBO.getPageSize())){
+ throw new BusinessException("分页信息不能为空");
+ }
+ if (ObjectUtils.isEmpty(overhaulLogReqBO.getPageNum())){
+ throw new BusinessException("分页信息不能为空");
+ }
+ Integer pageIndex = overhaulLogReqBO.getPageNum();
+ Integer pageSize = overhaulLogReqBO.getPageSize();
+
+ Page<PreventOverhaulLog> page = PageHelper.startPage(pageIndex, pageSize);
+ List<PreventOverhaulLog> preventOverhaulLogs = overhaulLogRepository.selectOverhaulLogPage(overhaulLogReqBO);
+ List<PreventOverhaulLog> result = page.getResult();
+
+ List<PreventOverhaulLogRespDTO> preventOverhaulLogRespDTOS = BeanCopyUtils.copyBeanList(result, PreventOverhaulLogRespDTO.class);
+
+ List<RiskList> riskUnitLists = iRiskListService.getRiskUnitLists();
+ for (PreventOverhaulLogRespDTO overhaulLog : preventOverhaulLogRespDTOS) {
+ for (RiskList riskUnit : riskUnitLists) {
+ if (overhaulLog.getRiskUnitId() == riskUnit.getRiskListId()){
+ overhaulLog.setRiskUnitName(riskUnit.getRiskListName());
+ }
+ }
+ }
+
+ resultVO.setData(preventOverhaulLogRespDTOS);
+ resultVO.setCount((int) page.getTotal());
+ resultVO.setPageNum(page.getPageNum());
+ resultVO.setPageSize(page.getPageSize());
+
+ return resultVO;
+ }
+
+ @Override
+ public ResultVO<PreventOverhaulLog> savePreventOverhaulLog(PreventOverhaulLogInsertReqBO insertReqBO) {
+
+ User sysUser = getSysUser();
+ ResultVO resultVO = new ResultVO<>();
+ resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
+
+
+ if (ObjectUtils.isEmpty(insertReqBO.getRiskUnitId())){
+ throw new RuntimeException("安全风险分析单元为空");
+ }
+ if (ObjectUtils.isEmpty(insertReqBO.getStopStartTime())){
+ throw new RuntimeException("装置停用或者检维修开始时间为空");
+ }
+ if (ObjectUtils.isEmpty(insertReqBO.getStopEndTime())){
+ throw new RuntimeException("装置停用或者检维修结束时间为空");
+ }
+ if (insertReqBO.getStopReason().isEmpty()){
+ throw new RuntimeException("停用原因为空");
+ }
+
+ Date date = new Date();
+ String uuid = UUID.randomUUID().toString();
+
+ PreventOverhaulLog preventOverhaulLog = BeanCopyUtils.copyBean(insertReqBO, PreventOverhaulLog.class);
+
+ preventOverhaulLog.setUuid(uuid);
+ preventOverhaulLog.setDeleteStatus((byte) 0);
+ preventOverhaulLog.setCreateByUserName(sysUser.getUserName());
+ preventOverhaulLog.setGmtCreate(date);
+ preventOverhaulLog.setLastEditUserName(sysUser.getUserName());
+ preventOverhaulLog.setGmtModitify(date);
+
+ //todo 对所属企业id和uuid没有进行设置
+ PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());
+ //设置上报时间为空
+ preventOverhaulLog.setReportTime(null);
+ //设置本条数据上报更新时间
+ preventOverhaulLog.setUpdateReportDataTime(date);
+ //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
+ if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
+ && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
+ //设置上报状态为-等待上报
+ preventOverhaulLog.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ //设置本条数据上报开关为-开启
+ preventOverhaulLog.setReportSwitch(SyncEnum.REPORT_ON.getCode());
+ //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
+ }else {
+ //设置上报状态为-不上报
+ preventOverhaulLog.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
+ //设置本条数据上报开关为-关闭
+ preventOverhaulLog.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
+ }
+
+ int result = overhaulLogRepository.savePreventOverhaulLog(preventOverhaulLog);
+
+ resultVO.setCount(result);
+ resultVO.setCode("200");
+ resultVO.setMsg("保存成功");
+
+ return resultVO;
+ }
+
+ /**
+ * 查询 by id
+ * */
+ @Override
+ public PreventOverhaulLog getOverhaulLogById(Long id) {
+ return overhaulLogRepository.getOverhaulLogById(id);
+ }
+
+ /**
+ * 修改保存
+ * */
+ @Override
+ public ResultVO<PreventOverhaulLog> updateOverhaulLog(PreventOverhaulLogUpdateReqBO updateReqBO) {
+
+
+ User sysUser = getSysUser();
+ ResultVO resultVO = new ResultVO<>();
+ resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
+
+ resultVO.setCode("200");
+ resultVO.setMsg("保存成功");
+
+ if (ObjectUtils.isEmpty(updateReqBO.getId())){
+ throw new RuntimeException("所选记录不能为空");
+ }
+ PreventOverhaulLog overhaulLogById = overhaulLogRepository.getOverhaulLogById(updateReqBO.getId());
+ if (ObjectUtils.isEmpty(overhaulLogById)){
+ throw new RuntimeException("记录不存在或已被被删除");
+ }
+ if (ObjectUtils.isEmpty(updateReqBO.getRiskUnitId())){
+ throw new RuntimeException("安全风险分析单元为空");
+ }
+ if (ObjectUtils.isEmpty(updateReqBO.getStopStartTime())){
+ throw new RuntimeException("装置停用或者检维修开始时间为空");
+ }
+ if (ObjectUtils.isEmpty(updateReqBO.getStopEndTime())){
+ throw new RuntimeException("装置停用或者检维修结束时间为空");
+ }
+ if (updateReqBO.getStopReason().isEmpty()){
+ throw new RuntimeException("停用原因为空");
+ }
+
+ Date date = new Date();
+ String uuid = UUID.randomUUID().toString();
+
+ PreventOverhaulLog preventOverhaulLog = BeanCopyUtils.copyBean(updateReqBO, PreventOverhaulLog.class);
+
+ preventOverhaulLog.setUuid(uuid);
+ preventOverhaulLog.setDeleteStatus((byte) 0);
+ preventOverhaulLog.setLastEditUserName(sysUser.getUserName());
+ preventOverhaulLog.setGmtModitify(date);
+ preventOverhaulLog.setLastEditUserName(sysUser.getUserName());
+ preventOverhaulLog.setGmtModitify(date);
+
+
+ //todo 对所属企业id和uuid没有进行设置
+ PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());
+ //设置上报时间为空
+ preventOverhaulLog.setReportTime(null);
+ //设置本条数据上报更新时间
+ preventOverhaulLog.setUpdateReportDataTime(date);
+ //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
+ if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
+ && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
+ //设置上报状态为-等待上报
+ preventOverhaulLog.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ //设置本条数据上报开关为-开启
+ preventOverhaulLog.setReportSwitch(SyncEnum.REPORT_ON.getCode());
+ //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
+ }else {
+ //设置上报状态为-不上报
+ preventOverhaulLog.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
+ //设置本条数据上报开关为-关闭
+ preventOverhaulLog.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
+ }
+
+ int result = overhaulLogRepository.updateOverhaulLog(preventOverhaulLog);
+ if (result < 1){
+ throw new RuntimeException("操作失败");
+ }
+
+ resultVO.setCount(result);
+
+ return resultVO;
+ }
+
+ @Override
+ public int deleteOverhaulLogByIds(String ids) {
+ return overhaulLogRepository.deleteOverhaulLogByIds(Convert.toStrArray(ids));
+ }
+
+ @Override
+ public List<PreventOverhaulLog> listReportOverhaulLog() {
+ return overhaulLogRepository.listReportOverhaulLog();
+ }
+
+ @Override
+ public int updateOverhaulReportStatus(HandlerReportParam handlerReportParam) {
+ return overhaulLogRepository.updateOverhaulReportStatus(handlerReportParam);
+ }
+
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventReportConfigServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventReportConfigServiceImpl.java
index 0c6dc49..f3b8103 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventReportConfigServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventReportConfigServiceImpl.java
@@ -1,43 +1,43 @@
-package com.ruoyi.doublePrevention.service.baseService.impl;
-
-import com.ruoyi.doublePrevention.entity.PreventReportConfig;
-import com.ruoyi.doublePrevention.repository.PreventReportConfigRepository;
-import com.ruoyi.doublePrevention.repository.param.PreventReportConfigUpdateParams;
-import com.ruoyi.doublePrevention.service.baseService.PreventReportConfigService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("PreventReportConfigService")
-public class PreventReportConfigServiceImpl implements PreventReportConfigService {
-
- @Autowired
- private PreventReportConfigRepository preventReportConfigRepository;
-
- /**
- * 数据上报配置-查询
- */
- @Override
- public List<PreventReportConfig> ListReportConfigs() {
- return preventReportConfigRepository.ListReportConfigs();
- }
-
- /**
- * 数据上报配置-修改
- */
- @Override
- public int updateReportConfig(PreventReportConfigUpdateParams updateParams) {
- return preventReportConfigRepository.updateReportConfig(updateParams);
- }
-
- /**
- * 数据上报配置-按照id查询
- */
- @Override
- public PreventReportConfig getReportConfigById(int Id) {
- return preventReportConfigRepository.selectById(Id);
- }
-
-
-}
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.ruoyi.doublePrevention.entity.PreventReportConfig;
+import com.ruoyi.doublePrevention.repository.PreventReportConfigRepository;
+import com.ruoyi.doublePrevention.repository.param.PreventReportConfigUpdateParams;
+import com.ruoyi.doublePrevention.service.baseService.PreventReportConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("PreventReportConfigService")
+public class PreventReportConfigServiceImpl implements PreventReportConfigService {
+
+ @Autowired
+ private PreventReportConfigRepository preventReportConfigRepository;
+
+ /**
+ * 数据上报配置-查询
+ */
+ @Override
+ public List<PreventReportConfig> ListReportConfigs() {
+ return preventReportConfigRepository.ListReportConfigs();
+ }
+
+ /**
+ * 数据上报配置-修改
+ */
+ @Override
+ public int updateReportConfig(PreventReportConfigUpdateParams updateParams) {
+ return preventReportConfigRepository.updateReportConfig(updateParams);
+ }
+
+ /**
+ * 数据上报配置-按照id查询
+ */
+ @Override
+ public PreventReportConfig getReportConfigById(int Id) {
+ return preventReportConfigRepository.selectById(Id);
+ }
+
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskCheckUnitServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskCheckUnitServiceImpl.java
index 15213d4..afab9cb 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskCheckUnitServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskCheckUnitServiceImpl.java
@@ -1,46 +1,46 @@
-package com.ruoyi.doublePrevention.service.baseService.impl;
-
-import com.ruoyi.doublePrevention.entity.PreventRiskCheckUnit;
-import com.ruoyi.doublePrevention.repository.PreventRiskCheckUnitRepository;
-import com.ruoyi.doublePrevention.service.baseService.PreventRiskCheckUnitService;
-import com.ruoyi.project.tr.baseCheckPoint.domain.BaseCheckPoint;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("PreventRiskCheckUnitService")
-public class PreventRiskCheckUnitServiceImpl implements PreventRiskCheckUnitService {
-
- @Autowired
- private PreventRiskCheckUnitRepository preventRiskCheckUnitRepository;
- /**
- * 保存原检查点与管控措施的对应关系
- */
- @Override
- public int insertPointAndMeasure(PreventRiskCheckUnit checkUnit) {
- return preventRiskCheckUnitRepository.insertPointAndMeasure(checkUnit);
- }
- /**
- * 通过riskId 查询管控措施列表
- */
- @Override
- public List<PreventRiskCheckUnit> getUnitByRiskId(String riskId) {
- return preventRiskCheckUnitRepository.getUnitByRiskId(riskId);
- }
- /**
- * 删除原检查点与管控措施的对应关系
- */
- @Override
- public int deletePointAndMeasure(String id) {
- return preventRiskCheckUnitRepository.deletePointAndMeasure(id);
- }
- /**
- * 通过baseCheckPointId 查询管控措施列表
- */
- @Override
- public PreventRiskCheckUnit getUnitByBaseCheckPointId(Long baseCheckPointId) {
- return preventRiskCheckUnitRepository.getUnitByBaseCheckPointId(baseCheckPointId);
- }
-
-}
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.ruoyi.doublePrevention.entity.PreventRiskCheckUnit;
+import com.ruoyi.doublePrevention.repository.PreventRiskCheckUnitRepository;
+import com.ruoyi.doublePrevention.service.baseService.PreventRiskCheckUnitService;
+import com.ruoyi.project.tr.baseCheckPoint.domain.BaseCheckPoint;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("PreventRiskCheckUnitService")
+public class PreventRiskCheckUnitServiceImpl implements PreventRiskCheckUnitService {
+
+ @Autowired
+ private PreventRiskCheckUnitRepository preventRiskCheckUnitRepository;
+ /**
+ * 保存原检查点与管控措施的对应关系
+ */
+ @Override
+ public int insertPointAndMeasure(PreventRiskCheckUnit checkUnit) {
+ return preventRiskCheckUnitRepository.insertPointAndMeasure(checkUnit);
+ }
+ /**
+ * 通过riskId 查询管控措施列表
+ */
+ @Override
+ public List<PreventRiskCheckUnit> getUnitByRiskId(String riskId) {
+ return preventRiskCheckUnitRepository.getUnitByRiskId(riskId);
+ }
+ /**
+ * 删除原检查点与管控措施的对应关系
+ */
+ @Override
+ public int deletePointAndMeasure(String id) {
+ return preventRiskCheckUnitRepository.deletePointAndMeasure(id);
+ }
+ /**
+ * 通过baseCheckPointId 查询管控措施列表
+ */
+ @Override
+ public PreventRiskCheckUnit getUnitByBaseCheckPointId(Long baseCheckPointId) {
+ return preventRiskCheckUnitRepository.getUnitByBaseCheckPointId(baseCheckPointId);
+ }
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerCheckAndMeasureServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerCheckAndMeasureServiceImpl.java
index 245b11f..f3d50ba 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerCheckAndMeasureServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerCheckAndMeasureServiceImpl.java
@@ -1,45 +1,45 @@
-package com.ruoyi.doublePrevention.service.baseService.impl;
-
-import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckAndMeasure;
-import com.ruoyi.doublePrevention.repository.PreventRiskDangerCheckAndMeasureRepository;
-import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerCheckAndMeasureService;
-import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("PreventRiskDangerCheckAndMeasureService")
-public class PreventRiskDangerCheckAndMeasureServiceImpl implements PreventRiskDangerCheckAndMeasureService {
-
- @Autowired
- private PreventRiskDangerCheckAndMeasureRepository preventRiskDangerCheckAndMeasureRepository;
-
- /**
- * 写入核查任务检查点与管控措施信息
- * */
- @Override
- public int insertCheckAndMeasure(PreventRiskDangerCheckAndMeasure checkAndMeasure) {
- return preventRiskDangerCheckAndMeasureRepository.insertCheckAndMeasure(checkAndMeasure);
- }
-
- @Override
- public List<PreventRiskDangerCheckAndMeasure> getByBaseCheckPointId(Long checkPointId) {
- return preventRiskDangerCheckAndMeasureRepository.getByBaseCheckPointId(checkPointId);
- }
-
- @Override
- public PreventRiskDangerCheckAndMeasure getByDangerCheckPointId(Long dangerCheckPointId) {
- return preventRiskDangerCheckAndMeasureRepository.getByDangerCheckPointId(dangerCheckPointId);
- }
-
- @Override
- public int updateCheckDesc(HiddenDangerCheckPoint hdcp) {
- return preventRiskDangerCheckAndMeasureRepository.updateCheckDesc(hdcp);
- }
-
- @Override
- public List<PreventRiskDangerCheckAndMeasure> getByCheckId(Long checkId) {
- return preventRiskDangerCheckAndMeasureRepository.getByCheckId(checkId);
- }
-}
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckAndMeasure;
+import com.ruoyi.doublePrevention.repository.PreventRiskDangerCheckAndMeasureRepository;
+import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerCheckAndMeasureService;
+import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("PreventRiskDangerCheckAndMeasureService")
+public class PreventRiskDangerCheckAndMeasureServiceImpl implements PreventRiskDangerCheckAndMeasureService {
+
+ @Autowired
+ private PreventRiskDangerCheckAndMeasureRepository preventRiskDangerCheckAndMeasureRepository;
+
+ /**
+ * 写入核查任务检查点与管控措施信息
+ * */
+ @Override
+ public int insertCheckAndMeasure(PreventRiskDangerCheckAndMeasure checkAndMeasure) {
+ return preventRiskDangerCheckAndMeasureRepository.insertCheckAndMeasure(checkAndMeasure);
+ }
+
+ @Override
+ public List<PreventRiskDangerCheckAndMeasure> getByBaseCheckPointId(Long checkPointId) {
+ return preventRiskDangerCheckAndMeasureRepository.getByBaseCheckPointId(checkPointId);
+ }
+
+ @Override
+ public PreventRiskDangerCheckAndMeasure getByDangerCheckPointId(Long dangerCheckPointId) {
+ return preventRiskDangerCheckAndMeasureRepository.getByDangerCheckPointId(dangerCheckPointId);
+ }
+
+ @Override
+ public int updateCheckDesc(HiddenDangerCheckPoint hdcp) {
+ return preventRiskDangerCheckAndMeasureRepository.updateCheckDesc(hdcp);
+ }
+
+ @Override
+ public List<PreventRiskDangerCheckAndMeasure> getByCheckId(Long checkId) {
+ return preventRiskDangerCheckAndMeasureRepository.getByCheckId(checkId);
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerCheckLogServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerCheckLogServiceImpl.java
index 6c1e8d7..a393e5d 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerCheckLogServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerCheckLogServiceImpl.java
@@ -1,96 +1,96 @@
-package com.ruoyi.doublePrevention.service.baseService.impl;
-
-import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckLog;
-import com.ruoyi.doublePrevention.enums.E;
-import com.ruoyi.doublePrevention.exception.AusinessException;
-import com.ruoyi.doublePrevention.repository.PreventRiskDangerCheckLogRepository;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerCheckLogService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-@Service("PreventRiskDangerCheckLogService")
-public class PreventRiskDangerCheckLogServiceImpl implements PreventRiskDangerCheckLogService {
-
- @Autowired
- private PreventRiskDangerCheckLogRepository preventRiskDangerCheckLogRepository;
- /**
- * 定时生成排查任务记录时，
- * 插入排查记录附属表
- */
- @Override
- public int insertDangerCheckLog(PreventRiskDangerCheckLog dangerCheck) {
- return preventRiskDangerCheckLogRepository.insertDangerCheckLog(dangerCheck);
- }
- /**
- * 删除定时核查任务
- * */
- @Override
- public int deleteDangerCheck(Long checkId) {
- return preventRiskDangerCheckLogRepository.deleteDangerCheck(checkId);
- }
-
-
- /**
- * 检索需要上报的任务记录
- * */
- @Override
- public List<PreventRiskDangerCheckLog> listReportTask() {
- return preventRiskDangerCheckLogRepository.listReportTask();
- }
- /**
- * 修改上报的数据状态
- * */
- @Override
- public int updateTaskReportStatus(HandlerReportParam handlerReportParam) {
- int result = preventRiskDangerCheckLogRepository.updateEventReportStatus(handlerReportParam);
- if (result < 1){
- throw new AusinessException(E.UPDATE_FAIL.getCode(), "安全风险事件-更新上报状态失败");
- }
- return result;
- }
- /**
- * 查询by checkId
- * */
- @Override
- public PreventRiskDangerCheckLog getByDangerCheckByCheckId(Long checkId) {
- return preventRiskDangerCheckLogRepository.getByDangerCheckByCheckId(checkId);
- }
-
- @Override
- public PreventRiskDangerCheckLog getByDangerCheckByJobId(Long jobId) {
- return preventRiskDangerCheckLogRepository.getByDangerCheckByJobId(jobId);
- }
-
- @Override
- public int updateCheckLog(Long checkId, Long mobileCode) {
- return preventRiskDangerCheckLogRepository.updateCheckLog(checkId, mobileCode);
- }
-
- @Override
- public int updateTaskReportStatusByList(List<Long> taskIds) {
- List<Long> ids = new ArrayList<>();
- Byte reportStatus = 1;
- Date reportTime = new Date();
- return preventRiskDangerCheckLogRepository.updateTaskReportStatusByList(taskIds, reportStatus, reportTime);
- }
-
- @Override
- public List<PreventRiskDangerCheckLog> listRectifyReportTask() {
- return preventRiskDangerCheckLogRepository.listRectifyReportTask();
- }
-
- @Override
- public List<PreventRiskDangerCheckLog> listSearchRectifyReportTask() {
- return preventRiskDangerCheckLogRepository.listSearchRectifyReportTask();
- }
-
- @Override
- public int updateSearchRectifyReportTask(PreventRiskDangerCheckLog dangerCheckLog) {
- return preventRiskDangerCheckLogRepository.updateSearchRectifyReportTask(dangerCheckLog);
- }
-}
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckLog;
+import com.ruoyi.doublePrevention.enums.E;
+import com.ruoyi.doublePrevention.exception.AusinessException;
+import com.ruoyi.doublePrevention.repository.PreventRiskDangerCheckLogRepository;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerCheckLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Service("PreventRiskDangerCheckLogService")
+public class PreventRiskDangerCheckLogServiceImpl implements PreventRiskDangerCheckLogService {
+
+ @Autowired
+ private PreventRiskDangerCheckLogRepository preventRiskDangerCheckLogRepository;
+ /**
+ * 定时生成排查任务记录时，
+ * 插入排查记录附属表
+ */
+ @Override
+ public int insertDangerCheckLog(PreventRiskDangerCheckLog dangerCheck) {
+ return preventRiskDangerCheckLogRepository.insertDangerCheckLog(dangerCheck);
+ }
+ /**
+ * 删除定时核查任务
+ * */
+ @Override
+ public int deleteDangerCheck(Long checkId) {
+ return preventRiskDangerCheckLogRepository.deleteDangerCheck(checkId);
+ }
+
+
+ /**
+ * 检索需要上报的任务记录
+ * */
+ @Override
+ public List<PreventRiskDangerCheckLog> listReportTask() {
+ return preventRiskDangerCheckLogRepository.listReportTask();
+ }
+ /**
+ * 修改上报的数据状态
+ * */
+ @Override
+ public int updateTaskReportStatus(HandlerReportParam handlerReportParam) {
+ int result = preventRiskDangerCheckLogRepository.updateEventReportStatus(handlerReportParam);
+ if (result < 1){
+ throw new AusinessException(E.UPDATE_FAIL.getCode(), "安全风险事件-更新上报状态失败");
+ }
+ return result;
+ }
+ /**
+ * 查询by checkId
+ * */
+ @Override
+ public PreventRiskDangerCheckLog getByDangerCheckByCheckId(Long checkId) {
+ return preventRiskDangerCheckLogRepository.getByDangerCheckByCheckId(checkId);
+ }
+
+ @Override
+ public PreventRiskDangerCheckLog getByDangerCheckByJobId(Long jobId) {
+ return preventRiskDangerCheckLogRepository.getByDangerCheckByJobId(jobId);
+ }
+
+ @Override
+ public int updateCheckLog(Long checkId, Long mobileCode) {
+ return preventRiskDangerCheckLogRepository.updateCheckLog(checkId, mobileCode);
+ }
+
+ @Override
+ public int updateTaskReportStatusByList(List<Long> taskIds) {
+ List<Long> ids = new ArrayList<>();
+ Byte reportStatus = 1;
+ Date reportTime = new Date();
+ return preventRiskDangerCheckLogRepository.updateTaskReportStatusByList(taskIds, reportStatus, reportTime);
+ }
+
+ @Override
+ public List<PreventRiskDangerCheckLog> listRectifyReportTask() {
+ return preventRiskDangerCheckLogRepository.listRectifyReportTask();
+ }
+
+ @Override
+ public List<PreventRiskDangerCheckLog> listSearchRectifyReportTask() {
+ return preventRiskDangerCheckLogRepository.listSearchRectifyReportTask();
+ }
+
+ @Override
+ public int updateSearchRectifyReportTask(PreventRiskDangerCheckLog dangerCheckLog) {
+ return preventRiskDangerCheckLogRepository.updateSearchRectifyReportTask(dangerCheckLog);
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerConfirmLogServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerConfirmLogServiceImpl.java
index 4d5b390..571c465 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerConfirmLogServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerConfirmLogServiceImpl.java
@@ -1,47 +1,47 @@
-package com.ruoyi.doublePrevention.service.baseService.impl;
-
-import com.ruoyi.doublePrevention.entity.PreventRiskDangerConfirmLog;
-import com.ruoyi.doublePrevention.repository.PreventRiskDangerConfirmLogRepository;
-import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerConfirmLogService;
-import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
-import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.time.LocalDateTime;
-import java.util.List;
-
-@Service
-public class PreventRiskDangerConfirmLogServiceImpl implements PreventRiskDangerConfirmLogService {
-
- @Autowired
- private PreventRiskDangerConfirmLogRepository confirmLogRepository;
-
- @Autowired
- private IHiddenDangerCheckPointService hiddenDangerCheckPointService;
-
- @Override
- public int saveConfirmLog(HiddenDangerCheckPoint hdcp) {
-
- PreventRiskDangerConfirmLog confirmLog = new PreventRiskDangerConfirmLog();
-
- confirmLog.setDangerCheckPointId(hdcp.getId());
- confirmLog.setConfirmUserId(hdcp.getExamineUserId());// examine_user_id , 核查人id
- confirmLog.setConfirmUser(hdcp.getExamineUserName());// examine_user_name
- confirmLog.setConfirmTime(LocalDateTime.now());
-// confirmLog.setConfirmResult(Integer.valueOf(hdcp.getReportStatus()));// report_status , 上报判定结果(0未判定 1不是隐患 2是隐患）
-// confirmLog.setConfirmOpinion(hdcp.getExamineOpinion()); // examine_opinion 意见
-
- int result = hiddenDangerCheckPointService.updateConfirm(hdcp);
- if (result < 1){
- throw new RuntimeException("修改核查人失败");
- }
-
- return confirmLogRepository.saveConfirmLog(confirmLog);
- }
-
- @Override
- public List<PreventRiskDangerConfirmLog> getLogsByDangerCheckPointId(Long dangerCheckPointId) {
- return confirmLogRepository.getLogsByDangerCheckPointId(dangerCheckPointId);
- }
-}
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.ruoyi.doublePrevention.entity.PreventRiskDangerConfirmLog;
+import com.ruoyi.doublePrevention.repository.PreventRiskDangerConfirmLogRepository;
+import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerConfirmLogService;
+import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
+import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Service
+public class PreventRiskDangerConfirmLogServiceImpl implements PreventRiskDangerConfirmLogService {
+
+ @Autowired
+ private PreventRiskDangerConfirmLogRepository confirmLogRepository;
+
+ @Autowired
+ private IHiddenDangerCheckPointService hiddenDangerCheckPointService;
+
+ @Override
+ public int saveConfirmLog(HiddenDangerCheckPoint hdcp) {
+
+ PreventRiskDangerConfirmLog confirmLog = new PreventRiskDangerConfirmLog();
+
+ confirmLog.setDangerCheckPointId(hdcp.getId());
+ confirmLog.setConfirmUserId(hdcp.getExamineUserId());// examine_user_id , 核查人id
+ confirmLog.setConfirmUser(hdcp.getExamineUserName());// examine_user_name
+ confirmLog.setConfirmTime(LocalDateTime.now());
+// confirmLog.setConfirmResult(Integer.valueOf(hdcp.getReportStatus()));// report_status , 上报判定结果(0未判定 1不是隐患 2是隐患）
+// confirmLog.setConfirmOpinion(hdcp.getExamineOpinion()); // examine_opinion 意见
+
+ int result = hiddenDangerCheckPointService.updateConfirm(hdcp);
+ if (result < 1){
+ throw new RuntimeException("修改核查人失败");
+ }
+
+ return confirmLogRepository.saveConfirmLog(confirmLog);
+ }
+
+ @Override
+ public List<PreventRiskDangerConfirmLog> getLogsByDangerCheckPointId(Long dangerCheckPointId) {
+ return confirmLogRepository.getLogsByDangerCheckPointId(dangerCheckPointId);
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerInfoServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerInfoServiceImpl.java
index d9fd528..c87a2de 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerInfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskDangerInfoServiceImpl.java
@@ -1,88 +1,88 @@
-package com.ruoyi.doublePrevention.service.baseService.impl;
-
-import com.ruoyi.doublePrevention.entity.PreventRiskDangerInfo;
-import com.ruoyi.doublePrevention.entity.dto.DataCountDangerResultRespDO;
-import com.ruoyi.doublePrevention.repository.PreventRiskDangerInfoRepository;
-import com.ruoyi.doublePrevention.repository.param.DataCountStartAndEndTimeParams;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.Date;
-import java.util.List;
-
-@Service("PreventRiskDangerInfoService")
-public class PreventRiskDangerInfoServiceImpl implements PreventRiskDangerInfoService {
-
- @Autowired
- private PreventRiskDangerInfoRepository preventRiskDangerInfoRepository;
-
- /**
- * 新增隐患上报
- * */
- @Override
- public int insertDangerInfo(PreventRiskDangerInfo dangerInfo) {
- return preventRiskDangerInfoRepository.insertDangerInfo(dangerInfo);
- }
-
- /**
- * 修改隐患上报
- * */
- @Override
- public int updateDangerInfo(PreventRiskDangerInfo dangerInfo) {
- return preventRiskDangerInfoRepository.updateDangerInfo(dangerInfo);
- }
-
- /**
- * 删除隐患上报
- */
- @Override
- public int deleteDangerInfo(Long id) {
- return preventRiskDangerInfoRepository.deleteDangerInfo(id);
- }
-
- /**
- * 修改隐患整改状态
- */
- @Override
- public int updateDangerInfoState(PreventRiskDangerInfo dangerInfo) {
- return preventRiskDangerInfoRepository.updateDangerInfoState(dangerInfo);
- }
- /**
- * 查询隐患附属表信息
- */
- @Override
- public PreventRiskDangerInfo getByHiddenDangerId(Long id) {
- return preventRiskDangerInfoRepository.getByHiddenDangerId(id);
- }
-
- @Override
- public PreventRiskDangerInfo getDangerInfoByDangerCheckPointId(Long checkId) {
- return preventRiskDangerInfoRepository.getByHiddenDangerId(checkId);
- }
-
- /**
- * @description 统计时间段内所有、死亡、重伤、轻伤的隐患数量
- */
- @Override
- public DataCountDangerResultRespDO listDangerResultCountByTime(Date startTime, Date endTime, List<Long> depIds) {
- return preventRiskDangerInfoRepository.listDangerResultCountByTime(startTime,endTime,depIds);
- }
-
- /**
- * 搜索需要上报的隐患
- */
- @Override
- public List<PreventRiskDangerInfo> listReportDanger() {
- return preventRiskDangerInfoRepository.listReportDanger();
- }
- /**
- * 修改上报的数据的姿态
- */
- @Override
- public PreventRiskDangerInfo updateDangerInfoReportStatus(HandlerReportParam handlerReportParam) {
- return preventRiskDangerInfoRepository.updateDangerInfoReportStatus(handlerReportParam);
- }
-
-}
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.ruoyi.doublePrevention.entity.PreventRiskDangerInfo;
+import com.ruoyi.doublePrevention.entity.dto.DataCountDangerResultRespDO;
+import com.ruoyi.doublePrevention.repository.PreventRiskDangerInfoRepository;
+import com.ruoyi.doublePrevention.repository.param.DataCountStartAndEndTimeParams;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service("PreventRiskDangerInfoService")
+public class PreventRiskDangerInfoServiceImpl implements PreventRiskDangerInfoService {
+
+ @Autowired
+ private PreventRiskDangerInfoRepository preventRiskDangerInfoRepository;
+
+ /**
+ * 新增隐患上报
+ * */
+ @Override
+ public int insertDangerInfo(PreventRiskDangerInfo dangerInfo) {
+ return preventRiskDangerInfoRepository.insertDangerInfo(dangerInfo);
+ }
+
+ /**
+ * 修改隐患上报
+ * */
+ @Override
+ public int updateDangerInfo(PreventRiskDangerInfo dangerInfo) {
+ return preventRiskDangerInfoRepository.updateDangerInfo(dangerInfo);
+ }
+
+ /**
+ * 删除隐患上报
+ */
+ @Override
+ public int deleteDangerInfo(Long id) {
+ return preventRiskDangerInfoRepository.deleteDangerInfo(id);
+ }
+
+ /**
+ * 修改隐患整改状态
+ */
+ @Override
+ public int updateDangerInfoState(PreventRiskDangerInfo dangerInfo) {
+ return preventRiskDangerInfoRepository.updateDangerInfoState(dangerInfo);
+ }
+ /**
+ * 查询隐患附属表信息
+ */
+ @Override
+ public PreventRiskDangerInfo getByHiddenDangerId(Long id) {
+ return preventRiskDangerInfoRepository.getByHiddenDangerId(id);
+ }
+
+ @Override
+ public PreventRiskDangerInfo getDangerInfoByDangerCheckPointId(Long checkId) {
+ return preventRiskDangerInfoRepository.getByHiddenDangerId(checkId);
+ }
+
+ /**
+ * @description 统计时间段内所有、死亡、重伤、轻伤的隐患数量
+ */
+ @Override
+ public DataCountDangerResultRespDO listDangerResultCountByTime(Date startTime, Date endTime, List<Long> depIds) {
+ return preventRiskDangerInfoRepository.listDangerResultCountByTime(startTime,endTime,depIds);
+ }
+
+ /**
+ * 搜索需要上报的隐患
+ */
+ @Override
+ public List<PreventRiskDangerInfo> listReportDanger() {
+ return preventRiskDangerInfoRepository.listReportDanger();
+ }
+ /**
+ * 修改上报的数据的姿态
+ */
+ @Override
+ public PreventRiskDangerInfo updateDangerInfoReportStatus(HandlerReportParam handlerReportParam) {
+ return preventRiskDangerInfoRepository.updateDangerInfoReportStatus(handlerReportParam);
+ }
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskJobAndMeasureServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskJobAndMeasureServiceImpl.java
index c2d4230..0429512 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskJobAndMeasureServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskJobAndMeasureServiceImpl.java
@@ -1,87 +1,87 @@
-package com.ruoyi.doublePrevention.service.baseService.impl;
-
-import com.ruoyi.common.exception.BusinessException;
-import com.ruoyi.doublePrevention.entity.PreventRiskJobAndMeasure;
-import com.ruoyi.doublePrevention.enums.ResultCodes;
-import com.ruoyi.doublePrevention.repository.PreventRiskJobAndMeasureRepository;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-import com.ruoyi.doublePrevention.service.baseService.PreventRiskJobAndMeasureService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("PreventRiskJobAndMeasureService")
-public class PreventRiskJobAndMeasureServiceImpl implements PreventRiskJobAndMeasureService {
-
- @Autowired
- private PreventRiskJobAndMeasureRepository preventRiskJobAndMeasureRepository;
-
- /**
- * 插入管控措施与job的对应关系
- * */
- @Override
- public int insertJobAndMeasure(PreventRiskJobAndMeasure jobAndMeasure) {
- return preventRiskJobAndMeasureRepository.insertJobAndMeasure(jobAndMeasure);
- }
-
- /**
- * 查询JobAndMeasure - By JobId
- */
- @Override
- public PreventRiskJobAndMeasure getJobAndMeasureByJobId(Long jobId) {
- return preventRiskJobAndMeasureRepository.getJobAndMeasureByJobId(jobId);
- }
-
- @Override
- public List<PreventRiskJobAndMeasure> getJobAndMeasureListByJobId(Long jobId) {
- return preventRiskJobAndMeasureRepository.getJobAndMeasureListByJobId(jobId);
- }
- /**
- * 删除job管控措施的附属表关联信息
- */
- @Override
- public int deleteJobAndMeasure(Long jobId) {
- return preventRiskJobAndMeasureRepository.deleteJobAndMeasure(jobId);
- }
-
-
-
- /**
- * 检索需要上报的隐患排查任务
- */
- @Override
- public List<PreventRiskJobAndMeasure> listReportWork() {
- return preventRiskJobAndMeasureRepository.listReportWork();
- }
- /**
- * 根据jobId查询对应的管控措施
- */
- @Override
- public List<PreventRiskJobAndMeasure> getMeasureListByJobId(Long jobId) {
- return preventRiskJobAndMeasureRepository.getMeasureListByJobId(jobId);
- }
- /**
- * 修改上报状态
- */
- @Override
- public int updateWorkReportStatus(HandlerReportParam handlerReportParam) {
- int result = preventRiskJobAndMeasureRepository.updateWorkReportStatus(handlerReportParam);
- if (result == 0) {
- throw new BusinessException(ResultCodes.SERVER_UPDATE_ERROR.getCode());
- }
- return result;
- }
-
- @Override
- public List<PreventRiskJobAndMeasure> listReportWorkTest() {
- return preventRiskJobAndMeasureRepository.listReportWorkTest();
- }
-
- @Override
- public List<PreventRiskJobAndMeasure> getRectifyJobData(Long jobId) {
- return preventRiskJobAndMeasureRepository.getRectifyJobData(jobId);
- }
-
-
-}
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.ruoyi.common.exception.BusinessException;
+import com.ruoyi.doublePrevention.entity.PreventRiskJobAndMeasure;
+import com.ruoyi.doublePrevention.enums.ResultCodes;
+import com.ruoyi.doublePrevention.repository.PreventRiskJobAndMeasureRepository;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import com.ruoyi.doublePrevention.service.baseService.PreventRiskJobAndMeasureService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("PreventRiskJobAndMeasureService")
+public class PreventRiskJobAndMeasureServiceImpl implements PreventRiskJobAndMeasureService {
+
+ @Autowired
+ private PreventRiskJobAndMeasureRepository preventRiskJobAndMeasureRepository;
+
+ /**
+ * 插入管控措施与job的对应关系
+ * */
+ @Override
+ public int insertJobAndMeasure(PreventRiskJobAndMeasure jobAndMeasure) {
+ return preventRiskJobAndMeasureRepository.insertJobAndMeasure(jobAndMeasure);
+ }
+
+ /**
+ * 查询JobAndMeasure - By JobId
+ */
+ @Override
+ public PreventRiskJobAndMeasure getJobAndMeasureByJobId(Long jobId) {
+ return preventRiskJobAndMeasureRepository.getJobAndMeasureByJobId(jobId);
+ }
+
+ @Override
+ public List<PreventRiskJobAndMeasure> getJobAndMeasureListByJobId(Long jobId) {
+ return preventRiskJobAndMeasureRepository.getJobAndMeasureListByJobId(jobId);
+ }
+ /**
+ * 删除job管控措施的附属表关联信息
+ */
+ @Override
+ public int deleteJobAndMeasure(Long jobId) {
+ return preventRiskJobAndMeasureRepository.deleteJobAndMeasure(jobId);
+ }
+
+
+
+ /**
+ * 检索需要上报的隐患排查任务
+ */
+ @Override
+ public List<PreventRiskJobAndMeasure> listReportWork() {
+ return preventRiskJobAndMeasureRepository.listReportWork();
+ }
+ /**
+ * 根据jobId查询对应的管控措施
+ */
+ @Override
+ public List<PreventRiskJobAndMeasure> getMeasureListByJobId(Long jobId) {
+ return preventRiskJobAndMeasureRepository.getMeasureListByJobId(jobId);
+ }
+ /**
+ * 修改上报状态
+ */
+ @Override
+ public int updateWorkReportStatus(HandlerReportParam handlerReportParam) {
+ int result = preventRiskJobAndMeasureRepository.updateWorkReportStatus(handlerReportParam);
+ if (result == 0) {
+ throw new BusinessException(ResultCodes.SERVER_UPDATE_ERROR.getCode());
+ }
+ return result;
+ }
+
+ @Override
+ public List<PreventRiskJobAndMeasure> listReportWorkTest() {
+ return preventRiskJobAndMeasureRepository.listReportWorkTest();
+ }
+
+ @Override
+ public List<PreventRiskJobAndMeasure> getRectifyJobData(Long jobId) {
+ return preventRiskJobAndMeasureRepository.getRectifyJobData(jobId);
+ }
+
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskUnitUuidServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskUnitUuidServiceImpl.java
index 5c725ca..2633b82 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskUnitUuidServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskUnitUuidServiceImpl.java
@@ -1,75 +1,75 @@
-package com.ruoyi.doublePrevention.service.baseService.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.doublePrevention.entity.PreventRiskUnitUuid;
-import com.ruoyi.doublePrevention.enums.E;
-import com.ruoyi.doublePrevention.exception.AusinessException;
-import com.ruoyi.doublePrevention.repository.PreventRiskUnitUuidRepository;
-import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
-import com.ruoyi.doublePrevention.service.baseService.PreventRiskUnitUuidService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("PreventRiskUnitUuidService")
-public class PreventRiskUnitUuidServiceImpl implements PreventRiskUnitUuidService {
-
- @Autowired
- private PreventRiskUnitUuidRepository preventRiskUnitUuidRepository;
- /**
- * 为设施设备清单附属表添加uuid
- * */
- @Override
- public int insertRiskUnitUuid(PreventRiskUnitUuid riskUnitUuid) {
- return preventRiskUnitUuidRepository.insertUuid(riskUnitUuid);
- }
- /**
- * 通过id获取uuid
- * */
- @Override
- public PreventRiskUnitUuid getRiskUnitUuidById(Long id) {
- return preventRiskUnitUuidRepository.getRiskUnitUuidById(id);
- }
- /**
- * 修改
- * */
- @Override
- public int updateRiskUnitUuid(PreventRiskUnitUuid riskUnitUuid) {
- return preventRiskUnitUuidRepository.updateRiskUnitUuid(riskUnitUuid);
- }
- /**
- * 删除附属表信息
- */
- @Override
- public int deleteRiskUnit(String[] riskListIds) {
- return preventRiskUnitUuidRepository.deleteRiskUnit(riskListIds);
- }
-
-
- /**
- * 检索需要上报的数据
- */
- @Override
- public List<PreventRiskUnitUuid> listRiskAnaUnit() {
- return preventRiskUnitUuidRepository.listRiskAnaUnit();
- }
- /**
- * 修改已经被检索读取完成数据的状态
- */
- @Override
- public int updateReportStatus(HandlerReportParam handlerReportParam) {
- int result = preventRiskUnitUuidRepository.updateReportStatus(handlerReportParam);
- if (result < 1){
- throw new AusinessException(E.UPDATE_FAIL.getCode(), "安全风险分析单元-更新上报状态失败");
- }
- return result;
- }
-
- @Override
- public PreventRiskUnitUuid getRiskUnitUuidByUnitId(Long riskUnitId) {
- return preventRiskUnitUuidRepository.getRiskUnitUuidByUnitId(riskUnitId);
- }
-
-
-}
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.doublePrevention.entity.PreventRiskUnitUuid;
+import com.ruoyi.doublePrevention.enums.E;
+import com.ruoyi.doublePrevention.exception.AusinessException;
+import com.ruoyi.doublePrevention.repository.PreventRiskUnitUuidRepository;
+import com.ruoyi.doublePrevention.repository.param.HandlerReportParam;
+import com.ruoyi.doublePrevention.service.baseService.PreventRiskUnitUuidService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("PreventRiskUnitUuidService")
+public class PreventRiskUnitUuidServiceImpl implements PreventRiskUnitUuidService {
+
+ @Autowired
+ private PreventRiskUnitUuidRepository preventRiskUnitUuidRepository;
+ /**
+ * 为设施设备清单附属表添加uuid
+ * */
+ @Override
+ public int insertRiskUnitUuid(PreventRiskUnitUuid riskUnitUuid) {
+ return preventRiskUnitUuidRepository.insertUuid(riskUnitUuid);
+ }
+ /**
+ * 通过id获取uuid
+ * */
+ @Override
+ public PreventRiskUnitUuid getRiskUnitUuidById(Long id) {
+ return preventRiskUnitUuidRepository.getRiskUnitUuidById(id);
+ }
+ /**
+ * 修改
+ * */
+ @Override
+ public int updateRiskUnitUuid(PreventRiskUnitUuid riskUnitUuid) {
+ return preventRiskUnitUuidRepository.updateRiskUnitUuid(riskUnitUuid);
+ }
+ /**
+ * 删除附属表信息
+ */
+ @Override
+ public int deleteRiskUnit(String[] riskListIds) {
+ return preventRiskUnitUuidRepository.deleteRiskUnit(riskListIds);
+ }
+
+
+ /**
+ * 检索需要上报的数据
+ */
+ @Override
+ public List<PreventRiskUnitUuid> listRiskAnaUnit() {
+ return preventRiskUnitUuidRepository.listRiskAnaUnit();
+ }
+ /**
+ * 修改已经被检索读取完成数据的状态
+ */
+ @Override
+ public int updateReportStatus(HandlerReportParam handlerReportParam) {
+ int result = preventRiskUnitUuidRepository.updateReportStatus(handlerReportParam);
+ if (result < 1){
+ throw new AusinessException(E.UPDATE_FAIL.getCode(), "安全风险分析单元-更新上报状态失败");
+ }
+ return result;
+ }
+
+ @Override
+ public PreventRiskUnitUuid getRiskUnitUuidByUnitId(Long riskUnitId) {
+ return preventRiskUnitUuidRepository.getRiskUnitUuidByUnitId(riskUnitId);
+ }
+
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventTaskTypeServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventTaskTypeServiceImpl.java
index ff4274c..99683f8 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventTaskTypeServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventTaskTypeServiceImpl.java
@@ -1,33 +1,33 @@
-package com.ruoyi.doublePrevention.service.baseService.impl;
-
-import com.ruoyi.doublePrevention.entity.PreventTaskType;
-import com.ruoyi.doublePrevention.repository.PreventTaskTypeRepository;
-import com.ruoyi.doublePrevention.service.baseService.PreventTaskTypeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("PreventTaskTypeService")
-public class PreventTaskTypeServiceImpl implements PreventTaskTypeService {
-
- @Autowired
- private PreventTaskTypeRepository taskTypeRepository;
-
-
- @Override
- public PreventTaskType getInfoByTaskId(Long taskId) {
- return taskTypeRepository.getInfoByTaskId(taskId);
- }
-
- @Override
- public List<PreventTaskType> getInfoByJobId(Long jobId) {
- return taskTypeRepository.getInfoByJobId(jobId);
- }
-
- @Override
- public List<PreventTaskType> getAllTaskTypeList() {
- return taskTypeRepository.getAllTaskTypeList();
- }
-
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.ruoyi.doublePrevention.entity.PreventTaskType;
+import com.ruoyi.doublePrevention.repository.PreventTaskTypeRepository;
+import com.ruoyi.doublePrevention.service.baseService.PreventTaskTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("PreventTaskTypeService")
+public class PreventTaskTypeServiceImpl implements PreventTaskTypeService {
+
+ @Autowired
+ private PreventTaskTypeRepository taskTypeRepository;
+
+
+ @Override
+ public PreventTaskType getInfoByTaskId(Long taskId) {
+ return taskTypeRepository.getInfoByTaskId(taskId);
+ }
+
+ @Override
+ public List<PreventTaskType> getInfoByJobId(Long jobId) {
+ return taskTypeRepository.getInfoByJobId(jobId);
+ }
+
+ @Override
+ public List<PreventTaskType> getAllTaskTypeList() {
+ return taskTypeRepository.getAllTaskTypeList();
+ }
+
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventTaskUnitAndMeasureServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventTaskUnitAndMeasureServiceImpl.java
index 5a9fe86..fa042e5 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventTaskUnitAndMeasureServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventTaskUnitAndMeasureServiceImpl.java
@@ -1,13 +1,13 @@
-package com.ruoyi.doublePrevention.service.baseService.impl;
-
-
-import com.ruoyi.doublePrevention.service.baseService.PreventTaskUnitAndMeasureService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("PreventTaskUnitAndMeasureService")
-public class PreventTaskUnitAndMeasureServiceImpl implements PreventTaskUnitAndMeasureService {
-
-
-}
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+
+import com.ruoyi.doublePrevention.service.baseService.PreventTaskUnitAndMeasureService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("PreventTaskUnitAndMeasureService")
+public class PreventTaskUnitAndMeasureServiceImpl implements PreventTaskUnitAndMeasureService {
+
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/RiskAndPeopleInfoServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/RiskAndPeopleInfoServiceImpl.java
index 66babe9..8431dd7 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/RiskAndPeopleInfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/RiskAndPeopleInfoServiceImpl.java
@@ -1,164 +1,164 @@
-package com.ruoyi.doublePrevention.service.baseService.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
-import com.ruoyi.common.exception.BusinessException;
-import com.ruoyi.common.utils.BeanCopyUtils;
-import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckLog;
-import com.ruoyi.doublePrevention.entity.RiskAndPeopleInfo;
-import com.ruoyi.doublePrevention.entity.dto.req.RiskAndPeopleInfoReqBO;
-import com.ruoyi.doublePrevention.entity.dto.resp.RiskAndPeopleInfoDTO;
-import com.ruoyi.doublePrevention.entity.dto.resp.RiskAndPeopleInfoRespDTO;
-import com.ruoyi.doublePrevention.repository.RiskAndPeopleInfoRepository;
-import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerCheckLogService;
-import com.ruoyi.doublePrevention.service.baseService.RiskAndPeopleInfoService;
-import com.ruoyi.doublePrevention.vo.ResultVO;
-import com.ruoyi.project.tr.HiddenDangerCheckJob.domain.HiddenDangerCheckJobLog;
-import com.ruoyi.project.tr.HiddenDangerCheckJob.service.IHiddenDangerCheckJobLogService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.RequestBody;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-
-@Service("RiskAndPeopleInfoService")
-public class RiskAndPeopleInfoServiceImpl extends ServiceImpl<RiskAndPeopleInfoRepository, RiskAndPeopleInfo> implements RiskAndPeopleInfoService {
-
- @Autowired
- private RiskAndPeopleInfoRepository repository;
-
- @Autowired
- private IHiddenDangerCheckJobLogService hiddenDangerCheckJobLogService;
-
- @Autowired
- private PreventRiskDangerCheckLogService preventRiskDangerCheckLogService;
-
- @Override
- public ResultVO<RiskAndPeopleInfoRespDTO> listRiskAndPeoplePage(RiskAndPeopleInfoReqBO reqBO) {
-
- ResultVO resultVO = new ResultVO<>();
-
- RiskAndPeopleInfoRespDTO respDTO = new RiskAndPeopleInfoRespDTO();
-
- if (ObjectUtils.isEmpty(reqBO.getPageSize())){
- throw new BusinessException("分页信息不能为空");
- }
- if (ObjectUtils.isEmpty(reqBO.getPageNum())){
- throw new BusinessException("分页信息不能为空");
- }
-
- Integer pageIndex = reqBO.getPageNum();
- Integer pageSize = reqBO.getPageSize();
-
- Page<RiskAndPeopleInfo> page = PageHelper.startPage(pageIndex, pageSize);
- List<RiskAndPeopleInfo> riskOldInfo = repository.listRiskAndPeoplePage(reqBO);
-
- List<HiddenDangerCheckJobLog> allCheckJobLogList = new ArrayList<>();
- List<HiddenDangerCheckJobLog> completeCheckJobLogList = new ArrayList<>();
- List<HiddenDangerCheckJobLog> allCheckJobLogListOfHandle = new ArrayList<>();
- List<HiddenDangerCheckJobLog> completeCheckJobLogListOfHandle = new ArrayList<>();
- List<HiddenDangerCheckJobLog> allCheckJobLogListOfTechnology = new ArrayList<>();
- List<HiddenDangerCheckJobLog> completeCheckJobLogListOfTechnology = new ArrayList<>();
- List<HiddenDangerCheckJobLog> allCheckJobLogListOfMain = new ArrayList<>();
- List<HiddenDangerCheckJobLog> completeCheckJobLogListOfMain = new ArrayList<>();
-
- for (RiskAndPeopleInfo riskAndPeopleInfo : riskOldInfo) {
- //操作人的id，依此为依据，查询所有的任务记录 check_user_id
- List<HiddenDangerCheckJobLog> jobLogOfHandle = hiddenDangerCheckJobLogService.getJobLogByCheckUserId(riskAndPeopleInfo.getHandleLiabilityPersonId());
- if (jobLogOfHandle.size() > 0){
- for (HiddenDangerCheckJobLog jobLog : jobLogOfHandle) {
- PreventRiskDangerCheckLog preventRiskDangerCheckLog = preventRiskDangerCheckLogService.getByDangerCheckByJobId(jobLog.getJobId());
- if (preventRiskDangerCheckLog.getCheckStatus() != 3){
- completeCheckJobLogListOfHandle.add(jobLog);
- completeCheckJobLogList.add(jobLog);
- }
- allCheckJobLogListOfHandle.add(jobLog);
- allCheckJobLogList.add(jobLog);
- }
- }
-
- //技术负责人的id，依此为依据，查询所有的任务记录 check_user_id
- List<HiddenDangerCheckJobLog> jobLogListsOfTechnology = hiddenDangerCheckJobLogService.getJobLogByCheckUserId(riskAndPeopleInfo.getTechnologyLiabilityPersonId());
- if (jobLogListsOfTechnology.size() > 0){
- for (HiddenDangerCheckJobLog jobLog : jobLogListsOfTechnology) {
- PreventRiskDangerCheckLog preventRiskDangerCheckLog = preventRiskDangerCheckLogService.getByDangerCheckByJobId(jobLog.getJobId());
- if (preventRiskDangerCheckLog.getCheckStatus() != 3){
- completeCheckJobLogListOfTechnology.add(jobLog);
- completeCheckJobLogList.add(jobLog);
- }
- allCheckJobLogListOfTechnology.add(jobLog);
- allCheckJobLogList.add(jobLog);
- }
- }
-
- //主要负责人的id，依此为依据，查询所有的任务记录 check_user_id
- List<HiddenDangerCheckJobLog> jobLogListsOfMain = hiddenDangerCheckJobLogService.getJobLogByCheckUserId(riskAndPeopleInfo.getMainLiabilityPersonId());
- if (jobLogListsOfMain.size() > 0){
- for (HiddenDangerCheckJobLog jobLog : jobLogListsOfMain) {
- PreventRiskDangerCheckLog preventRiskDangerCheckLog = preventRiskDangerCheckLogService.getByDangerCheckByJobId(jobLog.getJobId());
- if (preventRiskDangerCheckLog.getCheckStatus() != 3){
- completeCheckJobLogListOfMain.add(jobLog);
- completeCheckJobLogList.add(jobLog);
- }
- allCheckJobLogListOfMain.add(jobLog);
- allCheckJobLogList.add(jobLog);
- }
- }
- }
-
- List<RiskAndPeopleInfoDTO> riskAndPeopleList = BeanCopyUtils.copyBeanList(riskOldInfo, RiskAndPeopleInfoDTO.class);
-
- int completeRatio = 0;
- if (allCheckJobLogList.size() > 0){
- completeRatio = completeCheckJobLogList.size() / allCheckJobLogList.size();
- }
-
- int completeRatioOfHandle = 0;
- if (allCheckJobLogListOfHandle.size() > 0){
- completeRatioOfHandle = completeCheckJobLogListOfHandle.size() / allCheckJobLogListOfHandle.size();
- }
-
- int completeRatioOfTechnology = 0;
- if (allCheckJobLogListOfTechnology.size() > 0){
- completeRatioOfTechnology = completeCheckJobLogListOfTechnology.size() / allCheckJobLogListOfTechnology.size();
- }
-
- int completeRatioOfMain = 0;
- if (allCheckJobLogListOfMain.size() > 0){
- completeRatioOfMain = completeCheckJobLogListOfMain.size() / allCheckJobLogListOfMain.size();
- }
- respDTO.setRiskAndPeopleInfoDTO(riskAndPeopleList);
- respDTO.setCount(allCheckJobLogList.size());
- respDTO.setComplete(completeCheckJobLogList.size());
- respDTO.setCompleteRatio(BigDecimal.valueOf(completeRatio));
-
- respDTO.setCountOfHandle(allCheckJobLogListOfHandle.size());
- respDTO.setCompleteOfHandle(completeCheckJobLogListOfHandle.size());
- respDTO.setCompleteRatioOfHandle(BigDecimal.valueOf(completeRatioOfHandle));
-
- respDTO.setCountOfTechnology(allCheckJobLogListOfTechnology.size());
- respDTO.setCompleteOfTechnology(completeCheckJobLogListOfTechnology.size());
- respDTO.setCompleteRatioOfTechnology(BigDecimal.valueOf(completeRatioOfTechnology));
-
- respDTO.setCountOfMain(allCheckJobLogListOfMain.size());
- respDTO.setCompleteOfMain(completeCheckJobLogListOfMain.size());
- respDTO.setCompleteRatioOfMain(BigDecimal.valueOf(completeRatioOfMain));
-
- resultVO.setPageSize(pageSize);
- resultVO.setPageNum(pageIndex);
- resultVO.setCount((int) page.getTotal());
- resultVO.setData(respDTO);
-
- return resultVO;
- }
-
-
- @Override
- public RiskAndPeopleInfo selectRiskAndPeopleInfoById(Long id) {
- return repository.selectRiskAndPeopleInfoById(id);
- }
-}
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.ruoyi.common.exception.BusinessException;
+import com.ruoyi.common.utils.BeanCopyUtils;
+import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckLog;
+import com.ruoyi.doublePrevention.entity.RiskAndPeopleInfo;
+import com.ruoyi.doublePrevention.entity.dto.req.RiskAndPeopleInfoReqBO;
+import com.ruoyi.doublePrevention.entity.dto.resp.RiskAndPeopleInfoDTO;
+import com.ruoyi.doublePrevention.entity.dto.resp.RiskAndPeopleInfoRespDTO;
+import com.ruoyi.doublePrevention.repository.RiskAndPeopleInfoRepository;
+import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerCheckLogService;
+import com.ruoyi.doublePrevention.service.baseService.RiskAndPeopleInfoService;
+import com.ruoyi.doublePrevention.vo.ResultVO;
+import com.ruoyi.project.tr.HiddenDangerCheckJob.domain.HiddenDangerCheckJobLog;
+import com.ruoyi.project.tr.HiddenDangerCheckJob.service.IHiddenDangerCheckJobLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+@Service("RiskAndPeopleInfoService")
+public class RiskAndPeopleInfoServiceImpl extends ServiceImpl<RiskAndPeopleInfoRepository, RiskAndPeopleInfo> implements RiskAndPeopleInfoService {
+
+ @Autowired
+ private RiskAndPeopleInfoRepository repository;
+
+ @Autowired
+ private IHiddenDangerCheckJobLogService hiddenDangerCheckJobLogService;
+
+ @Autowired
+ private PreventRiskDangerCheckLogService preventRiskDangerCheckLogService;
+
+ @Override
+ public ResultVO<RiskAndPeopleInfoRespDTO> listRiskAndPeoplePage(RiskAndPeopleInfoReqBO reqBO) {
+
+ ResultVO resultVO = new ResultVO<>();
+
+ RiskAndPeopleInfoRespDTO respDTO = new RiskAndPeopleInfoRespDTO();
+
+ if (ObjectUtils.isEmpty(reqBO.getPageSize())){
+ throw new BusinessException("分页信息不能为空");
+ }
+ if (ObjectUtils.isEmpty(reqBO.getPageNum())){
+ throw new BusinessException("分页信息不能为空");
+ }
+
+ Integer pageIndex = reqBO.getPageNum();
+ Integer pageSize = reqBO.getPageSize();
+
+ Page<RiskAndPeopleInfo> page = PageHelper.startPage(pageIndex, pageSize);
+ List<RiskAndPeopleInfo> riskOldInfo = repository.listRiskAndPeoplePage(reqBO);
+
+ List<HiddenDangerCheckJobLog> allCheckJobLogList = new ArrayList<>();
+ List<HiddenDangerCheckJobLog> completeCheckJobLogList = new ArrayList<>();
+ List<HiddenDangerCheckJobLog> allCheckJobLogListOfHandle = new ArrayList<>();
+ List<HiddenDangerCheckJobLog> completeCheckJobLogListOfHandle = new ArrayList<>();
+ List<HiddenDangerCheckJobLog> allCheckJobLogListOfTechnology = new ArrayList<>();
+ List<HiddenDangerCheckJobLog> completeCheckJobLogListOfTechnology = new ArrayList<>();
+ List<HiddenDangerCheckJobLog> allCheckJobLogListOfMain = new ArrayList<>();
+ List<HiddenDangerCheckJobLog> completeCheckJobLogListOfMain = new ArrayList<>();
+
+ for (RiskAndPeopleInfo riskAndPeopleInfo : riskOldInfo) {
+ //操作人的id，依此为依据，查询所有的任务记录 check_user_id
+ List<HiddenDangerCheckJobLog> jobLogOfHandle = hiddenDangerCheckJobLogService.getJobLogByCheckUserId(riskAndPeopleInfo.getHandleLiabilityPersonId());
+ if (jobLogOfHandle.size() > 0){
+ for (HiddenDangerCheckJobLog jobLog : jobLogOfHandle) {
+ PreventRiskDangerCheckLog preventRiskDangerCheckLog = preventRiskDangerCheckLogService.getByDangerCheckByJobId(jobLog.getJobId());
+ if (preventRiskDangerCheckLog.getCheckStatus() != 3){
+ completeCheckJobLogListOfHandle.add(jobLog);
+ completeCheckJobLogList.add(jobLog);
+ }
+ allCheckJobLogListOfHandle.add(jobLog);
+ allCheckJobLogList.add(jobLog);
+ }
+ }
+
+ //技术负责人的id，依此为依据，查询所有的任务记录 check_user_id
+ List<HiddenDangerCheckJobLog> jobLogListsOfTechnology = hiddenDangerCheckJobLogService.getJobLogByCheckUserId(riskAndPeopleInfo.getTechnologyLiabilityPersonId());
+ if (jobLogListsOfTechnology.size() > 0){
+ for (HiddenDangerCheckJobLog jobLog : jobLogListsOfTechnology) {
+ PreventRiskDangerCheckLog preventRiskDangerCheckLog = preventRiskDangerCheckLogService.getByDangerCheckByJobId(jobLog.getJobId());
+ if (preventRiskDangerCheckLog.getCheckStatus() != 3){
+ completeCheckJobLogListOfTechnology.add(jobLog);
+ completeCheckJobLogList.add(jobLog);
+ }
+ allCheckJobLogListOfTechnology.add(jobLog);
+ allCheckJobLogList.add(jobLog);
+ }
+ }
+
+ //主要负责人的id，依此为依据，查询所有的任务记录 check_user_id
+ List<HiddenDangerCheckJobLog> jobLogListsOfMain = hiddenDangerCheckJobLogService.getJobLogByCheckUserId(riskAndPeopleInfo.getMainLiabilityPersonId());
+ if (jobLogListsOfMain.size() > 0){
+ for (HiddenDangerCheckJobLog jobLog : jobLogListsOfMain) {
+ PreventRiskDangerCheckLog preventRiskDangerCheckLog = preventRiskDangerCheckLogService.getByDangerCheckByJobId(jobLog.getJobId());
+ if (preventRiskDangerCheckLog.getCheckStatus() != 3){
+ completeCheckJobLogListOfMain.add(jobLog);
+ completeCheckJobLogList.add(jobLog);
+ }
+ allCheckJobLogListOfMain.add(jobLog);
+ allCheckJobLogList.add(jobLog);
+ }
+ }
+ }
+
+ List<RiskAndPeopleInfoDTO> riskAndPeopleList = BeanCopyUtils.copyBeanList(riskOldInfo, RiskAndPeopleInfoDTO.class);
+
+ int completeRatio = 0;
+ if (allCheckJobLogList.size() > 0){
+ completeRatio = completeCheckJobLogList.size() / allCheckJobLogList.size();
+ }
+
+ int completeRatioOfHandle = 0;
+ if (allCheckJobLogListOfHandle.size() > 0){
+ completeRatioOfHandle = completeCheckJobLogListOfHandle.size() / allCheckJobLogListOfHandle.size();
+ }
+
+ int completeRatioOfTechnology = 0;
+ if (allCheckJobLogListOfTechnology.size() > 0){
+ completeRatioOfTechnology = completeCheckJobLogListOfTechnology.size() / allCheckJobLogListOfTechnology.size();
+ }
+
+ int completeRatioOfMain = 0;
+ if (allCheckJobLogListOfMain.size() > 0){
+ completeRatioOfMain = completeCheckJobLogListOfMain.size() / allCheckJobLogListOfMain.size();
+ }
+ respDTO.setRiskAndPeopleInfoDTO(riskAndPeopleList);
+ respDTO.setCount(allCheckJobLogList.size());
+ respDTO.setComplete(completeCheckJobLogList.size());
+ respDTO.setCompleteRatio(BigDecimal.valueOf(completeRatio));
+
+ respDTO.setCountOfHandle(allCheckJobLogListOfHandle.size());
+ respDTO.setCompleteOfHandle(completeCheckJobLogListOfHandle.size());
+ respDTO.setCompleteRatioOfHandle(BigDecimal.valueOf(completeRatioOfHandle));
+
+ respDTO.setCountOfTechnology(allCheckJobLogListOfTechnology.size());
+ respDTO.setCompleteOfTechnology(completeCheckJobLogListOfTechnology.size());
+ respDTO.setCompleteRatioOfTechnology(BigDecimal.valueOf(completeRatioOfTechnology));
+
+ respDTO.setCountOfMain(allCheckJobLogListOfMain.size());
+ respDTO.setCompleteOfMain(completeCheckJobLogListOfMain.size());
+ respDTO.setCompleteRatioOfMain(BigDecimal.valueOf(completeRatioOfMain));
+
+ resultVO.setPageSize(pageSize);
+ resultVO.setPageNum(pageIndex);
+ resultVO.setCount((int) page.getTotal());
+ resultVO.setData(respDTO);
+
+ return resultVO;
+ }
+
+
+ @Override
+ public RiskAndPeopleInfo selectRiskAndPeopleInfoById(Long id) {
+ return repository.selectRiskAndPeopleInfoById(id);
+ }
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/RiskOldInfoServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/RiskOldInfoServiceImpl.java
index fce6ba3..e16d026 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/RiskOldInfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/RiskOldInfoServiceImpl.java
@@ -1,77 +1,77 @@
-package com.ruoyi.doublePrevention.service.baseService.impl;
-
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
-import com.ruoyi.common.exception.BusinessException;
-import com.ruoyi.common.utils.BeanCopyUtils;
-import com.ruoyi.doublePrevention.entity.RiskOldInfo;
-import com.ruoyi.doublePrevention.entity.dto.req.RiskOldInfoQueryReqDTO;
-import com.ruoyi.doublePrevention.entity.dto.resp.RiskOldInfoQueryRespDTO;
-import com.ruoyi.doublePrevention.repository.RiskOldInfoRepository;
-import com.ruoyi.doublePrevention.service.baseService.RiskOldInfoService;
-import com.ruoyi.doublePrevention.vo.ResultVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-
-import java.util.List;
-
-@Service
-public class RiskOldInfoServiceImpl implements RiskOldInfoService {
-
- @Autowired
- private RiskOldInfoRepository repository;
-
-
- @Override
- public ResultVO<RiskOldInfoQueryRespDTO> selectOldRiskInfoPage(RiskOldInfoQueryReqDTO queryReqDTO) {
-
- ResultVO resultVO = new ResultVO<>();
-
- if (ObjectUtils.isEmpty(queryReqDTO.getPageSize())){
- throw new BusinessException("分页信息不能为空");
- }
- if (ObjectUtils.isEmpty(queryReqDTO.getPageNum())){
- throw new BusinessException("分页信息不能为空");
- }
-
- if (queryReqDTO.getReportPeople() == "" ){
- queryReqDTO.setReportPeople(null);
- }
- if (queryReqDTO.getFindPeople() == "" ){
- queryReqDTO.setFindPeople(null);
- }
- if (queryReqDTO.getAcceptPeople() == "" ){
- queryReqDTO.setAcceptPeople(null);
- }
- if (queryReqDTO.getRiskLevel() == "" ){
- queryReqDTO.setRiskLevel(null);
- }
- if (queryReqDTO.getRiskDep() == "" ){
- queryReqDTO.setRiskDep(null);
- }
- if (queryReqDTO.getMajor() == "" ){
- queryReqDTO.setMajor(null);
- }
-
- Integer pageIndex = queryReqDTO.getPageNum();
- Integer pageSize = queryReqDTO.getPageSize();
-
- Page<RiskOldInfo> page = PageHelper.startPage(pageIndex, pageSize);
-
- List<RiskOldInfo> riskOldInfo = repository.selectOldRiskInfoPage(queryReqDTO);
- List<RiskOldInfo> result = page.getResult();
-
- resultVO.setData(result);
- resultVO.setCount((int) page.getTotal());
- resultVO.setPageNum(page.getPageNum());
- resultVO.setPageSize(page.getPageSize());
-
- return resultVO;
- }
-
-
-}
+package com.ruoyi.doublePrevention.service.baseService.impl;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.ruoyi.common.exception.BusinessException;
+import com.ruoyi.common.utils.BeanCopyUtils;
+import com.ruoyi.doublePrevention.entity.RiskOldInfo;
+import com.ruoyi.doublePrevention.entity.dto.req.RiskOldInfoQueryReqDTO;
+import com.ruoyi.doublePrevention.entity.dto.resp.RiskOldInfoQueryRespDTO;
+import com.ruoyi.doublePrevention.repository.RiskOldInfoRepository;
+import com.ruoyi.doublePrevention.service.baseService.RiskOldInfoService;
+import com.ruoyi.doublePrevention.vo.ResultVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import java.util.List;
+
+@Service
+public class RiskOldInfoServiceImpl implements RiskOldInfoService {
+
+ @Autowired
+ private RiskOldInfoRepository repository;
+
+
+ @Override
+ public ResultVO<RiskOldInfoQueryRespDTO> selectOldRiskInfoPage(RiskOldInfoQueryReqDTO queryReqDTO) {
+
+ ResultVO resultVO = new ResultVO<>();
+
+ if (ObjectUtils.isEmpty(queryReqDTO.getPageSize())){
+ throw new BusinessException("分页信息不能为空");
+ }
+ if (ObjectUtils.isEmpty(queryReqDTO.getPageNum())){
+ throw new BusinessException("分页信息不能为空");
+ }
+
+ if (queryReqDTO.getReportPeople() == "" ){
+ queryReqDTO.setReportPeople(null);
+ }
+ if (queryReqDTO.getFindPeople() == "" ){
+ queryReqDTO.setFindPeople(null);
+ }
+ if (queryReqDTO.getAcceptPeople() == "" ){
+ queryReqDTO.setAcceptPeople(null);
+ }
+ if (queryReqDTO.getRiskLevel() == "" ){
+ queryReqDTO.setRiskLevel(null);
+ }
+ if (queryReqDTO.getRiskDep() == "" ){
+ queryReqDTO.setRiskDep(null);
+ }
+ if (queryReqDTO.getMajor() == "" ){
+ queryReqDTO.setMajor(null);
+ }
+
+ Integer pageIndex = queryReqDTO.getPageNum();
+ Integer pageSize = queryReqDTO.getPageSize();
+
+ Page<RiskOldInfo> page = PageHelper.startPage(pageIndex, pageSize);
+
+ List<RiskOldInfo> riskOldInfo = repository.selectOldRiskInfoPage(queryReqDTO);
+ List<RiskOldInfo> result = page.getResult();
+
+ resultVO.setData(result);
+ resultVO.setCount((int) page.getTotal());
+ resultVO.setPageNum(page.getPageNum());
+ resultVO.setPageSize(page.getPageSize());
+
+ return resultVO;
+ }
+
+
+}
diff --git a/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java b/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
index 7173b16..18f4fe4 100644
--- a/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
+++ b/src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
@@ -1,1393 +1,1393 @@
-package com.ruoyi.doublePrevention.service.impl;
-
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
-import com.ruoyi.common.constant.TrHiddenDangerCheckConstants;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.text.Convert;
-import com.ruoyi.doublePrevention.entity.*;
-import com.ruoyi.doublePrevention.entity.dto.req.*;
-import com.ruoyi.doublePrevention.entity.dto.resp.*;
-import com.ruoyi.doublePrevention.enums.*;
-import com.ruoyi.doublePrevention.exception.AusinessException;
-import com.ruoyi.doublePrevention.repository.param.PreventPointAndMeasureParams;
-import com.ruoyi.doublePrevention.service.RiskService;
-import com.ruoyi.doublePrevention.service.baseService.*;
-import com.ruoyi.doublePrevention.vo.ResultVO;
-import com.ruoyi.project.system.user.domain.User;
-import com.ruoyi.project.tr.HiddenDangerCheckJob.domain.HiddenDangerCheckJob;
-import com.ruoyi.project.tr.HiddenDangerCheckJob.mapper.HiddenDangerCheckJobMapper;
-import com.ruoyi.project.tr.hiddenDangerCheck.domain.HiddenDangerCheck;
-import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
-import org.apache.commons.lang3.ObjectUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static com.ruoyi.common.utils.security.ShiroUtils.getSysUser;
-
-@Service("RiskService")
-public class RiskServiceImpl implements RiskService {
-
- @Autowired
- private PreventRiskUnitUuidService preventRiskUnitUuidService;
-
- @Autowired
- private PreventRiskEventService preventRiskEventService;
-
- @Autowired
- private PreventReportConfigService preventReportConfigService;
-
- @Autowired
- private PreventRiskListService preventRiskListService;
-
- @Autowired
- private PreventRiskControlTemplateService riskControlTemplateService;
-
- @Autowired
- private PreventRiskControlMeasureService riskControlMeasureService;
-
- @Autowired
- private PreventRiskCheckUnitService preventRiskCheckUnitService;
-
- @Autowired
- private PreventRiskJobAndMeasureService preventRiskJobAndMeasureService;
-
- @Autowired
- private HiddenDangerCheckJobMapper hiddenDangerCheckJobMapper;
-
- @Autowired
- private PreventRiskDangerCheckLogService preventRiskDangerCheckLogService;
-
- @Autowired
- private PreventRiskDangerCheckAndMeasureService preventRiskDangerCheckAndMeasureService;
-
- @Autowired
- private PreventRiskDangerInfoService preventRiskDangerInfoService;
-
- /**
- * 为设施设备清单附属表添加uuid
- * */
- @Override
- public int insertRiskUnitUuid(Long id) {
-
- String uuid = UUID.randomUUID().toString();
- PreventRiskUnitUuid riskUnitUuid = new PreventRiskUnitUuid();
- //封装参数
- riskUnitUuid.setRiskUnitId(id);
- riskUnitUuid.setRiskUnitUuid(uuid);
-
- //获取上报主配置信息
- PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());
- //设置本条数据上报更新时间
- riskUnitUuid.setUpdateReportDataTime(new Date());
- //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
- if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
- && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
- //设置上报状态为-等待上报
- riskUnitUuid.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- //设置本条数据上报开关为-开启
- riskUnitUuid.setReportSwitch(SyncEnum.REPORT_ON.getCode());
- //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
- }else {
- //设置上报状态为-不上报
- riskUnitUuid.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
- //设置本条数据上报开关为-关闭
- riskUnitUuid.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
- }
-
- return preventRiskUnitUuidService.insertRiskUnitUuid(riskUnitUuid);
- }
-
- /**
- * 修改风险清单附属表
- */
- @Override
- public int updateRiskUnit(Long riskListId) {
-
- PreventRiskUnitUuid riskUnitUuid = new PreventRiskUnitUuid();
- //封装参数
- riskUnitUuid.setRiskUnitId(riskListId);
-
- //获取上报主配置信息
- PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());
- //设置本条数据上报更新时间
- riskUnitUuid.setUpdateReportDataTime(new Date());
- //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
- if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
- && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
- //设置上报状态为-等待上报
- riskUnitUuid.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- //设置本条数据上报开关为-开启
- riskUnitUuid.setReportSwitch(SyncEnum.REPORT_ON.getCode());
- //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
- }else {
- //设置上报状态为-不上报
- riskUnitUuid.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
- //设置本条数据上报开关为-关闭
- riskUnitUuid.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
- }
-
- return preventRiskUnitUuidService.updateRiskUnitUuid(riskUnitUuid);
- }
-
- /**
- * 删除附属表信息
- */
- @Override
- public int deleteRiskUnit(String ids) {
- String[] riskIds = Convert.toStrArray(ids);
-
- return preventRiskUnitUuidService.deleteRiskUnit(riskIds);
- }
-
-
- /**
- * 风险事件-新增
- */
- @Override
- public ResultVO<PreventRiskEvent> saveRiskEvent(PreventRiskEventSaveReqDTO riskEventSaveReqDTO) {
- User sysUser = getSysUser();
- ResultVO resultVO = new ResultVO<>();
- resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
- Long riskUnitId = riskEventSaveReqDTO.getRiskUnitId();
- String riskEventName = riskEventSaveReqDTO.getRiskEventName();
- String eventResult = riskEventSaveReqDTO.getEventResult();
-
- if (riskUnitId == null){
- resultVO.setMsg("安全风险分析单元名称不能为空");
- return resultVO;
- }
-// PreventRiskUnitUuid riskUnit = preventRiskUnitUuidService.getRiskUnitUuidById(riskUnitId);
-// if (riskUnit == null){
-// resultVO.setMsg("安全风险分析单元名称不存在");
-// return resultVO;
-// }
- if (StringUtils.isEmpty(riskEventName)){
- resultVO.setMsg("安全风险事件名称不能为空");
- return resultVO;
- }
- PreventRiskEvent riskEventByEventName = preventRiskEventService.getPreventRiskEventByEventName(riskEventName);
- if (riskEventByEventName != null){
- resultVO.setMsg("安全风险事件名称已存在");
- return resultVO;
- }
- if (StringUtils.isEmpty(eventResult)){
- resultVO.setMsg("可能造成得后果不能为空");
- return resultVO;
- }
-
- Date date = new Date();
- String uuid = UUID.randomUUID().toString();
- PreventRiskEvent riskEvent = new PreventRiskEvent();
- riskEvent.setUuid(uuid);
- riskEvent.setEventResult(eventResult);
- riskEvent.setRiskEventName(riskEventName);
- riskEvent.setRiskUnitId(riskUnitId);
-// riskEvent.setRiskUnitUuid(riskUnit.getRiskUnitUuid());
- riskEvent.setDeleteStatus(StatusEnum.DELETE_STATUS_USE.getCode());
- riskEvent.setGmtCreate(date);
- riskEvent.setGmtModitify(date);
- riskEvent.setCreateByUserName(sysUser.getUserName());
- riskEvent.setLastEditUserName(sysUser.getUserName());
- //todo 对所属企业id和uuid没有进行设置
- PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());
- //设置上报时间为空
- riskEvent.setReportTime(null);
- //设置本条数据上报更新时间
- riskEvent.setUpdateReportDataTime(date);
- //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
- if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
- && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
- //设置上报状态为-等待上报
- riskEvent.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- //设置本条数据上报开关为-开启
- riskEvent.setReportSwitch(SyncEnum.REPORT_ON.getCode());
- //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
- }else {
- //设置上报状态为-不上报
- riskEvent.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
- //设置本条数据上报开关为-关闭
- riskEvent.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
- }
-
- int saveResult = preventRiskEventService.savePreventRiskEvent(riskEvent);
- if (saveResult == 0){
- resultVO.setCode(ResultCodes.SERVER_ADD_ERROR.getCode());
- resultVO.setMsg(ResultCodes.SERVER_ADD_ERROR.getDesc());
- return resultVO;
- }
- resultVO.setCode(ResultCodes.OK.getCode());
- resultVO.setMsg("新增安全风险事件成功");
- return resultVO;
- }
-
- /**
- * @description 风险事件-删除
- */
- @Override
- public ResultVO<PreventRiskEvent> deleteRiskEvent(PreventRiskEventDeleteReqDTO riskEventDeleteReqDTO) {
- User sysUser = getSysUser();
- ResultVO resultVO = new ResultVO<>();
- resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
-
- Long eventId = riskEventDeleteReqDTO.getId();
- if (eventId == null){
- resultVO.setMsg("安全风险事件Id为空，删除失败");
- return resultVO;
- }
- PreventRiskEvent riskEvent = preventRiskEventService.getPreventRiskEventById(eventId);
- if (riskEvent == null){
- resultVO.setMsg("安全风险事件不存在，删除失败");
- return resultVO;
- }
- Date date = new Date();
- riskEvent.setGmtModitify(date);
- riskEvent.setLastEditUserName(sysUser.getUserName());
- riskEvent.setUpdateReportDataTime(date);
-
- int deleteResult = preventRiskEventService.deletePreventRiskEventById(riskEvent);
- if (deleteResult == 0){
- resultVO.setCode(ResultCodes.SERVER_DEL_ERROR.getCode());
- resultVO.setMsg(ResultCodes.SERVER_DEL_ERROR.getDesc());
- return resultVO;
- }
- resultVO.setCode(ResultCodes.OK.getCode());
- resultVO.setMsg("删除安全风险事件成功");
- return resultVO;
- }
-
- /**
- * 风险事件-修改
- */
- @Override
- public ResultVO<PreventRiskEvent> updateRiskEvent(PreventRiskEventUpdateReqDTO riskEventUpdateReqDTO) {
- User sysUser = getSysUser();
- ResultVO resultVO = new ResultVO<>();
- resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
- Long riskEventId = riskEventUpdateReqDTO.getId();
- Long riskUnitId = riskEventUpdateReqDTO.getRiskUnitId();
- String riskEventName = riskEventUpdateReqDTO.getRiskEventName();
- String eventResult = riskEventUpdateReqDTO.getEventResult();
- if (riskEventId == null){
- resultVO.setMsg("安全风险事件ID不能为空");
- return resultVO;
- }
- if (riskUnitId == null){
- resultVO.setMsg("安全风险分析单元名称不能为空");
- return resultVO;
- }
-// PreventRiskUnitUuid riskUnit = preventRiskUnitUuidService.getRiskUnitUuidById(riskUnitId);
-// if (riskUnit == null){
-// resultVO.setMsg("安全风险分析单元名称不存在");
-// return resultVO;
-// }
- if (StringUtils.isEmpty(riskEventName)){
- resultVO.setMsg("安全风险事件名称不能为空");
- return resultVO;
- }
- PreventRiskEvent riskEventByEventName = preventRiskEventService.getPreventRiskEventByEventName(riskEventName);
- if (riskEventByEventName != null){
- if (!riskEventId.equals(riskEventByEventName.getId())){
- resultVO.setMsg("安全风险事件名称已存在");
- return resultVO;
- }
- }
- if (StringUtils.isEmpty(eventResult)){
- resultVO.setMsg("可能造成得后果不能为空");
- return resultVO;
- }
-
- Date date = new Date();
- PreventRiskEvent preventRiskEvent = new PreventRiskEvent();
- BeanUtils.copyProperties(riskEventUpdateReqDTO,preventRiskEvent);
- preventRiskEvent.setGmtModitify(date);
- preventRiskEvent.setLastEditUserName(sysUser.getUserName());
- //获取上报主配置信息
- PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());
- //设置本条数据上报更新时间
- preventRiskEvent.setUpdateReportDataTime(date);
- //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
- if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
- && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
- //设置上报状态为-等待上报
- preventRiskEvent.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- //设置本条数据上报开关为-开启
- preventRiskEvent.setReportSwitch(SyncEnum.REPORT_ON.getCode());
- //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
- }else {
- //设置上报状态为-不上报
- preventRiskEvent.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
- //设置本条数据上报开关为-关闭
- preventRiskEvent.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
- }
-
- int updateResult = preventRiskEventService.updatePreventRiskEventById(preventRiskEvent);
-
- if (updateResult == 0){
- resultVO.setCode(ResultCodes.SERVER_UPDATE_ERROR.getCode());
- resultVO.setMsg(ResultCodes.SERVER_UPDATE_ERROR.getDesc());
- return resultVO;
- }
- resultVO.setCode(ResultCodes.OK.getCode());
- resultVO.setMsg("更新安全风险事件成功");
- return resultVO;
- }
-
- /**
- * @description 根据风险事件的id查询风险事件
- */
- @Override
- public ResultVO<PreventRiskEventRespDTO> getRiskEventById(PreventRiskEventGetReqDTO riskEventGetReqDTO) {
- Long eventId = riskEventGetReqDTO.getId();
- ResultVO resultVO = new ResultVO<>();
- resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
- if (eventId == null){
- resultVO.setMsg("安全风险事件ID不能为空");
- return resultVO;
- }
- PreventRiskEvent riskEvent = preventRiskEventService.getPreventRiskEventById(eventId);
- if (riskEvent == null){
- resultVO.setMsg("安全风险事件不存在");
- return resultVO;
- }
- PreventRiskEventRespDTO respDTO = new PreventRiskEventRespDTO();
- BeanUtils.copyProperties(riskEvent,respDTO);
- resultVO.setCode(ResultCodes.OK.getCode());
- resultVO.setMsg(ResultCodes.OK.getDesc());
- resultVO.setData(respDTO);
- return resultVO;
- }
-
- /**
- * 风险事件-分页查询
- * @return
- */
- @Override
- public ResultVO<List<PreventRiskEventPageQueryRespDTO>> listRiskEventPage(PreventRiskEventPageQueryReqDTO riskEventQueryReqDTO) {
- Integer pageIndex = riskEventQueryReqDTO.getPageNum();
- Integer pageSize = riskEventQueryReqDTO.getPageSize();
- if (pageIndex == 0 || pageSize == 0){
- return new ResultVO<>(ErrorCodes.REQUEST_PARAM_ERROR.getCode(),"当前页码或当前页显示数不能为0");
- }
- Long riskUnitId = riskEventQueryReqDTO.getRiskUnitId();
- String riskEventName = riskEventQueryReqDTO.getRiskEventName();
- Page<PreventRiskEvent> page = PageHelper.startPage(pageIndex, pageSize);
- preventRiskEventService.listRiskEvenByCondition(riskUnitId,riskEventName);
-
- List<PreventRiskEvent> result = page.getResult();
- Long total = page.getTotal();
- int count = total.intValue();
- List<PreventRiskEventPageQueryRespDTO> pageResult = null;
- if (result != null) {
- pageResult = result.stream().map((preventRiskEvent) -> {
- PreventRiskEventPageQueryRespDTO dto = new PreventRiskEventPageQueryRespDTO();
- BeanUtils.copyProperties(preventRiskEvent, dto);
- Long unitId = dto.getRiskUnitId();
- if (unitId != null) {
- PreventRiskList riskList = preventRiskListService.getPreventRiskListById(unitId);
- if (riskList != null) {
- dto.setRiskUnitName(riskList.getRiskListName());
- }
- }
- return dto;
- }).collect(Collectors.toList());
- }
-
- ResultVO<List<PreventRiskEventPageQueryRespDTO>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);
- resultVO.setCount(count);
- return resultVO;
- }
-
- /**
- * @description 获取所有风险事件不分页
- */
- @Override
- public ResultVO<List<PreventRiskEventListQueryRespDTO>> listRiskEvent() {
- List<PreventRiskEvent> riskEvents = preventRiskEventService.listRiskEvenByCondition(null, null);
- List<PreventRiskEventListQueryRespDTO> riskEventList = null;
- if (riskEvents != null){
- riskEventList = riskEvents.stream().map((riskEvent)->{
- PreventRiskEventListQueryRespDTO dto = new PreventRiskEventListQueryRespDTO();
- BeanUtils.copyProperties(riskEvent,dto);
- return dto;
- }).collect(Collectors.toList());
- }
- return new ResultVO<>(ResultCodes.OK,riskEventList);
- }
-
- /**
- * @description 新增风险管控措施
- */
- @Override
- public ResultVO<PreventRiskControlMeasure> saveRiskControlMeasure(PreventRiskControlMeasureSaveReqDTO measureSaveReqDTO) {
- User sysUser = getSysUser();
- ResultVO resultVO = new ResultVO<>();
- resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
- Long riskEventId = measureSaveReqDTO.getRiskEventId();
- if (riskEventId == null){
- resultVO.setMsg("安全风险事件ID不能为空");
- return resultVO;
- }
- PreventRiskEvent riskEvent = preventRiskEventService.getPreventRiskEventById(riskEventId);
- if (riskEvent == null){
- resultVO.setMsg("安全风险事件不存在");
- return resultVO;
- }
- String controlMeasureCode = measureSaveReqDTO.getControlMeasureCode();
- if (controlMeasureCode.isEmpty()){
- resultVO.setMsg("风险措施编码不能为空");
- return resultVO;
- }
- PreventRiskControlMeasure riskControlMeasure = riskControlMeasureService.getPreventRiskControlMeasureByControlMeasureCode(controlMeasureCode);
- if (riskControlMeasure != null){
- resultVO.setMsg("风险措施编码已存在");
- return resultVO;
- }
- if (measureSaveReqDTO.getControlType() == null){
- resultVO.setMsg("管控方式不能为空");
- return resultVO;
- }
- if (measureSaveReqDTO.getCheckContent().isEmpty()){
- resultVO.setMsg("管控内容不能为空");
- return resultVO;
- }
- if (measureSaveReqDTO.getClassify1() == null){
- resultVO.setMsg("管控措施分类1不能为空");
- return resultVO;
- }
- if (measureSaveReqDTO.getClassify2() == null){
- resultVO.setMsg("管控措施分类2不能为空");
- return resultVO;
- }
- if (measureSaveReqDTO.getMeasureDesc().isEmpty()){
- resultVO.setMsg("措施说明不能为空");
- return resultVO;
- }
- Date date = new Date();
- String uuid = UUID.randomUUID().toString();
-
- PreventRiskControlMeasure controlMeasure = new PreventRiskControlMeasure();
- BeanUtils.copyProperties(measureSaveReqDTO,controlMeasure);
- controlMeasure.setUuid(uuid);
- controlMeasure.setDeleteStatus(StatusEnum.DELETE_STATUS_USE.getCode());
- controlMeasure.setGmtCreate(date);
- controlMeasure.setGmtModitify(date);
- controlMeasure.setLastEditUserName(sysUser.getUserName());
- controlMeasure.setCreateByUserName(sysUser.getUserName());
- controlMeasure.setRiskEventUuid(riskEvent.getUuid());
-
- PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());
- //设置上报时间为空
- controlMeasure.setReportTime(null);
- //设置本条数据上报更新时间
- controlMeasure.setUpdateReportDataTime(date);
- //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
- if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
- && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
- //设置上报状态为-等待上报
- controlMeasure.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- //设置本条数据上报开关为-开启
- controlMeasure.setReportSwitch(SyncEnum.REPORT_ON.getCode());
- //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
- }else {
- //设置上报状态为-不上报
- controlMeasure.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
- //设置本条数据上报开关为-关闭
- controlMeasure.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
- }
-
- int saveResult = riskControlMeasureService.savePreventRiskControlMeasure(controlMeasure);
- if (saveResult == 0){
- resultVO.setCode(ResultCodes.SERVER_ADD_ERROR.getCode());
- resultVO.setMsg(ResultCodes.SERVER_ADD_ERROR.getDesc());
- return resultVO;
- }
- resultVO.setCode(ResultCodes.OK.getCode());
- resultVO.setMsg("新增风险管控措施成功");
- return resultVO;
- }
-
- /**
- * 管控措施- 获取管控措施模板
- */
- @Override
- public ResultVO<List<PreventRiskMeasureTemplatesListQueryRespDTO>> listMeasureTemplates() {
- List<PreventRiskControlTemplate> riskControlTemplates = riskControlTemplateService.listMeasureTemplates();
-
- List<PreventRiskMeasureTemplatesListQueryRespDTO> listResult = null;
- if (riskControlTemplates != null){
- listResult = riskControlTemplates.stream().map((riskControlTemplate)->{
- PreventRiskMeasureTemplatesListQueryRespDTO dto = new PreventRiskMeasureTemplatesListQueryRespDTO();
- BeanUtils.copyProperties(riskControlTemplate,dto);
- return dto;
- }).collect(Collectors.toList());
- }
- return new ResultVO<>(ResultCodes.OK,listResult);
- }
-
- /**
- * 管控措施-删除
- */
- @Override
- public ResultVO<PreventRiskControlMeasure> deleteRiskControlMeasure(PreventRiskControlMeasureDeleteReqDTO measureDeleteReqDTO) {
- User sysUser = getSysUser();
- ResultVO resultVO = new ResultVO<>();
- resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
-
- Long measureId = measureDeleteReqDTO.getId();
- if (measureId == null){
- resultVO.setMsg("风险管控措施Id为空，删除失败");
- return resultVO;
- }
- PreventRiskControlMeasure controlMeasure = riskControlMeasureService.getPreventRiskControlMeasureById(measureId);
- if (controlMeasure == null){
- resultVO.setMsg("风险管控措施不存在，删除失败");
- return resultVO;
- }
- Date date = new Date();
- controlMeasure.setGmtModitify(date);
- controlMeasure.setLastEditUserName(sysUser.getUserName());
- controlMeasure.setUpdateReportDataTime(date);
-
- int deleteResult = riskControlMeasureService.deletePreventRiskControlMeasureById(controlMeasure);
- if (deleteResult == 0){
- resultVO.setCode(ResultCodes.SERVER_DEL_ERROR.getCode());
- resultVO.setMsg(ResultCodes.SERVER_DEL_ERROR.getDesc());
- return resultVO;
- }
- resultVO.setCode(ResultCodes.OK.getCode());
- resultVO.setMsg("删除风险管控措施成功");
- return resultVO;
- }
-
- /**
- * @description 根据风险措施id查询风险措施
- */
- @Override
- public ResultVO<PreventRiskControlMeasureRespDTO> getRiskControlMeasure(PreventRiskControlMeasureGetReqDTO riskControlMeasureGetReqDTO) {
- ResultVO resultVO = new ResultVO<>();
- resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
- Long measureId = riskControlMeasureGetReqDTO.getId();
- if (measureId == null){
- resultVO.setMsg("风险管控措施Id不能为空");
- return resultVO;
- }
- PreventRiskControlMeasure measure = riskControlMeasureService.getPreventRiskControlMeasureById(measureId);
- if (measure == null){
- resultVO.setMsg("风险管控措施不存在");
- return resultVO;
- }
- PreventRiskControlMeasureRespDTO dto = new PreventRiskControlMeasureRespDTO();
- BeanUtils.copyProperties(measure,dto);
- resultVO.setCode(ResultCodes.OK.getCode());
- resultVO.setMsg(ResultCodes.OK.getDesc());
- resultVO.setData(dto);
-
- return resultVO;
- }
-
- /**
- * 管控措施-修改
- */
- @Override
- public ResultVO<PreventRiskControlMeasure> updateRiskControlMeasure(PreventRiskControlMeasureUpdateReqDTO measureUpdateReqDTO) {
- User sysUser = getSysUser();
- ResultVO resultVO = new ResultVO<>();
- resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
- Long measureId = measureUpdateReqDTO.getId();
- Long riskEventId = measureUpdateReqDTO.getRiskEventId();
- if (measureId == null){
- resultVO.setMsg("风险管控措施ID不能为空");
- return resultVO;
- }
- if (riskEventId == null){
- resultVO.setMsg("安全风险事件ID不能为空");
- return resultVO;
- }
- PreventRiskEvent riskEvent = preventRiskEventService.getPreventRiskEventById(riskEventId);
- if (riskEvent == null){
- resultVO.setMsg("安全风险事件不存在");
- return resultVO;
- }
- String controlMeasureCode = measureUpdateReqDTO.getControlMeasureCode();
- if (controlMeasureCode.isEmpty()){
- resultVO.setMsg("风险措施编码不能为空");
- return resultVO;
- }
- PreventRiskControlMeasure riskControlMeasure = riskControlMeasureService.getPreventRiskControlMeasureByControlMeasureCode(controlMeasureCode);
- if (riskControlMeasure != null){
- if (!measureId.equals(riskControlMeasure.getId())){
- resultVO.setMsg("风险措施编码已存在");
- return resultVO;
- }
- }
- if (measureUpdateReqDTO.getControlType() == null){
- resultVO.setMsg("管控方式不能为空");
- return resultVO;
- }
- if (measureUpdateReqDTO.getCheckContent().isEmpty()){
- resultVO.setMsg("管控内容不能为空");
- return resultVO;
- }
- if (measureUpdateReqDTO.getClassify1() == null){
- resultVO.setMsg("管控措施分类1不能为空");
- return resultVO;
- }
- if (measureUpdateReqDTO.getClassify2() == null){
- resultVO.setMsg("管控措施分类2不能为空");
- return resultVO;
- }
- if (measureUpdateReqDTO.getMeasureDesc().isEmpty()){
- resultVO.setMsg("措施说明不能为空");
- return resultVO;
- }
-
- Date date = new Date();
- PreventRiskControlMeasure controlMeasure = new PreventRiskControlMeasure();
- BeanUtils.copyProperties(measureUpdateReqDTO,controlMeasure);
- controlMeasure.setRiskEventUuid(riskEvent.getUuid());
- controlMeasure.setGmtModitify(date);
- controlMeasure.setLastEditUserName(sysUser.getUserName());
- //获取上报主配置信息
- PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());
- //设置本条数据上报更新时间
- controlMeasure.setUpdateReportDataTime(date);
- //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
- if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
- && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
- //设置上报状态为-等待上报
- controlMeasure.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- //设置本条数据上报开关为-开启
- controlMeasure.setReportSwitch(SyncEnum.REPORT_ON.getCode());
- //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
- }else {
- //设置上报状态为-不上报
- controlMeasure.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
- //设置本条数据上报开关为-关闭
- controlMeasure.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
- }
-
- int updateResult = riskControlMeasureService.updatePreventRiskControlMeasureById(controlMeasure);
- if (updateResult == 0){
- resultVO.setCode(ResultCodes.SERVER_UPDATE_ERROR.getCode());
- resultVO.setMsg(ResultCodes.SERVER_UPDATE_ERROR.getDesc());
- return resultVO;
- }
- resultVO.setCode(ResultCodes.OK.getCode());
- resultVO.setMsg("更新风险管控措施成功");
- return resultVO;
-
- }
-
- /**
- * 管控措施-分页查询
- */
- @Override
- public ResultVO<List<PreventRiskControlMeasurePageQueryRespDTO>> getRiskControlMeasurePage(PreventRiskControlMeasureQueryReqDTO measureQueryReqDTO) {
- Integer pageIndex = measureQueryReqDTO.getPageNum();
- Integer pageSize = measureQueryReqDTO.getPageSize();
- if (pageIndex == 0 || pageSize == 0){
- return new ResultVO<>(ErrorCodes.REQUEST_PARAM_ERROR.getCode(),"当前页码或当前页显示数不能为0");
- }
- Byte controlType = measureQueryReqDTO.getControlType();
- Long riskEventId = measureQueryReqDTO.getRiskEventId();
-
- Page<PreventRiskControlMeasure> page = PageHelper.startPage(pageIndex, pageSize);
- riskControlMeasureService.listRiskControlMeasureByCondition(controlType,riskEventId);
-
- List<PreventRiskControlMeasure> result = page.getResult();
- Long total = page.getTotal();
- int count = total.intValue();
- List<PreventRiskControlMeasurePageQueryRespDTO> pageResult = null;
- if (result != null) {
- pageResult = result.stream().map((preventRiskControlMeasure) -> {
- PreventRiskControlMeasurePageQueryRespDTO dto = new PreventRiskControlMeasurePageQueryRespDTO();
- BeanUtils.copyProperties(preventRiskControlMeasure, dto);
- Long eventId = dto.getRiskEventId();
- if (eventId != null) {
- PreventRiskEvent riskEvent = preventRiskEventService.getPreventRiskEventById(eventId);
- if (riskEvent != null) {
- dto.setRiskEventName(riskEvent.getRiskEventName());
- }
- }
- return dto;
- }).collect(Collectors.toList());
- }
-
- ResultVO<List<PreventRiskControlMeasurePageQueryRespDTO>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);
- resultVO.setCount(count);
- return resultVO;
- }
- /**
- * 查询管控措施 by 基础排查清单ID
- */
- @Override
- public List<PreventRiskControlMeasure> getRiskControlMeasureByRiskId(Long riskListId) {
- //获取管控措施list
- List<PreventRiskControlMeasure> controlMeasureList = new ArrayList<>();
-
- //通过riskListId ,查询对应的管控措施id
- List<PreventRiskCheckUnit> unitByRiskId = preventRiskCheckUnitService.getUnitByRiskId(riskListId.toString());
-
- //遍历集合，封装管控措施
- for (PreventRiskCheckUnit checkUnit : unitByRiskId) {
- PreventRiskControlMeasure controlMeasure = riskControlMeasureService.getPreventRiskControlMeasureById(checkUnit.getControlMeasureId());
- controlMeasureList.add(controlMeasure);
- }
- return controlMeasureList;
- }
-
- /**
- * 保存原检查点与管控措施的对应关系
- */
- @Transactional
- @Override
- public int insertPointAndMeasure(PreventPointAndMeasureParams pointAndMeasureParams) {
-
- //参数校验-管控措施id
- if (pointAndMeasureParams.getControlMeasureId() == null){
- throw new RuntimeException("管控措施不能为空");
- }
- PreventRiskControlMeasure preventRiskControlMeasureById
- = riskControlMeasureService.getPreventRiskControlMeasureById(pointAndMeasureParams.getControlMeasureId());
- if (preventRiskControlMeasureById == null){
- throw new RuntimeException("管控措施不存在");
- }
- if (pointAndMeasureParams.getBaseCheckPointId() == null){
- throw new RuntimeException("检查点添加失败");
- }
-
- String uuid = UUID.randomUUID().toString();
- PreventRiskCheckUnit checkUnit = new PreventRiskCheckUnit();
- //封装数据
- checkUnit.setUuid(uuid);
- checkUnit.setRiskId(pointAndMeasureParams.getRiskId());
- checkUnit.setBaseCheckPointId(pointAndMeasureParams.getBaseCheckPointId());
- checkUnit.setControlMeasureId(pointAndMeasureParams.getControlMeasureId());
- //执行插入
- int result = preventRiskCheckUnitService.insertPointAndMeasure(checkUnit);
- if (result < 1){
- throw new RuntimeException("保存原检查点与管控措施的对应关系失败");
- }
-
- return result;
- }
- /**
- * 删除原检查点与管控措施的对应关系
- */
- @Override
- public int deletePointAndMeasure(String ids) {
-
- String[] idList = Convert.toStrArray(ids);
- for (String id : idList) {
- int result = preventRiskCheckUnitService.deletePointAndMeasure(id);
- if (result < 1){
- return StatusEnum.EXEC_FAIL.getCode();
- }
- }
-
- return StatusEnum.EXEC_SUCCESS.getCode();
- }
-
- /**
- * 保存job管控措施的附属表
- */
- @Override
- public int insertJobAndMeasure(Long jobId, HiddenDangerCheckJob hiddenDangerCheckJob) {
-
-
- PreventRiskJobAndMeasure jobAndMeasure = new PreventRiskJobAndMeasure();
-
- //根据RiskId查询对应的管控措施
- List<PreventRiskCheckUnit> unitByRiskId = preventRiskCheckUnitService.getUnitByRiskId(hiddenDangerCheckJob.getRiskId());
-
- //遍历管控措施集合
- for (PreventRiskCheckUnit checkUnit : unitByRiskId) {
- String jobUuid = UUID.randomUUID().toString();
- PreventRiskControlMeasure preventRiskControlMeasureById = riskControlMeasureService.getPreventRiskControlMeasureById(checkUnit.getControlMeasureId());
- //封装数据
- jobAndMeasure.setJobId(jobId);
- jobAndMeasure.setJobUuid(jobUuid);
- jobAndMeasure.setMeasureId(checkUnit.getControlMeasureId());
- jobAndMeasure.setMeasureUuid(preventRiskControlMeasureById.getUuid());//如果删除了措施 此处可能为空，后续处理
- //获取上报主配置信息
- PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_TASK_FROM_WORK.getCode());
- //设置上报时间为空
- jobAndMeasure.setReportTime(null);
- //设置本条数据上报更新时间
- jobAndMeasure.setUpdateReportDataTime(new Date());
- //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
- if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
- && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
- //设置上报状态为-等待上报
- jobAndMeasure.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- //设置本条数据上报开关为-开启
- jobAndMeasure.setReportSwitch(SyncEnum.REPORT_ON.getCode());
- //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
- }else {
- //设置上报状态为-不上报
- jobAndMeasure.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
- //设置本条数据上报开关为-关闭
- jobAndMeasure.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
- }
- int result = preventRiskJobAndMeasureService.insertJobAndMeasure(jobAndMeasure);
- if (result < 1 ){
- return StatusEnum.EXEC_FAIL.getCode();
- }
- }
-
- return StatusEnum.EXEC_SUCCESS.getCode();
- }
-
- /**
- * 修改job管控措施的附属表
- */
- @Transactional
- @Override
- public int updateJobAndMeasure(HiddenDangerCheckJob hiddenDangerCheckJob) {
-
- // 2、若有变更，需要预先读取jobAndMeasure的uuid，保存下来
- PreventRiskJobAndMeasure jobAndMeasureByJobId = preventRiskJobAndMeasureService.getJobAndMeasureByJobId(hiddenDangerCheckJob.getJobId());
- String jobUuid = jobAndMeasureByJobId.getJobUuid();
- Date reportTime = jobAndMeasureByJobId.getReportTime();
-
- if (jobAndMeasureByJobId != null){
- //3、删除库中原关联关系
- int deleteResult = preventRiskJobAndMeasureService.deleteJobAndMeasure(hiddenDangerCheckJob.getJobId());
- if(deleteResult < 1){
- throw new RuntimeException("清除job管控措施的附属表关联信息失败");
- }
- }
-
- //4根据RiskId查询对应的管控措施
- List<PreventRiskCheckUnit> unitByRiskId = preventRiskCheckUnitService.getUnitByRiskId(hiddenDangerCheckJob.getRiskId());
-
- //5封装数据，插入数据库，重新添加关联关系
- for (PreventRiskCheckUnit checkUnit : unitByRiskId) {
- PreventRiskControlMeasure preventRiskControlMeasureById = riskControlMeasureService.getPreventRiskControlMeasureById(checkUnit.getControlMeasureId());
- PreventRiskJobAndMeasure jobAndMeasure = new PreventRiskJobAndMeasure();
- //封装参数
- jobAndMeasure.setJobId(jobAndMeasureByJobId.getJobId());
- //使用保存下来的uuid，再次添加关联关系
- jobAndMeasure.setJobUuid(jobUuid);
- jobAndMeasure.setMeasureId(checkUnit.getControlMeasureId());
- jobAndMeasure.setMeasureUuid(preventRiskControlMeasureById.getUuid());//如果删除了措施 此处可能为空，后续处理
-
- //获取上报主配置信息
- PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_TASK_FROM_WORK.getCode());
- //设置上报时间
- jobAndMeasure.setReportTime(reportTime);
- //设置本条数据上报更新时间
- jobAndMeasure.setUpdateReportDataTime(new Date());
- //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
- if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
- && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
- //设置上报状态为-等待上报
- jobAndMeasure.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- //设置本条数据上报开关为-开启
- jobAndMeasure.setReportSwitch(SyncEnum.REPORT_ON.getCode());
- //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
- }else {
- //设置上报状态为-不上报
- jobAndMeasure.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
- //设置本条数据上报开关为-关闭
- jobAndMeasure.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
- }
- int result = preventRiskJobAndMeasureService.insertJobAndMeasure(jobAndMeasure);
- if (result < 1 ){
- return StatusEnum.EXEC_FAIL.getCode();
- }
- }
-
- return StatusEnum.EXEC_SUCCESS.getCode();
- }
-
- /**
- * 删除job管控措施的附属表关联信息
- */
- @Transactional
- @Override
- public int deleteJobAndMeasure(String ids) {
-
- Long[] jobIds = Convert.toLongArray(ids);
-
- for (Long jobId : jobIds)
- {
- int result = preventRiskJobAndMeasureService.deleteJobAndMeasure(jobId);
- if (result < 1 ){
- throw new RuntimeException("删除job管控措施的附属表关联信息失败");
- }
- }
- return StatusEnum.EXEC_SUCCESS.getCode();
- }
- /**
- * 查询Job与措施
- */
- @Override
- public PreventRiskJobAndMeasure getJobAndMeasure(Long jobId) {
- return preventRiskJobAndMeasureService.getJobAndMeasureByJobId(jobId);
- }
- /**
- * 定时生成排查任务记录时，
- * 插入排查记录附属表
- */
- @Override
- public int insertDangerCheckLog(Long checkId, HiddenDangerCheck hdc) {
-
- String dangerCheckUuid = UUID.randomUUID().toString();
- PreventRiskDangerCheckLog dangerCheck = new PreventRiskDangerCheckLog();
-
- dangerCheck.setUuid(dangerCheckUuid);
- dangerCheck.setCheckStatus((byte) 2);//
- dangerCheck.setCheckId(checkId);
- dangerCheck.setJobId(hdc.getJobId());
- //获取上报主配置信息
- PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG__CHECK_RECORD.getCode());
- //设置上报时间为空
- dangerCheck.setReportTime(null);
- //设置本条数据上报更新时间
- dangerCheck.setUpdateReportDataTime(new Date());
- //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
- if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
- && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
- //设置上报状态为-等待上报
- dangerCheck.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- //设置本条数据上报开关为-开启
- dangerCheck.setReportSwitch(SyncEnum.REPORT_ON.getCode());
- //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
- }else {
- //设置上报状态为-不上报
- dangerCheck.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
- //设置本条数据上报开关为-关闭
- dangerCheck.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
- }
- return preventRiskDangerCheckLogService.insertDangerCheckLog(dangerCheck);
- }
- /**
- * 定时生成排查任务记录时，
- * 插入检查点附属表
- */
- @Override
- public int insertCheckAndMeasure(Long id, HiddenDangerCheckPoint hdcp) {
- System.out.println("进入核查点保存方法");
- PreventRiskDangerCheckAndMeasure checkAndMeasure = new PreventRiskDangerCheckAndMeasure();
-
- //根据检查点信息，查询对应管控措施
- PreventRiskCheckUnit checkUnit = preventRiskCheckUnitService.getUnitByBaseCheckPointId(hdcp.getCheckPointId());
- if (checkUnit == null){
- throw new RuntimeException("基础检查点不存在");
- }
-// System.out.println("通过一次检验");
- PreventRiskControlMeasure controlMeasure = riskControlMeasureService.getPreventRiskControlMeasureById(checkUnit.getControlMeasureId());
- if (controlMeasure == null){
- throw new RuntimeException("管控措施已经被删除");
- }
-// System.out.println("通过二次检验");
- //封装数据
- checkAndMeasure.setCheckId(hdcp.getCheckId());
- checkAndMeasure.setDangerCheckPointId(id);
- checkAndMeasure.setBaseCheckPointId(hdcp.getCheckPointId());
- checkAndMeasure.setControlMeasureId(controlMeasure.getId());
- checkAndMeasure.setCheckContent(controlMeasure.getCheckContent());
- checkAndMeasure.setCheckResult((byte) 4);
-// System.out.println("数据封装完成");
- //写入核查任务检查点与管控措施信息
- int result = preventRiskDangerCheckAndMeasureService.insertCheckAndMeasure(checkAndMeasure);
- if (result <1){
- return StatusEnum.EXEC_FAIL.getCode();
- }
- return StatusEnum.EXEC_SUCCESS.getCode();
- }
- /**
- * todo-2022 填报时的操作
- */
-
- /**
- * 删除定时核查任务
- * */
- @Override
- @Transactional
- public int deleteDangerCheck(String ids) {
-
- Long[] dangerCheckIdList = Convert.toLongArray(ids);
-
- //1、删除核查任务附属表
- for (Long checkId : dangerCheckIdList) {
- int result = preventRiskDangerCheckLogService.deleteDangerCheck(checkId);
- if (result < 1){
- return StatusEnum.EXEC_FAIL.getCode();
- }
- }
-
- //2、删除核查任务-检查点的附属表----老代码未删除检查点信息，此处暂不做处理
-
- return StatusEnum.EXEC_SUCCESS.getCode();
- }
-
- /**
- * 新增隐患上报
- * */
- @Override
- public int insertDangerInfo(Long id, HiddenDangerCheckPoint hdcp) {
-
- String dangerInfoUuid = UUID.randomUUID().toString();
- PreventRiskDangerInfo dangerInfo = new PreventRiskDangerInfo();
-// if (ObjectUtils.isEmpty(hdcp.getDangerSrc())){
-// throw new RuntimeException("隐患来源为空");
-// }
-// if (ObjectUtils.isEmpty(hdcp.getHazardDangerType())){
-// throw new RuntimeException("隐患类型为空");
-// }
-
- dangerInfo.setUuid(dangerInfoUuid);
- dangerInfo.setDangerCheckPointId(id);
- dangerInfo.setHazardCode(hdcp.getHazardCode());
- dangerInfo.setDangerSrc(hdcp.getDangerSrc());
- dangerInfo.setDangerDesc(hdcp.getDangerDescription());
- dangerInfo.setDangerReason(hdcp.getDangerReason());
- dangerInfo.setDangerResult(hdcp.getDangerResult());
- dangerInfo.setHazardDangerType(hdcp.getHazardDangerType());
-// if (ObjectUtils.isNotEmpty(hdcp.getsta))
- //隐患状态 0未验收 1验收通过 2验收未通过
- if (hdcp.getAcceptStatus() == null){
- //设置为 空
- dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());
- } else if (hdcp.getAcceptStatus().equals("0")){
- //设置为整改中
- dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());
- } else if (hdcp.getAcceptStatus().equals("1")) {
- //设置为已验收
- dangerInfo.setDangerState(StatusEnum.ACCEPT_SUCCESS.getCode());
- }else if (hdcp.getAcceptStatus().equals("2")){
- //设置为超期未整改
- dangerInfo.setDangerState(StatusEnum.RECTIFY_TIMEOUT_AND_FAIL.getCode());
- }
-// dangerInfo.setDangerState(null); //设置为 空
- dangerInfo.setTimeoutFlag(null);//暂时不清楚是否需要此功能，先设为空
- //获取上报主配置信息
- PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());
- //设置上报时间为空
- dangerInfo.setReportTime(null);
- //设置本条数据上报更新时间
- dangerInfo.setUpdateReportDataTime(new Date());
- //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
- if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
- && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
- //设置上报状态为-等待上报
- dangerInfo.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- //设置本条数据上报开关为-开启
- dangerInfo.setReportSwitch(SyncEnum.REPORT_ON.getCode());
- //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
- }else {
- //设置上报状态为-不上报
- dangerInfo.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
- //设置本条数据上报开关为-关闭
- dangerInfo.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
- }
- int result = preventRiskDangerInfoService.insertDangerInfo(dangerInfo);
- return result;
- }
-
- /**
- * 修改隐患上报
- * */
- @Override
- public int updateDangerInfo(HiddenDangerCheckPoint hdcp) {
-
- //封装修改数据
- PreventRiskDangerInfo dangerInfo = new PreventRiskDangerInfo();
-
- dangerInfo.setDangerCheckPointId(hdcp.getId());
- dangerInfo.setHazardCode(hdcp.getHazardCode());
- dangerInfo.setDangerSrc(hdcp.getDangerSrc());
- dangerInfo.setDangerDesc(hdcp.getDangerDescription());
- dangerInfo.setDangerReason(hdcp.getDangerReason());
- dangerInfo.setDangerResult(hdcp.getDangerResult());
- dangerInfo.setHazardDangerType(hdcp.getHazardDangerType());
- //隐患状态 0未验收 1验收通过 2验收未通过 ，新建时为空
- if (hdcp.getAcceptStatus() == null){
- //设置为 空
- dangerInfo.setDangerState(null);
- } else if (hdcp.getAcceptStatus().equals(0)){
- //设置为整改中
- dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());
- } else if (hdcp.getAcceptStatus().equals(1)) {
- //设置为已验收
- dangerInfo.setDangerState(StatusEnum.ACCEPT_SUCCESS.getCode());
- }else if (hdcp.getAcceptStatus().equals(2)){
- //设置为超期未整改
- dangerInfo.setDangerState(StatusEnum.RECTIFY_TIMEOUT_AND_FAIL.getCode());
- }
- dangerInfo.setTimeoutFlag(null);//暂时不清楚是否需要此功能，先设为空
- //获取上报主配置信息
- PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());
- //设置本条数据上报更新时间
- dangerInfo.setUpdateReportDataTime(new Date());
- //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
- if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
- && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
- //设置上报状态为-等待上报
- dangerInfo.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- //设置本条数据上报开关为-开启
- dangerInfo.setReportSwitch(SyncEnum.REPORT_ON.getCode());
- //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
- }else {
- //设置上报状态为-不上报
- dangerInfo.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
- //设置本条数据上报开关为-关闭
- dangerInfo.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
- }
-
- return preventRiskDangerInfoService.updateDangerInfo(dangerInfo);
- }
-
- /**
- * 删除隐患上报
- */
- @Override
- public int deleteDangerInfo(Long id) {
-
- return preventRiskDangerInfoService.deleteDangerInfo(id);
- }
-
- /**
- * 隐患判定，如果是隐患，修改为整改中
- */
- @Override
- public int updateDangerInfoJudge(HiddenDangerCheckPoint hdcp) {
-
- //封装修改数据
- PreventRiskDangerInfo dangerInfo = new PreventRiskDangerInfo();
-
- dangerInfo.setDangerCheckPointId(hdcp.getId());
- //需要根据条件，判断附属表隐患状态。
- //目前想法：认定后的隐患-0整改中；整改后的隐患-1待验收；验收后的隐患-9已验收。2,3状态暂时未使用
- //设置为整改中
- dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());
- //获取上报主配置信息
- PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());
- //设置本条数据上报更新时间
- dangerInfo.setUpdateReportDataTime(new Date());
- //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
- if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
- && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
- //设置上报状态为-等待上报
- dangerInfo.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- //设置本条数据上报开关为-开启
- dangerInfo.setReportSwitch(SyncEnum.REPORT_ON.getCode());
- //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
- }else {
- //设置上报状态为-不上报
- dangerInfo.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
- //设置本条数据上报开关为-关闭
- dangerInfo.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
- }
-
- return preventRiskDangerInfoService.updateDangerInfoState(dangerInfo);
- }
-
- /**
- * 隐患整改信息 - 修改
- */
- @Override
- public int updateDangerInfoRectify(HiddenDangerCheckPoint hdcp) {
-
- //封装修改数据
- PreventRiskDangerInfo dangerInfo = new PreventRiskDangerInfo();
-
- dangerInfo.setDangerCheckPointId(hdcp.getId());
- //需要根据条件，判断附属表隐患状态。
- //目前想法：认定后的隐患-0整改中；整改后的隐患-1待验收；验收后的隐患-9已验收。2,3状态暂时未使用
- //待验收验收
- dangerInfo.setDangerState(StatusEnum.RECTIFY_WAIT_ACCEPT.getCode());
-
- //获取上报主配置信息
- PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());
- //设置本条数据上报更新时间
- dangerInfo.setUpdateReportDataTime(new Date());
- //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
- if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
- && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
- //设置上报状态为-等待上报
- dangerInfo.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- //设置本条数据上报开关为-开启
- dangerInfo.setReportSwitch(SyncEnum.REPORT_ON.getCode());
- //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
- }else {
- //设置上报状态为-不上报
- dangerInfo.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
- //设置本条数据上报开关为-关闭
- dangerInfo.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
- }
-
- return preventRiskDangerInfoService.updateDangerInfoState(dangerInfo);
- }
-
- /**
- * 隐患验收 - 保存验收信息
- */
- @Override
- public int updateDangerInfoAccept(HiddenDangerCheckPoint hdcp) {
-
- //封装修改数据
- PreventRiskDangerInfo dangerInfo = new PreventRiskDangerInfo();
-
- dangerInfo.setDangerCheckPointId(hdcp.getId());
- int acceptStatus = Integer.parseInt(hdcp.getAcceptStatus());
- //如果验收通过，设置为验收成功；验收失败，打回上一级进行整改，设置为整改中
- if (acceptStatus == 0){
- dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());
- }else if (acceptStatus == 1){
- dangerInfo.setDangerState(StatusEnum.ACCEPT_SUCCESS.getCode());
- }
-
- //获取上报主配置信息
- PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());
- //设置本条数据上报更新时间
- dangerInfo.setUpdateReportDataTime(new Date());
- //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
- if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
- && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
- //设置上报状态为-等待上报
- dangerInfo.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
- //设置本条数据上报开关为-开启
- dangerInfo.setReportSwitch(SyncEnum.REPORT_ON.getCode());
- //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
- }else {
- //设置上报状态为-不上报
- dangerInfo.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
- //设置本条数据上报开关为-关闭
- dangerInfo.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
- }
- return preventRiskDangerInfoService.updateDangerInfoState(dangerInfo);
- }
-
- /**
- * @description 获取所有的风险分析单元的编码和姓名
- */
- @Override
- public List<PreventRiskUnitCodeAndNameListQueryRespDTO> listRiskUnitCodeAndName() {
- List<PreventRiskList> riskLists = preventRiskListService.listRiskUnitCodeAndName();
- if (riskLists == null){
- return null;
- }
- List<PreventRiskUnitCodeAndNameListQueryRespDTO> listQueryRespDTOs= riskLists.stream().map((riskList)->{
- PreventRiskUnitCodeAndNameListQueryRespDTO listQueryRespDTO = new PreventRiskUnitCodeAndNameListQueryRespDTO();
- BeanUtils.copyProperties(riskList,listQueryRespDTO);
- return listQueryRespDTO;
- }).collect(Collectors.toList());
- return listQueryRespDTOs;
- }
-
- /**
- * 管控措施-不分页查询
- */
- @Override
- public ResultVO<List<PreventRiskControlMeasureListQueryRespDTO>> listRiskControlMeasure() {
-
- List<PreventRiskControlMeasure> controlMeasures = riskControlMeasureService.listRiskControlMeasure();
- List<PreventRiskControlMeasureListQueryRespDTO> pageResult = null;
- if (controlMeasures != null) {
- pageResult = controlMeasures.stream().map((preventRiskControlMeasure) -> {
- PreventRiskControlMeasureListQueryRespDTO dto = new PreventRiskControlMeasureListQueryRespDTO();
- BeanUtils.copyProperties(preventRiskControlMeasure, dto);
- return dto;
- }).collect(Collectors.toList());
- }
-
- ResultVO<List<PreventRiskControlMeasureListQueryRespDTO>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);
- return resultVO;
- }
-
- /**
- * 通过排查点，查找管控措施id
- */
- @Override
- public PreventRiskCheckUnit getRiskControlMeasureByCheckPointId(Long checkPointId) {
- return preventRiskCheckUnitService.getUnitByBaseCheckPointId(checkPointId);
- }
-
- /**
- * 查询管控措施信息
- */
- @Override
- public PreventRiskControlMeasure getRiskControlMeasureInfo(Long checkPointId) {
-
- PreventRiskCheckUnit unitByBaseCheckPointId = preventRiskCheckUnitService.getUnitByBaseCheckPointId(checkPointId);
-// if (ObjectUtils.isEmpty(unitByBaseCheckPointId)){
-// throw new AusinessException(E.DATA_DATABASE_DUPLICATED, "数据不存在或已被删除");
-// }
- return riskControlMeasureService.getPreventRiskControlMeasureById(unitByBaseCheckPointId.getControlMeasureId());
- }
-
- /**
- * 查询隐患附属表信息
- */
- @Override
- public PreventRiskDangerInfo getDangerInfoById(Long id) {
- PreventRiskDangerInfo dangerInfobyHiddenDangerId = preventRiskDangerInfoService.getByHiddenDangerId(id);
- return dangerInfobyHiddenDangerId;
- }
-
- @Override
- public int updateCheckLog(Long checkId, HiddenDangerCheckPoint hdcp) {
- return preventRiskDangerCheckLogService.updateCheckLog(checkId, hdcp.getMobileCode());
- }
-
- @Override
- public PreventRiskDangerInfo getDangerInfoByDangerCheckPointId(Long checkId) {
- return preventRiskDangerInfoService.getDangerInfoByDangerCheckPointId(checkId);
- }
-
-
- // /**
-// * 全流程 隐患上报-附属表信息插入
-// * */
-// @Override
-// public int insertAllDangerInfo(Long id, HiddenDangerCheckPoint hdcp) {
-//
-// String dangerInfoUuid = UUID.randomUUID().toString();
-// PreventRiskDangerInfo dangerInfo = new PreventRiskDangerInfo();
-//
-// dangerInfo.setUuid(dangerInfoUuid);
-// dangerInfo.setDangerCheckPointId(id);
-// dangerInfo.setHazardCode(hdcp.getHazardCode());
-// dangerInfo.setDangerSrc(hdcp.getDangerSrc());
-// dangerInfo.setDangerDesc(hdcp.getDangerDesc());
-// dangerInfo.setDangerReason(hdcp.getDangerReason());
-// dangerInfo.setDangerResult(hdcp.getDangerResult());
-// dangerInfo.setHazardDangerType(hdcp.getHazardDangerType());
-// dangerInfo.setDangerState(hdcp.getDangerState());
-// dangerInfo.setTimeoutFlag(null);//暂时不清楚是否需要此功能，先设为空
-//
-// //获取上报主配置信息
-// PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());
-// //设置上报时间为空
-// dangerInfo.setReportTime(null);
-// //设置本条数据上报更新时间
-// dangerInfo.setUpdateReportDataTime(new Date());
-// //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
-// if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
-// && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
-// //设置上报状态为-等待上报
-// dangerInfo.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
-// //设置本条数据上报开关为-开启
-// dangerInfo.setReportSwitch(SyncEnum.REPORT_ON.getCode());
-// //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
-// }else {
-// //设置上报状态为-不上报
-// dangerInfo.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
-// //设置本条数据上报开关为-关闭
-// dangerInfo.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
-// }
-//
-// return preventRiskDangerInfoService.insertDangerInfo(dangerInfo);
-// }
-
-
+package com.ruoyi.doublePrevention.service.impl;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.ruoyi.common.constant.TrHiddenDangerCheckConstants;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.text.Convert;
+import com.ruoyi.doublePrevention.entity.*;
+import com.ruoyi.doublePrevention.entity.dto.req.*;
+import com.ruoyi.doublePrevention.entity.dto.resp.*;
+import com.ruoyi.doublePrevention.enums.*;
+import com.ruoyi.doublePrevention.exception.AusinessException;
+import com.ruoyi.doublePrevention.repository.param.PreventPointAndMeasureParams;
+import com.ruoyi.doublePrevention.service.RiskService;
+import com.ruoyi.doublePrevention.service.baseService.*;
+import com.ruoyi.doublePrevention.vo.ResultVO;
+import com.ruoyi.project.system.user.domain.User;
+import com.ruoyi.project.tr.HiddenDangerCheckJob.domain.HiddenDangerCheckJob;
+import com.ruoyi.project.tr.HiddenDangerCheckJob.mapper.HiddenDangerCheckJobMapper;
+import com.ruoyi.project.tr.hiddenDangerCheck.domain.HiddenDangerCheck;
+import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static com.ruoyi.common.utils.security.ShiroUtils.getSysUser;
+
+@Service("RiskService")
+public class RiskServiceImpl implements RiskService {
+
+ @Autowired
+ private PreventRiskUnitUuidService preventRiskUnitUuidService;
+
+ @Autowired
+ private PreventRiskEventService preventRiskEventService;
+
+ @Autowired
+ private PreventReportConfigService preventReportConfigService;
+
+ @Autowired
+ private PreventRiskListService preventRiskListService;
+
+ @Autowired
+ private PreventRiskControlTemplateService riskControlTemplateService;
+
+ @Autowired
+ private PreventRiskControlMeasureService riskControlMeasureService;
+
+ @Autowired
+ private PreventRiskCheckUnitService preventRiskCheckUnitService;
+
+ @Autowired
+ private PreventRiskJobAndMeasureService preventRiskJobAndMeasureService;
+
+ @Autowired
+ private HiddenDangerCheckJobMapper hiddenDangerCheckJobMapper;
+
+ @Autowired
+ private PreventRiskDangerCheckLogService preventRiskDangerCheckLogService;
+
+ @Autowired
+ private PreventRiskDangerCheckAndMeasureService preventRiskDangerCheckAndMeasureService;
+
+ @Autowired
+ private PreventRiskDangerInfoService preventRiskDangerInfoService;
+
+ /**
+ * 为设施设备清单附属表添加uuid
+ * */
+ @Override
+ public int insertRiskUnitUuid(Long id) {
+
+ String uuid = UUID.randomUUID().toString();
+ PreventRiskUnitUuid riskUnitUuid = new PreventRiskUnitUuid();
+ //封装参数
+ riskUnitUuid.setRiskUnitId(id);
+ riskUnitUuid.setRiskUnitUuid(uuid);
+
+ //获取上报主配置信息
+ PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());
+ //设置本条数据上报更新时间
+ riskUnitUuid.setUpdateReportDataTime(new Date());
+ //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
+ if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
+ && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
+ //设置上报状态为-等待上报
+ riskUnitUuid.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ //设置本条数据上报开关为-开启
+ riskUnitUuid.setReportSwitch(SyncEnum.REPORT_ON.getCode());
+ //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
+ }else {
+ //设置上报状态为-不上报
+ riskUnitUuid.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
+ //设置本条数据上报开关为-关闭
+ riskUnitUuid.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
+ }
+
+ return preventRiskUnitUuidService.insertRiskUnitUuid(riskUnitUuid);
+ }
+
+ /**
+ * 修改风险清单附属表
+ */
+ @Override
+ public int updateRiskUnit(Long riskListId) {
+
+ PreventRiskUnitUuid riskUnitUuid = new PreventRiskUnitUuid();
+ //封装参数
+ riskUnitUuid.setRiskUnitId(riskListId);
+
+ //获取上报主配置信息
+ PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());
+ //设置本条数据上报更新时间
+ riskUnitUuid.setUpdateReportDataTime(new Date());
+ //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
+ if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
+ && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
+ //设置上报状态为-等待上报
+ riskUnitUuid.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ //设置本条数据上报开关为-开启
+ riskUnitUuid.setReportSwitch(SyncEnum.REPORT_ON.getCode());
+ //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
+ }else {
+ //设置上报状态为-不上报
+ riskUnitUuid.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
+ //设置本条数据上报开关为-关闭
+ riskUnitUuid.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
+ }
+
+ return preventRiskUnitUuidService.updateRiskUnitUuid(riskUnitUuid);
+ }
+
+ /**
+ * 删除附属表信息
+ */
+ @Override
+ public int deleteRiskUnit(String ids) {
+ String[] riskIds = Convert.toStrArray(ids);
+
+ return preventRiskUnitUuidService.deleteRiskUnit(riskIds);
+ }
+
+
+ /**
+ * 风险事件-新增
+ */
+ @Override
+ public ResultVO<PreventRiskEvent> saveRiskEvent(PreventRiskEventSaveReqDTO riskEventSaveReqDTO) {
+ User sysUser = getSysUser();
+ ResultVO resultVO = new ResultVO<>();
+ resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
+ Long riskUnitId = riskEventSaveReqDTO.getRiskUnitId();
+ String riskEventName = riskEventSaveReqDTO.getRiskEventName();
+ String eventResult = riskEventSaveReqDTO.getEventResult();
+
+ if (riskUnitId == null){
+ resultVO.setMsg("安全风险分析单元名称不能为空");
+ return resultVO;
+ }
+// PreventRiskUnitUuid riskUnit = preventRiskUnitUuidService.getRiskUnitUuidById(riskUnitId);
+// if (riskUnit == null){
+// resultVO.setMsg("安全风险分析单元名称不存在");
+// return resultVO;
+// }
+ if (StringUtils.isEmpty(riskEventName)){
+ resultVO.setMsg("安全风险事件名称不能为空");
+ return resultVO;
+ }
+ PreventRiskEvent riskEventByEventName = preventRiskEventService.getPreventRiskEventByEventName(riskEventName);
+ if (riskEventByEventName != null){
+ resultVO.setMsg("安全风险事件名称已存在");
+ return resultVO;
+ }
+ if (StringUtils.isEmpty(eventResult)){
+ resultVO.setMsg("可能造成得后果不能为空");
+ return resultVO;
+ }
+
+ Date date = new Date();
+ String uuid = UUID.randomUUID().toString();
+ PreventRiskEvent riskEvent = new PreventRiskEvent();
+ riskEvent.setUuid(uuid);
+ riskEvent.setEventResult(eventResult);
+ riskEvent.setRiskEventName(riskEventName);
+ riskEvent.setRiskUnitId(riskUnitId);
+// riskEvent.setRiskUnitUuid(riskUnit.getRiskUnitUuid());
+ riskEvent.setDeleteStatus(StatusEnum.DELETE_STATUS_USE.getCode());
+ riskEvent.setGmtCreate(date);
+ riskEvent.setGmtModitify(date);
+ riskEvent.setCreateByUserName(sysUser.getUserName());
+ riskEvent.setLastEditUserName(sysUser.getUserName());
+ //todo 对所属企业id和uuid没有进行设置
+ PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());
+ //设置上报时间为空
+ riskEvent.setReportTime(null);
+ //设置本条数据上报更新时间
+ riskEvent.setUpdateReportDataTime(date);
+ //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
+ if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
+ && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
+ //设置上报状态为-等待上报
+ riskEvent.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ //设置本条数据上报开关为-开启
+ riskEvent.setReportSwitch(SyncEnum.REPORT_ON.getCode());
+ //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
+ }else {
+ //设置上报状态为-不上报
+ riskEvent.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
+ //设置本条数据上报开关为-关闭
+ riskEvent.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
+ }
+
+ int saveResult = preventRiskEventService.savePreventRiskEvent(riskEvent);
+ if (saveResult == 0){
+ resultVO.setCode(ResultCodes.SERVER_ADD_ERROR.getCode());
+ resultVO.setMsg(ResultCodes.SERVER_ADD_ERROR.getDesc());
+ return resultVO;
+ }
+ resultVO.setCode(ResultCodes.OK.getCode());
+ resultVO.setMsg("新增安全风险事件成功");
+ return resultVO;
+ }
+
+ /**
+ * @description 风险事件-删除
+ */
+ @Override
+ public ResultVO<PreventRiskEvent> deleteRiskEvent(PreventRiskEventDeleteReqDTO riskEventDeleteReqDTO) {
+ User sysUser = getSysUser();
+ ResultVO resultVO = new ResultVO<>();
+ resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
+
+ Long eventId = riskEventDeleteReqDTO.getId();
+ if (eventId == null){
+ resultVO.setMsg("安全风险事件Id为空，删除失败");
+ return resultVO;
+ }
+ PreventRiskEvent riskEvent = preventRiskEventService.getPreventRiskEventById(eventId);
+ if (riskEvent == null){
+ resultVO.setMsg("安全风险事件不存在，删除失败");
+ return resultVO;
+ }
+ Date date = new Date();
+ riskEvent.setGmtModitify(date);
+ riskEvent.setLastEditUserName(sysUser.getUserName());
+ riskEvent.setUpdateReportDataTime(date);
+
+ int deleteResult = preventRiskEventService.deletePreventRiskEventById(riskEvent);
+ if (deleteResult == 0){
+ resultVO.setCode(ResultCodes.SERVER_DEL_ERROR.getCode());
+ resultVO.setMsg(ResultCodes.SERVER_DEL_ERROR.getDesc());
+ return resultVO;
+ }
+ resultVO.setCode(ResultCodes.OK.getCode());
+ resultVO.setMsg("删除安全风险事件成功");
+ return resultVO;
+ }
+
+ /**
+ * 风险事件-修改
+ */
+ @Override
+ public ResultVO<PreventRiskEvent> updateRiskEvent(PreventRiskEventUpdateReqDTO riskEventUpdateReqDTO) {
+ User sysUser = getSysUser();
+ ResultVO resultVO = new ResultVO<>();
+ resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
+ Long riskEventId = riskEventUpdateReqDTO.getId();
+ Long riskUnitId = riskEventUpdateReqDTO.getRiskUnitId();
+ String riskEventName = riskEventUpdateReqDTO.getRiskEventName();
+ String eventResult = riskEventUpdateReqDTO.getEventResult();
+ if (riskEventId == null){
+ resultVO.setMsg("安全风险事件ID不能为空");
+ return resultVO;
+ }
+ if (riskUnitId == null){
+ resultVO.setMsg("安全风险分析单元名称不能为空");
+ return resultVO;
+ }
+// PreventRiskUnitUuid riskUnit = preventRiskUnitUuidService.getRiskUnitUuidById(riskUnitId);
+// if (riskUnit == null){
+// resultVO.setMsg("安全风险分析单元名称不存在");
+// return resultVO;
+// }
+ if (StringUtils.isEmpty(riskEventName)){
+ resultVO.setMsg("安全风险事件名称不能为空");
+ return resultVO;
+ }
+ PreventRiskEvent riskEventByEventName = preventRiskEventService.getPreventRiskEventByEventName(riskEventName);
+ if (riskEventByEventName != null){
+ if (!riskEventId.equals(riskEventByEventName.getId())){
+ resultVO.setMsg("安全风险事件名称已存在");
+ return resultVO;
+ }
+ }
+ if (StringUtils.isEmpty(eventResult)){
+ resultVO.setMsg("可能造成得后果不能为空");
+ return resultVO;
+ }
+
+ Date date = new Date();
+ PreventRiskEvent preventRiskEvent = new PreventRiskEvent();
+ BeanUtils.copyProperties(riskEventUpdateReqDTO,preventRiskEvent);
+ preventRiskEvent.setGmtModitify(date);
+ preventRiskEvent.setLastEditUserName(sysUser.getUserName());
+ //获取上报主配置信息
+ PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());
+ //设置本条数据上报更新时间
+ preventRiskEvent.setUpdateReportDataTime(date);
+ //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
+ if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
+ && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
+ //设置上报状态为-等待上报
+ preventRiskEvent.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ //设置本条数据上报开关为-开启
+ preventRiskEvent.setReportSwitch(SyncEnum.REPORT_ON.getCode());
+ //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
+ }else {
+ //设置上报状态为-不上报
+ preventRiskEvent.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
+ //设置本条数据上报开关为-关闭
+ preventRiskEvent.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
+ }
+
+ int updateResult = preventRiskEventService.updatePreventRiskEventById(preventRiskEvent);
+
+ if (updateResult == 0){
+ resultVO.setCode(ResultCodes.SERVER_UPDATE_ERROR.getCode());
+ resultVO.setMsg(ResultCodes.SERVER_UPDATE_ERROR.getDesc());
+ return resultVO;
+ }
+ resultVO.setCode(ResultCodes.OK.getCode());
+ resultVO.setMsg("更新安全风险事件成功");
+ return resultVO;
+ }
+
+ /**
+ * @description 根据风险事件的id查询风险事件
+ */
+ @Override
+ public ResultVO<PreventRiskEventRespDTO> getRiskEventById(PreventRiskEventGetReqDTO riskEventGetReqDTO) {
+ Long eventId = riskEventGetReqDTO.getId();
+ ResultVO resultVO = new ResultVO<>();
+ resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
+ if (eventId == null){
+ resultVO.setMsg("安全风险事件ID不能为空");
+ return resultVO;
+ }
+ PreventRiskEvent riskEvent = preventRiskEventService.getPreventRiskEventById(eventId);
+ if (riskEvent == null){
+ resultVO.setMsg("安全风险事件不存在");
+ return resultVO;
+ }
+ PreventRiskEventRespDTO respDTO = new PreventRiskEventRespDTO();
+ BeanUtils.copyProperties(riskEvent,respDTO);
+ resultVO.setCode(ResultCodes.OK.getCode());
+ resultVO.setMsg(ResultCodes.OK.getDesc());
+ resultVO.setData(respDTO);
+ return resultVO;
+ }
+
+ /**
+ * 风险事件-分页查询
+ * @return
+ */
+ @Override
+ public ResultVO<List<PreventRiskEventPageQueryRespDTO>> listRiskEventPage(PreventRiskEventPageQueryReqDTO riskEventQueryReqDTO) {
+ Integer pageIndex = riskEventQueryReqDTO.getPageNum();
+ Integer pageSize = riskEventQueryReqDTO.getPageSize();
+ if (pageIndex == 0 || pageSize == 0){
+ return new ResultVO<>(ErrorCodes.REQUEST_PARAM_ERROR.getCode(),"当前页码或当前页显示数不能为0");
+ }
+ Long riskUnitId = riskEventQueryReqDTO.getRiskUnitId();
+ String riskEventName = riskEventQueryReqDTO.getRiskEventName();
+ Page<PreventRiskEvent> page = PageHelper.startPage(pageIndex, pageSize);
+ preventRiskEventService.listRiskEvenByCondition(riskUnitId,riskEventName);
+
+ List<PreventRiskEvent> result = page.getResult();
+ Long total = page.getTotal();
+ int count = total.intValue();
+ List<PreventRiskEventPageQueryRespDTO> pageResult = null;
+ if (result != null) {
+ pageResult = result.stream().map((preventRiskEvent) -> {
+ PreventRiskEventPageQueryRespDTO dto = new PreventRiskEventPageQueryRespDTO();
+ BeanUtils.copyProperties(preventRiskEvent, dto);
+ Long unitId = dto.getRiskUnitId();
+ if (unitId != null) {
+ PreventRiskList riskList = preventRiskListService.getPreventRiskListById(unitId);
+ if (riskList != null) {
+ dto.setRiskUnitName(riskList.getRiskListName());
+ }
+ }
+ return dto;
+ }).collect(Collectors.toList());
+ }
+
+ ResultVO<List<PreventRiskEventPageQueryRespDTO>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);
+ resultVO.setCount(count);
+ return resultVO;
+ }
+
+ /**
+ * @description 获取所有风险事件不分页
+ */
+ @Override
+ public ResultVO<List<PreventRiskEventListQueryRespDTO>> listRiskEvent() {
+ List<PreventRiskEvent> riskEvents = preventRiskEventService.listRiskEvenByCondition(null, null);
+ List<PreventRiskEventListQueryRespDTO> riskEventList = null;
+ if (riskEvents != null){
+ riskEventList = riskEvents.stream().map((riskEvent)->{
+ PreventRiskEventListQueryRespDTO dto = new PreventRiskEventListQueryRespDTO();
+ BeanUtils.copyProperties(riskEvent,dto);
+ return dto;
+ }).collect(Collectors.toList());
+ }
+ return new ResultVO<>(ResultCodes.OK,riskEventList);
+ }
+
+ /**
+ * @description 新增风险管控措施
+ */
+ @Override
+ public ResultVO<PreventRiskControlMeasure> saveRiskControlMeasure(PreventRiskControlMeasureSaveReqDTO measureSaveReqDTO) {
+ User sysUser = getSysUser();
+ ResultVO resultVO = new ResultVO<>();
+ resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
+ Long riskEventId = measureSaveReqDTO.getRiskEventId();
+ if (riskEventId == null){
+ resultVO.setMsg("安全风险事件ID不能为空");
+ return resultVO;
+ }
+ PreventRiskEvent riskEvent = preventRiskEventService.getPreventRiskEventById(riskEventId);
+ if (riskEvent == null){
+ resultVO.setMsg("安全风险事件不存在");
+ return resultVO;
+ }
+ String controlMeasureCode = measureSaveReqDTO.getControlMeasureCode();
+ if (controlMeasureCode.isEmpty()){
+ resultVO.setMsg("风险措施编码不能为空");
+ return resultVO;
+ }
+ PreventRiskControlMeasure riskControlMeasure = riskControlMeasureService.getPreventRiskControlMeasureByControlMeasureCode(controlMeasureCode);
+ if (riskControlMeasure != null){
+ resultVO.setMsg("风险措施编码已存在");
+ return resultVO;
+ }
+ if (measureSaveReqDTO.getControlType() == null){
+ resultVO.setMsg("管控方式不能为空");
+ return resultVO;
+ }
+ if (measureSaveReqDTO.getCheckContent().isEmpty()){
+ resultVO.setMsg("管控内容不能为空");
+ return resultVO;
+ }
+ if (measureSaveReqDTO.getClassify1() == null){
+ resultVO.setMsg("管控措施分类1不能为空");
+ return resultVO;
+ }
+ if (measureSaveReqDTO.getClassify2() == null){
+ resultVO.setMsg("管控措施分类2不能为空");
+ return resultVO;
+ }
+ if (measureSaveReqDTO.getMeasureDesc().isEmpty()){
+ resultVO.setMsg("措施说明不能为空");
+ return resultVO;
+ }
+ Date date = new Date();
+ String uuid = UUID.randomUUID().toString();
+
+ PreventRiskControlMeasure controlMeasure = new PreventRiskControlMeasure();
+ BeanUtils.copyProperties(measureSaveReqDTO,controlMeasure);
+ controlMeasure.setUuid(uuid);
+ controlMeasure.setDeleteStatus(StatusEnum.DELETE_STATUS_USE.getCode());
+ controlMeasure.setGmtCreate(date);
+ controlMeasure.setGmtModitify(date);
+ controlMeasure.setLastEditUserName(sysUser.getUserName());
+ controlMeasure.setCreateByUserName(sysUser.getUserName());
+ controlMeasure.setRiskEventUuid(riskEvent.getUuid());
+
+ PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());
+ //设置上报时间为空
+ controlMeasure.setReportTime(null);
+ //设置本条数据上报更新时间
+ controlMeasure.setUpdateReportDataTime(date);
+ //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
+ if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
+ && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
+ //设置上报状态为-等待上报
+ controlMeasure.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ //设置本条数据上报开关为-开启
+ controlMeasure.setReportSwitch(SyncEnum.REPORT_ON.getCode());
+ //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
+ }else {
+ //设置上报状态为-不上报
+ controlMeasure.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
+ //设置本条数据上报开关为-关闭
+ controlMeasure.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
+ }
+
+ int saveResult = riskControlMeasureService.savePreventRiskControlMeasure(controlMeasure);
+ if (saveResult == 0){
+ resultVO.setCode(ResultCodes.SERVER_ADD_ERROR.getCode());
+ resultVO.setMsg(ResultCodes.SERVER_ADD_ERROR.getDesc());
+ return resultVO;
+ }
+ resultVO.setCode(ResultCodes.OK.getCode());
+ resultVO.setMsg("新增风险管控措施成功");
+ return resultVO;
+ }
+
+ /**
+ * 管控措施- 获取管控措施模板
+ */
+ @Override
+ public ResultVO<List<PreventRiskMeasureTemplatesListQueryRespDTO>> listMeasureTemplates() {
+ List<PreventRiskControlTemplate> riskControlTemplates = riskControlTemplateService.listMeasureTemplates();
+
+ List<PreventRiskMeasureTemplatesListQueryRespDTO> listResult = null;
+ if (riskControlTemplates != null){
+ listResult = riskControlTemplates.stream().map((riskControlTemplate)->{
+ PreventRiskMeasureTemplatesListQueryRespDTO dto = new PreventRiskMeasureTemplatesListQueryRespDTO();
+ BeanUtils.copyProperties(riskControlTemplate,dto);
+ return dto;
+ }).collect(Collectors.toList());
+ }
+ return new ResultVO<>(ResultCodes.OK,listResult);
+ }
+
+ /**
+ * 管控措施-删除
+ */
+ @Override
+ public ResultVO<PreventRiskControlMeasure> deleteRiskControlMeasure(PreventRiskControlMeasureDeleteReqDTO measureDeleteReqDTO) {
+ User sysUser = getSysUser();
+ ResultVO resultVO = new ResultVO<>();
+ resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
+
+ Long measureId = measureDeleteReqDTO.getId();
+ if (measureId == null){
+ resultVO.setMsg("风险管控措施Id为空，删除失败");
+ return resultVO;
+ }
+ PreventRiskControlMeasure controlMeasure = riskControlMeasureService.getPreventRiskControlMeasureById(measureId);
+ if (controlMeasure == null){
+ resultVO.setMsg("风险管控措施不存在，删除失败");
+ return resultVO;
+ }
+ Date date = new Date();
+ controlMeasure.setGmtModitify(date);
+ controlMeasure.setLastEditUserName(sysUser.getUserName());
+ controlMeasure.setUpdateReportDataTime(date);
+
+ int deleteResult = riskControlMeasureService.deletePreventRiskControlMeasureById(controlMeasure);
+ if (deleteResult == 0){
+ resultVO.setCode(ResultCodes.SERVER_DEL_ERROR.getCode());
+ resultVO.setMsg(ResultCodes.SERVER_DEL_ERROR.getDesc());
+ return resultVO;
+ }
+ resultVO.setCode(ResultCodes.OK.getCode());
+ resultVO.setMsg("删除风险管控措施成功");
+ return resultVO;
+ }
+
+ /**
+ * @description 根据风险措施id查询风险措施
+ */
+ @Override
+ public ResultVO<PreventRiskControlMeasureRespDTO> getRiskControlMeasure(PreventRiskControlMeasureGetReqDTO riskControlMeasureGetReqDTO) {
+ ResultVO resultVO = new ResultVO<>();
+ resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
+ Long measureId = riskControlMeasureGetReqDTO.getId();
+ if (measureId == null){
+ resultVO.setMsg("风险管控措施Id不能为空");
+ return resultVO;
+ }
+ PreventRiskControlMeasure measure = riskControlMeasureService.getPreventRiskControlMeasureById(measureId);
+ if (measure == null){
+ resultVO.setMsg("风险管控措施不存在");
+ return resultVO;
+ }
+ PreventRiskControlMeasureRespDTO dto = new PreventRiskControlMeasureRespDTO();
+ BeanUtils.copyProperties(measure,dto);
+ resultVO.setCode(ResultCodes.OK.getCode());
+ resultVO.setMsg(ResultCodes.OK.getDesc());
+ resultVO.setData(dto);
+
+ return resultVO;
+ }
+
+ /**
+ * 管控措施-修改
+ */
+ @Override
+ public ResultVO<PreventRiskControlMeasure> updateRiskControlMeasure(PreventRiskControlMeasureUpdateReqDTO measureUpdateReqDTO) {
+ User sysUser = getSysUser();
+ ResultVO resultVO = new ResultVO<>();
+ resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
+ Long measureId = measureUpdateReqDTO.getId();
+ Long riskEventId = measureUpdateReqDTO.getRiskEventId();
+ if (measureId == null){
+ resultVO.setMsg("风险管控措施ID不能为空");
+ return resultVO;
+ }
+ if (riskEventId == null){
+ resultVO.setMsg("安全风险事件ID不能为空");
+ return resultVO;
+ }
+ PreventRiskEvent riskEvent = preventRiskEventService.getPreventRiskEventById(riskEventId);
+ if (riskEvent == null){
+ resultVO.setMsg("安全风险事件不存在");
+ return resultVO;
+ }
+ String controlMeasureCode = measureUpdateReqDTO.getControlMeasureCode();
+ if (controlMeasureCode.isEmpty()){
+ resultVO.setMsg("风险措施编码不能为空");
+ return resultVO;
+ }
+ PreventRiskControlMeasure riskControlMeasure = riskControlMeasureService.getPreventRiskControlMeasureByControlMeasureCode(controlMeasureCode);
+ if (riskControlMeasure != null){
+ if (!measureId.equals(riskControlMeasure.getId())){
+ resultVO.setMsg("风险措施编码已存在");
+ return resultVO;
+ }
+ }
+ if (measureUpdateReqDTO.getControlType() == null){
+ resultVO.setMsg("管控方式不能为空");
+ return resultVO;
+ }
+ if (measureUpdateReqDTO.getCheckContent().isEmpty()){
+ resultVO.setMsg("管控内容不能为空");
+ return resultVO;
+ }
+ if (measureUpdateReqDTO.getClassify1() == null){
+ resultVO.setMsg("管控措施分类1不能为空");
+ return resultVO;
+ }
+ if (measureUpdateReqDTO.getClassify2() == null){
+ resultVO.setMsg("管控措施分类2不能为空");
+ return resultVO;
+ }
+ if (measureUpdateReqDTO.getMeasureDesc().isEmpty()){
+ resultVO.setMsg("措施说明不能为空");
+ return resultVO;
+ }
+
+ Date date = new Date();
+ PreventRiskControlMeasure controlMeasure = new PreventRiskControlMeasure();
+ BeanUtils.copyProperties(measureUpdateReqDTO,controlMeasure);
+ controlMeasure.setRiskEventUuid(riskEvent.getUuid());
+ controlMeasure.setGmtModitify(date);
+ controlMeasure.setLastEditUserName(sysUser.getUserName());
+ //获取上报主配置信息
+ PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_RISK_ANA_UNIT.getCode());
+ //设置本条数据上报更新时间
+ controlMeasure.setUpdateReportDataTime(date);
+ //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
+ if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
+ && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
+ //设置上报状态为-等待上报
+ controlMeasure.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ //设置本条数据上报开关为-开启
+ controlMeasure.setReportSwitch(SyncEnum.REPORT_ON.getCode());
+ //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
+ }else {
+ //设置上报状态为-不上报
+ controlMeasure.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
+ //设置本条数据上报开关为-关闭
+ controlMeasure.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
+ }
+
+ int updateResult = riskControlMeasureService.updatePreventRiskControlMeasureById(controlMeasure);
+ if (updateResult == 0){
+ resultVO.setCode(ResultCodes.SERVER_UPDATE_ERROR.getCode());
+ resultVO.setMsg(ResultCodes.SERVER_UPDATE_ERROR.getDesc());
+ return resultVO;
+ }
+ resultVO.setCode(ResultCodes.OK.getCode());
+ resultVO.setMsg("更新风险管控措施成功");
+ return resultVO;
+
+ }
+
+ /**
+ * 管控措施-分页查询
+ */
+ @Override
+ public ResultVO<List<PreventRiskControlMeasurePageQueryRespDTO>> getRiskControlMeasurePage(PreventRiskControlMeasureQueryReqDTO measureQueryReqDTO) {
+ Integer pageIndex = measureQueryReqDTO.getPageNum();
+ Integer pageSize = measureQueryReqDTO.getPageSize();
+ if (pageIndex == 0 || pageSize == 0){
+ return new ResultVO<>(ErrorCodes.REQUEST_PARAM_ERROR.getCode(),"当前页码或当前页显示数不能为0");
+ }
+ Byte controlType = measureQueryReqDTO.getControlType();
+ Long riskEventId = measureQueryReqDTO.getRiskEventId();
+
+ Page<PreventRiskControlMeasure> page = PageHelper.startPage(pageIndex, pageSize);
+ riskControlMeasureService.listRiskControlMeasureByCondition(controlType,riskEventId);
+
+ List<PreventRiskControlMeasure> result = page.getResult();
+ Long total = page.getTotal();
+ int count = total.intValue();
+ List<PreventRiskControlMeasurePageQueryRespDTO> pageResult = null;
+ if (result != null) {
+ pageResult = result.stream().map((preventRiskControlMeasure) -> {
+ PreventRiskControlMeasurePageQueryRespDTO dto = new PreventRiskControlMeasurePageQueryRespDTO();
+ BeanUtils.copyProperties(preventRiskControlMeasure, dto);
+ Long eventId = dto.getRiskEventId();
+ if (eventId != null) {
+ PreventRiskEvent riskEvent = preventRiskEventService.getPreventRiskEventById(eventId);
+ if (riskEvent != null) {
+ dto.setRiskEventName(riskEvent.getRiskEventName());
+ }
+ }
+ return dto;
+ }).collect(Collectors.toList());
+ }
+
+ ResultVO<List<PreventRiskControlMeasurePageQueryRespDTO>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);
+ resultVO.setCount(count);
+ return resultVO;
+ }
+ /**
+ * 查询管控措施 by 基础排查清单ID
+ */
+ @Override
+ public List<PreventRiskControlMeasure> getRiskControlMeasureByRiskId(Long riskListId) {
+ //获取管控措施list
+ List<PreventRiskControlMeasure> controlMeasureList = new ArrayList<>();
+
+ //通过riskListId ,查询对应的管控措施id
+ List<PreventRiskCheckUnit> unitByRiskId = preventRiskCheckUnitService.getUnitByRiskId(riskListId.toString());
+
+ //遍历集合，封装管控措施
+ for (PreventRiskCheckUnit checkUnit : unitByRiskId) {
+ PreventRiskControlMeasure controlMeasure = riskControlMeasureService.getPreventRiskControlMeasureById(checkUnit.getControlMeasureId());
+ controlMeasureList.add(controlMeasure);
+ }
+ return controlMeasureList;
+ }
+
+ /**
+ * 保存原检查点与管控措施的对应关系
+ */
+ @Transactional
+ @Override
+ public int insertPointAndMeasure(PreventPointAndMeasureParams pointAndMeasureParams) {
+
+ //参数校验-管控措施id
+ if (pointAndMeasureParams.getControlMeasureId() == null){
+ throw new RuntimeException("管控措施不能为空");
+ }
+ PreventRiskControlMeasure preventRiskControlMeasureById
+ = riskControlMeasureService.getPreventRiskControlMeasureById(pointAndMeasureParams.getControlMeasureId());
+ if (preventRiskControlMeasureById == null){
+ throw new RuntimeException("管控措施不存在");
+ }
+ if (pointAndMeasureParams.getBaseCheckPointId() == null){
+ throw new RuntimeException("检查点添加失败");
+ }
+
+ String uuid = UUID.randomUUID().toString();
+ PreventRiskCheckUnit checkUnit = new PreventRiskCheckUnit();
+ //封装数据
+ checkUnit.setUuid(uuid);
+ checkUnit.setRiskId(pointAndMeasureParams.getRiskId());
+ checkUnit.setBaseCheckPointId(pointAndMeasureParams.getBaseCheckPointId());
+ checkUnit.setControlMeasureId(pointAndMeasureParams.getControlMeasureId());
+ //执行插入
+ int result = preventRiskCheckUnitService.insertPointAndMeasure(checkUnit);
+ if (result < 1){
+ throw new RuntimeException("保存原检查点与管控措施的对应关系失败");
+ }
+
+ return result;
+ }
+ /**
+ * 删除原检查点与管控措施的对应关系
+ */
+ @Override
+ public int deletePointAndMeasure(String ids) {
+
+ String[] idList = Convert.toStrArray(ids);
+ for (String id : idList) {
+ int result = preventRiskCheckUnitService.deletePointAndMeasure(id);
+ if (result < 1){
+ return StatusEnum.EXEC_FAIL.getCode();
+ }
+ }
+
+ return StatusEnum.EXEC_SUCCESS.getCode();
+ }
+
+ /**
+ * 保存job管控措施的附属表
+ */
+ @Override
+ public int insertJobAndMeasure(Long jobId, HiddenDangerCheckJob hiddenDangerCheckJob) {
+
+
+ PreventRiskJobAndMeasure jobAndMeasure = new PreventRiskJobAndMeasure();
+
+ //根据RiskId查询对应的管控措施
+ List<PreventRiskCheckUnit> unitByRiskId = preventRiskCheckUnitService.getUnitByRiskId(hiddenDangerCheckJob.getRiskId());
+
+ //遍历管控措施集合
+ for (PreventRiskCheckUnit checkUnit : unitByRiskId) {
+ String jobUuid = UUID.randomUUID().toString();
+ PreventRiskControlMeasure preventRiskControlMeasureById = riskControlMeasureService.getPreventRiskControlMeasureById(checkUnit.getControlMeasureId());
+ //封装数据
+ jobAndMeasure.setJobId(jobId);
+ jobAndMeasure.setJobUuid(jobUuid);
+ jobAndMeasure.setMeasureId(checkUnit.getControlMeasureId());
+ jobAndMeasure.setMeasureUuid(preventRiskControlMeasureById.getUuid());//如果删除了措施 此处可能为空，后续处理
+ //获取上报主配置信息
+ PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_TASK_FROM_WORK.getCode());
+ //设置上报时间为空
+ jobAndMeasure.setReportTime(null);
+ //设置本条数据上报更新时间
+ jobAndMeasure.setUpdateReportDataTime(new Date());
+ //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
+ if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
+ && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
+ //设置上报状态为-等待上报
+ jobAndMeasure.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ //设置本条数据上报开关为-开启
+ jobAndMeasure.setReportSwitch(SyncEnum.REPORT_ON.getCode());
+ //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
+ }else {
+ //设置上报状态为-不上报
+ jobAndMeasure.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
+ //设置本条数据上报开关为-关闭
+ jobAndMeasure.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
+ }
+ int result = preventRiskJobAndMeasureService.insertJobAndMeasure(jobAndMeasure);
+ if (result < 1 ){
+ return StatusEnum.EXEC_FAIL.getCode();
+ }
+ }
+
+ return StatusEnum.EXEC_SUCCESS.getCode();
+ }
+
+ /**
+ * 修改job管控措施的附属表
+ */
+ @Transactional
+ @Override
+ public int updateJobAndMeasure(HiddenDangerCheckJob hiddenDangerCheckJob) {
+
+ // 2、若有变更，需要预先读取jobAndMeasure的uuid，保存下来
+ PreventRiskJobAndMeasure jobAndMeasureByJobId = preventRiskJobAndMeasureService.getJobAndMeasureByJobId(hiddenDangerCheckJob.getJobId());
+ String jobUuid = jobAndMeasureByJobId.getJobUuid();
+ Date reportTime = jobAndMeasureByJobId.getReportTime();
+
+ if (jobAndMeasureByJobId != null){
+ //3、删除库中原关联关系
+ int deleteResult = preventRiskJobAndMeasureService.deleteJobAndMeasure(hiddenDangerCheckJob.getJobId());
+ if(deleteResult < 1){
+ throw new RuntimeException("清除job管控措施的附属表关联信息失败");
+ }
+ }
+
+ //4根据RiskId查询对应的管控措施
+ List<PreventRiskCheckUnit> unitByRiskId = preventRiskCheckUnitService.getUnitByRiskId(hiddenDangerCheckJob.getRiskId());
+
+ //5封装数据，插入数据库，重新添加关联关系
+ for (PreventRiskCheckUnit checkUnit : unitByRiskId) {
+ PreventRiskControlMeasure preventRiskControlMeasureById = riskControlMeasureService.getPreventRiskControlMeasureById(checkUnit.getControlMeasureId());
+ PreventRiskJobAndMeasure jobAndMeasure = new PreventRiskJobAndMeasure();
+ //封装参数
+ jobAndMeasure.setJobId(jobAndMeasureByJobId.getJobId());
+ //使用保存下来的uuid，再次添加关联关系
+ jobAndMeasure.setJobUuid(jobUuid);
+ jobAndMeasure.setMeasureId(checkUnit.getControlMeasureId());
+ jobAndMeasure.setMeasureUuid(preventRiskControlMeasureById.getUuid());//如果删除了措施 此处可能为空，后续处理
+
+ //获取上报主配置信息
+ PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_TASK_FROM_WORK.getCode());
+ //设置上报时间
+ jobAndMeasure.setReportTime(reportTime);
+ //设置本条数据上报更新时间
+ jobAndMeasure.setUpdateReportDataTime(new Date());
+ //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
+ if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
+ && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
+ //设置上报状态为-等待上报
+ jobAndMeasure.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ //设置本条数据上报开关为-开启
+ jobAndMeasure.setReportSwitch(SyncEnum.REPORT_ON.getCode());
+ //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
+ }else {
+ //设置上报状态为-不上报
+ jobAndMeasure.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
+ //设置本条数据上报开关为-关闭
+ jobAndMeasure.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
+ }
+ int result = preventRiskJobAndMeasureService.insertJobAndMeasure(jobAndMeasure);
+ if (result < 1 ){
+ return StatusEnum.EXEC_FAIL.getCode();
+ }
+ }
+
+ return StatusEnum.EXEC_SUCCESS.getCode();
+ }
+
+ /**
+ * 删除job管控措施的附属表关联信息
+ */
+ @Transactional
+ @Override
+ public int deleteJobAndMeasure(String ids) {
+
+ Long[] jobIds = Convert.toLongArray(ids);
+
+ for (Long jobId : jobIds)
+ {
+ int result = preventRiskJobAndMeasureService.deleteJobAndMeasure(jobId);
+ if (result < 1 ){
+ throw new RuntimeException("删除job管控措施的附属表关联信息失败");
+ }
+ }
+ return StatusEnum.EXEC_SUCCESS.getCode();
+ }
+ /**
+ * 查询Job与措施
+ */
+ @Override
+ public PreventRiskJobAndMeasure getJobAndMeasure(Long jobId) {
+ return preventRiskJobAndMeasureService.getJobAndMeasureByJobId(jobId);
+ }
+ /**
+ * 定时生成排查任务记录时，
+ * 插入排查记录附属表
+ */
+ @Override
+ public int insertDangerCheckLog(Long checkId, HiddenDangerCheck hdc) {
+
+ String dangerCheckUuid = UUID.randomUUID().toString();
+ PreventRiskDangerCheckLog dangerCheck = new PreventRiskDangerCheckLog();
+
+ dangerCheck.setUuid(dangerCheckUuid);
+ dangerCheck.setCheckStatus((byte) 2);//
+ dangerCheck.setCheckId(checkId);
+ dangerCheck.setJobId(hdc.getJobId());
+ //获取上报主配置信息
+ PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG__CHECK_RECORD.getCode());
+ //设置上报时间为空
+ dangerCheck.setReportTime(null);
+ //设置本条数据上报更新时间
+ dangerCheck.setUpdateReportDataTime(new Date());
+ //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
+ if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
+ && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
+ //设置上报状态为-等待上报
+ dangerCheck.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ //设置本条数据上报开关为-开启
+ dangerCheck.setReportSwitch(SyncEnum.REPORT_ON.getCode());
+ //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
+ }else {
+ //设置上报状态为-不上报
+ dangerCheck.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
+ //设置本条数据上报开关为-关闭
+ dangerCheck.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
+ }
+ return preventRiskDangerCheckLogService.insertDangerCheckLog(dangerCheck);
+ }
+ /**
+ * 定时生成排查任务记录时，
+ * 插入检查点附属表
+ */
+ @Override
+ public int insertCheckAndMeasure(Long id, HiddenDangerCheckPoint hdcp) {
+ System.out.println("进入核查点保存方法");
+ PreventRiskDangerCheckAndMeasure checkAndMeasure = new PreventRiskDangerCheckAndMeasure();
+
+ //根据检查点信息，查询对应管控措施
+ PreventRiskCheckUnit checkUnit = preventRiskCheckUnitService.getUnitByBaseCheckPointId(hdcp.getCheckPointId());
+ if (checkUnit == null){
+ throw new RuntimeException("基础检查点不存在");
+ }
+// System.out.println("通过一次检验");
+ PreventRiskControlMeasure controlMeasure = riskControlMeasureService.getPreventRiskControlMeasureById(checkUnit.getControlMeasureId());
+ if (controlMeasure == null){
+ throw new RuntimeException("管控措施已经被删除");
+ }
+// System.out.println("通过二次检验");
+ //封装数据
+ checkAndMeasure.setCheckId(hdcp.getCheckId());
+ checkAndMeasure.setDangerCheckPointId(id);
+ checkAndMeasure.setBaseCheckPointId(hdcp.getCheckPointId());
+ checkAndMeasure.setControlMeasureId(controlMeasure.getId());
+ checkAndMeasure.setCheckContent(controlMeasure.getCheckContent());
+ checkAndMeasure.setCheckResult((byte) 4);
+// System.out.println("数据封装完成");
+ //写入核查任务检查点与管控措施信息
+ int result = preventRiskDangerCheckAndMeasureService.insertCheckAndMeasure(checkAndMeasure);
+ if (result <1){
+ return StatusEnum.EXEC_FAIL.getCode();
+ }
+ return StatusEnum.EXEC_SUCCESS.getCode();
+ }
+ /**
+ * todo-2022 填报时的操作
+ */
+
+ /**
+ * 删除定时核查任务
+ * */
+ @Override
+ @Transactional
+ public int deleteDangerCheck(String ids) {
+
+ Long[] dangerCheckIdList = Convert.toLongArray(ids);
+
+ //1、删除核查任务附属表
+ for (Long checkId : dangerCheckIdList) {
+ int result = preventRiskDangerCheckLogService.deleteDangerCheck(checkId);
+ if (result < 1){
+ return StatusEnum.EXEC_FAIL.getCode();
+ }
+ }
+
+ //2、删除核查任务-检查点的附属表----老代码未删除检查点信息，此处暂不做处理
+
+ return StatusEnum.EXEC_SUCCESS.getCode();
+ }
+
+ /**
+ * 新增隐患上报
+ * */
+ @Override
+ public int insertDangerInfo(Long id, HiddenDangerCheckPoint hdcp) {
+
+ String dangerInfoUuid = UUID.randomUUID().toString();
+ PreventRiskDangerInfo dangerInfo = new PreventRiskDangerInfo();
+// if (ObjectUtils.isEmpty(hdcp.getDangerSrc())){
+// throw new RuntimeException("隐患来源为空");
+// }
+// if (ObjectUtils.isEmpty(hdcp.getHazardDangerType())){
+// throw new RuntimeException("隐患类型为空");
+// }
+
+ dangerInfo.setUuid(dangerInfoUuid);
+ dangerInfo.setDangerCheckPointId(id);
+ dangerInfo.setHazardCode(hdcp.getHazardCode());
+ dangerInfo.setDangerSrc(hdcp.getDangerSrc());
+ dangerInfo.setDangerDesc(hdcp.getDangerDescription());
+ dangerInfo.setDangerReason(hdcp.getDangerReason());
+ dangerInfo.setDangerResult(hdcp.getDangerResult());
+ dangerInfo.setHazardDangerType(hdcp.getHazardDangerType());
+// if (ObjectUtils.isNotEmpty(hdcp.getsta))
+ //隐患状态 0未验收 1验收通过 2验收未通过
+ if (hdcp.getAcceptStatus() == null){
+ //设置为 空
+ dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());
+ } else if (hdcp.getAcceptStatus().equals("0")){
+ //设置为整改中
+ dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());
+ } else if (hdcp.getAcceptStatus().equals("1")) {
+ //设置为已验收
+ dangerInfo.setDangerState(StatusEnum.ACCEPT_SUCCESS.getCode());
+ }else if (hdcp.getAcceptStatus().equals("2")){
+ //设置为超期未整改
+ dangerInfo.setDangerState(StatusEnum.RECTIFY_TIMEOUT_AND_FAIL.getCode());
+ }
+// dangerInfo.setDangerState(null); //设置为 空
+ dangerInfo.setTimeoutFlag(null);//暂时不清楚是否需要此功能，先设为空
+ //获取上报主配置信息
+ PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());
+ //设置上报时间为空
+ dangerInfo.setReportTime(null);
+ //设置本条数据上报更新时间
+ dangerInfo.setUpdateReportDataTime(new Date());
+ //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
+ if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
+ && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
+ //设置上报状态为-等待上报
+ dangerInfo.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ //设置本条数据上报开关为-开启
+ dangerInfo.setReportSwitch(SyncEnum.REPORT_ON.getCode());
+ //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
+ }else {
+ //设置上报状态为-不上报
+ dangerInfo.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
+ //设置本条数据上报开关为-关闭
+ dangerInfo.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
+ }
+ int result = preventRiskDangerInfoService.insertDangerInfo(dangerInfo);
+ return result;
+ }
+
+ /**
+ * 修改隐患上报
+ * */
+ @Override
+ public int updateDangerInfo(HiddenDangerCheckPoint hdcp) {
+
+ //封装修改数据
+ PreventRiskDangerInfo dangerInfo = new PreventRiskDangerInfo();
+
+ dangerInfo.setDangerCheckPointId(hdcp.getId());
+ dangerInfo.setHazardCode(hdcp.getHazardCode());
+ dangerInfo.setDangerSrc(hdcp.getDangerSrc());
+ dangerInfo.setDangerDesc(hdcp.getDangerDescription());
+ dangerInfo.setDangerReason(hdcp.getDangerReason());
+ dangerInfo.setDangerResult(hdcp.getDangerResult());
+ dangerInfo.setHazardDangerType(hdcp.getHazardDangerType());
+ //隐患状态 0未验收 1验收通过 2验收未通过 ，新建时为空
+ if (hdcp.getAcceptStatus() == null){
+ //设置为 空
+ dangerInfo.setDangerState(null);
+ } else if (hdcp.getAcceptStatus().equals(0)){
+ //设置为整改中
+ dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());
+ } else if (hdcp.getAcceptStatus().equals(1)) {
+ //设置为已验收
+ dangerInfo.setDangerState(StatusEnum.ACCEPT_SUCCESS.getCode());
+ }else if (hdcp.getAcceptStatus().equals(2)){
+ //设置为超期未整改
+ dangerInfo.setDangerState(StatusEnum.RECTIFY_TIMEOUT_AND_FAIL.getCode());
+ }
+ dangerInfo.setTimeoutFlag(null);//暂时不清楚是否需要此功能，先设为空
+ //获取上报主配置信息
+ PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());
+ //设置本条数据上报更新时间
+ dangerInfo.setUpdateReportDataTime(new Date());
+ //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
+ if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
+ && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
+ //设置上报状态为-等待上报
+ dangerInfo.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ //设置本条数据上报开关为-开启
+ dangerInfo.setReportSwitch(SyncEnum.REPORT_ON.getCode());
+ //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
+ }else {
+ //设置上报状态为-不上报
+ dangerInfo.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
+ //设置本条数据上报开关为-关闭
+ dangerInfo.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
+ }
+
+ return preventRiskDangerInfoService.updateDangerInfo(dangerInfo);
+ }
+
+ /**
+ * 删除隐患上报
+ */
+ @Override
+ public int deleteDangerInfo(Long id) {
+
+ return preventRiskDangerInfoService.deleteDangerInfo(id);
+ }
+
+ /**
+ * 隐患判定，如果是隐患，修改为整改中
+ */
+ @Override
+ public int updateDangerInfoJudge(HiddenDangerCheckPoint hdcp) {
+
+ //封装修改数据
+ PreventRiskDangerInfo dangerInfo = new PreventRiskDangerInfo();
+
+ dangerInfo.setDangerCheckPointId(hdcp.getId());
+ //需要根据条件，判断附属表隐患状态。
+ //目前想法：认定后的隐患-0整改中；整改后的隐患-1待验收；验收后的隐患-9已验收。2,3状态暂时未使用
+ //设置为整改中
+ dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());
+ //获取上报主配置信息
+ PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());
+ //设置本条数据上报更新时间
+ dangerInfo.setUpdateReportDataTime(new Date());
+ //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
+ if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
+ && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
+ //设置上报状态为-等待上报
+ dangerInfo.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ //设置本条数据上报开关为-开启
+ dangerInfo.setReportSwitch(SyncEnum.REPORT_ON.getCode());
+ //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
+ }else {
+ //设置上报状态为-不上报
+ dangerInfo.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
+ //设置本条数据上报开关为-关闭
+ dangerInfo.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
+ }
+
+ return preventRiskDangerInfoService.updateDangerInfoState(dangerInfo);
+ }
+
+ /**
+ * 隐患整改信息 - 修改
+ */
+ @Override
+ public int updateDangerInfoRectify(HiddenDangerCheckPoint hdcp) {
+
+ //封装修改数据
+ PreventRiskDangerInfo dangerInfo = new PreventRiskDangerInfo();
+
+ dangerInfo.setDangerCheckPointId(hdcp.getId());
+ //需要根据条件，判断附属表隐患状态。
+ //目前想法：认定后的隐患-0整改中；整改后的隐患-1待验收；验收后的隐患-9已验收。2,3状态暂时未使用
+ //待验收验收
+ dangerInfo.setDangerState(StatusEnum.RECTIFY_WAIT_ACCEPT.getCode());
+
+ //获取上报主配置信息
+ PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());
+ //设置本条数据上报更新时间
+ dangerInfo.setUpdateReportDataTime(new Date());
+ //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
+ if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
+ && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
+ //设置上报状态为-等待上报
+ dangerInfo.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ //设置本条数据上报开关为-开启
+ dangerInfo.setReportSwitch(SyncEnum.REPORT_ON.getCode());
+ //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
+ }else {
+ //设置上报状态为-不上报
+ dangerInfo.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
+ //设置本条数据上报开关为-关闭
+ dangerInfo.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
+ }
+
+ return preventRiskDangerInfoService.updateDangerInfoState(dangerInfo);
+ }
+
+ /**
+ * 隐患验收 - 保存验收信息
+ */
+ @Override
+ public int updateDangerInfoAccept(HiddenDangerCheckPoint hdcp) {
+
+ //封装修改数据
+ PreventRiskDangerInfo dangerInfo = new PreventRiskDangerInfo();
+
+ dangerInfo.setDangerCheckPointId(hdcp.getId());
+ int acceptStatus = Integer.parseInt(hdcp.getAcceptStatus());
+ //如果验收通过，设置为验收成功；验收失败，打回上一级进行整改，设置为整改中
+ if (acceptStatus == 0){
+ dangerInfo.setDangerState(StatusEnum.RECTIFY_ING.getCode());
+ }else if (acceptStatus == 1){
+ dangerInfo.setDangerState(StatusEnum.ACCEPT_SUCCESS.getCode());
+ }
+
+ //获取上报主配置信息
+ PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());
+ //设置本条数据上报更新时间
+ dangerInfo.setUpdateReportDataTime(new Date());
+ //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
+ if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
+ && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
+ //设置上报状态为-等待上报
+ dangerInfo.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+ //设置本条数据上报开关为-开启
+ dangerInfo.setReportSwitch(SyncEnum.REPORT_ON.getCode());
+ //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
+ }else {
+ //设置上报状态为-不上报
+ dangerInfo.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
+ //设置本条数据上报开关为-关闭
+ dangerInfo.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
+ }
+ return preventRiskDangerInfoService.updateDangerInfoState(dangerInfo);
+ }
+
+ /**
+ * @description 获取所有的风险分析单元的编码和姓名
+ */
+ @Override
+ public List<PreventRiskUnitCodeAndNameListQueryRespDTO> listRiskUnitCodeAndName() {
+ List<PreventRiskList> riskLists = preventRiskListService.listRiskUnitCodeAndName();
+ if (riskLists == null){
+ return null;
+ }
+ List<PreventRiskUnitCodeAndNameListQueryRespDTO> listQueryRespDTOs= riskLists.stream().map((riskList)->{
+ PreventRiskUnitCodeAndNameListQueryRespDTO listQueryRespDTO = new PreventRiskUnitCodeAndNameListQueryRespDTO();
+ BeanUtils.copyProperties(riskList,listQueryRespDTO);
+ return listQueryRespDTO;
+ }).collect(Collectors.toList());
+ return listQueryRespDTOs;
+ }
+
+ /**
+ * 管控措施-不分页查询
+ */
+ @Override
+ public ResultVO<List<PreventRiskControlMeasureListQueryRespDTO>> listRiskControlMeasure() {
+
+ List<PreventRiskControlMeasure> controlMeasures = riskControlMeasureService.listRiskControlMeasure();
+ List<PreventRiskControlMeasureListQueryRespDTO> pageResult = null;
+ if (controlMeasures != null) {
+ pageResult = controlMeasures.stream().map((preventRiskControlMeasure) -> {
+ PreventRiskControlMeasureListQueryRespDTO dto = new PreventRiskControlMeasureListQueryRespDTO();
+ BeanUtils.copyProperties(preventRiskControlMeasure, dto);
+ return dto;
+ }).collect(Collectors.toList());
+ }
+
+ ResultVO<List<PreventRiskControlMeasureListQueryRespDTO>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);
+ return resultVO;
+ }
+
+ /**
+ * 通过排查点，查找管控措施id
+ */
+ @Override
+ public PreventRiskCheckUnit getRiskControlMeasureByCheckPointId(Long checkPointId) {
+ return preventRiskCheckUnitService.getUnitByBaseCheckPointId(checkPointId);
+ }
+
+ /**
+ * 查询管控措施信息
+ */
+ @Override
+ public PreventRiskControlMeasure getRiskControlMeasureInfo(Long checkPointId) {
+
+ PreventRiskCheckUnit unitByBaseCheckPointId = preventRiskCheckUnitService.getUnitByBaseCheckPointId(checkPointId);
+// if (ObjectUtils.isEmpty(unitByBaseCheckPointId)){
+// throw new AusinessException(E.DATA_DATABASE_DUPLICATED, "数据不存在或已被删除");
+// }
+ return riskControlMeasureService.getPreventRiskControlMeasureById(unitByBaseCheckPointId.getControlMeasureId());
+ }
+
+ /**
+ * 查询隐患附属表信息
+ */
+ @Override
+ public PreventRiskDangerInfo getDangerInfoById(Long id) {
+ PreventRiskDangerInfo dangerInfobyHiddenDangerId = preventRiskDangerInfoService.getByHiddenDangerId(id);
+ return dangerInfobyHiddenDangerId;
+ }
+
+ @Override
+ public int updateCheckLog(Long checkId, HiddenDangerCheckPoint hdcp) {
+ return preventRiskDangerCheckLogService.updateCheckLog(checkId, hdcp.getMobileCode());
+ }
+
+ @Override
+ public PreventRiskDangerInfo getDangerInfoByDangerCheckPointId(Long checkId) {
+ return preventRiskDangerInfoService.getDangerInfoByDangerCheckPointId(checkId);
+ }
+
+
+ // /**
+// * 全流程 隐患上报-附属表信息插入
+// * */
+// @Override
+// public int insertAllDangerInfo(Long id, HiddenDangerCheckPoint hdcp) {
+//
+// String dangerInfoUuid = UUID.randomUUID().toString();
+// PreventRiskDangerInfo dangerInfo = new PreventRiskDangerInfo();
+//
+// dangerInfo.setUuid(dangerInfoUuid);
+// dangerInfo.setDangerCheckPointId(id);
+// dangerInfo.setHazardCode(hdcp.getHazardCode());
+// dangerInfo.setDangerSrc(hdcp.getDangerSrc());
+// dangerInfo.setDangerDesc(hdcp.getDangerDesc());
+// dangerInfo.setDangerReason(hdcp.getDangerReason());
+// dangerInfo.setDangerResult(hdcp.getDangerResult());
+// dangerInfo.setHazardDangerType(hdcp.getHazardDangerType());
+// dangerInfo.setDangerState(hdcp.getDangerState());
+// dangerInfo.setTimeoutFlag(null);//暂时不清楚是否需要此功能，先设为空
+//
+// //获取上报主配置信息
+// PreventReportConfig reportConfigById = preventReportConfigService.getReportConfigById(SyncEnum.REPORT_CONFIG_DANGER_INFO.getCode());
+// //设置上报时间为空
+// dangerInfo.setReportTime(null);
+// //设置本条数据上报更新时间
+// dangerInfo.setUpdateReportDataTime(new Date());
+// //读取上报主配置，进行任务记录上报配置,如果开启上报功能，且设置为自动上报,开启上报相关配置
+// if (reportConfigById.getReportState() == SyncEnum.REPORT_ON.getCode()
+// && reportConfigById.getReportType() == SyncEnum.REPORT_HAND_EXEC_CONFIG.getCode()){
+// //设置上报状态为-等待上报
+// dangerInfo.setReportStatus(SyncEnum.SYNC_WAIT_EXEC.getCode());
+// //设置本条数据上报开关为-开启
+// dangerInfo.setReportSwitch(SyncEnum.REPORT_ON.getCode());
+// //其他情况默认不开启上报数据，如果是手动上报，可对单条数据进行操作
+// }else {
+// //设置上报状态为-不上报
+// dangerInfo.setReportStatus(SyncEnum.SYNC_NOT_EXEC.getCode());
+// //设置本条数据上报开关为-关闭
+// dangerInfo.setReportSwitch(SyncEnum.REPORT_OFF.getCode());
+// }
+//
+// return preventRiskDangerInfoService.insertDangerInfo(dangerInfo);
+// }
+
+
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/doublePrevention/utilsCJ/AesGcm256Util.java b/src/main/java/com/ruoyi/doublePrevention/utilsCJ/AesGcm256Util.java
index b024ea0..8695ba0 100644
--- a/src/main/java/com/ruoyi/doublePrevention/utilsCJ/AesGcm256Util.java
+++ b/src/main/java/com/ruoyi/doublePrevention/utilsCJ/AesGcm256Util.java
@@ -1,149 +1,149 @@
-package com.ruoyi.doublePrevention.utilsCJ;//package com.gkhy.safePlatform.doublePrevention.utilsCJ;
-//
-//import com.f2bpm.upload.interfaces.ConstantUpload;
-//import org.bouncycastle.crypto.DataLengthException;
-//import org.bouncycastle.crypto.InvalidCipherTextException;
-//import org.bouncycastle.crypto.engines.AESFastEngine;
-//import org.bouncycastle.crypto.modes.GCMBlockCipher;
-//import org.bouncycastle.crypto.params.AEADParameters;
-//import org.bouncycastle.crypto.params.KeyParameter;
-//
-//import java.io.UnsupportedEncodingException;
-//import java.nio.charset.StandardCharsets;
-//import java.security.SecureRandom;
-//import java.util.Base64;
-//
-///**
-// * AES-GCM-256 工具类
-// *
-// * @author ：LX（长沙麓谷）
-// * @date 创建时间： 2022/8/3 14:05
-// */
-//public class AesGcm256Util {
-//
-// /**
-// * 随机数生成
-// */
-// private static final SecureRandom SECURE_RANDOM = new SecureRandom();
-//
-// public static final int NONCE_BIT_SIZE = 128;
-// public static final int MAC_BIT_SIZE = 128;
-// public static final int KEY_BIT_SIZE = 256;
-//
-//
-// private AesGcm256Util(){}
-//
-//
-// /**
-// * 创建密钥
-// * @return 密钥
-// */
-// public static byte[] key() {
-// byte[] key = new byte[KEY_BIT_SIZE / 8];
-// SECURE_RANDOM.nextBytes(key);
-// return key;
-// }
-//
-// /**
-// * 创建向量
-// * @return 向量
-// */
-// public static byte[] iv() {
-// byte[] iv = new byte[NONCE_BIT_SIZE / 8];
-// SECURE_RANDOM.nextBytes(iv);
-// return iv;
-// }
-//
-// /**
-// * 编码
-// * @param hexStr 要编码的文本
-// * @return 字节数组
-// */
-// public static byte[] hexToByte(String hexStr) {
-// int len = hexStr.length();
-// byte[] data = new byte[len / 2];
-// for (int i = 0; i < len; i += 2) {
-// data[i / 2] = (byte) ((Character.digit(hexStr.charAt(i), 16) << 4)
-// + Character.digit(hexStr.charAt(i + 1), 16));
-// }
-// return data;
-// }
-//
-// /**
-// * 转换为十六进制
-// * @param data 字节数组
-// * @return 转换的十六进制数据
-// */
-// public static String toHex(byte[] data) {
-// StringBuilder ret = new StringBuilder();
-// for (byte datum : data) {
-// String hex = Integer.toHexString(datum & 0xFF);
-// if (hex.length() == 1) {
-// hex = '0' + hex;
-// }
-// ret.append(hex.toUpperCase());
-// }
-// return ret.toString();
-// }
-//
-// /**
-// * 加密
-// * @param plainText 要加密的明文文本
-// * @param key 密钥
-// * @param iv 向量
-// * @return
-// */
-// public static String encrypt(String plainText, String key, String iv) throws UnsupportedEncodingException {
-// return encrypt(plainText, key.getBytes(ConstantUpload.Base.UTF-8), iv.getBytes(ConstantUpload.Base.UTF-8));
-// }
-//
-// /**
-// * 加密
-// * @param plainText 要加密的明文文本
-// * @param key 密钥
-// * @param iv 向量
-// * @return
-// */
-// public static String encrypt(String plainText, byte[] key, byte[] iv) {
-// String sr;
-// try {
-// byte[] plainBytes = plainText.getBytes(StandardCharsets.UTF_8);
-// GCMBlockCipher cipher = new GCMBlockCipher(new AESFastEngine());
-// AEADParameters parameters = new AEADParameters(new KeyParameter(key), MAC_BIT_SIZE, iv, null);
-// cipher.init(true, parameters);
-// byte[] encryptedBytes = new byte[cipher.getOutputSize(plainBytes.length)];
-// int retLen = cipher.processBytes(plainBytes, 0, plainBytes.length, encryptedBytes, 0);
-// cipher.doFinal(encryptedBytes, retLen);
-// sr = Base64.getEncoder().encodeToString(encryptedBytes);
-// } catch (Exception ex) {
-// throw new RuntimeException("加密异常! Encryption exception：" + ex.getMessage());
-// }
-// return sr;
-// }
-//
-// /**
-// * 解密
-// * @param encryptedText 已加密文本
-// * @param key 密钥
-// * @param iv 向量
-// * @return
-// */
-// public static String decrypt(String encryptedText, byte[] key, byte[] iv) {
-// String sr;
-// try {
-// byte[] encryptedBytes = Base64.getDecoder().decode(encryptedText);
-// GCMBlockCipher cipher = new GCMBlockCipher(new AESFastEngine());
-// AEADParameters parameters = new AEADParameters(new KeyParameter(key), MAC_BIT_SIZE, iv, null);
-// cipher.init(false, parameters);
-// byte[] plainBytes = new byte[cipher.getOutputSize(encryptedBytes.length)];
-// int retLen = cipher.processBytes(encryptedBytes, 0, encryptedBytes.length, plainBytes, 0);
-// cipher.doFinal(plainBytes, retLen);
-// sr = new String(plainBytes, StandardCharsets.UTF_8);
-//
-// } catch (IllegalArgumentException | IllegalStateException | DataLengthException | InvalidCipherTextException ex) {
-// throw new RuntimeException("解密异常! Decryption exception:" + ex.getMessage());
-// }
-// return sr;
-// }
-//}
-//
+package com.ruoyi.doublePrevention.utilsCJ;//package com.gkhy.safePlatform.doublePrevention.utilsCJ;
+//
+//import com.f2bpm.upload.interfaces.ConstantUpload;
+//import org.bouncycastle.crypto.DataLengthException;
+//import org.bouncycastle.crypto.InvalidCipherTextException;
+//import org.bouncycastle.crypto.engines.AESFastEngine;
+//import org.bouncycastle.crypto.modes.GCMBlockCipher;
+//import org.bouncycastle.crypto.params.AEADParameters;
+//import org.bouncycastle.crypto.params.KeyParameter;
+//
+//import java.io.UnsupportedEncodingException;
+//import java.nio.charset.StandardCharsets;
+//import java.security.SecureRandom;
+//import java.util.Base64;
+//
+///**
+// * AES-GCM-256 工具类
+// *
+// * @author ：LX（长沙麓谷）
+// * @date 创建时间： 2022/8/3 14:05
+// */
+//public class AesGcm256Util {
+//
+// /**
+// * 随机数生成
+// */
+// private static final SecureRandom SECURE_RANDOM = new SecureRandom();
+//
+// public static final int NONCE_BIT_SIZE = 128;
+// public static final int MAC_BIT_SIZE = 128;
+// public static final int KEY_BIT_SIZE = 256;
+//
+//
+// private AesGcm256Util(){}
+//
+//
+// /**
+// * 创建密钥
+// * @return 密钥
+// */
+// public static byte[] key() {
+// byte[] key = new byte[KEY_BIT_SIZE / 8];
+// SECURE_RANDOM.nextBytes(key);
+// return key;
+// }
+//
+// /**
+// * 创建向量
+// * @return 向量
+// */
+// public static byte[] iv() {
+// byte[] iv = new byte[NONCE_BIT_SIZE / 8];
+// SECURE_RANDOM.nextBytes(iv);
+// return iv;
+// }
+//
+// /**
+// * 编码
+// * @param hexStr 要编码的文本
+// * @return 字节数组
+// */
+// public static byte[] hexToByte(String hexStr) {
+// int len = hexStr.length();
+// byte[] data = new byte[len / 2];
+// for (int i = 0; i < len; i += 2) {
+// data[i / 2] = (byte) ((Character.digit(hexStr.charAt(i), 16) << 4)
+// + Character.digit(hexStr.charAt(i + 1), 16));
+// }
+// return data;
+// }
+//
+// /**
+// * 转换为十六进制
+// * @param data 字节数组
+// * @return 转换的十六进制数据
+// */
+// public static String toHex(byte[] data) {
+// StringBuilder ret = new StringBuilder();
+// for (byte datum : data) {
+// String hex = Integer.toHexString(datum & 0xFF);
+// if (hex.length() == 1) {
+// hex = '0' + hex;
+// }
+// ret.append(hex.toUpperCase());
+// }
+// return ret.toString();
+// }
+//
+// /**
+// * 加密
+// * @param plainText 要加密的明文文本
+// * @param key 密钥
+// * @param iv 向量
+// * @return
+// */
+// public static String encrypt(String plainText, String key, String iv) throws UnsupportedEncodingException {
+// return encrypt(plainText, key.getBytes(ConstantUpload.Base.UTF-8), iv.getBytes(ConstantUpload.Base.UTF-8));
+// }
+//
+// /**
+// * 加密
+// * @param plainText 要加密的明文文本
+// * @param key 密钥
+// * @param iv 向量
+// * @return
+// */
+// public static String encrypt(String plainText, byte[] key, byte[] iv) {
+// String sr;
+// try {
+// byte[] plainBytes = plainText.getBytes(StandardCharsets.UTF_8);
+// GCMBlockCipher cipher = new GCMBlockCipher(new AESFastEngine());
+// AEADParameters parameters = new AEADParameters(new KeyParameter(key), MAC_BIT_SIZE, iv, null);
+// cipher.init(true, parameters);
+// byte[] encryptedBytes = new byte[cipher.getOutputSize(plainBytes.length)];
+// int retLen = cipher.processBytes(plainBytes, 0, plainBytes.length, encryptedBytes, 0);
+// cipher.doFinal(encryptedBytes, retLen);
+// sr = Base64.getEncoder().encodeToString(encryptedBytes);
+// } catch (Exception ex) {
+// throw new RuntimeException("加密异常! Encryption exception：" + ex.getMessage());
+// }
+// return sr;
+// }
+//
+// /**
+// * 解密
+// * @param encryptedText 已加密文本
+// * @param key 密钥
+// * @param iv 向量
+// * @return
+// */
+// public static String decrypt(String encryptedText, byte[] key, byte[] iv) {
+// String sr;
+// try {
+// byte[] encryptedBytes = Base64.getDecoder().decode(encryptedText);
+// GCMBlockCipher cipher = new GCMBlockCipher(new AESFastEngine());
+// AEADParameters parameters = new AEADParameters(new KeyParameter(key), MAC_BIT_SIZE, iv, null);
+// cipher.init(false, parameters);
+// byte[] plainBytes = new byte[cipher.getOutputSize(encryptedBytes.length)];
+// int retLen = cipher.processBytes(encryptedBytes, 0, encryptedBytes.length, plainBytes, 0);
+// cipher.doFinal(plainBytes, retLen);
+// sr = new String(plainBytes, StandardCharsets.UTF_8);
+//
+// } catch (IllegalArgumentException | IllegalStateException | DataLengthException | InvalidCipherTextException ex) {
+// throw new RuntimeException("解密异常! Decryption exception:" + ex.getMessage());
+// }
+// return sr;
+// }
+//}
+//
diff --git a/src/main/java/com/ruoyi/project/system/user/test.java b/src/main/java/com/ruoyi/project/system/user/test.java
index a14d992..026cf6c 100644
--- a/src/main/java/com/ruoyi/project/system/user/test.java
+++ b/src/main/java/com/ruoyi/project/system/user/test.java
@@ -1,21 +1,21 @@
-package com.ruoyi.project.system.user;
-
-import com.ruoyi.framework.shiro.service.PasswordService;
-import org.apache.shiro.crypto.hash.Md5Hash;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class test {
-
-// @Autowired
-// private PasswordService passwordService;
-//
-// public static void main(String[] args) {
-//
-// String userName = "马文川";
-// String password = "Gkhy@c413";
-// String salt = "33402b";
-//
-// String s = new Md5Hash(userName + password + salt).toHex();
-// System.out.println(s);
-// }
-}
+package com.ruoyi.project.system.user;
+
+import com.ruoyi.framework.shiro.service.PasswordService;
+import org.apache.shiro.crypto.hash.Md5Hash;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class test {
+
+// @Autowired
+// private PasswordService passwordService;
+//
+// public static void main(String[] args) {
+//
+// String userName = "马文川";
+// String password = "Gkhy@c413";
+// String salt = "33402b";
+//
+// String s = new Md5Hash(userName + password + salt).toHex();
+// System.out.println(s);
+// }
+}
diff --git a/src/main/java/com/ruoyi/project/tr/HiddenDangerCheckJob/util/AbstractQuartzJob.java b/src/main/java/com/ruoyi/project/tr/HiddenDangerCheckJob/util/AbstractQuartzJob.java
index 08d8cb5..afefc86 100644
--- a/src/main/java/com/ruoyi/project/tr/HiddenDangerCheckJob/util/AbstractQuartzJob.java
+++ b/src/main/java/com/ruoyi/project/tr/HiddenDangerCheckJob/util/AbstractQuartzJob.java
@@ -133,7 +133,7 @@
* */
//生成定时隐患排查数据
@Transactional
- protected void createData(JobExecutionContext context, HiddenDangerCheckJob job) {
+ public void createData(JobExecutionContext context, HiddenDangerCheckJob job) {
Date startTime = threadLocal.get();
//比较当前时间与执行开始时间
diff --git a/src/main/java/com/ruoyi/project/tr/OverhaulLog/controller/OverhaulLogController.java b/src/main/java/com/ruoyi/project/tr/OverhaulLog/controller/OverhaulLogController.java
index d18bbf3..0a8c878 100644
--- a/src/main/java/com/ruoyi/project/tr/OverhaulLog/controller/OverhaulLogController.java
+++ b/src/main/java/com/ruoyi/project/tr/OverhaulLog/controller/OverhaulLogController.java
@@ -1,144 +1,144 @@
-package com.ruoyi.project.tr.OverhaulLog.controller;
-
-import com.ruoyi.doublePrevention.entity.PreventOverhaulLog;
-import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
-import com.ruoyi.doublePrevention.entity.dto.req.*;
-import com.ruoyi.doublePrevention.entity.dto.resp.PreventOverhaulLogRespDTO;
-import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskControlMeasureRespDTO;
-import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskEventListQueryRespDTO;
-import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskUnitCodeAndNameListQueryRespDTO;
-import com.ruoyi.doublePrevention.service.RiskService;
-import com.ruoyi.doublePrevention.service.baseService.PreventOverhaulLogService;
-import com.ruoyi.doublePrevention.vo.ResultVO;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-
-
-@Controller
-@RequestMapping("/tr/overhaulLog")
-public class OverhaulLogController extends BaseController {
-
- private String prefix = "tr/overhaulLog";
-
-
- @Autowired
- private PreventOverhaulLogService overhaulLogService;
-
- @Autowired
- private RiskService riskService;
-
-
-// @GetMapping()
-// public String overhaulLog()
-// {
-// return prefix + "/overhaulLog";
-// }
- @GetMapping()
- public String overhaulLog(ModelMap mmap)
- {
- List<PreventRiskUnitCodeAndNameListQueryRespDTO> respDTOS = riskService.listRiskUnitCodeAndName();
- mmap.put("riskUnits", respDTOS);
- return prefix + "/overhaulLog";
- }
-
- /**
- * 查询
- * */
- @PostMapping("/list")
- @ResponseBody
- public TableDataInfo selectOverhaulLogPage(PreventOverhaulLogReqBO overhaulLogReqBO, ModelMap mmap){
-
- ResultVO<PreventOverhaulLogRespDTO> result = overhaulLogService.selectOverhaulLogPage(overhaulLogReqBO);
- List<PreventOverhaulLogRespDTO> data = (List<PreventOverhaulLogRespDTO>) result.getData();
-
- TableDataInfo dataTable = getDataTable(data);
- dataTable.setTotal(result.getCount());
- return dataTable;
- }
-
- /**
- * 新增检修记录
- */
-// @GetMapping("/add")
-// public String add()
-// {
-// return prefix + "/add";
-// }
-
- @GetMapping("/add")
- public String add(ModelMap mmap)
- {
- List<PreventRiskUnitCodeAndNameListQueryRespDTO> respDTOS = riskService.listRiskUnitCodeAndName();
- mmap.put("riskUnits", respDTOS);
- return prefix + "/add";
- }
-
- /**
- * 新增保存检修记录
- */
- @PostMapping("/add")
- @ResponseBody
- public AjaxResult addSave(PreventOverhaulLogInsertReqBO insertReqBO)
- {
-
- ResultVO<PreventOverhaulLog> resultVO = overhaulLogService.savePreventOverhaulLog(insertReqBO);
- String code = resultVO.getCode();
- if ("200".equals(code)){
- return toAjax(1);
- }else {
- return AjaxResult.error(resultVO.getMsg());
- }
- }
-
- /**
- * 修改检修记录
- */
- @GetMapping("/edit/{id}")
- public String edit(@PathVariable("id") Long id, ModelMap mmap)
- {
- PreventOverhaulLog overhaulLogById = overhaulLogService.getOverhaulLogById(id);
- mmap.put("overhaulLog",overhaulLogById);
- List<PreventRiskUnitCodeAndNameListQueryRespDTO> respDTOS = riskService.listRiskUnitCodeAndName();
- mmap.put("riskUnits", respDTOS);
- return prefix + "/edit";
- }
-
- /**
- * 修改保存
- */
- @PostMapping("/edit")
- @ResponseBody
- public AjaxResult editSave(PreventOverhaulLogUpdateReqBO updateReqBO)
- {
- ResultVO<PreventOverhaulLog> resultVO = overhaulLogService.updateOverhaulLog(updateReqBO);
- String code = resultVO.getCode();
- if ("200".equals(code)){
- return toAjax(1);
- }else {
- return AjaxResult.error(resultVO.getMsg());
- }
- }
-
- /**
- * 删除检修记录
- */
- @Log(title = "风险单元类型", businessType = BusinessType.DELETE)
- @PostMapping( "/remove")
- @ResponseBody
- public AjaxResult remove(String ids)
- {
- return toAjax(overhaulLogService.deleteOverhaulLogByIds(ids));
- }
-
-
-}
+package com.ruoyi.project.tr.OverhaulLog.controller;
+
+import com.ruoyi.doublePrevention.entity.PreventOverhaulLog;
+import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
+import com.ruoyi.doublePrevention.entity.dto.req.*;
+import com.ruoyi.doublePrevention.entity.dto.resp.PreventOverhaulLogRespDTO;
+import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskControlMeasureRespDTO;
+import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskEventListQueryRespDTO;
+import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskUnitCodeAndNameListQueryRespDTO;
+import com.ruoyi.doublePrevention.service.RiskService;
+import com.ruoyi.doublePrevention.service.baseService.PreventOverhaulLogService;
+import com.ruoyi.doublePrevention.vo.ResultVO;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+
+
+@Controller
+@RequestMapping("/tr/overhaulLog")
+public class OverhaulLogController extends BaseController {
+
+ private String prefix = "tr/overhaulLog";
+
+
+ @Autowired
+ private PreventOverhaulLogService overhaulLogService;
+
+ @Autowired
+ private RiskService riskService;
+
+
+// @GetMapping()
+// public String overhaulLog()
+// {
+// return prefix + "/overhaulLog";
+// }
+ @GetMapping()
+ public String overhaulLog(ModelMap mmap)
+ {
+ List<PreventRiskUnitCodeAndNameListQueryRespDTO> respDTOS = riskService.listRiskUnitCodeAndName();
+ mmap.put("riskUnits", respDTOS);
+ return prefix + "/overhaulLog";
+ }
+
+ /**
+ * 查询
+ * */
+ @PostMapping("/list")
+ @ResponseBody
+ public TableDataInfo selectOverhaulLogPage(PreventOverhaulLogReqBO overhaulLogReqBO, ModelMap mmap){
+
+ ResultVO<PreventOverhaulLogRespDTO> result = overhaulLogService.selectOverhaulLogPage(overhaulLogReqBO);
+ List<PreventOverhaulLogRespDTO> data = (List<PreventOverhaulLogRespDTO>) result.getData();
+
+ TableDataInfo dataTable = getDataTable(data);
+ dataTable.setTotal(result.getCount());
+ return dataTable;
+ }
+
+ /**
+ * 新增检修记录
+ */
+// @GetMapping("/add")
+// public String add()
+// {
+// return prefix + "/add";
+// }
+
+ @GetMapping("/add")
+ public String add(ModelMap mmap)
+ {
+ List<PreventRiskUnitCodeAndNameListQueryRespDTO> respDTOS = riskService.listRiskUnitCodeAndName();
+ mmap.put("riskUnits", respDTOS);
+ return prefix + "/add";
+ }
+
+ /**
+ * 新增保存检修记录
+ */
+ @PostMapping("/add")
+ @ResponseBody
+ public AjaxResult addSave(PreventOverhaulLogInsertReqBO insertReqBO)
+ {
+
+ ResultVO<PreventOverhaulLog> resultVO = overhaulLogService.savePreventOverhaulLog(insertReqBO);
+ String code = resultVO.getCode();
+ if ("200".equals(code)){
+ return toAjax(1);
+ }else {
+ return AjaxResult.error(resultVO.getMsg());
+ }
+ }
+
+ /**
+ * 修改检修记录
+ */
+ @GetMapping("/edit/{id}")
+ public String edit(@PathVariable("id") Long id, ModelMap mmap)
+ {
+ PreventOverhaulLog overhaulLogById = overhaulLogService.getOverhaulLogById(id);
+ mmap.put("overhaulLog",overhaulLogById);
+ List<PreventRiskUnitCodeAndNameListQueryRespDTO> respDTOS = riskService.listRiskUnitCodeAndName();
+ mmap.put("riskUnits", respDTOS);
+ return prefix + "/edit";
+ }
+
+ /**
+ * 修改保存
+ */
+ @PostMapping("/edit")
+ @ResponseBody
+ public AjaxResult editSave(PreventOverhaulLogUpdateReqBO updateReqBO)
+ {
+ ResultVO<PreventOverhaulLog> resultVO = overhaulLogService.updateOverhaulLog(updateReqBO);
+ String code = resultVO.getCode();
+ if ("200".equals(code)){
+ return toAjax(1);
+ }else {
+ return AjaxResult.error(resultVO.getMsg());
+ }
+ }
+
+ /**
+ * 删除检修记录
+ */
+ @Log(title = "风险单元类型", businessType = BusinessType.DELETE)
+ @PostMapping( "/remove")
+ @ResponseBody
+ public AjaxResult remove(String ids)
+ {
+ return toAjax(overhaulLogService.deleteOverhaulLogByIds(ids));
+ }
+
+
+}
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/service/impl/HiddenDangerCheckServiceImpl.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/service/impl/HiddenDangerCheckServiceImpl.java
index 06df29e..daca922 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/service/impl/HiddenDangerCheckServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/service/impl/HiddenDangerCheckServiceImpl.java
@@ -1,25 +1,16 @@
package com.ruoyi.project.tr.hiddenDangerCheck.service.impl;
-import com.alibaba.fastjson.JSONObject;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.text.Convert;
-import com.ruoyi.framework.web.service.JpushService;
-import com.ruoyi.project.mobile.domain.ApiResult;
-import com.ruoyi.project.system.user.domain.User;
import com.ruoyi.project.system.user.service.IUserService;
import com.ruoyi.project.tr.hiddenDangerCheck.domain.HiddenDangerCheck;
import com.ruoyi.project.tr.hiddenDangerCheck.mapper.HiddenDangerCheckMapper;
import com.ruoyi.project.tr.hiddenDangerCheck.service.IHiddenDangerCheckService;
-import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
import com.ruoyi.project.tr.report.mapper.ReportMapper;
import com.ruoyi.project.tr.report.service.ReportService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
/**
* 隐患排查Service业务层处理
@@ -39,8 +30,6 @@
@Autowired
private ReportMapper reportMapper;
- @Autowired
- JpushService jpushService;
@Autowired
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/Test/ItemDangerReportScheduleTest.java b/src/main/java/com/ruoyi/project/tr/specialCheck/Test/ItemDangerReportScheduleTest.java
index 841af68..25a658b 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/Test/ItemDangerReportScheduleTest.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/Test/ItemDangerReportScheduleTest.java
@@ -1,224 +1,224 @@
-package com.ruoyi.project.tr.specialCheck.Test;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.ruoyi.common.utils.BeanCopyUtils;
-import com.ruoyi.doublePrevention.entity.CJReport.CJdto.CJReportResultData;
-import com.ruoyi.doublePrevention.entity.CJReport.CJdto.Data;
-import com.ruoyi.doublePrevention.entity.CJReport.CJdto.ErrorMsgDetails;
-import com.ruoyi.doublePrevention.enums.CJReportEnum;
-import com.ruoyi.doublePrevention.enums.SyncEnum;
-import com.ruoyi.project.tr.riskList.service.IRiskListService;
-import com.ruoyi.project.tr.specialCheck.domin.BO.HandlerSpecialCheckReportParam;
-import com.ruoyi.project.tr.specialCheck.domin.DTO.SpecialCheckItemDangerLogReportDTO;
-import com.ruoyi.project.tr.specialCheck.domin.DTO.SpecialCheckTaskLogReportDTO;
-import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemDangerLog;
-import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckScoreAndDangerLog;
-import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckTaskLog;
-import com.ruoyi.project.tr.specialCheck.mapper.*;
-import org.apache.commons.lang3.ObjectUtils;
-import org.bouncycastle.crypto.engines.AESFastEngine;
-import org.bouncycastle.crypto.modes.GCMBlockCipher;
-import org.bouncycastle.crypto.params.AEADParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-
-@Component
-public class ItemDangerReportScheduleTest {
-
- private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
- @Autowired
- private TbSpecialCheckItemLogMapper itemLogMapper;
-
- @Autowired
- private TbSpecialCheckScoreAndDangerLogMapper scoreAndDangerLogMapper;
-
- String token = "GT6gGJV7JV";
- String key = "Bv+NeBolwqg2Pbc1yVwrZA==";
- String iv = "4QC9V8eAiB7tdlgBkMsTAw==";
-
- public static final int MAC_BIT_SIZE = 128;
-
- public static String encrypt(String plainText, byte[] key, byte[] iv) {
- String sr;
- try {
- byte[] plainBytes = plainText.getBytes(StandardCharsets.UTF_8);
- GCMBlockCipher cipher = new GCMBlockCipher(new
- AESFastEngine());
- AEADParameters parameters =
- new AEADParameters(new KeyParameter(key),
- MAC_BIT_SIZE, iv, null);
- cipher.init(true, parameters);
- byte[] encryptedBytes = new
- byte[cipher.getOutputSize(plainBytes.length)];
- int retLen = cipher.processBytes(plainBytes, 0, plainBytes.length,
- encryptedBytes, 0);
- cipher.doFinal(encryptedBytes, retLen);
- sr = Base64.getEncoder().encodeToString(encryptedBytes);
- } catch (Exception ex) {
- throw new RuntimeException(ex.getMessage());
- }
- return sr;
- }
-
-
- @Transactional
-// @Scheduled(cron = "0 0 23 * * ?") //每天晚上23点执行一次0 0 22,23 * * ?
-// @Scheduled(cron = "0 0 22,23 * * ?") //每天晚上22、23点执行一次
-// @Scheduled(cron = "0 0/1 * * * ? ") // 分钟
-// @Scheduled(cron = "0 0/35 * * * ? ") // 分钟
-// @Scheduled(cron = "0/5 * * * * ?")
- public void execReportDateSchedule() throws UnsupportedEncodingException {
- logger.info("【####】上报数据开始...");
-
- HttpURLConnection con = null;
- BufferedReader buffer = null;
- int responseCode = 200;
-
-// SimpleDateFormat dateFormatCheckData= new SimpleDateFormat("yyyy-MM-dd");
-// SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd HH:MM:ss");
- DateTimeFormatter dateFormatCheckData = DateTimeFormatter.ofPattern("yyyy-MM-dd");
- DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:MM:ss");
-
- Date date = new Date();
- //格式化时间，作为token的时间戳
- SimpleDateFormat tokenDate= new SimpleDateFormat("yyyyMMddHHmmssSSS");
- String formatDate = tokenDate.format(date);
-
- logger.info("【token时间】" + formatDate);
-
- /**
- * 1、检查项与隐患上报
- * */
- System.out.println("【2】检查项与隐患上报-处理数据...");
-// List<TbSpecialCheckTaskLog> CJRiskAnaUnits = .listReportUnitDate();
- List<TbSpecialCheckScoreAndDangerLog> scoreAndDangerLogs = scoreAndDangerLogMapper.listScoreAndDangerLogReportList();
- if (ObjectUtils.isNotEmpty(scoreAndDangerLogs)){
- //封装上报数据,时间格式化
- List<SpecialCheckItemDangerLogReportDTO> list = new ArrayList<>();
-
- for (TbSpecialCheckScoreAndDangerLog scoreAndDangerLog : scoreAndDangerLogs) {
- SpecialCheckItemDangerLogReportDTO specialCheckItemDangerLogReportDTO = BeanCopyUtils.copyBean(scoreAndDangerLog, SpecialCheckItemDangerLogReportDTO.class);
- specialCheckItemDangerLogReportDTO.setCreateDate(dateFormat.format(scoreAndDangerLog.getCreateDate()));
- specialCheckItemDangerLogReportDTO.setUpdateDate(dateFormat.format(scoreAndDangerLog.getUpdateDate()));
- specialCheckItemDangerLogReportDTO.setCheckDate(dateFormatCheckData.format(scoreAndDangerLog.getCheckDate()));
- specialCheckItemDangerLogReportDTO.setDeleted(scoreAndDangerLog.getDeleted().toString());
- list.add(specialCheckItemDangerLogReportDTO);
- }
-// logger.info("【【原始数据】】" + JSONObject.toJSONString(list));
- System.out.println("【【原始数据】】" + JSONObject.toJSONString(list));
- String AESReportUnitDate = encrypt(JSONObject.toJSONString(list), key.getBytes(), iv.getBytes());
-// logger.info("【【AES加密结果】】"+ AESReportUnitDate);{0JRK`$6X.jpg)min/Desktop/所有桌面文件存放/9}AM56M10$6WX){0JRK`$6X.jpg)
- StringBuffer itemDangerResultBuffer = null;
-
-
- //上报数据
- try {
- URL url = new URL("http://120.71.182.198:9999/v1/data/receive/receiveCheckDangerList");
- //得到连接对象
- con = (HttpURLConnection) url.openConnection();
- //设置请求类型
- con.setRequestMethod("POST");
- //允许写出
- con.setDoOutput(true);
- //允许读入
- con.setDoInput(true);
- //不使用缓存
- con.setUseCaches(false);
- con.setInstanceFollowRedirects(true);
- //设置请求头
- con.setRequestProperty("X-Access-Token",token+formatDate.toString());
- //设置Content-Type，此处根据实际情况确定
- con.setRequestProperty("Content-Type", "application/json;charset=utf8");
-
- OutputStream os = con.getOutputStream();
- Map paraMap = new HashMap();
- paraMap.put("data", AESReportUnitDate); /**封装数据*/
- System.out.println("【【加密请求体】】" + JSONArray.toJSON(paraMap).toString());
- //组装入参，设置请求体
- os.write(JSON.toJSONString(paraMap).getBytes());
-
- //本段日志，测试成功后，可注释掉
- if (responseCode == HttpURLConnection.HTTP_OK) {
- //得到响应流
- InputStream inputStream = con.getInputStream();
- //将响应流转换成字符串
- itemDangerResultBuffer = new StringBuffer();
- String line;
- buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
- while ((line = buffer.readLine()) != null) {
- itemDangerResultBuffer.append(line);
- }
-// logger.info("result:" + unitResultBuffer.toString());
- System.out.println("result:" + itemDangerResultBuffer.toString());
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- //接收返回值，保存返回值
- CJReportResultData CJOverhaulLogResult = JSONObject.parseObject(itemDangerResultBuffer.toString(), CJReportResultData.class);
- //接收返回值，保存返回值
- List<String> errorIdList= new ArrayList<>();
- Data data = JSONObject.parseObject(CJOverhaulLogResult.getData(), Data.class);
- //保存失败结果
- if (ObjectUtils.isNotEmpty(data)){
- for (ErrorMsgDetails errorMsgDetail : data.getErrorMsgDetails()) {
- errorIdList.add(errorMsgDetail.getId());
- }
- }
- LocalDateTime nowDate = LocalDateTime.now();
- logger.info("【检查项与隐患】数据上报结果：" + CJOverhaulLogResult.getCode());
- //设置所有数据上报成功
- if (CJOverhaulLogResult.getCode().equals(CJReportEnum.SUCCESS.getCode()) || CJOverhaulLogResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
- for (TbSpecialCheckScoreAndDangerLog itemDangerLo : scoreAndDangerLogs) {
- HandlerSpecialCheckReportParam handlerCJReportParam = new HandlerSpecialCheckReportParam();
- //封装数据
- handlerCJReportParam.setId(itemDangerLo.getId());
- handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
- handlerCJReportParam.setReportTime(nowDate);
- scoreAndDangerLogMapper.updateItemDangerReportStatusById(handlerCJReportParam);
- }
- }
- //设置上报失败的数据，上报失败
- if (CJOverhaulLogResult.getCode().equals(CJReportEnum.FAIL.getCode()) || CJOverhaulLogResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
- for (String failId : errorIdList) {
- //上报失败
- HandlerSpecialCheckReportParam handlerCJReportParam = new HandlerSpecialCheckReportParam();
- //封装数据
- handlerCJReportParam.setId(failId);
- handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());
- handlerCJReportParam.setReportTime(nowDate);
- scoreAndDangerLogMapper.updateItemDangerReportStatusById(handlerCJReportParam);
- }
- }
-
-
-// logger.info("【1】安全风险分析单元-数据处理完成");
- System.out.println("【检查项与隐患】-数据处理完成");
- }else {
-// logger.info("【1】风险分析单元-无数据上报昌吉州");
- System.out.println("【检查项与隐患】-无数据上报昌吉州");
- }
-
-
-
- }
-}
+package com.ruoyi.project.tr.specialCheck.Test;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.utils.BeanCopyUtils;
+import com.ruoyi.doublePrevention.entity.CJReport.CJdto.CJReportResultData;
+import com.ruoyi.doublePrevention.entity.CJReport.CJdto.Data;
+import com.ruoyi.doublePrevention.entity.CJReport.CJdto.ErrorMsgDetails;
+import com.ruoyi.doublePrevention.enums.CJReportEnum;
+import com.ruoyi.doublePrevention.enums.SyncEnum;
+import com.ruoyi.project.tr.riskList.service.IRiskListService;
+import com.ruoyi.project.tr.specialCheck.domin.BO.HandlerSpecialCheckReportParam;
+import com.ruoyi.project.tr.specialCheck.domin.DTO.SpecialCheckItemDangerLogReportDTO;
+import com.ruoyi.project.tr.specialCheck.domin.DTO.SpecialCheckTaskLogReportDTO;
+import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemDangerLog;
+import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckScoreAndDangerLog;
+import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckTaskLog;
+import com.ruoyi.project.tr.specialCheck.mapper.*;
+import org.apache.commons.lang3.ObjectUtils;
+import org.bouncycastle.crypto.engines.AESFastEngine;
+import org.bouncycastle.crypto.modes.GCMBlockCipher;
+import org.bouncycastle.crypto.params.AEADParameters;
+import org.bouncycastle.crypto.params.KeyParameter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+
+@Component
+public class ItemDangerReportScheduleTest {
+
+ private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+ @Autowired
+ private TbSpecialCheckItemLogMapper itemLogMapper;
+
+ @Autowired
+ private TbSpecialCheckScoreAndDangerLogMapper scoreAndDangerLogMapper;
+
+ String token = "GT6gGJV7JV";
+ String key = "Bv+NeBolwqg2Pbc1yVwrZA==";
+ String iv = "4QC9V8eAiB7tdlgBkMsTAw==";
+
+ public static final int MAC_BIT_SIZE = 128;
+
+ public static String encrypt(String plainText, byte[] key, byte[] iv) {
+ String sr;
+ try {
+ byte[] plainBytes = plainText.getBytes(StandardCharsets.UTF_8);
+ GCMBlockCipher cipher = new GCMBlockCipher(new
+ AESFastEngine());
+ AEADParameters parameters =
+ new AEADParameters(new KeyParameter(key),
+ MAC_BIT_SIZE, iv, null);
+ cipher.init(true, parameters);
+ byte[] encryptedBytes = new
+ byte[cipher.getOutputSize(plainBytes.length)];
+ int retLen = cipher.processBytes(plainBytes, 0, plainBytes.length,
+ encryptedBytes, 0);
+ cipher.doFinal(encryptedBytes, retLen);
+ sr = Base64.getEncoder().encodeToString(encryptedBytes);
+ } catch (Exception ex) {
+ throw new RuntimeException(ex.getMessage());
+ }
+ return sr;
+ }
+
+
+ @Transactional
+// @Scheduled(cron = "0 0 23 * * ?") //每天晚上23点执行一次0 0 22,23 * * ?
+// @Scheduled(cron = "0 0 22,23 * * ?") //每天晚上22、23点执行一次
+// @Scheduled(cron = "0 0/1 * * * ? ") // 分钟
+// @Scheduled(cron = "0 0/35 * * * ? ") // 分钟
+// @Scheduled(cron = "0/5 * * * * ?")
+ public void execReportDateSchedule() throws UnsupportedEncodingException {
+ logger.info("【####】上报数据开始...");
+
+ HttpURLConnection con = null;
+ BufferedReader buffer = null;
+ int responseCode = 200;
+
+// SimpleDateFormat dateFormatCheckData= new SimpleDateFormat("yyyy-MM-dd");
+// SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd HH:MM:ss");
+ DateTimeFormatter dateFormatCheckData = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:MM:ss");
+
+ Date date = new Date();
+ //格式化时间，作为token的时间戳
+ SimpleDateFormat tokenDate= new SimpleDateFormat("yyyyMMddHHmmssSSS");
+ String formatDate = tokenDate.format(date);
+
+ logger.info("【token时间】" + formatDate);
+
+ /**
+ * 1、检查项与隐患上报
+ * */
+ System.out.println("【2】检查项与隐患上报-处理数据...");
+// List<TbSpecialCheckTaskLog> CJRiskAnaUnits = .listReportUnitDate();
+ List<TbSpecialCheckScoreAndDangerLog> scoreAndDangerLogs = scoreAndDangerLogMapper.listScoreAndDangerLogReportList();
+ if (ObjectUtils.isNotEmpty(scoreAndDangerLogs)){
+ //封装上报数据,时间格式化
+ List<SpecialCheckItemDangerLogReportDTO> list = new ArrayList<>();
+
+ for (TbSpecialCheckScoreAndDangerLog scoreAndDangerLog : scoreAndDangerLogs) {
+ SpecialCheckItemDangerLogReportDTO specialCheckItemDangerLogReportDTO = BeanCopyUtils.copyBean(scoreAndDangerLog, SpecialCheckItemDangerLogReportDTO.class);
+ specialCheckItemDangerLogReportDTO.setCreateDate(dateFormat.format(scoreAndDangerLog.getCreateDate()));
+ specialCheckItemDangerLogReportDTO.setUpdateDate(dateFormat.format(scoreAndDangerLog.getUpdateDate()));
+ specialCheckItemDangerLogReportDTO.setCheckDate(dateFormatCheckData.format(scoreAndDangerLog.getCheckDate()));
+ specialCheckItemDangerLogReportDTO.setDeleted(scoreAndDangerLog.getDeleted().toString());
+ list.add(specialCheckItemDangerLogReportDTO);
+ }
+// logger.info("【【原始数据】】" + JSONObject.toJSONString(list));
+ System.out.println("【【原始数据】】" + JSONObject.toJSONString(list));
+ String AESReportUnitDate = encrypt(JSONObject.toJSONString(list), key.getBytes(), iv.getBytes());
+// logger.info("【【AES加密结果】】"+ AESReportUnitDate);{0JRK`$6X.jpg)min/Desktop/所有桌面文件存放/9}AM56M10$6WX){0JRK`$6X.jpg)
+ StringBuffer itemDangerResultBuffer = null;
+
+
+ //上报数据
+ try {
+ URL url = new URL("http://120.71.182.198:9999/v1/data/receive/receiveCheckDangerList");
+ //得到连接对象
+ con = (HttpURLConnection) url.openConnection();
+ //设置请求类型
+ con.setRequestMethod("POST");
+ //允许写出
+ con.setDoOutput(true);
+ //允许读入
+ con.setDoInput(true);
+ //不使用缓存
+ con.setUseCaches(false);
+ con.setInstanceFollowRedirects(true);
+ //设置请求头
+ con.setRequestProperty("X-Access-Token",token+formatDate.toString());
+ //设置Content-Type，此处根据实际情况确定
+ con.setRequestProperty("Content-Type", "application/json;charset=utf8");
+
+ OutputStream os = con.getOutputStream();
+ Map paraMap = new HashMap();
+ paraMap.put("data", AESReportUnitDate); /**封装数据*/
+ System.out.println("【【加密请求体】】" + JSONArray.toJSON(paraMap).toString());
+ //组装入参，设置请求体
+ os.write(JSON.toJSONString(paraMap).getBytes());
+
+ //本段日志，测试成功后，可注释掉
+ if (responseCode == HttpURLConnection.HTTP_OK) {
+ //得到响应流
+ InputStream inputStream = con.getInputStream();
+ //将响应流转换成字符串
+ itemDangerResultBuffer = new StringBuffer();
+ String line;
+ buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
+ while ((line = buffer.readLine()) != null) {
+ itemDangerResultBuffer.append(line);
+ }
+// logger.info("result:" + unitResultBuffer.toString());
+ System.out.println("result:" + itemDangerResultBuffer.toString());
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ //接收返回值，保存返回值
+ CJReportResultData CJOverhaulLogResult = JSONObject.parseObject(itemDangerResultBuffer.toString(), CJReportResultData.class);
+ //接收返回值，保存返回值
+ List<String> errorIdList= new ArrayList<>();
+ Data data = JSONObject.parseObject(CJOverhaulLogResult.getData(), Data.class);
+ //保存失败结果
+ if (ObjectUtils.isNotEmpty(data)){
+ for (ErrorMsgDetails errorMsgDetail : data.getErrorMsgDetails()) {
+ errorIdList.add(errorMsgDetail.getId());
+ }
+ }
+ LocalDateTime nowDate = LocalDateTime.now();
+ logger.info("【检查项与隐患】数据上报结果：" + CJOverhaulLogResult.getCode());
+ //设置所有数据上报成功
+ if (CJOverhaulLogResult.getCode().equals(CJReportEnum.SUCCESS.getCode()) || CJOverhaulLogResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
+ for (TbSpecialCheckScoreAndDangerLog itemDangerLo : scoreAndDangerLogs) {
+ HandlerSpecialCheckReportParam handlerCJReportParam = new HandlerSpecialCheckReportParam();
+ //封装数据
+ handlerCJReportParam.setId(itemDangerLo.getId());
+ handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
+ handlerCJReportParam.setReportTime(nowDate);
+ scoreAndDangerLogMapper.updateItemDangerReportStatusById(handlerCJReportParam);
+ }
+ }
+ //设置上报失败的数据，上报失败
+ if (CJOverhaulLogResult.getCode().equals(CJReportEnum.FAIL.getCode()) || CJOverhaulLogResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
+ for (String failId : errorIdList) {
+ //上报失败
+ HandlerSpecialCheckReportParam handlerCJReportParam = new HandlerSpecialCheckReportParam();
+ //封装数据
+ handlerCJReportParam.setId(failId);
+ handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());
+ handlerCJReportParam.setReportTime(nowDate);
+ scoreAndDangerLogMapper.updateItemDangerReportStatusById(handlerCJReportParam);
+ }
+ }
+
+
+// logger.info("【1】安全风险分析单元-数据处理完成");
+ System.out.println("【检查项与隐患】-数据处理完成");
+ }else {
+// logger.info("【1】风险分析单元-无数据上报昌吉州");
+ System.out.println("【检查项与隐患】-无数据上报昌吉州");
+ }
+
+
+
+ }
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/Test/SpecialCheckTaskDownload.java b/src/main/java/com/ruoyi/project/tr/specialCheck/Test/SpecialCheckTaskDownload.java
index cdc07c5..8ccc6f5 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/Test/SpecialCheckTaskDownload.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/Test/SpecialCheckTaskDownload.java
@@ -1,335 +1,335 @@
-package com.ruoyi.project.tr.specialCheck.Test;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.ruoyi.project.tr.riskList.service.IRiskListService;
-import com.ruoyi.project.tr.specialCheck.domin.DownloadDTO.*;
-import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckItem;
-import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckScore;
-import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckTask;
-import com.ruoyi.project.tr.specialCheck.domin.TbCheckConfig;
-import com.ruoyi.project.tr.specialCheck.mapper.*;
-import org.bouncycastle.crypto.engines.AESFastEngine;
-import org.bouncycastle.crypto.modes.GCMBlockCipher;
-import org.bouncycastle.crypto.params.AEADParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.text.SimpleDateFormat;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-
-@Component
-public class SpecialCheckTaskDownload {
-
- private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
- @Autowired
- private TbBaseCheckCompanyMapper companyTbRepository;
- @Autowired
- private TbBaseCheckItemMapper itemTbRepository;
- @Autowired
- private TbBaseCheckScoreMapper scoreTbRepository;
- @Autowired
- private TbBaseCheckTaskMapper taskTbRepository;
- @Autowired
- private TbSpecialCheckTaskLogMapper taskSpecialLogMapper;
- @Autowired
- private IRiskListService riskListService;
- @Autowired
- private TbCheckConfigMapper configMapper;
-
- String token = "GT6gGJV7JV";
- String key = "Bv+NeBolwqg2Pbc1yVwrZA==";
- String iv = "4QC9V8eAiB7tdlgBkMsTAw==";
-
- public static final int MAC_BIT_SIZE = 128;
-
- public static String encrypt(String plainText, byte[] key, byte[] iv) {
- String sr;
- try {
- byte[] plainBytes = plainText.getBytes(StandardCharsets.UTF_8);
- GCMBlockCipher cipher = new GCMBlockCipher(new
- AESFastEngine());
- AEADParameters parameters =
- new AEADParameters(new KeyParameter(key),
- MAC_BIT_SIZE, iv, null);
- cipher.init(true, parameters);
- byte[] encryptedBytes = new
- byte[cipher.getOutputSize(plainBytes.length)];
- int retLen = cipher.processBytes(plainBytes, 0, plainBytes.length,
- encryptedBytes, 0);
- cipher.doFinal(encryptedBytes, retLen);
- sr = Base64.getEncoder().encodeToString(encryptedBytes);
- } catch (Exception ex) {
- throw new RuntimeException(ex.getMessage());
- }
- return sr;
- }
-
-
- @Transactional
-// @Scheduled(cron = "0 0 23 * * ?") //每天晚上23点执行一次0 0 22,23 * * ?
-// @Scheduled(cron = "0 0 22,23 * * ?") //每天晚上22、23点执行一次
-// @Scheduled(cron = "0 0/1 * * * ? ") // 分钟
-// @Scheduled(cron = "0 0/20 * * * ? ") // 分钟
-// @Scheduled(cron = "0/5 * * * * ?")
- public void execReportDateSchedule() throws UnsupportedEncodingException {
- logger.info("【####】拉取专项检查数据开始...");
-
- HttpURLConnection con = null;
- BufferedReader buffer = null;
- int responseCode = 200;
-
- DateTimeFormatter dateFormatCheckData = DateTimeFormatter.ofPattern("yyyy-MM-dd");
- DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:MM:ss");
-
- Date date = new Date();
- //格式化时间，作为token的时间戳
- SimpleDateFormat tokenDate= new SimpleDateFormat("yyyyMMddHHmmssSSS");
- String formatDate = tokenDate.format(date);
-
- logger.info("【token时间】" + formatDate);
-
- /**
- * 1
- * */
- logger.info("【####】拉取专项任务数据开始...");
- TbCheckConfig specialCheckConfig = configMapper.getSpecialCheckConfig();
- if (specialCheckConfig.getStatus() == 2){
-
- StringBuffer specialCheckBuffer = null;
-
- //上报数据
- try {
- URL url = new URL("http://120.71.182.198:9999/v1/data/receive/getCheckTask");
- //得到连接对象
- con = (HttpURLConnection) url.openConnection();
- //设置请求类型
- con.setRequestMethod("POST");
- //允许写出
- con.setDoOutput(true);
- //允许读入
- con.setDoInput(true);
- //不使用缓存
- con.setUseCaches(false);
- con.setInstanceFollowRedirects(true);
- //设置请求头
- con.setRequestProperty("X-Access-Token",token+formatDate.toString());
- //设置Content-Type，此处根据实际情况确定
- con.setRequestProperty("Content-Type", "application/json;charset=utf8");
-
- OutputStream os = con.getOutputStream();
-
- //本段日志，测试成功后，可注释掉
- if (responseCode == HttpURLConnection.HTTP_OK) {
- //得到响应流
- InputStream inputStream = con.getInputStream();
- //将响应流转换成字符串
- specialCheckBuffer = new StringBuffer();
- String line;
- buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
- while ((line = buffer.readLine()) != null) {
- specialCheckBuffer.append(line);
- }
-// logger.info("result:" + unitResultBuffer.toString());
- System.out.println("result:" + specialCheckBuffer.toString());
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- //接收返回值，保存返回值
- TbBaseCheckTaskDownloadBO checkTaskDownloadDTO = JSONObject.parseObject(specialCheckBuffer.toString(), TbBaseCheckTaskDownloadBO.class);
- //接收返回值，保存返回值
- CheckTaskData tasks = JSONObject.parseObject(checkTaskDownloadDTO.getData(), CheckTaskData.class);
- if (tasks.getCheckTaskLists().size() > 0){
- for (TbBaseCheckTask checkTask : tasks.getCheckTaskLists()) {
- checkTask.setStatus(1);
- int insert = taskTbRepository.insert(checkTask);
- }
- }
-
- logger.info("【专项检查任务】-读取任务结果：" + checkTaskDownloadDTO.getCode());
- System.out.println("【专项检查任务】-读取任务完成");
- }else {
- System.out.println("【专项检查任务】- 不读取任务");
- }
-
- /**
- * 2
- * */
- logger.info("【####】拉取检查项数据开始...");
- if (specialCheckConfig.getStatus() == 2){
-
- StringBuffer specialCheckBuffer = null;
-
- ItemDownloadRespDTO itemDownloadRespDTO = new ItemDownloadRespDTO();
- TbBaseCheckTask baseCheckTask = taskTbRepository.getBaseCheckTaskByStatus(date);
- Page page = new Page();
- page.setCurrent(String.valueOf(1));
- page.setSize(String.valueOf(1000));
-
- itemDownloadRespDTO.setTaskId(baseCheckTask.getId());
- itemDownloadRespDTO.setPage(page);
- //加密请求数据
- String AESReportUnitDate = encrypt(JSONObject.toJSONString(itemDownloadRespDTO), key.getBytes(), iv.getBytes());
- //上报数据
- try {
- URL url = new URL("http://120.71.182.198:9999/v1/data/receive/getCheckItem");
- //得到连接对象
- con = (HttpURLConnection) url.openConnection();
- //设置请求类型
- con.setRequestMethod("POST");
- //允许写出
- con.setDoOutput(true);
- //允许读入
- con.setDoInput(true);
- //不使用缓存
- con.setUseCaches(false);
- con.setInstanceFollowRedirects(true);
- //设置请求头
- con.setRequestProperty("X-Access-Token",token+formatDate.toString());
- //设置Content-Type，此处根据实际情况确定
- con.setRequestProperty("Content-Type", "application/json;charset=utf8");
-
- OutputStream os = con.getOutputStream();
- Map paraMap = new HashMap();
- paraMap.put("data", AESReportUnitDate); /**封装数据*/
- System.out.println("【【加密请求体】】" + JSONArray.toJSON(paraMap).toString());
- //组装入参，设置请求体
- os.write(JSON.toJSONString(paraMap).getBytes());
-
- //本段日志，测试成功后，可注释掉
- if (responseCode == HttpURLConnection.HTTP_OK) {
- //得到响应流
- InputStream inputStream = con.getInputStream();
- //将响应流转换成字符串
- specialCheckBuffer = new StringBuffer();
- String line;
- buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
- while ((line = buffer.readLine()) != null) {
- specialCheckBuffer.append(line);
- }
-// logger.info("result:" + unitResultBuffer.toString());
- System.out.println("result:" + specialCheckBuffer.toString());
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- //接收返回值，保存返回值
- ItemDownloadRespBO itemDownloadRespBO = JSONObject.parseObject(specialCheckBuffer.toString(), ItemDownloadRespBO.class);
- //接收返回值，保存返回值
- CheckItemData itemData = JSONObject.parseObject(itemDownloadRespBO.getData(), CheckItemData.class);
- if (itemData.getItemLists().size() > 0){
- for (TbBaseCheckItem item : itemData.getItemLists()) {
- item.setStatus(1);
- int insert = itemTbRepository.insert(item);
- }
- }
-
- taskTbRepository.updateStatusById(baseCheckTask.getId());
-
- logger.info("【专项任务检查项】-读取检查项结果：" + itemDownloadRespBO.getCode());
- System.out.println("【专项任务检查项】-读取检查项完成");
- }else {
- System.out.println("【专项任务检查项】- 不读取检查项");
- }
-
- /**
- * 3
- * */
- logger.info("【####】拉取评分细则开始...");
- if (specialCheckConfig.getStatus() == 2){
-
- StringBuffer specialCheckBuffer = null;
-
- ScoreDownloadRespDTO scoreDownloadRespDTO = new ScoreDownloadRespDTO();
- TbBaseCheckItem baseItemByStatus = itemTbRepository.getBaseItemByStatus(date);
- Page page = new Page();
- page.setCurrent(String.valueOf(1));
- page.setSize(String.valueOf(1000));
-
- scoreDownloadRespDTO.setTaskId(baseItemByStatus.getTaskId());
- scoreDownloadRespDTO.setCheckItemId(baseItemByStatus.getId());
- scoreDownloadRespDTO.setPage(page);
- //加密请求数据
- String AESReportUnitDate = encrypt(JSONObject.toJSONString(scoreDownloadRespDTO), key.getBytes(), iv.getBytes());
- //上报数据
- try {
- URL url = new URL("http://120.71.182.198:9999/v1/data/receive/getCheckItem");
- //得到连接对象
- con = (HttpURLConnection) url.openConnection();
- //设置请求类型
- con.setRequestMethod("POST");
- //允许写出
- con.setDoOutput(true);
- //允许读入
- con.setDoInput(true);
- //不使用缓存
- con.setUseCaches(false);
- con.setInstanceFollowRedirects(true);
- //设置请求头
- con.setRequestProperty("X-Access-Token",token+formatDate.toString());
- //设置Content-Type，此处根据实际情况确定
- con.setRequestProperty("Content-Type", "application/json;charset=utf8");
-
- OutputStream os = con.getOutputStream();
- Map paraMap = new HashMap();
- paraMap.put("data", AESReportUnitDate); /**封装数据*/
- System.out.println("【【加密请求体】】" + JSONArray.toJSON(paraMap).toString());
- //组装入参，设置请求体
- os.write(JSON.toJSONString(paraMap).getBytes());
-
- //本段日志，测试成功后，可注释掉
- if (responseCode == HttpURLConnection.HTTP_OK) {
- //得到响应流
- InputStream inputStream = con.getInputStream();
- //将响应流转换成字符串
- specialCheckBuffer = new StringBuffer();
- String line;
- buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
- while ((line = buffer.readLine()) != null) {
- specialCheckBuffer.append(line);
- }
-// logger.info("result:" + unitResultBuffer.toString());
- System.out.println("result:" + specialCheckBuffer.toString());
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- //接收返回值，保存返回值
- ScoreDownloadRespBO scoreDownloadRespBO = JSONObject.parseObject(specialCheckBuffer.toString(), ScoreDownloadRespBO.class);
- //接收返回值，保存返回值
- CheckScoreData scoreData = JSONObject.parseObject(scoreDownloadRespBO.getData(), CheckScoreData.class);
- if (scoreData.getScoreLists().size() > 0){
- for (TbBaseCheckScore score : scoreData.getScoreLists()) {
- int insert = scoreTbRepository.insert(score);
- }
-
- }
- itemTbRepository.updateStatusById(baseItemByStatus.getId());
-
- logger.info("【评分细则】-读取结果：" + scoreDownloadRespBO.getCode());
- System.out.println("【评分细则】-读取完成");
- }else {
- System.out.println("【评分细则】- 不读取");
- }
-
-
- }
-}
+package com.ruoyi.project.tr.specialCheck.Test;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.project.tr.riskList.service.IRiskListService;
+import com.ruoyi.project.tr.specialCheck.domin.DownloadDTO.*;
+import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckItem;
+import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckScore;
+import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckTask;
+import com.ruoyi.project.tr.specialCheck.domin.TbCheckConfig;
+import com.ruoyi.project.tr.specialCheck.mapper.*;
+import org.bouncycastle.crypto.engines.AESFastEngine;
+import org.bouncycastle.crypto.modes.GCMBlockCipher;
+import org.bouncycastle.crypto.params.AEADParameters;
+import org.bouncycastle.crypto.params.KeyParameter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+
+@Component
+public class SpecialCheckTaskDownload {
+
+ private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+ @Autowired
+ private TbBaseCheckCompanyMapper companyTbRepository;
+ @Autowired
+ private TbBaseCheckItemMapper itemTbRepository;
+ @Autowired
+ private TbBaseCheckScoreMapper scoreTbRepository;
+ @Autowired
+ private TbBaseCheckTaskMapper taskTbRepository;
+ @Autowired
+ private TbSpecialCheckTaskLogMapper taskSpecialLogMapper;
+ @Autowired
+ private IRiskListService riskListService;
+ @Autowired
+ private TbCheckConfigMapper configMapper;
+
+ String token = "GT6gGJV7JV";
+ String key = "Bv+NeBolwqg2Pbc1yVwrZA==";
+ String iv = "4QC9V8eAiB7tdlgBkMsTAw==";
+
+ public static final int MAC_BIT_SIZE = 128;
+
+ public static String encrypt(String plainText, byte[] key, byte[] iv) {
+ String sr;
+ try {
+ byte[] plainBytes = plainText.getBytes(StandardCharsets.UTF_8);
+ GCMBlockCipher cipher = new GCMBlockCipher(new
+ AESFastEngine());
+ AEADParameters parameters =
+ new AEADParameters(new KeyParameter(key),
+ MAC_BIT_SIZE, iv, null);
+ cipher.init(true, parameters);
+ byte[] encryptedBytes = new
+ byte[cipher.getOutputSize(plainBytes.length)];
+ int retLen = cipher.processBytes(plainBytes, 0, plainBytes.length,
+ encryptedBytes, 0);
+ cipher.doFinal(encryptedBytes, retLen);
+ sr = Base64.getEncoder().encodeToString(encryptedBytes);
+ } catch (Exception ex) {
+ throw new RuntimeException(ex.getMessage());
+ }
+ return sr;
+ }
+
+
+ @Transactional
+// @Scheduled(cron = "0 0 23 * * ?") //每天晚上23点执行一次0 0 22,23 * * ?
+// @Scheduled(cron = "0 0 22,23 * * ?") //每天晚上22、23点执行一次
+// @Scheduled(cron = "0 0/1 * * * ? ") // 分钟
+// @Scheduled(cron = "0 0/20 * * * ? ") // 分钟
+// @Scheduled(cron = "0/5 * * * * ?")
+ public void execReportDateSchedule() throws UnsupportedEncodingException {
+ logger.info("【####】拉取专项检查数据开始...");
+
+ HttpURLConnection con = null;
+ BufferedReader buffer = null;
+ int responseCode = 200;
+
+ DateTimeFormatter dateFormatCheckData = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:MM:ss");
+
+ Date date = new Date();
+ //格式化时间，作为token的时间戳
+ SimpleDateFormat tokenDate= new SimpleDateFormat("yyyyMMddHHmmssSSS");
+ String formatDate = tokenDate.format(date);
+
+ logger.info("【token时间】" + formatDate);
+
+ /**
+ * 1
+ * */
+ logger.info("【####】拉取专项任务数据开始...");
+ TbCheckConfig specialCheckConfig = configMapper.getSpecialCheckConfig();
+ if (specialCheckConfig.getStatus() == 2){
+
+ StringBuffer specialCheckBuffer = null;
+
+ //上报数据
+ try {
+ URL url = new URL("http://120.71.182.198:9999/v1/data/receive/getCheckTask");
+ //得到连接对象
+ con = (HttpURLConnection) url.openConnection();
+ //设置请求类型
+ con.setRequestMethod("POST");
+ //允许写出
+ con.setDoOutput(true);
+ //允许读入
+ con.setDoInput(true);
+ //不使用缓存
+ con.setUseCaches(false);
+ con.setInstanceFollowRedirects(true);
+ //设置请求头
+ con.setRequestProperty("X-Access-Token",token+formatDate.toString());
+ //设置Content-Type，此处根据实际情况确定
+ con.setRequestProperty("Content-Type", "application/json;charset=utf8");
+
+ OutputStream os = con.getOutputStream();
+
+ //本段日志，测试成功后，可注释掉
+ if (responseCode == HttpURLConnection.HTTP_OK) {
+ //得到响应流
+ InputStream inputStream = con.getInputStream();
+ //将响应流转换成字符串
+ specialCheckBuffer = new StringBuffer();
+ String line;
+ buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
+ while ((line = buffer.readLine()) != null) {
+ specialCheckBuffer.append(line);
+ }
+// logger.info("result:" + unitResultBuffer.toString());
+ System.out.println("result:" + specialCheckBuffer.toString());
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ //接收返回值，保存返回值
+ TbBaseCheckTaskDownloadBO checkTaskDownloadDTO = JSONObject.parseObject(specialCheckBuffer.toString(), TbBaseCheckTaskDownloadBO.class);
+ //接收返回值，保存返回值
+ CheckTaskData tasks = JSONObject.parseObject(checkTaskDownloadDTO.getData(), CheckTaskData.class);
+ if (tasks.getCheckTaskLists().size() > 0){
+ for (TbBaseCheckTask checkTask : tasks.getCheckTaskLists()) {
+ checkTask.setStatus(1);
+ int insert = taskTbRepository.insert(checkTask);
+ }
+ }
+
+ logger.info("【专项检查任务】-读取任务结果：" + checkTaskDownloadDTO.getCode());
+ System.out.println("【专项检查任务】-读取任务完成");
+ }else {
+ System.out.println("【专项检查任务】- 不读取任务");
+ }
+
+ /**
+ * 2
+ * */
+ logger.info("【####】拉取检查项数据开始...");
+ if (specialCheckConfig.getStatus() == 2){
+
+ StringBuffer specialCheckBuffer = null;
+
+ ItemDownloadRespDTO itemDownloadRespDTO = new ItemDownloadRespDTO();
+ TbBaseCheckTask baseCheckTask = taskTbRepository.getBaseCheckTaskByStatus(date);
+ Page page = new Page();
+ page.setCurrent(String.valueOf(1));
+ page.setSize(String.valueOf(1000));
+
+ itemDownloadRespDTO.setTaskId(baseCheckTask.getId());
+ itemDownloadRespDTO.setPage(page);
+ //加密请求数据
+ String AESReportUnitDate = encrypt(JSONObject.toJSONString(itemDownloadRespDTO), key.getBytes(), iv.getBytes());
+ //上报数据
+ try {
+ URL url = new URL("http://120.71.182.198:9999/v1/data/receive/getCheckItem");
+ //得到连接对象
+ con = (HttpURLConnection) url.openConnection();
+ //设置请求类型
+ con.setRequestMethod("POST");
+ //允许写出
+ con.setDoOutput(true);
+ //允许读入
+ con.setDoInput(true);
+ //不使用缓存
+ con.setUseCaches(false);
+ con.setInstanceFollowRedirects(true);
+ //设置请求头
+ con.setRequestProperty("X-Access-Token",token+formatDate.toString());
+ //设置Content-Type，此处根据实际情况确定
+ con.setRequestProperty("Content-Type", "application/json;charset=utf8");
+
+ OutputStream os = con.getOutputStream();
+ Map paraMap = new HashMap();
+ paraMap.put("data", AESReportUnitDate); /**封装数据*/
+ System.out.println("【【加密请求体】】" + JSONArray.toJSON(paraMap).toString());
+ //组装入参，设置请求体
+ os.write(JSON.toJSONString(paraMap).getBytes());
+
+ //本段日志，测试成功后，可注释掉
+ if (responseCode == HttpURLConnection.HTTP_OK) {
+ //得到响应流
+ InputStream inputStream = con.getInputStream();
+ //将响应流转换成字符串
+ specialCheckBuffer = new StringBuffer();
+ String line;
+ buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
+ while ((line = buffer.readLine()) != null) {
+ specialCheckBuffer.append(line);
+ }
+// logger.info("result:" + unitResultBuffer.toString());
+ System.out.println("result:" + specialCheckBuffer.toString());
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ //接收返回值，保存返回值
+ ItemDownloadRespBO itemDownloadRespBO = JSONObject.parseObject(specialCheckBuffer.toString(), ItemDownloadRespBO.class);
+ //接收返回值，保存返回值
+ CheckItemData itemData = JSONObject.parseObject(itemDownloadRespBO.getData(), CheckItemData.class);
+ if (itemData.getItemLists().size() > 0){
+ for (TbBaseCheckItem item : itemData.getItemLists()) {
+ item.setStatus(1);
+ int insert = itemTbRepository.insert(item);
+ }
+ }
+
+ taskTbRepository.updateStatusById(baseCheckTask.getId());
+
+ logger.info("【专项任务检查项】-读取检查项结果：" + itemDownloadRespBO.getCode());
+ System.out.println("【专项任务检查项】-读取检查项完成");
+ }else {
+ System.out.println("【专项任务检查项】- 不读取检查项");
+ }
+
+ /**
+ * 3
+ * */
+ logger.info("【####】拉取评分细则开始...");
+ if (specialCheckConfig.getStatus() == 2){
+
+ StringBuffer specialCheckBuffer = null;
+
+ ScoreDownloadRespDTO scoreDownloadRespDTO = new ScoreDownloadRespDTO();
+ TbBaseCheckItem baseItemByStatus = itemTbRepository.getBaseItemByStatus(date);
+ Page page = new Page();
+ page.setCurrent(String.valueOf(1));
+ page.setSize(String.valueOf(1000));
+
+ scoreDownloadRespDTO.setTaskId(baseItemByStatus.getTaskId());
+ scoreDownloadRespDTO.setCheckItemId(baseItemByStatus.getId());
+ scoreDownloadRespDTO.setPage(page);
+ //加密请求数据
+ String AESReportUnitDate = encrypt(JSONObject.toJSONString(scoreDownloadRespDTO), key.getBytes(), iv.getBytes());
+ //上报数据
+ try {
+ URL url = new URL("http://120.71.182.198:9999/v1/data/receive/getCheckItem");
+ //得到连接对象
+ con = (HttpURLConnection) url.openConnection();
+ //设置请求类型
+ con.setRequestMethod("POST");
+ //允许写出
+ con.setDoOutput(true);
+ //允许读入
+ con.setDoInput(true);
+ //不使用缓存
+ con.setUseCaches(false);
+ con.setInstanceFollowRedirects(true);
+ //设置请求头
+ con.setRequestProperty("X-Access-Token",token+formatDate.toString());
+ //设置Content-Type，此处根据实际情况确定
+ con.setRequestProperty("Content-Type", "application/json;charset=utf8");
+
+ OutputStream os = con.getOutputStream();
+ Map paraMap = new HashMap();
+ paraMap.put("data", AESReportUnitDate); /**封装数据*/
+ System.out.println("【【加密请求体】】" + JSONArray.toJSON(paraMap).toString());
+ //组装入参，设置请求体
+ os.write(JSON.toJSONString(paraMap).getBytes());
+
+ //本段日志，测试成功后，可注释掉
+ if (responseCode == HttpURLConnection.HTTP_OK) {
+ //得到响应流
+ InputStream inputStream = con.getInputStream();
+ //将响应流转换成字符串
+ specialCheckBuffer = new StringBuffer();
+ String line;
+ buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
+ while ((line = buffer.readLine()) != null) {
+ specialCheckBuffer.append(line);
+ }
+// logger.info("result:" + unitResultBuffer.toString());
+ System.out.println("result:" + specialCheckBuffer.toString());
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ //接收返回值，保存返回值
+ ScoreDownloadRespBO scoreDownloadRespBO = JSONObject.parseObject(specialCheckBuffer.toString(), ScoreDownloadRespBO.class);
+ //接收返回值，保存返回值
+ CheckScoreData scoreData = JSONObject.parseObject(scoreDownloadRespBO.getData(), CheckScoreData.class);
+ if (scoreData.getScoreLists().size() > 0){
+ for (TbBaseCheckScore score : scoreData.getScoreLists()) {
+ int insert = scoreTbRepository.insert(score);
+ }
+
+ }
+ itemTbRepository.updateStatusById(baseItemByStatus.getId());
+
+ logger.info("【评分细则】-读取结果：" + scoreDownloadRespBO.getCode());
+ System.out.println("【评分细则】-读取完成");
+ }else {
+ System.out.println("【评分细则】- 不读取");
+ }
+
+
+ }
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/Test/TaskReportScheduleTest.java b/src/main/java/com/ruoyi/project/tr/specialCheck/Test/TaskReportScheduleTest.java
index cf595fa..d5b2c94 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/Test/TaskReportScheduleTest.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/Test/TaskReportScheduleTest.java
@@ -1,236 +1,236 @@
-package com.ruoyi.project.tr.specialCheck.Test;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.ruoyi.common.utils.BeanCopyUtils;
-import com.ruoyi.doublePrevention.entity.CJReport.CJdto.CJReportResultData;
-import com.ruoyi.doublePrevention.entity.CJReport.CJdto.Data;
-import com.ruoyi.doublePrevention.entity.CJReport.CJdto.ErrorMsgDetails;
-import com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO.*;
-import com.ruoyi.doublePrevention.entity.CJReport.*;
-import com.ruoyi.doublePrevention.entity.PreventReportConfig;
-import com.ruoyi.doublePrevention.enums.CJReportEnum;
-import com.ruoyi.doublePrevention.enums.SyncEnum;
-import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
-import com.ruoyi.doublePrevention.service.baseService.*;
-import com.ruoyi.project.tr.report.service.ReportService;
-import com.ruoyi.project.tr.riskList.service.IRiskListService;
-import com.ruoyi.project.tr.specialCheck.domin.BO.HandlerSpecialCheckReportParam;
-import com.ruoyi.project.tr.specialCheck.domin.DTO.SpecialCheckTaskLogReportDTO;
-import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckTaskLog;
-import com.ruoyi.project.tr.specialCheck.mapper.*;
-import org.apache.commons.lang3.ObjectUtils;
-import org.bouncycastle.crypto.engines.AESFastEngine;
-import org.bouncycastle.crypto.modes.GCMBlockCipher;
-import org.bouncycastle.crypto.params.AEADParameters;
-import org.bouncycastle.crypto.params.KeyParameter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.io.*;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-
-@Component
-public class TaskReportScheduleTest {
-
- private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
- @Autowired
- private TbBaseCheckCompanyMapper companyTbRepository;
- @Autowired
- private TbBaseCheckItemMapper itemTbRepository;
- @Autowired
- private TbBaseCheckScoreMapper scoreTbRepository;
- @Autowired
- private TbBaseCheckTaskMapper taskTbRepository;
- @Autowired
- private TbSpecialCheckTaskLogMapper taskSpecialLogMapper;
- @Autowired
- private IRiskListService riskListService;
-
- String token = "GT6gGJV7JV";
- String key = "Bv+NeBolwqg2Pbc1yVwrZA==";
- String iv = "4QC9V8eAiB7tdlgBkMsTAw==";
-
- public static final int MAC_BIT_SIZE = 128;
-
- public static String encrypt(String plainText, byte[] key, byte[] iv) {
- String sr;
- try {
- byte[] plainBytes = plainText.getBytes(StandardCharsets.UTF_8);
- GCMBlockCipher cipher = new GCMBlockCipher(new
- AESFastEngine());
- AEADParameters parameters =
- new AEADParameters(new KeyParameter(key),
- MAC_BIT_SIZE, iv, null);
- cipher.init(true, parameters);
- byte[] encryptedBytes = new
- byte[cipher.getOutputSize(plainBytes.length)];
- int retLen = cipher.processBytes(plainBytes, 0, plainBytes.length,
- encryptedBytes, 0);
- cipher.doFinal(encryptedBytes, retLen);
- sr = Base64.getEncoder().encodeToString(encryptedBytes);
- } catch (Exception ex) {
- throw new RuntimeException(ex.getMessage());
- }
- return sr;
- }
-
-
- @Transactional
-// @Scheduled(cron = "0 0 23 * * ?") //每天晚上23点执行一次0 0 22,23 * * ?
-// @Scheduled(cron = "0 0 22,23 * * ?") //每天晚上22、23点执行一次
-// @Scheduled(cron = "0 0/1 * * * ? ") // 分钟
-// @Scheduled(cron = "0 0/35 * * * ? ") // 分钟
-// @Scheduled(cron = "0/5 * * * * ?")
- public void execReportDateSchedule() throws UnsupportedEncodingException {
- logger.info("【####】上报数据开始...");
-
- HttpURLConnection con = null;
- BufferedReader buffer = null;
- int responseCode = 200;
-
-// SimpleDateFormat dateFormatCheckData= new SimpleDateFormat("yyyy-MM-dd");
-// SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd HH:MM:ss");
- DateTimeFormatter dateFormatCheckData = DateTimeFormatter.ofPattern("yyyy-MM-dd");
- DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:MM:ss");
-
- Date date = new Date();
- //格式化时间，作为token的时间戳
- SimpleDateFormat tokenDate= new SimpleDateFormat("yyyyMMddHHmmssSSS");
- String formatDate = tokenDate.format(date);
-
- logger.info("【token时间】" + formatDate);
-
- /**
- * 1、任务上报
- * */
- System.out.println("【1】任务上报-处理数据...");
-// List<TbSpecialCheckTaskLog> CJRiskAnaUnits = .listReportUnitDate();
- List<TbSpecialCheckTaskLog> taskLogLists = taskSpecialLogMapper.listTestReportTask();
- if (ObjectUtils.isNotEmpty(taskLogLists)){
- //封装上报数据,时间格式化
- List<SpecialCheckTaskLogReportDTO> list = new ArrayList<>();
-
- for (TbSpecialCheckTaskLog taskLog : taskLogLists) {
- SpecialCheckTaskLogReportDTO specialTaskLogReportDTO = BeanCopyUtils.copyBean(taskLog, SpecialCheckTaskLogReportDTO.class);
- specialTaskLogReportDTO.setCreateDate(dateFormat.format(taskLog.getCreateDate()));
- specialTaskLogReportDTO.setUpdateDate(dateFormat.format(taskLog.getUpdateDate()));
- specialTaskLogReportDTO.setCheckDate(dateFormatCheckData.format(taskLog.getCheckDate()));
- list.add(specialTaskLogReportDTO);
- }
-// logger.info("【【原始数据】】" + JSONObject.toJSONString(list));
- System.out.println("【【原始数据】】" + JSONObject.toJSONString(list));
- String AESReportUnitDate = encrypt(JSONObject.toJSONString(list), key.getBytes(), iv.getBytes());
-// logger.info("【【AES加密结果】】"+ AESReportUnitDate);{0JRK`$6X.jpg)min/Desktop/所有桌面文件存放/9}AM56M10$6WX){0JRK`$6X.jpg)
- StringBuffer checkTaskResultBuffer = null;
-
-
- //上报数据
- try {
- URL url = new URL("http://120.71.182.198:9999/v1/data/receive/receiveCheckRecordList");
- //得到连接对象
- con = (HttpURLConnection) url.openConnection();
- //设置请求类型
- con.setRequestMethod("POST");
- //允许写出
- con.setDoOutput(true);
- //允许读入
- con.setDoInput(true);
- //不使用缓存
- con.setUseCaches(false);
- con.setInstanceFollowRedirects(true);
- //设置请求头
- con.setRequestProperty("X-Access-Token",token+formatDate.toString());
- //设置Content-Type，此处根据实际情况确定
- con.setRequestProperty("Content-Type", "application/json;charset=utf8");
-
- OutputStream os = con.getOutputStream();
- Map paraMap = new HashMap();
- paraMap.put("data", AESReportUnitDate); /**封装数据*/
- System.out.println("【【加密请求体】】" + JSONArray.toJSON(paraMap).toString());
- //组装入参，设置请求体
- os.write(JSON.toJSONString(paraMap).getBytes());
-
- //本段日志，测试成功后，可注释掉
- if (responseCode == HttpURLConnection.HTTP_OK) {
- //得到响应流
- InputStream inputStream = con.getInputStream();
- //将响应流转换成字符串
- checkTaskResultBuffer = new StringBuffer();
- String line;
- buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
- while ((line = buffer.readLine()) != null) {
- checkTaskResultBuffer.append(line);
- }
-// logger.info("result:" + unitResultBuffer.toString());
- System.out.println("result:" + checkTaskResultBuffer.toString());
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- }
-
-
- //接收返回值，保存返回值
- CJReportResultData CJOverhaulLogResult = JSONObject.parseObject(checkTaskResultBuffer.toString(), CJReportResultData.class);
- //接收返回值，保存返回值
- List<String> errorIdList= new ArrayList<>();
- Data data = JSONObject.parseObject(CJOverhaulLogResult.getData(), Data.class);
- //保存失败结果
- if (ObjectUtils.isNotEmpty(data)){
- for (ErrorMsgDetails errorMsgDetail : data.getErrorMsgDetails()) {
- errorIdList.add(errorMsgDetail.getId());
- }
- }
- LocalDateTime nowDate = LocalDateTime.now();
- logger.info("【任务】数据上报结果：" + CJOverhaulLogResult.getCode());
- //设置所有数据上报成功
- if (CJOverhaulLogResult.getCode().equals(CJReportEnum.SUCCESS.getCode()) || CJOverhaulLogResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
- for (TbSpecialCheckTaskLog taskLog : taskLogLists) {
- HandlerSpecialCheckReportParam handlerCJReportParam = new HandlerSpecialCheckReportParam();
- //封装数据
- handlerCJReportParam.setId(taskLog.getId());
- handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
- handlerCJReportParam.setReportTime(nowDate);
- taskSpecialLogMapper.updateCheckTaskReportStatusById(handlerCJReportParam);
- }
- }
- //设置上报失败的数据，上报失败
- if (CJOverhaulLogResult.getCode().equals(CJReportEnum.FAIL.getCode()) || CJOverhaulLogResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
- for (String failId : errorIdList) {
- //上报失败
- HandlerSpecialCheckReportParam handlerCJReportParam = new HandlerSpecialCheckReportParam();
- //封装数据
- handlerCJReportParam.setId(failId);
- handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());
- handlerCJReportParam.setReportTime(nowDate);
- taskSpecialLogMapper.updateCheckTaskReportStatusById(handlerCJReportParam);
- }
- }
-
-
-
-// logger.info("【1】安全风险分析单元-数据处理完成");
- System.out.println("【任务】-数据处理完成");
- }else {
-// logger.info("【1】风险分析单元-无数据上报昌吉州");
- System.out.println("【任务】-无数据上报昌吉州");
- }
-
-
-
- }
-}
+package com.ruoyi.project.tr.specialCheck.Test;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.common.utils.BeanCopyUtils;
+import com.ruoyi.doublePrevention.entity.CJReport.CJdto.CJReportResultData;
+import com.ruoyi.doublePrevention.entity.CJReport.CJdto.Data;
+import com.ruoyi.doublePrevention.entity.CJReport.CJdto.ErrorMsgDetails;
+import com.ruoyi.doublePrevention.entity.CJReport.CJdto.HandlerDO.*;
+import com.ruoyi.doublePrevention.entity.CJReport.*;
+import com.ruoyi.doublePrevention.entity.PreventReportConfig;
+import com.ruoyi.doublePrevention.enums.CJReportEnum;
+import com.ruoyi.doublePrevention.enums.SyncEnum;
+import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
+import com.ruoyi.doublePrevention.service.baseService.*;
+import com.ruoyi.project.tr.report.service.ReportService;
+import com.ruoyi.project.tr.riskList.service.IRiskListService;
+import com.ruoyi.project.tr.specialCheck.domin.BO.HandlerSpecialCheckReportParam;
+import com.ruoyi.project.tr.specialCheck.domin.DTO.SpecialCheckTaskLogReportDTO;
+import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckTaskLog;
+import com.ruoyi.project.tr.specialCheck.mapper.*;
+import org.apache.commons.lang3.ObjectUtils;
+import org.bouncycastle.crypto.engines.AESFastEngine;
+import org.bouncycastle.crypto.modes.GCMBlockCipher;
+import org.bouncycastle.crypto.params.AEADParameters;
+import org.bouncycastle.crypto.params.KeyParameter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+
+@Component
+public class TaskReportScheduleTest {
+
+ private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+ @Autowired
+ private TbBaseCheckCompanyMapper companyTbRepository;
+ @Autowired
+ private TbBaseCheckItemMapper itemTbRepository;
+ @Autowired
+ private TbBaseCheckScoreMapper scoreTbRepository;
+ @Autowired
+ private TbBaseCheckTaskMapper taskTbRepository;
+ @Autowired
+ private TbSpecialCheckTaskLogMapper taskSpecialLogMapper;
+ @Autowired
+ private IRiskListService riskListService;
+
+ String token = "GT6gGJV7JV";
+ String key = "Bv+NeBolwqg2Pbc1yVwrZA==";
+ String iv = "4QC9V8eAiB7tdlgBkMsTAw==";
+
+ public static final int MAC_BIT_SIZE = 128;
+
+ public static String encrypt(String plainText, byte[] key, byte[] iv) {
+ String sr;
+ try {
+ byte[] plainBytes = plainText.getBytes(StandardCharsets.UTF_8);
+ GCMBlockCipher cipher = new GCMBlockCipher(new
+ AESFastEngine());
+ AEADParameters parameters =
+ new AEADParameters(new KeyParameter(key),
+ MAC_BIT_SIZE, iv, null);
+ cipher.init(true, parameters);
+ byte[] encryptedBytes = new
+ byte[cipher.getOutputSize(plainBytes.length)];
+ int retLen = cipher.processBytes(plainBytes, 0, plainBytes.length,
+ encryptedBytes, 0);
+ cipher.doFinal(encryptedBytes, retLen);
+ sr = Base64.getEncoder().encodeToString(encryptedBytes);
+ } catch (Exception ex) {
+ throw new RuntimeException(ex.getMessage());
+ }
+ return sr;
+ }
+
+
+ @Transactional
+// @Scheduled(cron = "0 0 23 * * ?") //每天晚上23点执行一次0 0 22,23 * * ?
+// @Scheduled(cron = "0 0 22,23 * * ?") //每天晚上22、23点执行一次
+// @Scheduled(cron = "0 0/1 * * * ? ") // 分钟
+// @Scheduled(cron = "0 0/35 * * * ? ") // 分钟
+// @Scheduled(cron = "0/5 * * * * ?")
+ public void execReportDateSchedule() throws UnsupportedEncodingException {
+ logger.info("【####】上报数据开始...");
+
+ HttpURLConnection con = null;
+ BufferedReader buffer = null;
+ int responseCode = 200;
+
+// SimpleDateFormat dateFormatCheckData= new SimpleDateFormat("yyyy-MM-dd");
+// SimpleDateFormat dateFormat= new SimpleDateFormat("yyyy-MM-dd HH:MM:ss");
+ DateTimeFormatter dateFormatCheckData = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ DateTimeFormatter dateFormat = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:MM:ss");
+
+ Date date = new Date();
+ //格式化时间，作为token的时间戳
+ SimpleDateFormat tokenDate= new SimpleDateFormat("yyyyMMddHHmmssSSS");
+ String formatDate = tokenDate.format(date);
+
+ logger.info("【token时间】" + formatDate);
+
+ /**
+ * 1、任务上报
+ * */
+ System.out.println("【1】任务上报-处理数据...");
+// List<TbSpecialCheckTaskLog> CJRiskAnaUnits = .listReportUnitDate();
+ List<TbSpecialCheckTaskLog> taskLogLists = taskSpecialLogMapper.listTestReportTask();
+ if (ObjectUtils.isNotEmpty(taskLogLists)){
+ //封装上报数据,时间格式化
+ List<SpecialCheckTaskLogReportDTO> list = new ArrayList<>();
+
+ for (TbSpecialCheckTaskLog taskLog : taskLogLists) {
+ SpecialCheckTaskLogReportDTO specialTaskLogReportDTO = BeanCopyUtils.copyBean(taskLog, SpecialCheckTaskLogReportDTO.class);
+ specialTaskLogReportDTO.setCreateDate(dateFormat.format(taskLog.getCreateDate()));
+ specialTaskLogReportDTO.setUpdateDate(dateFormat.format(taskLog.getUpdateDate()));
+ specialTaskLogReportDTO.setCheckDate(dateFormatCheckData.format(taskLog.getCheckDate()));
+ list.add(specialTaskLogReportDTO);
+ }
+// logger.info("【【原始数据】】" + JSONObject.toJSONString(list));
+ System.out.println("【【原始数据】】" + JSONObject.toJSONString(list));
+ String AESReportUnitDate = encrypt(JSONObject.toJSONString(list), key.getBytes(), iv.getBytes());
+// logger.info("【【AES加密结果】】"+ AESReportUnitDate);{0JRK`$6X.jpg)min/Desktop/所有桌面文件存放/9}AM56M10$6WX){0JRK`$6X.jpg)
+ StringBuffer checkTaskResultBuffer = null;
+
+
+ //上报数据
+ try {
+ URL url = new URL("http://120.71.182.198:9999/v1/data/receive/receiveCheckRecordList");
+ //得到连接对象
+ con = (HttpURLConnection) url.openConnection();
+ //设置请求类型
+ con.setRequestMethod("POST");
+ //允许写出
+ con.setDoOutput(true);
+ //允许读入
+ con.setDoInput(true);
+ //不使用缓存
+ con.setUseCaches(false);
+ con.setInstanceFollowRedirects(true);
+ //设置请求头
+ con.setRequestProperty("X-Access-Token",token+formatDate.toString());
+ //设置Content-Type，此处根据实际情况确定
+ con.setRequestProperty("Content-Type", "application/json;charset=utf8");
+
+ OutputStream os = con.getOutputStream();
+ Map paraMap = new HashMap();
+ paraMap.put("data", AESReportUnitDate); /**封装数据*/
+ System.out.println("【【加密请求体】】" + JSONArray.toJSON(paraMap).toString());
+ //组装入参，设置请求体
+ os.write(JSON.toJSONString(paraMap).getBytes());
+
+ //本段日志，测试成功后，可注释掉
+ if (responseCode == HttpURLConnection.HTTP_OK) {
+ //得到响应流
+ InputStream inputStream = con.getInputStream();
+ //将响应流转换成字符串
+ checkTaskResultBuffer = new StringBuffer();
+ String line;
+ buffer = new BufferedReader(new InputStreamReader(inputStream, "UTF-8"));
+ while ((line = buffer.readLine()) != null) {
+ checkTaskResultBuffer.append(line);
+ }
+// logger.info("result:" + unitResultBuffer.toString());
+ System.out.println("result:" + checkTaskResultBuffer.toString());
+ }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+
+ //接收返回值，保存返回值
+ CJReportResultData CJOverhaulLogResult = JSONObject.parseObject(checkTaskResultBuffer.toString(), CJReportResultData.class);
+ //接收返回值，保存返回值
+ List<String> errorIdList= new ArrayList<>();
+ Data data = JSONObject.parseObject(CJOverhaulLogResult.getData(), Data.class);
+ //保存失败结果
+ if (ObjectUtils.isNotEmpty(data)){
+ for (ErrorMsgDetails errorMsgDetail : data.getErrorMsgDetails()) {
+ errorIdList.add(errorMsgDetail.getId());
+ }
+ }
+ LocalDateTime nowDate = LocalDateTime.now();
+ logger.info("【任务】数据上报结果：" + CJOverhaulLogResult.getCode());
+ //设置所有数据上报成功
+ if (CJOverhaulLogResult.getCode().equals(CJReportEnum.SUCCESS.getCode()) || CJOverhaulLogResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
+ for (TbSpecialCheckTaskLog taskLog : taskLogLists) {
+ HandlerSpecialCheckReportParam handlerCJReportParam = new HandlerSpecialCheckReportParam();
+ //封装数据
+ handlerCJReportParam.setId(taskLog.getId());
+ handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_SUCCESS.getCode());
+ handlerCJReportParam.setReportTime(nowDate);
+ taskSpecialLogMapper.updateCheckTaskReportStatusById(handlerCJReportParam);
+ }
+ }
+ //设置上报失败的数据，上报失败
+ if (CJOverhaulLogResult.getCode().equals(CJReportEnum.FAIL.getCode()) || CJOverhaulLogResult.getCode().equals(CJReportEnum.SUCESS_AND_FAIL.getCode())){
+ for (String failId : errorIdList) {
+ //上报失败
+ HandlerSpecialCheckReportParam handlerCJReportParam = new HandlerSpecialCheckReportParam();
+ //封装数据
+ handlerCJReportParam.setId(failId);
+ handlerCJReportParam.setReportStatus(SyncEnum.SYNC_EXEC_FAIL.getCode());
+ handlerCJReportParam.setReportTime(nowDate);
+ taskSpecialLogMapper.updateCheckTaskReportStatusById(handlerCJReportParam);
+ }
+ }
+
+
+
+// logger.info("【1】安全风险分析单元-数据处理完成");
+ System.out.println("【任务】-数据处理完成");
+ }else {
+// logger.info("【1】风险分析单元-无数据上报昌吉州");
+ System.out.println("【任务】-无数据上报昌吉州");
+ }
+
+
+
+ }
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/HandlerSpecialCheckReportParam.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/HandlerSpecialCheckReportParam.java
index fd94dfd..73452d1 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/HandlerSpecialCheckReportParam.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/HandlerSpecialCheckReportParam.java
@@ -1,23 +1,23 @@
-package com.ruoyi.project.tr.specialCheck.domin.BO;
-
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class HandlerSpecialCheckReportParam {
-
- /**
- * 主键
- */
- private String id;
- /**
- * 上报状态 1-待上报；2-已上报；3-不上报；4-变更需上传
- */
- private Byte reportStatus;
- /**
- * 上报时间
- */
- private LocalDateTime reportTime;
-
-}
+package com.ruoyi.project.tr.specialCheck.domin.BO;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class HandlerSpecialCheckReportParam {
+
+ /**
+ * 主键
+ */
+ private String id;
+ /**
+ * 上报状态 1-待上报；2-已上报；3-不上报；4-变更需上传
+ */
+ private Byte reportStatus;
+ /**
+ * 上报时间
+ */
+ private LocalDateTime reportTime;
+
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbBaseCheckItemBO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbBaseCheckItemBO.java
index ae90c13..7cbcd45 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbBaseCheckItemBO.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbBaseCheckItemBO.java
@@ -1,31 +1,31 @@
-package com.ruoyi.project.tr.specialCheck.domin.BO;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class TbBaseCheckItemBO {
-
- private Integer pageNum;
-
- private Integer pageSize;
-
-
- private String checkName;
-
- private String checkContent;
-
- private String checkWay;
-
- private String checkBasis;
-
- private String applicablePlace;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createDate;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime updateDate;
-}
+package com.ruoyi.project.tr.specialCheck.domin.BO;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class TbBaseCheckItemBO {
+
+ private Integer pageNum;
+
+ private Integer pageSize;
+
+
+ private String checkName;
+
+ private String checkContent;
+
+ private String checkWay;
+
+ private String checkBasis;
+
+ private String applicablePlace;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createDate;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateDate;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbBaseCheckScoreBO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbBaseCheckScoreBO.java
index 6d5cb70..60eeebb 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbBaseCheckScoreBO.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbBaseCheckScoreBO.java
@@ -1,35 +1,35 @@
-package com.ruoyi.project.tr.specialCheck.domin.BO;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class TbBaseCheckScoreBO {
-
- private Integer pageNum;
-
- private Integer pageSize;
-
- private String id;
-
- private String checkItemId;
-
- private String isReject;
-
- private String deductPoint;
-
- private String deductIllustrate;
-
-
- private String createBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createDate;
-
- private String updateBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime updateDate;
-}
+package com.ruoyi.project.tr.specialCheck.domin.BO;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class TbBaseCheckScoreBO {
+
+ private Integer pageNum;
+
+ private Integer pageSize;
+
+ private String id;
+
+ private String checkItemId;
+
+ private String isReject;
+
+ private String deductPoint;
+
+ private String deductIllustrate;
+
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createDate;
+
+ private String updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateDate;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbBaseCheckTaskBO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbBaseCheckTaskBO.java
index 66fe487..623532e 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbBaseCheckTaskBO.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbBaseCheckTaskBO.java
@@ -1,37 +1,37 @@
-package com.ruoyi.project.tr.specialCheck.domin.BO;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class TbBaseCheckTaskBO {
-
- private Integer pageNum;
-
- private Integer pageSize;
-
- private String taskName;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime taskStartTime;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime taskEndTime;
-
- private String taskTypeName;
-
- private String taskContent;
-
- private String createBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createDate;
-
- private String updateBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime updateDate;
-
-}
+package com.ruoyi.project.tr.specialCheck.domin.BO;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class TbBaseCheckTaskBO {
+
+ private Integer pageNum;
+
+ private Integer pageSize;
+
+ private String taskName;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime taskStartTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime taskEndTime;
+
+ private String taskTypeName;
+
+ private String taskContent;
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createDate;
+
+ private String updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateDate;
+
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckItemDangerLogBO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckItemDangerLogBO.java
index 683d0f0..e5644ec 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckItemDangerLogBO.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckItemDangerLogBO.java
@@ -1,70 +1,70 @@
-package com.ruoyi.project.tr.specialCheck.domin.BO;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Data
-public class TbSpecialCheckItemDangerLogBO {
-
- private Integer pageNum;
-
- private Integer pageSize;
-
- private Long indexId;
-
- private String id;
-
- private String companyCode;
-
- private String dangerId;
-
- private String taskId;
-
- private String checkType;
-
- private String checkItemId;
-
- private String checkScoreId;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime checkDate;
-
- private String checkPay;
-
- private String harmType;
-
- private String checkName;
-
- private String checkContent;
-
- private String checkWay;
-
- private String checkBasis;
-
- private String applicablePlace;
-
- private String isReject;
-
- private String deductPoint;
-
- private String deductIllustrate;
-
-
- private String createBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createDate;
-
- private String updateBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime updateDate;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime reportTime;
-
- private Byte reportStatus;
-}
+package com.ruoyi.project.tr.specialCheck.domin.BO;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+public class TbSpecialCheckItemDangerLogBO {
+
+ private Integer pageNum;
+
+ private Integer pageSize;
+
+ private Long indexId;
+
+ private String id;
+
+ private String companyCode;
+
+ private String dangerId;
+
+ private String taskId;
+
+ private String checkType;
+
+ private String checkItemId;
+
+ private String checkScoreId;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime checkDate;
+
+ private String checkPay;
+
+ private String harmType;
+
+ private String checkName;
+
+ private String checkContent;
+
+ private String checkWay;
+
+ private String checkBasis;
+
+ private String applicablePlace;
+
+ private String isReject;
+
+ private String deductPoint;
+
+ private String deductIllustrate;
+
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createDate;
+
+ private String updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateDate;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime reportTime;
+
+ private Byte reportStatus;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckItemDangerLogUpdateBO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckItemDangerLogUpdateBO.java
index 134ad31..84a84dd 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckItemDangerLogUpdateBO.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckItemDangerLogUpdateBO.java
@@ -1,76 +1,76 @@
-package com.ruoyi.project.tr.specialCheck.domin.BO;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Data
-public class TbSpecialCheckItemDangerLogUpdateBO {
-
-
- private Long indexId;
-
- private String id;
-
- private String companyCode;
-
-
-
- private String dangerId;
- private String dangerName;
-
- private String taskId;
-
- private String checkType;
-
- private String checkItemId;
-
- private String checkScoreId;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime checkDate;
-
- private String checkPay;
-
- private String harmType;
-
- private String checkName;
-
- private String checkContent;
-
- private String checkWay;
-
- private String checkBasis;
-
- private String applicablePlace;
-
- private String isReject;
-
- private String deductPoint;
-
- private String deductIllustrate;
-
-
-
- private Byte deleted;
-
- private String createBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createDate;
-
- private String updateBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime updateDate;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime reportTime;
-
- private Byte reportStatus;
-}
+package com.ruoyi.project.tr.specialCheck.domin.BO;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+public class TbSpecialCheckItemDangerLogUpdateBO {
+
+
+ private Long indexId;
+
+ private String id;
+
+ private String companyCode;
+
+
+
+ private String dangerId;
+ private String dangerName;
+
+ private String taskId;
+
+ private String checkType;
+
+ private String checkItemId;
+
+ private String checkScoreId;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime checkDate;
+
+ private String checkPay;
+
+ private String harmType;
+
+ private String checkName;
+
+ private String checkContent;
+
+ private String checkWay;
+
+ private String checkBasis;
+
+ private String applicablePlace;
+
+ private String isReject;
+
+ private String deductPoint;
+
+ private String deductIllustrate;
+
+
+
+ private Byte deleted;
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createDate;
+
+ private String updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateDate;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime reportTime;
+
+ private Byte reportStatus;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckItemLogEditBO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckItemLogEditBO.java
index cde35de..40513c1 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckItemLogEditBO.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckItemLogEditBO.java
@@ -1,55 +1,55 @@
-package com.ruoyi.project.tr.specialCheck.domin.BO;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-
-@Data
-public class TbSpecialCheckItemLogEditBO {
-
-
- private Long indexId;
-
- private String id;
-
- private String companyCode;
-
-
-
- private String taskId;
-
- private String checkItemId;
-
- private String checkName;
-
- private String checkContent;
-
- private String checkWay;
-
- private String checkBasis;
-
- private String applicablePlace;
-
-
- private Byte deleted;
-
- private String createBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date createDate;
-
- private String updateBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date updateDate;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date reportTime;
-
- private Byte reportStatus;
-}
+package com.ruoyi.project.tr.specialCheck.domin.BO;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@Data
+public class TbSpecialCheckItemLogEditBO {
+
+
+ private Long indexId;
+
+ private String id;
+
+ private String companyCode;
+
+
+
+ private String taskId;
+
+ private String checkItemId;
+
+ private String checkName;
+
+ private String checkContent;
+
+ private String checkWay;
+
+ private String checkBasis;
+
+ private String applicablePlace;
+
+
+ private Byte deleted;
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createDate;
+
+ private String updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateDate;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date reportTime;
+
+ private Byte reportStatus;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckScoreAndDangerLogEditBO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckScoreAndDangerLogEditBO.java
index 42507b6..0f9d3b5 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckScoreAndDangerLogEditBO.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckScoreAndDangerLogEditBO.java
@@ -1,60 +1,60 @@
-package com.ruoyi.project.tr.specialCheck.domin.BO;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class TbSpecialCheckScoreAndDangerLogEditBO {
-
-
- private Long indexId;
-
- private String id;
-
- private String companyCode;
-
-
-
- private String dangerId;
-
- private String dangerName;
-
- private String taskId;
-
- private String checkType;
-
- private String checkItemId;
-
- private String checkScoreId;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date checkDate;
-
- private String checkPay;
-
- private String harmType;
-
- private String isReject;
-
- private String deductPoint;
-
- private String deductIllustrate;
- private Byte deleted;
-
- private String createBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date createDate;
-
- private String updateBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date updateDate;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date reportTime;
-
- private Byte reportStatus;
-}
+package com.ruoyi.project.tr.specialCheck.domin.BO;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class TbSpecialCheckScoreAndDangerLogEditBO {
+
+
+ private Long indexId;
+
+ private String id;
+
+ private String companyCode;
+
+
+
+ private String dangerId;
+
+ private String dangerName;
+
+ private String taskId;
+
+ private String checkType;
+
+ private String checkItemId;
+
+ private String checkScoreId;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date checkDate;
+
+ private String checkPay;
+
+ private String harmType;
+
+ private String isReject;
+
+ private String deductPoint;
+
+ private String deductIllustrate;
+ private Byte deleted;
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createDate;
+
+ private String updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateDate;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date reportTime;
+
+ private Byte reportStatus;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckScoreAndDangerLogQueryBO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckScoreAndDangerLogQueryBO.java
index 19de40a..26e5377 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckScoreAndDangerLogQueryBO.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckScoreAndDangerLogQueryBO.java
@@ -1,62 +1,62 @@
-package com.ruoyi.project.tr.specialCheck.domin.BO;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class TbSpecialCheckScoreAndDangerLogQueryBO {
-
- private Integer pageNum;
-
- private Integer pageSize;
-
- private Long indexId;
-
- private String id;
-
- private String companyCode;
-
-
-
- private String dangerId;
-
- private String dangerName;
-
- private String taskId;
-
- private String checkType;
-
- private String checkItemId;
-
- private String checkScoreId;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime checkDate;
-
- private String checkPay;
-
- private String harmType;
-
- private String isReject;
-
- private String deductPoint;
-
- private String deductIllustrate;
-
- private String createBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createDate;
-
- private String updateBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime updateDate;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime reportTime;
-
- private Byte reportStatus;
-}
+package com.ruoyi.project.tr.specialCheck.domin.BO;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class TbSpecialCheckScoreAndDangerLogQueryBO {
+
+ private Integer pageNum;
+
+ private Integer pageSize;
+
+ private Long indexId;
+
+ private String id;
+
+ private String companyCode;
+
+
+
+ private String dangerId;
+
+ private String dangerName;
+
+ private String taskId;
+
+ private String checkType;
+
+ private String checkItemId;
+
+ private String checkScoreId;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime checkDate;
+
+ private String checkPay;
+
+ private String harmType;
+
+ private String isReject;
+
+ private String deductPoint;
+
+ private String deductIllustrate;
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createDate;
+
+ private String updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateDate;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime reportTime;
+
+ private Byte reportStatus;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckTaskLogBO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckTaskLogBO.java
index e14c52a..884981b 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckTaskLogBO.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckTaskLogBO.java
@@ -1,49 +1,49 @@
-package com.ruoyi.project.tr.specialCheck.domin.BO;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class TbSpecialCheckTaskLogBO {
-
- private Integer pageNum;
-
- private Integer pageSize;
-
- private Long indexId;
-
- private String id;
-
- private String companyCode;
-
- private String hazardCode;
-
- private String hazardSource;
-
- private String taskId;
-
- private String checkType;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime checkDate;
-
- private String resultStatus;
-
-
- private String createBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createDate;
-
- private String updateBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime updateDate;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime reportTime;
-
- private Byte reportStatus;
-}
+package com.ruoyi.project.tr.specialCheck.domin.BO;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class TbSpecialCheckTaskLogBO {
+
+ private Integer pageNum;
+
+ private Integer pageSize;
+
+ private Long indexId;
+
+ private String id;
+
+ private String companyCode;
+
+ private String hazardCode;
+
+ private String hazardSource;
+
+ private String taskId;
+
+ private String checkType;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime checkDate;
+
+ private String resultStatus;
+
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createDate;
+
+ private String updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateDate;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime reportTime;
+
+ private Byte reportStatus;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckTaskLogEditBO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckTaskLogEditBO.java
index 83ef1d9..18191c3 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckTaskLogEditBO.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckTaskLogEditBO.java
@@ -1,51 +1,51 @@
-package com.ruoyi.project.tr.specialCheck.domin.BO;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-
-@Data
-public class TbSpecialCheckTaskLogEditBO {
-
-
- private Long indexId;
-
- private String id;
-
- private String companyCode;
-
- private String hazardCode;
-
- private String hazardSource;
-
- private String taskId;
-
- private String checkType;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date checkDate;
-
- private String resultStatus;
-
- private Byte deleted;
-
- private String createBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date createDate;
-
- private String updateBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date updateDate;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date reportTime;
-
- private Byte reportStatus;
-}
+package com.ruoyi.project.tr.specialCheck.domin.BO;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@Data
+public class TbSpecialCheckTaskLogEditBO {
+
+
+ private Long indexId;
+
+ private String id;
+
+ private String companyCode;
+
+ private String hazardCode;
+
+ private String hazardSource;
+
+ private String taskId;
+
+ private String checkType;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date checkDate;
+
+ private String resultStatus;
+
+ private Byte deleted;
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createDate;
+
+ private String updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateDate;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date reportTime;
+
+ private Byte reportStatus;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckTaskLogUpdateBO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckTaskLogUpdateBO.java
index 493d9bc..40247c4 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckTaskLogUpdateBO.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/BO/TbSpecialCheckTaskLogUpdateBO.java
@@ -1,44 +1,44 @@
-package com.ruoyi.project.tr.specialCheck.domin.BO;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class TbSpecialCheckTaskLogUpdateBO {
-
- private Long indexId;
-
- private String id;
-
- private String companyCode;
-
- private String hazardCode;
-
- private String hazardSource;
-
- private String taskId;
-
- private String checkType;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime checkDate;
-
- private String resultStatus;
-
- private String createBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createDate;
-
- private String updateBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime updateDate;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime reportTime;
-
- private Byte reportStatus;
-}
+package com.ruoyi.project.tr.specialCheck.domin.BO;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class TbSpecialCheckTaskLogUpdateBO {
+
+ private Long indexId;
+
+ private String id;
+
+ private String companyCode;
+
+ private String hazardCode;
+
+ private String hazardSource;
+
+ private String taskId;
+
+ private String checkType;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime checkDate;
+
+ private String resultStatus;
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createDate;
+
+ private String updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateDate;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime reportTime;
+
+ private Byte reportStatus;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/SpecialCheckItemDangerLogReportDTO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/SpecialCheckItemDangerLogReportDTO.java
index 68ab2ee..10e6fa5 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/SpecialCheckItemDangerLogReportDTO.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/SpecialCheckItemDangerLogReportDTO.java
@@ -1,46 +1,46 @@
-package com.ruoyi.project.tr.specialCheck.domin.DTO;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Data
-public class SpecialCheckItemDangerLogReportDTO {
-
-
- private String id;
-
- private String companyCode;
-
- private String dangerId;
-
- private String taskId;
-
- private String checkType;
-
- private String checkItemId;
-
- private String checkScoreId;
-
- private String checkDate;
-
- private String checkPay;
-
- private String harmType;
-
- private String deleted;
-
- private String createBy;
-
- private String createDate;
-
- private String updateBy;
-
- private String updateDate;
-
-}
+package com.ruoyi.project.tr.specialCheck.domin.DTO;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+public class SpecialCheckItemDangerLogReportDTO {
+
+
+ private String id;
+
+ private String companyCode;
+
+ private String dangerId;
+
+ private String taskId;
+
+ private String checkType;
+
+ private String checkItemId;
+
+ private String checkScoreId;
+
+ private String checkDate;
+
+ private String checkPay;
+
+ private String harmType;
+
+ private String deleted;
+
+ private String createBy;
+
+ private String createDate;
+
+ private String updateBy;
+
+ private String updateDate;
+
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/SpecialCheckTaskLogReportDTO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/SpecialCheckTaskLogReportDTO.java
index 2d17bb6..5a5b56b 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/SpecialCheckTaskLogReportDTO.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/SpecialCheckTaskLogReportDTO.java
@@ -1,32 +1,32 @@
-package com.ruoyi.project.tr.specialCheck.domin.DTO;
-
-import lombok.Data;
-
-
-@Data
-public class SpecialCheckTaskLogReportDTO {
-
-
- private String id;
-
- private String companyCode;
-
- private String hazardCode;
-
- private String taskId;
-
- private String checkType;
-
- private String checkDate;
-
- private String resultStatus;
-
- private String createBy;
-
- private String createDate;
-
- private String updateBy;
-
- private String updateDate;
-
-}
+package com.ruoyi.project.tr.specialCheck.domin.DTO;
+
+import lombok.Data;
+
+
+@Data
+public class SpecialCheckTaskLogReportDTO {
+
+
+ private String id;
+
+ private String companyCode;
+
+ private String hazardCode;
+
+ private String taskId;
+
+ private String checkType;
+
+ private String checkDate;
+
+ private String resultStatus;
+
+ private String createBy;
+
+ private String createDate;
+
+ private String updateBy;
+
+ private String updateDate;
+
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbBaseCheckItemDTO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbBaseCheckItemDTO.java
index 297e9ae..9299585 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbBaseCheckItemDTO.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbBaseCheckItemDTO.java
@@ -1,36 +1,36 @@
-package com.ruoyi.project.tr.specialCheck.domin.DTO;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class TbBaseCheckItemDTO {
-
- private String id;
-
- private String taskId;
-
- private String checkName;
-
- private String checkContent;
-
- private String checkWay;
-
- private String checkBasis;
-
- private String applicablePlace;
-
- private Byte deleted;
-
- private String createBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createDate;
-
- private String updateBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime updateDate;
-}
+package com.ruoyi.project.tr.specialCheck.domin.DTO;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class TbBaseCheckItemDTO {
+
+ private String id;
+
+ private String taskId;
+
+ private String checkName;
+
+ private String checkContent;
+
+ private String checkWay;
+
+ private String checkBasis;
+
+ private String applicablePlace;
+
+ private Byte deleted;
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createDate;
+
+ private String updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateDate;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbBaseCheckScoreDTO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbBaseCheckScoreDTO.java
index b22153e..66abbac 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbBaseCheckScoreDTO.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbBaseCheckScoreDTO.java
@@ -1,32 +1,32 @@
-package com.ruoyi.project.tr.specialCheck.domin.DTO;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class TbBaseCheckScoreDTO {
-
- private String id;
-
- private String checkItemId;
-
- private String isReject;
-
- private String deductPoint;
-
- private String deductIllustrate;
-
- private Byte deleted;
-
- private String createBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createDate;
-
- private String updateBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime updateDate;
-}
+package com.ruoyi.project.tr.specialCheck.domin.DTO;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class TbBaseCheckScoreDTO {
+
+ private String id;
+
+ private String checkItemId;
+
+ private String isReject;
+
+ private String deductPoint;
+
+ private String deductIllustrate;
+
+ private Byte deleted;
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createDate;
+
+ private String updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateDate;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbBaseCheckTaskDTO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbBaseCheckTaskDTO.java
index 6cfdc32..b11bd79 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbBaseCheckTaskDTO.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbBaseCheckTaskDTO.java
@@ -1,39 +1,39 @@
-package com.ruoyi.project.tr.specialCheck.domin.DTO;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class TbBaseCheckTaskDTO {
-
- private Integer pageNum;
-
- private Integer pageSize;
-
- private String id;
-
- private String taskName;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime taskStartTime;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime taskEndTime;
-
- private String taskTypeName;
-
- private String taskContent;
-
- private Byte deleted;
-
- private String createBy;
-
- private LocalDateTime createDate;
-
- private String updateBy;
-
- private LocalDateTime updateDate;
-
-}
+package com.ruoyi.project.tr.specialCheck.domin.DTO;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class TbBaseCheckTaskDTO {
+
+ private Integer pageNum;
+
+ private Integer pageSize;
+
+ private String id;
+
+ private String taskName;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime taskStartTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime taskEndTime;
+
+ private String taskTypeName;
+
+ private String taskContent;
+
+ private Byte deleted;
+
+ private String createBy;
+
+ private LocalDateTime createDate;
+
+ private String updateBy;
+
+ private LocalDateTime updateDate;
+
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckItemDangerLogDTO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckItemDangerLogDTO.java
index 36f735b..91aa22f 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckItemDangerLogDTO.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckItemDangerLogDTO.java
@@ -1,77 +1,77 @@
-package com.ruoyi.project.tr.specialCheck.domin.DTO;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Data
-public class TbSpecialCheckItemDangerLogDTO {
-
-
- private Long indexId;
-
- private String id;
-
- private String companyCode;
-
-
-
- private String dangerId;
-
- private String dangerName;
-
- private String taskId;
-
- private String checkType;
-
- private String checkItemId;
-
- private String checkScoreId;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime checkDate;
-
- private String checkPay;
-
- private String harmType;
-
- private String checkName;
-
- private String checkContent;
-
- private String checkWay;
-
- private String checkBasis;
-
- private String applicablePlace;
-
- private String isReject;
-
- private String deductPoint;
-
- private String deductIllustrate;
-
-
-
- private Byte deleted;
-
- private String createBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createDate;
-
- private String updateBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime updateDate;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime reportTime;
-
- private Byte reportStatus;
-}
+package com.ruoyi.project.tr.specialCheck.domin.DTO;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+public class TbSpecialCheckItemDangerLogDTO {
+
+
+ private Long indexId;
+
+ private String id;
+
+ private String companyCode;
+
+
+
+ private String dangerId;
+
+ private String dangerName;
+
+ private String taskId;
+
+ private String checkType;
+
+ private String checkItemId;
+
+ private String checkScoreId;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime checkDate;
+
+ private String checkPay;
+
+ private String harmType;
+
+ private String checkName;
+
+ private String checkContent;
+
+ private String checkWay;
+
+ private String checkBasis;
+
+ private String applicablePlace;
+
+ private String isReject;
+
+ private String deductPoint;
+
+ private String deductIllustrate;
+
+
+
+ private Byte deleted;
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createDate;
+
+ private String updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateDate;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime reportTime;
+
+ private Byte reportStatus;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckItemLogDTO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckItemLogDTO.java
index d1489ff..0f1eed1 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckItemLogDTO.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckItemLogDTO.java
@@ -1,55 +1,55 @@
-package com.ruoyi.project.tr.specialCheck.domin.DTO;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-
-@Data
-public class TbSpecialCheckItemLogDTO {
-
-
- private Long indexId;
-
- private String id;
-
- private String companyCode;
-
-
-
- private String taskId;
-
- private String checkItemId;
-
- private String checkName;
-
- private String checkContent;
-
- private String checkWay;
-
- private String checkBasis;
-
- private String applicablePlace;
-
-
- private Byte deleted;
-
- private String createBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date createDate;
-
- private String updateBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date updateDate;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date reportTime;
-
- private Byte reportStatus;
-}
+package com.ruoyi.project.tr.specialCheck.domin.DTO;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@Data
+public class TbSpecialCheckItemLogDTO {
+
+
+ private Long indexId;
+
+ private String id;
+
+ private String companyCode;
+
+
+
+ private String taskId;
+
+ private String checkItemId;
+
+ private String checkName;
+
+ private String checkContent;
+
+ private String checkWay;
+
+ private String checkBasis;
+
+ private String applicablePlace;
+
+
+ private Byte deleted;
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createDate;
+
+ private String updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateDate;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date reportTime;
+
+ private Byte reportStatus;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckItemLogQueryDTO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckItemLogQueryDTO.java
index 125e38d..606f7d9 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckItemLogQueryDTO.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckItemLogQueryDTO.java
@@ -1,51 +1,51 @@
-package com.ruoyi.project.tr.specialCheck.domin.DTO;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class TbSpecialCheckItemLogQueryDTO {
-
- private Long indexId;
-
- private String id;
-
- private String companyCode;
-
-
-
- private String taskId;
-
- private String checkItemId;
-
- private String checkName;
-
- private String checkContent;
-
- private String checkWay;
-
- private String checkBasis;
-
- private String applicablePlace;
-
-
- private String createBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createDate;
-
- private String updateBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime updateDate;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime reportTime;
-
- private Byte reportStatus;
-}
+package com.ruoyi.project.tr.specialCheck.domin.DTO;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class TbSpecialCheckItemLogQueryDTO {
+
+ private Long indexId;
+
+ private String id;
+
+ private String companyCode;
+
+
+
+ private String taskId;
+
+ private String checkItemId;
+
+ private String checkName;
+
+ private String checkContent;
+
+ private String checkWay;
+
+ private String checkBasis;
+
+ private String applicablePlace;
+
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createDate;
+
+ private String updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateDate;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime reportTime;
+
+ private Byte reportStatus;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckScoreAndDangerLogDTO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckScoreAndDangerLogDTO.java
index b7f5915..d4c01c6 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckScoreAndDangerLogDTO.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckScoreAndDangerLogDTO.java
@@ -1,67 +1,67 @@
-package com.ruoyi.project.tr.specialCheck.domin.DTO;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-
-@Data
-public class TbSpecialCheckScoreAndDangerLogDTO {
-
-
- private Long indexId;
-
- private String id;
-
- private String companyCode;
-
-
-
- private String dangerId;
-
- private String dangerName;
-
- private String taskId;
-
- private String checkType;
-
- private String checkItemId;
-
- private String checkScoreId;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date checkDate;
-
- private String checkPay;
-
- private String harmType;
-
- private String isReject;
-
- private String deductPoint;
-
- private String deductIllustrate;
-
-
-
- private Byte deleted;
-
- private String createBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date createDate;
-
- private String updateBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date updateDate;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date reportTime;
-
- private Byte reportStatus;
-}
+package com.ruoyi.project.tr.specialCheck.domin.DTO;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@Data
+public class TbSpecialCheckScoreAndDangerLogDTO {
+
+
+ private Long indexId;
+
+ private String id;
+
+ private String companyCode;
+
+
+
+ private String dangerId;
+
+ private String dangerName;
+
+ private String taskId;
+
+ private String checkType;
+
+ private String checkItemId;
+
+ private String checkScoreId;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date checkDate;
+
+ private String checkPay;
+
+ private String harmType;
+
+ private String isReject;
+
+ private String deductPoint;
+
+ private String deductIllustrate;
+
+
+
+ private Byte deleted;
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date createDate;
+
+ private String updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date updateDate;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date reportTime;
+
+ private Byte reportStatus;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckScoreAndDangerLogQueryDTO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckScoreAndDangerLogQueryDTO.java
index 198d550..856a6b5 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckScoreAndDangerLogQueryDTO.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckScoreAndDangerLogQueryDTO.java
@@ -1,68 +1,68 @@
-package com.ruoyi.project.tr.specialCheck.domin.DTO;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-@TableName("tb_special_check_score_and_danger_log")
-public class TbSpecialCheckScoreAndDangerLogQueryDTO {
-
-
- @TableId(type = IdType.AUTO)
- private Long indexId;
-
- private String id;
-
- private String companyCode;
-
-
-
- private String dangerId;
-
- private String dangerName;
-
- private String taskId;
-
- private String checkType;
-
- private String checkItemId;
-
- private String checkScoreId;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime checkDate;
-
- private String checkPay;
-
- private String harmType;
-
- private String isReject;
-
- private String deductPoint;
-
- private String deductIllustrate;
-
-
-
- private Byte deleted;
-
- private String createBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createDate;
-
- private String updateBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime updateDate;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime reportTime;
-
- private Byte reportStatus;
-}
+package com.ruoyi.project.tr.specialCheck.domin.DTO;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@TableName("tb_special_check_score_and_danger_log")
+public class TbSpecialCheckScoreAndDangerLogQueryDTO {
+
+
+ @TableId(type = IdType.AUTO)
+ private Long indexId;
+
+ private String id;
+
+ private String companyCode;
+
+
+
+ private String dangerId;
+
+ private String dangerName;
+
+ private String taskId;
+
+ private String checkType;
+
+ private String checkItemId;
+
+ private String checkScoreId;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime checkDate;
+
+ private String checkPay;
+
+ private String harmType;
+
+ private String isReject;
+
+ private String deductPoint;
+
+ private String deductIllustrate;
+
+
+
+ private Byte deleted;
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createDate;
+
+ private String updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateDate;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime reportTime;
+
+ private Byte reportStatus;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckScoreAndDangerLogRespDTO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckScoreAndDangerLogRespDTO.java
index c4a5647..e146ab9 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckScoreAndDangerLogRespDTO.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckScoreAndDangerLogRespDTO.java
@@ -1,62 +1,62 @@
-package com.ruoyi.project.tr.specialCheck.domin.DTO;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class TbSpecialCheckScoreAndDangerLogRespDTO {
-
-
- private Long indexId;
-
- private String id;
-
- private String companyCode;
-
-
-
- private String dangerId;
-
- private String dangerName;
-
- private String taskId;
-
- private String checkType;
-
- private String checkItemId;
-
- private String checkScoreId;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime checkDate;
-
- private String checkPay;
-
- private String harmType;
-
- private String isReject;
-
- private String deductPoint;
-
- private String deductIllustrate;
-
- private String createBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createDate;
-
- private String updateBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime updateDate;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime reportTime;
-
- private Byte reportStatus;
-}
+package com.ruoyi.project.tr.specialCheck.domin.DTO;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class TbSpecialCheckScoreAndDangerLogRespDTO {
+
+
+ private Long indexId;
+
+ private String id;
+
+ private String companyCode;
+
+
+
+ private String dangerId;
+
+ private String dangerName;
+
+ private String taskId;
+
+ private String checkType;
+
+ private String checkItemId;
+
+ private String checkScoreId;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime checkDate;
+
+ private String checkPay;
+
+ private String harmType;
+
+ private String isReject;
+
+ private String deductPoint;
+
+ private String deductIllustrate;
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createDate;
+
+ private String updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateDate;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime reportTime;
+
+ private Byte reportStatus;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckTaskLogDTO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckTaskLogDTO.java
index 97972ce..2503046 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckTaskLogDTO.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckTaskLogDTO.java
@@ -1,48 +1,48 @@
-package com.ruoyi.project.tr.specialCheck.domin.DTO;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-public class TbSpecialCheckTaskLogDTO {
-
-
- private Long indexId;
-
- private String id;
-
- private String companyCode;
-
- private String hazardCode;
- private String hazardSource;
-
- private String taskId;
-
- private String checkType;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime checkDate;
-
- private String resultStatus;
-
- private Byte deleted;
-
- private String createBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createDate;
-
- private String updateBy;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime updateDate;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime reportTime;
-
- private Byte reportStatus;
-}
+package com.ruoyi.project.tr.specialCheck.domin.DTO;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class TbSpecialCheckTaskLogDTO {
+
+
+ private Long indexId;
+
+ private String id;
+
+ private String companyCode;
+
+ private String hazardCode;
+ private String hazardSource;
+
+ private String taskId;
+
+ private String checkType;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime checkDate;
+
+ private String resultStatus;
+
+ private Byte deleted;
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createDate;
+
+ private String updateBy;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateDate;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime reportTime;
+
+ private Byte reportStatus;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckTaskLogDateDTO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckTaskLogDateDTO.java
index 240fec2..32f2d0e 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckTaskLogDateDTO.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DTO/TbSpecialCheckTaskLogDateDTO.java
@@ -1,43 +1,43 @@
-package com.ruoyi.project.tr.specialCheck.domin.DTO;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-import java.util.Date;
-
-@Data
-public class TbSpecialCheckTaskLogDateDTO {
-
-
- private Long indexId;
-
- private String id;
-
- private String companyCode;
-
- private String hazardCode;
- private String hazardSource;
-
- private String taskId;
-
- private String checkType;
-
- private Date checkDate;
-
- private String resultStatus;
-
- private Byte deleted;
-
- private String createBy;
-
- private Date createDate;
-
- private String updateBy;
-
- private Date updateDate;
-
- private Date reportTime;
-
- private Byte reportStatus;
-}
+package com.ruoyi.project.tr.specialCheck.domin.DTO;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@Data
+public class TbSpecialCheckTaskLogDateDTO {
+
+
+ private Long indexId;
+
+ private String id;
+
+ private String companyCode;
+
+ private String hazardCode;
+ private String hazardSource;
+
+ private String taskId;
+
+ private String checkType;
+
+ private Date checkDate;
+
+ private String resultStatus;
+
+ private Byte deleted;
+
+ private String createBy;
+
+ private Date createDate;
+
+ private String updateBy;
+
+ private Date updateDate;
+
+ private Date reportTime;
+
+ private Byte reportStatus;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/CheckItemData.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/CheckItemData.java
index be42313..1ebba28 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/CheckItemData.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/CheckItemData.java
@@ -1,20 +1,20 @@
-package com.ruoyi.project.tr.specialCheck.domin.DownloadDTO;
-
-import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckItem;
-import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckTask;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class CheckItemData {
-
- private String total;
-
- private String current;
-
- private String size;
-
- private List<TbBaseCheckItem> itemLists;
-
-}
+package com.ruoyi.project.tr.specialCheck.domin.DownloadDTO;
+
+import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckItem;
+import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckTask;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CheckItemData {
+
+ private String total;
+
+ private String current;
+
+ private String size;
+
+ private List<TbBaseCheckItem> itemLists;
+
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/CheckScoreData.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/CheckScoreData.java
index 2eea981..2c5aaae 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/CheckScoreData.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/CheckScoreData.java
@@ -1,20 +1,20 @@
-package com.ruoyi.project.tr.specialCheck.domin.DownloadDTO;
-
-import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckItem;
-import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckScore;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class CheckScoreData {
-
- private String total;
-
- private String current;
-
- private String size;
-
- private List<TbBaseCheckScore> scoreLists;
-
-}
+package com.ruoyi.project.tr.specialCheck.domin.DownloadDTO;
+
+import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckItem;
+import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckScore;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CheckScoreData {
+
+ private String total;
+
+ private String current;
+
+ private String size;
+
+ private List<TbBaseCheckScore> scoreLists;
+
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/CheckTaskData.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/CheckTaskData.java
index d5f4f0c..6f55058 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/CheckTaskData.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/CheckTaskData.java
@@ -1,13 +1,13 @@
-package com.ruoyi.project.tr.specialCheck.domin.DownloadDTO;
-
-import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckTask;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class CheckTaskData {
-
- private List<TbBaseCheckTask> checkTaskLists;
-
-}
+package com.ruoyi.project.tr.specialCheck.domin.DownloadDTO;
+
+import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckTask;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CheckTaskData {
+
+ private List<TbBaseCheckTask> checkTaskLists;
+
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/ItemDownloadRespBO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/ItemDownloadRespBO.java
index 0a0e71e..9a70e37 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/ItemDownloadRespBO.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/ItemDownloadRespBO.java
@@ -1,17 +1,17 @@
-package com.ruoyi.project.tr.specialCheck.domin.DownloadDTO;
-
-import lombok.Data;
-
-@Data
-public class ItemDownloadRespBO {
-
- /**
- * 返回code
- * */
- private String code;
- /**
- *
- * */
- private String data;
-
-}
+package com.ruoyi.project.tr.specialCheck.domin.DownloadDTO;
+
+import lombok.Data;
+
+@Data
+public class ItemDownloadRespBO {
+
+ /**
+ * 返回code
+ * */
+ private String code;
+ /**
+ *
+ * */
+ private String data;
+
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/ItemDownloadRespDTO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/ItemDownloadRespDTO.java
index b11930b..cceeaae 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/ItemDownloadRespDTO.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/ItemDownloadRespDTO.java
@@ -1,11 +1,11 @@
-package com.ruoyi.project.tr.specialCheck.domin.DownloadDTO;
-
-import lombok.Data;
-
-@Data
-public class ItemDownloadRespDTO {
-
- private String taskId;
-
- private Page page;
-}
+package com.ruoyi.project.tr.specialCheck.domin.DownloadDTO;
+
+import lombok.Data;
+
+@Data
+public class ItemDownloadRespDTO {
+
+ private String taskId;
+
+ private Page page;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/Page.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/Page.java
index ac7a306..19a56ba 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/Page.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/Page.java
@@ -1,13 +1,13 @@
-package com.ruoyi.project.tr.specialCheck.domin.DownloadDTO;
-
-import lombok.Data;
-
-@Data
-public class Page {
-
- //分页页码
- private String current;
-
- //分页大小，最小10最大1000
- private String size;
-}
+package com.ruoyi.project.tr.specialCheck.domin.DownloadDTO;
+
+import lombok.Data;
+
+@Data
+public class Page {
+
+ //分页页码
+ private String current;
+
+ //分页大小，最小10最大1000
+ private String size;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/ScoreDownloadRespBO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/ScoreDownloadRespBO.java
index 1effeea..1d6e559 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/ScoreDownloadRespBO.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/ScoreDownloadRespBO.java
@@ -1,17 +1,17 @@
-package com.ruoyi.project.tr.specialCheck.domin.DownloadDTO;
-
-import lombok.Data;
-
-@Data
-public class ScoreDownloadRespBO {
-
- /**
- * 返回code
- * */
- private String code;
- /**
- *
- * */
- private String data;
-
-}
+package com.ruoyi.project.tr.specialCheck.domin.DownloadDTO;
+
+import lombok.Data;
+
+@Data
+public class ScoreDownloadRespBO {
+
+ /**
+ * 返回code
+ * */
+ private String code;
+ /**
+ *
+ * */
+ private String data;
+
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/ScoreDownloadRespDTO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/ScoreDownloadRespDTO.java
index 3ca129f..549925e 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/ScoreDownloadRespDTO.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/ScoreDownloadRespDTO.java
@@ -1,13 +1,13 @@
-package com.ruoyi.project.tr.specialCheck.domin.DownloadDTO;
-
-import lombok.Data;
-
-@Data
-public class ScoreDownloadRespDTO {
-
- private String taskId;
-
- private String checkItemId;
-
- private Page page;
-}
+package com.ruoyi.project.tr.specialCheck.domin.DownloadDTO;
+
+import lombok.Data;
+
+@Data
+public class ScoreDownloadRespDTO {
+
+ private String taskId;
+
+ private String checkItemId;
+
+ private Page page;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/TbBaseCheckTaskDownloadBO.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/TbBaseCheckTaskDownloadBO.java
index b1ee828..6e98b23 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/TbBaseCheckTaskDownloadBO.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/DownloadDTO/TbBaseCheckTaskDownloadBO.java
@@ -1,17 +1,17 @@
-package com.ruoyi.project.tr.specialCheck.domin.DownloadDTO;
-
-import lombok.Data;
-
-@Data
-public class TbBaseCheckTaskDownloadBO {
-
- /**
- * 返回code
- * */
- private String code;
- /**
- *
- * */
- private String data;
-
-}
+package com.ruoyi.project.tr.specialCheck.domin.DownloadDTO;
+
+import lombok.Data;
+
+@Data
+public class TbBaseCheckTaskDownloadBO {
+
+ /**
+ * 返回code
+ * */
+ private String code;
+ /**
+ *
+ * */
+ private String data;
+
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckCompany.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckCompany.java
index ac50b3c..3f3f0ce 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckCompany.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckCompany.java
@@ -1,32 +1,32 @@
-package com.ruoyi.project.tr.specialCheck.domin;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-@TableName("tb_base_check_company")
-public class TbBaseCheckCompany {
-
- private String id;
-
- private String taskId;
-
- private String companyCode;
-
- private Byte deleted;
-
- private String createBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createDate;
-
- private String updateBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime updateDate;
-
- private String bjxfbm;
-}
+package com.ruoyi.project.tr.specialCheck.domin;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@TableName("tb_base_check_company")
+public class TbBaseCheckCompany {
+
+ private String id;
+
+ private String taskId;
+
+ private String companyCode;
+
+ private Byte deleted;
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createDate;
+
+ private String updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateDate;
+
+ private String bjxfbm;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckItem.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckItem.java
index b9c988d..c9ff5ba 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckItem.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckItem.java
@@ -1,40 +1,40 @@
-package com.ruoyi.project.tr.specialCheck.domin;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-@TableName("tb_base_check_item")
-public class TbBaseCheckItem {
-
- private String id;
-
- private String taskId;
-
- private String checkName;
-
- private String checkContent;
-
- private String checkWay;
-
- private String checkBasis;
-
- private String applicablePlace;
-
- private Byte deleted;
-
- private String createBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createDate;
-
- private String updateBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime updateDate;
-
- private Integer status;
-}
+package com.ruoyi.project.tr.specialCheck.domin;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@TableName("tb_base_check_item")
+public class TbBaseCheckItem {
+
+ private String id;
+
+ private String taskId;
+
+ private String checkName;
+
+ private String checkContent;
+
+ private String checkWay;
+
+ private String checkBasis;
+
+ private String applicablePlace;
+
+ private Byte deleted;
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createDate;
+
+ private String updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateDate;
+
+ private Integer status;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckScore.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckScore.java
index f9ce9e2..dab2f2c 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckScore.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckScore.java
@@ -1,34 +1,34 @@
-package com.ruoyi.project.tr.specialCheck.domin;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-@TableName("tb_base_check_score")
-public class TbBaseCheckScore {
-
- private String id;
-
- private String checkItemId;
-
- private String isReject;
-
- private String deductPoint;
-
- private String deductIllustrate;
-
- private Byte deleted;
-
- private String createBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createDate;
-
- private String updateBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime updateDate;
-}
+package com.ruoyi.project.tr.specialCheck.domin;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@TableName("tb_base_check_score")
+public class TbBaseCheckScore {
+
+ private String id;
+
+ private String checkItemId;
+
+ private String isReject;
+
+ private String deductPoint;
+
+ private String deductIllustrate;
+
+ private Byte deleted;
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createDate;
+
+ private String updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateDate;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckTask.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckTask.java
index 58ac68b..9e87bfe 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckTask.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbBaseCheckTask.java
@@ -1,40 +1,40 @@
-package com.ruoyi.project.tr.specialCheck.domin;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-@TableName("tb_base_check_task")
-public class TbBaseCheckTask {
-
- private String id;
-
- private String taskName;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime taskStartTime;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime taskEndTime;
-
- private String taskTypeName;
-
- private String taskContent;
-
- private Byte deleted;
-
- private String createBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createDate;
-
- private String updateBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime updateDate;
-
- private Integer status;
-}
+package com.ruoyi.project.tr.specialCheck.domin;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@TableName("tb_base_check_task")
+public class TbBaseCheckTask {
+
+ private String id;
+
+ private String taskName;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime taskStartTime;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime taskEndTime;
+
+ private String taskTypeName;
+
+ private String taskContent;
+
+ private Byte deleted;
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createDate;
+
+ private String updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateDate;
+
+ private Integer status;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbCheckConfig.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbCheckConfig.java
index 905607c..c6a2810 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbCheckConfig.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbCheckConfig.java
@@ -1,22 +1,22 @@
-package com.ruoyi.project.tr.specialCheck.domin;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-@TableName("tb_check_config")
-public class TbCheckConfig {
-
-
-
- @TableId(type = IdType.AUTO)
- private Long id;
-
- //1-不上报；2-上报
- private Integer status;
-}
+package com.ruoyi.project.tr.specialCheck.domin;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@TableName("tb_check_config")
+public class TbCheckConfig {
+
+
+
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ //1-不上报；2-上报
+ private Integer status;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckItemDangerLog.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckItemDangerLog.java
index 3b772c6..f152061 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckItemDangerLog.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckItemDangerLog.java
@@ -1,79 +1,79 @@
-package com.ruoyi.project.tr.specialCheck.domin;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-
-@Data
-@TableName("tb_special_check_item_danger_log")
-public class TbSpecialCheckItemDangerLog {
-
-
- @TableId(type = IdType.AUTO)
- private Long indexId;
-
- private String id;
-
- private String companyCode;
-
-
-
- private String dangerId;
-
- private String dangerName;
-
- private String taskId;
-
- private String checkType;
-
- private String checkItemId;
-
- private String checkScoreId;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime checkDate;
-
- private String checkPay;
-
- private String harmType;
-
- private String checkName;
-
- private String checkContent;
-
- private String checkWay;
-
- private String checkBasis;
-
- private String applicablePlace;
-
- private String isReject;
-
- private String deductPoint;
-
- private String deductIllustrate;
-
-
-
- private Byte deleted;
-
- private String createBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createDate;
-
- private String updateBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime updateDate;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime reportTime;
-
- private Byte reportStatus;
-}
+package com.ruoyi.project.tr.specialCheck.domin;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Data
+@TableName("tb_special_check_item_danger_log")
+public class TbSpecialCheckItemDangerLog {
+
+
+ @TableId(type = IdType.AUTO)
+ private Long indexId;
+
+ private String id;
+
+ private String companyCode;
+
+
+
+ private String dangerId;
+
+ private String dangerName;
+
+ private String taskId;
+
+ private String checkType;
+
+ private String checkItemId;
+
+ private String checkScoreId;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime checkDate;
+
+ private String checkPay;
+
+ private String harmType;
+
+ private String checkName;
+
+ private String checkContent;
+
+ private String checkWay;
+
+ private String checkBasis;
+
+ private String applicablePlace;
+
+ private String isReject;
+
+ private String deductPoint;
+
+ private String deductIllustrate;
+
+
+
+ private Byte deleted;
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createDate;
+
+ private String updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateDate;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime reportTime;
+
+ private Byte reportStatus;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckItemLog.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckItemLog.java
index 1fe55c7..901aa51 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckItemLog.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckItemLog.java
@@ -1,56 +1,56 @@
-package com.ruoyi.project.tr.specialCheck.domin;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-@TableName("tb_special_check_item_log")
-public class TbSpecialCheckItemLog {
-
-
- @TableId(type = IdType.AUTO)
- private Long indexId;
-
- private String id;
-
- private String companyCode;
-
-
-
- private String taskId;
-
- private String checkItemId;
-
- private String checkName;
-
- private String checkContent;
-
- private String checkWay;
-
- private String checkBasis;
-
- private String applicablePlace;
-
-
- private Byte deleted;
-
- private String createBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createDate;
-
- private String updateBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime updateDate;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime reportTime;
-
- private Byte reportStatus;
-}
+package com.ruoyi.project.tr.specialCheck.domin;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@TableName("tb_special_check_item_log")
+public class TbSpecialCheckItemLog {
+
+
+ @TableId(type = IdType.AUTO)
+ private Long indexId;
+
+ private String id;
+
+ private String companyCode;
+
+
+
+ private String taskId;
+
+ private String checkItemId;
+
+ private String checkName;
+
+ private String checkContent;
+
+ private String checkWay;
+
+ private String checkBasis;
+
+ private String applicablePlace;
+
+
+ private Byte deleted;
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createDate;
+
+ private String updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateDate;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime reportTime;
+
+ private Byte reportStatus;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckScoreAndDangerLog.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckScoreAndDangerLog.java
index 58280fe..e9e9877 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckScoreAndDangerLog.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckScoreAndDangerLog.java
@@ -1,68 +1,68 @@
-package com.ruoyi.project.tr.specialCheck.domin;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-@TableName("tb_special_check_score_and_danger_log")
-public class TbSpecialCheckScoreAndDangerLog {
-
-
- @TableId(type = IdType.AUTO)
- private Long indexId;
-
- private String id;
-
- private String companyCode;
-
-
-
- private String dangerId;
-
- private String dangerName;
-
- private String taskId;
-
- private String checkType;
-
- private String checkItemId;
-
- private String checkScoreId;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime checkDate;
-
- private String checkPay;
-
- private String harmType;
-
- private String isReject;
-
- private String deductPoint;
-
- private String deductIllustrate;
-
-
-
- private Byte deleted;
-
- private String createBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createDate;
-
- private String updateBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime updateDate;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime reportTime;
-
- private Byte reportStatus;
-}
+package com.ruoyi.project.tr.specialCheck.domin;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@TableName("tb_special_check_score_and_danger_log")
+public class TbSpecialCheckScoreAndDangerLog {
+
+
+ @TableId(type = IdType.AUTO)
+ private Long indexId;
+
+ private String id;
+
+ private String companyCode;
+
+
+
+ private String dangerId;
+
+ private String dangerName;
+
+ private String taskId;
+
+ private String checkType;
+
+ private String checkItemId;
+
+ private String checkScoreId;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime checkDate;
+
+ private String checkPay;
+
+ private String harmType;
+
+ private String isReject;
+
+ private String deductPoint;
+
+ private String deductIllustrate;
+
+
+
+ private Byte deleted;
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createDate;
+
+ private String updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateDate;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime reportTime;
+
+ private Byte reportStatus;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckTaskLog.java b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckTaskLog.java
index 8055be4..0e83913 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckTaskLog.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/domin/TbSpecialCheckTaskLog.java
@@ -1,52 +1,52 @@
-package com.ruoyi.project.tr.specialCheck.domin;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.time.LocalDateTime;
-
-@Data
-@TableName("tb_special_check_task_log")
-public class TbSpecialCheckTaskLog {
-
-
- @TableId(type = IdType.AUTO)
- private Long indexId;
-
- private String id;
-
- private String companyCode;
-
- private String hazardCode;
-
- private String hazardSource;
-
- private String taskId;
-
- private String checkType;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime checkDate;
-
- private String resultStatus;
-
- private Byte deleted;
-
- private String createBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createDate;
-
- private String updateBy;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime updateDate;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime reportTime;
-
- private Byte reportStatus;
-}
+package com.ruoyi.project.tr.specialCheck.domin;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+@TableName("tb_special_check_task_log")
+public class TbSpecialCheckTaskLog {
+
+
+ @TableId(type = IdType.AUTO)
+ private Long indexId;
+
+ private String id;
+
+ private String companyCode;
+
+ private String hazardCode;
+
+ private String hazardSource;
+
+ private String taskId;
+
+ private String checkType;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime checkDate;
+
+ private String resultStatus;
+
+ private Byte deleted;
+
+ private String createBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime createDate;
+
+ private String updateBy;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime updateDate;
+
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime reportTime;
+
+ private Byte reportStatus;
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckCompanyMapper.java b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckCompanyMapper.java
index c6be23d..c279d08 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckCompanyMapper.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckCompanyMapper.java
@@ -1,10 +1,10 @@
-package com.ruoyi.project.tr.specialCheck.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckCompany;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface TbBaseCheckCompanyMapper extends BaseMapper<TbBaseCheckCompany> {
-
-}
+package com.ruoyi.project.tr.specialCheck.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckCompany;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface TbBaseCheckCompanyMapper extends BaseMapper<TbBaseCheckCompany> {
+
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckItemMapper.java b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckItemMapper.java
index 876fe42..1fb0288 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckItemMapper.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckItemMapper.java
@@ -1,22 +1,22 @@
-package com.ruoyi.project.tr.specialCheck.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbBaseCheckItemBO;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbBaseCheckScoreBO;
-import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckItem;
-import org.springframework.stereotype.Repository;
-
-import java.util.Date;
-import java.util.List;
-
-@Repository
-public interface TbBaseCheckItemMapper extends BaseMapper<TbBaseCheckItem> {
-
- List<TbBaseCheckItem> selectTbBaseCheckItemPage(TbBaseCheckItemBO tbBaseCheckItemBO);
-
- TbBaseCheckItem getBaseCheckItemByItemId(String checkItemId);
-
- TbBaseCheckItem getBaseItemByStatus(Date date);
-
- int updateStatusById(String id);
-}
+package com.ruoyi.project.tr.specialCheck.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbBaseCheckItemBO;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbBaseCheckScoreBO;
+import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckItem;
+import org.springframework.stereotype.Repository;
+
+import java.util.Date;
+import java.util.List;
+
+@Repository
+public interface TbBaseCheckItemMapper extends BaseMapper<TbBaseCheckItem> {
+
+ List<TbBaseCheckItem> selectTbBaseCheckItemPage(TbBaseCheckItemBO tbBaseCheckItemBO);
+
+ TbBaseCheckItem getBaseCheckItemByItemId(String checkItemId);
+
+ TbBaseCheckItem getBaseItemByStatus(Date date);
+
+ int updateStatusById(String id);
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckScoreMapper.java b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckScoreMapper.java
index 5a0034c..e15190e 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckScoreMapper.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckScoreMapper.java
@@ -1,19 +1,19 @@
-package com.ruoyi.project.tr.specialCheck.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbBaseCheckScoreBO;
-import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckScore;
-import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckTask;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface TbBaseCheckScoreMapper extends BaseMapper<TbBaseCheckScore> {
-
- List<TbBaseCheckScore> selectTbBaseCheckScorePage(TbBaseCheckScoreBO tbBaseCheckScoreBO);
-
- TbBaseCheckScore getBaseCheckScoreByScoreId(String checkScoreId);
-
- List<TbBaseCheckTask> listTbBaseCheckTask();
-}
+package com.ruoyi.project.tr.specialCheck.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbBaseCheckScoreBO;
+import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckScore;
+import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckTask;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface TbBaseCheckScoreMapper extends BaseMapper<TbBaseCheckScore> {
+
+ List<TbBaseCheckScore> selectTbBaseCheckScorePage(TbBaseCheckScoreBO tbBaseCheckScoreBO);
+
+ TbBaseCheckScore getBaseCheckScoreByScoreId(String checkScoreId);
+
+ List<TbBaseCheckTask> listTbBaseCheckTask();
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckTaskMapper.java b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckTaskMapper.java
index 2a1d00f..f5201aa 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckTaskMapper.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbBaseCheckTaskMapper.java
@@ -1,23 +1,23 @@
-package com.ruoyi.project.tr.specialCheck.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbBaseCheckTaskBO;
-import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckTask;
-import org.springframework.stereotype.Repository;
-
-import java.util.Date;
-import java.util.List;
-
-@Repository
-public interface TbBaseCheckTaskMapper extends BaseMapper<TbBaseCheckTask> {
-
- List<TbBaseCheckTaskMapper> selectTbBaseCheckTaskPage(TbBaseCheckTaskBO tbBaseCheckTaskBO);
-
- TbBaseCheckTask getBaseCheckTaskByTaskId(String taskId);
-
- List<TbBaseCheckTask> listTbBaseCheckTask();
-
- TbBaseCheckTask getBaseCheckTaskByStatus(Date date);
-
- int updateStatusById(String id);
-}
+package com.ruoyi.project.tr.specialCheck.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbBaseCheckTaskBO;
+import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckTask;
+import org.springframework.stereotype.Repository;
+
+import java.util.Date;
+import java.util.List;
+
+@Repository
+public interface TbBaseCheckTaskMapper extends BaseMapper<TbBaseCheckTask> {
+
+ List<TbBaseCheckTaskMapper> selectTbBaseCheckTaskPage(TbBaseCheckTaskBO tbBaseCheckTaskBO);
+
+ TbBaseCheckTask getBaseCheckTaskByTaskId(String taskId);
+
+ List<TbBaseCheckTask> listTbBaseCheckTask();
+
+ TbBaseCheckTask getBaseCheckTaskByStatus(Date date);
+
+ int updateStatusById(String id);
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbCheckConfigMapper.java b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbCheckConfigMapper.java
index f6647ef..7dec2f9 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbCheckConfigMapper.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbCheckConfigMapper.java
@@ -1,12 +1,12 @@
-package com.ruoyi.project.tr.specialCheck.mapper;
-
-import com.ruoyi.project.tr.specialCheck.domin.TbCheckConfig;
-import org.springframework.stereotype.Repository;
-
-
-@Repository
-public interface TbCheckConfigMapper {
-
-
- TbCheckConfig getSpecialCheckConfig();
-}
+package com.ruoyi.project.tr.specialCheck.mapper;
+
+import com.ruoyi.project.tr.specialCheck.domin.TbCheckConfig;
+import org.springframework.stereotype.Repository;
+
+
+@Repository
+public interface TbCheckConfigMapper {
+
+
+ TbCheckConfig getSpecialCheckConfig();
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckItemDangerLogMapper.java b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckItemDangerLogMapper.java
index c7824e3..d543aef 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckItemDangerLogMapper.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckItemDangerLogMapper.java
@@ -1,29 +1,29 @@
-package com.ruoyi.project.tr.specialCheck.mapper;
-
-import com.ruoyi.project.tr.specialCheck.domin.BO.HandlerSpecialCheckReportParam;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogBO;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogUpdateBO;
-import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemDangerLog;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface TbSpecialCheckItemDangerLogMapper {
-
- List<TbSpecialCheckItemDangerLog> selectSpecialCheckItemDangerLogPage(TbSpecialCheckItemDangerLogBO itemDangerLogBO);
-
- int save(TbSpecialCheckItemDangerLog itemDangerLog);
-
- TbSpecialCheckItemDangerLog getSpecialCheckItemDangerLogByIndexId(Long indexId);
-
- int updateSpecialCheckItemDangerLogById(TbSpecialCheckItemDangerLogUpdateBO updateBO);
-
- int deleteTbSpecialCheckItemDangerLog(TbSpecialCheckItemDangerLog tbSpecialCheckItemDangerLog);
-
- List<TbSpecialCheckItemDangerLog> listItemDangerReportTask();
-
- void updateItemDangerReportStatusById(HandlerSpecialCheckReportParam handlerCJReportParam);
-
- TbSpecialCheckItemDangerLog getSpecialCheckItemDangerLogById(String id);
-}
+package com.ruoyi.project.tr.specialCheck.mapper;
+
+import com.ruoyi.project.tr.specialCheck.domin.BO.HandlerSpecialCheckReportParam;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogBO;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogUpdateBO;
+import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemDangerLog;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface TbSpecialCheckItemDangerLogMapper {
+
+ List<TbSpecialCheckItemDangerLog> selectSpecialCheckItemDangerLogPage(TbSpecialCheckItemDangerLogBO itemDangerLogBO);
+
+ int save(TbSpecialCheckItemDangerLog itemDangerLog);
+
+ TbSpecialCheckItemDangerLog getSpecialCheckItemDangerLogByIndexId(Long indexId);
+
+ int updateSpecialCheckItemDangerLogById(TbSpecialCheckItemDangerLogUpdateBO updateBO);
+
+ int deleteTbSpecialCheckItemDangerLog(TbSpecialCheckItemDangerLog tbSpecialCheckItemDangerLog);
+
+ List<TbSpecialCheckItemDangerLog> listItemDangerReportTask();
+
+ void updateItemDangerReportStatusById(HandlerSpecialCheckReportParam handlerCJReportParam);
+
+ TbSpecialCheckItemDangerLog getSpecialCheckItemDangerLogById(String id);
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckItemLogMapper.java b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckItemLogMapper.java
index ede8f0e..f905409 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckItemLogMapper.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckItemLogMapper.java
@@ -1,30 +1,30 @@
-package com.ruoyi.project.tr.specialCheck.mapper;
-
-import com.ruoyi.project.tr.specialCheck.domin.BO.HandlerSpecialCheckReportParam;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogBO;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogUpdateBO;
-import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemDangerLog;
-import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemLog;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface TbSpecialCheckItemLogMapper {
-
- List<TbSpecialCheckItemLog> selectSpecialCheckItemDangerLogPage(TbSpecialCheckItemDangerLogBO itemDangerLogBO);
-
- int save(TbSpecialCheckItemLog itemLog);
-
- TbSpecialCheckItemLog getSpecialCheckItemDangerLogByIndexId(Long indexId);
-
- int updateSpecialCheckItemDangerLogById(TbSpecialCheckItemLog updateBO);
-
- int deleteTbSpecialCheckItemDangerLog(TbSpecialCheckItemLog itemLog);
-
- List<TbSpecialCheckItemLog> listItemDangerReportTask();
-
- int updateItemDangerReportStatusById(HandlerSpecialCheckReportParam handlerCJReportParam);
-
- TbSpecialCheckItemLog getSpecialCheckItemDangerLogById(String id);
-}
+package com.ruoyi.project.tr.specialCheck.mapper;
+
+import com.ruoyi.project.tr.specialCheck.domin.BO.HandlerSpecialCheckReportParam;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogBO;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogUpdateBO;
+import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemDangerLog;
+import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemLog;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface TbSpecialCheckItemLogMapper {
+
+ List<TbSpecialCheckItemLog> selectSpecialCheckItemDangerLogPage(TbSpecialCheckItemDangerLogBO itemDangerLogBO);
+
+ int save(TbSpecialCheckItemLog itemLog);
+
+ TbSpecialCheckItemLog getSpecialCheckItemDangerLogByIndexId(Long indexId);
+
+ int updateSpecialCheckItemDangerLogById(TbSpecialCheckItemLog updateBO);
+
+ int deleteTbSpecialCheckItemDangerLog(TbSpecialCheckItemLog itemLog);
+
+ List<TbSpecialCheckItemLog> listItemDangerReportTask();
+
+ int updateItemDangerReportStatusById(HandlerSpecialCheckReportParam handlerCJReportParam);
+
+ TbSpecialCheckItemLog getSpecialCheckItemDangerLogById(String id);
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckScoreAndDangerLogMapper.java b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckScoreAndDangerLogMapper.java
index 199a921..968f1d5 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckScoreAndDangerLogMapper.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckScoreAndDangerLogMapper.java
@@ -1,33 +1,33 @@
-package com.ruoyi.project.tr.specialCheck.mapper;
-
-import com.ruoyi.project.tr.specialCheck.domin.BO.HandlerSpecialCheckReportParam;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogBO;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogUpdateBO;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckScoreAndDangerLogQueryBO;
-import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemDangerLog;
-import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckScoreAndDangerLog;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-@Repository
-public interface TbSpecialCheckScoreAndDangerLogMapper {
-
- List<TbSpecialCheckScoreAndDangerLog> selectSpecialCheckScoreAndDangerLogPage(TbSpecialCheckScoreAndDangerLogQueryBO scoreAndDangerLogBO);
-
- int save(TbSpecialCheckScoreAndDangerLog scoreAndDangerLog);
-
- TbSpecialCheckScoreAndDangerLog getSpecialCheckScoreAndDangerLogByIndexId(Long indexId);
-
- int updateSpecialCheckScoreAndDangerLogById(TbSpecialCheckScoreAndDangerLog scoreAndDangerLog);
-
- int deleteTbSpecialCheckScoreAndDangerLog(TbSpecialCheckScoreAndDangerLog scoreAndDangerLog);
-
- List<TbSpecialCheckScoreAndDangerLog> listItemDangerReportTask();
-
- void updateItemDangerReportStatusById(HandlerSpecialCheckReportParam handlerCJReportParam);
-
- TbSpecialCheckScoreAndDangerLog getSpecialCheckScoreAndDangerLogById(String id);
-
- List<TbSpecialCheckScoreAndDangerLog> listScoreAndDangerLogReportList();
-}
+package com.ruoyi.project.tr.specialCheck.mapper;
+
+import com.ruoyi.project.tr.specialCheck.domin.BO.HandlerSpecialCheckReportParam;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogBO;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogUpdateBO;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckScoreAndDangerLogQueryBO;
+import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemDangerLog;
+import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckScoreAndDangerLog;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface TbSpecialCheckScoreAndDangerLogMapper {
+
+ List<TbSpecialCheckScoreAndDangerLog> selectSpecialCheckScoreAndDangerLogPage(TbSpecialCheckScoreAndDangerLogQueryBO scoreAndDangerLogBO);
+
+ int save(TbSpecialCheckScoreAndDangerLog scoreAndDangerLog);
+
+ TbSpecialCheckScoreAndDangerLog getSpecialCheckScoreAndDangerLogByIndexId(Long indexId);
+
+ int updateSpecialCheckScoreAndDangerLogById(TbSpecialCheckScoreAndDangerLog scoreAndDangerLog);
+
+ int deleteTbSpecialCheckScoreAndDangerLog(TbSpecialCheckScoreAndDangerLog scoreAndDangerLog);
+
+ List<TbSpecialCheckScoreAndDangerLog> listItemDangerReportTask();
+
+ void updateItemDangerReportStatusById(HandlerSpecialCheckReportParam handlerCJReportParam);
+
+ TbSpecialCheckScoreAndDangerLog getSpecialCheckScoreAndDangerLogById(String id);
+
+ List<TbSpecialCheckScoreAndDangerLog> listScoreAndDangerLogReportList();
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckTaskLogMapper.java b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckTaskLogMapper.java
index 8365f1a..a7a208e 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckTaskLogMapper.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/mapper/TbSpecialCheckTaskLogMapper.java
@@ -1,31 +1,31 @@
-package com.ruoyi.project.tr.specialCheck.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
-import com.ruoyi.doublePrevention.vo.ResultVO;
-import com.ruoyi.project.tr.specialCheck.domin.BO.HandlerSpecialCheckReportParam;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckTaskLogBO;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckTaskLogUpdateBO;
-import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckTaskLog;
-import org.springframework.stereotype.Repository;
-
-import java.util.List;
-
-
-@Repository
-public interface TbSpecialCheckTaskLogMapper extends BaseMapper<TbSpecialCheckTaskLog> {
-
- List<TbSpecialCheckTaskLog> selectSpecialCheckTaskLogPage(TbSpecialCheckTaskLogBO specialCheckTaskLogBO);
-
- int save(TbSpecialCheckTaskLog tbSpecialCheckTaskLog);
-
- TbSpecialCheckTaskLog getSpecialCheckTaskLogByIndexId(Long indexId);
-
- int updateSpecialCheckTaskLogById(TbSpecialCheckTaskLogUpdateBO updateBO);
-
- int deleteTbSpecialCheckTaskLog(TbSpecialCheckTaskLog tbSpecialCheckTaskLog);
-
- List<TbSpecialCheckTaskLog> listTestReportTask();
-
- void updateCheckTaskReportStatusById(HandlerSpecialCheckReportParam handlerCJReportParam);
-}
+package com.ruoyi.project.tr.specialCheck.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.doublePrevention.repository.param.HandlerCJReportParam;
+import com.ruoyi.doublePrevention.vo.ResultVO;
+import com.ruoyi.project.tr.specialCheck.domin.BO.HandlerSpecialCheckReportParam;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckTaskLogBO;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckTaskLogUpdateBO;
+import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckTaskLog;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+
+@Repository
+public interface TbSpecialCheckTaskLogMapper extends BaseMapper<TbSpecialCheckTaskLog> {
+
+ List<TbSpecialCheckTaskLog> selectSpecialCheckTaskLogPage(TbSpecialCheckTaskLogBO specialCheckTaskLogBO);
+
+ int save(TbSpecialCheckTaskLog tbSpecialCheckTaskLog);
+
+ TbSpecialCheckTaskLog getSpecialCheckTaskLogByIndexId(Long indexId);
+
+ int updateSpecialCheckTaskLogById(TbSpecialCheckTaskLogUpdateBO updateBO);
+
+ int deleteTbSpecialCheckTaskLog(TbSpecialCheckTaskLog tbSpecialCheckTaskLog);
+
+ List<TbSpecialCheckTaskLog> listTestReportTask();
+
+ void updateCheckTaskReportStatusById(HandlerSpecialCheckReportParam handlerCJReportParam);
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/service/SpecialCheckItemDangerLogService.java b/src/main/java/com/ruoyi/project/tr/specialCheck/service/SpecialCheckItemDangerLogService.java
index fdac3c9..8629bd7 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/service/SpecialCheckItemDangerLogService.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/service/SpecialCheckItemDangerLogService.java
@@ -1,26 +1,26 @@
-package com.ruoyi.project.tr.specialCheck.service;
-
-
-import com.ruoyi.doublePrevention.vo.ResultVO;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogBO;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogUpdateBO;
-import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemDangerLog;
-import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemLog;
-
-import java.util.List;
-
-public interface SpecialCheckItemDangerLogService {
-
-
- ResultVO<List<TbSpecialCheckItemLog>> selectSpecialCheckItemDangerLogPage(TbSpecialCheckItemDangerLogBO itemDangerLogBO);
-
- ResultVO<TbSpecialCheckItemLog> addSpecialItemDanger(TbSpecialCheckItemDangerLog itemDangerLog);
-
- TbSpecialCheckItemLog getSpecialCheckItemDangerLogByIndexId(Long indexId);
-
- ResultVO<TbSpecialCheckItemLog> updateSpecialCheckItemDangerLog(TbSpecialCheckItemDangerLogUpdateBO updateBO);
-
- ResultVO<TbSpecialCheckItemLog> deleteTbSpecialItemDangerTaskLog(TbSpecialCheckItemDangerLogUpdateBO updateBO);
-
- TbSpecialCheckItemLog getSpecialCheckItemDangerLogById(String id);
-}
+package com.ruoyi.project.tr.specialCheck.service;
+
+
+import com.ruoyi.doublePrevention.vo.ResultVO;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogBO;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogUpdateBO;
+import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemDangerLog;
+import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemLog;
+
+import java.util.List;
+
+public interface SpecialCheckItemDangerLogService {
+
+
+ ResultVO<List<TbSpecialCheckItemLog>> selectSpecialCheckItemDangerLogPage(TbSpecialCheckItemDangerLogBO itemDangerLogBO);
+
+ ResultVO<TbSpecialCheckItemLog> addSpecialItemDanger(TbSpecialCheckItemDangerLog itemDangerLog);
+
+ TbSpecialCheckItemLog getSpecialCheckItemDangerLogByIndexId(Long indexId);
+
+ ResultVO<TbSpecialCheckItemLog> updateSpecialCheckItemDangerLog(TbSpecialCheckItemDangerLogUpdateBO updateBO);
+
+ ResultVO<TbSpecialCheckItemLog> deleteTbSpecialItemDangerTaskLog(TbSpecialCheckItemDangerLogUpdateBO updateBO);
+
+ TbSpecialCheckItemLog getSpecialCheckItemDangerLogById(String id);
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/service/SpecialCheckScoreAndDangerDangerLogService.java b/src/main/java/com/ruoyi/project/tr/specialCheck/service/SpecialCheckScoreAndDangerDangerLogService.java
index 8e5b06c..0c4c8d6 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/service/SpecialCheckScoreAndDangerDangerLogService.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/service/SpecialCheckScoreAndDangerDangerLogService.java
@@ -1,25 +1,25 @@
-package com.ruoyi.project.tr.specialCheck.service;
-
-
-import com.ruoyi.doublePrevention.vo.ResultVO;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckScoreAndDangerLogEditBO;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckScoreAndDangerLogQueryBO;
-import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckScoreAndDangerLog;
-
-import java.util.List;
-
-public interface SpecialCheckScoreAndDangerDangerLogService {
-
-
- ResultVO<List<TbSpecialCheckScoreAndDangerLog>> selectSpecialCheckScoreAndDangerLogPage(TbSpecialCheckScoreAndDangerLogQueryBO scoreAndDangerLogBO );
-
- ResultVO<TbSpecialCheckScoreAndDangerLog> addSpecialScoreAndDanger(TbSpecialCheckScoreAndDangerLogEditBO scoreAndDangerEditLog);
-
- TbSpecialCheckScoreAndDangerLog getSpecialCheckScoreAndDangerLogByIndexId(Long indexId);
-
- ResultVO<TbSpecialCheckScoreAndDangerLog> updateSpecialCheckScoreAndDangerLog(TbSpecialCheckScoreAndDangerLogEditBO scoreAndDangerEditLog);
-
- ResultVO<TbSpecialCheckScoreAndDangerLog> deleteTbSpecialScoreAndDangerLog(TbSpecialCheckScoreAndDangerLog scoreAndDangerLog);
-
- TbSpecialCheckScoreAndDangerLog getSpecialCheckScoreAndDangerLogById(String id);
-}
+package com.ruoyi.project.tr.specialCheck.service;
+
+
+import com.ruoyi.doublePrevention.vo.ResultVO;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckScoreAndDangerLogEditBO;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckScoreAndDangerLogQueryBO;
+import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckScoreAndDangerLog;
+
+import java.util.List;
+
+public interface SpecialCheckScoreAndDangerDangerLogService {
+
+
+ ResultVO<List<TbSpecialCheckScoreAndDangerLog>> selectSpecialCheckScoreAndDangerLogPage(TbSpecialCheckScoreAndDangerLogQueryBO scoreAndDangerLogBO );
+
+ ResultVO<TbSpecialCheckScoreAndDangerLog> addSpecialScoreAndDanger(TbSpecialCheckScoreAndDangerLogEditBO scoreAndDangerEditLog);
+
+ TbSpecialCheckScoreAndDangerLog getSpecialCheckScoreAndDangerLogByIndexId(Long indexId);
+
+ ResultVO<TbSpecialCheckScoreAndDangerLog> updateSpecialCheckScoreAndDangerLog(TbSpecialCheckScoreAndDangerLogEditBO scoreAndDangerEditLog);
+
+ ResultVO<TbSpecialCheckScoreAndDangerLog> deleteTbSpecialScoreAndDangerLog(TbSpecialCheckScoreAndDangerLog scoreAndDangerLog);
+
+ TbSpecialCheckScoreAndDangerLog getSpecialCheckScoreAndDangerLogById(String id);
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/service/SpecialCheckTaskService.java b/src/main/java/com/ruoyi/project/tr/specialCheck/service/SpecialCheckTaskService.java
index ed4aa41..2ff9345 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/service/SpecialCheckTaskService.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/service/SpecialCheckTaskService.java
@@ -1,24 +1,24 @@
-package com.ruoyi.project.tr.specialCheck.service;
-
-
-import com.ruoyi.doublePrevention.vo.ResultVO;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemLogEditBO;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckTaskLogBO;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckTaskLogEditBO;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckTaskLogUpdateBO;
-import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckTaskLog;
-
-import java.util.List;
-
-public interface SpecialCheckTaskService {
-
- ResultVO<List<TbSpecialCheckTaskLog>> selectSpecialCheckTaskLogPage(TbSpecialCheckTaskLogBO specialCheckTaskLogBO);
-
- ResultVO<TbSpecialCheckTaskLog> addSpecialTask(TbSpecialCheckTaskLogEditBO taskLogEditBO);
-
- TbSpecialCheckTaskLog getSpecialCheckTaskLogByIndexId(Long id);
-
- ResultVO<TbSpecialCheckTaskLog> updateSpecialCheckTaskLog(TbSpecialCheckTaskLogEditBO taskLogEditBO);
-
- ResultVO<TbSpecialCheckTaskLog> deleteTbSpecialCheckTaskLog(TbSpecialCheckTaskLogUpdateBO updateBO);
-}
+package com.ruoyi.project.tr.specialCheck.service;
+
+
+import com.ruoyi.doublePrevention.vo.ResultVO;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemLogEditBO;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckTaskLogBO;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckTaskLogEditBO;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckTaskLogUpdateBO;
+import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckTaskLog;
+
+import java.util.List;
+
+public interface SpecialCheckTaskService {
+
+ ResultVO<List<TbSpecialCheckTaskLog>> selectSpecialCheckTaskLogPage(TbSpecialCheckTaskLogBO specialCheckTaskLogBO);
+
+ ResultVO<TbSpecialCheckTaskLog> addSpecialTask(TbSpecialCheckTaskLogEditBO taskLogEditBO);
+
+ TbSpecialCheckTaskLog getSpecialCheckTaskLogByIndexId(Long id);
+
+ ResultVO<TbSpecialCheckTaskLog> updateSpecialCheckTaskLog(TbSpecialCheckTaskLogEditBO taskLogEditBO);
+
+ ResultVO<TbSpecialCheckTaskLog> deleteTbSpecialCheckTaskLog(TbSpecialCheckTaskLogUpdateBO updateBO);
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/service/TbBaseCheckService.java b/src/main/java/com/ruoyi/project/tr/specialCheck/service/TbBaseCheckService.java
index 466fb98..a4fcf39 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/service/TbBaseCheckService.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/service/TbBaseCheckService.java
@@ -1,25 +1,25 @@
-package com.ruoyi.project.tr.specialCheck.service;
-
-import com.ruoyi.doublePrevention.vo.ResultVO;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbBaseCheckItemBO;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbBaseCheckScoreBO;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbBaseCheckTaskBO;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckTaskLogBO;
-import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckItem;
-import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckScore;
-import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckTask;
-import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckTaskLog;
-
-import java.util.List;
-
-public interface TbBaseCheckService {
-
- ResultVO<List<TbBaseCheckTask>> selectTbBaseCheckTaskPage(TbBaseCheckTaskBO tbBaseCheckTaskBO);
-
- ResultVO<List<TbBaseCheckItem>> selectTbBaseCheckItemPage(TbBaseCheckItemBO tbBaseCheckItemBO);
-
- ResultVO<List<TbBaseCheckScore>> selectTbBaseCheckScorePage(TbBaseCheckScoreBO tbBaseCheckScoreBO);
-
-
- List<TbBaseCheckTask> listTbBaseCheckTask();
-}
+package com.ruoyi.project.tr.specialCheck.service;
+
+import com.ruoyi.doublePrevention.vo.ResultVO;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbBaseCheckItemBO;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbBaseCheckScoreBO;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbBaseCheckTaskBO;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckTaskLogBO;
+import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckItem;
+import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckScore;
+import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckTask;
+import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckTaskLog;
+
+import java.util.List;
+
+public interface TbBaseCheckService {
+
+ ResultVO<List<TbBaseCheckTask>> selectTbBaseCheckTaskPage(TbBaseCheckTaskBO tbBaseCheckTaskBO);
+
+ ResultVO<List<TbBaseCheckItem>> selectTbBaseCheckItemPage(TbBaseCheckItemBO tbBaseCheckItemBO);
+
+ ResultVO<List<TbBaseCheckScore>> selectTbBaseCheckScorePage(TbBaseCheckScoreBO tbBaseCheckScoreBO);
+
+
+ List<TbBaseCheckTask> listTbBaseCheckTask();
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java b/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java
index 5df30eb..ea73b83 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java
@@ -1,240 +1,240 @@
-package com.ruoyi.project.tr.specialCheck.service.impl;
-
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo;
-import com.ruoyi.doublePrevention.enums.ErrorCodes;
-import com.ruoyi.doublePrevention.enums.ResultCodes;
-import com.ruoyi.doublePrevention.repository.PreventCJReportDangerInfoRepository;
-import com.ruoyi.doublePrevention.vo.ResultVO;
-import com.ruoyi.project.system.user.domain.User;
-import com.ruoyi.project.tr.specialCheck.domin.*;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogBO;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogUpdateBO;
-import com.ruoyi.project.tr.specialCheck.mapper.*;
-import com.ruoyi.project.tr.specialCheck.service.SpecialCheckItemDangerLogService;
-import com.ruoyi.project.tr.specialCheck.service.SpecialCheckScoreAndDangerDangerLogService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.UUID;
-
-import static com.ruoyi.common.utils.security.ShiroUtils.getSysUser;
-
-@Service
-public class SpecialCheckItemDangerLogServiceImpl implements SpecialCheckItemDangerLogService {
-
- @Autowired
- private TbSpecialCheckItemLogMapper itemLogMapper;
-
- @Autowired
- private TbBaseCheckTaskMapper baseCheckTaskMapper;
-
- @Autowired
- private TbBaseCheckItemMapper baseCheckItemMapper;
-
- @Autowired
- private TbBaseCheckScoreMapper baseCheckScoreMapper;
-
- @Autowired
- private PreventCJReportDangerInfoRepository preventCJReportDangerInfoRepository;
-
- @Autowired
- private SpecialCheckScoreAndDangerDangerLogService scoreAndDangerDangerLogService;
-
- @Override
- public ResultVO<List<TbSpecialCheckItemLog>> selectSpecialCheckItemDangerLogPage(TbSpecialCheckItemDangerLogBO itemDangerLogBO) {
- Integer pageIndex = itemDangerLogBO.getPageNum();
- Integer pageSize = itemDangerLogBO.getPageSize();
- if (pageIndex == 0 || pageSize == 0){
- return new ResultVO<>(ErrorCodes.REQUEST_PARAM_ERROR.getCode(),"当前页码或当前页显示数不能为0");
- }
-
- Page<TbSpecialCheckItemLog> page = PageHelper.startPage(pageIndex, pageSize);
- itemLogMapper.selectSpecialCheckItemDangerLogPage(itemDangerLogBO);
-
- Long total = page.getTotal();
- int count = total.intValue();
- List<TbSpecialCheckItemLog> pageResult = null;
-
- ResultVO<List<TbSpecialCheckItemLog>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);
-
- resultVO.setData(page.getResult());
- resultVO.setCount(count);
- resultVO.setCount((int) page.getTotal());
- resultVO.setPageNum(page.getPageNum());
- resultVO.setPageSize(page.getPageSize());
- return resultVO;
- }
-
- @Override
- public ResultVO<TbSpecialCheckItemLog> addSpecialItemDanger(TbSpecialCheckItemDangerLog itemDangerLog) {
- User sysUser = getSysUser();
- ResultVO resultVO = new ResultVO<>();
- resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
-
- if (itemDangerLog.getTaskId() == null){
- resultVO.setMsg("任务不能为空");
- return resultVO;
- }
- TbBaseCheckTask baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(itemDangerLog.getTaskId());
- if (ObjectUtils.isEmpty(baseCheckTaskByTaskId)){
- resultVO.setMsg("任务不存在");
- return resultVO;
- }
- if (itemDangerLog.getCheckItemId() == null){
- resultVO.setMsg("检查项不能为空");
- return resultVO;
- }
- TbBaseCheckItem baseCheckItemByItemId = baseCheckItemMapper.getBaseCheckItemByItemId(itemDangerLog.getCheckItemId());
- if (ObjectUtils.isEmpty(baseCheckItemByItemId)){
- resultVO.setMsg("检查项不存在");
- return resultVO;
- }
-
- TbSpecialCheckItemLog itemLog = new TbSpecialCheckItemLog();
-
- LocalDateTime dateTime = LocalDateTime.now();
- String uuid = UUID.randomUUID().toString();
-
- itemLog.setId(uuid);
- itemLog.setCompanyCode("652310082");
- itemLog.setCheckItemId(itemDangerLog.getCheckItemId());
- itemLog.setTaskId(itemDangerLog.getTaskId());
- itemLog.setCheckName(baseCheckItemByItemId.getCheckName());
- itemLog.setCheckContent(baseCheckItemByItemId.getCheckContent());
- itemLog.setCheckWay(baseCheckItemByItemId.getCheckWay());
- itemLog.setCheckBasis(baseCheckItemByItemId.getCheckBasis());
- itemLog.setApplicablePlace(baseCheckItemByItemId.getApplicablePlace());
- itemLog.setDeleted((byte) 0);
- itemLog.setCreateDate(dateTime);
- itemLog.setUpdateDate(dateTime);
- itemLog.setCreateBy(sysUser.getUserName());
- itemLog.setUpdateBy(sysUser.getUserName());
- itemLog.setReportStatus((byte) 1);
- itemLog.setReportTime(null);
-
-
-
- int saveResult = itemLogMapper.save(itemLog);
- if (saveResult == 0){
- resultVO.setCode(ResultCodes.SERVER_ADD_ERROR.getCode());
- resultVO.setMsg(ResultCodes.SERVER_ADD_ERROR.getDesc());
- return resultVO;
- }
- resultVO.setCode(ResultCodes.OK.getCode());
- resultVO.setMsg("新增检查成功");
- return resultVO;
- }
-
- @Override
- public TbSpecialCheckItemLog getSpecialCheckItemDangerLogByIndexId(Long indexId) {
- return itemLogMapper.getSpecialCheckItemDangerLogByIndexId(indexId);
- }
-
- @Override
- public ResultVO<TbSpecialCheckItemLog> updateSpecialCheckItemDangerLog(TbSpecialCheckItemDangerLogUpdateBO updateBO) {
- User sysUser = getSysUser();
- ResultVO resultVO = new ResultVO<>();
- resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
-
- if (updateBO.getIndexId() == null){
- resultVO.setMsg("任务不能为空");
- return resultVO;
- }
- if (updateBO.getTaskId() == null){
- resultVO.setMsg("专项任务不能为空");
- return resultVO;
- }
- TbBaseCheckTask baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(updateBO.getTaskId());
- if (ObjectUtils.isEmpty(baseCheckTaskByTaskId)){
- resultVO.setMsg("专项任务不存在");
- return resultVO;
- }
- if (updateBO.getCheckItemId() == null){
- resultVO.setMsg("检查项不能为空");
- return resultVO;
- }
- TbBaseCheckItem baseCheckItemByItemId = baseCheckItemMapper.getBaseCheckItemByItemId(updateBO.getCheckItemId());
- if (ObjectUtils.isEmpty(baseCheckItemByItemId)){
- resultVO.setMsg("检查项不存在");
- return resultVO;
- }
-
- TbSpecialCheckItemLog itemLog = new TbSpecialCheckItemLog();
- LocalDateTime dateTime = LocalDateTime.now();
-
- updateBO.setUpdateDate(dateTime);
- updateBO.setUpdateBy(sysUser.getUserName());
- updateBO.setReportStatus((byte) 1);
-
- itemLog.setCheckItemId(updateBO.getCheckItemId());
- itemLog.setTaskId(updateBO.getTaskId());
- itemLog.setCheckName(baseCheckItemByItemId.getCheckName());
- itemLog.setCheckContent(baseCheckItemByItemId.getCheckContent());
- itemLog.setCheckWay(baseCheckItemByItemId.getCheckWay());
- itemLog.setCheckBasis(baseCheckItemByItemId.getCheckBasis());
- itemLog.setApplicablePlace(baseCheckItemByItemId.getApplicablePlace());
-
-
- int updateResult = itemLogMapper.updateSpecialCheckItemDangerLogById(itemLog);
- if (updateResult == 0){
- resultVO.setCode(ResultCodes.SERVER_UPDATE_ERROR.getCode());
- resultVO.setMsg(ResultCodes.SERVER_UPDATE_ERROR.getDesc());
- return resultVO;
- }
- resultVO.setCode(ResultCodes.OK.getCode());
- resultVO.setMsg("更新成功");
- return resultVO;
- }
-
- @Override
- public ResultVO<TbSpecialCheckItemLog> deleteTbSpecialItemDangerTaskLog(TbSpecialCheckItemDangerLogUpdateBO updateBO) {
- User sysUser = getSysUser();
- ResultVO resultVO = new ResultVO<>();
- resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
-
- if (updateBO.getIndexId() == null){
- resultVO.setMsg("检查项为空");
- return resultVO;
- }
- TbSpecialCheckItemLog specialCheckItemLogByIndexId = itemLogMapper.getSpecialCheckItemDangerLogByIndexId(updateBO.getIndexId());
- if (ObjectUtils.isEmpty(specialCheckItemLogByIndexId)){
- resultVO.setMsg("检查项不存在，删除失败");
- return resultVO;
- }
- TbSpecialCheckScoreAndDangerLog specialCheckScoreAndDangerLogById = scoreAndDangerDangerLogService.getSpecialCheckScoreAndDangerLogById(specialCheckItemLogByIndexId.getCheckItemId());
- if (!ObjectUtils.isEmpty(specialCheckScoreAndDangerLogById)){
- resultVO.setMsg("该检查项存在评价记录，无法删除");
- return resultVO;
- }
- TbSpecialCheckItemLog tbSpecialCheckItemLog = new TbSpecialCheckItemLog();
- LocalDateTime dateTime = LocalDateTime.now();
-
- tbSpecialCheckItemLog.setIndexId(updateBO.getIndexId());
- tbSpecialCheckItemLog.setUpdateDate(dateTime);
- tbSpecialCheckItemLog.setUpdateBy(sysUser.getUserName());
- tbSpecialCheckItemLog.setReportStatus((byte) 1);
- tbSpecialCheckItemLog.setDeleted((byte) 1);
-
- int deleteResult = itemLogMapper.deleteTbSpecialCheckItemDangerLog(tbSpecialCheckItemLog);
- if (deleteResult == 0){
- resultVO.setCode(ResultCodes.SERVER_DEL_ERROR.getCode());
- resultVO.setMsg(ResultCodes.SERVER_DEL_ERROR.getDesc());
- return resultVO;
- }
- resultVO.setCode(ResultCodes.OK.getCode());
- resultVO.setMsg("删除成功");
- return resultVO;
- }
-
- @Override
- public TbSpecialCheckItemLog getSpecialCheckItemDangerLogById(String id) {
- return itemLogMapper.getSpecialCheckItemDangerLogById(id);
- }
-
-
-}
+package com.ruoyi.project.tr.specialCheck.service.impl;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo;
+import com.ruoyi.doublePrevention.enums.ErrorCodes;
+import com.ruoyi.doublePrevention.enums.ResultCodes;
+import com.ruoyi.doublePrevention.repository.PreventCJReportDangerInfoRepository;
+import com.ruoyi.doublePrevention.vo.ResultVO;
+import com.ruoyi.project.system.user.domain.User;
+import com.ruoyi.project.tr.specialCheck.domin.*;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogBO;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogUpdateBO;
+import com.ruoyi.project.tr.specialCheck.mapper.*;
+import com.ruoyi.project.tr.specialCheck.service.SpecialCheckItemDangerLogService;
+import com.ruoyi.project.tr.specialCheck.service.SpecialCheckScoreAndDangerDangerLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.UUID;
+
+import static com.ruoyi.common.utils.security.ShiroUtils.getSysUser;
+
+@Service
+public class SpecialCheckItemDangerLogServiceImpl implements SpecialCheckItemDangerLogService {
+
+ @Autowired
+ private TbSpecialCheckItemLogMapper itemLogMapper;
+
+ @Autowired
+ private TbBaseCheckTaskMapper baseCheckTaskMapper;
+
+ @Autowired
+ private TbBaseCheckItemMapper baseCheckItemMapper;
+
+ @Autowired
+ private TbBaseCheckScoreMapper baseCheckScoreMapper;
+
+ @Autowired
+ private PreventCJReportDangerInfoRepository preventCJReportDangerInfoRepository;
+
+ @Autowired
+ private SpecialCheckScoreAndDangerDangerLogService scoreAndDangerDangerLogService;
+
+ @Override
+ public ResultVO<List<TbSpecialCheckItemLog>> selectSpecialCheckItemDangerLogPage(TbSpecialCheckItemDangerLogBO itemDangerLogBO) {
+ Integer pageIndex = itemDangerLogBO.getPageNum();
+ Integer pageSize = itemDangerLogBO.getPageSize();
+ if (pageIndex == 0 || pageSize == 0){
+ return new ResultVO<>(ErrorCodes.REQUEST_PARAM_ERROR.getCode(),"当前页码或当前页显示数不能为0");
+ }
+
+ Page<TbSpecialCheckItemLog> page = PageHelper.startPage(pageIndex, pageSize);
+ itemLogMapper.selectSpecialCheckItemDangerLogPage(itemDangerLogBO);
+
+ Long total = page.getTotal();
+ int count = total.intValue();
+ List<TbSpecialCheckItemLog> pageResult = null;
+
+ ResultVO<List<TbSpecialCheckItemLog>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);
+
+ resultVO.setData(page.getResult());
+ resultVO.setCount(count);
+ resultVO.setCount((int) page.getTotal());
+ resultVO.setPageNum(page.getPageNum());
+ resultVO.setPageSize(page.getPageSize());
+ return resultVO;
+ }
+
+ @Override
+ public ResultVO<TbSpecialCheckItemLog> addSpecialItemDanger(TbSpecialCheckItemDangerLog itemDangerLog) {
+ User sysUser = getSysUser();
+ ResultVO resultVO = new ResultVO<>();
+ resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
+
+ if (itemDangerLog.getTaskId() == null){
+ resultVO.setMsg("任务不能为空");
+ return resultVO;
+ }
+ TbBaseCheckTask baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(itemDangerLog.getTaskId());
+ if (ObjectUtils.isEmpty(baseCheckTaskByTaskId)){
+ resultVO.setMsg("任务不存在");
+ return resultVO;
+ }
+ if (itemDangerLog.getCheckItemId() == null){
+ resultVO.setMsg("检查项不能为空");
+ return resultVO;
+ }
+ TbBaseCheckItem baseCheckItemByItemId = baseCheckItemMapper.getBaseCheckItemByItemId(itemDangerLog.getCheckItemId());
+ if (ObjectUtils.isEmpty(baseCheckItemByItemId)){
+ resultVO.setMsg("检查项不存在");
+ return resultVO;
+ }
+
+ TbSpecialCheckItemLog itemLog = new TbSpecialCheckItemLog();
+
+ LocalDateTime dateTime = LocalDateTime.now();
+ String uuid = UUID.randomUUID().toString();
+
+ itemLog.setId(uuid);
+ itemLog.setCompanyCode("652310082");
+ itemLog.setCheckItemId(itemDangerLog.getCheckItemId());
+ itemLog.setTaskId(itemDangerLog.getTaskId());
+ itemLog.setCheckName(baseCheckItemByItemId.getCheckName());
+ itemLog.setCheckContent(baseCheckItemByItemId.getCheckContent());
+ itemLog.setCheckWay(baseCheckItemByItemId.getCheckWay());
+ itemLog.setCheckBasis(baseCheckItemByItemId.getCheckBasis());
+ itemLog.setApplicablePlace(baseCheckItemByItemId.getApplicablePlace());
+ itemLog.setDeleted((byte) 0);
+ itemLog.setCreateDate(dateTime);
+ itemLog.setUpdateDate(dateTime);
+ itemLog.setCreateBy(sysUser.getUserName());
+ itemLog.setUpdateBy(sysUser.getUserName());
+ itemLog.setReportStatus((byte) 1);
+ itemLog.setReportTime(null);
+
+
+
+ int saveResult = itemLogMapper.save(itemLog);
+ if (saveResult == 0){
+ resultVO.setCode(ResultCodes.SERVER_ADD_ERROR.getCode());
+ resultVO.setMsg(ResultCodes.SERVER_ADD_ERROR.getDesc());
+ return resultVO;
+ }
+ resultVO.setCode(ResultCodes.OK.getCode());
+ resultVO.setMsg("新增检查成功");
+ return resultVO;
+ }
+
+ @Override
+ public TbSpecialCheckItemLog getSpecialCheckItemDangerLogByIndexId(Long indexId) {
+ return itemLogMapper.getSpecialCheckItemDangerLogByIndexId(indexId);
+ }
+
+ @Override
+ public ResultVO<TbSpecialCheckItemLog> updateSpecialCheckItemDangerLog(TbSpecialCheckItemDangerLogUpdateBO updateBO) {
+ User sysUser = getSysUser();
+ ResultVO resultVO = new ResultVO<>();
+ resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
+
+ if (updateBO.getIndexId() == null){
+ resultVO.setMsg("任务不能为空");
+ return resultVO;
+ }
+ if (updateBO.getTaskId() == null){
+ resultVO.setMsg("专项任务不能为空");
+ return resultVO;
+ }
+ TbBaseCheckTask baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(updateBO.getTaskId());
+ if (ObjectUtils.isEmpty(baseCheckTaskByTaskId)){
+ resultVO.setMsg("专项任务不存在");
+ return resultVO;
+ }
+ if (updateBO.getCheckItemId() == null){
+ resultVO.setMsg("检查项不能为空");
+ return resultVO;
+ }
+ TbBaseCheckItem baseCheckItemByItemId = baseCheckItemMapper.getBaseCheckItemByItemId(updateBO.getCheckItemId());
+ if (ObjectUtils.isEmpty(baseCheckItemByItemId)){
+ resultVO.setMsg("检查项不存在");
+ return resultVO;
+ }
+
+ TbSpecialCheckItemLog itemLog = new TbSpecialCheckItemLog();
+ LocalDateTime dateTime = LocalDateTime.now();
+
+ updateBO.setUpdateDate(dateTime);
+ updateBO.setUpdateBy(sysUser.getUserName());
+ updateBO.setReportStatus((byte) 1);
+
+ itemLog.setCheckItemId(updateBO.getCheckItemId());
+ itemLog.setTaskId(updateBO.getTaskId());
+ itemLog.setCheckName(baseCheckItemByItemId.getCheckName());
+ itemLog.setCheckContent(baseCheckItemByItemId.getCheckContent());
+ itemLog.setCheckWay(baseCheckItemByItemId.getCheckWay());
+ itemLog.setCheckBasis(baseCheckItemByItemId.getCheckBasis());
+ itemLog.setApplicablePlace(baseCheckItemByItemId.getApplicablePlace());
+
+
+ int updateResult = itemLogMapper.updateSpecialCheckItemDangerLogById(itemLog);
+ if (updateResult == 0){
+ resultVO.setCode(ResultCodes.SERVER_UPDATE_ERROR.getCode());
+ resultVO.setMsg(ResultCodes.SERVER_UPDATE_ERROR.getDesc());
+ return resultVO;
+ }
+ resultVO.setCode(ResultCodes.OK.getCode());
+ resultVO.setMsg("更新成功");
+ return resultVO;
+ }
+
+ @Override
+ public ResultVO<TbSpecialCheckItemLog> deleteTbSpecialItemDangerTaskLog(TbSpecialCheckItemDangerLogUpdateBO updateBO) {
+ User sysUser = getSysUser();
+ ResultVO resultVO = new ResultVO<>();
+ resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
+
+ if (updateBO.getIndexId() == null){
+ resultVO.setMsg("检查项为空");
+ return resultVO;
+ }
+ TbSpecialCheckItemLog specialCheckItemLogByIndexId = itemLogMapper.getSpecialCheckItemDangerLogByIndexId(updateBO.getIndexId());
+ if (ObjectUtils.isEmpty(specialCheckItemLogByIndexId)){
+ resultVO.setMsg("检查项不存在，删除失败");
+ return resultVO;
+ }
+ TbSpecialCheckScoreAndDangerLog specialCheckScoreAndDangerLogById = scoreAndDangerDangerLogService.getSpecialCheckScoreAndDangerLogById(specialCheckItemLogByIndexId.getCheckItemId());
+ if (!ObjectUtils.isEmpty(specialCheckScoreAndDangerLogById)){
+ resultVO.setMsg("该检查项存在评价记录，无法删除");
+ return resultVO;
+ }
+ TbSpecialCheckItemLog tbSpecialCheckItemLog = new TbSpecialCheckItemLog();
+ LocalDateTime dateTime = LocalDateTime.now();
+
+ tbSpecialCheckItemLog.setIndexId(updateBO.getIndexId());
+ tbSpecialCheckItemLog.setUpdateDate(dateTime);
+ tbSpecialCheckItemLog.setUpdateBy(sysUser.getUserName());
+ tbSpecialCheckItemLog.setReportStatus((byte) 1);
+ tbSpecialCheckItemLog.setDeleted((byte) 1);
+
+ int deleteResult = itemLogMapper.deleteTbSpecialCheckItemDangerLog(tbSpecialCheckItemLog);
+ if (deleteResult == 0){
+ resultVO.setCode(ResultCodes.SERVER_DEL_ERROR.getCode());
+ resultVO.setMsg(ResultCodes.SERVER_DEL_ERROR.getDesc());
+ return resultVO;
+ }
+ resultVO.setCode(ResultCodes.OK.getCode());
+ resultVO.setMsg("删除成功");
+ return resultVO;
+ }
+
+ @Override
+ public TbSpecialCheckItemLog getSpecialCheckItemDangerLogById(String id) {
+ return itemLogMapper.getSpecialCheckItemDangerLogById(id);
+ }
+
+
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckScoreAndDangerLogServiceImpl.java b/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckScoreAndDangerLogServiceImpl.java
index a934587..de81c69 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckScoreAndDangerLogServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckScoreAndDangerLogServiceImpl.java
@@ -1,287 +1,287 @@
-package com.ruoyi.project.tr.specialCheck.service.impl;
-
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
-import com.ruoyi.common.utils.BeanCopyUtils;
-import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo;
-import com.ruoyi.doublePrevention.enums.ErrorCodes;
-import com.ruoyi.doublePrevention.enums.ResultCodes;
-import com.ruoyi.doublePrevention.repository.PreventCJReportDangerInfoRepository;
-import com.ruoyi.doublePrevention.vo.ResultVO;
-import com.ruoyi.project.system.user.domain.User;
-import com.ruoyi.project.tr.specialCheck.domin.*;
-import com.ruoyi.project.tr.specialCheck.domin.BO.HandlerSpecialCheckReportParam;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckScoreAndDangerLogEditBO;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckScoreAndDangerLogQueryBO;
-import com.ruoyi.project.tr.specialCheck.mapper.*;
-import com.ruoyi.project.tr.specialCheck.service.SpecialCheckScoreAndDangerDangerLogService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.util.List;
-import java.util.UUID;
-
-import static com.ruoyi.common.utils.security.ShiroUtils.getSysUser;
-
-@Service
-public class SpecialCheckScoreAndDangerLogServiceImpl implements SpecialCheckScoreAndDangerDangerLogService {
-
- @Autowired
- private TbSpecialCheckScoreAndDangerLogMapper scoreAndDangerLogMapper;
-
- @Autowired
- private TbBaseCheckTaskMapper baseCheckTaskMapper;
-
- @Autowired
- private TbBaseCheckItemMapper baseCheckItemMapper;
-
- @Autowired
- private TbBaseCheckScoreMapper baseCheckScoreMapper;
-
- @Autowired
- private PreventCJReportDangerInfoRepository preventCJReportDangerInfoRepository;
-
- @Autowired
- private TbSpecialCheckItemLogMapper specialCheckItemLogMapper;
-
-
-
- @Override
- public ResultVO<List<TbSpecialCheckScoreAndDangerLog>> selectSpecialCheckScoreAndDangerLogPage(TbSpecialCheckScoreAndDangerLogQueryBO scoreAndDangerLogBO) {
- Integer pageIndex = scoreAndDangerLogBO.getPageNum();
- Integer pageSize = scoreAndDangerLogBO.getPageSize();
- if (pageIndex == 0 || pageSize == 0){
- return new ResultVO<>(ErrorCodes.REQUEST_PARAM_ERROR.getCode(),"当前页码或当前页显示数不能为0");
- }
-
- Page<TbSpecialCheckScoreAndDangerLog> page = PageHelper.startPage(pageIndex, pageSize);
- scoreAndDangerLogMapper.selectSpecialCheckScoreAndDangerLogPage(scoreAndDangerLogBO);
-
- Long total = page.getTotal();
- int count = total.intValue();
- List<TbSpecialCheckScoreAndDangerLog> pageResult = null;
-
- ResultVO<List<TbSpecialCheckScoreAndDangerLog>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);
-
- resultVO.setData(page.getResult());
- resultVO.setCount(count);
- resultVO.setCount((int) page.getTotal());
- resultVO.setPageNum(page.getPageNum());
- resultVO.setPageSize(page.getPageSize());
- return resultVO;
- }
-
- @Override
- public ResultVO<TbSpecialCheckScoreAndDangerLog> addSpecialScoreAndDanger(TbSpecialCheckScoreAndDangerLogEditBO scoreAndDangerEditLog) {
- User sysUser = getSysUser();
- ResultVO resultVO = new ResultVO<>();
- resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
- TbSpecialCheckScoreAndDangerLog scoreAndDangerLog = BeanCopyUtils.copyBean(scoreAndDangerEditLog, TbSpecialCheckScoreAndDangerLog.class);
-
- if (scoreAndDangerLog.getCheckItemId() == null){
- resultVO.setMsg("检查项不能为空");
- return resultVO;
- }
- TbBaseCheckItem baseCheckItemByItemId = baseCheckItemMapper.getBaseCheckItemByItemId(scoreAndDangerLog.getCheckItemId());
- if (ObjectUtils.isEmpty(baseCheckItemByItemId)){
- resultVO.setMsg("检查项不存在");
- return resultVO;
- }
- if (scoreAndDangerLog.getCheckScoreId() == null){
- resultVO.setMsg("评分不能为空");
- return resultVO;
- }
- TbBaseCheckScore baseCheckScoreByScoreId = baseCheckScoreMapper.getBaseCheckScoreByScoreId(scoreAndDangerLog.getCheckScoreId());
- if (ObjectUtils.isEmpty(baseCheckScoreByScoreId)){
- resultVO.setMsg("评分标准不存在");
- return resultVO;
- }
- if (scoreAndDangerLog.getDangerId() == null){
- resultVO.setMsg("关联隐患不能为空");
- return resultVO;
- }
- PreventCJReportDangerInfo dangerById = preventCJReportDangerInfoRepository.getDangerById(scoreAndDangerLog.getDangerId());
- if (ObjectUtils.isEmpty(dangerById)){
- resultVO.setMsg("隐患不存在");
- return resultVO;
- }
- if (scoreAndDangerEditLog.getCheckDate() == null){
- resultVO.setMsg("检查时间不能为空");
- return resultVO;
- }
- if (scoreAndDangerLog.getCheckType() == null){
- resultVO.setMsg("检查类型不能为空");
- return resultVO;
- }
- TbBaseCheckTask baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(baseCheckItemByItemId.getTaskId());
- if (ObjectUtils.isEmpty(baseCheckTaskByTaskId)){
- resultVO.setMsg("专项任务不存在");
- return resultVO;
- }
-
- LocalDateTime dateTime = LocalDateTime.now();
- String uuid = UUID.randomUUID().toString();
-
- scoreAndDangerLog.setId(uuid);
- scoreAndDangerLog.setCompanyCode("652310082");
- scoreAndDangerLog.setCreateDate(dateTime);
- scoreAndDangerLog.setUpdateDate(dateTime);
- scoreAndDangerLog.setCreateBy(sysUser.getUserName());
- scoreAndDangerLog.setUpdateBy(sysUser.getUserName());
- scoreAndDangerLog.setReportStatus((byte) 1);
- scoreAndDangerLog.setReportTime(null);
- scoreAndDangerLog.setDeleted((byte) 0);
- scoreAndDangerLog.setDangerName(dangerById.getDangerName());
- scoreAndDangerLog.setIsReject(baseCheckScoreByScoreId.getIsReject());
- scoreAndDangerLog.setDeductPoint(baseCheckScoreByScoreId.getDeductPoint());
- scoreAndDangerLog.setDeductIllustrate(baseCheckScoreByScoreId.getDeductIllustrate());
- scoreAndDangerLog.setTaskId(baseCheckItemByItemId.getTaskId());
- scoreAndDangerLog.setCheckDate(LocalDateTime.ofInstant(scoreAndDangerEditLog.getCheckDate().toInstant(), ZoneId.systemDefault()));
-
-
-
-
- int saveResult = scoreAndDangerLogMapper.save(scoreAndDangerLog);
- if (saveResult == 0){
- resultVO.setCode(ResultCodes.SERVER_ADD_ERROR.getCode());
- resultVO.setMsg(ResultCodes.SERVER_ADD_ERROR.getDesc());
- return resultVO;
- }
-// HandlerSpecialCheckReportParam specialCheckItemLog = new HandlerSpecialCheckReportParam();
-// specialCheckItemLog.setId();
-// specialCheckItemLog.setReportStatus((byte) 2);
-// specialCheckItemLog.setReportTime(dateTime);
-// int i = specialCheckItemLogMapper.updateItemDangerReportStatusById(specialCheckItemLog);
-// if (i == 0){
-// resultVO.setCode(ResultCodes.SERVER_ADD_ERROR.getCode());
-// resultVO.setMsg("修改检查项状态失败");
-// return resultVO;
-// }
- resultVO.setCode(ResultCodes.OK.getCode());
- resultVO.setMsg("新增检查成功");
- return resultVO;
- }
-
- @Override
- public TbSpecialCheckScoreAndDangerLog getSpecialCheckScoreAndDangerLogByIndexId(Long indexId) {
- return scoreAndDangerLogMapper.getSpecialCheckScoreAndDangerLogByIndexId(indexId);
- }
-
- @Override
- public ResultVO<TbSpecialCheckScoreAndDangerLog> updateSpecialCheckScoreAndDangerLog(TbSpecialCheckScoreAndDangerLogEditBO scoreAndDangerEditLog) {
- User sysUser = getSysUser();
- ResultVO resultVO = new ResultVO<>();
- resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
-
- TbSpecialCheckScoreAndDangerLog scoreAndDangerLog = BeanCopyUtils.copyBean(scoreAndDangerEditLog, TbSpecialCheckScoreAndDangerLog.class);
-
- if (scoreAndDangerLog.getCheckItemId() == null){
- resultVO.setMsg("检查项不能为空");
- return resultVO;
- }
- TbBaseCheckItem baseCheckItemByItemId = baseCheckItemMapper.getBaseCheckItemByItemId(scoreAndDangerLog.getCheckItemId());
- if (ObjectUtils.isEmpty(baseCheckItemByItemId)){
- resultVO.setMsg("检查项不存在");
- return resultVO;
- }
- if (scoreAndDangerLog.getCheckScoreId() == null){
- resultVO.setMsg("评分不能为空");
- return resultVO;
- }
- TbBaseCheckScore baseCheckScoreByScoreId = baseCheckScoreMapper.getBaseCheckScoreByScoreId(scoreAndDangerLog.getCheckScoreId());
- if (ObjectUtils.isEmpty(baseCheckScoreByScoreId)){
- resultVO.setMsg("评分标准不存在");
- return resultVO;
- }
- if (scoreAndDangerLog.getDangerId() == null){
- resultVO.setMsg("关联隐患不能为空");
- return resultVO;
- }
- PreventCJReportDangerInfo dangerById = preventCJReportDangerInfoRepository.getDangerById(scoreAndDangerLog.getDangerId());
- if (ObjectUtils.isEmpty(dangerById)){
- resultVO.setMsg("隐患不存在");
- return resultVO;
- }
- if (scoreAndDangerEditLog.getCheckDate() == null){
- resultVO.setMsg("检查时间不能为空");
- return resultVO;
- }
- if (scoreAndDangerLog.getCheckType() == null){
- resultVO.setMsg("检查类型不能为空");
- return resultVO;
- }
- TbBaseCheckTask baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(baseCheckItemByItemId.getTaskId());
- if (ObjectUtils.isEmpty(baseCheckTaskByTaskId)){
- resultVO.setMsg("专项任务不存在");
- return resultVO;
- }
-
- LocalDateTime dateTime = LocalDateTime.now();
-
- scoreAndDangerLog.setUpdateDate(dateTime);
- scoreAndDangerLog.setUpdateBy(sysUser.getUserName());
- scoreAndDangerLog.setReportStatus((byte) 1);
-
- scoreAndDangerLog.setDangerName(dangerById.getDangerName());
- scoreAndDangerLog.setIsReject(baseCheckScoreByScoreId.getIsReject());
- scoreAndDangerLog.setDeductPoint(baseCheckScoreByScoreId.getDeductPoint());
- scoreAndDangerLog.setDeductIllustrate(baseCheckScoreByScoreId.getDeductIllustrate());
- scoreAndDangerLog.setCheckDate(LocalDateTime.ofInstant(scoreAndDangerEditLog.getCheckDate().toInstant(), ZoneId.systemDefault()));
-
- int updateResult = scoreAndDangerLogMapper.updateSpecialCheckScoreAndDangerLogById(scoreAndDangerLog);
- if (updateResult == 0){
- resultVO.setCode(ResultCodes.SERVER_UPDATE_ERROR.getCode());
- resultVO.setMsg(ResultCodes.SERVER_UPDATE_ERROR.getDesc());
- return resultVO;
- }
- resultVO.setCode(ResultCodes.OK.getCode());
- resultVO.setMsg("更新成功");
- return resultVO;
- }
-
- @Override
- public ResultVO<TbSpecialCheckScoreAndDangerLog> deleteTbSpecialScoreAndDangerLog(TbSpecialCheckScoreAndDangerLog scoreAndDangerLog) {
- User sysUser = getSysUser();
- ResultVO resultVO = new ResultVO<>();
- resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
-
- if (scoreAndDangerLog.getIndexId() == null){
- resultVO.setMsg("评分项为空");
- return resultVO;
- }
- TbSpecialCheckScoreAndDangerLog specialCheckScoreAndDangerLogByIndexId = scoreAndDangerLogMapper.getSpecialCheckScoreAndDangerLogByIndexId(scoreAndDangerLog.getIndexId());
- if (ObjectUtils.isEmpty(specialCheckScoreAndDangerLogByIndexId)){
- resultVO.setMsg("评分项不存在，删除失败");
- return resultVO;
- }
-
- TbSpecialCheckScoreAndDangerLog tbSpecialCheckItemDangerLog = new TbSpecialCheckScoreAndDangerLog();
- LocalDateTime dateTime = LocalDateTime.now();
-
- tbSpecialCheckItemDangerLog.setIndexId(scoreAndDangerLog.getIndexId());
- tbSpecialCheckItemDangerLog.setUpdateDate(dateTime);
- tbSpecialCheckItemDangerLog.setUpdateBy(sysUser.getUserName());
- tbSpecialCheckItemDangerLog.setReportStatus((byte) 1);
- tbSpecialCheckItemDangerLog.setDeleted((byte) 1);
-
- int deleteResult = scoreAndDangerLogMapper.deleteTbSpecialCheckScoreAndDangerLog(tbSpecialCheckItemDangerLog);
- if (deleteResult == 0){
- resultVO.setCode(ResultCodes.SERVER_DEL_ERROR.getCode());
- resultVO.setMsg(ResultCodes.SERVER_DEL_ERROR.getDesc());
- return resultVO;
- }
- resultVO.setCode(ResultCodes.OK.getCode());
- resultVO.setMsg("删除成功");
- return resultVO;
- }
-
- @Override
- public TbSpecialCheckScoreAndDangerLog getSpecialCheckScoreAndDangerLogById(String id) {
- return scoreAndDangerLogMapper.getSpecialCheckScoreAndDangerLogById(id);
- }
-
-
-}
+package com.ruoyi.project.tr.specialCheck.service.impl;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.ruoyi.common.utils.BeanCopyUtils;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo;
+import com.ruoyi.doublePrevention.enums.ErrorCodes;
+import com.ruoyi.doublePrevention.enums.ResultCodes;
+import com.ruoyi.doublePrevention.repository.PreventCJReportDangerInfoRepository;
+import com.ruoyi.doublePrevention.vo.ResultVO;
+import com.ruoyi.project.system.user.domain.User;
+import com.ruoyi.project.tr.specialCheck.domin.*;
+import com.ruoyi.project.tr.specialCheck.domin.BO.HandlerSpecialCheckReportParam;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckScoreAndDangerLogEditBO;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckScoreAndDangerLogQueryBO;
+import com.ruoyi.project.tr.specialCheck.mapper.*;
+import com.ruoyi.project.tr.specialCheck.service.SpecialCheckScoreAndDangerDangerLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.List;
+import java.util.UUID;
+
+import static com.ruoyi.common.utils.security.ShiroUtils.getSysUser;
+
+@Service
+public class SpecialCheckScoreAndDangerLogServiceImpl implements SpecialCheckScoreAndDangerDangerLogService {
+
+ @Autowired
+ private TbSpecialCheckScoreAndDangerLogMapper scoreAndDangerLogMapper;
+
+ @Autowired
+ private TbBaseCheckTaskMapper baseCheckTaskMapper;
+
+ @Autowired
+ private TbBaseCheckItemMapper baseCheckItemMapper;
+
+ @Autowired
+ private TbBaseCheckScoreMapper baseCheckScoreMapper;
+
+ @Autowired
+ private PreventCJReportDangerInfoRepository preventCJReportDangerInfoRepository;
+
+ @Autowired
+ private TbSpecialCheckItemLogMapper specialCheckItemLogMapper;
+
+
+
+ @Override
+ public ResultVO<List<TbSpecialCheckScoreAndDangerLog>> selectSpecialCheckScoreAndDangerLogPage(TbSpecialCheckScoreAndDangerLogQueryBO scoreAndDangerLogBO) {
+ Integer pageIndex = scoreAndDangerLogBO.getPageNum();
+ Integer pageSize = scoreAndDangerLogBO.getPageSize();
+ if (pageIndex == 0 || pageSize == 0){
+ return new ResultVO<>(ErrorCodes.REQUEST_PARAM_ERROR.getCode(),"当前页码或当前页显示数不能为0");
+ }
+
+ Page<TbSpecialCheckScoreAndDangerLog> page = PageHelper.startPage(pageIndex, pageSize);
+ scoreAndDangerLogMapper.selectSpecialCheckScoreAndDangerLogPage(scoreAndDangerLogBO);
+
+ Long total = page.getTotal();
+ int count = total.intValue();
+ List<TbSpecialCheckScoreAndDangerLog> pageResult = null;
+
+ ResultVO<List<TbSpecialCheckScoreAndDangerLog>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);
+
+ resultVO.setData(page.getResult());
+ resultVO.setCount(count);
+ resultVO.setCount((int) page.getTotal());
+ resultVO.setPageNum(page.getPageNum());
+ resultVO.setPageSize(page.getPageSize());
+ return resultVO;
+ }
+
+ @Override
+ public ResultVO<TbSpecialCheckScoreAndDangerLog> addSpecialScoreAndDanger(TbSpecialCheckScoreAndDangerLogEditBO scoreAndDangerEditLog) {
+ User sysUser = getSysUser();
+ ResultVO resultVO = new ResultVO<>();
+ resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
+ TbSpecialCheckScoreAndDangerLog scoreAndDangerLog = BeanCopyUtils.copyBean(scoreAndDangerEditLog, TbSpecialCheckScoreAndDangerLog.class);
+
+ if (scoreAndDangerLog.getCheckItemId() == null){
+ resultVO.setMsg("检查项不能为空");
+ return resultVO;
+ }
+ TbBaseCheckItem baseCheckItemByItemId = baseCheckItemMapper.getBaseCheckItemByItemId(scoreAndDangerLog.getCheckItemId());
+ if (ObjectUtils.isEmpty(baseCheckItemByItemId)){
+ resultVO.setMsg("检查项不存在");
+ return resultVO;
+ }
+ if (scoreAndDangerLog.getCheckScoreId() == null){
+ resultVO.setMsg("评分不能为空");
+ return resultVO;
+ }
+ TbBaseCheckScore baseCheckScoreByScoreId = baseCheckScoreMapper.getBaseCheckScoreByScoreId(scoreAndDangerLog.getCheckScoreId());
+ if (ObjectUtils.isEmpty(baseCheckScoreByScoreId)){
+ resultVO.setMsg("评分标准不存在");
+ return resultVO;
+ }
+ if (scoreAndDangerLog.getDangerId() == null){
+ resultVO.setMsg("关联隐患不能为空");
+ return resultVO;
+ }
+ PreventCJReportDangerInfo dangerById = preventCJReportDangerInfoRepository.getDangerById(scoreAndDangerLog.getDangerId());
+ if (ObjectUtils.isEmpty(dangerById)){
+ resultVO.setMsg("隐患不存在");
+ return resultVO;
+ }
+ if (scoreAndDangerEditLog.getCheckDate() == null){
+ resultVO.setMsg("检查时间不能为空");
+ return resultVO;
+ }
+ if (scoreAndDangerLog.getCheckType() == null){
+ resultVO.setMsg("检查类型不能为空");
+ return resultVO;
+ }
+ TbBaseCheckTask baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(baseCheckItemByItemId.getTaskId());
+ if (ObjectUtils.isEmpty(baseCheckTaskByTaskId)){
+ resultVO.setMsg("专项任务不存在");
+ return resultVO;
+ }
+
+ LocalDateTime dateTime = LocalDateTime.now();
+ String uuid = UUID.randomUUID().toString();
+
+ scoreAndDangerLog.setId(uuid);
+ scoreAndDangerLog.setCompanyCode("652310082");
+ scoreAndDangerLog.setCreateDate(dateTime);
+ scoreAndDangerLog.setUpdateDate(dateTime);
+ scoreAndDangerLog.setCreateBy(sysUser.getUserName());
+ scoreAndDangerLog.setUpdateBy(sysUser.getUserName());
+ scoreAndDangerLog.setReportStatus((byte) 1);
+ scoreAndDangerLog.setReportTime(null);
+ scoreAndDangerLog.setDeleted((byte) 0);
+ scoreAndDangerLog.setDangerName(dangerById.getDangerName());
+ scoreAndDangerLog.setIsReject(baseCheckScoreByScoreId.getIsReject());
+ scoreAndDangerLog.setDeductPoint(baseCheckScoreByScoreId.getDeductPoint());
+ scoreAndDangerLog.setDeductIllustrate(baseCheckScoreByScoreId.getDeductIllustrate());
+ scoreAndDangerLog.setTaskId(baseCheckItemByItemId.getTaskId());
+ scoreAndDangerLog.setCheckDate(LocalDateTime.ofInstant(scoreAndDangerEditLog.getCheckDate().toInstant(), ZoneId.systemDefault()));
+
+
+
+
+ int saveResult = scoreAndDangerLogMapper.save(scoreAndDangerLog);
+ if (saveResult == 0){
+ resultVO.setCode(ResultCodes.SERVER_ADD_ERROR.getCode());
+ resultVO.setMsg(ResultCodes.SERVER_ADD_ERROR.getDesc());
+ return resultVO;
+ }
+// HandlerSpecialCheckReportParam specialCheckItemLog = new HandlerSpecialCheckReportParam();
+// specialCheckItemLog.setId();
+// specialCheckItemLog.setReportStatus((byte) 2);
+// specialCheckItemLog.setReportTime(dateTime);
+// int i = specialCheckItemLogMapper.updateItemDangerReportStatusById(specialCheckItemLog);
+// if (i == 0){
+// resultVO.setCode(ResultCodes.SERVER_ADD_ERROR.getCode());
+// resultVO.setMsg("修改检查项状态失败");
+// return resultVO;
+// }
+ resultVO.setCode(ResultCodes.OK.getCode());
+ resultVO.setMsg("新增检查成功");
+ return resultVO;
+ }
+
+ @Override
+ public TbSpecialCheckScoreAndDangerLog getSpecialCheckScoreAndDangerLogByIndexId(Long indexId) {
+ return scoreAndDangerLogMapper.getSpecialCheckScoreAndDangerLogByIndexId(indexId);
+ }
+
+ @Override
+ public ResultVO<TbSpecialCheckScoreAndDangerLog> updateSpecialCheckScoreAndDangerLog(TbSpecialCheckScoreAndDangerLogEditBO scoreAndDangerEditLog) {
+ User sysUser = getSysUser();
+ ResultVO resultVO = new ResultVO<>();
+ resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
+
+ TbSpecialCheckScoreAndDangerLog scoreAndDangerLog = BeanCopyUtils.copyBean(scoreAndDangerEditLog, TbSpecialCheckScoreAndDangerLog.class);
+
+ if (scoreAndDangerLog.getCheckItemId() == null){
+ resultVO.setMsg("检查项不能为空");
+ return resultVO;
+ }
+ TbBaseCheckItem baseCheckItemByItemId = baseCheckItemMapper.getBaseCheckItemByItemId(scoreAndDangerLog.getCheckItemId());
+ if (ObjectUtils.isEmpty(baseCheckItemByItemId)){
+ resultVO.setMsg("检查项不存在");
+ return resultVO;
+ }
+ if (scoreAndDangerLog.getCheckScoreId() == null){
+ resultVO.setMsg("评分不能为空");
+ return resultVO;
+ }
+ TbBaseCheckScore baseCheckScoreByScoreId = baseCheckScoreMapper.getBaseCheckScoreByScoreId(scoreAndDangerLog.getCheckScoreId());
+ if (ObjectUtils.isEmpty(baseCheckScoreByScoreId)){
+ resultVO.setMsg("评分标准不存在");
+ return resultVO;
+ }
+ if (scoreAndDangerLog.getDangerId() == null){
+ resultVO.setMsg("关联隐患不能为空");
+ return resultVO;
+ }
+ PreventCJReportDangerInfo dangerById = preventCJReportDangerInfoRepository.getDangerById(scoreAndDangerLog.getDangerId());
+ if (ObjectUtils.isEmpty(dangerById)){
+ resultVO.setMsg("隐患不存在");
+ return resultVO;
+ }
+ if (scoreAndDangerEditLog.getCheckDate() == null){
+ resultVO.setMsg("检查时间不能为空");
+ return resultVO;
+ }
+ if (scoreAndDangerLog.getCheckType() == null){
+ resultVO.setMsg("检查类型不能为空");
+ return resultVO;
+ }
+ TbBaseCheckTask baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(baseCheckItemByItemId.getTaskId());
+ if (ObjectUtils.isEmpty(baseCheckTaskByTaskId)){
+ resultVO.setMsg("专项任务不存在");
+ return resultVO;
+ }
+
+ LocalDateTime dateTime = LocalDateTime.now();
+
+ scoreAndDangerLog.setUpdateDate(dateTime);
+ scoreAndDangerLog.setUpdateBy(sysUser.getUserName());
+ scoreAndDangerLog.setReportStatus((byte) 1);
+
+ scoreAndDangerLog.setDangerName(dangerById.getDangerName());
+ scoreAndDangerLog.setIsReject(baseCheckScoreByScoreId.getIsReject());
+ scoreAndDangerLog.setDeductPoint(baseCheckScoreByScoreId.getDeductPoint());
+ scoreAndDangerLog.setDeductIllustrate(baseCheckScoreByScoreId.getDeductIllustrate());
+ scoreAndDangerLog.setCheckDate(LocalDateTime.ofInstant(scoreAndDangerEditLog.getCheckDate().toInstant(), ZoneId.systemDefault()));
+
+ int updateResult = scoreAndDangerLogMapper.updateSpecialCheckScoreAndDangerLogById(scoreAndDangerLog);
+ if (updateResult == 0){
+ resultVO.setCode(ResultCodes.SERVER_UPDATE_ERROR.getCode());
+ resultVO.setMsg(ResultCodes.SERVER_UPDATE_ERROR.getDesc());
+ return resultVO;
+ }
+ resultVO.setCode(ResultCodes.OK.getCode());
+ resultVO.setMsg("更新成功");
+ return resultVO;
+ }
+
+ @Override
+ public ResultVO<TbSpecialCheckScoreAndDangerLog> deleteTbSpecialScoreAndDangerLog(TbSpecialCheckScoreAndDangerLog scoreAndDangerLog) {
+ User sysUser = getSysUser();
+ ResultVO resultVO = new ResultVO<>();
+ resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
+
+ if (scoreAndDangerLog.getIndexId() == null){
+ resultVO.setMsg("评分项为空");
+ return resultVO;
+ }
+ TbSpecialCheckScoreAndDangerLog specialCheckScoreAndDangerLogByIndexId = scoreAndDangerLogMapper.getSpecialCheckScoreAndDangerLogByIndexId(scoreAndDangerLog.getIndexId());
+ if (ObjectUtils.isEmpty(specialCheckScoreAndDangerLogByIndexId)){
+ resultVO.setMsg("评分项不存在，删除失败");
+ return resultVO;
+ }
+
+ TbSpecialCheckScoreAndDangerLog tbSpecialCheckItemDangerLog = new TbSpecialCheckScoreAndDangerLog();
+ LocalDateTime dateTime = LocalDateTime.now();
+
+ tbSpecialCheckItemDangerLog.setIndexId(scoreAndDangerLog.getIndexId());
+ tbSpecialCheckItemDangerLog.setUpdateDate(dateTime);
+ tbSpecialCheckItemDangerLog.setUpdateBy(sysUser.getUserName());
+ tbSpecialCheckItemDangerLog.setReportStatus((byte) 1);
+ tbSpecialCheckItemDangerLog.setDeleted((byte) 1);
+
+ int deleteResult = scoreAndDangerLogMapper.deleteTbSpecialCheckScoreAndDangerLog(tbSpecialCheckItemDangerLog);
+ if (deleteResult == 0){
+ resultVO.setCode(ResultCodes.SERVER_DEL_ERROR.getCode());
+ resultVO.setMsg(ResultCodes.SERVER_DEL_ERROR.getDesc());
+ return resultVO;
+ }
+ resultVO.setCode(ResultCodes.OK.getCode());
+ resultVO.setMsg("删除成功");
+ return resultVO;
+ }
+
+ @Override
+ public TbSpecialCheckScoreAndDangerLog getSpecialCheckScoreAndDangerLogById(String id) {
+ return scoreAndDangerLogMapper.getSpecialCheckScoreAndDangerLogById(id);
+ }
+
+
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckTaskServiceImpl.java b/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckTaskServiceImpl.java
index 132f684..6188db0 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckTaskServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckTaskServiceImpl.java
@@ -1,230 +1,230 @@
-package com.ruoyi.project.tr.specialCheck.service.impl;
-
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
-import com.ruoyi.common.utils.BeanCopyUtils;
-import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
-import com.ruoyi.doublePrevention.enums.ErrorCodes;
-import com.ruoyi.doublePrevention.enums.ResultCodes;
-import com.ruoyi.doublePrevention.vo.ResultVO;
-import com.ruoyi.project.system.user.domain.User;
-import com.ruoyi.project.tr.riskList.domain.RiskList;
-import com.ruoyi.project.tr.riskList.service.IRiskListService;
-import com.ruoyi.project.tr.specialCheck.domin.BO.*;
-import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckTaskLog;
-import com.ruoyi.project.tr.specialCheck.mapper.*;
-import com.ruoyi.project.tr.specialCheck.service.SpecialCheckTaskService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
-
-import static com.ruoyi.common.utils.security.ShiroUtils.getSysUser;
-
-@Service
-public class SpecialCheckTaskServiceImpl implements SpecialCheckTaskService {
-
- @Autowired
- private TbBaseCheckCompanyMapper companyTbRepository;
- @Autowired
- private TbBaseCheckItemMapper itemTbRepository;
- @Autowired
- private TbBaseCheckScoreMapper scoreTbRepository;
- @Autowired
- private TbBaseCheckTaskMapper taskTbRepository;
- @Autowired
- private TbSpecialCheckTaskLogMapper taskSpecialLogMapper;
- @Autowired
- private IRiskListService riskListService;
-
- @Override
- public ResultVO<List<TbSpecialCheckTaskLog>> selectSpecialCheckTaskLogPage(TbSpecialCheckTaskLogBO specialCheckTaskLogBO) {
- Integer pageIndex = specialCheckTaskLogBO.getPageNum();
- Integer pageSize = specialCheckTaskLogBO.getPageSize();
- if (pageIndex == 0 || pageSize == 0){
- return new ResultVO<>(ErrorCodes.REQUEST_PARAM_ERROR.getCode(),"当前页码或当前页显示数不能为0");
- }
-
- Page<TbSpecialCheckTaskLog> page = PageHelper.startPage(pageIndex, pageSize);
- taskSpecialLogMapper.selectSpecialCheckTaskLogPage(specialCheckTaskLogBO);
-
- Long total = page.getTotal();
- int count = total.intValue();
- List<TbSpecialCheckTaskLog> pageResult = null;
-
- ResultVO<List<TbSpecialCheckTaskLog>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);
-
- resultVO.setData(page.getResult());
- resultVO.setCount(count);
- resultVO.setCount((int) page.getTotal());
- resultVO.setPageNum(page.getPageNum());
- resultVO.setPageSize(page.getPageSize());
- return resultVO;
- }
-
- @Override
- public ResultVO<TbSpecialCheckTaskLog> addSpecialTask(TbSpecialCheckTaskLogEditBO taskLogEditBO) {
- User sysUser = getSysUser();
- ResultVO resultVO = new ResultVO<>();
- resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
-
- TbSpecialCheckTaskLog tbSpecialCheckTaskLog = BeanCopyUtils.copyBean(taskLogEditBO, TbSpecialCheckTaskLog.class);
- if (tbSpecialCheckTaskLog.getHazardCode() == null){
- resultVO.setMsg("重大风险源不能为空");
- return resultVO;
- }
- RiskList infoByRiskListNum = riskListService.getInfoByRiskListNum(tbSpecialCheckTaskLog.getHazardCode());
- if (ObjectUtils.isEmpty(infoByRiskListNum)){
- resultVO.setMsg("请检查重大风险源是否存在");
- return resultVO;
- }
- if (tbSpecialCheckTaskLog.getTaskId() == null){
- resultVO.setMsg("专项任务不能为空");
- return resultVO;
- }
- if (tbSpecialCheckTaskLog.getCheckType() == null){
- resultVO.setMsg("检查类型不能为空");
- return resultVO;
- }
- if (tbSpecialCheckTaskLog.getResultStatus() == null){
- resultVO.setMsg("结果不能为空");
- return resultVO;
- }
- if (taskLogEditBO.getCheckDate() == null){
- resultVO.setMsg("检查日期不能为空");
- return resultVO;
- }
- LocalDateTime dateTime = LocalDateTime.now();
- String uuid = UUID.randomUUID().toString();
-
- tbSpecialCheckTaskLog.setId(uuid);
- tbSpecialCheckTaskLog.setHazardSource(infoByRiskListNum.getRiskListName());
- tbSpecialCheckTaskLog.setCompanyCode("652310082");
- tbSpecialCheckTaskLog.setCreateDate(dateTime);
- tbSpecialCheckTaskLog.setUpdateDate(dateTime);
- tbSpecialCheckTaskLog.setCreateBy(sysUser.getUserName());
- tbSpecialCheckTaskLog.setUpdateBy(sysUser.getUserName());
- tbSpecialCheckTaskLog.setReportStatus((byte) 1);
- tbSpecialCheckTaskLog.setReportTime(null);
- tbSpecialCheckTaskLog.setDeleted((byte) 0);
- tbSpecialCheckTaskLog.setCheckDate(LocalDateTime.ofInstant(taskLogEditBO.getCheckDate().toInstant(), ZoneId.systemDefault()));
-
- int saveResult = taskSpecialLogMapper.save(tbSpecialCheckTaskLog);
- if (saveResult == 0){
- resultVO.setCode(ResultCodes.SERVER_ADD_ERROR.getCode());
- resultVO.setMsg(ResultCodes.SERVER_ADD_ERROR.getDesc());
- return resultVO;
- }
- resultVO.setCode(ResultCodes.OK.getCode());
- resultVO.setMsg("新增任务成功");
- return resultVO;
- }
-
- @Override
- public TbSpecialCheckTaskLog getSpecialCheckTaskLogByIndexId(Long id) {
- return taskSpecialLogMapper.getSpecialCheckTaskLogByIndexId(id);
- }
-
- @Override
- public ResultVO<TbSpecialCheckTaskLog> updateSpecialCheckTaskLog(TbSpecialCheckTaskLogEditBO taskLogEditBO) {
- User sysUser = getSysUser();
- ResultVO resultVO = new ResultVO<>();
- resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
-
- TbSpecialCheckTaskLogUpdateBO updateBO = BeanCopyUtils.copyBean(taskLogEditBO, TbSpecialCheckTaskLogUpdateBO.class);
-
- if (updateBO.getIndexId() == null){
- resultVO.setMsg("任务不能为空");
- return resultVO;
- }
- TbSpecialCheckTaskLog specialCheckTaskLogByIndexId = taskSpecialLogMapper.getSpecialCheckTaskLogByIndexId(updateBO.getIndexId());
- if (ObjectUtils.isEmpty(specialCheckTaskLogByIndexId)){
- resultVO.setMsg("任务不存在");
- return resultVO;
- }
- if (updateBO.getHazardCode() == null){
- resultVO.setMsg("重大风险源不能为空");
- return resultVO;
- }
- RiskList infoByRiskListNum = riskListService.getInfoByRiskListNum(updateBO.getHazardCode());
- if (ObjectUtils.isEmpty(infoByRiskListNum)){
- resultVO.setMsg("请检查重大风险源是否存在");
- return resultVO;
- }
- if (updateBO.getTaskId() == null){
- resultVO.setMsg("专项任务不能为空");
- return resultVO;
- }
- if (updateBO.getCheckType() == null){
- resultVO.setMsg("检查类型不能为空");
- return resultVO;
- }
- if (updateBO.getResultStatus() == null){
- resultVO.setMsg("结果不能为空");
- return resultVO;
- }
- if (taskLogEditBO.getCheckDate() == null){
- resultVO.setMsg("检查日期不能为空");
- return resultVO;
- }
-
- LocalDateTime dateTime = LocalDateTime.now();
- updateBO.setHazardSource(infoByRiskListNum.getRiskListName());
- updateBO.setUpdateDate(dateTime);
- updateBO.setUpdateBy(sysUser.getUserName());
- updateBO.setReportStatus((byte) 1);
- updateBO.setCheckDate(LocalDateTime.ofInstant(taskLogEditBO.getCheckDate().toInstant(), ZoneId.systemDefault()));
-
- int updateResult = taskSpecialLogMapper.updateSpecialCheckTaskLogById(updateBO);
- if (updateResult == 0){
- resultVO.setCode(ResultCodes.SERVER_UPDATE_ERROR.getCode());
- resultVO.setMsg(ResultCodes.SERVER_UPDATE_ERROR.getDesc());
- return resultVO;
- }
- resultVO.setCode(ResultCodes.OK.getCode());
- resultVO.setMsg("更新任务成功");
- return resultVO;
- }
-
- @Override
- public ResultVO<TbSpecialCheckTaskLog> deleteTbSpecialCheckTaskLog(TbSpecialCheckTaskLogUpdateBO updateBO) {
- User sysUser = getSysUser();
- ResultVO resultVO = new ResultVO<>();
- resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
-
- if (updateBO.getIndexId() == null){
- resultVO.setMsg("任务为空，删除失败");
- return resultVO;
- }
- TbSpecialCheckTaskLog specialCheckTaskLogByIndexId = taskSpecialLogMapper.getSpecialCheckTaskLogByIndexId(updateBO.getIndexId());
- if (ObjectUtils.isEmpty(specialCheckTaskLogByIndexId)){
- resultVO.setMsg("任务不存在，删除失败");
- return resultVO;
- }
- TbSpecialCheckTaskLog tbSpecialCheckTaskLog = new TbSpecialCheckTaskLog();
- LocalDateTime dateTime = LocalDateTime.now();
-
- tbSpecialCheckTaskLog.setIndexId(updateBO.getIndexId());
- tbSpecialCheckTaskLog.setUpdateDate(dateTime);
- tbSpecialCheckTaskLog.setUpdateBy(sysUser.getUserName());
- tbSpecialCheckTaskLog.setReportStatus((byte) 1);
- tbSpecialCheckTaskLog.setDeleted((byte) 1);
-
- int deleteResult = taskSpecialLogMapper.deleteTbSpecialCheckTaskLog(tbSpecialCheckTaskLog);
- if (deleteResult == 0){
- resultVO.setCode(ResultCodes.SERVER_DEL_ERROR.getCode());
- resultVO.setMsg(ResultCodes.SERVER_DEL_ERROR.getDesc());
- return resultVO;
- }
- resultVO.setCode(ResultCodes.OK.getCode());
- resultVO.setMsg("删除成功");
- return resultVO;
- }
-
-
-}
+package com.ruoyi.project.tr.specialCheck.service.impl;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.ruoyi.common.utils.BeanCopyUtils;
+import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure;
+import com.ruoyi.doublePrevention.enums.ErrorCodes;
+import com.ruoyi.doublePrevention.enums.ResultCodes;
+import com.ruoyi.doublePrevention.vo.ResultVO;
+import com.ruoyi.project.system.user.domain.User;
+import com.ruoyi.project.tr.riskList.domain.RiskList;
+import com.ruoyi.project.tr.riskList.service.IRiskListService;
+import com.ruoyi.project.tr.specialCheck.domin.BO.*;
+import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckTaskLog;
+import com.ruoyi.project.tr.specialCheck.mapper.*;
+import com.ruoyi.project.tr.specialCheck.service.SpecialCheckTaskService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+import static com.ruoyi.common.utils.security.ShiroUtils.getSysUser;
+
+@Service
+public class SpecialCheckTaskServiceImpl implements SpecialCheckTaskService {
+
+ @Autowired
+ private TbBaseCheckCompanyMapper companyTbRepository;
+ @Autowired
+ private TbBaseCheckItemMapper itemTbRepository;
+ @Autowired
+ private TbBaseCheckScoreMapper scoreTbRepository;
+ @Autowired
+ private TbBaseCheckTaskMapper taskTbRepository;
+ @Autowired
+ private TbSpecialCheckTaskLogMapper taskSpecialLogMapper;
+ @Autowired
+ private IRiskListService riskListService;
+
+ @Override
+ public ResultVO<List<TbSpecialCheckTaskLog>> selectSpecialCheckTaskLogPage(TbSpecialCheckTaskLogBO specialCheckTaskLogBO) {
+ Integer pageIndex = specialCheckTaskLogBO.getPageNum();
+ Integer pageSize = specialCheckTaskLogBO.getPageSize();
+ if (pageIndex == 0 || pageSize == 0){
+ return new ResultVO<>(ErrorCodes.REQUEST_PARAM_ERROR.getCode(),"当前页码或当前页显示数不能为0");
+ }
+
+ Page<TbSpecialCheckTaskLog> page = PageHelper.startPage(pageIndex, pageSize);
+ taskSpecialLogMapper.selectSpecialCheckTaskLogPage(specialCheckTaskLogBO);
+
+ Long total = page.getTotal();
+ int count = total.intValue();
+ List<TbSpecialCheckTaskLog> pageResult = null;
+
+ ResultVO<List<TbSpecialCheckTaskLog>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);
+
+ resultVO.setData(page.getResult());
+ resultVO.setCount(count);
+ resultVO.setCount((int) page.getTotal());
+ resultVO.setPageNum(page.getPageNum());
+ resultVO.setPageSize(page.getPageSize());
+ return resultVO;
+ }
+
+ @Override
+ public ResultVO<TbSpecialCheckTaskLog> addSpecialTask(TbSpecialCheckTaskLogEditBO taskLogEditBO) {
+ User sysUser = getSysUser();
+ ResultVO resultVO = new ResultVO<>();
+ resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
+
+ TbSpecialCheckTaskLog tbSpecialCheckTaskLog = BeanCopyUtils.copyBean(taskLogEditBO, TbSpecialCheckTaskLog.class);
+ if (tbSpecialCheckTaskLog.getHazardCode() == null){
+ resultVO.setMsg("重大风险源不能为空");
+ return resultVO;
+ }
+ RiskList infoByRiskListNum = riskListService.getInfoByRiskListNum(tbSpecialCheckTaskLog.getHazardCode());
+ if (ObjectUtils.isEmpty(infoByRiskListNum)){
+ resultVO.setMsg("请检查重大风险源是否存在");
+ return resultVO;
+ }
+ if (tbSpecialCheckTaskLog.getTaskId() == null){
+ resultVO.setMsg("专项任务不能为空");
+ return resultVO;
+ }
+ if (tbSpecialCheckTaskLog.getCheckType() == null){
+ resultVO.setMsg("检查类型不能为空");
+ return resultVO;
+ }
+ if (tbSpecialCheckTaskLog.getResultStatus() == null){
+ resultVO.setMsg("结果不能为空");
+ return resultVO;
+ }
+ if (taskLogEditBO.getCheckDate() == null){
+ resultVO.setMsg("检查日期不能为空");
+ return resultVO;
+ }
+ LocalDateTime dateTime = LocalDateTime.now();
+ String uuid = UUID.randomUUID().toString();
+
+ tbSpecialCheckTaskLog.setId(uuid);
+ tbSpecialCheckTaskLog.setHazardSource(infoByRiskListNum.getRiskListName());
+ tbSpecialCheckTaskLog.setCompanyCode("652310082");
+ tbSpecialCheckTaskLog.setCreateDate(dateTime);
+ tbSpecialCheckTaskLog.setUpdateDate(dateTime);
+ tbSpecialCheckTaskLog.setCreateBy(sysUser.getUserName());
+ tbSpecialCheckTaskLog.setUpdateBy(sysUser.getUserName());
+ tbSpecialCheckTaskLog.setReportStatus((byte) 1);
+ tbSpecialCheckTaskLog.setReportTime(null);
+ tbSpecialCheckTaskLog.setDeleted((byte) 0);
+ tbSpecialCheckTaskLog.setCheckDate(LocalDateTime.ofInstant(taskLogEditBO.getCheckDate().toInstant(), ZoneId.systemDefault()));
+
+ int saveResult = taskSpecialLogMapper.save(tbSpecialCheckTaskLog);
+ if (saveResult == 0){
+ resultVO.setCode(ResultCodes.SERVER_ADD_ERROR.getCode());
+ resultVO.setMsg(ResultCodes.SERVER_ADD_ERROR.getDesc());
+ return resultVO;
+ }
+ resultVO.setCode(ResultCodes.OK.getCode());
+ resultVO.setMsg("新增任务成功");
+ return resultVO;
+ }
+
+ @Override
+ public TbSpecialCheckTaskLog getSpecialCheckTaskLogByIndexId(Long id) {
+ return taskSpecialLogMapper.getSpecialCheckTaskLogByIndexId(id);
+ }
+
+ @Override
+ public ResultVO<TbSpecialCheckTaskLog> updateSpecialCheckTaskLog(TbSpecialCheckTaskLogEditBO taskLogEditBO) {
+ User sysUser = getSysUser();
+ ResultVO resultVO = new ResultVO<>();
+ resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
+
+ TbSpecialCheckTaskLogUpdateBO updateBO = BeanCopyUtils.copyBean(taskLogEditBO, TbSpecialCheckTaskLogUpdateBO.class);
+
+ if (updateBO.getIndexId() == null){
+ resultVO.setMsg("任务不能为空");
+ return resultVO;
+ }
+ TbSpecialCheckTaskLog specialCheckTaskLogByIndexId = taskSpecialLogMapper.getSpecialCheckTaskLogByIndexId(updateBO.getIndexId());
+ if (ObjectUtils.isEmpty(specialCheckTaskLogByIndexId)){
+ resultVO.setMsg("任务不存在");
+ return resultVO;
+ }
+ if (updateBO.getHazardCode() == null){
+ resultVO.setMsg("重大风险源不能为空");
+ return resultVO;
+ }
+ RiskList infoByRiskListNum = riskListService.getInfoByRiskListNum(updateBO.getHazardCode());
+ if (ObjectUtils.isEmpty(infoByRiskListNum)){
+ resultVO.setMsg("请检查重大风险源是否存在");
+ return resultVO;
+ }
+ if (updateBO.getTaskId() == null){
+ resultVO.setMsg("专项任务不能为空");
+ return resultVO;
+ }
+ if (updateBO.getCheckType() == null){
+ resultVO.setMsg("检查类型不能为空");
+ return resultVO;
+ }
+ if (updateBO.getResultStatus() == null){
+ resultVO.setMsg("结果不能为空");
+ return resultVO;
+ }
+ if (taskLogEditBO.getCheckDate() == null){
+ resultVO.setMsg("检查日期不能为空");
+ return resultVO;
+ }
+
+ LocalDateTime dateTime = LocalDateTime.now();
+ updateBO.setHazardSource(infoByRiskListNum.getRiskListName());
+ updateBO.setUpdateDate(dateTime);
+ updateBO.setUpdateBy(sysUser.getUserName());
+ updateBO.setReportStatus((byte) 1);
+ updateBO.setCheckDate(LocalDateTime.ofInstant(taskLogEditBO.getCheckDate().toInstant(), ZoneId.systemDefault()));
+
+ int updateResult = taskSpecialLogMapper.updateSpecialCheckTaskLogById(updateBO);
+ if (updateResult == 0){
+ resultVO.setCode(ResultCodes.SERVER_UPDATE_ERROR.getCode());
+ resultVO.setMsg(ResultCodes.SERVER_UPDATE_ERROR.getDesc());
+ return resultVO;
+ }
+ resultVO.setCode(ResultCodes.OK.getCode());
+ resultVO.setMsg("更新任务成功");
+ return resultVO;
+ }
+
+ @Override
+ public ResultVO<TbSpecialCheckTaskLog> deleteTbSpecialCheckTaskLog(TbSpecialCheckTaskLogUpdateBO updateBO) {
+ User sysUser = getSysUser();
+ ResultVO resultVO = new ResultVO<>();
+ resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
+
+ if (updateBO.getIndexId() == null){
+ resultVO.setMsg("任务为空，删除失败");
+ return resultVO;
+ }
+ TbSpecialCheckTaskLog specialCheckTaskLogByIndexId = taskSpecialLogMapper.getSpecialCheckTaskLogByIndexId(updateBO.getIndexId());
+ if (ObjectUtils.isEmpty(specialCheckTaskLogByIndexId)){
+ resultVO.setMsg("任务不存在，删除失败");
+ return resultVO;
+ }
+ TbSpecialCheckTaskLog tbSpecialCheckTaskLog = new TbSpecialCheckTaskLog();
+ LocalDateTime dateTime = LocalDateTime.now();
+
+ tbSpecialCheckTaskLog.setIndexId(updateBO.getIndexId());
+ tbSpecialCheckTaskLog.setUpdateDate(dateTime);
+ tbSpecialCheckTaskLog.setUpdateBy(sysUser.getUserName());
+ tbSpecialCheckTaskLog.setReportStatus((byte) 1);
+ tbSpecialCheckTaskLog.setDeleted((byte) 1);
+
+ int deleteResult = taskSpecialLogMapper.deleteTbSpecialCheckTaskLog(tbSpecialCheckTaskLog);
+ if (deleteResult == 0){
+ resultVO.setCode(ResultCodes.SERVER_DEL_ERROR.getCode());
+ resultVO.setMsg(ResultCodes.SERVER_DEL_ERROR.getDesc());
+ return resultVO;
+ }
+ resultVO.setCode(ResultCodes.OK.getCode());
+ resultVO.setMsg("删除成功");
+ return resultVO;
+ }
+
+
+}
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/TbBaseCheckServiceImpl.java b/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/TbBaseCheckServiceImpl.java
index 1016931..667e6b5 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/TbBaseCheckServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/TbBaseCheckServiceImpl.java
@@ -1,122 +1,122 @@
-package com.ruoyi.project.tr.specialCheck.service.impl;
-
-import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
-import com.ruoyi.doublePrevention.enums.ErrorCodes;
-import com.ruoyi.doublePrevention.enums.ResultCodes;
-import com.ruoyi.doublePrevention.vo.ResultVO;
-import com.ruoyi.project.tr.specialCheck.domin.*;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbBaseCheckItemBO;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbBaseCheckScoreBO;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbBaseCheckTaskBO;
-import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckTaskLogBO;
-import com.ruoyi.project.tr.specialCheck.mapper.*;
-import com.ruoyi.project.tr.specialCheck.service.SpecialCheckItemDangerLogService;
-import com.ruoyi.project.tr.specialCheck.service.TbBaseCheckService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class TbBaseCheckServiceImpl implements TbBaseCheckService {
-
- @Autowired
- private TbBaseCheckCompanyMapper companyTbRepository;
- @Autowired
- private TbBaseCheckItemMapper itemTbRepository;
- @Autowired
- private TbBaseCheckScoreMapper scoreTbRepository;
- @Autowired
- private TbBaseCheckTaskMapper taskTbRepository;
- @Autowired
- private TbSpecialCheckTaskLogMapper taskSpecialLogMapper;
- @Autowired
- private SpecialCheckItemDangerLogService itemDangerLogService;
-
- @Override
- public ResultVO<List<TbBaseCheckTask>> selectTbBaseCheckTaskPage(TbBaseCheckTaskBO tbBaseCheckTaskBO) {
-
- Integer pageIndex = tbBaseCheckTaskBO.getPageNum();
- Integer pageSize = tbBaseCheckTaskBO.getPageSize();
- if (pageIndex == 0 || pageSize == 0){
- return new ResultVO<>(ErrorCodes.REQUEST_PARAM_ERROR.getCode(),"当前页码或当前页显示数不能为0");
- }
-
- Page<TbBaseCheckTask> page = PageHelper.startPage(pageIndex, pageSize);
- taskTbRepository.selectTbBaseCheckTaskPage(tbBaseCheckTaskBO);
-
- Long total = page.getTotal();
- int count = total.intValue();
- List<TbBaseCheckTask> pageResult = null;
-
- ResultVO<List<TbBaseCheckTask>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);
-
- resultVO.setData(page.getResult());
- resultVO.setCount(count);
- resultVO.setCount((int) page.getTotal());
- resultVO.setPageNum(page.getPageNum());
- resultVO.setPageSize(page.getPageSize());
- return resultVO;
- }
-
- @Override
- public ResultVO<List<TbBaseCheckItem>> selectTbBaseCheckItemPage(TbBaseCheckItemBO tbBaseCheckItemBO) {
-
- Integer pageIndex = tbBaseCheckItemBO.getPageNum();
- Integer pageSize = tbBaseCheckItemBO.getPageSize();
- if (pageIndex == 0 || pageSize == 0){
- return new ResultVO<>(ErrorCodes.REQUEST_PARAM_ERROR.getCode(),"当前页码或当前页显示数不能为0");
- }
-
- Page<TbBaseCheckItem> page = PageHelper.startPage(pageIndex, pageSize);
- itemTbRepository.selectTbBaseCheckItemPage(tbBaseCheckItemBO);
-
- Long total = page.getTotal();
- int count = total.intValue();
- List<TbBaseCheckItem> pageResult = null;
-
- ResultVO<List<TbBaseCheckItem>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);
-
- resultVO.setData(page.getResult());
- resultVO.setCount(count);
- resultVO.setCount((int) page.getTotal());
- resultVO.setPageNum(page.getPageNum());
- resultVO.setPageSize(page.getPageSize());
- return resultVO;
- }
-
- @Override
- public ResultVO<List<TbBaseCheckScore>> selectTbBaseCheckScorePage(TbBaseCheckScoreBO tbBaseCheckScoreBO) {
- Integer pageIndex = tbBaseCheckScoreBO.getPageNum();
- Integer pageSize = tbBaseCheckScoreBO.getPageSize();
- if (pageIndex == 0 || pageSize == 0){
- return new ResultVO<>(ErrorCodes.REQUEST_PARAM_ERROR.getCode(),"当前页码或当前页显示数不能为0");
- }
- TbSpecialCheckItemLog specialCheckItemDangerLogById = itemDangerLogService.getSpecialCheckItemDangerLogById(tbBaseCheckScoreBO.getId());
- Page<TbBaseCheckScore> page = PageHelper.startPage(pageIndex, pageSize);
-
- tbBaseCheckScoreBO.setCheckItemId(specialCheckItemDangerLogById.getCheckItemId());
- scoreTbRepository.selectTbBaseCheckScorePage(tbBaseCheckScoreBO);
-
- Long total = page.getTotal();
- int count = total.intValue();
- List<TbBaseCheckScore> pageResult = null;
-
- ResultVO<List<TbBaseCheckScore>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);
-
- resultVO.setData(page.getResult());
- resultVO.setCount(count);
- resultVO.setCount((int) page.getTotal());
- resultVO.setPageNum(page.getPageNum());
- resultVO.setPageSize(page.getPageSize());
- return resultVO;
- }
-
- @Override
- public List<TbBaseCheckTask> listTbBaseCheckTask() {
- return taskTbRepository.listTbBaseCheckTask();
- }
-
-
-}
+package com.ruoyi.project.tr.specialCheck.service.impl;
+
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
+import com.ruoyi.doublePrevention.enums.ErrorCodes;
+import com.ruoyi.doublePrevention.enums.ResultCodes;
+import com.ruoyi.doublePrevention.vo.ResultVO;
+import com.ruoyi.project.tr.specialCheck.domin.*;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbBaseCheckItemBO;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbBaseCheckScoreBO;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbBaseCheckTaskBO;
+import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckTaskLogBO;
+import com.ruoyi.project.tr.specialCheck.mapper.*;
+import com.ruoyi.project.tr.specialCheck.service.SpecialCheckItemDangerLogService;
+import com.ruoyi.project.tr.specialCheck.service.TbBaseCheckService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class TbBaseCheckServiceImpl implements TbBaseCheckService {
+
+ @Autowired
+ private TbBaseCheckCompanyMapper companyTbRepository;
+ @Autowired
+ private TbBaseCheckItemMapper itemTbRepository;
+ @Autowired
+ private TbBaseCheckScoreMapper scoreTbRepository;
+ @Autowired
+ private TbBaseCheckTaskMapper taskTbRepository;
+ @Autowired
+ private TbSpecialCheckTaskLogMapper taskSpecialLogMapper;
+ @Autowired
+ private SpecialCheckItemDangerLogService itemDangerLogService;
+
+ @Override
+ public ResultVO<List<TbBaseCheckTask>> selectTbBaseCheckTaskPage(TbBaseCheckTaskBO tbBaseCheckTaskBO) {
+
+ Integer pageIndex = tbBaseCheckTaskBO.getPageNum();
+ Integer pageSize = tbBaseCheckTaskBO.getPageSize();
+ if (pageIndex == 0 || pageSize == 0){
+ return new ResultVO<>(ErrorCodes.REQUEST_PARAM_ERROR.getCode(),"当前页码或当前页显示数不能为0");
+ }
+
+ Page<TbBaseCheckTask> page = PageHelper.startPage(pageIndex, pageSize);
+ taskTbRepository.selectTbBaseCheckTaskPage(tbBaseCheckTaskBO);
+
+ Long total = page.getTotal();
+ int count = total.intValue();
+ List<TbBaseCheckTask> pageResult = null;
+
+ ResultVO<List<TbBaseCheckTask>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);
+
+ resultVO.setData(page.getResult());
+ resultVO.setCount(count);
+ resultVO.setCount((int) page.getTotal());
+ resultVO.setPageNum(page.getPageNum());
+ resultVO.setPageSize(page.getPageSize());
+ return resultVO;
+ }
+
+ @Override
+ public ResultVO<List<TbBaseCheckItem>> selectTbBaseCheckItemPage(TbBaseCheckItemBO tbBaseCheckItemBO) {
+
+ Integer pageIndex = tbBaseCheckItemBO.getPageNum();
+ Integer pageSize = tbBaseCheckItemBO.getPageSize();
+ if (pageIndex == 0 || pageSize == 0){
+ return new ResultVO<>(ErrorCodes.REQUEST_PARAM_ERROR.getCode(),"当前页码或当前页显示数不能为0");
+ }
+
+ Page<TbBaseCheckItem> page = PageHelper.startPage(pageIndex, pageSize);
+ itemTbRepository.selectTbBaseCheckItemPage(tbBaseCheckItemBO);
+
+ Long total = page.getTotal();
+ int count = total.intValue();
+ List<TbBaseCheckItem> pageResult = null;
+
+ ResultVO<List<TbBaseCheckItem>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);
+
+ resultVO.setData(page.getResult());
+ resultVO.setCount(count);
+ resultVO.setCount((int) page.getTotal());
+ resultVO.setPageNum(page.getPageNum());
+ resultVO.setPageSize(page.getPageSize());
+ return resultVO;
+ }
+
+ @Override
+ public ResultVO<List<TbBaseCheckScore>> selectTbBaseCheckScorePage(TbBaseCheckScoreBO tbBaseCheckScoreBO) {
+ Integer pageIndex = tbBaseCheckScoreBO.getPageNum();
+ Integer pageSize = tbBaseCheckScoreBO.getPageSize();
+ if (pageIndex == 0 || pageSize == 0){
+ return new ResultVO<>(ErrorCodes.REQUEST_PARAM_ERROR.getCode(),"当前页码或当前页显示数不能为0");
+ }
+ TbSpecialCheckItemLog specialCheckItemDangerLogById = itemDangerLogService.getSpecialCheckItemDangerLogById(tbBaseCheckScoreBO.getId());
+ Page<TbBaseCheckScore> page = PageHelper.startPage(pageIndex, pageSize);
+
+ tbBaseCheckScoreBO.setCheckItemId(specialCheckItemDangerLogById.getCheckItemId());
+ scoreTbRepository.selectTbBaseCheckScorePage(tbBaseCheckScoreBO);
+
+ Long total = page.getTotal();
+ int count = total.intValue();
+ List<TbBaseCheckScore> pageResult = null;
+
+ ResultVO<List<TbBaseCheckScore>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);
+
+ resultVO.setData(page.getResult());
+ resultVO.setCount(count);
+ resultVO.setCount((int) page.getTotal());
+ resultVO.setPageNum(page.getPageNum());
+ resultVO.setPageSize(page.getPageSize());
+ return resultVO;
+ }
+
+ @Override
+ public List<TbBaseCheckTask> listTbBaseCheckTask() {
+ return taskTbRepository.listTbBaseCheckTask();
+ }
+
+
+}
diff --git a/src/main/resources/application-louge.yml b/src/main/resources/application-dev.yml
similarity index 74%
rename from src/main/resources/application-louge.yml
rename to src/main/resources/application-dev.yml
index 888c21a..d2638e4 100644
--- a/src/main/resources/application-louge.yml
+++ b/src/main/resources/application-dev.yml
@@ -6,25 +6,13 @@
spring:
datasource:
type: com.alibaba.druid.pool.DruidDataSource
- driverClassName: com.mysql.cj.jdbc.Driver
+ driverClassName: com.mysql.jdbc.Driver
druid:
# 主库数据源
master:
- url: jdbc:mysql://124.221.179.102:3306/testqhs?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
- username: testqhs
- password: raD2AEaccLRsaFrB
-
-# url: jdbc:mysql://localhost:3306/trouble_and_risk.guotai?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# username: root
-# password: root
-
-# url: jdbc:mysql://localhost:17716/trouble_and_risk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# username: trouble_and_risk
-# password: Bw44sxzyiE8SdWzJ
-
-# url: jdbc:mysql://192.168.10.201:3306/trouble_and_risk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-# username: trouble_and_risk
-# password: LYGstJAYc85jkF7H
+ url: jdbc:mysql://192.168.2.16:39231/gt_double_risk?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+ username: gt_double_risk
+ password: B6CrYp7ZhTNdJF4Y
# 从库数据源
slave:
@@ -75,9 +63,9 @@
# redis
redis:
- host: 192.168.0.52
+ host: 127.0.0.1
port: 6379
- password: SEF98uvs98dUAUEF90Udssa # Redis 服务器密码，默认为空。生产中，一定要设置 Redis 密码！
+ password: # Redis 服务器密码，默认为空。生产中，一定要设置 Redis 密码！
database: 0 # Redis 数据库号，默认为 0
timeout: 15000 # Redis 连接超时时间，单位：毫秒。
lettuce:
@@ -111,4 +99,17 @@
profile: D:/ProjFile/TroubleAndRisk
# profile: /home/troubleAndRisk/upload
# 获取ip地址开关
- addressEnabled: true
\ No newline at end of file
+ addressEnabled: true
+
+
+# 日志配置
+logging:
+ level:
+ com.ruoyi: debug
+ org.springframework: warn
+
+#极光推送内容
+jpush:
+ appKey: dac5323e315005928daa4330_1
+ masterSecret: d115672ccd8d69d0b75c4926
+ liveTime: 172800
\ No newline at end of file
diff --git a/src/main/resources/application-guotai-prod.yml b/src/main/resources/application-guotai-prod.yml
index 3b938cf..c57ecb5 100644
--- a/src/main/resources/application-guotai-prod.yml
+++ b/src/main/resources/application-guotai-prod.yml
@@ -128,4 +128,11 @@
# profile: /www/wwwroot/springboot_pro/TroubleAndRisk/upload
profile: /home/java/TroubleAndRisk/upload
# 获取ip地址开关
- addressEnabled: true
\ No newline at end of file
+ addressEnabled: true
+
+
+# 日志配置
+logging:
+ level:
+ com.ruoyi: info
+ org.springframework: info
\ No newline at end of file
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a2fcbf5..afeea8e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -38,6 +38,8 @@
# Spring配置
spring:
+ application:
+ name: trouble_risk
# 模板引擎
thymeleaf:
mode: HTML
@@ -52,13 +54,9 @@
time-zone: GMT+8
date-format: yyyy-MM-dd HH:mm:ss
profiles:
- #active: guotai-uat
+ #active: dev
active: guotai-prod
-# active: druid
-# druid使用的数据库是5.7.28，过高的版本，可能有部分函数不支持
-# active: uat
-# active: uat8
-# active: local
+
# 文件上传
servlet:
multipart:
@@ -76,34 +74,13 @@
jcache:
config: classpath:ehcache.xml
-# 日志配置
-logging:
- level:
- com.ruoyi: debug
- org.springframework: warn
+
# 用户配置
user:
password:
# 密码错误{maxRetryCount}次锁定10分钟
maxRetryCount: 5
-# # redis
-# redis:
-# host: 192.168.0.52
-# port: 6379
-# password: SEF98uvs98dUAUEF90Udssa # Redis 服务器密码，默认为空。生产中，一定要设置 Redis 密码！
-# database: 0 # Redis 数据库号，默认为 0
-# timeout: 15000 # Redis 连接超时时间，单位：毫秒。
-# lettuce:
-# pool:
-# max-active: 4
-# # 对应 RedisProperties.Jedis 内部类
-# jedis:
-# pool:
-# max-active: 4 # 连接池最大连接数，默认为 8 。使用负数表示没有限制 同一时间最大只能执行8条sql语句，每执行一条语句就会建立一个连接
-# max-idle: 4 # 默认连接数最大空闲的连接数，默认为 8 。使用负数表示没有限制。
-# min-idle: 0 # 默认连接池最小空闲的连接数，默认为 0 。允许设置 0 和 正数。
-# max-wait: -1
# MyBatis
mybatis:
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index dc98339..4a24cc8 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -1,29 +1,38 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
+ <!--应用名称-->
+ <springProperty scope="context" name="APP_NAME" source="spring.application.name" defaultValue="springBoot"/>
<!-- 日志存放路径 -->
- <property name="log.path" value="/www/javaProject/TroubleAndRisk/logs" />
+ <property name="log.path" value="logs" />
+ <!--日志文件保存路径-->
+ <property name="LOG_FILE_PATH" value="${LOG_FILE:-${LOG_PATH:-${LOG_TEMP:-${java.io.tmpdir:-/tmp}}}/logs}"/>
<!-- 日志输出格式 -->
- <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
+ <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%C,%M,%L] - %msg%n" />
<!-- 控制台输出 -->
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>${log.pattern}</pattern>
- </encoder>
+ <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+ <pattern>${log.pattern}</pattern>
+ <charset>utf8</charset>
+ </encoder>
</appender>
<!-- 系统日志输出 -->
<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/sys-info.log</file>
<!-- 循环政策：基于时间创建日志文件 -->
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!-- 日志文件名格式 -->
- <fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
- <!-- 日志最大的历史 60天 -->
- <maxHistory>60</maxHistory>
+ <fileNamePattern>${log.path}/${APP_NAME}-info-%d{yyyy-MM-dd}-%i.log</fileNamePattern>
+ <totalSizeCap>30GB</totalSizeCap>
+ <!--设置日志文件大小，超过就重新生成文件，默认50M-->
+ <maxFileSize>100MB</maxFileSize>
+ <!-- 日志最大的历史 30天 -->
+ <maxHistory>30</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${log.pattern}</pattern>
+ <charset>UTF-8</charset>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 -->
@@ -38,14 +47,18 @@
<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${log.path}/sys-error.log</file>
<!-- 循环政策：基于时间创建日志文件 -->
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<!-- 日志文件名格式 -->
- <fileNamePattern>${log.path}/sys-error.%d{yyyy-MM-dd}.log</fileNamePattern>
- <!-- 日志最大的历史 60天 -->
- <maxHistory>60</maxHistory>
+ <fileNamePattern>${log.path}/${APP_NAME}-error-%d{yyyy-MM-dd}-%i.log</fileNamePattern>
+ <totalSizeCap>10GB</totalSizeCap>
+ <!--设置日志文件大小，超过就重新生成文件，默认50M-->
+ <maxFileSize>100MB</maxFileSize>
+ <!-- 日志最大的历史 30天 -->
+ <maxHistory>30</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${log.pattern}</pattern>
+ <charset>UTF-8</charset>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<!-- 过滤的级别 -->
@@ -56,27 +69,15 @@
<onMismatch>DENY</onMismatch>
</filter>
</appender>
-
- <!-- 用户访问日志输出 -->
- <appender name="sys-user" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${log.path}/sys-user.log</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <!-- 按天回滚 daily -->
- <fileNamePattern>${log.path}/sys-user.%d{yyyy-MM-dd}.log</fileNamePattern>
- <!-- 日志最大的历史 60天 -->
- <maxHistory>60</maxHistory>
- </rollingPolicy>
- <encoder>
- <pattern>${log.pattern}</pattern>
- </encoder>
- </appender>
+
<!-- 系统模块日志级别控制 -->
+ <logger name="org.slf4j" level="INFO"/>
<logger name="com.ruoyi" level="info" />
<!-- Spring日志级别控制 -->
<logger name="org.springframework" level="warn" />
- <root level="info">
+ <root level="DEBUG">
<appender-ref ref="console" />
</root>
@@ -86,8 +87,5 @@
<appender-ref ref="file_error" />
</root>
- <!--系统用户操作日志-->
- <logger name="sys-user" level="info">
- <appender-ref ref="sys-user"/>
- </logger>
+
</configuration>
\ No newline at end of file
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckRecordFromTaskMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckRecordFromTaskMapper.xml
index 0b05d0c..5a1295c 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckRecordFromTaskMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckRecordFromTaskMapper.xml
@@ -1,94 +1,94 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportCheckRecordFromTaskRepository">
-
- <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckRecordFromTask">
- <id column="index_id" property="indexId"/>
- <result column="id" property="id"/>
- <result column="company_code" property="companyCode"/>
- <result column="deleted" property="deleted"/>
- <result column="create_date" property="createDate"/>
- <result column="create_by" property="createBy"/>
- <result column="update_date" property="updateDate"/>
- <result column="update_by" property="updateBy"/>
- <result column="report_status" property="reportStatus"/>
- <result column="report_time" property="reportTime"/>
- <result column="data_source" property="dataSource"/>
- <result column="check_task_id" property="checkTaskId"/>
- <result column="check_status" property="checkStatus"/>
- <result column="check_time" property="checkTime"/>
- <result column="create_by_mobile" property="createByMobile"/>
- <result column="update_by_mobile" property="updateByMobile"/>
- <result column="task_id" property="taskId"/>
-
- <result column="mobile_code" property="mobileCode"/>
- <result column="defend" property="defend"/>
- </resultMap>
-
- <!--IPage<PreventReportCheckRecordFromTask> getReportTaskFromWorkPage(Page<Object> objectPage, PreventReportCheckRecordFromTaskReqDTO queryReqDTO);-->
- <select id="getReportTaskFromWorkPage" resultMap="BaseResultMap">
- select * from prevent_cj_report_check_record_from_task
- order by create_by desc
- </select>
-
- <!--List<PreventReportCheckRecordFromTask> listReportTaskRecordDate();-->
- <select id="listReportTaskRecordDate" resultMap="BaseResultMap">
- select * from prevent_cj_report_check_record_from_task
- where report_status = 1
- limit 200
- </select>
-
- <!--int updateTaskReportStatus(HandlerReportParam handlerReportParam);-->
- <update id="updateTaskReportStatus">
- update prevent_cj_report_check_record_from_task set
- report_status = #{reportStatus},
- report_time = #{reportTime}
- where task_id = #{id}
- </update>
-
- <!--int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);-->
- <update id="updateCJReportStatusById">
- update prevent_cj_report_check_record_from_task set
- report_status = #{reportStatus},
- report_time = #{reportTime}
- where id = #{id}
- </update>
-
-<!-- int insertRecord(PreventCJReportCheckRecordFromTask recordFromTasks);-->
- <insert id="insertRecord">
- insert into prevent_cj_report_check_record_from_task
- values(null, #{id}, #{companyCode}, #{deleted}, #{createDate}, #{createBy}, #{updateDate}, #{updateBy}
- , #{checkTaskId}, #{checkStatus}, #{checkTime}, #{createByMobile}, #{updateByMobile}
- , #{reportStatus}, #{reportTime}, #{dataSource}, #{taskId}
- , #{mobileCode}, #{defend})
- </insert>
-
-
- <insert id="insertRecordList">
- insert into prevent_cj_report_check_record_from_task
- (index_id, id, company_code, deleted, create_date, create_by, update_date, update_by,
- report_status, report_time,data_source, check_task_id, check_status, check_time,
- create_by_mobile, update_by_mobile, task_id, mobile_code, defend)
- values
- <foreach collection="list" item="record" separator=",">
- (null, #{record.id}, #{record.companyCode}, #{record.deleted}, #{record.createDate}, #{record.createBy}, #{record.updateDate},#{record.updateBy},
- #{record.reportStatus}, #{record.reportTime}, #{record.dataSource}, #{record.checkTaskId}, #{record.checkStatus}, #{record.checkTime},
- #{record.createByMobile}, #{record.updateByMobile}, #{record.taskId}, #{record.mobileCode}, #{record.defend})
- </foreach>
- </insert>
-
-<!-- int updateCJReportStatusBatchById(List<PreventCJReportCheckRecordFromTask> cjRecordFromTasks);-->
- <update id="updateCJReportStatusBatchById">
- update prevent_cj_report_check_record_from_task
- <set>
- <if test="report_status != null ">
- report_status = #{reportStatus},
- </if>
- <if test="report_time != null ">
- report_time= #{reportTime},
- </if>
- </set>
- where id = #{id}
- </update>
-
-</mapper>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportCheckRecordFromTaskRepository">
+
+ <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckRecordFromTask">
+ <id column="index_id" property="indexId"/>
+ <result column="id" property="id"/>
+ <result column="company_code" property="companyCode"/>
+ <result column="deleted" property="deleted"/>
+ <result column="create_date" property="createDate"/>
+ <result column="create_by" property="createBy"/>
+ <result column="update_date" property="updateDate"/>
+ <result column="update_by" property="updateBy"/>
+ <result column="report_status" property="reportStatus"/>
+ <result column="report_time" property="reportTime"/>
+ <result column="data_source" property="dataSource"/>
+ <result column="check_task_id" property="checkTaskId"/>
+ <result column="check_status" property="checkStatus"/>
+ <result column="check_time" property="checkTime"/>
+ <result column="create_by_mobile" property="createByMobile"/>
+ <result column="update_by_mobile" property="updateByMobile"/>
+ <result column="task_id" property="taskId"/>
+
+ <result column="mobile_code" property="mobileCode"/>
+ <result column="defend" property="defend"/>
+ </resultMap>
+
+ <!--IPage<PreventReportCheckRecordFromTask> getReportTaskFromWorkPage(Page<Object> objectPage, PreventReportCheckRecordFromTaskReqDTO queryReqDTO);-->
+ <select id="getReportTaskFromWorkPage" resultMap="BaseResultMap">
+ select * from prevent_cj_report_check_record_from_task
+ order by create_by desc
+ </select>
+
+ <!--List<PreventReportCheckRecordFromTask> listReportTaskRecordDate();-->
+ <select id="listReportTaskRecordDate" resultMap="BaseResultMap">
+ select * from prevent_cj_report_check_record_from_task
+ where report_status = 1
+ limit 60
+ </select>
+
+ <!--int updateTaskReportStatus(HandlerReportParam handlerReportParam);-->
+ <update id="updateTaskReportStatus">
+ update prevent_cj_report_check_record_from_task set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where task_id = #{id}
+ </update>
+
+ <!--int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);-->
+ <update id="updateCJReportStatusById">
+ update prevent_cj_report_check_record_from_task set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where id = #{id}
+ </update>
+
+<!-- int insertRecord(PreventCJReportCheckRecordFromTask recordFromTasks);-->
+ <insert id="insertRecord">
+ insert into prevent_cj_report_check_record_from_task
+ values(null, #{id}, #{companyCode}, #{deleted}, #{createDate}, #{createBy}, #{updateDate}, #{updateBy}
+ , #{checkTaskId}, #{checkStatus}, #{checkTime}, #{createByMobile}, #{updateByMobile}
+ , #{reportStatus}, #{reportTime}, #{dataSource}, #{taskId}
+ , #{mobileCode}, #{defend})
+ </insert>
+
+
+ <insert id="insertRecordList">
+ insert into prevent_cj_report_check_record_from_task
+ (index_id, id, company_code, deleted, create_date, create_by, update_date, update_by,
+ report_status, report_time,data_source, check_task_id, check_status, check_time,
+ create_by_mobile, update_by_mobile, task_id, mobile_code, defend)
+ values
+ <foreach collection="list" item="record" separator=",">
+ (null, #{record.id}, #{record.companyCode}, #{record.deleted}, #{record.createDate}, #{record.createBy}, #{record.updateDate},#{record.updateBy},
+ #{record.reportStatus}, #{record.reportTime}, #{record.dataSource}, #{record.checkTaskId}, #{record.checkStatus}, #{record.checkTime},
+ #{record.createByMobile}, #{record.updateByMobile}, #{record.taskId}, #{record.mobileCode}, #{record.defend})
+ </foreach>
+ </insert>
+
+<!-- int updateCJReportStatusBatchById(List<PreventCJReportCheckRecordFromTask> cjRecordFromTasks);-->
+ <update id="updateCJReportStatusBatchById">
+ update prevent_cj_report_check_record_from_task
+ <set>
+ <if test="report_status != null ">
+ report_status = #{reportStatus},
+ </if>
+ <if test="report_time != null ">
+ report_time= #{reportTime},
+ </if>
+ </set>
+ where id = #{id}
+ </update>
+
+</mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml
index 08f882a..5ca825d 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportCheckTaskFromWorkMapper.xml
@@ -1,150 +1,150 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportCheckTaskFromWorkRepository">
-
- <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckTaskFromWork">
- <id column="index_id" property="indexId"/>
- <result column="id" property="id"/>
- <result column="company_code" property="companyCode"/>
- <result column="deleted" property="deleted"/>
- <result column="create_date" property="createDate"/>
- <result column="create_by" property="createBy"/>
- <result column="update_date" property="updateDate"/>
- <result column="update_by" property="updateBy"/>
- <result column="report_status" property="reportStatus"/>
- <result column="report_time" property="reportTime"/>
- <result column="data_source" property="dataSource"/>
- <result column="risk_measure_id" property="riskMeasureId"/>
- <result column="check_cycle" property="checkCycle"/>
- <result column="check_cycle_unit" property="checkCycleUnit"/>
- <result column="work_id" property="workId"/>
-
- <result column="troubleshoot_content" property="troubleshootContent"/>
- <result column="task_start_time" property="taskStartTime"/>
- <result column="work_start_time" property="workStartTime"/>
- <result column="work_end_time" property="workEndTime"/>
- <result column="work_day_type" property="workDayType"/>
- <result column="work_type" property="workType"/>
- <result column="task_num" property="taskNum"/>
- </resultMap>
-
- <!--IPage<PreventReportCheckTaskFromWork> getReportTaskFromWorkPage(Page<Object> objectPage, PreventReportCheckTaskFromWorkReqDTO queryReqDTO);-->
- <select id="getReportTaskFromWorkPage" resultMap="BaseResultMap">
- select * from prevent_cj_report_check_task_from_work
- order by create_by desc
- </select>
-
- <!--List<PreventReportCheckTaskFromWork> listReportTaskFromWorkDate();-->
- <select id="listReportTaskFromWorkDate" resultMap="BaseResultMap">
- select * from prevent_cj_report_check_task_from_work
- where report_status = 1
- limit 200
- </select>
-
- <select id="listWork" resultMap="BaseResultMap">
- select * from prevent_cj_report_check_task_from_work
- where work_id >= 82 and 94 >= work_id and troubleshoot_content is null
- limit 50
- </select>
-
- <select id="listWork1" resultMap="BaseResultMap">
- select * from prevent_cj_report_check_task_from_work
- where index_id > 800 and 1205 >= index_id and (82 > work_id or work_id > 94) and troubleshoot_content is null
- limit 100
- </select>
-
- <!--int updateWorkReportStatus(HandlerReportParam handlerReportParam);-->
- <update id="updateWorkReportStatus">
- update prevent_cj_report_check_task_from_work set
- report_status = #{reportStatus},
- report_time = #{reportTime}
- where work_id = #{id}
- </update>
-
- <!--int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);-->
- <update id="updateCJReportStatusById">
- update prevent_cj_report_check_task_from_work set
- report_status = #{reportStatus},
- report_time = #{reportTime}
- where id = #{id}
- </update>
-
-<!-- int updateInfo(PreventCJReportCheckTaskFromWork work);-->
- <update id="updateInfo">
- update prevent_cj_report_check_task_from_work set
- work_start_time = #{workStartTime},
- work_end_time = #{workEndTime},
- troubleshoot_content = #{troubleshootContent}
- where index_id = #{indexId}
- </update>
-<!-- int updateInfo1(PreventCJReportCheckTaskFromWork work);-->
- <update id="updateInfo1">
- update prevent_cj_report_check_task_from_work set
- troubleshoot_content = #{troubleshootContent},
- task_start_time = #{taskStartTime},
- work_day_type = #{workDayType},
- work_type = #{workType},
- task_num = #{taskNum}
-
- where index_id = #{indexId}
-
- </update>
-
-<!-- int insertTaskFromWorkList(PreventCJReportCheckTaskFromWork cjTaskFromWork);-->
- <insert id="insertTaskFromWorkList">
- insert into prevent_cj_report_check_task_from_work
- values(null, #{id}, #{companyCode}, #{deleted}, #{createDate}, #{createBy}, #{updateDate}, #{updateBy}
- , #{riskMeasureId}, #{checkCycle}, #{checkCycleUnit}
- , #{reportStatus}, #{reportTime}, #{dataSource}, #{workId}
- , #{troubleshootContent},#{taskStartTime},#{workStartTime},#{workEndTime},#{workDayType},#{workType},#{taskNum})
- </insert>
-
-<!-- PreventCJReportCheckTaskFromWork geByMeasureUUidAndJobId(String measureUuid, Long jobId);-->
- <select id="geByMeasureUUidAndJobId" resultMap="BaseResultMap">
- select * from prevent_cj_report_check_task_from_work
- where work_id = #{jobId} and risk_measure_id = #{measureUuid} and deleted = 0
- </select>
-
-
-<!-- int insertList(taskFromWorkLists);-->
- <insert id="saveList">
- insert into prevent_cj_report_check_task_from_work
- (
- id,
- risk_measure_id,
- check_cycle,
- check_cycle_unit,
- troubleshoot_content,
- company_code,
- deleted,
- create_date,
- create_by,
- update_date,
- update_by,
- data_source,
- report_status,
- report_time
- )
- values
- <foreach collection="taskFromWorkLists" item="taskFromWorkList" separator="," >
- (
- #{taskFromWorkList.id},
- #{taskFromWorkList.riskMeasureId},
- #{taskFromWorkList.checkCycle},
- #{taskFromWorkList.checkCycleUnit},
- #{taskFromWorkList.troubleshootContent},
- #{taskFromWorkList.companyCode},
- #{taskFromWorkList.deleted},
- #{taskFromWorkList.createDate},
- #{taskFromWorkList.createBy},
- #{taskFromWorkList.updateDate},
- #{taskFromWorkList.updateBy},
- #{taskFromWorkList.dataSource},
- #{taskFromWorkList.reportStatus},
- #{taskFromWorkList.reportTime}
- )
- </foreach>
- </insert>
-
-
-</mapper>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportCheckTaskFromWorkRepository">
+
+ <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportCheckTaskFromWork">
+ <id column="index_id" property="indexId"/>
+ <result column="id" property="id"/>
+ <result column="company_code" property="companyCode"/>
+ <result column="deleted" property="deleted"/>
+ <result column="create_date" property="createDate"/>
+ <result column="create_by" property="createBy"/>
+ <result column="update_date" property="updateDate"/>
+ <result column="update_by" property="updateBy"/>
+ <result column="report_status" property="reportStatus"/>
+ <result column="report_time" property="reportTime"/>
+ <result column="data_source" property="dataSource"/>
+ <result column="risk_measure_id" property="riskMeasureId"/>
+ <result column="check_cycle" property="checkCycle"/>
+ <result column="check_cycle_unit" property="checkCycleUnit"/>
+ <result column="work_id" property="workId"/>
+
+ <result column="troubleshoot_content" property="troubleshootContent"/>
+ <result column="task_start_time" property="taskStartTime"/>
+ <result column="work_start_time" property="workStartTime"/>
+ <result column="work_end_time" property="workEndTime"/>
+ <result column="work_day_type" property="workDayType"/>
+ <result column="work_type" property="workType"/>
+ <result column="task_num" property="taskNum"/>
+ </resultMap>
+
+ <!--IPage<PreventReportCheckTaskFromWork> getReportTaskFromWorkPage(Page<Object> objectPage, PreventReportCheckTaskFromWorkReqDTO queryReqDTO);-->
+ <select id="getReportTaskFromWorkPage" resultMap="BaseResultMap">
+ select * from prevent_cj_report_check_task_from_work
+ order by create_by desc
+ </select>
+
+ <!--List<PreventReportCheckTaskFromWork> listReportTaskFromWorkDate();-->
+ <select id="listReportTaskFromWorkDate" resultMap="BaseResultMap">
+ select * from prevent_cj_report_check_task_from_work
+ where report_status = 1
+ limit 200
+ </select>
+
+ <select id="listWork" resultMap="BaseResultMap">
+ select * from prevent_cj_report_check_task_from_work
+ where work_id >= 82 and 94 >= work_id and troubleshoot_content is null
+ limit 50
+ </select>
+
+ <select id="listWork1" resultMap="BaseResultMap">
+ select * from prevent_cj_report_check_task_from_work
+ where index_id > 800 and 1205 >= index_id and (82 > work_id or work_id > 94) and troubleshoot_content is null
+ limit 100
+ </select>
+
+ <!--int updateWorkReportStatus(HandlerReportParam handlerReportParam);-->
+ <update id="updateWorkReportStatus">
+ update prevent_cj_report_check_task_from_work set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where work_id = #{id}
+ </update>
+
+ <!--int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);-->
+ <update id="updateCJReportStatusById">
+ update prevent_cj_report_check_task_from_work set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where id = #{id}
+ </update>
+
+<!-- int updateInfo(PreventCJReportCheckTaskFromWork work);-->
+ <update id="updateInfo">
+ update prevent_cj_report_check_task_from_work set
+ work_start_time = #{workStartTime},
+ work_end_time = #{workEndTime},
+ troubleshoot_content = #{troubleshootContent}
+ where index_id = #{indexId}
+ </update>
+<!-- int updateInfo1(PreventCJReportCheckTaskFromWork work);-->
+ <update id="updateInfo1">
+ update prevent_cj_report_check_task_from_work set
+ troubleshoot_content = #{troubleshootContent},
+ task_start_time = #{taskStartTime},
+ work_day_type = #{workDayType},
+ work_type = #{workType},
+ task_num = #{taskNum}
+
+ where index_id = #{indexId}
+
+ </update>
+
+<!-- int insertTaskFromWorkList(PreventCJReportCheckTaskFromWork cjTaskFromWork);-->
+ <insert id="insertTaskFromWorkList">
+ insert into prevent_cj_report_check_task_from_work
+ values(null, #{id}, #{companyCode}, #{deleted}, #{createDate}, #{createBy}, #{updateDate}, #{updateBy}
+ , #{riskMeasureId}, #{checkCycle}, #{checkCycleUnit}
+ , #{reportStatus}, #{reportTime}, #{dataSource}, #{workId}
+ , #{troubleshootContent},#{taskStartTime},#{workStartTime},#{workEndTime},#{workDayType},#{workType},#{taskNum})
+ </insert>
+
+<!-- PreventCJReportCheckTaskFromWork geByMeasureUUidAndJobId(String measureUuid, Long jobId);-->
+ <select id="geByMeasureUUidAndJobId" resultMap="BaseResultMap">
+ select * from prevent_cj_report_check_task_from_work
+ where work_id = #{jobId} and risk_measure_id = #{measureUuid} and deleted = 0
+ </select>
+
+
+<!-- int insertList(taskFromWorkLists);-->
+ <insert id="saveList">
+ insert into prevent_cj_report_check_task_from_work
+ (
+ id,
+ risk_measure_id,
+ check_cycle,
+ check_cycle_unit,
+ troubleshoot_content,
+ company_code,
+ deleted,
+ create_date,
+ create_by,
+ update_date,
+ update_by,
+ data_source,
+ report_status,
+ report_time
+ )
+ values
+ <foreach collection="taskFromWorkLists" item="taskFromWorkList" separator="," >
+ (
+ #{taskFromWorkList.id},
+ #{taskFromWorkList.riskMeasureId},
+ #{taskFromWorkList.checkCycle},
+ #{taskFromWorkList.checkCycleUnit},
+ #{taskFromWorkList.troubleshootContent},
+ #{taskFromWorkList.companyCode},
+ #{taskFromWorkList.deleted},
+ #{taskFromWorkList.createDate},
+ #{taskFromWorkList.createBy},
+ #{taskFromWorkList.updateDate},
+ #{taskFromWorkList.updateBy},
+ #{taskFromWorkList.dataSource},
+ #{taskFromWorkList.reportStatus},
+ #{taskFromWorkList.reportTime}
+ )
+ </foreach>
+ </insert>
+
+
+</mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportConfigLogMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportConfigLogMapper.xml
index f1618c5..e29bc4b 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventCJReportConfigLogMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportConfigLogMapper.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportConfigLogRepository">
-
- <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportConfigLog">
- <id property="id" column="id"/>
- <result property="reportState" column="report_state"/>
- <result property="reportType" column="report_type"/>
- <result property="reportData" column="report_data"/>
- <result property="reportDataName" column="report_data_name"/>
- <result property="gmtModitify" column="gmt_moditify"/>
- <result property="lastEditUserName" column="last_edit_user_name"/>
- </resultMap>
-
- <!--IPage<PreventReportConfigLog> getReportConfigLogPage(Page<Object> page, PreventReportConfigLogQueryReqDTO queryReqDTO);-->
- <select id="getReportConfigLogPage" resultMap="BaseResultMap">
- select id, report_state, report_type, report_data_name, gmt_moditify, last_edit_user_name, update_info
- from prevent_cj_report_config_log
- <where>
- 1 = 1
- <if test="queryReqDTO.startTime != null">
- and #{queryReqDTO.id} >= gmt_moditify
- </if>
- <if test="queryReqDTO.endTime != null">
- and gmt_moditify >= #{queryReqDTO.id}
- </if>
- </where>
- </select>
-
-</mapper>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportConfigLogRepository">
+
+ <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportConfigLog">
+ <id property="id" column="id"/>
+ <result property="reportState" column="report_state"/>
+ <result property="reportType" column="report_type"/>
+ <result property="reportData" column="report_data"/>
+ <result property="reportDataName" column="report_data_name"/>
+ <result property="gmtModitify" column="gmt_moditify"/>
+ <result property="lastEditUserName" column="last_edit_user_name"/>
+ </resultMap>
+
+ <!--IPage<PreventReportConfigLog> getReportConfigLogPage(Page<Object> page, PreventReportConfigLogQueryReqDTO queryReqDTO);-->
+ <select id="getReportConfigLogPage" resultMap="BaseResultMap">
+ select id, report_state, report_type, report_data_name, gmt_moditify, last_edit_user_name, update_info
+ from prevent_cj_report_config_log
+ <where>
+ 1 = 1
+ <if test="queryReqDTO.startTime != null">
+ and #{queryReqDTO.id} >= gmt_moditify
+ </if>
+ <if test="queryReqDTO.endTime != null">
+ and gmt_moditify >= #{queryReqDTO.id}
+ </if>
+ </where>
+ </select>
+
+</mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportConfigMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportConfigMapper.xml
index b1ff7d7..8c3fd1b 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventCJReportConfigMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportConfigMapper.xml
@@ -1,31 +1,31 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportConfigRepository">
-
- <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportConfig">
- <id property="id" column="id"/>
- <result property="reportState" column="report_state"/>
- <result property="reportType" column="report_type"/>
- <result property="reportData" column="report_data"/>
- <result property="reportDataName" column="report_data_name"/>
- <result property="gmtModitify" column="gmt_moditify"/>
- <result property="lastEditUserName" column="last_edit_user_name"/>
- </resultMap>
-
- <!--List<PreventReportConfig> ListReportConfigs();-->
- <select id="ListReportConfigs" resultMap="BaseResultMap">
- select id, report_state, report_type, report_data_name, gmt_moditify, last_edit_user_name
- from prevent_cj_report_config
- </select>
-
- <!--int updateReportConfig(PreventReportConfigUpdateParams updateParams);-->
- <update id="updateReportConfig">
- update prevent_cj_report_config set
- report_state = #{reportState},
- report_type = #{reportType},
- last_edit_user_name = #{lastEditUserName},
- gmt_moditify = #{gmtModitify}
- where id = #{id}
- </update>
-
-</mapper>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportConfigRepository">
+
+ <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportConfig">
+ <id property="id" column="id"/>
+ <result property="reportState" column="report_state"/>
+ <result property="reportType" column="report_type"/>
+ <result property="reportData" column="report_data"/>
+ <result property="reportDataName" column="report_data_name"/>
+ <result property="gmtModitify" column="gmt_moditify"/>
+ <result property="lastEditUserName" column="last_edit_user_name"/>
+ </resultMap>
+
+ <!--List<PreventReportConfig> ListReportConfigs();-->
+ <select id="ListReportConfigs" resultMap="BaseResultMap">
+ select id, report_state, report_type, report_data_name, gmt_moditify, last_edit_user_name
+ from prevent_cj_report_config
+ </select>
+
+ <!--int updateReportConfig(PreventReportConfigUpdateParams updateParams);-->
+ <update id="updateReportConfig">
+ update prevent_cj_report_config set
+ report_state = #{reportState},
+ report_type = #{reportType},
+ last_edit_user_name = #{lastEditUserName},
+ gmt_moditify = #{gmtModitify}
+ where id = #{id}
+ </update>
+
+</mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml
index c1f4543..85f165c 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportDangerInfoMapper.xml
@@ -1,91 +1,91 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportDangerInfoRepository">
-
- <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo">
- <id column="index_id" property="indexId"/>
- <result column="id" property="id"/>
- <result column="company_code" property="companyCode"/>
- <result column="deleted" property="deleted"/>
- <result column="create_date" property="createDate"/>
- <result column="create_by" property="createBy"/>
- <result column="update_date" property="updateDate"/>
- <result column="update_by" property="updateBy"/>
- <result column="report_status" property="reportStatus"/>
- <result column="report_time" property="reportTime"/>
- <result column="data_source" property="dataSource"/>
- <result column="hazard_code" property="hazardCode"/>
- <result column="risk_measure_id" property="riskMeasureId"/>
- <result column="check_record_id" property="checkRecordId"/>
- <result column="danger_name" property="dangerName"/>
- <result column="danger_level" property="dangerLevel"/>
- <result column="danger_src" property="dangerSrc"/>
- <result column="danger_manage_type" property="dangerManageType"/>
- <result column="danger_desc" property="dangerDesc"/>
- <result column="danger_reason" property="dangerReason"/>
- <result column="control_measures" property="controlMeasures"/>
- <result column="cost" property="cost"/>
- <result column="danger_manage_deadline" property="dangerManageDeadline"/>
- <result column="danger_state" property="dangerState"/>
- <result column="hazard_danger_type" property="hazardDangerType"/>
- <result column="hazard_category" property="hazardCategory"/>
- <result column="registrant" property="registrant"/>
- <result column="regist_time" property="registTime"/>
- <result column="liable_person" property="liablePerson"/>
- <result column="check_accept_person" property="checkAcceptPerson"/>
- <result column="check_accept_comment" property="checkAcceptComment"/>
- <result column="check_accept_time" property="checkAcceptTime"/>
- <result column="danger_manager_id" property="dangerManagerId"/>
- </resultMap>
-
- <!--IPage<PreventReportDangerInfo> getReportDangerInfoPage(Page<Object> objectPage, PreventReportDangerInfoReqDTO queryReqDTO);-->
- <select id="getReportDangerInfoPage" resultMap="BaseResultMap">
- select * from prevent_cj_report_danger_info
- order by create_by desc
- </select>
-
- <!-- List<PreventReportDangerInfo> listReportDangerRecordDate();-->
- <select id="listReportDangerDate" resultMap="BaseResultMap">
- select * from prevent_cj_report_danger_info
- where report_status = 1
- limit 200
- </select>
-
- <!--int updateTaskReportStatus(HandlerReportParam handlerReportParam);-->
- <update id="updateTaskReportStatus">
- update prevent_cj_report_danger_info set
- report_status = #{reportStatus},
- report_time = #{reportTime}
- where danger_manager_id = #{id}
- </update>
-
- <!--int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);-->
- <update id="updateCJReportStatusById">
- update prevent_cj_report_danger_info set
- report_status = #{reportStatus},
- report_time = #{reportTime}
- where id = #{id}
- </update>
-
-<!-- int insertDangerInfo(PreventCJReportDangerInfo danger);-->
- <insert id="insertDangerInfo">
- insert into prevent_cj_report_danger_info
- values(null, #{id}, #{companyCode}, #{deleted}, #{createDate}, #{createBy}, #{updateDate}, #{updateBy}
- , #{hazardCode}, #{riskMeasureId}, #{checkRecordId}, #{dangerName}, #{dangerLevel}, #{dangerSrc}, #{dangerManageType}
- , #{dangerDesc}, #{dangerReason}, #{controlMeasures}, #{cost}, #{dangerManageDeadline}, #{dangerState}, #{hazardDangerType}
- , #{registrant}, #{registTime}, #{liablePerson}, #{checkAcceptPerson}, #{checkAcceptComment}, #{checkAcceptTime}, #{hazardCategory}
- , #{reportStatus}, #{reportTime}, #{dataSource}, #{dangerManagerId})
- </insert>
-
-<!-- List<PreventCJReportDangerInfo> getDangerListForCheckTask();-->
- <select id="getDangerListForCheckTask" resultMap="BaseResultMap">
- select * from prevent_cj_report_danger_info
- where hazard_code is not null and report_status = 2 and deleted = 0
- order by create_date desc
- </select>
-<!-- PreventCJReportDangerInfo getDangetById(String dangerId);-->
- <select id="getDangerById" resultMap="BaseResultMap">
- select * from prevent_cj_report_danger_info
- where deleted = 0 and id = #{dangerId}
- </select>
-</mapper>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportDangerInfoRepository">
+
+ <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo">
+ <id column="index_id" property="indexId"/>
+ <result column="id" property="id"/>
+ <result column="company_code" property="companyCode"/>
+ <result column="deleted" property="deleted"/>
+ <result column="create_date" property="createDate"/>
+ <result column="create_by" property="createBy"/>
+ <result column="update_date" property="updateDate"/>
+ <result column="update_by" property="updateBy"/>
+ <result column="report_status" property="reportStatus"/>
+ <result column="report_time" property="reportTime"/>
+ <result column="data_source" property="dataSource"/>
+ <result column="hazard_code" property="hazardCode"/>
+ <result column="risk_measure_id" property="riskMeasureId"/>
+ <result column="check_record_id" property="checkRecordId"/>
+ <result column="danger_name" property="dangerName"/>
+ <result column="danger_level" property="dangerLevel"/>
+ <result column="danger_src" property="dangerSrc"/>
+ <result column="danger_manage_type" property="dangerManageType"/>
+ <result column="danger_desc" property="dangerDesc"/>
+ <result column="danger_reason" property="dangerReason"/>
+ <result column="control_measures" property="controlMeasures"/>
+ <result column="cost" property="cost"/>
+ <result column="danger_manage_deadline" property="dangerManageDeadline"/>
+ <result column="danger_state" property="dangerState"/>
+ <result column="hazard_danger_type" property="hazardDangerType"/>
+ <result column="hazard_category" property="hazardCategory"/>
+ <result column="registrant" property="registrant"/>
+ <result column="regist_time" property="registTime"/>
+ <result column="liable_person" property="liablePerson"/>
+ <result column="check_accept_person" property="checkAcceptPerson"/>
+ <result column="check_accept_comment" property="checkAcceptComment"/>
+ <result column="check_accept_time" property="checkAcceptTime"/>
+ <result column="danger_manager_id" property="dangerManagerId"/>
+ </resultMap>
+
+ <!--IPage<PreventReportDangerInfo> getReportDangerInfoPage(Page<Object> objectPage, PreventReportDangerInfoReqDTO queryReqDTO);-->
+ <select id="getReportDangerInfoPage" resultMap="BaseResultMap">
+ select * from prevent_cj_report_danger_info
+ order by create_by desc
+ </select>
+
+ <!-- List<PreventReportDangerInfo> listReportDangerRecordDate();-->
+ <select id="listReportDangerDate" resultMap="BaseResultMap">
+ select * from prevent_cj_report_danger_info
+ where report_status = 1
+ limit 200
+ </select>
+
+ <!--int updateTaskReportStatus(HandlerReportParam handlerReportParam);-->
+ <update id="updateTaskReportStatus">
+ update prevent_cj_report_danger_info set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where danger_manager_id = #{id}
+ </update>
+
+ <!--int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);-->
+ <update id="updateCJReportStatusById">
+ update prevent_cj_report_danger_info set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where id = #{id}
+ </update>
+
+<!-- int insertDangerInfo(PreventCJReportDangerInfo danger);-->
+ <insert id="insertDangerInfo">
+ insert into prevent_cj_report_danger_info
+ values(null, #{id}, #{companyCode}, #{deleted}, #{createDate}, #{createBy}, #{updateDate}, #{updateBy}
+ , #{hazardCode}, #{riskMeasureId}, #{checkRecordId}, #{dangerName}, #{dangerLevel}, #{dangerSrc}, #{dangerManageType}
+ , #{dangerDesc}, #{dangerReason}, #{controlMeasures}, #{cost}, #{dangerManageDeadline}, #{dangerState}, #{hazardDangerType}
+ , #{registrant}, #{registTime}, #{liablePerson}, #{checkAcceptPerson}, #{checkAcceptComment}, #{checkAcceptTime}, #{hazardCategory}
+ , #{reportStatus}, #{reportTime}, #{dataSource}, #{dangerManagerId})
+ </insert>
+
+<!-- List<PreventCJReportDangerInfo> getDangerListForCheckTask();-->
+ <select id="getDangerListForCheckTask" resultMap="BaseResultMap">
+ select * from prevent_cj_report_danger_info
+ where hazard_code is not null and report_status = 2 and deleted = 0
+ order by create_date desc
+ </select>
+<!-- PreventCJReportDangerInfo getDangetById(String dangerId);-->
+ <select id="getDangerById" resultMap="BaseResultMap">
+ select * from prevent_cj_report_danger_info
+ where deleted = 0 and id = #{dangerId}
+ </select>
+</mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportOverhaulMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportOverhaulMapper.xml
index 21d01ec..e212137 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventCJReportOverhaulMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportOverhaulMapper.xml
@@ -1,68 +1,68 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportOverhaulLogRepository" >
-
-<!-- List<PreventCJReportOverhaulLog> listReportOverhaulDate();-->
- <select id="listReportOverhaulDate" resultType="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportOverhaulLog">
- select * from prevent_overhaul_log
- where report_status = 1
- limit 200
- </select>
-
-<!-- int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);-->
- <select id="updateCJReportStatusById">
- update prevent_overhaul_log set
- report_status = #{reportStatus},
- report_time = #{reportTime}
- where id = #{id}
- </select>
-
-
-<!-- int insertCJOverhaulLists(PreventOverhaulLog preventOverhaulLog);-->
- <insert id="insertCJOverhaulLists" parameterType="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportOverhaulLog">
- insert into prevent_overhaul_log
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="id != null ">id,</if>
- <if test="deleteStatus != null ">delete_status,</if>
- <if test="companyCode != null ">company_code,</if>
-
- <if test="gmtCreate != null ">gmt_create,</if>
- <if test="createByUserName != null">create_by_user_name,</if>
- <if test="gmtModitify != null ">gmt_moditify,</if>
- <if test="lastEditUserName != null ">last_edit_user_name,</if>
-
- <if test="reportTime != null ">report_time,</if>
- <if test="reportStatus != null ">report_status,</if>
- <if test="dataSource != null ">data_source,</if>
-
- <if test="hazardCode != null ">hazard_code,</if>
- <if test="riskUnitId != null ">risk_unit_id,</if>
- <if test="stopStartTime != null ">stop_start_time,</if>
- <if test="stopEndTime != null ">stop_end_time,</if>
- <if test="stopReason != null ">stop_reason,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="uuid != null ">#{uuid},</if>
- <if test="deleteStatus != null ">#{deleteStatus},</if>
- <if test="companyCode != null ">#{companyCode},</if>
-
- <if test="gmtCreate != null ">#{gmtCreate},</if>
- <if test="createByUserName != null ">#{createByUserName},</if>
- <if test="gmtModitify != null ">#{gmtModitify},</if>
- <if test="lastEditUserName != null ">#{lastEditUserName},</if>
-
- <if test="reportTime != null ">#{reportTime},</if>
- <if test="reportStatus != null ">#{reportStatus},</if>
- <if test="dataSource != null ">#{dataSource},</if>
-
- <if test="hazardCode != null ">#{hazardCode},</if>
- <if test="riskUnitId != null ">#{riskUnitId},</if>
- <if test="stopStartTime != null ">#{stopStartTime},</if>
- <if test="stopEndTime != null ">#{stopEndTime},</if>
- <if test="stopReason != null ">#{stopReason},</if>
- </trim>
- </insert>
-
-
-</mapper>
-
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportOverhaulLogRepository" >
+
+<!-- List<PreventCJReportOverhaulLog> listReportOverhaulDate();-->
+ <select id="listReportOverhaulDate" resultType="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportOverhaulLog">
+ select * from prevent_overhaul_log
+ where report_status = 1
+ limit 200
+ </select>
+
+<!-- int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);-->
+ <select id="updateCJReportStatusById">
+ update prevent_overhaul_log set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where id = #{id}
+ </select>
+
+
+<!-- int insertCJOverhaulLists(PreventOverhaulLog preventOverhaulLog);-->
+ <insert id="insertCJOverhaulLists" parameterType="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportOverhaulLog">
+ insert into prevent_overhaul_log
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null ">id,</if>
+ <if test="deleteStatus != null ">delete_status,</if>
+ <if test="companyCode != null ">company_code,</if>
+
+ <if test="gmtCreate != null ">gmt_create,</if>
+ <if test="createByUserName != null">create_by_user_name,</if>
+ <if test="gmtModitify != null ">gmt_moditify,</if>
+ <if test="lastEditUserName != null ">last_edit_user_name,</if>
+
+ <if test="reportTime != null ">report_time,</if>
+ <if test="reportStatus != null ">report_status,</if>
+ <if test="dataSource != null ">data_source,</if>
+
+ <if test="hazardCode != null ">hazard_code,</if>
+ <if test="riskUnitId != null ">risk_unit_id,</if>
+ <if test="stopStartTime != null ">stop_start_time,</if>
+ <if test="stopEndTime != null ">stop_end_time,</if>
+ <if test="stopReason != null ">stop_reason,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="uuid != null ">#{uuid},</if>
+ <if test="deleteStatus != null ">#{deleteStatus},</if>
+ <if test="companyCode != null ">#{companyCode},</if>
+
+ <if test="gmtCreate != null ">#{gmtCreate},</if>
+ <if test="createByUserName != null ">#{createByUserName},</if>
+ <if test="gmtModitify != null ">#{gmtModitify},</if>
+ <if test="lastEditUserName != null ">#{lastEditUserName},</if>
+
+ <if test="reportTime != null ">#{reportTime},</if>
+ <if test="reportStatus != null ">#{reportStatus},</if>
+ <if test="dataSource != null ">#{dataSource},</if>
+
+ <if test="hazardCode != null ">#{hazardCode},</if>
+ <if test="riskUnitId != null ">#{riskUnitId},</if>
+ <if test="stopStartTime != null ">#{stopStartTime},</if>
+ <if test="stopEndTime != null ">#{stopEndTime},</if>
+ <if test="stopReason != null ">#{stopReason},</if>
+ </trim>
+ </insert>
+
+
+</mapper>
+
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportPointMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportPointMapper.xml
index 581553c..248e9c0 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventCJReportPointMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportPointMapper.xml
@@ -1,81 +1,81 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportPointRepository">
-
- <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportPoint">
- <id column="index_id" property="indexId"/>
- <result column="id" property="id"/>
- <result column="company_code" property="companyCode"/>
- <result column="deleted" property="deleted"/>
- <result column="create_date" property="createDate"/>
- <result column="create_by" property="createBy"/>
- <result column="update_date" property="updateDate"/>
- <result column="update_by" property="updateBy"/>
- <result column="risk_unit_ids" property="riskUnitIds"/>
- <result column="risk_event_ids" property="riskEventIds"/>
- <result column="risk_measure_ids" property="riskMeasureIds"/>
- <result column="hazard_dep" property="hazardDep"/>
- <result column="hazard_liable_person" property="hazardLiablePerson"/>
- <result column="hazard_code" property="hazardCode"/>
- <result column="report_status" property="reportStatus"/>
- <result column="report_time" property="reportTime"/>
- <result column="data_source" property="dataSource"/>
- <result column="risk_event_id" property="riskEventId"/>
- </resultMap>
-
- <!--IPage<PreventReportRiskEvent> getReportRiskEventPage();-->
- <select id="getReportRiskEventPage" resultMap="BaseResultMap">
- select * from prevent_cj_report_point
- order by create_by desc
- </select>
-
- <!--List<PreventReportRiskEvent> listReportEventDate();-->
- <select id="listReportEventDate" resultMap="BaseResultMap">
- select * from prevent_cj_report_point
- where report_status = 1
- limit 200
- </select>
-
- <!--int updateEventReportStatus(HandlerReportParam handlerReportParam);-->
- <update id="updateEventReportStatus">
- update prevent_cj_report_point set
- report_status = #{reportStatus},
- report_time = #{reportTime}
- where risk_event_id = #{id}
- </update>
- <!--int insertList(List<PreventReportRiskEvent> eventLists);-->
- <insert id="saveList">
- insert into prevent_cj_report_point
- (
- id,
- risk_event_name,
- risk_unit_id,
- company_code,
- deleted,
- create_date,
- create_by,
- update_date,
- update_by,
- data_source,
- report_status,
- report_time
- )
- values
- <foreach collection="eventLists" item="eventList" separator="," >
- (
- #{eventList.id},
- #{eventList.riskEventName},
- #{eventList.riskUnitId},
- #{eventList.companyCode},
- #{eventList.deleted},
- #{eventList.createDate},
- #{eventList.createBy},
- #{eventList.updateDate},
- #{eventList.updateBy},
- #{eventList.dataSource},
- #{eventList.reportStatus},
- #{eventList.reportTime}
- )
- </foreach>
- </insert>
-</mapper>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportPointRepository">
+
+ <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportPoint">
+ <id column="index_id" property="indexId"/>
+ <result column="id" property="id"/>
+ <result column="company_code" property="companyCode"/>
+ <result column="deleted" property="deleted"/>
+ <result column="create_date" property="createDate"/>
+ <result column="create_by" property="createBy"/>
+ <result column="update_date" property="updateDate"/>
+ <result column="update_by" property="updateBy"/>
+ <result column="risk_unit_ids" property="riskUnitIds"/>
+ <result column="risk_event_ids" property="riskEventIds"/>
+ <result column="risk_measure_ids" property="riskMeasureIds"/>
+ <result column="hazard_dep" property="hazardDep"/>
+ <result column="hazard_liable_person" property="hazardLiablePerson"/>
+ <result column="hazard_code" property="hazardCode"/>
+ <result column="report_status" property="reportStatus"/>
+ <result column="report_time" property="reportTime"/>
+ <result column="data_source" property="dataSource"/>
+ <result column="risk_event_id" property="riskEventId"/>
+ </resultMap>
+
+ <!--IPage<PreventReportRiskEvent> getReportRiskEventPage();-->
+ <select id="getReportRiskEventPage" resultMap="BaseResultMap">
+ select * from prevent_cj_report_point
+ order by create_by desc
+ </select>
+
+ <!--List<PreventReportRiskEvent> listReportEventDate();-->
+ <select id="listReportEventDate" resultMap="BaseResultMap">
+ select * from prevent_cj_report_point
+ where report_status = 1
+ limit 200
+ </select>
+
+ <!--int updateEventReportStatus(HandlerReportParam handlerReportParam);-->
+ <update id="updateEventReportStatus">
+ update prevent_cj_report_point set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where risk_event_id = #{id}
+ </update>
+ <!--int insertList(List<PreventReportRiskEvent> eventLists);-->
+ <insert id="saveList">
+ insert into prevent_cj_report_point
+ (
+ id,
+ risk_event_name,
+ risk_unit_id,
+ company_code,
+ deleted,
+ create_date,
+ create_by,
+ update_date,
+ update_by,
+ data_source,
+ report_status,
+ report_time
+ )
+ values
+ <foreach collection="eventLists" item="eventList" separator="," >
+ (
+ #{eventList.id},
+ #{eventList.riskEventName},
+ #{eventList.riskUnitId},
+ #{eventList.companyCode},
+ #{eventList.deleted},
+ #{eventList.createDate},
+ #{eventList.createBy},
+ #{eventList.updateDate},
+ #{eventList.updateBy},
+ #{eventList.dataSource},
+ #{eventList.reportStatus},
+ #{eventList.reportTime}
+ )
+ </foreach>
+ </insert>
+</mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportResultDataRepository.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportResultDataRepository.xml
index 608ee94..137b5a0 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventCJReportResultDataRepository.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportResultDataRepository.xml
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportResultDataRepository" >
-
- <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportResultData">
- <id column="id" property="id"/>
- <result column="code" property="batchId"/>
- <result column="batch_time" property="batchTime"/>
- <result column="data_source" property="dataSource"/>
- </resultMap>
-
-
-</mapper>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportResultDataRepository" >
+
+ <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportResultData">
+ <id column="id" property="id"/>
+ <result column="code" property="batchId"/>
+ <result column="batch_time" property="batchTime"/>
+ <result column="data_source" property="dataSource"/>
+ </resultMap>
+
+
+</mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskAnaUnitMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskAnaUnitMapper.xml
index cfec120..30fc447 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskAnaUnitMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskAnaUnitMapper.xml
@@ -1,73 +1,73 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportRiskAnaUnitRepository">
-
- <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskAnaUnit">
- <id column="index_id" property="indexId"/>
- <result column="id" property="id"/>
- <result column="company_code" property="companyCode"/>
- <result column="deleted" property="deleted"/>
- <result column="create_date" property="createDate"/>
- <result column="create_by" property="createBy"/>
- <result column="update_date" property="updateDate"/>
- <result column="update_by" property="updateBy"/>
- <result column="report_status" property="reportStatus"/>
- <result column="report_time" property="reportTime"/>
- <result column="data_source" property="dataSource"/>
- <result column="risk_unit_name" property="riskUnitName"/>
- <result column="hazard_code" property="hazardCode"/>
- <result column="hazard_dep" property="hazardDep"/>
- <result column="hazard_liable_person" property="hazardLiablePerson"/>
- <result column="risk_unit_id" property="riskUnitId"/>
- </resultMap>
-
- <!--IPage<PreventRiskAnaUnit> getReportRiskUnitPage(Page<Object> page, PreReportRiskUnitQueryReqDTO queryReqDTO);-->
- <select id="getReportRiskUnitPage" resultMap="BaseResultMap">
- select * from
- prevent_cj_report_risk_ana_unit
- <where>
- 1 = 1
- <if test="queryReqDTO.riskUnitName != null">
- and liable_person_id = #{queryReqDTO.riskUnitName}
- </if>
- <if test="queryReqDTO.hazardDep != null">
- and liable_dep_id = #{queryReqDTO.hazardDep}
- </if>
- <if test="queryReqDTO.hazardLiablePerson != null">
- and risk_unit_name = #{queryReqDTO.hazardLiablePerson}
- </if>
- </where>
- </select>
-
- <!--List<PreventReportRiskAnaUnit> listReportUnitDate();-->
- <select id="listReportUnitDate" resultMap="BaseResultMap">
- select * from prevent_cj_report_risk_ana_unit
- where report_status = 1
- limit 200
- </select>
-
- <!--int updateReportStatus();-->
- <update id="updateReportStatus">
- update prevent_cj_report_risk_ana_unit set
- report_status = #{reportStatus},
- report_time = #{reportTime}
- where risk_unit_id = #{id}
- </update>
-
- <!--int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);-->
- <update id="updateCJReportStatusById">
- update prevent_cj_report_risk_ana_unit set
- report_status = #{reportStatus},
- report_time = #{reportTime}
- where id = #{id}
- </update>
-
-<!-- int insertUnitList(PreventCJReportRiskAnaUnit unit);-->
- <insert id="insertUnitList">
- insert into prevent_cj_report_risk_ana_unit
- values(null, #{id}, #{companyCode}, #{deleted}, #{createDate}, #{createBy}, #{updateDate}, #{updateBy}
- , #{riskUnitName}, #{hazardCode}, #{hazardDep}, #{hazardLiablePerson}
- , #{reportStatus}, #{reportTime}, #{dataSource}, #{riskUnitId})
- </insert>
-
-</mapper>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportRiskAnaUnitRepository">
+
+ <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskAnaUnit">
+ <id column="index_id" property="indexId"/>
+ <result column="id" property="id"/>
+ <result column="company_code" property="companyCode"/>
+ <result column="deleted" property="deleted"/>
+ <result column="create_date" property="createDate"/>
+ <result column="create_by" property="createBy"/>
+ <result column="update_date" property="updateDate"/>
+ <result column="update_by" property="updateBy"/>
+ <result column="report_status" property="reportStatus"/>
+ <result column="report_time" property="reportTime"/>
+ <result column="data_source" property="dataSource"/>
+ <result column="risk_unit_name" property="riskUnitName"/>
+ <result column="hazard_code" property="hazardCode"/>
+ <result column="hazard_dep" property="hazardDep"/>
+ <result column="hazard_liable_person" property="hazardLiablePerson"/>
+ <result column="risk_unit_id" property="riskUnitId"/>
+ </resultMap>
+
+ <!--IPage<PreventRiskAnaUnit> getReportRiskUnitPage(Page<Object> page, PreReportRiskUnitQueryReqDTO queryReqDTO);-->
+ <select id="getReportRiskUnitPage" resultMap="BaseResultMap">
+ select * from
+ prevent_cj_report_risk_ana_unit
+ <where>
+ 1 = 1
+ <if test="queryReqDTO.riskUnitName != null">
+ and liable_person_id = #{queryReqDTO.riskUnitName}
+ </if>
+ <if test="queryReqDTO.hazardDep != null">
+ and liable_dep_id = #{queryReqDTO.hazardDep}
+ </if>
+ <if test="queryReqDTO.hazardLiablePerson != null">
+ and risk_unit_name = #{queryReqDTO.hazardLiablePerson}
+ </if>
+ </where>
+ </select>
+
+ <!--List<PreventReportRiskAnaUnit> listReportUnitDate();-->
+ <select id="listReportUnitDate" resultMap="BaseResultMap">
+ select * from prevent_cj_report_risk_ana_unit
+ where report_status = 1
+ limit 200
+ </select>
+
+ <!--int updateReportStatus();-->
+ <update id="updateReportStatus">
+ update prevent_cj_report_risk_ana_unit set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where risk_unit_id = #{id}
+ </update>
+
+ <!--int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);-->
+ <update id="updateCJReportStatusById">
+ update prevent_cj_report_risk_ana_unit set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where id = #{id}
+ </update>
+
+<!-- int insertUnitList(PreventCJReportRiskAnaUnit unit);-->
+ <insert id="insertUnitList">
+ insert into prevent_cj_report_risk_ana_unit
+ values(null, #{id}, #{companyCode}, #{deleted}, #{createDate}, #{createBy}, #{updateDate}, #{updateBy}
+ , #{riskUnitName}, #{hazardCode}, #{hazardDep}, #{hazardLiablePerson}
+ , #{reportStatus}, #{reportTime}, #{dataSource}, #{riskUnitId})
+ </insert>
+
+</mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskControlMeasureMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskControlMeasureMapper.xml
index 50c7763..8fc59ef 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskControlMeasureMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskControlMeasureMapper.xml
@@ -1,112 +1,112 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportRiskControlMeasureRepository">
-
- <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskControlMeasure">
- <id column="index_id" property="indexId"/>
- <result column="id" property="id"/>
- <result column="company_code" property="companyCode"/>
- <result column="deleted" property="deleted"/>
- <result column="create_date" property="createDate"/>
- <result column="create_by" property="createBy"/>
- <result column="update_date" property="updateDate"/>
- <result column="update_by" property="updateBy"/>
- <result column="report_status" property="reportStatus"/>
- <result column="report_time" property="reportTime"/>
- <result column="data_source" property="dataSource"/>
- <result column="risk_event_id" property="riskEventId"/>
- <result column="data_src" property="dataSrc"/>
- <result column="risk_measure_desc" property="riskMeasureDesc"/>
- <result column="troubleshoot_content" property="troubleshootContent"/>
- <result column="classify1" property="classify1"/>
- <result column="classify2" property="classify2"/>
- <result column="classify3" property="classify3"/>
- <result column="risk_measure_id" property="riskMeasureId"/>
- </resultMap>
-
-<!-- IPage<PreventReportRiskControlMeasure> getReportMeasurePage();-->
- <select id="getReportMeasurePage" resultMap="BaseResultMap">
- select * from prevent_cj_report_risk_control_measure
- </select>
-
- <!--List<PreventReportRiskControlMeasure> listReportMeasureDate();-->
- <select id="listReportMeasureDate" resultMap="BaseResultMap">
- select * from prevent_cj_report_risk_control_measure
- where report_status = 1
- limit 200
- </select>
-
- <!--int updateMeasureReportStatus(HandlerReportParam handlerReportParam);-->
- <update id="updateMeasureReportStatus">
- update prevent_cj_report_risk_control_measure set
- report_status = #{reportStatus},
- report_time = #{reportTime}
- where risk_measure_id = #{id}
- </update>
-
- <!--int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);-->
- <update id="updateCJReportStatusById">
- update prevent_cj_report_risk_control_measure set
- report_status = #{reportStatus},
- report_time = #{reportTime}
- where id = #{id}
- </update>
-
-<!-- int insertMeasureList(PreventCJReportRiskControlMeasure cjMeasure);-->
- <insert id="insertMeasureList">
- insert into prevent_cj_report_risk_control_measure
- values(null, #{id}, #{companyCode}, #{deleted}, #{createDate}, #{createBy}, #{updateDate}, #{updateBy}
- , #{riskEventId}, #{dataSrc}, #{riskMeasureDesc}, #{troubleshootContent}, #{classify1}, #{classify2}, #{classify3}
- , #{reportStatus}, #{reportTime}, #{dataSource}, #{riskMeasureId})
- </insert>
-
-
-
-
- <!--int insertList(List<PreventReportRiskControlMeasure> measureLists);-->
- <insert id="insertList">
- insert into prevent_cj_report_risk_control_measure
- (
- id,
- risk_event_id,
- data_src,
- risk_measure_desc,
- troubleshoot_content,
- classify1,
- classify2,
- classify3,
- company_code,
- deleted,
- create_date,
- create_by,
- update_date,
- update_by,
- data_source,
- report_status,
- report_time
- )
- values
- <foreach collection="measureLists" item="measureList" separator="," >
- (
- #{eventList.id},
- #{eventList.riskEventId},
- #{eventList.dataSrc},
- #{eventList.riskMeasureDesc},
- #{eventList.troubleshootContent},
- #{eventList.classify1},
- #{eventList.classify2},
- #{eventList.classify3},
- #{eventList.companyCode},
- #{eventList.deleted},
- #{eventList.createDate},
- #{eventList.createBy},
- #{eventList.updateDate},
- #{eventList.updateBy},
- #{eventList.dataSource},
- #{eventList.reportStatus},
- #{eventList.reportTime}
- )
- </foreach>
- </insert>
-
-</mapper>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportRiskControlMeasureRepository">
+
+ <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskControlMeasure">
+ <id column="index_id" property="indexId"/>
+ <result column="id" property="id"/>
+ <result column="company_code" property="companyCode"/>
+ <result column="deleted" property="deleted"/>
+ <result column="create_date" property="createDate"/>
+ <result column="create_by" property="createBy"/>
+ <result column="update_date" property="updateDate"/>
+ <result column="update_by" property="updateBy"/>
+ <result column="report_status" property="reportStatus"/>
+ <result column="report_time" property="reportTime"/>
+ <result column="data_source" property="dataSource"/>
+ <result column="risk_event_id" property="riskEventId"/>
+ <result column="data_src" property="dataSrc"/>
+ <result column="risk_measure_desc" property="riskMeasureDesc"/>
+ <result column="troubleshoot_content" property="troubleshootContent"/>
+ <result column="classify1" property="classify1"/>
+ <result column="classify2" property="classify2"/>
+ <result column="classify3" property="classify3"/>
+ <result column="risk_measure_id" property="riskMeasureId"/>
+ </resultMap>
+
+<!-- IPage<PreventReportRiskControlMeasure> getReportMeasurePage();-->
+ <select id="getReportMeasurePage" resultMap="BaseResultMap">
+ select * from prevent_cj_report_risk_control_measure
+ </select>
+
+ <!--List<PreventReportRiskControlMeasure> listReportMeasureDate();-->
+ <select id="listReportMeasureDate" resultMap="BaseResultMap">
+ select * from prevent_cj_report_risk_control_measure
+ where report_status = 1
+ limit 200
+ </select>
+
+ <!--int updateMeasureReportStatus(HandlerReportParam handlerReportParam);-->
+ <update id="updateMeasureReportStatus">
+ update prevent_cj_report_risk_control_measure set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where risk_measure_id = #{id}
+ </update>
+
+ <!--int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);-->
+ <update id="updateCJReportStatusById">
+ update prevent_cj_report_risk_control_measure set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where id = #{id}
+ </update>
+
+<!-- int insertMeasureList(PreventCJReportRiskControlMeasure cjMeasure);-->
+ <insert id="insertMeasureList">
+ insert into prevent_cj_report_risk_control_measure
+ values(null, #{id}, #{companyCode}, #{deleted}, #{createDate}, #{createBy}, #{updateDate}, #{updateBy}
+ , #{riskEventId}, #{dataSrc}, #{riskMeasureDesc}, #{troubleshootContent}, #{classify1}, #{classify2}, #{classify3}
+ , #{reportStatus}, #{reportTime}, #{dataSource}, #{riskMeasureId})
+ </insert>
+
+
+
+
+ <!--int insertList(List<PreventReportRiskControlMeasure> measureLists);-->
+ <insert id="insertList">
+ insert into prevent_cj_report_risk_control_measure
+ (
+ id,
+ risk_event_id,
+ data_src,
+ risk_measure_desc,
+ troubleshoot_content,
+ classify1,
+ classify2,
+ classify3,
+ company_code,
+ deleted,
+ create_date,
+ create_by,
+ update_date,
+ update_by,
+ data_source,
+ report_status,
+ report_time
+ )
+ values
+ <foreach collection="measureLists" item="measureList" separator="," >
+ (
+ #{eventList.id},
+ #{eventList.riskEventId},
+ #{eventList.dataSrc},
+ #{eventList.riskMeasureDesc},
+ #{eventList.troubleshootContent},
+ #{eventList.classify1},
+ #{eventList.classify2},
+ #{eventList.classify3},
+ #{eventList.companyCode},
+ #{eventList.deleted},
+ #{eventList.createDate},
+ #{eventList.createBy},
+ #{eventList.updateDate},
+ #{eventList.updateBy},
+ #{eventList.dataSource},
+ #{eventList.reportStatus},
+ #{eventList.reportTime}
+ )
+ </foreach>
+ </insert>
+
+</mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskEventMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskEventMapper.xml
index 61cfea0..b6aadce 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskEventMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventCJReportRiskEventMapper.xml
@@ -1,99 +1,99 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportRiskEventRepository">
-
- <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskEvent">
- <id column="index_id" property="indexId"/>
- <result column="id" property="id"/>
- <result column="company_code" property="companyCode"/>
- <result column="deleted" property="deleted"/>
- <result column="create_date" property="createDate"/>
- <result column="create_by" property="createBy"/>
- <result column="update_date" property="updateDate"/>
- <result column="update_by" property="updateBy"/>
- <result column="report_status" property="reportStatus"/>
- <result column="report_time" property="reportTime"/>
- <result column="data_source" property="dataSource"/>
- <result column="risk_event_name" property="riskEventName"/>
- <result column="risk_unit_id" property="riskUnitId"/>
- <result column="risk_event_id" property="riskEventId"/>
- </resultMap>
-
- <!--IPage<PreventReportRiskEvent> getReportRiskEventPage();-->
- <select id="getReportRiskEventPage" resultMap="BaseResultMap">
- select * from prevent_cj_report_risk_event
- order by create_by desc
- </select>
-
- <!--List<PreventReportRiskEvent> listReportEventDate();-->
- <select id="listReportEventDate" resultMap="BaseResultMap">
- select * from prevent_cj_report_risk_event
- where report_status = 1
- limit 200
- </select>
-
- <!--int updateEventReportStatus(HandlerReportParam handlerReportParam);-->
- <update id="updateEventReportStatus">
- update prevent_cj_report_risk_event set
- report_status = #{reportStatus},
- report_time = #{reportTime}
- where risk_event_id = #{id}
- </update>
-
- <!--int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);-->
- <update id="updateCJReportStatusById">
- update prevent_cj_report_risk_event set
- report_status = #{reportStatus},
- report_time = #{reportTime}
- where id = #{id}
- </update>
-
-<!-- int insertEventLists(PreventCJReportRiskEvent event);-->
- <insert id="insertEventLists" >
- insert into prevent_cj_report_risk_event
- values(null, #{id}, #{companyCode}, #{deleted}, #{createDate}, #{createBy}, #{updateDate}, #{updateBy}
- , #{riskEventName}, #{riskUnitId}, #{reportStatus}, #{reportTime}, #{dataSource}, #{riskEventId})
- </insert>
-
-
-
-
-
-
-
- <!--int insertList(List<PreventReportRiskEvent> eventLists);-->
- <insert id="saveList">
- insert into prevent_cj_report_risk_event
- (
- id,
- risk_event_name,
- risk_unit_id,
- company_code,
- deleted,
- create_date,
- create_by,
- update_date,
- update_by,
- data_source,
- report_status,
- report_time
- )
- values
- <foreach collection="eventLists" item="eventList" separator="," >
- (
- #{eventList.id},
- #{eventList.riskEventName},
- #{eventList.riskUnitId},
- #{eventList.companyCode},
- #{eventList.deleted},
- #{eventList.createDate},
- #{eventList.createBy},
- #{eventList.updateDate},
- #{eventList.updateBy},
- #{eventList.dataSource},
- #{eventList.reportStatus},
- #{eventList.reportTime}
- )
- </foreach>
- </insert>
-</mapper>
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.doublePrevention.repository.PreventCJReportRiskEventRepository">
+
+ <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportRiskEvent">
+ <id column="index_id" property="indexId"/>
+ <result column="id" property="id"/>
+ <result column="company_code" property="companyCode"/>
+ <result column="deleted" property="deleted"/>
+ <result column="create_date" property="createDate"/>
+ <result column="create_by" property="createBy"/>
+ <result column="update_date" property="updateDate"/>
+ <result column="update_by" property="updateBy"/>
+ <result column="report_status" property="reportStatus"/>
+ <result column="report_time" property="reportTime"/>
+ <result column="data_source" property="dataSource"/>
+ <result column="risk_event_name" property="riskEventName"/>
+ <result column="risk_unit_id" property="riskUnitId"/>
+ <result column="risk_event_id" property="riskEventId"/>
+ </resultMap>
+
+ <!--IPage<PreventReportRiskEvent> getReportRiskEventPage();-->
+ <select id="getReportRiskEventPage" resultMap="BaseResultMap">
+ select * from prevent_cj_report_risk_event
+ order by create_by desc
+ </select>
+
+ <!--List<PreventReportRiskEvent> listReportEventDate();-->
+ <select id="listReportEventDate" resultMap="BaseResultMap">
+ select * from prevent_cj_report_risk_event
+ where report_status = 1
+ limit 200
+ </select>
+
+ <!--int updateEventReportStatus(HandlerReportParam handlerReportParam);-->
+ <update id="updateEventReportStatus">
+ update prevent_cj_report_risk_event set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where risk_event_id = #{id}
+ </update>
+
+ <!--int updateCJReportStatusById(HandlerCJReportParam handlerCJReportParam);-->
+ <update id="updateCJReportStatusById">
+ update prevent_cj_report_risk_event set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where id = #{id}
+ </update>
+
+<!-- int insertEventLists(PreventCJReportRiskEvent event);-->
+ <insert id="insertEventLists" >
+ insert into prevent_cj_report_risk_event
+ values(null, #{id}, #{companyCode}, #{deleted}, #{createDate}, #{createBy}, #{updateDate}, #{updateBy}
+ , #{riskEventName}, #{riskUnitId}, #{reportStatus}, #{reportTime}, #{dataSource}, #{riskEventId})
+ </insert>
+
+
+
+
+
+
+
+ <!--int insertList(List<PreventReportRiskEvent> eventLists);-->
+ <insert id="saveList">
+ insert into prevent_cj_report_risk_event
+ (
+ id,
+ risk_event_name,
+ risk_unit_id,
+ company_code,
+ deleted,
+ create_date,
+ create_by,
+ update_date,
+ update_by,
+ data_source,
+ report_status,
+ report_time
+ )
+ values
+ <foreach collection="eventLists" item="eventList" separator="," >
+ (
+ #{eventList.id},
+ #{eventList.riskEventName},
+ #{eventList.riskUnitId},
+ #{eventList.companyCode},
+ #{eventList.deleted},
+ #{eventList.createDate},
+ #{eventList.createBy},
+ #{eventList.updateDate},
+ #{eventList.updateBy},
+ #{eventList.dataSource},
+ #{eventList.reportStatus},
+ #{eventList.reportTime}
+ )
+ </foreach>
+ </insert>
+</mapper>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventOverhaulMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventOverhaulMapper.xml
index 5fcbb0d..7300a72 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventOverhaulMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventOverhaulMapper.xml
@@ -1,134 +1,134 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.doublePrevention.repository.PreventOverhaulLogRepository" >
-
- <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.PreventOverhaulLog">
- <id column="id" property="id"/>
- <id column="uuid" property="uuid"/>
- <result column="delete_status" property="deleteStatus" />
-
- <result column="gmt_create" property="gmtCreate" />
- <result column="create_by_user_name" property="createByUserName" />
- <result column="gmt_moditify" property="gmtModitify" />
- <result column="last_edit_user_name" property="lastEditUserName" />
- <result column="enterprise_id" property="enterpriseId" />
- <result column="enterprise_uuid" property="enterpriseUuid" />
-
- <result column="report_time" property="reportTime" />
- <result column="update_report_data_time" property="updateReportDataTime" />
- <result column="report_status" property="reportStatus" />
- <result column="report_switch" property="reportSwitch" />
-
- <result column="hazard_code" property="hazardCode" />
- <result column="risk_unit_id" property="riskUnitId" />
- <result column="risk_unit_uuid" property="riskUnitUuid" />
- <result column="stop_start_time" property="stopStartTime" />
- <result column="stop_end_time" property="stopEndTime" />
- <result column="stop_reason" property="stopReason" />
- </resultMap>
-
-
-
-<!-- List<PreventOverhaulLog> selectOverhaulLogPage(@Param("overhaulLogReqBO") PreventOverhaulLogReqBO overhaulLogReqBO);-->
- <select id="selectOverhaulLogPage" resultMap="BaseResultMap">
- select * from prevent_overhaul_log
- <where>
- delete_status = 0
- <if test="overhaulLogReqBO.riskUnitId != null">
- and risk_unit_id = #{overhaulLogReqBO.riskUnitId}
- </if>
- </where>
- </select>
-
-<!-- PreventOverhaulLog getOverhaulLogById(Long id);-->
- <select id="getOverhaulLogById" resultMap="BaseResultMap">
- select * from prevent_overhaul_log
- where delete_status = 0 and id = #{id}
- </select>
-
-<!-- List<PreventOverhaulLog> listReportOverhaulLog();-->
- <select id="listReportOverhaulLog" resultMap="BaseResultMap">
- select * from prevent_overhaul_log
- where report_switch = 0 and delete_status = 0 and (update_report_data_time > report_time or report_time is null)
- </select>
-<!-- int savePreventOverhaulLog(PreventOverhaulLog preventOverhaulLog);-->
- <insert id="savePreventOverhaulLog" parameterType="com.ruoyi.doublePrevention.entity.PreventOverhaulLog">
- insert into prevent_overhaul_log
- <trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="uuid != null ">uuid,</if>
- <if test="deleteStatus != null ">delete_status,</if>
- <if test="gmtCreate != null ">gmt_create,</if>
- <if test="createByUserName != null and createByUserName != '' ">create_by_user_name,</if>
- <if test="gmtModitify != null ">gmt_moditify,</if>
- <if test="lastEditUserName != null and lastEditUserName != '' ">last_edit_user_name,</if>
- <if test="enterpriseId != null and enterpriseId != '' ">enterprise_id,</if>
- <if test="enterpriseUuid != null and enterpriseUuid != '' ">enterprise_uuid,</if>
- <if test="reportTime != null ">report_time,</if>
- <if test="updateReportDataTime != null ">update_report_data_time,</if>
- <if test="reportStatus != null ">report_status,</if>
- <if test="reportSwitch != null ">report_switch,</if>
- <if test="hazardCode != null and hazardCode != '' ">hazard_code,</if>
- <if test="riskUnitId != null and riskUnitId != '' ">risk_unit_id,</if>
- <if test="riskUnitUuid != null ">risk_unit_uuid,</if>
- <if test="stopStartTime != null ">stop_start_time,</if>
- <if test="stopEndTime != null ">stop_end_time,</if>
- <if test="stopReason != null ">stop_reason,</if>
- </trim>
- <trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="uuid != null ">#{uuid},</if>
- <if test="deleteStatus != null ">#{deleteStatus},</if>
- <if test="gmtCreate != null ">#{gmtCreate},</if>
- <if test="createByUserName != null and createByUserName != '' ">#{createByUserName},</if>
- <if test="gmtModitify != null ">#{gmtModitify},</if>
- <if test="lastEditUserName != null and lastEditUserName != '' ">#{lastEditUserName},</if>
- <if test="enterpriseId != null and enterpriseId != '' ">#{enterpriseId},</if>
- <if test="enterpriseUuid != null and enterpriseUuid != '' ">#{enterpriseUuid},</if>
- <if test="reportTime != null ">#{reportTime},</if>
- <if test="updateReportDataTime != null ">#{updateReportDataTime},</if>
- <if test="reportStatus != null ">#{reportStatus},</if>
- <if test="reportSwitch != null ">#{reportSwitch},</if>
- <if test="hazardCode != null and hazardCode != '' ">#{hazardCode},</if>
- <if test="riskUnitId != null and riskUnitId != '' ">#{riskUnitId},</if>
- <if test="riskUnitUuid != null ">#{riskUnitUuid},</if>
- <if test="stopStartTime != null ">#{stopStartTime},</if>
- <if test="stopEndTime != null ">#{stopEndTime},</if>
- <if test="stopReason != null ">#{stopReason},</if>
- </trim>
- </insert>
-
-
-<!-- int updateOverhaulLog(PreventOverhaulLogUpdateReqBO updateReqBO);-->
- <update id="updateOverhaulLog" parameterType="com.ruoyi.doublePrevention.entity.PreventOverhaulLog">
- update prevent_overhaul_log
- <trim prefix="SET" suffixOverrides=",">
- <if test="preventOverhaulLog.hazardCode != null and preventOverhaulLog.hazardCode != ''">hazard_code = #{preventOverhaulLog.id},</if>
- <if test="preventOverhaulLog.riskUnitId != null ">risk_unit_id = #{preventOverhaulLog.riskUnitId},</if>
- <if test="preventOverhaulLog.riskUnitUuid != null and preventOverhaulLog.riskUnitUuid != ''">risk_unit_uuid = #{preventOverhaulLog.riskUnitUuid},</if>
- <if test="preventOverhaulLog.stopStartTime != null ">stop_start_time = #{preventOverhaulLog.stopStartTime},</if>
- <if test="preventOverhaulLog.stopEndTime != null ">stop_end_time = #{preventOverhaulLog.stopEndTime},</if>
- <if test="preventOverhaulLog.stopReason != null and preventOverhaulLog.stopReason != ''">stop_reason = #{preventOverhaulLog.stopReason},</if>
- <if test="preventOverhaulLog.gmtModitify != null ">gmt_moditify = #{preventOverhaulLog.gmtModitify},</if>
- <if test="preventOverhaulLog.lastEditUserName != null and preventOverhaulLog.lastEditUserName != ''">last_edit_user_name = #{preventOverhaulLog.lastEditUserName},</if>
- </trim>
- where id = #{preventOverhaulLog.id}
- </update>
-
-<!-- int deleteOverhaulLogByIds(String[] ids);-->
- <delete id="deleteOverhaulLogByIds" parameterType="String">
- delete from prevent_overhaul_log where id in
- <foreach item="id" collection="array" open="(" separator="," close=")">
- #{id}
- </foreach>
- </delete>
-
-
-
- <!-- int updateOverhaulReportStatus(HandlerReportParam handlerReportParam);-->
- <update id="updateOverhaulReportStatus" parameterType="com.ruoyi.doublePrevention.entity.PreventOverhaulLog">
- update prevent_overhaul_log set
- report_status = #{reportStatus},
- report_time = #{reportTime}
- where id = #{handlerReportParam.id}
- </update>
-</mapper>
-
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.doublePrevention.repository.PreventOverhaulLogRepository" >
+
+ <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.PreventOverhaulLog">
+ <id column="id" property="id"/>
+ <id column="uuid" property="uuid"/>
+ <result column="delete_status" property="deleteStatus" />
+
+ <result column="gmt_create" property="gmtCreate" />
+ <result column="create_by_user_name" property="createByUserName" />
+ <result column="gmt_moditify" property="gmtModitify" />
+ <result column="last_edit_user_name" property="lastEditUserName" />
+ <result column="enterprise_id" property="enterpriseId" />
+ <result column="enterprise_uuid" property="enterpriseUuid" />
+
+ <result column="report_time" property="reportTime" />
+ <result column="update_report_data_time" property="updateReportDataTime" />
+ <result column="report_status" property="reportStatus" />
+ <result column="report_switch" property="reportSwitch" />
+
+ <result column="hazard_code" property="hazardCode" />
+ <result column="risk_unit_id" property="riskUnitId" />
+ <result column="risk_unit_uuid" property="riskUnitUuid" />
+ <result column="stop_start_time" property="stopStartTime" />
+ <result column="stop_end_time" property="stopEndTime" />
+ <result column="stop_reason" property="stopReason" />
+ </resultMap>
+
+
+
+<!-- List<PreventOverhaulLog> selectOverhaulLogPage(@Param("overhaulLogReqBO") PreventOverhaulLogReqBO overhaulLogReqBO);-->
+ <select id="selectOverhaulLogPage" resultMap="BaseResultMap">
+ select * from prevent_overhaul_log
+ <where>
+ delete_status = 0
+ <if test="overhaulLogReqBO.riskUnitId != null">
+ and risk_unit_id = #{overhaulLogReqBO.riskUnitId}
+ </if>
+ </where>
+ </select>
+
+<!-- PreventOverhaulLog getOverhaulLogById(Long id);-->
+ <select id="getOverhaulLogById" resultMap="BaseResultMap">
+ select * from prevent_overhaul_log
+ where delete_status = 0 and id = #{id}
+ </select>
+
+<!-- List<PreventOverhaulLog> listReportOverhaulLog();-->
+ <select id="listReportOverhaulLog" resultMap="BaseResultMap">
+ select * from prevent_overhaul_log
+ where report_switch = 0 and delete_status = 0 and (update_report_data_time > report_time or report_time is null)
+ </select>
+<!-- int savePreventOverhaulLog(PreventOverhaulLog preventOverhaulLog);-->
+ <insert id="savePreventOverhaulLog" parameterType="com.ruoyi.doublePrevention.entity.PreventOverhaulLog">
+ insert into prevent_overhaul_log
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="uuid != null ">uuid,</if>
+ <if test="deleteStatus != null ">delete_status,</if>
+ <if test="gmtCreate != null ">gmt_create,</if>
+ <if test="createByUserName != null and createByUserName != '' ">create_by_user_name,</if>
+ <if test="gmtModitify != null ">gmt_moditify,</if>
+ <if test="lastEditUserName != null and lastEditUserName != '' ">last_edit_user_name,</if>
+ <if test="enterpriseId != null and enterpriseId != '' ">enterprise_id,</if>
+ <if test="enterpriseUuid != null and enterpriseUuid != '' ">enterprise_uuid,</if>
+ <if test="reportTime != null ">report_time,</if>
+ <if test="updateReportDataTime != null ">update_report_data_time,</if>
+ <if test="reportStatus != null ">report_status,</if>
+ <if test="reportSwitch != null ">report_switch,</if>
+ <if test="hazardCode != null and hazardCode != '' ">hazard_code,</if>
+ <if test="riskUnitId != null and riskUnitId != '' ">risk_unit_id,</if>
+ <if test="riskUnitUuid != null ">risk_unit_uuid,</if>
+ <if test="stopStartTime != null ">stop_start_time,</if>
+ <if test="stopEndTime != null ">stop_end_time,</if>
+ <if test="stopReason != null ">stop_reason,</if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="uuid != null ">#{uuid},</if>
+ <if test="deleteStatus != null ">#{deleteStatus},</if>
+ <if test="gmtCreate != null ">#{gmtCreate},</if>
+ <if test="createByUserName != null and createByUserName != '' ">#{createByUserName},</if>
+ <if test="gmtModitify != null ">#{gmtModitify},</if>
+ <if test="lastEditUserName != null and lastEditUserName != '' ">#{lastEditUserName},</if>
+ <if test="enterpriseId != null and enterpriseId != '' ">#{enterpriseId},</if>
+ <if test="enterpriseUuid != null and enterpriseUuid != '' ">#{enterpriseUuid},</if>
+ <if test="reportTime != null ">#{reportTime},</if>
+ <if test="updateReportDataTime != null ">#{updateReportDataTime},</if>
+ <if test="reportStatus != null ">#{reportStatus},</if>
+ <if test="reportSwitch != null ">#{reportSwitch},</if>
+ <if test="hazardCode != null and hazardCode != '' ">#{hazardCode},</if>
+ <if test="riskUnitId != null and riskUnitId != '' ">#{riskUnitId},</if>
+ <if test="riskUnitUuid != null ">#{riskUnitUuid},</if>
+ <if test="stopStartTime != null ">#{stopStartTime},</if>
+ <if test="stopEndTime != null ">#{stopEndTime},</if>
+ <if test="stopReason != null ">#{stopReason},</if>
+ </trim>
+ </insert>
+
+
+<!-- int updateOverhaulLog(PreventOverhaulLogUpdateReqBO updateReqBO);-->
+ <update id="updateOverhaulLog" parameterType="com.ruoyi.doublePrevention.entity.PreventOverhaulLog">
+ update prevent_overhaul_log
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="preventOverhaulLog.hazardCode != null and preventOverhaulLog.hazardCode != ''">hazard_code = #{preventOverhaulLog.id},</if>
+ <if test="preventOverhaulLog.riskUnitId != null ">risk_unit_id = #{preventOverhaulLog.riskUnitId},</if>
+ <if test="preventOverhaulLog.riskUnitUuid != null and preventOverhaulLog.riskUnitUuid != ''">risk_unit_uuid = #{preventOverhaulLog.riskUnitUuid},</if>
+ <if test="preventOverhaulLog.stopStartTime != null ">stop_start_time = #{preventOverhaulLog.stopStartTime},</if>
+ <if test="preventOverhaulLog.stopEndTime != null ">stop_end_time = #{preventOverhaulLog.stopEndTime},</if>
+ <if test="preventOverhaulLog.stopReason != null and preventOverhaulLog.stopReason != ''">stop_reason = #{preventOverhaulLog.stopReason},</if>
+ <if test="preventOverhaulLog.gmtModitify != null ">gmt_moditify = #{preventOverhaulLog.gmtModitify},</if>
+ <if test="preventOverhaulLog.lastEditUserName != null and preventOverhaulLog.lastEditUserName != ''">last_edit_user_name = #{preventOverhaulLog.lastEditUserName},</if>
+ </trim>
+ where id = #{preventOverhaulLog.id}
+ </update>
+
+<!-- int deleteOverhaulLogByIds(String[] ids);-->
+ <delete id="deleteOverhaulLogByIds" parameterType="String">
+ delete from prevent_overhaul_log where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </delete>
+
+
+
+ <!-- int updateOverhaulReportStatus(HandlerReportParam handlerReportParam);-->
+ <update id="updateOverhaulReportStatus" parameterType="com.ruoyi.doublePrevention.entity.PreventOverhaulLog">
+ update prevent_overhaul_log set
+ report_status = #{reportStatus},
+ report_time = #{reportTime}
+ where id = #{handlerReportParam.id}
+ </update>
+</mapper>
+
diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskCheckUnitMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskCheckUnitMapper.xml
index a4f48c9..3f48a9f 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventRiskCheckUnitMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventRiskCheckUnitMapper.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.doublePrevention.repository.PreventRiskCheckUnitRepository" >
-
- <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.PreventRiskCheckUnit">
- <id column="id" property="id"/>
- <result column="uuid" property="uuid"/>
- <result column="base_check_point_id" property="baseCheckPointId" />
- <result column="control_measure_id" property="controlMeasureId" />
- <result column="risk_id" property="riskId" />
- </resultMap>
-
-<!-- int insertPointAndMeasure(PreventRiskCheckUnit checkUnit);-->
- <insert id="insertPointAndMeasure">
- insert into prevent_risk_check_unit values(null, #{uuid}, #{baseCheckPointId}, #{controlMeasureId}, #{riskId})
- </insert>
-
-<!-- List<PreventRiskCheckUnit> getUnitByRiskId(String riskId);-->
- <select id="getUnitByRiskId" resultMap="BaseResultMap">
- select * from prevent_risk_check_unit
- where risk_id = #{riskId}
- </select>
-
- <!-- PreventRiskCheckUnit getUnitByBaseCheckPointId(Long baseCheckPointId);-->
- <select id="getUnitByBaseCheckPointId" resultMap="BaseResultMap">
- select * from prevent_risk_check_unit
- where base_check_point_id = #{baseCheckPointId}
- </select>
-
-
- <!-- int deletePointAndMeasure(String id);-->
- <delete id="deletePointAndMeasure">
- delete from prevent_risk_check_unit
- where base_check_point_id = #{id}
- </delete>
-
-
-</mapper>
-
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.doublePrevention.repository.PreventRiskCheckUnitRepository" >
+
+ <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.PreventRiskCheckUnit">
+ <id column="id" property="id"/>
+ <result column="uuid" property="uuid"/>
+ <result column="base_check_point_id" property="baseCheckPointId" />
+ <result column="control_measure_id" property="controlMeasureId" />
+ <result column="risk_id" property="riskId" />
+ </resultMap>
+
+<!-- int insertPointAndMeasure(PreventRiskCheckUnit checkUnit);-->
+ <insert id="insertPointAndMeasure">
+ insert into prevent_risk_check_unit values(null, #{uuid}, #{baseCheckPointId}, #{controlMeasureId}, #{riskId})
+ </insert>
+
+<!-- List<PreventRiskCheckUnit> getUnitByRiskId(String riskId);-->
+ <select id="getUnitByRiskId" resultMap="BaseResultMap">
+ select * from prevent_risk_check_unit
+ where risk_id = #{riskId}
+ </select>
+
+ <!-- PreventRiskCheckUnit getUnitByBaseCheckPointId(Long baseCheckPointId);-->
+ <select id="getUnitByBaseCheckPointId" resultMap="BaseResultMap">
+ select * from prevent_risk_check_unit
+ where base_check_point_id = #{baseCheckPointId}
+ </select>
+
+
+ <!-- int deletePointAndMeasure(String id);-->
+ <delete id="deletePointAndMeasure">
+ delete from prevent_risk_check_unit
+ where base_check_point_id = #{id}
+ </delete>
+
+
+</mapper>
+
diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskDangerCheckLogMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskDangerCheckLogMapper.xml
index edeac56..bb270a2 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventRiskDangerCheckLogMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventRiskDangerCheckLogMapper.xml
@@ -38,7 +38,7 @@
where report_switch = 0 and (update_report_data_time > report_time or report_time is null) and mobile_code is not null
<!-- where report_switch = 0 and (update_report_data_time > report_time or report_time is null) and mobile_code is not null and job_id = 47-->
order by update_report_data_time
- limit 10
+ limit 3
</select>
diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskDangerConfirmLogMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskDangerConfirmLogMapper.xml
index e8b915f..1eb8c54 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventRiskDangerConfirmLogMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventRiskDangerConfirmLogMapper.xml
@@ -1,34 +1,34 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.doublePrevention.repository.PreventRiskDangerConfirmLogRepository" >
-
- <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.PreventRiskDangerConfirmLog">
- <id column="id" property="id"/>
- <result column="danger_check_point_id" property="dangerCheckPointId" />
- <result column="confirm_user_id" property="confirmUserId"/>
- <result column="confirm_user" property="confirmUser"/>
- <result column="confirm_time" property="confirmTime" />
- <result column="confirm_result" property="confirmResult"/>
- <result column="confirm_opinion" property="confirmOpinion"/>
- </resultMap>
-
-<!-- int saveConfirmLog(HiddenDangerCheckPoint hdcp);-->
- <insert id="saveConfirmLog">
- insert into prevent_risk_danger_confirm_log values
- (null, #{dangerCheckPointId}, #{confirmUserId}, #{confirmUser}, #{confirmTime}, null, null)
- </insert>
-
-<!-- List<PreventRiskDangerConfirmLog> getLogsByDangerCheckPointId(Long dangerCheckPointId);-->
- <select id="getLogsByDangerCheckPointId" resultMap="BaseResultMap">
- select * from prevent_risk_danger_confirm_log
- where danger_check_point_id = #{dangerCheckPointId}
- </select>
-
- <update id="getLogsByDang1erCheckPointId" parameterType="int">
- update prevent_risk_danger_confirm_log set values
- (null, #{dangerCheckPoint}, #{ni})
- </update>
-</mapper>
-
-
-
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.doublePrevention.repository.PreventRiskDangerConfirmLogRepository" >
+
+ <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.PreventRiskDangerConfirmLog">
+ <id column="id" property="id"/>
+ <result column="danger_check_point_id" property="dangerCheckPointId" />
+ <result column="confirm_user_id" property="confirmUserId"/>
+ <result column="confirm_user" property="confirmUser"/>
+ <result column="confirm_time" property="confirmTime" />
+ <result column="confirm_result" property="confirmResult"/>
+ <result column="confirm_opinion" property="confirmOpinion"/>
+ </resultMap>
+
+<!-- int saveConfirmLog(HiddenDangerCheckPoint hdcp);-->
+ <insert id="saveConfirmLog">
+ insert into prevent_risk_danger_confirm_log values
+ (null, #{dangerCheckPointId}, #{confirmUserId}, #{confirmUser}, #{confirmTime}, null, null)
+ </insert>
+
+<!-- List<PreventRiskDangerConfirmLog> getLogsByDangerCheckPointId(Long dangerCheckPointId);-->
+ <select id="getLogsByDangerCheckPointId" resultMap="BaseResultMap">
+ select * from prevent_risk_danger_confirm_log
+ where danger_check_point_id = #{dangerCheckPointId}
+ </select>
+
+ <update id="getLogsByDang1erCheckPointId" parameterType="int">
+ update prevent_risk_danger_confirm_log set values
+ (null, #{dangerCheckPoint}, #{ni})
+ </update>
+</mapper>
+
+
+
diff --git a/src/main/resources/mybatis/doublePrevention/PreventTaskTypeMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventTaskTypeMapper.xml
index 71901c0..5b7ef85 100644
--- a/src/main/resources/mybatis/doublePrevention/PreventTaskTypeMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/PreventTaskTypeMapper.xml
@@ -1,32 +1,32 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.doublePrevention.repository.PreventTaskTypeRepository" >
-
- <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.PreventTaskType">
- <id column="id" property="id"/>
- <result column="job_id" property="jobId"/>
- <result column="job_name" property="jobName" />
- <result column="task_id" property="taskId" />
- <result column="job_uuid" property="jobUuid" />
- <result column="type" property="type" />
- <result column="delete_status" property="deleteStatus" />
- </resultMap>
-
-
-<!-- PreventTaskType getByTaskId(Long taskId);-->
- <select id="getInfoByTaskId" resultMap="BaseResultMap">
- select * from prevent_task_type where delete_status = 0 and task_id = #{taskId}
- </select>
-
-<!-- List<PreventTaskType> getInfoByJobId(Long jobId);-->
- <select id="getInfoByJobId" resultMap="BaseResultMap">
- select * from prevent_task_type where delete_status = 0 and job_id = #{jobId}
- </select>
-
-<!-- List<PreventTaskType> getAllTaskTypeList();-->
- <select id="getAllTaskTypeList" resultMap="BaseResultMap">
- select * from prevent_task_type where delete_status = 0
- </select>
-
-</mapper>
-
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.doublePrevention.repository.PreventTaskTypeRepository" >
+
+ <resultMap id="BaseResultMap" type="com.ruoyi.doublePrevention.entity.PreventTaskType">
+ <id column="id" property="id"/>
+ <result column="job_id" property="jobId"/>
+ <result column="job_name" property="jobName" />
+ <result column="task_id" property="taskId" />
+ <result column="job_uuid" property="jobUuid" />
+ <result column="type" property="type" />
+ <result column="delete_status" property="deleteStatus" />
+ </resultMap>
+
+
+<!-- PreventTaskType getByTaskId(Long taskId);-->
+ <select id="getInfoByTaskId" resultMap="BaseResultMap">
+ select * from prevent_task_type where delete_status = 0 and task_id = #{taskId}
+ </select>
+
+<!-- List<PreventTaskType> getInfoByJobId(Long jobId);-->
+ <select id="getInfoByJobId" resultMap="BaseResultMap">
+ select * from prevent_task_type where delete_status = 0 and job_id = #{jobId}
+ </select>
+
+<!-- List<PreventTaskType> getAllTaskTypeList();-->
+ <select id="getAllTaskTypeList" resultMap="BaseResultMap">
+ select * from prevent_task_type where delete_status = 0
+ </select>
+
+</mapper>
+
diff --git a/src/main/resources/mybatis/doublePrevention/RiskAndPeopleMapper.xml b/src/main/resources/mybatis/doublePrevention/RiskAndPeopleMapper.xml
index fc69574..85f6842 100644
--- a/src/main/resources/mybatis/doublePrevention/RiskAndPeopleMapper.xml
+++ b/src/main/resources/mybatis/doublePrevention/RiskAndPeopleMapper.xml
@@ -1,64 +1,64 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.ruoyi.doublePrevention.repository.RiskAndPeopleInfoRepository">
-
- <resultMap type="com.ruoyi.doublePrevention.entity.RiskAndPeopleInfo" id="Result">
- <id property="id" column="id"/>
-
- <result column="area_code" property="areaCode"/>
- <result column="company_name" property="companyName"/>
- <result column="company_nature" property="companyNature"/>
- <result column="company_nature_name" property="companyNatureName"/>
- <result column="hazard_id" property="hazardId"/>
- <result column="hazard_code" property="hazardCode"/>
- <result column="hazard_name" property="hazardName"/>
- <result column="hazard_rank" property="hazardRank"/>
- <result column="hazard_rank_name" property="hazardRankName"/>
- <result column="park_name" property="parkName"/>
-
- <result column="main_liability_person_id" property="mainLiabilityPersonId"/>
- <result column="main_liability_person_name" property="mainLiabilityPersonName"/>
- <result column="main_liability_person_type" property="mainLiabilityPersonType"/>
- <result column="main_liability_person_phone" property="mainLiabilityPersonPhone"/>
- <result column="main_liability_person_job" property="mainLiabilityPersonJob"/>
- <result column="main_liability_person_work" property="mainLiabilityPersonWork"/>
- <result column="technology_liability_person_id" property="technologyLiabilityPersonId"/>
- <result column="technology_liability_person_name" property="technologyLiabilityPersonName"/>
- <result column="technology_liability_person_type" property="technologyLiabilityPersonType"/>
- <result column="technology_liability_person_phone" property="technologyLiabilityPersonPhone"/>
- <result column="technology_liability_person_job" property="technologyLiabilityPersonJob"/>
- <result column="technology_liability_person_work" property="technologyLiabilityPersonWork"/>
- <result column="handle_liability_person_id" property="handleLiabilityPersonId"/>
- <result column="handle_liability_person_name" property="handleLiabilityPersonName"/>
- <result column="handle_liability_person_type" property="handleLiabilityPersonType"/>
- <result column="handle_liability_person_phone" property="handleLiabilityPersonPhone"/>
- <result column="handle_liability_person_job" property="handleLiabilityPersonJob"/>
- <result column="handle_liability_person_work" property="handleLiabilityPersonWork"/>
-
- <result column="delete_status" property="deleteStatus"/>
- <result column="gmt_create" property="gmtCreate"/>
- <result column="gmt_moditify" property="gmtModitify"/>
- <result column="create_by_user_name" property="createByUserName"/>
- <result column="last_edit_user_name" property="lastEditUserName"/>
- </resultMap>
-
- <select id="listRiskAndPeoplePage" resultMap="Result">
- select * from risk_and_people_info where delete_status = 0
- <if test="reqBO.hazardName != null and reqBO.hazardName != '' ">
- and hazard_name like "%" #{reqBO.hazardName} "%"
- </if>
- <if test="reqBO.hazardRank != null and reqBO.hazardRank != '' ">
- and hazard_rank = #{reqBO.hazardRank}
- </if>
- <if test="reqBO.id != null and reqBO.id != '' ">
- and id = #{reqBO.id}
- </if>
- </select>
-
-
- <select id="selectRiskAndPeopleInfoById" resultMap="Result">
- select * from risk_and_people_info where delete_status = 0 and id = #{id}
- </select>
-
-
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.doublePrevention.repository.RiskAndPeopleInfoRepository">
+
+ <resultMap type="com.ruoyi.doublePrevention.entity.RiskAndPeopleInfo" id="Result">
+ <id property="id" column="id"/>
+
+ <result column="area_code" property="areaCode"/>
+ <result column="company_name" property="companyName"/>
+ <result column="company_nature" property="companyNature"/>
+ <result column="company_nature_name" property="companyNatureName"/>
+ <result column="hazard_id" property="hazardId"/>
+ <result column="hazard_code" property="hazardCode"/>
+ <result column="hazard_name" property="hazardName"/>
+ <result column="hazard_rank" property="hazardRank"/>
+ <result column="hazard_rank_name" property="hazardRankName"/>
+ <result column="park_name" property="parkName"/>
+
+ <result column="main_liability_person_id" property="mainLiabilityPersonId"/>
+ <result column="main_liability_person_name" property="mainLiabilityPersonName"/>
+ <result column="main_liability_person_type" property="mainLiabilityPersonType"/>
+ <result column="main_liability_person_phone" property="mainLiabilityPersonPhone"/>
+ <result column="main_liability_person_job" property="mainLiabilityPersonJob"/>
+ <result column="main_liability_person_work" property="mainLiabilityPersonWork"/>
+ <result column="technology_liability_person_id" property="technologyLiabilityPersonId"/>
+ <result column="technology_liability_person_name" property="technologyLiabilityPersonName"/>
+ <result column="technology_liability_person_type" property="technologyLiabilityPersonType"/>
+ <result column="technology_liability_person_phone" property="technologyLiabilityPersonPhone"/>
+ <result column="technology_liability_person_job" property="technologyLiabilityPersonJob"/>
+ <result column="technology_liability_person_work" property="technologyLiabilityPersonWork"/>
+ <result column="handle_liability_person_id" property="handleLiabilityPersonId"/>
+ <result column="handle_liability_person_name" property="handleLiabilityPersonName"/>
+ <result column="handle_liability_person_type" property="handleLiabilityPersonType"/>
+ <result column="handle_liability_person_phone" property="handleLiabilityPersonPhone"/>
+ <result column="handle_liability_person_job" property="handleLiabilityPersonJob"/>
+ <result column="handle_liability_person_work" property="handleLiabilityPersonWork"/>
+
+ <result column="delete_status" property="deleteStatus"/>
+ <result column="gmt_create" property="gmtCreate"/>
+ <result column="gmt_moditify" property="gmtModitify"/>
+ <result column="create_by_user_name" property="createByUserName"/>
+ <result column="last_edit_user_name" property="lastEditUserName"/>
+ </resultMap>
+
+ <select id="listRiskAndPeoplePage" resultMap="Result">
+ select * from risk_and_people_info where delete_status = 0
+ <if test="reqBO.hazardName != null and reqBO.hazardName != '' ">
+ and hazard_name like "%" #{reqBO.hazardName} "%"
+ </if>
+ <if test="reqBO.hazardRank != null and reqBO.hazardRank != '' ">
+ and hazard_rank = #{reqBO.hazardRank}
+ </if>
+ <if test="reqBO.id != null and reqBO.id != '' ">
+ and id = #{reqBO.id}
+ </if>
+ </select>
+
+
+ <select id="selectRiskAndPeopleInfoById" resultMap="Result">
+ select * from risk_and_people_info where delete_status = 0 and id = #{id}
+ </select>
+
+
</mapper>
\ No newline at end of file
diff --git a/src/test/ReportTest.java b/src/test/ReportTest.java
new file mode 100644
index 0000000..3aeeb31
--- /dev/null
+++ b/src/test/ReportTest.java
@@ -0,0 +1,26 @@
+import com.ruoyi.doublePrevention.scheduls.ExecCJReportDateSchedule;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.io.UnsupportedEncodingException;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SpringBootApplication.class)
+//@ActiveProfiles("dev")
+@Slf4j
+public class ReportTest {
+ @Autowired
+ ExecCJReportDateSchedule execCJReportDateSchedule;
+
+ @Test
+ public void testPush() throws UnsupportedEncodingException {
+ execCJReportDateSchedule.execReportDateSchedule();
+ }
+
+}
--
Gitblit v1.9.2