guoshengxiong
9121461a3a
# Conflicts: # src/main/java/com/dahuatech/icc/model/visitor/visitorAppointment/VisitorAppointmentResponse.java # src/main/java/com/zhgd/mybatis/DataScopeHandler.java # src/main/java/com/zhgd/xmgl/async/AsyncAiAnalyse.java # src/main/java/com/zhgd/xmgl/call/IccCarCall.java # src/main/java/com/zhgd/xmgl/call/IccWorkerCall.java # src/main/java/com/zhgd/xmgl/call/Mcs8Call.java # src/main/java/com/zhgd/xmgl/call/TencentCloudMessageCall.java # src/main/java/com/zhgd/xmgl/call/YunPianMessageCall.java # src/main/java/com/zhgd/xmgl/call/api/MessageManufacturer.java # src/main/java/com/zhgd/xmgl/config/OperLogAspect.java # src/main/java/com/zhgd/xmgl/modules/basicdata/controller/CompanyBigScreenConfigController.java # src/main/java/com/zhgd/xmgl/modules/basicdata/controller/ExternalCallBackController.java # src/main/java/com/zhgd/xmgl/modules/basicdata/controller/LoginController.java # src/main/java/com/zhgd/xmgl/modules/basicdata/controller/NoticeRemindSoundController.java # src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java # src/main/java/com/zhgd/xmgl/modules/basicdata/controller/UploadFileController.java # src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/CompanyMapper.java # src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/SystemUserMapper.java # src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/CompanyMapper.xml # src/main/java/com/zhgd/xmgl/modules/basicdata/service/ICompanyService.java # src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/CompanyServiceImpl.java # src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java # src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/CrawlerCraneAlarmController.java # src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/CrawlerCraneCurrentDataController.java # src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/CrawlerCraneWorkerCycleController.java # src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/MockCrawlerCraneAlarmConfigController.java # src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/MockCrawlerCraneCurrentDataConfigController.java # src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/MockCrawlerCraneWorkCycleConfigController.java # src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/MockTruckCraneAlarmConfigController.java # src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/MockTruckCraneCurrentDataConfigController.java # src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/MockTunnelBoringMachineCurrentDataConfigController.java # src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TruckCraneAlarmController.java # src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TruckCraneCurrentDataController.java # src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TunnelBoringMachineCurrentDataController.java # src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineAlarmConfigController.java # src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineAlarmController.java # src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineDataConfigController.java # src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/controller/BridgeErectMachineDataController.java # src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/mapper/xml/BridgeErectMachineAlarmConfigMapper.xml # src/main/java/com/zhgd/xmgl/modules/bridgeerectmachine/mapper/xml/BridgeErectMachineDataConfigMapper.xml # src/main/java/com/zhgd/xmgl/modules/car/controller/CarMeasureSpeedDataController.java # src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarMeasureSpeedDataServiceImpl.java # src/main/java/com/zhgd/xmgl/modules/environment/service/impl/EnvironmentAlarmServiceImpl.java # src/main/java/com/zhgd/xmgl/modules/ocr/controller/OcrBuildLogController.java # src/main/java/com/zhgd/xmgl/modules/ocr/controller/OcrConfigController.java # src/main/java/com/zhgd/xmgl/modules/ocr/controller/OcrModulePlaceController.java # src/main/java/com/zhgd/xmgl/modules/ocr/controller/OcrZonePlaceController.java # src/main/java/com/zhgd/xmgl/modules/ocr/service/impl/OcrZonePlaceServiceImpl.java # src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveCompactionRecordConfigController.java # src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveCompactionRecordController.java # src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveRecordConfigController.java # src/main/java/com/zhgd/xmgl/modules/pave/controller/PaveRecordController.java # src/main/java/com/zhgd/xmgl/modules/pave/mapper/xml/PaveCompactionRecordConfigMapper.xml # src/main/java/com/zhgd/xmgl/modules/pave/mapper/xml/PaveRecordConfigMapper.xml # src/main/java/com/zhgd/xmgl/modules/project/controller/DevMessageConfigController.java # src/main/java/com/zhgd/xmgl/modules/project/controller/EnableMessageDevController.java # src/main/java/com/zhgd/xmgl/modules/project/controller/EnableMessageDevRuleController.java # src/main/java/com/zhgd/xmgl/modules/project/controller/LargeScreenConfigController.java # src/main/java/com/zhgd/xmgl/modules/project/controller/MessageConfigV2Controller.java # src/main/java/com/zhgd/xmgl/modules/project/entity/EnableMessageDevRule.java # src/main/java/com/zhgd/xmgl/modules/project/service/IEnableMessageDevRuleService.java # src/main/java/com/zhgd/xmgl/modules/project/service/impl/DevMessageConfigServiceImpl.java # src/main/java/com/zhgd/xmgl/modules/project/service/impl/EnableMessageDevRuleServiceImpl.java # src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityRegionController.java # src/main/java/com/zhgd/xmgl/modules/review/controller/IndexController.java # src/main/java/com/zhgd/xmgl/modules/review/controller/MonitorDevController.java # src/main/java/com/zhgd/xmgl/modules/risk/controller/RiskListDetailController.java # src/main/java/com/zhgd/xmgl/modules/risk/controller/RiskListLibraryController.java # src/main/java/com/zhgd/xmgl/modules/risk/controller/RiskListMonthlyController.java # src/main/java/com/zhgd/xmgl/modules/risk/controller/RiskListPointController.java # src/main/java/com/zhgd/xmgl/modules/risk/controller/RiskListPotentialAccidentTypeController.java # src/main/java/com/zhgd/xmgl/modules/risk/controller/RiskListRuleController.java # src/main/java/com/zhgd/xmgl/modules/risk/controller/RiskListRuleItemController.java # src/main/java/com/zhgd/xmgl/modules/risk/controller/RiskListSourceController.java # src/main/java/com/zhgd/xmgl/modules/risk/controller/RiskListSourceDataCenterController.java # src/main/java/com/zhgd/xmgl/modules/risk/controller/RiskListSourceUnbuiltController.java # src/main/java/com/zhgd/xmgl/modules/risk/controller/RiskListWorkableController.java # src/main/java/com/zhgd/xmgl/modules/risk/entity/RiskListPoint.java # src/main/java/com/zhgd/xmgl/modules/risk/entity/RiskListSource.java # src/main/java/com/zhgd/xmgl/modules/risk/entity/bo/RiskByDateBo.java # src/main/java/com/zhgd/xmgl/modules/risk/entity/vo/RiskListSourceVo.java # src/main/java/com/zhgd/xmgl/modules/risk/service/IRiskListSourceService.java # src/main/java/com/zhgd/xmgl/modules/risk/service/impl/RiskListLibraryServiceImpl.java # src/main/java/com/zhgd/xmgl/modules/risk/service/impl/RiskListMonthlyServiceImpl.java # src/main/java/com/zhgd/xmgl/modules/risk/service/impl/RiskListPointServiceImpl.java # src/main/java/com/zhgd/xmgl/modules/risk/service/impl/RiskListSourceServiceImpl.java # src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatDataController.java # src/main/java/com/zhgd/xmgl/modules/safetyhat/controller/SafetyHatDataDailyStatisticsController.java # src/main/java/com/zhgd/xmgl/modules/vehicleposition/controller/VehiclePositionDataController.java # src/main/java/com/zhgd/xmgl/modules/vehicleposition/controller/VehiclePositionDevController.java # src/main/java/com/zhgd/xmgl/modules/video/controller/VideoItemController.java # src/main/java/com/zhgd/xmgl/modules/video/entity/VideoItem.java # src/main/java/com/zhgd/xmgl/modules/video/service/impl/VideoItemServiceImpl.java # src/main/java/com/zhgd/xmgl/modules/worker/controller/EnterpriseInfoController.java # src/main/java/com/zhgd/xmgl/modules/worker/controller/UfaceRecognitionController.java # src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerAttendanceController.java # src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerCallbackController.java # src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerDailyAttendanceStatisticsV2Controller.java # src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerExitConfigController.java # src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerInfoController.java # src/main/java/com/zhgd/xmgl/modules/worker/service/IWorkerAttendanceService.java # src/main/java/com/zhgd/xmgl/modules/worker/service/impl/EnterpriseInfoServiceImpl.java # src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendancePresenceServiceImpl.java # src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerInfoServiceImpl.java # src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerFieldConfigController.java # src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerFieldController.java # src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerItemRecordController.java # src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerReviewVerifyController.java # src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityDangerTypeRecordController.java # src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityPostponeRectifyApplyController.java # src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityQualityInspectionRecordController.java # src/main/java/com/zhgd/xmgl/modules/xz/security/controller/XzSecurityQualityInspectionRecordDraftController.java # src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityPostponeRectifyApplyServiceImpl.java # src/main/java/com/zhgd/xmgl/modules/xz/security/service/impl/XzSecurityQualityRectifyRecordServiceImpl.java # src/main/java/com/zhgd/xmgl/security/PermissionEvaluator.java # src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java # src/main/java/com/zhgd/xmgl/task/CarInfoTask.java # src/main/java/com/zhgd/xmgl/task/MessageDevRuleTask.java # src/main/java/com/zhgd/xmgl/task/ProjectTask.java # src/main/java/com/zhgd/xmgl/task/RiskListTask.java # src/main/java/com/zhgd/xmgl/task/SafetyHatTask.java # src/main/java/com/zhgd/xmgl/task/WorkerTask.java # src/main/java/com/zhgd/xmgl/util/EasyPoiUtil.java # src/main/java/com/zhgd/xmgl/util/ExcelUtils.java # src/main/java/com/zhgd/xmgl/util/FileUtils.java # src/main/java/com/zhgd/xmgl/util/WordUtils.java # src/main/resources/application-gsx-other-env-show.properties # src/main/resources/application.properties
修改mysql
-
my.cnf文件或my.ini文件的sql-mode修改成下面的值 [mysqld] sql-mode=" STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION"
-
导入sql文件的function失败执行下面命令 set global log_bin_trust_function_creators=TRUE;
idea配置
idea运行需要把内存修改大一点
