From 6c91925517de7c9141c4a97d195bf1bbb96ea4d7 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Mon, 25 Dec 2023 15:31:11 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8E=BB=E9=99=A4swagger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lms/nladmin-system/nlsso-server/pom.xml | 41 +- .../nl/common/annotation/DataPermission.java | 9 +- .../java/org/nl/common/annotation/Query.java | 13 +- .../org/nl/common/aspect/LimitAspect.java | 6 +- .../java/org/nl/common/aspect/LimitType.java | 1 + .../main/java/org/nl/common/base/BaseDTO.java | 2 +- .../java/org/nl/common/base/BaseMapper.java | 8 +- .../org/nl/common/domain/query/LConsumer.java | 3 +- .../org/nl/common/domain/query/QParam.java | 3 - .../java/org/nl/common/domain/vo/DeptVo.java | 22 +- .../java/org/nl/common/domain/vo/MenuVo.java | 1 + .../java/org/nl/common/domain/vo/RoleVo.java | 13 +- .../org/nl/common/domain/vo/UserPassVo.java | 1 + .../java/org/nl/common/enums/CodeBiEnum.java | 1 + .../java/org/nl/common/enums/CodeEnum.java | 1 + .../org/nl/common/enums/DataScopeEnum.java | 1 + .../java/org/nl/common/enums/LogTypeEnum.java | 1 + .../java/org/nl/common/enums/NoticeEnum.java | 2 +- .../java/org/nl/common/enums/QueryTEnum.java | 48 +- .../common/exception/BadRequestException.java | 7 +- .../exception/EntityExistException.java | 2 +- .../exception/EntityNotFoundException.java | 2 +- .../nl/common/exception/handler/ApiError.java | 4 +- .../handler/GlobalExceptionHandler.java | 19 +- .../org/nl/common/logging/domain/Log.java | 46 +- .../org/nl/common/mnt/util/DataTypeEnum.java | 63 +- .../nl/common/mnt/util/ExecuteShellUtil.java | 116 ++-- .../org/nl/common/mnt/util/ScpClientUtil.java | 125 ++-- .../java/org/nl/common/mnt/util/SqlUtils.java | 305 ++++----- .../java/org/nl/common/mnt/util/ZipUtils.java | 226 +++---- .../org/nl/common/mnt/websocket/MsgType.java | 24 +- .../nl/common/mnt/websocket/SocketMsg.java | 12 +- .../common/mnt/websocket/WebSocketServer.java | 192 +++--- .../config/ConfigBeanConfiguration.java | 1 - .../security/config/bean/LoginProperties.java | 2 +- .../security/satoken/SaTokenConfigure.java | 3 +- .../security/satoken/StpInterfaceImpl.java | 2 + .../org/nl/common/security/satoken/hint.md | 9 +- .../security/service/UserCacheClean.java | 2 +- .../java/org/nl/common/utils/CacheKey.java | 1 - .../java/org/nl/common/utils/CodeUtil.java | 8 +- .../java/org/nl/common/utils/DateUtil.java | 5 +- .../org/nl/common/utils/EncryptUtils.java | 5 +- .../java/org/nl/common/utils/FileUtil.java | 2 +- .../java/org/nl/common/utils/GenUtil.java | 3 + .../java/org/nl/common/utils/PageUtil.java | 28 +- .../java/org/nl/common/utils/RedisUtils.java | 5 +- .../org/nl/common/utils/RequestHolder.java | 1 + .../java/org/nl/common/utils/RsaUtils.java | 9 +- .../java/org/nl/common/utils/StringUtils.java | 10 +- .../org/nl/common/utils/ThrowableUtil.java | 3 +- .../org/nl/common/utils/TranslatorUtil.java | 8 +- .../org/nl/common/utils/ValidationUtil.java | 9 +- .../java/org/nl/config/AuditorConfig.java | 7 +- .../src/main/java/org/nl/config/CallBack.java | 1 + .../java/org/nl/config/ConfigurerAdapter.java | 8 +- .../nl/config/CustomJsonConfiguration.java | 9 +- .../org/nl/config/ElPermissionConfig.java | 2 +- .../java/org/nl/config/FileProperties.java | 16 +- .../src/main/java/org/nl/config/MapOf.java | 4 - .../main/java/org/nl/config/RedisConfig.java | 20 +- .../org/nl/config/SpringContextHolder.java | 9 +- .../java/org/nl/config/SwaggerConfig.java | 161 ----- .../java/org/nl/config/WebSocketConfig.java | 8 +- .../config/jackson/JacksonObjectMapper.java | 4 + .../nl/config/lucene/DynamicLogAppender.java | 7 +- .../org/nl/config/lucene/DynamicLogger.java | 12 +- .../nl/config/lucene/LogMessageConstant.java | 68 ++- .../org/nl/config/lucene/LuceneAppender.java | 2 +- .../nl/config/lucene/LuceneIndexWriter.java | 15 +- .../java/org/nl/config/lucene/Searcher.java | 29 +- .../org/nl/config/mybatis/CodeGenerator.java | 4 +- .../nl/config/mybatis/CustomIdGenerator.java | 2 +- .../org/nl/config/mybatis/MyStdOutImpl.java | 1 + .../nl/config/mybatis/MybatisPlusConfig.java | 2 +- .../org/nl/config/redis/RedisConvert.java | 5 +- .../org/nl/config/saconfig/SaInitConfig.java | 1 - .../config/thread/AsyncTaskExecutePool.java | 9 +- .../nl/config/thread/AsyncTaskProperties.java | 1 + .../org/nl/config/thread/TestCollector.java | 21 + .../nl/config/thread/TheadFactoryName.java | 5 +- .../config/thread/ThreadPoolExecutorUtil.java | 3 +- .../coderule/SysCodeRuleController.java | 11 +- .../coderule/SysCodeRuleDetailController.java | 22 +- .../controller/dept/DeptController.java | 47 +- .../controller/dict/SysDictController.java | 47 +- .../generator/CodeGenConfigController.java | 15 +- .../generator/CodeGeneratorController.java | 40 +- .../controller/logging/SysLogController.java | 41 +- .../controller/logicflow/StageController.java | 20 +- .../logicflow/StageImageController.java | 15 +- .../controller/lucence/LuceneController.java | 13 +- .../controller/menu/SysMenuController.java | 26 +- .../controller/monitor/MonitorController.java | 8 +- .../notice/SysNoticeController.java | 39 +- .../controller/param/SysParamController.java | 21 +- .../SysDataPermissionController.java | 40 +- .../quartz/SysQuartzJobController.java | 18 +- .../controller/redis/RedisController.java | 19 +- .../controller/role/SysRoleController.java | 13 +- .../secutiry/AuthorizationController.java | 26 +- .../MobileAuthorizationController.java | 6 +- .../tools/ToolLocalStorageController.java | 16 +- .../controller/user/OnlineController.java | 23 +- .../controller/user/UserController.java | 51 +- .../coderule/ISysCodeRuleDetailService.java | 9 +- .../service/coderule/ISysCodeRuleService.java | 8 +- .../service/coderule/dao/SysCodeRule.java | 3 +- .../coderule/dao/SysCodeRuleDetail.java | 6 +- .../dao/mapper/SysCodeRuleDetailMapper.java | 2 +- .../dao/mapper/SysCodeRuleMapper.java | 2 +- .../impl/SysCodeRuleDetailServiceImpl.java | 3 +- .../coderule/impl/SysCodeRuleServiceImpl.java | 8 +- .../system/service/dept/ISysDeptService.java | 10 +- .../dept/dao/mapper/SysDeptMapper.java | 6 +- .../service/dept/dao/mapper/SysDeptMapper.xml | 49 +- .../nl/system/service/dept/dto/DeptTree.java | 8 +- .../service/dept/impl/SysDeptServiceImpl.java | 44 +- .../system/service/dict/ISysDictService.java | 11 +- .../org/nl/system/service/dict/dao/Dict.java | 6 +- .../dict/dao/mapper/SysDictMapper.java | 2 +- .../generator/ICodeGenConfigService.java | 4 +- .../generator/ICodeGeneratorService.java | 20 +- .../generator/dao/CodeColumnConfig.java | 44 +- .../service/generator/dao/CodeGenConfig.java | 3 +- .../dao/mapper/CodeColumnConfigMapper.java | 5 +- .../dao/mapper/CodeColumnConfigMapper.xml | 40 +- .../dao/mapper/CodeGenConfigMapper.java | 2 +- .../service/generator/dto/ColumnInfo.java | 25 +- .../impl/CodeGenConfigServiceImpl.java | 4 +- .../impl/CodeGeneratorServiceImpl.java | 1 - .../service/logging/ISysLogService.java | 11 +- .../nl/system/service/logging/dao/SysLog.java | 4 +- .../logging/dao/mapper/SysLogMapper.java | 2 +- .../logging/impl/SysLogServiceImpl.java | 15 +- .../service/logicflow/IStageImageService.java | 8 +- .../service/logicflow/IStageService.java | 9 +- .../system/service/logicflow/dao/Stage.java | 3 +- .../service/logicflow/dao/StageImage.java | 3 +- .../dao/mapper/StageImageMapper.java | 2 +- .../logicflow/dao/mapper/StageMapper.java | 2 +- .../lucene/LuceneExecuteLogService.java | 7 +- .../service/lucene/dto/LuceneLogDto.java | 9 +- .../impl/LuceneExecuteLogServiceImpl.java | 6 +- .../lucene/impl/LuceneServiceImpl.java | 5 +- .../system/service/menu/ISysMenuService.java | 20 +- .../menu/dao/mapper/SysMenuMapper.java | 5 +- .../service/menu/dao/mapper/SysMenuMapper.xml | 46 +- .../nl/system/service/menu/dto/MenuQuery.java | 1 + .../service/menu/impl/SysMenuServiceImpl.java | 50 +- .../service/monitor/MonitorService.java | 9 +- .../monitor/impl/MonitorServiceImpl.java | 39 +- .../service/notice/ISysNoticeService.java | 50 +- .../system/service/notice/dao/SysNotice.java | 25 +- .../notice/dao/mapper/SysNoticeMapper.java | 6 +- .../service/notice/dto/SysNoticeDto.java | 41 +- .../service/notice/dto/SysNoticeQuery.java | 6 +- .../notice/impl/SysNoticeServiceImpl.java | 5 +- .../nl/system/service/param/dao/Param.java | 3 +- .../param/dao/mapper/SysParamMapper.java | 2 +- .../permission/ISysDataPermissionService.java | 11 +- .../permission/dao/SysDataPermission.java | 5 +- .../service/permission/dao/SysDataScope.java | 3 +- .../dao/mapper/SysDataPermissionMapper.java | 2 +- .../dao/mapper/SysDataPermissionMapper.xml | 10 +- .../service/quartz/ISysQuartzJobService.java | 12 +- .../service/quartz/config/QuartzConfig.java | 6 +- .../service/quartz/dao/SysQuartzJob.java | 2 +- .../service/quartz/dao/SysQuartzLog.java | 3 +- .../quartz/dao/mapper/SysQuartzJobMapper.java | 2 +- .../quartz/dao/mapper/SysQuartzLogMapper.java | 2 +- .../system/service/quartz/dto/JobQuery.java | 1 + .../quartz/impl/SysQuartzJobServiceImpl.java | 4 +- .../quartz/task/AutoClearInteractionData.java | 3 +- .../quartz/task/AutoClearLuceneData.java | 1 + .../system/service/quartz/task/TestTask.java | 6 +- .../service/quartz/utils/ExecutionJob.java | 5 +- .../service/quartz/utils/QuartzManage.java | 33 +- .../service/quartz/utils/QuartzRunnable.java | 1 + .../nl/system/service/redis/RedisService.java | 4 + .../service/redis/dao/RedisKeyDefine.java | 2 +- .../service/redis/impl/RedisServiceImpl.java | 9 +- .../redis/vo/RedisKeyDefineRespVO.java | 15 +- .../service/redis/vo/RedisMonitorRespVO.java | 16 +- .../system/service/role/ISysRoleService.java | 12 +- .../role/dao/mapper/SysRoleMapper.java | 2 + .../service/role/dao/mapper/SysRoleMapper.xml | 14 +- .../service/role/impl/SysRoleServiceImpl.java | 4 +- .../secutiry/impl/OnlineUserService.java | 60 +- .../tools/IToolLocalStorageService.java | 7 +- .../service/tools/dao/ToolLocalStorage.java | 3 +- .../dao/mapper/ToolLocalStorageMapper.java | 2 +- .../impl/ToolLocalStorageServiceImpl.java | 14 +- .../system/service/user/ISysUserService.java | 9 + .../user/dao/mapper/SysUserMapper.java | 5 +- .../service/user/dao/mapper/SysUserMapper.xml | 68 ++- .../service/user/dto/OnlineUserDto.java | 1 + .../service/user/dto/SysUserDetail.java | 1 - .../user/impl/ISysUserServiceImpl.java | 43 +- .../cockpit/controller/CockPitController.java | 6 +- .../wms/cockpit/service/CockpitService.java | 3 +- .../service/impl/CockpitServiceImpl.java | 5 +- .../cockpit/service/mapper/CockPitMapper.java | 5 + .../cockpit/service/mapper/CockPitMapper.xml | 104 ++-- .../DasDeviceCheckRecordController.java | 28 +- .../service/IDasDeviceCheckRecordService.java | 36 +- .../service/dao/DasDeviceCheckRecord.java | 23 +- .../mapper/DasDeviceCheckRecordMapper.java | 6 +- .../service/dto/DasDeviceCheckRecordDto.java | 37 +- .../dto/DasDeviceCheckRecordQuery.java | 6 +- .../impl/DasDeviceCheckRecordServiceImpl.java | 12 +- .../DasDeviceOperationRecordController.java | 28 +- .../IDasDeviceOperationRecordService.java | 36 +- .../service/dao/DasDeviceOperationRecord.java | 21 +- .../DasDeviceOperationRecordMapper.java | 6 +- .../dto/DasDeviceOperationRecordDto.java | 33 +- .../dto/DasDeviceOperationRecordQuery.java | 6 +- .../DasDeviceOperationRecordServiceImpl.java | 14 +- .../DasQualityInspectionController.java | 28 +- .../service/IDasQualityInspectionService.java | 43 +- .../service/dao/DasQualityInspection.java | 23 +- .../mapper/DasQualityInspectionMapper.java | 6 +- .../service/dto/DasQualityInspectionDto.java | 37 +- .../dto/DasQualityInspectionQuery.java | 6 +- .../impl/DasQualityInspectionServiceImpl.java | 16 +- .../controller/MdBaseBrickInfoController.java | 28 +- .../service/IMdBaseBrickInfoService.java | 48 +- .../brick/service/dao/MdBaseBrickInfo.java | 49 +- .../dao/mapper/MdBaseBrickInfoMapper.java | 8 +- .../dao/mapper/MdBaseBrickInfoMapper.xml | 18 +- .../brick/service/dto/MdBaseBrickInfoDto.java | 81 ++- .../service/dto/MdBaseBrickInfoQuery.java | 6 +- .../MdBaseClassstandardController.java | 35 +- .../service/IMdBaseClassstandardService.java | 45 +- .../service/dao/MdBaseClassstandard.java | 50 +- .../dao/mapper/MdBaseClassstandardMapper.java | 6 +- .../service/dto/MdBaseClassstandardDto.java | 89 ++- .../service/dto/MdBaseClassstandardQuery.java | 6 +- .../impl/MdBaseClassstandardServiceImpl.java | 7 +- .../controller/MdBaseMaterialController.java | 30 +- .../service/IMdBaseMaterialService.java | 45 +- .../material/service/dao/MdBaseMaterial.java | 63 +- .../dao/mapper/MdBaseMaterialMapper.java | 7 +- .../dao/mapper/MdBaseMaterialMapper.xml | 80 +-- .../service/dto/MdBaseMaterialDto.java | 77 ++- .../service/dto/MdBaseMaterialQuery.java | 6 +- .../impl/MdBaseMaterialServiceImpl.java | 13 +- .../controller/MdBaseVehicleController.java | 28 +- .../service/IMdBaseVehicleService.java | 42 +- .../vehicle/service/dao/MdBaseVehicle.java | 47 +- .../dao/mapper/MdBaseVehicleMapper.java | 6 +- .../vehicle/service/dto/MdBaseVehicleDto.java | 83 ++- .../service/dto/MdBaseVehicleQuery.java | 6 +- .../impl/MdBaseVehicleServiceImpl.java | 13 +- .../controller/MdBaseWorkshopController.java | 34 +- .../service/IMdBaseWorkshopService.java | 43 +- .../workshop/service/dao/MdBaseWorkshop.java | 32 +- .../dao/mapper/MdBaseWorkshopMapper.java | 6 +- .../service/dto/MdBaseWorkshopDto.java | 53 +- .../service/dto/MdBaseWorkshopQuery.java | 6 +- .../impl/MdBaseWorkshopServiceImpl.java | 12 +- .../ext/acs/autotask/AutoCallMaterials.java | 4 +- .../ext/acs/autotask/AutoIssueWorkOrder.java | 1 + .../acs/controller/AcsToWmsController.java | 7 +- .../wms/ext/acs/service/AcsToWmsService.java | 23 + .../wms/ext/acs/service/WmsToAcsService.java | 5 + .../wms/ext/acs/service/dto/BrickInfoDto.java | 64 +- .../wms/ext/acs/service/dto/PalletizeDto.java | 216 +++++-- .../wms/ext/acs/service/dto/SignalData.java | 2 +- .../ext/acs/service/dto/to/BaseResponse.java | 3 + .../service/dto/to/acs/ApplyTaskResponse.java | 2 + .../service/dto/to/acs/CancelTaskRequest.java | 2 +- .../dto/to/acs/GetPalletizeResponse.java | 3 +- .../service/dto/to/acs/PutActionRequest.java | 2 +- .../service/dto/to/wms/ApplyDeviceDto.java | 8 +- .../service/dto/to/wms/ApplyTaskRequest.java | 2 +- .../dto/to/wms/FeedBackTaskStatusRequest.java | 6 +- .../acs/service/impl/AcsToWmsServiceImpl.java | 16 +- .../acs/service/impl/WmsToAcsServiceImpl.java | 1 + .../wms/ext/mes/autotask/AutoSaveGdyInfo.java | 3 +- .../mes/autotask/AutoSaveProductionInfo.java | 3 +- .../autotask/AutoSaveShelfInformation.java | 4 +- .../ext/mes/autotask/AutoSaveWaitGdyInfo.java | 3 +- .../ext/mes/autotask/AutoSynMaterialInfo.java | 1 + .../mes/autotask/AutoSynWorkOrderInfo.java | 4 - .../mes/controller/MesToWmsController.java | 12 +- .../mes/controller/WmsToMesController.java | 18 +- .../wms/ext/mes/service/MesToWmsService.java | 2 - .../wms/ext/mes/service/WmsToMesService.java | 24 + .../service/dao/mapper/MesRequestMapper.java | 33 +- .../service/dao/mapper/MesRequestMapper.xml | 577 +++++++++--------- .../mes/service/dto/MesMudConsumptionDto.java | 32 +- .../mes/service/dto/MesProductDataDto.java | 12 +- .../ext/mes/service/dto/MesWorkOrderDto.java | 96 ++- .../wms/ext/mes/service/dto/ResultForMes.java | 2 +- .../mes/service/impl/MesToWmsServiceImpl.java | 1 - .../mes/service/impl/WmsToMesServiceImpl.java | 3 +- .../wms/ext/mms/service/WmsToMmsService.java | 1 + .../service/dao/mapper/MmsRequestMapper.xml | 5 +- .../mms/service/impl/WmsToMmsServiceImpl.java | 1 + .../SysInteractRecordController.java | 28 +- .../service/ISysInteractRecordService.java | 64 +- .../record/service/dao/SysInteractRecord.java | 27 +- .../dao/mapper/SysInteractRecordMapper.java | 6 +- .../dao/mapper/SysInteractRecordMapper.xml | 9 +- .../service/dto/SysInteractRecordDto.java | 45 +- .../service/dto/SysInteractRecordQuery.java | 6 +- .../impl/SysInteractRecordServiceImpl.java | 14 +- .../nl/wms/pda/controller/PdaController.java | 138 +++-- .../org/nl/wms/pda/service/PdaService.java | 29 + .../pda/service/dao/dto/BlendingMoveDto.java | 2 - .../wms/pda/service/dao/mapper/PdaMapper.java | 9 + .../wms/pda/service/dao/mapper/PdaMapper.xml | 255 ++++---- .../wms/pda/service/impl/PdaServiceImpl.java | 34 +- .../PdmBdMudConsumptionController.java | 28 +- .../service/IPdmBdMudConsumptionService.java | 36 +- .../service/dao/PdmBdMudConsumption.java | 31 +- .../dao/mapper/PdmBdMudConsumptionMapper.java | 6 +- .../service/dto/PdmBdMudConsumptionDto.java | 47 +- .../service/dto/PdmBdMudConsumptionQuery.java | 6 +- .../impl/PdmBdMudConsumptionServiceImpl.java | 14 +- .../PdmBdRequestMaterialRecordController.java | 28 +- .../IPdmBdRequestMaterialRecordService.java | 47 +- .../dao/PdmBdRequestMaterialRecord.java | 25 +- .../PdmBdRequestMaterialRecordMapper.java | 6 +- .../PdmBdRequestMaterialRecordMapper.xml | 11 +- .../dto/PdmBdRequestMaterialRecordDto.java | 38 +- .../dto/PdmBdRequestMaterialRecordQuery.java | 6 +- ...PdmBdRequestMaterialRecordServiceImpl.java | 14 +- .../PdmBdMaterialResidueController.java | 28 +- .../service/IPdmBdMaterialResidueService.java | 43 +- .../service/dao/PdmBdMaterialResidue.java | 23 +- .../mapper/PdmBdMaterialResidueMapper.java | 6 +- .../service/dto/PdmBdMaterialResidueDto.java | 37 +- .../dto/PdmBdMaterialResidueQuery.java | 6 +- .../impl/PdmBdMaterialResidueServiceImpl.java | 16 +- ...BdProductionProcessTrackingController.java | 29 +- ...PdmBdProductionProcessTrackingService.java | 43 +- .../dao/PdmBdProductionProcessTracking.java | 19 +- .../PdmBdProductionProcessTrackingMapper.java | 6 +- .../PdmBdProductionProcessTrackingMapper.xml | 28 +- .../PdmBdProductionProcessTrackingDto.java | 29 +- .../PdmBdProductionProcessTrackingQuery.java | 6 +- ...dProductionProcessTrackingServiceImpl.java | 15 +- .../PdmBdVehicleBindingController.java | 28 +- .../service/IPdmBdVehicleBindingService.java | 42 +- .../service/dao/PdmBdVehicleBinding.java | 31 +- .../dao/mapper/PdmBdVehicleBindingMapper.java | 6 +- .../service/dto/PdmBdVehicleBindingDto.java | 53 +- .../service/dto/PdmBdVehicleBindingQuery.java | 6 +- .../impl/PdmBdVehicleBindingServiceImpl.java | 14 +- .../controller/PdmBdWorkorderController.java | 55 +- .../service/IPdmBdWorkorderService.java | 61 +- .../workorder/service/dao/PdmBdWorkorder.java | 91 ++- .../dao/mapper/PdmBdWorkorderMapper.java | 13 +- .../dao/mapper/PdmBdWorkorderMapper.xml | 169 +++-- .../service/dao/vo/AcsWorkOrderVo.java | 2 +- .../service/dto/PdmBdWorkorderDto.java | 129 ++-- .../service/dto/PdmBdWorkorderQuery.java | 6 +- .../impl/PdmBdWorkorderServiceImpl.java | 1 + .../report/controller/ReportController.java | 39 +- .../nl/wms/report/service/ReportService.java | 4 + .../service/dao/mapper/ReportMapper.xml | 97 ++- .../service/impl/ReportServiceImpl.java | 1 + ...SchBaseVehiclematerialgroupController.java | 32 +- .../ISchBaseVehiclematerialgroupService.java | 59 +- .../dao/SchBaseVehiclematerialgroup.java | 88 ++- .../SchBaseVehiclematerialgroupMapper.java | 6 +- .../SchBaseVehiclematerialgroupMapper.xml | 34 +- .../dto/SchBaseVehiclematerialgroupDto.java | 175 ++++-- .../dto/SchBaseVehiclematerialgroupQuery.java | 8 +- ...chBaseVehiclematerialgroupServiceImpl.java | 13 +- ...BaseAcsandlmsinteractivelogController.java | 28 +- ...SchBaseAcsandlmsinteractivelogService.java | 42 +- .../dao/SchBaseAcsandlmsinteractivelog.java | 41 +- .../SchBaseAcsandlmsinteractivelogMapper.java | 6 +- .../SchBaseAcsandlmsinteractivelogDto.java | 73 ++- .../SchBaseAcsandlmsinteractivelogQuery.java | 6 +- ...aseAcsandlmsinteractivelogServiceImpl.java | 13 +- .../controller/SchBasePointController.java | 40 +- .../point/service/ISchBasePointService.java | 48 +- .../sch/point/service/dao/SchBasePoint.java | 80 ++- .../dao/mapper/SchBasePointMapper.java | 12 +- .../service/dao/mapper/SchBasePointMapper.xml | 40 +- .../point/service/dto/SchBasePointDto.java | 146 +++-- .../point/service/dto/SchBasePointQuery.java | 8 +- .../service/impl/SchBasePointServiceImpl.java | 2 - .../controller/SchBaseRegionController.java | 38 +- .../region/service/ISchBaseRegionService.java | 45 +- .../sch/region/service/dao/SchBaseRegion.java | 31 +- .../dao/mapper/SchBaseRegionMapper.java | 6 +- .../region/service/dto/SchBaseRegionDto.java | 59 +- .../service/dto/SchBaseRegionQuery.java | 6 +- .../impl/SchBaseRegionServiceImpl.java | 6 +- .../controller/SchBaseTaskController.java | 38 +- .../SchBaseTaskconfigController.java | 28 +- .../sch/task/service/ISchBaseTaskService.java | 17 +- .../service/ISchBaseTaskconfigService.java | 42 +- .../wms/sch/task/service/dao/SchBaseTask.java | 73 ++- .../task/service/dao/SchBaseTaskconfig.java | 91 ++- .../service/dao/mapper/SchBaseTaskMapper.java | 6 +- .../service/dao/mapper/SchBaseTaskMapper.xml | 32 +- .../dao/mapper/SchBaseTaskconfigMapper.java | 6 +- .../sch/task/service/dto/SchBaseTaskDto.java | 137 +++-- .../task/service/dto/SchBaseTaskQuery.java | 6 +- .../service/dto/SchBaseTaskconfigDto.java | 171 ++++-- .../service/dto/SchBaseTaskconfigQuery.java | 6 +- .../impl/SchBaseTaskconfigServiceImpl.java | 2 +- .../nl/wms/sch/task_manage/AbstractTask.java | 11 +- .../nl/wms/sch/task_manage/AcsTaskDto.java | 3 +- .../wms/sch/task_manage/AutoCreateTask.java | 4 +- .../sch/task_manage/GeneralDefinition.java | 148 +++-- .../task_manage/enums/TaskDirectionEnum.java | 1 - .../nl/wms/sch/task_manage/task/AcsUtil.java | 6 +- .../wms/sch/task_manage/task/TaskFactory.java | 1 - .../task_manage/task/tasks/dtk/CTQKTask.java | 3 +- .../task/tasks/dtk/mapper/DTKMapper.java | 1 + .../task/tasks/dtk/mapper/DTKMapper.xml | 38 +- .../task_manage/task/tasks/fj/FJQKTask.java | 3 + .../task_manage/task/tasks/fj/FJQLTask.java | 4 +- .../task_manage/task/tasks/fj/FJQZRKTask.java | 7 +- .../task_manage/task/tasks/fj/FJRKTask.java | 3 + .../task_manage/task/tasks/fj/FJSKTask.java | 4 +- .../task_manage/task/tasks/fj/FJSLTask.java | 1 + .../task/tasks/fj/mapper/FJMapper.java | 3 + .../task/tasks/fj/mapper/FJMapper.xml | 96 +-- .../task_manage/task/tasks/hn/HNMLTask.java | 1 + .../task/tasks/hn/mapper/HNMapper.java | 1 + .../task/tasks/hn/mapper/HNMapper.xml | 42 +- .../task_manage/task/tasks/yao/GZYQLTask.java | 3 + .../task_manage/task/tasks/yz/YZQKTask.java | 1 + .../task_manage/task/tasks/yz/YZSKTask.java | 3 - .../task_manage/task/tasks/yz/YZSLTask.java | 1 + .../task/tasks/yz/mapper/YZMapper.java | 2 + .../task/tasks/yz/mapper/YZMapper.xml | 45 +- .../java/org/nl/wms/util/CommonUtils.java | 8 +- .../main/java/org/nl/wms/util/MesUtils.java | 3 +- .../java/org/nl/wms/util/MyEventListener.java | 1 - .../main/java/org/nl/wms/util/MyListener.java | 2 +- .../main/java/org/nl/wms/util/PointUtils.java | 1 - .../main/java/org/nl/wms/util/TaskUtils.java | 13 +- .../java/org/nl/wms/util/XmlFormatter.java | 13 +- .../nl/wms/util/test/mapper/TestMapper.xml | 6 +- ...tp.core.monitor.collector.MetricsCollector | 1 + .../src/main/resources/config/application.yml | 77 +++ .../template/generator/admin/Controller.ftl | 7 - .../template/generator/admin/Entity.ftl | 6 +- 447 files changed, 6290 insertions(+), 4878 deletions(-) delete mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/SwaggerConfig.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/TestCollector.java create mode 100644 lms/nladmin-system/nlsso-server/src/main/resources/META-INF/services/org.dromara.dynamictp.core.monitor.collector.MetricsCollector diff --git a/lms/nladmin-system/nlsso-server/pom.xml b/lms/nladmin-system/nlsso-server/pom.xml index caa24a8..5bca905 100644 --- a/lms/nladmin-system/nlsso-server/pom.xml +++ b/lms/nladmin-system/nlsso-server/pom.xml @@ -33,6 +33,16 @@ + + org.dromara.dynamictp + dynamic-tp-spring-boot-starter-common + 1.1.6.1 + + + org.dromara.dynamictp + dynamic-tp-spring-boot-starter-adapter-webserver + 1.1.6.1 + com.yomahub @@ -178,37 +188,6 @@ ${log4jdbc.version} - - - io.springfox - springfox-swagger2 - ${swagger.version} - - - io.swagger - swagger-annotations - - - io.swagger - swagger-models - - - - - io.springfox - springfox-swagger-ui - ${swagger.version} - - - io.swagger - swagger-annotations - 1.5.21 - - - io.swagger - swagger-models - 1.5.21 - diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/annotation/DataPermission.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/annotation/DataPermission.java index b8a693d..2f14063 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/annotation/DataPermission.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/annotation/DataPermission.java @@ -22,11 +22,12 @@ import java.lang.annotation.Target; /** *

- * 用于判断是否过滤数据权限 - * 1、如果没有用到 @OneToOne 这种关联关系，只需要填写 fieldName [参考：DeptQueryCriteria.class] - * 2、如果用到了 @OneToOne ，fieldName 和 joinName 都需要填写，拿UserQueryCriteria.class举例: - * 应该是 @DataPermission(joinName = "dept", fieldName = "id") + * 用于判断是否过滤数据权限 + * 1、如果没有用到 @OneToOne 这种关联关系，只需要填写 fieldName [参考：DeptQueryCriteria.class] + * 2、如果用到了 @OneToOne ，fieldName 和 joinName 都需要填写，拿UserQueryCriteria.class举例: + * 应该是 @DataPermission(joinName = "dept", fieldName = "id") *

+ * * @author Zheng Jie * @website https://el-admin.vip * @date 2020-05-07 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/annotation/Query.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/annotation/Query.java index 2abca5a..50b4820 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/annotation/Query.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/annotation/Query.java @@ -30,6 +30,7 @@ public @interface Query { // Dong ZhaoYang 2017/8/7 基本对象的属性名 String propName() default ""; + // Dong ZhaoYang 2017/8/7 查询方式 Type type() default Type.EQUAL; @@ -66,13 +67,13 @@ public @interface Query { // jie 2019/6/4 包含 , IN // 不等于 - ,NOT_EQUAL + , NOT_EQUAL // between - ,BETWEEN + , BETWEEN // 不为空 - ,NOT_NULL + , NOT_NULL // 为空 - ,IS_NULL + , IS_NULL } /** @@ -80,7 +81,9 @@ public @interface Query { * 适用于简单连接查询，复杂的请自定义该注解，或者使用sql查询 */ enum Join { - /** jie 2019-6-4 13:18:30 */ + /** + * jie 2019-6-4 13:18:30 + */ LEFT, RIGHT, INNER } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/aspect/LimitAspect.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/aspect/LimitAspect.java index a669c5e..68f192a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/aspect/LimitAspect.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/aspect/LimitAspect.java @@ -45,10 +45,10 @@ import java.lang.reflect.Method; @Slf4j public class LimitAspect { - private final RedisTemplate redisTemplate; + private final RedisTemplate redisTemplate; private static final Logger logger = LoggerFactory.getLogger(LimitAspect.class); - public LimitAspect(RedisTemplate redisTemplate) { + public LimitAspect(RedisTemplate redisTemplate) { this.redisTemplate = redisTemplate; } @@ -72,7 +72,7 @@ public class LimitAspect { } } - ImmutableList keys = ImmutableList.of(StrUtil.join(limit.prefix(), "_", key, "_", request.getRequestURI().replaceAll("/","_"))); + ImmutableList keys = ImmutableList.of(StrUtil.join(limit.prefix(), "_", key, "_", request.getRequestURI().replaceAll("/", "_"))); String luaScript = buildLuaScript(); RedisScript redisScript = new DefaultRedisScript<>(luaScript, Number.class); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/aspect/LimitType.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/aspect/LimitType.java index 7959f02..e3ac656 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/aspect/LimitType.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/aspect/LimitType.java @@ -17,6 +17,7 @@ package org.nl.common.aspect; /** * 限流枚举 + * * @author / */ public enum LimitType { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/base/BaseDTO.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/base/BaseDTO.java index 7920b7c..4bd2151 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/base/BaseDTO.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/base/BaseDTO.java @@ -12,7 +12,7 @@ import java.util.Date; * @date 2019年10月24日20:48:53 */ @Data -public class BaseDTO implements Serializable { +public class BaseDTO implements Serializable { private String create_name; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/base/BaseMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/base/BaseMapper.java index c1b43a0..7634018 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/base/BaseMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/base/BaseMapper.java @@ -25,6 +25,7 @@ public interface BaseMapper { /** * DTO转Entity + * * @param dto / * @return / */ @@ -32,6 +33,7 @@ public interface BaseMapper { /** * Entity转DTO + * * @param entity / * @return / */ @@ -39,15 +41,17 @@ public interface BaseMapper { /** * DTO集合转Entity集合 + * * @param dtoList / * @return / */ - List toEntity(List dtoList); + List toEntity(List dtoList); /** * Entity集合转DTO集合 + * * @param entityList / * @return / */ - List toDto(List entityList); + List toDto(List entityList); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/LConsumer.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/LConsumer.java index 9e303ba..0242ebc 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/LConsumer.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/LConsumer.java @@ -1,7 +1,5 @@ package org.nl.common.domain.query; -import java.util.Objects; - /** * @author ZZQ * @Date 2022/12/14 8:40 下午 @@ -10,6 +8,7 @@ import java.util.Objects; public interface LConsumer { /** * 接受 + * * @param x / * @param y / * @param z / diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/QParam.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/QParam.java index dee5c8d..9d73775 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/QParam.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/query/QParam.java @@ -1,9 +1,6 @@ package org.nl.common.domain.query; -import lombok.AllArgsConstructor; import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; import org.nl.common.enums.QueryTEnum; /* diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/DeptVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/DeptVo.java index 5acaa4a..64b5c6b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/DeptVo.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/DeptVo.java @@ -15,7 +15,6 @@ */ package org.nl.common.domain.vo; -import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; import org.nl.common.base.BaseDTO; @@ -26,9 +25,9 @@ import java.io.Serializable; import java.util.List; /** -* @author Zheng Jie -* @date 2019-03-25 -*/ + * @author Zheng Jie + * @date 2019-03-25 + */ @Getter @Setter public class DeptVo extends BaseDTO implements Serializable { @@ -41,34 +40,33 @@ public class DeptVo extends BaseDTO implements Serializable { private String ext_id; - @ApiModelProperty(value = "排序") private Integer dept_sort; @NotBlank - @ApiModelProperty(value = "部门名称") + private String name; @NotNull - @ApiModelProperty(value = "是否启用") + private Boolean is_used; - @ApiModelProperty(value = "上级部门") + private Long pid; - @ApiModelProperty(value = "子节点数目", hidden = true) + private Integer sub_count = 0; /** * 前端显示 */ - private Boolean has_children =Boolean.FALSE; + private Boolean has_children = Boolean.FALSE; private List children; public void setSub_count(Integer sub_count) { this.sub_count = sub_count; - if (sub_count >0){ - this.has_children =Boolean.TRUE; + if (sub_count > 0) { + this.has_children = Boolean.TRUE; } } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/MenuVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/MenuVo.java index 07cb902..009cc7e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/MenuVo.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/MenuVo.java @@ -23,6 +23,7 @@ import java.util.List; /** * 构建前端路由时用到 + * * @author Zheng Jie * @date 2018-12-20 */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/RoleVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/RoleVo.java index 88cb9d1..d647c3b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/RoleVo.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/RoleVo.java @@ -15,7 +15,6 @@ */ package org.nl.common.domain.vo; -import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; @@ -24,6 +23,7 @@ import java.io.Serializable; /** * 角色 + * * @author Zheng Jie * @date 2018-11-22 */ @@ -32,23 +32,22 @@ import java.io.Serializable; public class RoleVo implements Serializable { - @ApiModelProperty(value = "ID", hidden = true) private Long role_id; @NotBlank - @ApiModelProperty(value = "名称", hidden = true) + private String name; - @ApiModelProperty(value = "级别，数值越小，级别越大") + private Integer level = 3; - @ApiModelProperty(value = "描述") + private String remark; - @ApiModelProperty(value = "描述") + private String order_seq; - @ApiModelProperty(value = "描述") + private String is_used; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/UserPassVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/UserPassVo.java index 6420b97..0303575 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/UserPassVo.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/domain/vo/UserPassVo.java @@ -19,6 +19,7 @@ import lombok.Data; /** * 修改密码的 Vo 类 + * * @author Zheng Jie * @date 2019年7月11日13:59:49 */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/CodeBiEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/CodeBiEnum.java index 9dcdd2b..ab430ff 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/CodeBiEnum.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/CodeBiEnum.java @@ -22,6 +22,7 @@ import lombok.Getter; *

* 验证码业务场景 *

+ * * @author Zheng Jie * @date 2020-05-02 */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/CodeEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/CodeEnum.java index d5dc14e..9f07510 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/CodeEnum.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/CodeEnum.java @@ -22,6 +22,7 @@ import lombok.Getter; *

* 验证码业务场景对应的 Redis 中的 key *

+ * * @author Zheng Jie * @date 2020-05-02 */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/DataScopeEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/DataScopeEnum.java index 71213ba..7196a11 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/DataScopeEnum.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/DataScopeEnum.java @@ -22,6 +22,7 @@ import lombok.Getter; *

* 数据权限枚举 *

+ * * @author Zheng Jie * @date 2020-05-07 */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/LogTypeEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/LogTypeEnum.java index 1035bb0..1e31587 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/LogTypeEnum.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/LogTypeEnum.java @@ -20,6 +20,7 @@ public enum LogTypeEnum { LogTypeEnum(String desc) { this.desc = desc; } + public String getDesc() { return desc; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/NoticeEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/NoticeEnum.java index 962d4b6..1213ed7 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/NoticeEnum.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/NoticeEnum.java @@ -14,7 +14,7 @@ public enum NoticeEnum { /** * 未读 */ - HAVE_READ_OFF("1","未读"), + HAVE_READ_OFF("1", "未读"), /** * 已读 */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/QueryTEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/QueryTEnum.java index 5a56212..2275bb4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/QueryTEnum.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/enums/QueryTEnum.java @@ -14,22 +14,46 @@ import java.util.Collection; @Getter public enum QueryTEnum { // - EQ((q, k, v) -> { q.eq(k[0],v); }), - IN((q, key, o) -> { if (o instanceof Collection){ q.in(key[0],(Collection) o); } }), - LK((q, keys, o) -> { for (String key : keys) { q.like(key,o); } }), - LE((q, k, v) -> { q.le(k[0],v); }), - BY((q, k, v) -> { q.orderByDesc(k[0],v); }), - NO((q, k, v) -> { q.isNull(k[0]); }), - LT((q, k, v) -> { q.lt(k[0],v); }), - OREQ((q, k, v) -> { if (StringUtils.isBlank((String)v)){ q.isNull(k[0]); }else { q.eq(k[0],v); } }); + EQ((q, k, v) -> { + q.eq(k[0], v); + }), + IN((q, key, o) -> { + if (o instanceof Collection) { + q.in(key[0], (Collection) o); + } + }), + LK((q, keys, o) -> { + for (String key : keys) { + q.like(key, o); + } + }), + LE((q, k, v) -> { + q.le(k[0], v); + }), + BY((q, k, v) -> { + q.orderByDesc(k[0], v); + }), + NO((q, k, v) -> { + q.isNull(k[0]); + }), + LT((q, k, v) -> { + q.lt(k[0], v); + }), + OREQ((q, k, v) -> { + if (StringUtils.isBlank((String) v)) { + q.isNull(k[0]); + } else { + q.eq(k[0], v); + } + }); - private LConsumer doP; + private LConsumer doP; - QueryTEnum(LConsumer doP) { + QueryTEnum(LConsumer doP) { this.doP = doP; } - public static void build(QueryTEnum type, QueryWrapper q, String[] k , Object v){ - type.getDoP().accept(q,k,v); + public static void build(QueryTEnum type, QueryWrapper q, String[] k, Object v) { + type.getDoP().accept(q, k, v); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/BadRequestException.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/BadRequestException.java index 627bdef..738a4eb 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/BadRequestException.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/BadRequestException.java @@ -17,7 +17,6 @@ package org.nl.common.exception; import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import org.nl.common.logging.annotation.Log; import org.springframework.http.HttpStatus; import static org.springframework.http.HttpStatus.BAD_REQUEST; @@ -29,16 +28,16 @@ import static org.springframework.http.HttpStatus.BAD_REQUEST; */ @Slf4j @Getter -public class BadRequestException extends RuntimeException{ +public class BadRequestException extends RuntimeException { private Integer status = BAD_REQUEST.value(); - public BadRequestException(String msg){ + public BadRequestException(String msg) { super(msg); log.error("异常信息：{}", msg); } - public BadRequestException(HttpStatus status,String msg){ + public BadRequestException(HttpStatus status, String msg) { super(msg); this.status = status.value(); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/EntityExistException.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/EntityExistException.java index e73e764..0d3640f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/EntityExistException.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/EntityExistException.java @@ -29,6 +29,6 @@ public class EntityExistException extends RuntimeException { private static String generateMessage(String entity, String field, String val) { return StringUtils.capitalize(entity) - + " with " + field + " "+ val + " existed"; + + " with " + field + " " + val + " existed"; } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/EntityNotFoundException.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/EntityNotFoundException.java index 3918eb9..c346733 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/EntityNotFoundException.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/EntityNotFoundException.java @@ -29,6 +29,6 @@ public class EntityNotFoundException extends RuntimeException { private static String generateMessage(String entity, String field, String val) { return StringUtils.capitalize(entity) - + " with " + field + " "+ val + " does not exist"; + + " with " + field + " " + val + " does not exist"; } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/handler/ApiError.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/handler/ApiError.java index c596d1d..b119ca0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/handler/ApiError.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/handler/ApiError.java @@ -36,13 +36,13 @@ class ApiError { Date = LocalDateTime.now(); } - public static ApiError error(String message){ + public static ApiError error(String message) { ApiError apiError = new ApiError(); apiError.setMessage(message); return apiError; } - public static ApiError error(Integer status, String message){ + public static ApiError error(Integer status, String message) { ApiError apiError = new ApiError(); apiError.setStatus(status); apiError.setMessage(message); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/handler/GlobalExceptionHandler.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/handler/GlobalExceptionHandler.java index 5c36e8a..67cd07a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/handler/GlobalExceptionHandler.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/exception/handler/GlobalExceptionHandler.java @@ -63,7 +63,7 @@ public class GlobalExceptionHandler { * 处理所有不可知的异常 */ @ExceptionHandler(Throwable.class) - public ResponseEntity handleException(Throwable e){ + public ResponseEntity handleException(Throwable e) { // 打印堆栈信息 log.error(ThrowableUtil.getStackTrace(e)); return buildResponseEntity(ApiError.error(e.getMessage())); @@ -71,24 +71,25 @@ public class GlobalExceptionHandler { /** * token 无效的异常拦截 + * * @param e * @return */ @ExceptionHandler(value = NotLoginException.class) public ResponseEntity notLoginException(Exception e) { - return buildResponseEntity(ApiError.error(401,"token 失效")); + return buildResponseEntity(ApiError.error(401, "token 失效")); } /** * 处理自定义异常 */ - @ExceptionHandler(value = BadRequestException.class) - public ResponseEntity badRequestException(BadRequestException e) { + @ExceptionHandler(value = BadRequestException.class) + public ResponseEntity badRequestException(BadRequestException e) { // 打印堆栈信息 log.error(ThrowableUtil.getStackTrace(e)); - return buildResponseEntity(ApiError.error(e.getStatus(),e.getMessage())); - } + return buildResponseEntity(ApiError.error(e.getStatus(), e.getMessage())); + } /** * 处理 EntityExist @@ -107,20 +108,20 @@ public class GlobalExceptionHandler { public ResponseEntity entityNotFoundException(EntityNotFoundException e) { // 打印堆栈信息 log.error(ThrowableUtil.getStackTrace(e)); - return buildResponseEntity(ApiError.error(NOT_FOUND.value(),e.getMessage())); + return buildResponseEntity(ApiError.error(NOT_FOUND.value(), e.getMessage())); } /** * 处理所有接口数据验证异常 */ @ExceptionHandler(MethodArgumentNotValidException.class) - public ResponseEntity handleMethodArgumentNotValidException(MethodArgumentNotValidException e){ + public ResponseEntity handleMethodArgumentNotValidException(MethodArgumentNotValidException e) { // 打印堆栈信息 log.error(ThrowableUtil.getStackTrace(e)); String[] str = Objects.requireNonNull(e.getBindingResult().getAllErrors().get(0).getCodes())[1].split("\\."); String message = e.getBindingResult().getAllErrors().get(0).getDefaultMessage(); String msg = "不能为空"; - if(msg.equals(message)){ + if (msg.equals(message)) { message = str[1] + ":" + message; } return buildResponseEntity(ApiError.error(message)); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/domain/Log.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/domain/Log.java index 2d9f1c6..34bab3f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/domain/Log.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/logging/domain/Log.java @@ -30,40 +30,62 @@ import java.util.Date; @Setter @NoArgsConstructor -public class Log implements Serializable { +public class Log implements Serializable { private String id; - /** 操作用户 */ + /** + * 操作用户 + */ private String username; - /** 描述 */ + /** + * 描述 + */ private String description; - /** 方法名 */ + /** + * 方法名 + */ private String method; - /** 参数 */ + /** + * 参数 + */ private String params; - /** 日志类型 */ + /** + * 日志类型 + */ private String logType; - /** 请求ip */ + /** + * 请求ip + */ private String requestIp; - /** 地址 */ + /** + * 地址 + */ private String address; - /** 浏览器 */ + /** + * 浏览器 + */ private String browser; - /** 请求耗时 */ + /** + * 请求耗时 + */ private Long time; - /** 异常详细 */ + /** + * 异常详细 + */ private byte[] exceptionDetail; - /** 创建日期 */ + /** + * 创建日期 + */ private Date createTime; public Log(String logType, Long time) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/util/DataTypeEnum.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/util/DataTypeEnum.java index 99ab108..430a7ff 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/util/DataTypeEnum.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/util/DataTypeEnum.java @@ -18,58 +18,89 @@ */ package org.nl.common.mnt.util; + import lombok.extern.slf4j.Slf4j; /** * @author / */ @Slf4j -@SuppressWarnings({"unchecked","all"}) +@SuppressWarnings({"unchecked", "all"}) public enum DataTypeEnum { - /** mysql */ + /** + * mysql + */ MYSQL("mysql", "mysql", "com.mysql.cj.jdbc.Driver", "`", "`", "'", "'"), - /** oracle */ + /** + * oracle + */ ORACLE("oracle", "oracle", "oracle.jdbc.driver.OracleDriver", "\"", "\"", "\"", "\""), - /** sql server */ + /** + * sql server + */ SQLSERVER("sqlserver", "sqlserver", "com.microsoft.sqlserver.jdbc.SQLServerDriver", "\"", "\"", "\"", "\""), - /** h2 */ + /** + * h2 + */ H2("h2", "h2", "org.h2.Driver", "`", "`", "\"", "\""), - /** phoenix */ + /** + * phoenix + */ PHOENIX("phoenix", "hbase phoenix", "org.apache.phoenix.jdbc.PhoenixDriver", "", "", "\"", "\""), - /** mongo */ + /** + * mongo + */ MONGODB("mongo", "mongodb", "mongodb.jdbc.MongoDriver", "`", "`", "\"", "\""), - /** sql4es */ + /** + * sql4es + */ ELASTICSEARCH("sql4es", "elasticsearch", "nl.anchormen.sql4es.jdbc.ESDriver", "", "", "'", "'"), - /** presto */ + /** + * presto + */ PRESTO("presto", "presto", "com.facebook.presto.jdbc.PrestoDriver", "", "", "\"", "\""), - /** moonbox */ + /** + * moonbox + */ MOONBOX("moonbox", "moonbox", "moonbox.jdbc.MbDriver", "`", "`", "`", "`"), - /** cassandra */ + /** + * cassandra + */ CASSANDRA("cassandra", "cassandra", "com.github.adejanovski.cassandra.jdbc.CassandraDriver", "", "", "'", "'"), - /** click house */ + /** + * click house + */ CLICKHOUSE("clickhouse", "clickhouse", "ru.yandex.clickhouse.ClickHouseDriver", "", "", "\"", "\""), - /** kylin */ + /** + * kylin + */ KYLIN("kylin", "kylin", "org.apache.kylin.jdbc.Driver", "\"", "\"", "\"", "\""), - /** vertica */ + /** + * vertica + */ VERTICA("vertica", "vertica", "com.vertica.jdbc.Driver", "", "", "'", "'"), - /** sap */ + /** + * sap + */ HANA("sap", "sap hana", "com.sap.db.jdbc.Driver", "", "", "'", "'"), - /** impala */ + /** + * impala + */ IMPALA("impala", "impala", "com.cloudera.impala.jdbc41.Driver", "", "", "'", "'"); private String feature; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/util/ExecuteShellUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/util/ExecuteShellUtil.java index cf5d26f..57cb56d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/util/ExecuteShellUtil.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/util/ExecuteShellUtil.java @@ -35,69 +35,69 @@ import java.util.Vector; @Slf4j public class ExecuteShellUtil { - private Vector stdout; + private Vector stdout; - Session session; + Session session; - public ExecuteShellUtil(final String ipAddress, final String username, final String password,int port) { - try { - JSch jsch = new JSch(); - session = jsch.getSession(username, ipAddress, port); - session.setPassword(password); - session.setConfig("StrictHostKeyChecking", "no"); - session.connect(3000); - } catch (Exception e) { - log.error(e.getMessage(),e); - } + public ExecuteShellUtil(final String ipAddress, final String username, final String password, int port) { + try { + JSch jsch = new JSch(); + session = jsch.getSession(username, ipAddress, port); + session.setPassword(password); + session.setConfig("StrictHostKeyChecking", "no"); + session.connect(3000); + } catch (Exception e) { + log.error(e.getMessage(), e); + } - } + } - public int execute(final String command) { - int returnCode = 0; - ChannelShell channel = null; - PrintWriter printWriter = null; - BufferedReader input = null; - stdout = new Vector(); - try { - channel = (ChannelShell) session.openChannel("shell"); - channel.connect(); - input = new BufferedReader(new InputStreamReader(channel.getInputStream())); - printWriter = new PrintWriter(channel.getOutputStream()); - printWriter.println(command); - printWriter.println("exit"); - printWriter.flush(); - log.info("The remote command is: "); - String line; - while ((line = input.readLine()) != null) { - stdout.add(line); - System.out.println(line); - } - } catch (Exception e) { - log.error(e.getMessage(),e); - return -1; - }finally { - IoUtil.close(printWriter); - IoUtil.close(input); - if (channel != null) { - channel.disconnect(); - } - } - return returnCode; - } + public int execute(final String command) { + int returnCode = 0; + ChannelShell channel = null; + PrintWriter printWriter = null; + BufferedReader input = null; + stdout = new Vector(); + try { + channel = (ChannelShell) session.openChannel("shell"); + channel.connect(); + input = new BufferedReader(new InputStreamReader(channel.getInputStream())); + printWriter = new PrintWriter(channel.getOutputStream()); + printWriter.println(command); + printWriter.println("exit"); + printWriter.flush(); + log.info("The remote command is: "); + String line; + while ((line = input.readLine()) != null) { + stdout.add(line); + System.out.println(line); + } + } catch (Exception e) { + log.error(e.getMessage(), e); + return -1; + } finally { + IoUtil.close(printWriter); + IoUtil.close(input); + if (channel != null) { + channel.disconnect(); + } + } + return returnCode; + } - public void close(){ - if (session != null) { - session.disconnect(); - } - } + public void close() { + if (session != null) { + session.disconnect(); + } + } - public String executeForResult(String command) { - execute(command); - StringBuilder sb = new StringBuilder(); - for (String str : stdout) { - sb.append(str); - } - return sb.toString(); - } + public String executeForResult(String command) { + execute(command); + StringBuilder sb = new StringBuilder(); + for (String str : stdout) { + sb.append(str); + } + return sb.toString(); + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/util/ScpClientUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/util/ScpClientUtil.java index 0df287d..65d2136 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/util/ScpClientUtil.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/util/ScpClientUtil.java @@ -26,80 +26,81 @@ import java.util.logging.Logger; /** * 远程执行linux命令 + * * @author: ZhangHouYing * @date: 2019-08-10 10:06 */ public class ScpClientUtil { - static private Map instance = Maps.newHashMap(); + static private Map instance = Maps.newHashMap(); - static synchronized public ScpClientUtil getInstance(String ip, int port, String username, String password) { - if (instance.get(ip) == null) { - instance.put(ip, new ScpClientUtil(ip, port, username, password)); - } - return instance.get(ip); - } + static synchronized public ScpClientUtil getInstance(String ip, int port, String username, String password) { + if (instance.get(ip) == null) { + instance.put(ip, new ScpClientUtil(ip, port, username, password)); + } + return instance.get(ip); + } - public ScpClientUtil(String ip, int port, String username, String password) { - this.ip = ip; - this.port = port; - this.username = username; - this.password = password; - } + public ScpClientUtil(String ip, int port, String username, String password) { + this.ip = ip; + this.port = port; + this.username = username; + this.password = password; + } - public void getFile(String remoteFile, String localTargetDirectory) { - Connection conn = new Connection(ip, port); - try { - conn.connect(); - boolean isAuthenticated = conn.authenticateWithPassword(username, password); - if (!isAuthenticated) { - System.err.println("authentication failed"); - } - SCPClient client = new SCPClient(conn); - client.get(remoteFile, localTargetDirectory); - } catch (IOException ex) { - Logger.getLogger(SCPClient.class.getName()).log(Level.SEVERE, null, ex); - }finally{ - conn.close(); - } - } + public void getFile(String remoteFile, String localTargetDirectory) { + Connection conn = new Connection(ip, port); + try { + conn.connect(); + boolean isAuthenticated = conn.authenticateWithPassword(username, password); + if (!isAuthenticated) { + System.err.println("authentication failed"); + } + SCPClient client = new SCPClient(conn); + client.get(remoteFile, localTargetDirectory); + } catch (IOException ex) { + Logger.getLogger(SCPClient.class.getName()).log(Level.SEVERE, null, ex); + } finally { + conn.close(); + } + } - public void putFile(String localFile, String remoteTargetDirectory) { - putFile(localFile, null, remoteTargetDirectory); - } + public void putFile(String localFile, String remoteTargetDirectory) { + putFile(localFile, null, remoteTargetDirectory); + } - public void putFile(String localFile, String remoteFileName, String remoteTargetDirectory) { - putFile(localFile, remoteFileName, remoteTargetDirectory,null); - } + public void putFile(String localFile, String remoteFileName, String remoteTargetDirectory) { + putFile(localFile, remoteFileName, remoteTargetDirectory, null); + } - public void putFile(String localFile, String remoteFileName, String remoteTargetDirectory, String mode) { - Connection conn = new Connection(ip, port); - try { - conn.connect(); - boolean isAuthenticated = conn.authenticateWithPassword(username, password); - if (!isAuthenticated) { - System.err.println("authentication failed"); - } - SCPClient client = new SCPClient(conn); - if ((mode == null) || (mode.length() == 0)) { - mode = "0600"; - } - if (remoteFileName == null) { - client.put(localFile, remoteTargetDirectory); - } else { - client.put(localFile, remoteFileName, remoteTargetDirectory, mode); - } - } catch (IOException ex) { - Logger.getLogger(ScpClientUtil.class.getName()).log(Level.SEVERE, null, ex); - }finally{ - conn.close(); - } - } + public void putFile(String localFile, String remoteFileName, String remoteTargetDirectory, String mode) { + Connection conn = new Connection(ip, port); + try { + conn.connect(); + boolean isAuthenticated = conn.authenticateWithPassword(username, password); + if (!isAuthenticated) { + System.err.println("authentication failed"); + } + SCPClient client = new SCPClient(conn); + if ((mode == null) || (mode.length() == 0)) { + mode = "0600"; + } + if (remoteFileName == null) { + client.put(localFile, remoteTargetDirectory); + } else { + client.put(localFile, remoteFileName, remoteTargetDirectory, mode); + } + } catch (IOException ex) { + Logger.getLogger(ScpClientUtil.class.getName()).log(Level.SEVERE, null, ex); + } finally { + conn.close(); + } + } - private String ip; - private int port; - private String username; - private String password; + private String ip; + private int port; + private String username; + private String password; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/util/SqlUtils.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/util/SqlUtils.java index 718f5b2..0ae8da5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/util/SqlUtils.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/util/SqlUtils.java @@ -35,172 +35,175 @@ import java.util.List; @Slf4j public class SqlUtils { - public static final String COLON = ":"; + public static final String COLON = ":"; - /** - * 获取数据源 - * - * @param jdbcUrl / - * @param userName / - * @param password / - * @return DataSource - */ - private static DataSource getDataSource(String jdbcUrl, String userName, String password) { - DruidDataSource druidDataSource = new DruidDataSource(); - String className; - try { - className = DriverManager.getDriver(jdbcUrl.trim()).getClass().getName(); - } catch (SQLException e) { - throw new RuntimeException("Get class name error: =" + jdbcUrl); - } - if (StringUtils.isEmpty(className)) { - DataTypeEnum dataTypeEnum = DataTypeEnum.urlOf(jdbcUrl); - if (null == dataTypeEnum) { - throw new RuntimeException("Not supported data type: jdbcUrl=" + jdbcUrl); - } - druidDataSource.setDriverClassName(dataTypeEnum.getDriver()); - } else { - druidDataSource.setDriverClassName(className); - } + /** + * 获取数据源 + * + * @param jdbcUrl / + * @param userName / + * @param password / + * @return DataSource + */ + private static DataSource getDataSource(String jdbcUrl, String userName, String password) { + DruidDataSource druidDataSource = new DruidDataSource(); + String className; + try { + className = DriverManager.getDriver(jdbcUrl.trim()).getClass().getName(); + } catch (SQLException e) { + throw new RuntimeException("Get class name error: =" + jdbcUrl); + } + if (StringUtils.isEmpty(className)) { + DataTypeEnum dataTypeEnum = DataTypeEnum.urlOf(jdbcUrl); + if (null == dataTypeEnum) { + throw new RuntimeException("Not supported data type: jdbcUrl=" + jdbcUrl); + } + druidDataSource.setDriverClassName(dataTypeEnum.getDriver()); + } else { + druidDataSource.setDriverClassName(className); + } - druidDataSource.setUrl(jdbcUrl); - druidDataSource.setUsername(userName); - druidDataSource.setPassword(password); - // 配置获取连接等待超时的时间 - druidDataSource.setMaxWait(3000); - // 配置初始化大小、最小、最大 - druidDataSource.setInitialSize(1); - druidDataSource.setMinIdle(1); - druidDataSource.setMaxActive(1); + druidDataSource.setUrl(jdbcUrl); + druidDataSource.setUsername(userName); + druidDataSource.setPassword(password); + // 配置获取连接等待超时的时间 + druidDataSource.setMaxWait(3000); + // 配置初始化大小、最小、最大 + druidDataSource.setInitialSize(1); + druidDataSource.setMinIdle(1); + druidDataSource.setMaxActive(1); - // 如果链接出现异常则直接判定为失败而不是一直重试 - druidDataSource.setBreakAfterAcquireFailure(true); - try { - druidDataSource.init(); - } catch (SQLException e) { - log.error("Exception during pool initialization", e); - throw new RuntimeException(e.getMessage()); - } + // 如果链接出现异常则直接判定为失败而不是一直重试 + druidDataSource.setBreakAfterAcquireFailure(true); + try { + druidDataSource.init(); + } catch (SQLException e) { + log.error("Exception during pool initialization", e); + throw new RuntimeException(e.getMessage()); + } - return druidDataSource; - } + return druidDataSource; + } - private static Connection getConnection(String jdbcUrl, String userName, String password) { - DataSource dataSource = getDataSource(jdbcUrl, userName, password); - Connection connection = null; - try { - connection = dataSource.getConnection(); - } catch (Exception ignored) {} - try { - int timeOut = 5; - if (null == connection || connection.isClosed() || !connection.isValid(timeOut)) { - log.info("connection is closed or invalid, retry get connection!"); - connection = dataSource.getConnection(); - } - } catch (Exception e) { - log.error("create connection error, jdbcUrl: {}", jdbcUrl); - throw new RuntimeException("create connection error, jdbcUrl: " + jdbcUrl); - } - return connection; - } + private static Connection getConnection(String jdbcUrl, String userName, String password) { + DataSource dataSource = getDataSource(jdbcUrl, userName, password); + Connection connection = null; + try { + connection = dataSource.getConnection(); + } catch (Exception ignored) { + } + try { + int timeOut = 5; + if (null == connection || connection.isClosed() || !connection.isValid(timeOut)) { + log.info("connection is closed or invalid, retry get connection!"); + connection = dataSource.getConnection(); + } + } catch (Exception e) { + log.error("create connection error, jdbcUrl: {}", jdbcUrl); + throw new RuntimeException("create connection error, jdbcUrl: " + jdbcUrl); + } + return connection; + } - private static void releaseConnection(Connection connection) { - if (null != connection) { - try { - connection.close(); - } catch (Exception e) { - log.error(e.getMessage(),e); - log.error("connection close error：" + e.getMessage()); - } - } - } + private static void releaseConnection(Connection connection) { + if (null != connection) { + try { + connection.close(); + } catch (Exception e) { + log.error(e.getMessage(), e); + log.error("connection close error：" + e.getMessage()); + } + } + } - public static void closeResult(ResultSet rs) { - if (rs != null) { - try { - rs.close(); - } catch (Exception e) { - log.error(e.getMessage(),e); - } - } - } + public static void closeResult(ResultSet rs) { + if (rs != null) { + try { + rs.close(); + } catch (Exception e) { + log.error(e.getMessage(), e); + } + } + } - public static boolean testConnection(String jdbcUrl, String userName, String password) { - Connection connection = null; - try { - connection = getConnection(jdbcUrl, userName, password); - if (null != connection) { - return true; - } - } catch (Exception e) { - log.info("Get connection failed:" + e.getMessage()); - } finally { - releaseConnection(connection); - } - return false; - } + public static boolean testConnection(String jdbcUrl, String userName, String password) { + Connection connection = null; + try { + connection = getConnection(jdbcUrl, userName, password); + if (null != connection) { + return true; + } + } catch (Exception e) { + log.info("Get connection failed:" + e.getMessage()); + } finally { + releaseConnection(connection); + } + return false; + } - public static String executeFile(String jdbcUrl, String userName, String password, File sqlFile) { - Connection connection = getConnection(jdbcUrl, userName, password); - try { - batchExecute(connection, readSqlList(sqlFile)); - } catch (Exception e) { - log.error("sql脚本执行发生异常:{}",e.getMessage()); - return e.getMessage(); - }finally { - releaseConnection(connection); - } - return "success"; - } + public static String executeFile(String jdbcUrl, String userName, String password, File sqlFile) { + Connection connection = getConnection(jdbcUrl, userName, password); + try { + batchExecute(connection, readSqlList(sqlFile)); + } catch (Exception e) { + log.error("sql脚本执行发生异常:{}", e.getMessage()); + return e.getMessage(); + } finally { + releaseConnection(connection); + } + return "success"; + } - /** - * 批量执行sql - * @param connection / - * @param sqlList / - */ - public static void batchExecute(Connection connection, List sqlList) throws SQLException { - Statement st = connection.createStatement(); - for (String sql : sqlList) { - if (sql.endsWith(";")) { - sql = sql.substring(0, sql.length() - 1); - } - st.addBatch(sql); - } - st.executeBatch(); - } + /** + * 批量执行sql + * + * @param connection / + * @param sqlList / + */ + public static void batchExecute(Connection connection, List sqlList) throws SQLException { + Statement st = connection.createStatement(); + for (String sql : sqlList) { + if (sql.endsWith(";")) { + sql = sql.substring(0, sql.length() - 1); + } + st.addBatch(sql); + } + st.executeBatch(); + } - /** - * 将文件中的sql语句以；为单位读取到列表中 - * @param sqlFile / - * @return / - * @throws Exception e - */ - private static List readSqlList(File sqlFile) throws Exception { - List sqlList = Lists.newArrayList(); - StringBuilder sb = new StringBuilder(); - try (BufferedReader reader = new BufferedReader(new InputStreamReader( - new FileInputStream(sqlFile), StandardCharsets.UTF_8))) { - String tmp; - while ((tmp = reader.readLine()) != null) { - log.info("line:{}", tmp); - if (tmp.endsWith(";")) { - sb.append(tmp); - sqlList.add(sb.toString()); - sb.delete(0, sb.length()); - } else { - sb.append(tmp); - } - } - if (!"".endsWith(sb.toString().trim())) { - sqlList.add(sb.toString()); - } - } + /** + * 将文件中的sql语句以；为单位读取到列表中 + * + * @param sqlFile / + * @return / + * @throws Exception e + */ + private static List readSqlList(File sqlFile) throws Exception { + List sqlList = Lists.newArrayList(); + StringBuilder sb = new StringBuilder(); + try (BufferedReader reader = new BufferedReader(new InputStreamReader( + new FileInputStream(sqlFile), StandardCharsets.UTF_8))) { + String tmp; + while ((tmp = reader.readLine()) != null) { + log.info("line:{}", tmp); + if (tmp.endsWith(";")) { + sb.append(tmp); + sqlList.add(sb.toString()); + sb.delete(0, sb.length()); + } else { + sb.append(tmp); + } + } + if (!"".endsWith(sb.toString().trim())) { + sqlList.add(sb.toString()); + } + } - return sqlList; - } + return sqlList; + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/util/ZipUtils.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/util/ZipUtils.java index 9ef08c7..1dfc1b6 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/util/ZipUtils.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/util/ZipUtils.java @@ -27,133 +27,133 @@ import java.util.zip.ZipInputStream; * @date: 2019-08-10 13:34 */ public class ZipUtils { - /** - * 解压文件 - * - * @param zipFilePath 解压文件路径 - * @param outputFolder 输出解压文件路径 - */ - public static void unZipIt(String zipFilePath, String outputFolder) { - byte[] buffer = new byte[1024]; + /** + * 解压文件 + * + * @param zipFilePath 解压文件路径 + * @param outputFolder 输出解压文件路径 + */ + public static void unZipIt(String zipFilePath, String outputFolder) { + byte[] buffer = new byte[1024]; - File folder = new File(outputFolder); - if (!folder.exists()) { - folder.mkdir(); - } - try { - //get the zip file content - ZipInputStream zis = new ZipInputStream(new FileInputStream(zipFilePath)); - ZipEntry ze = zis.getNextEntry(); - while (ze != null) { - String fileName = ze.getName(); - File newFile = new File(outputFolder + File.separator + fileName); - System.out.println("file unzip : " + newFile.getAbsoluteFile()); - //大部分网络上的源码，这里没有判断子目录 - if (ze.isDirectory()) { - if (!newFile.mkdirs()) { - System.out.println("was not successful."); - } - } else { - if (!new File(newFile.getParent()).mkdirs()) { - System.out.println("was not successful."); - } - FileOutputStream fos = new FileOutputStream(newFile); - int len; - while ((len = zis.read(buffer)) != -1) { - fos.write(buffer, 0, len); - } - fos.close(); - } - ze = zis.getNextEntry(); - } - zis.closeEntry(); - zis.close(); - System.out.println("Done"); - } catch (IOException e) { - e.printStackTrace(); - } - } + File folder = new File(outputFolder); + if (!folder.exists()) { + folder.mkdir(); + } + try { + //get the zip file content + ZipInputStream zis = new ZipInputStream(new FileInputStream(zipFilePath)); + ZipEntry ze = zis.getNextEntry(); + while (ze != null) { + String fileName = ze.getName(); + File newFile = new File(outputFolder + File.separator + fileName); + System.out.println("file unzip : " + newFile.getAbsoluteFile()); + //大部分网络上的源码，这里没有判断子目录 + if (ze.isDirectory()) { + if (!newFile.mkdirs()) { + System.out.println("was not successful."); + } + } else { + if (!new File(newFile.getParent()).mkdirs()) { + System.out.println("was not successful."); + } + FileOutputStream fos = new FileOutputStream(newFile); + int len; + while ((len = zis.read(buffer)) != -1) { + fos.write(buffer, 0, len); + } + fos.close(); + } + ze = zis.getNextEntry(); + } + zis.closeEntry(); + zis.close(); + System.out.println("Done"); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static void unzip(File source, String out) throws IOException { - try (ZipInputStream zis = new ZipInputStream(new FileInputStream(source))) { + public static void unzip(File source, String out) throws IOException { + try (ZipInputStream zis = new ZipInputStream(new FileInputStream(source))) { - ZipEntry entry = zis.getNextEntry(); + ZipEntry entry = zis.getNextEntry(); - while (entry != null) { + while (entry != null) { - File file = new File(out, entry.getName()); + File file = new File(out, entry.getName()); - if (entry.isDirectory()) { - if (!file.mkdirs()) { - System.out.println("was not successful."); - } - } else { - File parent = file.getParentFile(); + if (entry.isDirectory()) { + if (!file.mkdirs()) { + System.out.println("was not successful."); + } + } else { + File parent = file.getParentFile(); - if (!parent.exists()) { - if (!parent.mkdirs()) { - System.out.println("was not successful."); - } - } + if (!parent.exists()) { + if (!parent.mkdirs()) { + System.out.println("was not successful."); + } + } - try (BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(file))) { + try (BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(file))) { - byte[] buffer = new byte[Math.toIntExact(entry.getSize())]; + byte[] buffer = new byte[Math.toIntExact(entry.getSize())]; - int location; + int location; - while ((location = zis.read(buffer)) != -1) { - bos.write(buffer, 0, location); - } - } - } - entry = zis.getNextEntry(); - } - } - } + while ((location = zis.read(buffer)) != -1) { + bos.write(buffer, 0, location); + } + } + } + entry = zis.getNextEntry(); + } + } + } - /** - * 把所有文件都直接解压到指定目录(忽略子文件夹) - * - * @param zipFile - * @param folderPath - * @throws ZipException - * @throws IOException - */ - public static void upZipFile(File zipFile, String folderPath) throws ZipException, IOException { - File desDir = new File(folderPath); - if (!desDir.exists()) { - if (!desDir.mkdirs()) { - System.out.println("was not successful."); - } - } - ZipFile zf = new ZipFile(zipFile); - for (Enumeration entries = zf.entries(); entries.hasMoreElements(); ) { - ZipEntry entry = ((ZipEntry) entries.nextElement()); - InputStream in = zf.getInputStream(entry); - String str = folderPath; - File desFile = new File(str, java.net.URLEncoder.encode(entry.getName(), "UTF-8")); + /** + * 把所有文件都直接解压到指定目录(忽略子文件夹) + * + * @param zipFile + * @param folderPath + * @throws ZipException + * @throws IOException + */ + public static void upZipFile(File zipFile, String folderPath) throws ZipException, IOException { + File desDir = new File(folderPath); + if (!desDir.exists()) { + if (!desDir.mkdirs()) { + System.out.println("was not successful."); + } + } + ZipFile zf = new ZipFile(zipFile); + for (Enumeration entries = zf.entries(); entries.hasMoreElements(); ) { + ZipEntry entry = ((ZipEntry) entries.nextElement()); + InputStream in = zf.getInputStream(entry); + String str = folderPath; + File desFile = new File(str, java.net.URLEncoder.encode(entry.getName(), "UTF-8")); - if (!desFile.exists()) { - File fileParentDir = desFile.getParentFile(); - if (!fileParentDir.exists()) { - if (!fileParentDir.mkdirs()) { - System.out.println("was not successful."); - } - } - } + if (!desFile.exists()) { + File fileParentDir = desFile.getParentFile(); + if (!fileParentDir.exists()) { + if (!fileParentDir.mkdirs()) { + System.out.println("was not successful."); + } + } + } - OutputStream out = new FileOutputStream(desFile); - byte[] buffer = new byte[1024 * 1024]; - int realLength = in.read(buffer); - while (realLength != -1) { - out.write(buffer, 0, realLength); - realLength = in.read(buffer); - } + OutputStream out = new FileOutputStream(desFile); + byte[] buffer = new byte[1024 * 1024]; + int realLength = in.read(buffer); + while (realLength != -1) { + out.write(buffer, 0, realLength); + realLength = in.read(buffer); + } - out.close(); - in.close(); + out.close(); + in.close(); - } - } + } + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/websocket/MsgType.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/websocket/MsgType.java index 513e8c6..e1df5be 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/websocket/MsgType.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/websocket/MsgType.java @@ -20,12 +20,20 @@ package org.nl.common.mnt.websocket; * @date 2019-08-10 9:56 */ public enum MsgType { - /** 连接 */ - CONNECT, - /** 关闭 */ - CLOSE, - /** 信息 */ - INFO, - /** 错误 */ - ERROR + /** + * 连接 + */ + CONNECT, + /** + * 关闭 + */ + CLOSE, + /** + * 信息 + */ + INFO, + /** + * 错误 + */ + ERROR } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/websocket/SocketMsg.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/websocket/SocketMsg.java index c9c470e..b1d5d75 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/websocket/SocketMsg.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/websocket/SocketMsg.java @@ -23,11 +23,11 @@ import lombok.Data; */ @Data public class SocketMsg { - private Object msg; - private MsgType msgType; + private Object msg; + private MsgType msgType; - public SocketMsg(Object msg, MsgType msgType) { - this.msg = msg; - this.msgType = msgType; - } + public SocketMsg(Object msg, MsgType msgType) { + this.msg = msg; + this.msgType = msgType; + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/websocket/WebSocketServer.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/websocket/WebSocketServer.java index 5604438..6932a97 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/websocket/WebSocketServer.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/mnt/websocket/WebSocketServer.java @@ -25,6 +25,7 @@ import javax.websocket.server.ServerEndpoint; import java.io.IOException; import java.util.Objects; import java.util.concurrent.CopyOnWriteArraySet; + /** * @author ZhangHouYing * @date 2019-08-10 15:46 @@ -34,106 +35,111 @@ import java.util.concurrent.CopyOnWriteArraySet; @Component public class WebSocketServer { - /** - * concurrent包的线程安全Set，用来存放每个客户端对应的MyWebSocket对象。 - */ - private static CopyOnWriteArraySet webSocketSet = new CopyOnWriteArraySet(); + /** + * concurrent包的线程安全Set，用来存放每个客户端对应的MyWebSocket对象。 + */ + private static CopyOnWriteArraySet webSocketSet = new CopyOnWriteArraySet(); - /** - * 与某个客户端的连接会话，需要通过它来给客户端发送数据 - */ - private Session session; + /** + * 与某个客户端的连接会话，需要通过它来给客户端发送数据 + */ + private Session session; - /** - * 接收sid - */ - private String sid=""; - /** - * 连接建立成功调用的方法 - * */ - @OnOpen - public void onOpen(Session session,@PathParam("sid") String sid) { - this.session = session; - //如果存在就先删除一个，防止重复推送消息 - for (WebSocketServer webSocket:webSocketSet) { - if (webSocket.sid.equals(sid)) { - webSocketSet.remove(webSocket); - } - } - webSocketSet.add(this); - this.sid=sid; - } + /** + * 接收sid + */ + private String sid = ""; - /** - * 连接关闭调用的方法 - */ - @OnClose - public void onClose() { - webSocketSet.remove(this); - } + /** + * 连接建立成功调用的方法 + */ + @OnOpen + public void onOpen(Session session, @PathParam("sid") String sid) { + this.session = session; + //如果存在就先删除一个，防止重复推送消息 + for (WebSocketServer webSocket : webSocketSet) { + if (webSocket.sid.equals(sid)) { + webSocketSet.remove(webSocket); + } + } + webSocketSet.add(this); + this.sid = sid; + } - /** - * 收到客户端消息后调用的方法 - * @param message 客户端发送过来的消息*/ - @OnMessage - public void onMessage(String message, Session session) { - log.info("收到来"+sid+"的信息:"+message); - //群发消息 - for (WebSocketServer item : webSocketSet) { - try { - item.sendMessage(message); - } catch (IOException e) { - log.error(e.getMessage(),e); - } - } - } + /** + * 连接关闭调用的方法 + */ + @OnClose + public void onClose() { + webSocketSet.remove(this); + } - @OnError - public void onError(Session session, Throwable error) { - log.error("发生错误"); - error.printStackTrace(); - } - /** - * 实现服务器主动推送 - */ - private void sendMessage(String message) throws IOException { - this.session.getBasicRemote().sendText(message); - } + /** + * 收到客户端消息后调用的方法 + * + * @param message 客户端发送过来的消息 + */ + @OnMessage + public void onMessage(String message, Session session) { + log.info("收到来" + sid + "的信息:" + message); + //群发消息 + for (WebSocketServer item : webSocketSet) { + try { + item.sendMessage(message); + } catch (IOException e) { + log.error(e.getMessage(), e); + } + } + } + + @OnError + public void onError(Session session, Throwable error) { + log.error("发生错误"); + error.printStackTrace(); + } + + /** + * 实现服务器主动推送 + */ + private void sendMessage(String message) throws IOException { + this.session.getBasicRemote().sendText(message); + } - /** - * 群发自定义消息 - * */ - public static void sendInfo(SocketMsg socketMsg, @PathParam("sid") String sid) throws IOException { - String message = JSONObject.toJSONString(socketMsg); - log.debug("推送消息到"+sid+"，推送内容:"+message); - for (WebSocketServer item : webSocketSet) { - try { - //这里可以设定只推送给这个sid的，为null则全部推送 - if(sid==null) { - item.sendMessage(message); - }else if(item.sid.equals(sid)){ - item.sendMessage(message); - } - } catch (IOException ignored) { } - } - } + /** + * 群发自定义消息 + */ + public static void sendInfo(SocketMsg socketMsg, @PathParam("sid") String sid) throws IOException { + String message = JSONObject.toJSONString(socketMsg); + log.debug("推送消息到" + sid + "，推送内容:" + message); + for (WebSocketServer item : webSocketSet) { + try { + //这里可以设定只推送给这个sid的，为null则全部推送 + if (sid == null) { + item.sendMessage(message); + } else if (item.sid.equals(sid)) { + item.sendMessage(message); + } + } catch (IOException ignored) { + } + } + } - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - WebSocketServer that = (WebSocketServer) o; - return Objects.equals(session, that.session) && - Objects.equals(sid, that.sid); - } + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + WebSocketServer that = (WebSocketServer) o; + return Objects.equals(session, that.session) && + Objects.equals(sid, that.sid); + } - @Override - public int hashCode() { - return Objects.hash(session, sid); - } + @Override + public int hashCode() { + return Objects.hash(session, sid); + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/config/ConfigBeanConfiguration.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/config/ConfigBeanConfiguration.java index 71493c6..6c3e66a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/config/ConfigBeanConfiguration.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/config/ConfigBeanConfiguration.java @@ -21,7 +21,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; /** - * @apiNote 配置文件转换Pojo类的 统一配置 类 * @author: liaojinlong * @date: 2020/6/10 19:04 */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/config/bean/LoginProperties.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/config/bean/LoginProperties.java index 2babbf2..cb32811 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/config/bean/LoginProperties.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/config/bean/LoginProperties.java @@ -103,7 +103,7 @@ public class LoginProperties { throw new BadConfigurationException("验证码配置信息错误！正确配置查看 LoginCodeEnum "); } } - if(StrUtil.isNotEmpty(loginCode.getFontName())){ + if (StrUtil.isNotEmpty(loginCode.getFontName())) { captcha.setFont(new Font(loginCode.getFontName(), Font.PLAIN, loginCode.getFontSize())); } return captcha; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/satoken/SaTokenConfigure.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/satoken/SaTokenConfigure.java index dd0b80f..87289d4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/satoken/SaTokenConfigure.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/satoken/SaTokenConfigure.java @@ -4,7 +4,6 @@ import cn.dev33.satoken.interceptor.SaInterceptor; import cn.dev33.satoken.jwt.StpLogicJwtForSimple; import cn.dev33.satoken.stp.StpLogic; import cn.dev33.satoken.stp.StpUtil; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; @@ -26,6 +25,7 @@ public class SaTokenConfigure implements WebMvcConfigurer { /** * Sa-Token 整合 jwt (Simple 简单模式) + * * @return */ @Bean @@ -35,6 +35,7 @@ public class SaTokenConfigure implements WebMvcConfigurer { /** * 注册 Sa-Token 拦截器，打开注解式鉴权功能 + * * @param registry / */ @Override diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/satoken/StpInterfaceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/satoken/StpInterfaceImpl.java index 2bfd6aa..ee2db83 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/satoken/StpInterfaceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/satoken/StpInterfaceImpl.java @@ -16,6 +16,7 @@ public class StpInterfaceImpl implements StpInterface { /** * 用户权限获取 + * * @param o login存入的值，此处存放用户id * @param s * @return @@ -27,6 +28,7 @@ public class StpInterfaceImpl implements StpInterface { /** * 角色权限获取 - 数据库没有设计角色code，因此不推荐使用角色鉴权 + * * @param o * @param s * @return diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/satoken/hint.md b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/satoken/hint.md index 627b958..8dc5f90 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/satoken/hint.md +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/satoken/hint.md @@ -1,8 +1,11 @@ ## 关于satoken的提示 + ### 本系统采用两个session存放相关信息 + 1、其中tokenSession存放的是 提供公共模块使用，获取是Object可以直接强转此实体. 主要使用在 SecurityUtils类上，使用的key: userInfo + ```java @Data public class CurrentUser implements Serializable { @@ -16,7 +19,9 @@ public class CurrentUser implements Serializable { private List permissions = new ArrayList<>(); } ``` + 2、Session存放的是UserDto,提供业务模块使用使用的key: UserDto + ```java @Getter @Setter @@ -64,11 +69,13 @@ public class UserDto extends BaseDTO implements Serializable { ``` ### 加密规则 + ``` SaSecureUtil.md5BySalt("123456", "salt") ``` ### 另一种拦截 + ``` registry.addInterceptor(new SaRouteInterceptor((request, response, handler) -> { System.out.println(SaHolder.getRequest().getRequestPath()); @@ -85,4 +92,4 @@ registry.addInterceptor(new SaRouteInterceptor((request, response, handler) -> { }); })).addPathPatterns("/**"); registry.addInterceptor(new SaAnnotationInterceptor()).addPathPatterns("/**"); -``` \ No newline at end of file +``` diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/service/UserCacheClean.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/service/UserCacheClean.java index c16eed4..47f8acf 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/service/UserCacheClean.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/security/service/UserCacheClean.java @@ -22,7 +22,7 @@ package org.nl.common.security.service;///* ///** // * @author: liaojinlong // * @date: 2020/6/11 18:01 -// * @apiNote: 用于清理 用户登录信息缓存，为防止Spring循环依赖与安全考虑 ，单独构成工具类 +// * // */ //@Component //public class UserCacheClean { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CacheKey.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CacheKey.java index ba14cf0..dfde06c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CacheKey.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CacheKey.java @@ -18,7 +18,6 @@ package org.nl.common.utils; /** * @author: liaojinlong * @date: 2020/6/11 15:49 - * @apiNote: 关于缓存的Key集合 */ public interface CacheKey { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java index 2f9189b..32f0c3b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/CodeUtil.java @@ -18,16 +18,16 @@ import java.util.concurrent.TimeUnit; public class CodeUtil { @SneakyThrows - public static String getNewCode(String ruleCode){ + public static String getNewCode(String ruleCode) { RedissonClient redissonClient = SpringContextHolder.getBean(RedissonClient.class); RLock lock = redissonClient.getLock(ruleCode); boolean tryLock = lock.tryLock(5, TimeUnit.SECONDS); try { if (tryLock) { String flag = "1"; - HashMap map = new HashMap<>(); - map.put("flag",flag); - map.put("code",ruleCode); + HashMap map = new HashMap<>(); + map.put("flag", flag); + map.put("code", ruleCode); return SpringContextHolder.getBean(ISysCodeRuleService.class).codeDemo(map); } else { throw new BadRequestException("系统繁忙，稍后在试"); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/DateUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/DateUtil.java index a80fd28..b9ec980 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/DateUtil.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/DateUtil.java @@ -23,7 +23,6 @@ import java.util.Date; /** * @author: liaojinlong * @date: 2020/6/11 16:28 - * @apiNote: JDK 8 新日期类 格式化与字符串转换 工具类 */ public class DateUtil { @@ -88,7 +87,7 @@ public class DateUtil { * 日期 格式化 * * @param localDateTime / - * @param patten / + * @param patten / * @return / */ public static String localDateTimeFormat(LocalDateTime localDateTime, String patten) { @@ -100,7 +99,7 @@ public class DateUtil { * 日期 格式化 * * @param localDateTime / - * @param df / + * @param df / * @return / */ public static String localDateTimeFormat(LocalDateTime localDateTime, DateTimeFormatter df) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/EncryptUtils.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/EncryptUtils.java index 6603817..5099736 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/EncryptUtils.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/EncryptUtils.java @@ -24,6 +24,7 @@ import java.nio.charset.StandardCharsets; /** * 加密 + * * @author Zheng Jie * @date 2018-11-23 */ @@ -37,7 +38,7 @@ public class EncryptUtils { private static final IvParameterSpec IV = new IvParameterSpec(STR_PARAM.getBytes(StandardCharsets.UTF_8)); private static DESKeySpec getDesKeySpec(String source) throws Exception { - if (source == null || source.length() == 0){ + if (source == null || source.length() == 0) { return null; } cipher = Cipher.getInstance("DES/CBC/PKCS5Padding"); @@ -87,7 +88,7 @@ public class EncryptUtils { private static byte[] hex2byte(byte[] b) { int size = 2; - if ((b.length % size) != 0){ + if ((b.length % size) != 0) { throw new IllegalArgumentException("长度不是偶数"); } byte[] b2 = new byte[b.length / 2]; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/FileUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/FileUtil.java index 1ecd740..365b830 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/FileUtil.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/FileUtil.java @@ -209,7 +209,7 @@ public class FileUtil extends cn.hutool.core.io.FileUtil { BigExcelWriter writer = ExcelUtil.getBigWriter(file); // 一次性写出内容，使用默认样式，强制输出标题 writer.write(list, true); - SXSSFSheet sheet = (SXSSFSheet)writer.getSheet(); + SXSSFSheet sheet = (SXSSFSheet) writer.getSheet(); //上面需要强转SXSSFSheet 不然没有trackAllColumnsForAutoSizing方法 sheet.trackAllColumnsForAutoSizing(); //列宽自适应 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/GenUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/GenUtil.java index 21796f2..bfaee83 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/GenUtil.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/GenUtil.java @@ -320,6 +320,7 @@ public class GenUtil { /** * 打包下载 + * * @param columns * @param genConfig * @return @@ -367,6 +368,7 @@ public class GenUtil { /** * 生成文件 + * * @param file * @param template * @param map @@ -389,6 +391,7 @@ public class GenUtil { /** * 生成代码 + * * @param columnInfos * @param genConfig * @throws IOException diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/PageUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/PageUtil.java index 2949467..6586486 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/PageUtil.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/PageUtil.java @@ -24,6 +24,7 @@ import java.util.Map; /** * 分页工具 + * * @author Zheng Jie * @date 2018-12-10 */ @@ -32,25 +33,25 @@ public class PageUtil extends cn.hutool.core.util.PageUtil { /** * List 分页 */ - public static List toPage(int page, int size , List list) { + public static List toPage(int page, int size, List list) { int fromIndex = page * size; int toIndex = page * size + size; - if(fromIndex > list.size()){ + if (fromIndex > list.size()) { return new ArrayList(); - } else if(toIndex >= list.size()) { - return list.subList(fromIndex,list.size()); + } else if (toIndex >= list.size()) { + return list.subList(fromIndex, list.size()); } else { - return list.subList(fromIndex,toIndex); + return list.subList(fromIndex, toIndex); } } /** * Page 数据处理，预防redis反序列化报错 */ - public static Map toPage(Page page) { - Map map = new LinkedHashMap<>(2); - map.put("content",page.getContent()); - map.put("totalElements",page.getTotalElements()); + public static Map toPage(Page page) { + Map map = new LinkedHashMap<>(2); + map.put("content", page.getContent()); + map.put("totalElements", page.getTotalElements()); return map; } @@ -58,13 +59,12 @@ public class PageUtil extends cn.hutool.core.util.PageUtil { /** * 自定义分页 */ - public static Map toPage(Object object, Object totalElements) { - Map map = new LinkedHashMap<>(2); - map.put("content",object); - map.put("totalElements",totalElements); + public static Map toPage(Object object, Object totalElements) { + Map map = new LinkedHashMap<>(2); + map.put("content", object); + map.put("totalElements", totalElements); return map; } - } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/RedisUtils.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/RedisUtils.java index e70d42d..3146a3f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/RedisUtils.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/RedisUtils.java @@ -38,7 +38,7 @@ import java.util.concurrent.TimeUnit; public class RedisUtils { private static final Logger log = LoggerFactory.getLogger(RedisUtils.class); private RedisTemplate redisTemplate; - /* @Value("${jwt.online-key}")*/ + /* @Value("${jwt.online-key}")*/ private String onlineKey; public RedisUtils(RedisTemplate redisTemplate) { @@ -95,6 +95,7 @@ public class RedisUtils { /** * 查找匹配key * 例如：online-* : 就会选择key是online-开头的数据 + * * @param pattern key * @return / */ @@ -215,7 +216,7 @@ public class RedisUtils { public List multiGet(List keys) { List list = redisTemplate.opsForValue().multiGet(Sets.newHashSet(keys)); List resultList = Lists.newArrayList(); - Optional.ofNullable(list).ifPresent(e-> list.forEach(ele-> Optional.ofNullable(ele).ifPresent(resultList::add))); + Optional.ofNullable(list).ifPresent(e -> list.forEach(ele -> Optional.ofNullable(ele).ifPresent(resultList::add))); return resultList; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/RequestHolder.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/RequestHolder.java index 27352b9..2186394 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/RequestHolder.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/RequestHolder.java @@ -23,6 +23,7 @@ import java.util.Objects; /** * 获取 HttpServletRequest + * * @author Zheng Jie * @date 2018-11-24 */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/RsaUtils.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/RsaUtils.java index 96a88f8..bcd0d4d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/RsaUtils.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/RsaUtils.java @@ -50,6 +50,7 @@ public class RsaUtils { /** * 私钥加密公钥解密 + * * @throws Exception / */ private static void test2(RsaKeyPair keyPair) throws Exception { @@ -71,7 +72,7 @@ public class RsaUtils { * 公钥解密 * * @param publicKeyText 公钥 - * @param text 待解密的信息 + * @param text 待解密的信息 * @return / * @throws Exception / */ @@ -89,7 +90,7 @@ public class RsaUtils { * 私钥加密 * * @param privateKeyText 私钥 - * @param text 待加密的信息 + * @param text 待加密的信息 * @return / * @throws Exception / */ @@ -107,7 +108,7 @@ public class RsaUtils { * 私钥解密 * * @param privateKeyText 私钥 - * @param text 待解密的文本 + * @param text 待解密的文本 * @return / * @throws Exception / */ @@ -125,7 +126,7 @@ public class RsaUtils { * 公钥加密 * * @param publicKeyText 公钥 - * @param text 待加密的文本 + * @param text 待加密的文本 * @return / */ public static String encryptByPublicKey(String publicKeyText, String text) throws Exception { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/StringUtils.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/StringUtils.java index 86fff98..c7c2fba 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/StringUtils.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/StringUtils.java @@ -181,11 +181,11 @@ public class StringUtils { */ public static String getCityInfo(String ip) { if (ElAdminProperties.ipLocal) { - // return getLocalCityInfo(ip); + // return getLocalCityInfo(ip); return "局域网"; } else { return "局域网"; - // return getHttpCityInfo(ip); + // return getHttpCityInfo(ip); } } @@ -203,7 +203,7 @@ public class StringUtils { */ public static String getLocalCityInfo(String ip) { IpInfo ipInfo = IP_SEARCHER.memorySearch(ip); - if(ipInfo != null){ + if (ipInfo != null) { return ipInfo.getAddress(); } return null; @@ -239,10 +239,10 @@ public class StringUtils { try { InetAddress candidateAddress = null; // 遍历所有的网络接口 - for (Enumeration interfaces = NetworkInterface.getNetworkInterfaces(); interfaces.hasMoreElements();) { + for (Enumeration interfaces = NetworkInterface.getNetworkInterfaces(); interfaces.hasMoreElements(); ) { NetworkInterface anInterface = interfaces.nextElement(); // 在所有的接口下再遍历IP - for (Enumeration inetAddresses = anInterface.getInetAddresses(); inetAddresses.hasMoreElements();) { + for (Enumeration inetAddresses = anInterface.getInetAddresses(); inetAddresses.hasMoreElements(); ) { InetAddress inetAddr = inetAddresses.nextElement(); // 排除loopback类型地址 if (!inetAddr.isLoopbackAddress()) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ThrowableUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ThrowableUtil.java index ff55d06..c9b8c13 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ThrowableUtil.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ThrowableUtil.java @@ -20,6 +20,7 @@ import java.io.StringWriter; /** * 异常工具 2019-01-06 + * * @author Zheng Jie */ public class ThrowableUtil { @@ -27,7 +28,7 @@ public class ThrowableUtil { /** * 获取堆栈信息 */ - public static String getStackTrace(Throwable throwable){ + public static String getStackTrace(Throwable throwable) { StringWriter sw = new StringWriter(); try (PrintWriter pw = new PrintWriter(sw)) { throwable.printStackTrace(pw); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/TranslatorUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/TranslatorUtil.java index 7947e5b..4f1fd92 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/TranslatorUtil.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/TranslatorUtil.java @@ -29,7 +29,7 @@ import java.net.URLEncoder; */ public class TranslatorUtil { - public static String translate(String word){ + public static String translate(String word) { try { String url = "https://translate.googleapis.com/translate_a/single?" + "client=gtx&" + @@ -51,12 +51,12 @@ public class TranslatorUtil { } in.close(); return parseResult(response.toString()); - }catch (Exception e){ - return word; + } catch (Exception e) { + return word; } } - private static String parseResult(String inputJson){ + private static String parseResult(String inputJson) { JSONArray jsonArray2 = (JSONArray) new JSONArray(inputJson).get(0); StringBuilder result = new StringBuilder(); for (Object o : jsonArray2) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ValidationUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ValidationUtil.java index 7b9d80a..88c8fd9 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ValidationUtil.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/common/utils/ValidationUtil.java @@ -21,17 +21,18 @@ import org.nl.common.exception.BadRequestException; /** * 验证工具 + * * @author Zheng Jie * @date 2018-11-23 */ -public class ValidationUtil{ +public class ValidationUtil { /** * 验证空 */ - public static void isNull(Object obj, String entity, String parameter , Object value){ - if(ObjectUtil.isNull(obj)){ - String msg = entity + " 不存在: "+ parameter +" is "+ value; + public static void isNull(Object obj, String entity, String parameter, Object value) { + if (ObjectUtil.isNull(obj)) { + String msg = entity + " 不存在: " + parameter + " is " + value; throw new BadRequestException(msg); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/AuditorConfig.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/AuditorConfig.java index 7ce0e4a..20096d0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/AuditorConfig.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/AuditorConfig.java @@ -21,8 +21,8 @@ import org.springframework.stereotype.Component; import java.util.Optional; /** - * @description : 设置审计 - * @author : Dong ZhaoYang + * @author : Dong ZhaoYang + * @description : 设置审计 * @date : 2019/10/28 */ @Component("auditorAware") @@ -38,7 +38,8 @@ public class AuditorConfig implements AuditorAware { try { // 这里应根据实际业务情况获取具体信息 return Optional.of(null); - }catch (Exception ignored){} + } catch (Exception ignored) { + } // 用户定时任务，或者无Token调用的情况 return Optional.of("System"); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/CallBack.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/CallBack.java index c50349f..b9b4d97 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/CallBack.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/CallBack.java @@ -32,6 +32,7 @@ public interface CallBack { /** * 本回调任务名称 + * * @return / */ default String getCallBackName() { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/ConfigurerAdapter.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/ConfigurerAdapter.java index f4915e9..fab1fc3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/ConfigurerAdapter.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/ConfigurerAdapter.java @@ -33,7 +33,9 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @Configuration @EnableWebMvc public class ConfigurerAdapter implements WebMvcConfigurer { - /** 文件配置 */ + /** + * 文件配置 + */ private final FileProperties properties; public ConfigurerAdapter(FileProperties properties) { @@ -55,8 +57,8 @@ public class ConfigurerAdapter implements WebMvcConfigurer { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { FileProperties.ElPath path = properties.getPath(); - String avatarUtl = "file:" + path.getAvatar().replace("\\","/"); - String pathUtl = "file:" + path.getPath().replace("\\","/"); + String avatarUtl = "file:" + path.getAvatar().replace("\\", "/"); + String pathUtl = "file:" + path.getPath().replace("\\", "/"); registry.addResourceHandler("/avatar/**").addResourceLocations(avatarUtl).setCachePeriod(0); registry.addResourceHandler("/file/**").addResourceLocations(pathUtl).setCachePeriod(0); registry.addResourceHandler("/**").addResourceLocations("classpath:/META-INF/resources/").setCachePeriod(0); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/CustomJsonConfiguration.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/CustomJsonConfiguration.java index 5bcba43..b55df81 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/CustomJsonConfiguration.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/CustomJsonConfiguration.java @@ -16,6 +16,9 @@ import java.util.List; /** * 处理前端和后端Long类型失去精度问题. * https://blog.51cto.com/u_15127549/3519757 + *

+ * 序列换成json时,将所有的long变成string + * 因为js中得数字类型不能包含所有的java long值 *//* @Configuration @@ -28,9 +31,9 @@ public class CustomJsonConfiguration implements WebMvcConfigurer { ObjectMapper objectMapper = new ObjectMapper(); */ /** - * 序列换成json时,将所有的long变成string - * 因为js中得数字类型不能包含所有的java long值 - *//* + * 序列换成json时,将所有的long变成string + * 因为js中得数字类型不能包含所有的java long值 + *//* SimpleModule simpleModule = new SimpleModule(); simpleModule.addSerializer(Long.class, ToStringSerializer.instance); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/ElPermissionConfig.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/ElPermissionConfig.java index cba016f..90ecc3a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/ElPermissionConfig.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/ElPermissionConfig.java @@ -23,7 +23,7 @@ import org.springframework.stereotype.Service; @Service(value = "el") public class ElPermissionConfig { - public Boolean check(String ...permissions){ + public Boolean check(String... permissions) { // 获取当前用户的所有权限 return true; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/FileProperties.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/FileProperties.java index 0d85a82..999f312 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/FileProperties.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/FileProperties.java @@ -28,10 +28,14 @@ import org.springframework.context.annotation.Configuration; @ConfigurationProperties(prefix = "file") public class FileProperties { - /** 文件大小限制 */ + /** + * 文件大小限制 + */ private Long maxSize; - /** 头像大小限制 */ + /** + * 头像大小限制 + */ private Long avatarMaxSize; private ElPath mac; @@ -40,18 +44,18 @@ public class FileProperties { private ElPath windows; - public ElPath getPath(){ + public ElPath getPath() { String os = System.getProperty("os.name"); - if(os.toLowerCase().startsWith(ElAdminConstant.WIN)) { + if (os.toLowerCase().startsWith(ElAdminConstant.WIN)) { return windows; - } else if(os.toLowerCase().startsWith(ElAdminConstant.MAC)){ + } else if (os.toLowerCase().startsWith(ElAdminConstant.MAC)) { return mac; } return linux; } @Data - public static class ElPath{ + public static class ElPath { private String path; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/MapOf.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/MapOf.java index 5a69104..9da0d16 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/MapOf.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/MapOf.java @@ -1,12 +1,8 @@ package org.nl.config; -import org.checkerframework.checker.units.qual.K; -import org.springframework.util.CollectionUtils; - import java.io.Serializable; import java.util.HashMap; -import java.util.Iterator; /** * @author ZZQ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/RedisConfig.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/RedisConfig.java index e0785bb..cd986c7 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/RedisConfig.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/RedisConfig.java @@ -58,11 +58,11 @@ import java.util.Map; public class RedisConfig extends CachingConfigurerSupport { /** - * 设置 redis 数据默认过期时间，默认2小时 - * 设置@cacheable 序列化方式 + * 设置 redis 数据默认过期时间，默认2小时 + * 设置@cacheable 序列化方式 */ @Bean - public RedisCacheConfiguration redisCacheConfiguration(){ + public RedisCacheConfiguration redisCacheConfiguration() { FastJsonRedisSerializer fastJsonRedisSerializer = new FastJsonRedisSerializer<>(Object.class); RedisCacheConfiguration configuration = RedisCacheConfiguration.defaultCacheConfig(); configuration = configuration.serializeValuesWith(RedisSerializationContext. @@ -98,17 +98,17 @@ public class RedisConfig extends CachingConfigurerSupport { @Override public KeyGenerator keyGenerator() { return (target, method, params) -> { - Map container = new HashMap<>(3); + Map container = new HashMap<>(3); Class targetClassClass = target.getClass(); // 类地址 - container.put("class",targetClassClass.toGenericString()); + container.put("class", targetClassClass.toGenericString()); // 方法名称 - container.put("methodName",method.getName()); + container.put("methodName", method.getName()); // 包名称 - container.put("package",targetClassClass.getPackage()); + container.put("package", targetClassClass.getPackage()); // 参数列表 for (int i = 0; i < params.length; i++) { - container.put(String.valueOf(i),params[i]); + container.put(String.valueOf(i), params[i]); } // 转为JSON字符串 String jsonString = JSON.toJSONString(container); @@ -150,10 +150,10 @@ public class RedisConfig extends CachingConfigurerSupport { /** * Value 序列化 * - * @author / * @param + * @author / */ - class FastJsonRedisSerializer implements RedisSerializer { +class FastJsonRedisSerializer implements RedisSerializer { private final Class clazz; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/SpringContextHolder.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/SpringContextHolder.java index 3a2ae32..10b932a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/SpringContextHolder.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/SpringContextHolder.java @@ -20,6 +20,7 @@ import org.springframework.beans.factory.DisposableBean; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.core.env.Environment; + import java.util.ArrayList; import java.util.List; @@ -32,7 +33,7 @@ public class SpringContextHolder implements ApplicationContextAware, DisposableB private static ApplicationContext applicationContext = null; //数据库连接的bean名字 - public static String dataSourceBeanName="dataSource"; + public static String dataSourceBeanName = "dataSource"; private static final List CALL_BACKS = new ArrayList<>(); private static boolean addCallback = true; @@ -50,13 +51,14 @@ public class SpringContextHolder implements ApplicationContextAware, DisposableB callBack.executor(); } } + public static ApplicationContext getApplicationContext() { try { } catch (Exception e) { e.printStackTrace(); } - return applicationContext; + return applicationContext; } @@ -89,7 +91,8 @@ public class SpringContextHolder implements ApplicationContextAware, DisposableB T result = defaultValue; try { result = getBean(Environment.class).getProperty(property, requiredType); - } catch (Exception ignored) {} + } catch (Exception ignored) { + } return result; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/SwaggerConfig.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/SwaggerConfig.java deleted file mode 100644 index fa7ae74..0000000 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/SwaggerConfig.java +++ /dev/null @@ -1,161 +0,0 @@ -/* - * Copyright 2019-2020 Zheng Jie - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.nl.config; - -import com.fasterxml.classmate.TypeResolver; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.Ordered; -import org.springframework.data.domain.Pageable; -import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.builders.PathSelectors; -import springfox.documentation.schema.AlternateTypeRule; -import springfox.documentation.schema.AlternateTypeRuleConvention; -import springfox.documentation.service.*; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spi.service.contexts.SecurityContext; -import springfox.documentation.spring.web.plugins.Docket; -import springfox.documentation.swagger2.annotations.EnableSwagger2; - -import java.util.ArrayList; -import java.util.List; - -import static com.google.common.collect.Lists.newArrayList; -import static springfox.documentation.schema.AlternateTypeRules.newRule; - -/** - * api页面 /doc.html - * @author Zheng Jie - * @date 2018-11-23 - */ -@Configuration -@EnableSwagger2 -public class SwaggerConfig { - - @Value("${sa-token.token-name}") - private String tokenHeader; - - @Value("${sa-token.token-prefix}") - private String tokenStartWith; - - @Value("${swagger.enabled}") - private Boolean enabled; - - @Bean - @SuppressWarnings("all") - public Docket createRestApi() { -// ParameterBuilder ticketPar = new ParameterBuilder(); -//// List pars = new ArrayList<>(); -//// ticketPar.name(tokenHeader).description("token") -//// .modelRef(new ModelRef("string")) -//// .parameterType("header") -//// .defaultValue(tokenStartWith + " ") -//// .required(true) -//// .build(); -// pars.add(ticketPar.build()); - return new Docket(DocumentationType.SWAGGER_2) - .enable(enabled) - .apiInfo(apiInfo()) - .select() -// .paths(Predicates.not(PathSelectors.regex("/error.*"))) - .paths(PathSelectors.any()) - .build() -// .globalOperationParameters(pars) - //添加登陆认证 - .securitySchemes(securitySchemes()) - .securityContexts(securityContexts()); - } - - private ApiInfo apiInfo() { - return new ApiInfoBuilder() - .description("一个简单且易上手的 Spring boot 后台管理框架") - .title("EL-ADMIN 接口文档") - .version("2.4") - .build(); - } - - private List securitySchemes() { - //设置请求头信息 - List securitySchemes = new ArrayList<>(); - ApiKey apiKey = new ApiKey(tokenHeader, tokenHeader, "header"); - securitySchemes.add(apiKey); - return securitySchemes; - } - - private List securityContexts() { - //设置需要登录认证的路径 - List securityContexts = new ArrayList<>(); - // ^(?!auth).*$ 表示所有包含auth的接口不需要使用securitySchemes即不需要带token - // ^标识开始 ()里是一子表达式 ?!/auth表示匹配不是/auth的位置，匹配上则添加请求头，注意路径已/开头 .表示任意字符 *表示前面的字符匹配多次 $标识结束 - securityContexts.add(getContextByPath("^(?!/auth).*$")); - return securityContexts; - } - - private SecurityContext getContextByPath(String pathRegex) { - return SecurityContext.builder() - .securityReferences(defaultAuth()) - .forPaths(PathSelectors.regex(pathRegex)) - .build(); - } - - private List defaultAuth() { - List securityReferences = new ArrayList<>(); - AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything"); - AuthorizationScope[] authorizationScopes = new AuthorizationScope[1]; - authorizationScopes[0] = authorizationScope; - securityReferences.add(new SecurityReference(tokenHeader, authorizationScopes)); - return securityReferences; - } -} - -/** - * 将Pageable转换展示在swagger中 - */ -@Configuration -class SwaggerDataConfig { - - @Bean - public AlternateTypeRuleConvention pageableConvention(final TypeResolver resolver) { - return new AlternateTypeRuleConvention() { - @Override - public int getOrder() { - return Ordered.HIGHEST_PRECEDENCE; - } - - @Override - public List rules() { - return newArrayList(newRule(resolver.resolve(Pageable.class), resolver.resolve(Page.class))); - } - }; - } - - @ApiModel - @Data - private static class Page { - @ApiModelProperty("页码 (0..N)") - private Integer page; - - @ApiModelProperty("每页显示的数目") - private Integer size; - - @ApiModelProperty("以下列格式排序标准：property[,asc | desc]。 默认排序顺序为升序。 支持多种排序条件：如：id,asc") - private List sort; - } -} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/WebSocketConfig.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/WebSocketConfig.java index 28a447c..60214f9 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/WebSocketConfig.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/WebSocketConfig.java @@ -26,8 +26,8 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter; @Configuration public class WebSocketConfig { - @Bean - public ServerEndpointExporter serverEndpointExporter() { - return new ServerEndpointExporter(); - } + @Bean + public ServerEndpointExporter serverEndpointExporter() { + return new ServerEndpointExporter(); + } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/jackson/JacksonObjectMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/jackson/JacksonObjectMapper.java index c97d5dc..39836ef 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/jackson/JacksonObjectMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/jackson/JacksonObjectMapper.java @@ -27,6 +27,10 @@ import static com.fasterxml.jackson.databind.DeserializationFeature.FAIL_ON_UNKN * @ProjectName Demo * @Description 与前端交互时对实体类中Long类型的ID字段序列号 * @time 2021/6/23 11:30 + * @author JohanChan + * @ProjectName Demo + * @Description 与前端交互时对实体类中Long类型的ID字段序列号 + * @time 2021/6/23 11:30 */ /** * @author JohanChan diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/DynamicLogAppender.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/DynamicLogAppender.java index aa920a5..2f5632a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/DynamicLogAppender.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/DynamicLogAppender.java @@ -14,10 +14,11 @@ import java.nio.charset.Charset; public class DynamicLogAppender { /** * 通过传入的动态名字,动态设置appender + * * @param dynamicName * @return */ - public RollingFileAppender getAppender(String oldLogPath,String dynamicName) { + public RollingFileAppender getAppender(String oldLogPath, String dynamicName) { LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); RollingFileAppender appender = new RollingFileAppender(); //appender的name属性 @@ -25,7 +26,7 @@ public class DynamicLogAppender { appender.setContext(context); //设置文件名 - appender.setFile(new File(oldLogPath, dynamicName + "\\" + DateUtil.format(new DateTime(),"yyyy-MM-dd")+".log").getAbsolutePath()); + appender.setFile(new File(oldLogPath, dynamicName + "\\" + DateUtil.format(new DateTime(), "yyyy-MM-dd") + ".log").getAbsolutePath()); //设置日志文件输出格式 PatternLayoutEncoder encoder = new PatternLayoutEncoder(); encoder.setContext(context); @@ -35,7 +36,7 @@ public class DynamicLogAppender { //设置日志记录器的滚动策略 TimeBasedRollingPolicy policy = new TimeBasedRollingPolicy(); - policy.setFileNamePattern(oldLogPath+dynamicName+".%d{yyyy-MM-dd}.log"); + policy.setFileNamePattern(oldLogPath + dynamicName + ".%d{yyyy-MM-dd}.log"); //设置父节点是appender policy.setParent(appender); policy.setContext(context); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/DynamicLogger.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/DynamicLogger.java index 2881728..acb2b88 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/DynamicLogger.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/DynamicLogger.java @@ -11,23 +11,27 @@ import java.util.Map; public class DynamicLogger { //日志存储路径 String logPath; + public DynamicLogger(String logPath) { this.logPath = logPath; } + //对外暴露日志对象：每次拿的对象从内存里拿，没有再构建 - private static Map container = new HashMap<>(); + private static Map container = new HashMap<>(); + public Logger getLogger(String dynamicName) { Logger logger = container.get(dynamicName); - if(logger != null) { + if (logger != null) { return logger; } logger = build(dynamicName); - container.put(dynamicName,logger); + container.put(dynamicName, logger); return logger; } + //构建Logger对象，给Logger指定appender private Logger build(String dynamicName) { - RollingFileAppender runTaskAppender =new DynamicLogAppender().getAppender(this.logPath,dynamicName); + RollingFileAppender runTaskAppender = new DynamicLogAppender().getAppender(this.logPath, dynamicName); LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); Logger logger = context.getLogger(dynamicName); logger.addAppender(runTaskAppender); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LogMessageConstant.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LogMessageConstant.java index c2fc8e5..31242b6 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LogMessageConstant.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LogMessageConstant.java @@ -6,41 +6,75 @@ package org.nl.config.lucene; * @Date: 2023/8/25 */ public class LogMessageConstant { - /** */ + /** + * + */ public final static String SORT_NAME = "time"; - /** 级别 */ + /** + * 级别 + */ public final static String FIELD_LEVEL = "level"; - /** 时间 */ + /** + * 时间 + */ public final static String FIELD_TIMESTAMP = "timestamp"; - /** 类的限定名 */ + /** + * 类的限定名 + */ public final static String FIELD_CLASS_NAME = "logger"; - /** 线程名 */ + /** + * 线程名 + */ public final static String FIELD_THREAD = "thread"; - /** 日志内容 */ + /** + * 日志内容 + */ public final static String FIELD_MESSAGE = "message"; public final static String FIELD_TRACEID = "tlogTraceId"; // 定义颜色值 - /** 文本颜色：黑色 */ + /** + * 文本颜色：黑色 + */ public final static String COLOR_BLACK = "\u001B[30m"; - /** 文本颜色：红色 */ + /** + * 文本颜色：红色 + */ public final static String COLOR_RED = "\u001B[31m"; - /** 文本颜色：绿色 */ + /** + * 文本颜色：绿色 + */ public final static String COLOR_GREEN = "\u001B[32m"; - /** 文本颜色：黄色 */ + /** + * 文本颜色：黄色 + */ public final static String COLOR_YELLOW = "\u001B[33m"; - /** 文本颜色：蓝色 */ + /** + * 文本颜色：蓝色 + */ public final static String COLOR_BLUE = "\u001B[34m"; - /** 文本颜色：品红色 */ + /** + * 文本颜色：品红色 + */ public final static String COLOR_MAGENTA = "\u001B[35m"; - /** 文本颜色：青色 */ + /** + * 文本颜色：青色 + */ public final static String COLOR_CYAN = "\u001B[36m"; - /** 文本颜色：白色 */ + /** + * 文本颜色：白色 + */ public final static String COLOR_WHITE = "\u001B[37m"; - /** 文本颜色重置 */ + /** + * 文本颜色重置 + */ public final static String COLOR_RESET = "\u001B[0m"; - /** 背景颜色：黄色 */ + /** + * 背景颜色：黄色 + */ public final static String BACKGROUND_YELLOW = "\u001B[43m"; - /** 索引路径 */ + /** + * 索引路径 + */ public final static String INDEX_DIR = "D:\\lucene\\index"; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneAppender.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneAppender.java index f1fd585..94d6d6a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneAppender.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneAppender.java @@ -65,7 +65,7 @@ public class LuceneAppender extends AppenderBase { doc.add(new LongPoint(LogMessageConstant.SORT_NAME, timeStamp)); doc.add(new NumericDocValuesField(LogMessageConstant.SORT_NAME, timeStamp)); doc.add(new StringField(LogMessageConstant.FIELD_LEVEL, event.getLevel().toString(), Field.Store.YES)); - doc.add(new StringField(LogMessageConstant.FIELD_TIMESTAMP, formattedDateTime,Field.Store.YES)); + doc.add(new StringField(LogMessageConstant.FIELD_TIMESTAMP, formattedDateTime, Field.Store.YES)); doc.add(new StoredField(LogMessageConstant.FIELD_CLASS_NAME, event.getLoggerName())); doc.add(new StoredField(LogMessageConstant.FIELD_THREAD, event.getThreadName())); if (ObjectUtil.isNotEmpty(mdcPropertyMap) && ObjectUtil.isNotEmpty(mdcPropertyMap.get(LogMessageConstant.FIELD_TRACEID))) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneIndexWriter.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneIndexWriter.java index 1aba134..23b8e86 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneIndexWriter.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/LuceneIndexWriter.java @@ -34,15 +34,22 @@ public class LuceneIndexWriter { } })); } - /**在线程结束时，自动关闭IndexWriter*/ + + /** + * 在线程结束时，自动关闭IndexWriter + */ public static IndexWriter getIndexWriter() { return indexWriter; } - /**关闭IndexWriter + + /** + * 关闭IndexWriter + * * @throws IOException - * @throws CorruptIndexException */ + * @throws CorruptIndexException + */ public static void closeIndexWriter() throws Exception { - if(indexWriter != null) { + if (indexWriter != null) { indexWriter.close(); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Searcher.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Searcher.java index 0ec18c1..2126e2b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Searcher.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/lucene/Searcher.java @@ -7,8 +7,9 @@ import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.document.Document; -import org.apache.lucene.document.LongPoint; -import org.apache.lucene.index.*; +import org.apache.lucene.index.DirectoryReader; +import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.Term; import org.apache.lucene.queryparser.classic.QueryParser; import org.apache.lucene.search.*; import org.apache.lucene.store.Directory; @@ -50,48 +51,48 @@ public class Searcher { // 当前页的结束条数（不能包含） int end = start + pageSize; // 创建排序对象,需要排序字段SortField，参数：字段的名称、字段的类型、是否反转如果是false，升序。true降序 - Sort sort = new Sort(new SortField(LogMessageConstant.SORT_NAME, SortField.Type.LONG,true)); + Sort sort = new Sort(new SortField(LogMessageConstant.SORT_NAME, SortField.Type.LONG, true)); TopDocs docs = null; BooleanQuery.Builder booleanQueryBuilder = new BooleanQuery.Builder(); //时间范围查询 String startDate = whereJson.getString("begin_time"); String endDate = whereJson.getString("end_time"); - Calendar calendar=Calendar.getInstance(); + Calendar calendar = Calendar.getInstance(); calendar.set(1970, 0, 1); - if (startDate == null){ - startDate = DateUtil.format(calendar.getTime(),"yyyy-MM-dd HH:mm:ss.SSS"); - }else{ + if (startDate == null) { + startDate = DateUtil.format(calendar.getTime(), "yyyy-MM-dd HH:mm:ss.SSS"); + } else { startDate = LuceneIndexWriter.getDate(startDate); } - if (endDate == null){ - endDate = DateUtil.format(new DateTime(),"yyyy-MM-dd HH:mm:ss.SSS"); + if (endDate == null) { + endDate = DateUtil.format(new DateTime(), "yyyy-MM-dd HH:mm:ss.SSS"); } else { endDate = LuceneIndexWriter.getDate(endDate); } // 字段之间的与或非关系，MUST表示and，MUST_NOT表示not，SHOULD表示or，有几个fields就必须有几个clauses TermRangeQuery termRangeQuery = new TermRangeQuery("timestamp", new BytesRef(startDate), new BytesRef(endDate), true, true); - booleanQueryBuilder.add(termRangeQuery,BooleanClause.Occur.MUST); - if (ObjectUtil.isNotEmpty(whereJson.get(LogMessageConstant.FIELD_MESSAGE))){ + booleanQueryBuilder.add(termRangeQuery, BooleanClause.Occur.MUST); + if (ObjectUtil.isNotEmpty(whereJson.get(LogMessageConstant.FIELD_MESSAGE))) { //查询解析器 QueryParser queryParser = new QueryParser("message", analyzer); Query query = queryParser.parse("message:" + whereJson.getString("message") + "~"); booleanQueryBuilder.add(query, BooleanClause.Occur.MUST); } - if (ObjectUtil.isNotEmpty(whereJson.get(LogMessageConstant.FIELD_TRACEID))){ + if (ObjectUtil.isNotEmpty(whereJson.get(LogMessageConstant.FIELD_TRACEID))) { //查询解析器 TermQuery termQuery = new TermQuery(new Term(LogMessageConstant.FIELD_TRACEID, whereJson.getString(LogMessageConstant.FIELD_TRACEID).trim())); booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST); } - if (ObjectUtil.isNotEmpty(whereJson.get(LogMessageConstant.FIELD_LEVEL))){ + if (ObjectUtil.isNotEmpty(whereJson.get(LogMessageConstant.FIELD_LEVEL))) { //查询解析器 TermQuery termQuery = new TermQuery(new Term(LogMessageConstant.FIELD_LEVEL, whereJson.get(LogMessageConstant.FIELD_LEVEL).toString())); booleanQueryBuilder.add(termQuery, BooleanClause.Occur.MUST); } - docs = searcher.search(booleanQueryBuilder.build(), end,sort); + docs = searcher.search(booleanQueryBuilder.build(), end, sort); List list = new ArrayList<>(); ScoreDoc[] scoreDocs = docs.scoreDocs; if (end > docs.totalHits.value) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java index e89ac1b..4acbc35 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CodeGenerator.java @@ -66,9 +66,9 @@ public class CodeGenerator { mpg.setDataSource(dsc); // 包配置 PackageConfig pc = new PackageConfig(); - pc.setParent("org.nl."+menusName); + pc.setParent("org.nl." + menusName); pc.setController("controller." + moduleName); - pc.setMapper("service."+moduleName+".dao.mapper"); + pc.setMapper("service." + moduleName + ".dao.mapper"); pc.setService("service." + moduleName); pc.setServiceImpl("service." + moduleName + ".impl"); pc.setEntity("service." + moduleName + ".dao"); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CustomIdGenerator.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CustomIdGenerator.java index bb53c71..45b557b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CustomIdGenerator.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/CustomIdGenerator.java @@ -13,6 +13,6 @@ import org.springframework.stereotype.Component; public class CustomIdGenerator implements IdentifierGenerator { @Override public Number nextId(Object entity) { - return IdUtil.getSnowflake(1,1).nextId(); + return IdUtil.getSnowflake(1, 1).nextId(); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/MyStdOutImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/MyStdOutImpl.java index 0b1d8dc..cf2dddf 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/MyStdOutImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/MyStdOutImpl.java @@ -12,6 +12,7 @@ import org.apache.ibatis.logging.Log; public class MyStdOutImpl implements Log { public MyStdOutImpl(String clazz) { } + @Override public boolean isDebugEnabled() { return true; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java index e17db63..295dabf 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java @@ -19,7 +19,7 @@ public class MybatisPlusConfig { /** * 新的分页插件,一缓和二缓遵循mybatis的规则,需要设置 MybatisConfiguration#useDeprecatedExecutor = false 避免缓存出现问题(该属性会在旧插件移除后一同移除) - 添加自增插件 + * 添加自增插件 */ @Bean public MybatisPlusInterceptor mybatisPlusInterceptor() { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/redis/RedisConvert.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/redis/RedisConvert.java index 8079179..273ba14 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/redis/RedisConvert.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/redis/RedisConvert.java @@ -20,8 +20,9 @@ public interface RedisConvert { /** * 构建 RedisMonitorRespVO - * @param info / - * @param dbSize / + * + * @param info / + * @param dbSize / * @param commandStats / * @return / */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/saconfig/SaInitConfig.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/saconfig/SaInitConfig.java index 8c8a046..d522f33 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/saconfig/SaInitConfig.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/saconfig/SaInitConfig.java @@ -3,7 +3,6 @@ package org.nl.config.saconfig; import cn.dev33.satoken.config.SaSsoConfig; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; -import org.apache.http.client.HttpClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.ModelAndView; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/AsyncTaskExecutePool.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/AsyncTaskExecutePool.java index 0f7083a..d0405e8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/AsyncTaskExecutePool.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/AsyncTaskExecutePool.java @@ -26,6 +26,7 @@ import java.util.concurrent.ThreadPoolExecutor; /** * 异步任务线程池装配类 + * * @author https://juejin.im/entry/5abb8f6951882555677e9da2 * @date 2019年10月31日15:06:18 */ @@ -33,7 +34,9 @@ import java.util.concurrent.ThreadPoolExecutor; @Configuration public class AsyncTaskExecutePool implements AsyncConfigurer { - /** 注入配置类 */ + /** + * 注入配置类 + */ private final AsyncTaskProperties config; public AsyncTaskExecutePool(AsyncTaskProperties config) { @@ -63,8 +66,8 @@ public class AsyncTaskExecutePool implements AsyncConfigurer { @Override public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() { return (throwable, method, objects) -> { - log.error("===="+throwable.getMessage()+"====", throwable); - log.error("exception method:"+method.getName()); + log.error("====" + throwable.getMessage() + "====", throwable); + log.error("exception method:" + method.getName()); }; } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/AsyncTaskProperties.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/AsyncTaskProperties.java index 3a1541e..51c6f92 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/AsyncTaskProperties.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/AsyncTaskProperties.java @@ -21,6 +21,7 @@ import org.springframework.stereotype.Component; /** * 线程池配置属性类 + * * @author https://juejin.im/entry/5abb8f6951882555677e9da2 * @date 2019年10月31日14:58:18 */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/TestCollector.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/TestCollector.java new file mode 100644 index 0000000..f6c0900 --- /dev/null +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/TestCollector.java @@ -0,0 +1,21 @@ +package org.nl.config.thread; + +import org.dromara.dynamictp.common.entity.ThreadPoolStats; +import org.dromara.dynamictp.core.monitor.collector.AbstractCollector; + +/** + * @Author: lyd + * @Description: + * @Date: 2023/12/25 + */ +public class TestCollector extends AbstractCollector { + @Override + public void collect(ThreadPoolStats threadPoolStats) { + System.out.println("ssssssssssssssss:" + threadPoolStats); + } + + @Override + public String type() { + return "test_collect"; + } +} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/TheadFactoryName.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/TheadFactoryName.java index c4676b6..6661f64 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/TheadFactoryName.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/TheadFactoryName.java @@ -22,6 +22,7 @@ import java.util.concurrent.atomic.AtomicInteger; /** * 自定义线程名称 + * * @author Zheng Jie * @date 2019年10月31日17:49:55 */ @@ -37,7 +38,7 @@ public class TheadFactoryName implements ThreadFactory { this("el-pool"); } - private TheadFactoryName(String name){ + private TheadFactoryName(String name) { SecurityManager s = System.getSecurityManager(); group = (s != null) ? s.getThreadGroup() : Thread.currentThread().getThreadGroup(); @@ -50,7 +51,7 @@ public class TheadFactoryName implements ThreadFactory { public Thread newThread(Runnable r) { //此时线程的名字 就是 namePrefix + -thread- + 这个线程池中第几个执行的线程 Thread t = new Thread(group, r, - namePrefix + "-thread-"+threadNumber.getAndIncrement(), + namePrefix + "-thread-" + threadNumber.getAndIncrement(), 0); if (t.isDaemon()) { t.setDaemon(false); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/ThreadPoolExecutorUtil.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/ThreadPoolExecutorUtil.java index 00c1bfe..334d20f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/ThreadPoolExecutorUtil.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/config/thread/ThreadPoolExecutorUtil.java @@ -24,12 +24,13 @@ import java.util.concurrent.TimeUnit; /** * 用于获取自定义线程池 + * * @author Zheng Jie * @date 2019年10月31日18:16:47 */ public class ThreadPoolExecutorUtil { - public static ThreadPoolExecutor getPoll(){ + public static ThreadPoolExecutor getPoll() { AsyncTaskProperties properties = SpringContextHolder.getBean(AsyncTaskProperties.class); return new ThreadPoolExecutor( properties.getCorePoolSize(), diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleController.java index bdfe2db..f347da4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleController.java @@ -2,8 +2,6 @@ package org.nl.system.controller.coderule; import cn.dev33.satoken.annotation.SaCheckPermission; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; @@ -28,13 +26,13 @@ import java.util.Set; * @since 2022-12-19 */ @RestController -@Api(tags = "系统：编码生成") + @RequestMapping("/api/genCode") public class SysCodeRuleController { @Autowired private ISysCodeRuleService codeRuleService; - @ApiOperation("查询编码") + @GetMapping @SaCheckPermission("genCode:list") public ResponseEntity queryAll(@RequestParam Map form, PageQuery pageable) { @@ -42,7 +40,6 @@ public class SysCodeRuleController { } @Log("新增编码") - @ApiOperation("新增编码") @PostMapping @SaCheckPermission("genCode:add") public ResponseEntity create(@Validated @RequestBody SysCodeRule codeRule) { @@ -51,7 +48,6 @@ public class SysCodeRuleController { } @Log("删除编码") - @ApiOperation("删除编码") @DeleteMapping @SaCheckPermission("genCode:del") public ResponseEntity delete(@RequestBody Set ids) { @@ -60,7 +56,6 @@ public class SysCodeRuleController { } @Log("修改编码") - @ApiOperation("修改编码") @PutMapping @SaCheckPermission("genCode:edit") public ResponseEntity update(@RequestBody SysCodeRule codeRule) { @@ -68,7 +63,7 @@ public class SysCodeRuleController { return new ResponseEntity<>(HttpStatus.NO_CONTENT); } - @ApiOperation("导出任务数据") + @GetMapping(value = "/codeDemo") @SaCheckPermission("genCode:list") public ResponseEntity CodeDemo(@RequestParam Map form) throws IOException { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleDetailController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleDetailController.java index c0268dc..d7bc1bb 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleDetailController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/coderule/SysCodeRuleDetailController.java @@ -2,8 +2,6 @@ package org.nl.system.controller.coderule; import cn.dev33.satoken.annotation.SaCheckPermission; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; @@ -23,7 +21,7 @@ import org.springframework.web.bind.annotation.*; * @author generator * @since 2022-12-20 */ -@Api(tags = "系统：编码详情管理") + @RestController @RequestMapping("/api/codeDetail") public class SysCodeRuleDetailController { @@ -31,36 +29,36 @@ public class SysCodeRuleDetailController { @Autowired private ISysCodeRuleDetailService codeDetailService; - @ApiOperation("查询编码明细") + @GetMapping @SaCheckPermission("genCode:list") - public ResponseEntity queryAll(CodeRuleDetailQuery form, PageQuery pageable){ - return new ResponseEntity<>(TableDataInfo.build(codeDetailService.queryAll(form,pageable)), HttpStatus.OK); + public ResponseEntity queryAll(CodeRuleDetailQuery form, PageQuery pageable) { + return new ResponseEntity<>(TableDataInfo.build(codeDetailService.queryAll(form, pageable)), HttpStatus.OK); } @Log("新增编码明细") - @ApiOperation("新增编码明细") + @PostMapping @SaCheckPermission("genCode:add") - public ResponseEntity create(@RequestBody SysCodeRuleDetail codeRuleDetail){ + public ResponseEntity create(@RequestBody SysCodeRuleDetail codeRuleDetail) { codeDetailService.create(codeRuleDetail); return new ResponseEntity<>(HttpStatus.CREATED); } @Log("删除编码明细") - @ApiOperation("删除编码明细") + @DeleteMapping(value = "/{id}") @SaCheckPermission("genCode:del") - public ResponseEntity delete(@PathVariable String id){ + public ResponseEntity delete(@PathVariable String id) { codeDetailService.delete(id); return new ResponseEntity<>(HttpStatus.OK); } @Log("修改编码明细") - @ApiOperation("修改编码明细") + @PutMapping @SaCheckPermission("genCode:edit") - public ResponseEntity update(@RequestBody SysCodeRuleDetail json){ + public ResponseEntity update(@RequestBody SysCodeRuleDetail json) { codeDetailService.update(json); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java index 75bc5d3..3365ea8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dept/DeptController.java @@ -18,13 +18,11 @@ package org.nl.system.controller.dept; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaMode; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; -import org.nl.common.utils.PageUtil; import org.nl.common.logging.annotation.Log; +import org.nl.common.utils.PageUtil; import org.nl.system.service.dept.ISysDeptService; import org.nl.system.service.dept.dao.SysDept; import org.nl.system.service.dept.dto.DeptQuery; @@ -39,60 +37,59 @@ import java.util.List; import java.util.Set; /** -* @author Zheng Jie -* @date 2019-03-25 -*/ + * @author Zheng Jie + * @date 2019-03-25 + */ @RestController -@Api(tags = "系统：部门管理") + @RequestMapping("/api/dept") public class DeptController { @Autowired private ISysDeptService deptService; - @ApiOperation("查询部门") + @GetMapping public ResponseEntity query(DeptQuery query) throws Exception { List list = deptService.list(query.build()); - return new ResponseEntity<>(PageUtil.toPage(list, list.size()),HttpStatus.OK); + return new ResponseEntity<>(PageUtil.toPage(list, list.size()), HttpStatus.OK); } - @ApiOperation("查询部门") + @GetMapping("/vo") public ResponseEntity queryvo(DeptQuery query, PageQuery pageQuery) throws Exception { Page deptPage = deptService.queryVo(query, pageQuery); - return new ResponseEntity((TableDataInfo.build(deptPage)),HttpStatus.OK); + return new ResponseEntity((TableDataInfo.build(deptPage)), HttpStatus.OK); } - @ApiOperation("查询所有部门树") @GetMapping("/allTree") public ResponseEntity allTree(DeptQuery query) { - return new ResponseEntity<>(deptService.buildTree(query),HttpStatus.OK); + return new ResponseEntity<>(deptService.buildTree(query), HttpStatus.OK); } - @ApiOperation("查询部门:根据ID获取同级与上级数据") + @PostMapping("/superior") @SaCheckPermission(value = {"user:list", "dept:list"}, mode = SaMode.AND) public ResponseEntity getSuperior(@RequestBody List ids) { - if (CollectionUtils.isEmpty(ids)){ - return ResponseEntity.noContent().build(); + if (CollectionUtils.isEmpty(ids)) { + return ResponseEntity.noContent().build(); } - return new ResponseEntity<>(deptService.getSuperior(ids),HttpStatus.OK); + return new ResponseEntity<>(deptService.getSuperior(ids), HttpStatus.OK); } @Log("新增部门") - @ApiOperation("新增部门") + @PostMapping - public ResponseEntity create(@Validated @RequestBody SysDept resources){ + public ResponseEntity create(@Validated @RequestBody SysDept resources) { deptService.createDept(resources); return new ResponseEntity<>(HttpStatus.CREATED); } @Log("修改部门") - @ApiOperation("修改部门") + @PutMapping - public ResponseEntity update(@Validated @RequestBody SysDept dept){ + public ResponseEntity update(@Validated @RequestBody SysDept dept) { if (dept.getPid() != null && dept.getDept_id().equals(dept.getPid())) { throw new BadRequestException("上级不能为自己"); } @@ -101,11 +98,11 @@ public class DeptController { } @Log("删除部门") - @ApiOperation("删除部门") + @DeleteMapping - public ResponseEntity delete(@RequestBody Set deptIds){ - if (CollectionUtils.isEmpty(deptIds)){ - return ResponseEntity.noContent().build(); + public ResponseEntity delete(@RequestBody Set deptIds) { + if (CollectionUtils.isEmpty(deptIds)) { + return ResponseEntity.noContent().build(); } deptService.delateDept(deptIds); return new ResponseEntity<>(HttpStatus.OK); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java index 66b7adb..43a98e4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/dict/SysDictController.java @@ -1,7 +1,6 @@ package org.nl.system.controller.dict; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.ApiOperation; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; @@ -36,56 +35,56 @@ public class SysDictController { @Log("查询字典") @GetMapping - @ApiOperation("查询字典") + // @SaCheckPermission("dict:list") - public ResponseEntity query(@RequestParam Map whereJson, PageQuery pageable){ - return new ResponseEntity<>(TableDataInfo.build(dictService.queryAll(whereJson,pageable)), HttpStatus.OK); + public ResponseEntity query(@RequestParam Map whereJson, PageQuery pageable) { + return new ResponseEntity<>(TableDataInfo.build(dictService.queryAll(whereJson, pageable)), HttpStatus.OK); } - @ApiOperation("查询所有字典信息") + @GetMapping(value = "/all") // @SaCheckPermission("dict:list") - public ResponseEntity queryAll(){ - return new ResponseEntity<>(dictService.queryAll(),HttpStatus.OK); + public ResponseEntity queryAll() { + return new ResponseEntity<>(dictService.queryAll(), HttpStatus.OK); } @Log("新增字典") @PostMapping - @ApiOperation("新增字典") + // @SaCheckPermission("dict:add") - public ResponseEntity create(@RequestBody Dict dict){ + public ResponseEntity create(@RequestBody Dict dict) { dictService.create(dict); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping @Log("修改字典") - @ApiOperation("修改字典") + //@SaCheckPermission("@el.check('dict:edit')") - public ResponseEntity updateDict(@Validated @RequestBody Dict dto){ + public ResponseEntity updateDict(@Validated @RequestBody Dict dto) { dictService.updateDict(dto); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除字典") - @ApiOperation("删除字典") + @DeleteMapping // @SaCheckPermission("dict:del") - public ResponseEntity delete(@RequestBody Set ids){ + public ResponseEntity delete(@RequestBody Set ids) { dictService.deleteBatchByIds(ids); return new ResponseEntity<>(HttpStatus.OK); } @GetMapping("/dictDetail") - @ApiOperation("查询字典详情") - public ResponseEntity queryDetails(@RequestParam Map criteria, PageQuery pageable){ + + public ResponseEntity queryDetails(@RequestParam Map criteria, PageQuery pageable) { DictQuery dictQuery = JSONObject.parseObject(JSONObject.toJSONString(criteria), DictQuery.class); - return new ResponseEntity<>(TableDataInfo.build(dictService.queryAllDetail(dictQuery,pageable)),HttpStatus.OK); + return new ResponseEntity<>(TableDataInfo.build(dictService.queryAllDetail(dictQuery, pageable)), HttpStatus.OK); } - @ApiOperation("查询多个字典详情") + @GetMapping(value = "/dictDetail/map") - public ResponseEntity getDictDetailMaps(@RequestParam String dictName){ + public ResponseEntity getDictDetailMaps(@RequestParam String dictName) { String[] names = dictName.split("[,，]"); Map> dictMap = new HashMap<>(16); for (String name : names) { @@ -95,28 +94,28 @@ public class SysDictController { } @Log("新增字典详情") - @ApiOperation("新增字典详情") + @PostMapping("/dictDetail") // @SaCheckPermission("dict:add") - public ResponseEntity createDetail(@RequestBody Dict resources){ + public ResponseEntity createDetail(@RequestBody Dict resources) { dictService.createDetail(resources); return new ResponseEntity<>(HttpStatus.CREATED); } @Log("修改字典详情") - @ApiOperation("修改字典详情") + @PutMapping("/dictDetail") // @SaCheckPermission("dict:edit") - public ResponseEntity updateDetail(@RequestBody Dict resources){ + public ResponseEntity updateDetail(@RequestBody Dict resources) { dictService.updateDetail(resources); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除字典详情") - @ApiOperation("删除字典详情") + @DeleteMapping(value = "/dictDetail/{id}") // @SaCheckPermission("dict:del") - public ResponseEntity deleteDetail(@PathVariable String id){ + public ResponseEntity deleteDetail(@PathVariable String id) { dictService.deleteDetail(id); return new ResponseEntity<>(HttpStatus.OK); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGenConfigController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGenConfigController.java index 81d06da..550b93b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGenConfigController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGenConfigController.java @@ -2,9 +2,6 @@ package org.nl.system.controller.generator; import cn.dev33.satoken.annotation.SaIgnore; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; import org.nl.system.service.generator.ICodeGenConfigService; import org.nl.system.service.generator.dao.CodeGenConfig; import org.springframework.beans.factory.annotation.Autowired; @@ -23,23 +20,23 @@ import org.springframework.web.bind.annotation.*; */ @SaIgnore @RestController -@Api(tags = "系统：代码生成管理") + @RequestMapping("api/genConfig") public class CodeGenConfigController { @Autowired private ICodeGenConfigService genConfigService; - @ApiOperation("查询表数据") + @GetMapping(value = "/{tableName}") - public ResponseEntity query(@PathVariable String tableName){ + public ResponseEntity query(@PathVariable String tableName) { return new ResponseEntity<>(genConfigService.findByTableName(tableName), HttpStatus.OK); } - @ApiOperation("修改") + @PutMapping - public ResponseEntity update(@Validated @RequestBody CodeGenConfig genConfig){ - return new ResponseEntity<>(genConfigService.update(genConfig.getTable_name(), genConfig),HttpStatus.OK); + public ResponseEntity update(@Validated @RequestBody CodeGenConfig genConfig) { + return new ResponseEntity<>(genConfigService.update(genConfig.getTable_name(), genConfig), HttpStatus.OK); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java index cc48b9d..0704474 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/generator/CodeGeneratorController.java @@ -1,8 +1,6 @@ package org.nl.system.controller.generator; import cn.dev33.satoken.annotation.SaIgnore; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; @@ -30,7 +28,7 @@ import java.util.List; @SaIgnore @RestController @RequestMapping("/api/generator") -@Api(tags = "系统：代码生成管理") + public class CodeGeneratorController { @Autowired private ICodeGeneratorService generatorService; @@ -40,50 +38,54 @@ public class CodeGeneratorController { @Value("${generator.enabled}") private Boolean generatorEnabled; - @ApiOperation("查询数据库数据") + @GetMapping(value = "/tables") - public ResponseEntity queryTables(@RequestParam(defaultValue = "") String name, PageQuery pageable){ + public ResponseEntity queryTables(@RequestParam(defaultValue = "") String name, PageQuery pageable) { return new ResponseEntity<>(TableDataInfo.build(generatorService.getTables(name, pageable)), HttpStatus.OK); } - @ApiOperation("查询字段数据") + @GetMapping(value = "/columns") - public ResponseEntity queryColumns(@RequestParam String tableName){ + public ResponseEntity queryColumns(@RequestParam String tableName) { return new ResponseEntity<>(TableDataInfo.build(generatorService.getColumns(tableName)), HttpStatus.OK); } - @ApiOperation("批量修改字段数据") + @PutMapping - public ResponseEntity save(@RequestBody List columnInfos){ + public ResponseEntity save(@RequestBody List columnInfos) { generatorService.updateBatchById(columnInfos); return new ResponseEntity<>(HttpStatus.OK); } - @ApiOperation("同步字段数据") + @PostMapping(value = "sync") - public ResponseEntity sync(@RequestBody List tables){ + public ResponseEntity sync(@RequestBody List tables) { for (String table : tables) { generatorService.sync(generatorService.getColumns(table), generatorService.query(table)); } return new ResponseEntity<>(HttpStatus.OK); } - @ApiOperation("生成代码") + @PostMapping(value = "/{tableName}/{type}") - public ResponseEntity generator(@PathVariable String tableName, @PathVariable Integer type, HttpServletRequest request, HttpServletResponse response){ - if(!generatorEnabled && type == 0){ + public ResponseEntity generator(@PathVariable String tableName, @PathVariable Integer type, HttpServletRequest request, HttpServletResponse response) { + if (!generatorEnabled && type == 0) { throw new BadRequestException("此环境不允许生成代码，请选择预览或者下载查看！"); } - switch (type){ + switch (type) { // 生成代码 - case 0: generatorService.generator(genConfigService.findByTableName(tableName), generatorService.getColumns(tableName)); + case 0: + generatorService.generator(genConfigService.findByTableName(tableName), generatorService.getColumns(tableName)); break; // 预览 - case 1: return generatorService.preview(genConfigService.findByTableName(tableName), generatorService.getColumns(tableName)); + case 1: + return generatorService.preview(genConfigService.findByTableName(tableName), generatorService.getColumns(tableName)); // 打包 - case 2: generatorService.download(genConfigService.findByTableName(tableName), generatorService.getColumns(tableName), request, response); + case 2: + generatorService.download(genConfigService.findByTableName(tableName), generatorService.getColumns(tableName), request, response); break; - default: throw new BadRequestException("没有这个选项"); + default: + throw new BadRequestException("没有这个选项"); } return new ResponseEntity<>(HttpStatus.OK); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logging/SysLogController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logging/SysLogController.java index 5323312..bfe630e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logging/SysLogController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logging/SysLogController.java @@ -1,8 +1,6 @@ package org.nl.system.controller.logging; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; @@ -25,55 +23,56 @@ import java.util.Map; */ @RestController @RequestMapping("/api/logs") -@Api(tags = "系统：日志管理") + public class SysLogController { @Autowired private ISysLogService logService; + @GetMapping - @ApiOperation("日志查询") + //@SaCheckPermission("@el.check()") - public ResponseEntity query(@RequestParam Map criteria, PageQuery pageable){ - criteria.put("log_type","INFO"); - return new ResponseEntity<>(TableDataInfo.build(logService.queryAll(criteria,pageable)), HttpStatus.OK); + public ResponseEntity query(@RequestParam Map criteria, PageQuery pageable) { + criteria.put("log_type", "INFO"); + return new ResponseEntity<>(TableDataInfo.build(logService.queryAll(criteria, pageable)), HttpStatus.OK); } @GetMapping(value = "/user") - // @ApiOperation("用户日志查询") - public ResponseEntity queryUserLog(@RequestParam Map criteria, PageQuery pageable){ - criteria.put("log_type","INFO"); + // + public ResponseEntity queryUserLog(@RequestParam Map criteria, PageQuery pageable) { + criteria.put("log_type", "INFO"); criteria.put("username", SecurityUtils.getCurrentUsername()); - return new ResponseEntity<>(TableDataInfo.build(logService.queryAll(criteria,pageable)), HttpStatus.OK); + return new ResponseEntity<>(TableDataInfo.build(logService.queryAll(criteria, pageable)), HttpStatus.OK); } @GetMapping(value = "/error") - @ApiOperation("错误日志查询") + // @SaCheckPermission("@el.check()") - public ResponseEntity queryErrorLog(@RequestParam Map criteria, PageQuery pageable){ - criteria.put("log_type","ERROR"); - return new ResponseEntity<>(TableDataInfo.build(logService.queryAll(criteria,pageable)), HttpStatus.OK); + public ResponseEntity queryErrorLog(@RequestParam Map criteria, PageQuery pageable) { + criteria.put("log_type", "ERROR"); + return new ResponseEntity<>(TableDataInfo.build(logService.queryAll(criteria, pageable)), HttpStatus.OK); } @GetMapping(value = "/error/{id}") - @ApiOperation("日志异常详情查询") + // @SaCheckPermission("@el.check()") - public ResponseEntity queryErrorLogs(@PathVariable String id){ + public ResponseEntity queryErrorLogs(@PathVariable String id) { return new ResponseEntity<>(logService.findByErrDetail(id), HttpStatus.OK); } @DeleteMapping(value = "/del/error") @Log("删除所有ERROR日志") - @ApiOperation("删除所有ERROR日志") + // @SaCheckPermission("@el.check()") - public ResponseEntity delAllErrorLog(){ + public ResponseEntity delAllErrorLog() { logService.delAllByError(); return new ResponseEntity<>(HttpStatus.OK); } @DeleteMapping(value = "/del/info") @Log("删除所有INFO日志") - @ApiOperation("删除所有INFO日志") + // @SaCheckPermission("@el.check()") - public ResponseEntity delAllInfoLog(){ + public ResponseEntity delAllInfoLog() { logService.delAllByInfo(); return new ResponseEntity<>(HttpStatus.OK); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageController.java index 65e23de..c0d80af 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageController.java @@ -1,8 +1,6 @@ package org.nl.system.controller.logicflow; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -28,7 +26,7 @@ import java.util.Set; */ @Slf4j @RestController -@Api(tags = "舞台管理") + @RequestMapping("/api/stage") public class StageController { @@ -37,7 +35,7 @@ public class StageController { @GetMapping @Log("查询舞台") - @ApiOperation("查询舞台") + //@SaCheckPermission("stage:list") public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(stageService.queryAll(whereJson, page)), HttpStatus.OK); @@ -45,7 +43,7 @@ public class StageController { @PostMapping @Log("新增舞台") - @ApiOperation("新增舞台") + //@SaCheckPermission("stage:add") public ResponseEntity create(@Validated @RequestBody Stage dto) { stageService.create(dto); @@ -54,7 +52,7 @@ public class StageController { @PutMapping @Log("修改舞台") - @ApiOperation("修改舞台") + //@SaCheckPermission("stage:edit") public ResponseEntity update(@Validated @RequestBody Stage dto) { stageService.update(dto); @@ -62,7 +60,7 @@ public class StageController { } @Log("删除舞台") - @ApiOperation("删除舞台") + //@SaCheckPermission("stage:del") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { @@ -72,7 +70,7 @@ public class StageController { @GetMapping("/selectList") @Log("下拉选舞台") - @ApiOperation("下拉选舞台") + //@SaCheckPermission("routePlan:list") public ResponseEntity selectList() { return new ResponseEntity<>(stageService.selectList(), HttpStatus.OK); @@ -80,16 +78,16 @@ public class StageController { @PostMapping("/addNewStage") @Log("保存舞台数据") - @ApiOperation("保存舞台数据") + public ResponseEntity addNewStage(@Validated @RequestBody Stage dto) { - log.info("dto{}",dto); + log.info("dto{}", dto); stageService.addNewStage(dto); return new ResponseEntity<>(HttpStatus.CREATED); } @PostMapping("/getNewStageDataByCode") @Log("根据stage_code获取舞台数据") - @ApiOperation("根据stage_code获取舞台数据") + public ResponseEntity getNewStageDataByCode(@RequestBody String code) { Stage one = stageService.getOne(new LambdaQueryWrapper().eq(Stage::getStage_code, code)); return new ResponseEntity<>(one, HttpStatus.CREATED); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageImageController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageImageController.java index c8e5f2d..175b29f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageImageController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/logicflow/StageImageController.java @@ -1,8 +1,6 @@ package org.nl.system.controller.logicflow; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; @@ -27,16 +25,17 @@ import java.util.Set; */ @RestController @RequiredArgsConstructor -@Api(tags = "舞台管理") + @RequestMapping("/api/stageImage") @Slf4j public class StageImageController { @Autowired private IStageImageService stageImageService; + @GetMapping @Log("查询舞台") - @ApiOperation("查询舞台") + //@SaCheckPermission("stageImage:list") public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(stageImageService.queryAll(whereJson, page)), HttpStatus.OK); @@ -44,7 +43,7 @@ public class StageImageController { @PostMapping @Log("新增舞台图片") - @ApiOperation("新增舞台图片") + //@SaCheckPermission("stageImage:add") public ResponseEntity create(@Validated @RequestBody StageImage entity) { stageImageService.create(entity); @@ -53,7 +52,7 @@ public class StageImageController { @PutMapping @Log("修改舞台") - @ApiOperation("修改舞台") + //@SaCheckPermission("stageImage:edit") public ResponseEntity update(@Validated @RequestBody StageImage entity) { stageImageService.update(entity); @@ -61,7 +60,7 @@ public class StageImageController { } @Log("删除舞台") - @ApiOperation("删除舞台") + //@SaCheckPermission("stageImage:del") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { @@ -71,7 +70,7 @@ public class StageImageController { @GetMapping("/selectList") @Log("下拉选设备图标") - @ApiOperation("下拉选设备图标") + //@SaCheckPermission("routePlan:list") public ResponseEntity selectList() { return new ResponseEntity<>(stageImageService.selectList(), HttpStatus.OK); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/lucence/LuceneController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/lucence/LuceneController.java index 8b9651a..18fd431 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/lucence/LuceneController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/lucence/LuceneController.java @@ -1,18 +1,15 @@ package org.nl.system.controller.lucence; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.nl.common.logging.annotation.Log; import org.nl.system.service.lucene.LuceneService; -import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; +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; /** * @Author: lyd @@ -21,7 +18,7 @@ import java.util.Map; */ @RestController @RequiredArgsConstructor -@Api(tags = "日志检索") + @RequestMapping("/api/lucene") @Slf4j public class LuceneController { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java index 71e5679..0b846c3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/menu/SysMenuController.java @@ -5,8 +5,6 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; - -import io.swagger.annotations.ApiOperation; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; @@ -38,19 +36,19 @@ public class SysMenuController { private ISysMenuService iSysMenuService; @GetMapping(value = "/build") - @ApiOperation("根据用户获取菜单") + public ResponseEntity buildMenus(@Validated String systemType) { //校验系统表是否存在该系统类型 - return new ResponseEntity(iSysMenuService.buildMenus(systemType),HttpStatus.OK); + return new ResponseEntity(iSysMenuService.buildMenus(systemType), HttpStatus.OK); } - @ApiOperation("返回全部的菜单") + @GetMapping(value = "/lazy") @SaCheckPermission(value = {"menu:list", "roles:list"}, mode = SaMode.AND) public ResponseEntity query(@RequestParam String pid) { return new ResponseEntity<>(iSysMenuService.getMenus(pid), HttpStatus.OK); } - @ApiOperation("获取菜单列表") + @PostMapping(value = "/getMenusByRole") @SaCheckPermission(value = {"menu:list", "roles:list"}, mode = SaMode.AND) public ResponseEntity getMenusByRole(@RequestBody JSONObject json) { @@ -60,7 +58,7 @@ public class SysMenuController { return new ResponseEntity<>(iSysMenuService.getMenusByRole(role_id, system_type, category), HttpStatus.OK); } - @ApiOperation("根据菜单ID返回所有子节点ID，包含自身ID") + @GetMapping(value = "/child") @SaCheckPermission(value = {"menu:list", "roles:list"}, mode = SaMode.AND) public ResponseEntity child(@RequestParam String id) { @@ -73,19 +71,19 @@ public class SysMenuController { } @GetMapping - @ApiOperation("查询菜单") + @SaCheckPermission("menu:list") public ResponseEntity pageQuery(MenuQuery query, PageQuery page) throws Exception { List list = iSysMenuService.query(query, page); return new ResponseEntity<>(TableDataInfo.build(list), HttpStatus.OK); } - @ApiOperation("查询菜单:根据ID获取同级与上级数据") + @PostMapping("/superior") @SaCheckPermission("menu:list") public ResponseEntity getSuperior(@RequestBody JSONObject param) { Set menuDtos = new LinkedHashSet<>(); - String id=param.getString("ids"); + String id = param.getString("ids"); if (StrUtil.isNotEmpty(id)) { menuDtos.addAll(iSysMenuService.getSuperior(iSysMenuService.doToDto(iSysMenuService.findById(id)), new ArrayList<>())); return new ResponseEntity<>(iSysMenuService.buildTree(new ArrayList<>(menuDtos)), HttpStatus.OK); @@ -94,7 +92,7 @@ public class SysMenuController { } @Log("新增菜单") - @ApiOperation("新增菜单") + @PostMapping @SaCheckPermission("menu:add") public ResponseEntity create(@RequestBody SysMenu form) { @@ -103,16 +101,16 @@ public class SysMenuController { } @Log("修改菜单") - @ApiOperation("修改菜单") + @PutMapping @SaCheckPermission("menu:edit") - public ResponseEntity update( @RequestBody SysMenu form) { + public ResponseEntity update(@RequestBody SysMenu form) { iSysMenuService.update(form); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除菜单") - @ApiOperation("删除菜单") + @DeleteMapping @SaCheckPermission("menu:del") public ResponseEntity delete(@RequestBody Set ids) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/monitor/MonitorController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/monitor/MonitorController.java index 092e749..ae4135d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/monitor/MonitorController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/monitor/MonitorController.java @@ -16,8 +16,6 @@ package org.nl.system.controller.monitor; import cn.dev33.satoken.annotation.SaCheckPermission; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.nl.system.service.monitor.MonitorService; import org.springframework.http.HttpStatus; @@ -32,16 +30,16 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @RequiredArgsConstructor -@Api(tags = "系统-服务监控管理") + @RequestMapping("/api/monitor") public class MonitorController { private final MonitorService serverService; @GetMapping - @ApiOperation("查询服务监控") + @SaCheckPermission("monitor:list") public ResponseEntity query() { - return new ResponseEntity<>(serverService.getServers(),HttpStatus.OK); + return new ResponseEntity<>(serverService.getServers(), HttpStatus.OK); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/notice/SysNoticeController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/notice/SysNoticeController.java index 5d63042..e4c3afc 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/notice/SysNoticeController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/notice/SysNoticeController.java @@ -1,8 +1,6 @@ package org.nl.system.controller.notice; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -17,13 +15,14 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; import java.util.Set; + /** -* @author lyd -* @date 2023-05-09 -**/ + * @author lyd + * @date 2023-05-09 + **/ @Slf4j @RestController -@Api(tags = "消息通知管理") + @RequestMapping("/api/notice") public class SysNoticeController { @@ -32,32 +31,32 @@ public class SysNoticeController { @GetMapping @Log("查询消息通知") - @ApiOperation("查询消息通知") + //@SaCheckPermission("@el.check('sysNotice:list')") - public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ - return new ResponseEntity<>(TableDataInfo.build(noticeService.queryAll(whereJson,page)),HttpStatus.OK); + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(noticeService.queryAll(whereJson, page)), HttpStatus.OK); } @PostMapping @Log("新增消息通知") - @ApiOperation("新增消息通知") + //@SaCheckPermission("@el.check('sysNotice:add')") - public ResponseEntity create(@Validated @RequestBody SysNotice entity){ + public ResponseEntity create(@Validated @RequestBody SysNotice entity) { noticeService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping @Log("修改消息通知") - @ApiOperation("修改消息通知") + //@SaCheckPermission("@el.check('sysNotice:edit')") - public ResponseEntity update(@Validated @RequestBody SysNotice entity){ + public ResponseEntity update(@Validated @RequestBody SysNotice entity) { noticeService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除消息通知") - @ApiOperation("删除消息通知") + //@SaCheckPermission("@el.check('sysNotice:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { @@ -67,39 +66,39 @@ public class SysNoticeController { @Log("获取未读的接收消息条数") @GetMapping("/countByReceiveNotRead") - public ResponseEntity countByReceiveNotRead(){ + public ResponseEntity countByReceiveNotRead() { return new ResponseEntity<>(noticeService.countByReceiveNotRead(), HttpStatus.OK); } @Log("接收消息分页") @GetMapping("/pageByReceive") - public ResponseEntity pageByReceive(){ + public ResponseEntity pageByReceive() { return new ResponseEntity<>(noticeService.pageByReceive(), HttpStatus.OK); } @Log("标为已读") @PostMapping("/read") - public ResponseEntity read(@RequestBody String id){ + public ResponseEntity read(@RequestBody String id) { noticeService.read(id); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("消息详情") @PostMapping("/findById") - public ResponseEntity findById(@RequestBody String id){ + public ResponseEntity findById(@RequestBody String id) { return new ResponseEntity<>(noticeService.getById(id), HttpStatus.OK); } @Log("修改已处理") @PostMapping("/deal") - public ResponseEntity deal(@RequestBody String id){ + public ResponseEntity deal(@RequestBody String id) { noticeService.deal(id); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("批量已读") @PostMapping("/changeRead") - @ApiOperation("批量已读") + public ResponseEntity changeRead(@RequestBody JSONObject jsonObject) { noticeService.changeRead(jsonObject); return new ResponseEntity<>(HttpStatus.NO_CONTENT); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/param/SysParamController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/param/SysParamController.java index b78ffb0..ac8048b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/param/SysParamController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/param/SysParamController.java @@ -1,8 +1,6 @@ package org.nl.system.controller.param; import cn.dev33.satoken.annotation.SaIgnore; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -27,7 +25,7 @@ import java.util.Map; * @author generator * @since 2022-12-14 */ -@Api(tags = "系统参数管理") + @Slf4j @RestController @RequestMapping("/api/param") @@ -35,34 +33,35 @@ class SysParamController { @Autowired private ISysParamService paramService; + @GetMapping @Log("查询系统参数") - @ApiOperation("查询系统参数") + //@SaCheckPermission("param:list") - public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(paramService.queryPage(whereJson, page)), HttpStatus.OK); } @PostMapping @Log("新增系统参数") - @ApiOperation("新增系统参数") + //@SaCheckPermission("param:add") - public ResponseEntity create(@Validated @RequestBody Param param){ + public ResponseEntity create(@Validated @RequestBody Param param) { paramService.create(param); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping @Log("修改系统参数") - @ApiOperation("修改系统参数") + //@SaCheckPermission("param:edit") - public ResponseEntity update(@Validated @RequestBody Param param){ + public ResponseEntity update(@Validated @RequestBody Param param) { paramService.update(param); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除系统参数") - @ApiOperation("删除系统参数") + //@SaCheckPermission("param:del") @DeleteMapping public ResponseEntity delete(@RequestBody String[] ids) { @@ -73,7 +72,7 @@ class SysParamController { @PostMapping("/getValueByCode/{code}") @Log("根据编码获取值") - @ApiOperation("根据编码获取值") + @SaIgnore public ResponseEntity getValueByCode(@PathVariable String code) { return new ResponseEntity<>(paramService.findByCode(code), HttpStatus.CREATED); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java index 4a94366..b905fb8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/permission/SysDataPermissionController.java @@ -2,8 +2,6 @@ package org.nl.system.controller.permission; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -29,7 +27,7 @@ import java.util.Set; */ @Slf4j @RestController -@Api(tags = "数据管理") + @RequestMapping("/api/dataPermission") public class SysDataPermissionController { @@ -38,7 +36,7 @@ public class SysDataPermissionController { @GetMapping @Log("查询数据权限") - @ApiOperation("查询数据权限") + //@SaCheckPermission("@el.check('dataPermission:list')") public ResponseEntity query(SysDataPermissionQuery dataPermissionQuery, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(dataPermissionService.queryAll(dataPermissionQuery, page)), HttpStatus.OK); @@ -46,7 +44,7 @@ public class SysDataPermissionController { @PostMapping @Log("新增数据权限") - @ApiOperation("新增数据权限") + //@SaCheckPermission("@el.check('dataPermission:add')") public ResponseEntity create(@Validated @RequestBody SysDataPermission permission) { dataPermissionService.create(permission); @@ -55,7 +53,7 @@ public class SysDataPermissionController { @PutMapping @Log("修改数据权限") - @ApiOperation("修改数据权限") + //@SaCheckPermission("@el.check('dataPermission:edit')") public ResponseEntity update(@Validated @RequestBody SysDataPermission permission) { dataPermissionService.update(permission); @@ -63,7 +61,7 @@ public class SysDataPermissionController { } @Log("删除数据权限") - @ApiOperation("删除数据权限") + //@SaCheckPermission("@el.check('dataPermission:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { @@ -73,38 +71,38 @@ public class SysDataPermissionController { @GetMapping("/scopeType") @Log("获取数据权限范围") - @ApiOperation("获取数据权限范围") - public ResponseEntity getDataScopeType(){ - return new ResponseEntity<>(dataPermissionService.getDataScopeType(),HttpStatus.OK); + + public ResponseEntity getDataScopeType() { + return new ResponseEntity<>(dataPermissionService.getDataScopeType(), HttpStatus.OK); } @GetMapping("/dataPermissionOption") @Log("获取数据权限下拉框") - @ApiOperation("获取数据权限下拉框") - public ResponseEntity getDataPermissionOption(){ - return new ResponseEntity<>(dataPermissionService.getDataPermissionOption(),HttpStatus.OK); + + public ResponseEntity getDataPermissionOption() { + return new ResponseEntity<>(dataPermissionService.getDataPermissionOption(), HttpStatus.OK); } @PostMapping("/saveDataPermission") @Log("保存数据权限") - @ApiOperation("保存数据权限") - public ResponseEntity saveDataPermission(@RequestBody JSONObject datas){ + + public ResponseEntity saveDataPermission(@RequestBody JSONObject datas) { dataPermissionService.savePermission(datas); return new ResponseEntity<>(HttpStatus.CREATED); } @PostMapping("/dataShow") @Log("查看数据权限") - @ApiOperation("查看数据权限") - public ResponseEntity getDataShow(@RequestBody String id){ - return new ResponseEntity<>(dataPermissionService.getDataShow(id),HttpStatus.OK); + + public ResponseEntity getDataShow(@RequestBody String id) { + return new ResponseEntity<>(dataPermissionService.getDataShow(id), HttpStatus.OK); } @PostMapping("/dataDetail") @Log("查看数据明细") - @ApiOperation("查看数据明细") - public ResponseEntity getDataDetail(@RequestBody JSONObject data){ - return new ResponseEntity<>(dataPermissionService.getDataDetail(data),HttpStatus.OK); + + public ResponseEntity getDataDetail(@RequestBody JSONObject data) { + return new ResponseEntity<>(dataPermissionService.getDataDetail(data), HttpStatus.OK); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/quartz/SysQuartzJobController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/quartz/SysQuartzJobController.java index 1b6bdf2..297fa57 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/quartz/SysQuartzJobController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/quartz/SysQuartzJobController.java @@ -2,8 +2,6 @@ package org.nl.system.controller.quartz; import cn.dev33.satoken.annotation.SaCheckPermission; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -31,21 +29,21 @@ import java.util.Set; @Slf4j @RestController @RequestMapping("/api/jobs") -@Api(tags = "系统:定时任务管理") + public class SysQuartzJobController { private static final String ENTITY_NAME = "quartzJob"; @Autowired private ISysQuartzJobService quartzJobService; - @ApiOperation("查询定时任务") + @GetMapping @SaCheckPermission("timing:list") public ResponseEntity query(JobQuery criteria, PageQuery pageable) { return new ResponseEntity<>(TableDataInfo.build(quartzJobService.queryAll(criteria, pageable)), HttpStatus.OK); } - @ApiOperation("查询任务执行日志") + @GetMapping(value = "/logs") @SaCheckPermission("timing:list") public ResponseEntity queryJobLog(JobQuery criteria, PageQuery pageable) { @@ -53,7 +51,7 @@ public class SysQuartzJobController { } @Log("新增定时任务") - @ApiOperation("新增定时任务") + @PostMapping @SaCheckPermission("timing:add") public ResponseEntity create(@Validated @RequestBody SysQuartzJob resources) { @@ -65,7 +63,7 @@ public class SysQuartzJobController { } @Log("修改定时任务") - @ApiOperation("修改定时任务") + @PutMapping @SaCheckPermission("timing:edit") public ResponseEntity update(@Validated @RequestBody SysQuartzJob resources) { @@ -74,7 +72,7 @@ public class SysQuartzJobController { } @Log("更改定时任务状态") - @ApiOperation("更改定时任务状态") + @PutMapping(value = "/{id}") @SaCheckPermission("timing:edit") public ResponseEntity update(@PathVariable String id) { @@ -83,7 +81,7 @@ public class SysQuartzJobController { } @Log("执行定时任务") - @ApiOperation("执行定时任务") + @PutMapping(value = "/exec/{id}") @SaCheckPermission("timing:edit") public ResponseEntity execution(@PathVariable String id) { @@ -92,7 +90,7 @@ public class SysQuartzJobController { } @Log("删除定时任务") - @ApiOperation("删除定时任务") + @DeleteMapping @SaCheckPermission("timing:del") public ResponseEntity delete(@RequestBody Set ids) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/redis/RedisController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/redis/RedisController.java index ec89c86..d0cd656 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/redis/RedisController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/redis/RedisController.java @@ -1,7 +1,6 @@ package org.nl.system.controller.redis; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.logging.annotation.Log; @@ -17,7 +16,7 @@ import org.springframework.web.bind.annotation.*; */ @RestController @RequiredArgsConstructor -@Api(tags = "系统表格管理") + @RequestMapping("/api/redis") @Slf4j public class RedisController { @@ -26,27 +25,27 @@ public class RedisController { @GetMapping("/get-monitor-info") @Log("查询redis的信息") - @ApiOperation("查询redis的信息") + public ResponseEntity getRedisMonitorInfo() { - return new ResponseEntity<>(redisService.getRedisMonitorInfo(),HttpStatus.OK); + return new ResponseEntity<>(redisService.getRedisMonitorInfo(), HttpStatus.OK); } @GetMapping("/get-key-define-list") @Log("获得 Redis Key 模板列表") - @ApiOperation("获得 Redis Key 模板列表") + public ResponseEntity getKeyDefineList() { - return new ResponseEntity<>(redisService.getKeyDefineList(),HttpStatus.OK); + return new ResponseEntity<>(redisService.getKeyDefineList(), HttpStatus.OK); } @GetMapping("/get-key-value-list") @Log("获得 Redis Key Value列表") - @ApiOperation("获得 Redis Key Value列表") + public ResponseEntity getKeyValueList() { - return new ResponseEntity<>( redisService.getKeyValueList(),HttpStatus.OK); + return new ResponseEntity<>(redisService.getKeyValueList(), HttpStatus.OK); } @Log("根据key删除Redis数据") - @ApiOperation("根据key删除Redis数据") + @DeleteMapping public ResponseEntity deleteByKey(@RequestBody String[] ids) { redisService.deleteByKey(ids); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/role/SysRoleController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/role/SysRoleController.java index 2eacfa3..fcae380 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/role/SysRoleController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/role/SysRoleController.java @@ -2,7 +2,6 @@ package org.nl.system.controller.role; import cn.dev33.satoken.annotation.SaCheckPermission; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.ApiOperation; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; @@ -30,21 +29,21 @@ public class SysRoleController { @Autowired private ISysRoleService roleService; - @ApiOperation("分页查询角色") + @GetMapping @SaCheckPermission("roles:list") public ResponseEntity pageQuery(@RequestParam Map param, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(roleService.query(param, page)), HttpStatus.OK); } - @ApiOperation("查询所有角色") + @GetMapping("/all") public ResponseEntity queryAll() { return new ResponseEntity<>(roleService.list(), HttpStatus.OK); } @Log("新增角色") - @ApiOperation("新增角色") + @PostMapping @SaCheckPermission("roles:add") public ResponseEntity create(@RequestBody JSONObject param) { @@ -53,7 +52,7 @@ public class SysRoleController { } @Log("修改角色") - @ApiOperation("修改角色") + @PutMapping @SaCheckPermission("roles:edit") public ResponseEntity update(@RequestBody JSONObject param) { @@ -62,7 +61,7 @@ public class SysRoleController { } @Log("删除角色") - @ApiOperation("删除角色") + @DeleteMapping @SaCheckPermission("roles:del") public ResponseEntity delete(@RequestBody Set ids) { @@ -71,7 +70,7 @@ public class SysRoleController { } @Log("修改角色菜单") - @ApiOperation("修改角色菜单") + @PutMapping(value = "/menu") @SaCheckPermission("roles:edit") public ResponseEntity updateMenu(@RequestBody JSONObject form) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java index 9deb8ad..b94a635 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/AuthorizationController.java @@ -1,4 +1,3 @@ - package org.nl.system.controller.secutiry; @@ -7,14 +6,12 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import com.wf.captcha.base.Captcha; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.nl.common.security.config.bean.LoginCodeEnum; +import org.nl.common.security.config.bean.LoginProperties; import org.nl.common.utils.RedisUtils; import org.nl.common.utils.SecurityUtils; import org.nl.common.utils.dto.CurrentUser; -import org.nl.common.security.config.bean.LoginCodeEnum; -import org.nl.common.security.config.bean.LoginProperties; import org.nl.system.service.secutiry.impl.OnlineUserService; import org.nl.system.service.user.ISysUserService; import org.nl.system.service.user.dao.SysUser; @@ -37,10 +34,10 @@ import java.util.concurrent.TimeUnit; @Slf4j @RestController @RequestMapping("/auth") -@Api(tags = "系统：系统授权接口") + public class AuthorizationController { @Autowired - private RedisUtils redisUtils; + private RedisUtils redisUtils; @Autowired private OnlineUserService onlineUserService; @Autowired @@ -48,17 +45,16 @@ public class AuthorizationController { @Autowired private LoginProperties loginProperties; - @ApiOperation("登录授权") + @PostMapping(value = "/login") public ResponseEntity login(@RequestBody Map authMap, HttpServletRequest request) throws Exception { - if (ObjectUtil.isEmpty(authMap)){ - return ResponseEntity.noContent().build(); + if (ObjectUtil.isEmpty(authMap)) { + return ResponseEntity.noContent().build(); } return ResponseEntity.ok(onlineUserService.login(authMap, request)); } - @ApiOperation("获取用户信息") @GetMapping(value = "/info") public ResponseEntity getUserInfo() { CurrentUser currentUser = SecurityUtils.getCurrentUser(); @@ -68,17 +64,17 @@ public class AuthorizationController { return ResponseEntity.ok(jsonObject); } - @ApiOperation("获取指定用户信息") + @GetMapping(value = "/userInfo") public ResponseEntity getUserInfo(Long loginId) { - if (loginId != null){ + if (loginId != null) { SysUser user = userService.getById(loginId); return ResponseEntity.ok(user); } return ResponseEntity.noContent().build(); } - @ApiOperation("获取验证码") + @GetMapping(value = "/code") public ResponseEntity getCode() { // 获取运算的结果 @@ -99,7 +95,7 @@ public class AuthorizationController { return ResponseEntity.ok(imgResult); } - @ApiOperation("退出登录") + @DeleteMapping(value = "/logout") public ResponseEntity logout(HttpServletRequest request) { if (ObjectUtil.isNotEmpty(StpUtil.getTokenValue())) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java index baf7c1e..aeb0c35 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/secutiry/MobileAuthorizationController.java @@ -8,8 +8,6 @@ import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.RsaUtils; @@ -39,13 +37,13 @@ import java.util.List; @Slf4j @RestController @RequestMapping("/mobile/auth") -@Api(tags = "手持：系统授权接口") + public class MobileAuthorizationController { @Autowired private ISysUserService userService; @Autowired private ISysRoleService roleService; - @ApiOperation("登录授权") + @PostMapping(value = "/login") @SaIgnore public ResponseEntity login(@Validated @RequestBody AuthUserDto authUser, HttpServletRequest request) throws Exception { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/tools/ToolLocalStorageController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/tools/ToolLocalStorageController.java index e042e03..63ec0ec 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/tools/ToolLocalStorageController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/tools/ToolLocalStorageController.java @@ -3,13 +3,11 @@ package org.nl.system.controller.tools; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaIgnore; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; -import org.nl.common.utils.FileUtil; import org.nl.common.logging.annotation.Log; +import org.nl.common.utils.FileUtil; import org.nl.system.service.tools.IToolLocalStorageService; import org.nl.system.service.tools.dao.ToolLocalStorage; import org.nl.system.service.tools.dto.ToolLocalStorageQuery; @@ -31,20 +29,20 @@ import java.util.Set; * @since 2022-12-20 */ @RestController -@Api(tags = "工具：本地存储管理") + @RequestMapping("/api/localStorage") public class ToolLocalStorageController { @Autowired private IToolLocalStorageService localStorageService; - @ApiOperation("查询文件") + @GetMapping // @SaCheckPermission("storage:list") public ResponseEntity query(ToolLocalStorageQuery criteria, PageQuery pageable) { return new ResponseEntity<>(TableDataInfo.build(localStorageService.queryAll(criteria, pageable)), HttpStatus.OK); } - @ApiOperation("上传文件") + @PostMapping @SaIgnore // @SaCheckPermission("storage:add") @@ -53,7 +51,7 @@ public class ToolLocalStorageController { } @PostMapping("/pictures") - @ApiOperation("上传图片") + public ResponseEntity upload(@RequestParam MultipartFile file) { // 判断文件是否为图片 String suffix = FileUtil.getExtensionName(file.getOriginalFilename()); @@ -64,7 +62,7 @@ public class ToolLocalStorageController { } @Log("修改文件") - @ApiOperation("修改文件") + @PutMapping @SaCheckPermission("storage:edit") public ResponseEntity update(@Validated @RequestBody ToolLocalStorage resources) { @@ -74,7 +72,7 @@ public class ToolLocalStorageController { @Log("删除文件") @DeleteMapping - @ApiOperation("多选删除") + public ResponseEntity delete(@RequestBody Set ids) { localStorageService.deleteAll(ids); return new ResponseEntity<>(HttpStatus.OK); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/OnlineController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/OnlineController.java index f48db8f..9e73869 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/OnlineController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/OnlineController.java @@ -15,9 +15,7 @@ */ package org.nl.system.controller.user; -import com.alibaba.fastjson.JSONArray; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + import org.nl.common.utils.EncryptUtils; import org.nl.system.service.secutiry.impl.OnlineUserService; import org.nl.system.service.user.dto.OnlineUserDto; @@ -30,36 +28,35 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.util.List; -import java.util.Set; /** * @author Zheng Jie */ @RestController @RequestMapping("/auth/online") -@Api(tags = "系统：在线用户管理") + public class OnlineController { @Autowired private OnlineUserService onlineUserService; - @ApiOperation("查询在线用户") + @GetMapping - // @SaCheckPermission("@el.check()") - public ResponseEntity query(String filter, Pageable pageable){ - return new ResponseEntity<>(onlineUserService.getAll(filter, pageable),HttpStatus.OK); + // @SaCheckPermission("@el.check()") + public ResponseEntity query(String filter, Pageable pageable) { + return new ResponseEntity<>(onlineUserService.getAll(filter, pageable), HttpStatus.OK); } - @ApiOperation("导出数据") + @GetMapping(value = "/download") - // @SaCheckPermission("@el.check()") + // @SaCheckPermission("@el.check()") public void download(HttpServletResponse response, String filter) throws IOException { onlineUserService.download(onlineUserService.getAll(filter), response); } - @ApiOperation("踢出用户") + @DeleteMapping - // @SaCheckPermission("@el.check()") + // @SaCheckPermission("@el.check()") public ResponseEntity delete(@RequestBody List keys) throws Exception { for (OnlineUserDto key : keys) { // 解密Key diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java index d558ace..e7b62ad 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/controller/user/UserController.java @@ -21,16 +21,14 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; -import org.nl.config.RsaProperties; import org.nl.common.exception.BadRequestException; +import org.nl.common.logging.annotation.Log; import org.nl.common.utils.RsaUtils; import org.nl.common.utils.SecurityUtils; -import org.nl.common.logging.annotation.Log; +import org.nl.config.RsaProperties; import org.nl.system.service.user.ISysUserService; import org.nl.system.service.user.dao.SysUser; import org.nl.system.service.user.dto.UserQuery; @@ -48,7 +46,7 @@ import java.util.Set; * @author Zheng Jie * @date 2018-11-23 */ -@Api(tags = "系统：用户管理") + @RestController @RequestMapping("/api/users") @RequiredArgsConstructor @@ -58,35 +56,34 @@ public class UserController { private ISysUserService userService; - @ApiOperation("查询用户") @GetMapping - public ResponseEntity query(UserQuery query, PageQuery page){ - return new ResponseEntity(TableDataInfo.build(userService.getUserDetail(query, page)),HttpStatus.OK); + public ResponseEntity query(UserQuery query, PageQuery page) { + return new ResponseEntity(TableDataInfo.build(userService.getUserDetail(query, page)), HttpStatus.OK); } @Log("新增用户") - @ApiOperation("新增用户") + @PostMapping // @SaCheckPermission("user:add") - public ResponseEntity create(@RequestBody Map user){ + public ResponseEntity create(@RequestBody Map user) { userService.create(user); return new ResponseEntity<>(HttpStatus.CREATED); } @Log("修改用户") - @ApiOperation("修改用户") + @PutMapping // @SaCheckPermission("user:edit") - public ResponseEntity update( @RequestBody Map resources) throws Exception { + public ResponseEntity update(@RequestBody Map resources) throws Exception { userService.update(resources); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("修改用户：个人中心") - @ApiOperation("修改用户：个人中心") + // @PutMapping(value = "center") - public ResponseEntity center(@RequestBody SysUser resources){ - if(!resources.getUser_id().equals(StpUtil.getLoginIdAsLong())){ + public ResponseEntity center(@RequestBody SysUser resources) { + if (!resources.getUser_id().equals(StpUtil.getLoginIdAsLong())) { throw new BadRequestException("不能修改他人资料"); } userService.saveOrUpdate(resources); @@ -94,7 +91,7 @@ public class UserController { } @Log("删除用户") - @ApiOperation("删除用户") + @DeleteMapping // @SaCheckPermission("user:del") public ResponseEntity delete(@RequestBody Set ids) { @@ -102,12 +99,12 @@ public class UserController { return new ResponseEntity<>(HttpStatus.OK); } - @ApiOperation("修改密码") + @PostMapping(value = "/updatePass") public ResponseEntity updatePass(@RequestBody JSONObject passVo) throws Exception { // 解密，得到字符密码 - String oldPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,passVo.getString("oldPass")); - String newPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,passVo.getString("newPass")); + String oldPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey, passVo.getString("oldPass")); + String newPass = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey, passVo.getString("newPass")); SysUser user = userService.getOne(new LambdaQueryWrapper().eq(SysUser::getUsername, SecurityUtils.getCurrentUsername())); if (!SaSecureUtil.md5BySalt(user.getPassword(), GeneralDefinition.SALT).equals(SaSecureUtil.md5BySalt(oldPass, GeneralDefinition.SALT))) { throw new BadRequestException("修改失败，旧密码错误"); @@ -120,22 +117,22 @@ public class UserController { return new ResponseEntity<>(HttpStatus.OK); } - @ApiOperation("修改头像") + @PostMapping(value = "/updateAvatar") - public ResponseEntity updateAvatar(@RequestParam MultipartFile avatar){ + public ResponseEntity updateAvatar(@RequestParam MultipartFile avatar) { return new ResponseEntity<>(userService.updateAvatar(avatar), HttpStatus.OK); } @Log("修改邮箱") - @ApiOperation("修改邮箱") + @PostMapping(value = "/updateEmail/{code}") - public ResponseEntity updateEmail(@PathVariable String code,@RequestBody SysUser user) throws Exception { - String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey,user.getPassword()); - SysUser userInfo = userService.getOne(new QueryWrapper().eq("username",SecurityUtils.getCurrentUsername())); - if(!SaSecureUtil.md5BySalt(userInfo.getPassword(), GeneralDefinition.SALT).equals(SaSecureUtil.md5BySalt(password, GeneralDefinition.SALT))){ + public ResponseEntity updateEmail(@PathVariable String code, @RequestBody SysUser user) throws Exception { + String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey, user.getPassword()); + SysUser userInfo = userService.getOne(new QueryWrapper().eq("username", SecurityUtils.getCurrentUsername())); + if (!SaSecureUtil.md5BySalt(userInfo.getPassword(), GeneralDefinition.SALT).equals(SaSecureUtil.md5BySalt(password, GeneralDefinition.SALT))) { throw new BadRequestException("密码错误"); } - userService.update(new UpdateWrapper().set(userInfo.getUsername(),user.getEmail())); + userService.update(new UpdateWrapper().set(userInfo.getUsername(), user.getEmail())); return new ResponseEntity<>(HttpStatus.OK); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/ISysCodeRuleDetailService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/ISysCodeRuleDetailService.java index 597669d..3f349b7 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/ISysCodeRuleDetailService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/ISysCodeRuleDetailService.java @@ -1,13 +1,10 @@ package org.nl.system.service.coderule; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; import org.nl.system.service.coderule.dao.SysCodeRuleDetail; -import com.baomidou.mybatisplus.extension.service.IService; import org.nl.system.service.coderule.dto.CodeRuleDetailQuery; -import org.springframework.data.domain.Pageable; - -import java.util.Map; /** *

@@ -21,6 +18,7 @@ public interface ISysCodeRuleDetailService extends IService { /** * 分页查询 + * * @param form * @param pageable * @return @@ -29,18 +27,21 @@ public interface ISysCodeRuleDetailService extends IService { /** * 创建 + * * @param codeRuleDetail */ void create(SysCodeRuleDetail codeRuleDetail); /** * 根据id删除 + * * @param id */ void delete(String id); /** * 修改明细 + * * @param json */ void update(SysCodeRuleDetail json); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/ISysCodeRuleService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/ISysCodeRuleService.java index 49d63fb..e9d9c6c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/ISysCodeRuleService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/ISysCodeRuleService.java @@ -1,10 +1,9 @@ package org.nl.system.service.coderule; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; import org.nl.system.service.coderule.dao.SysCodeRule; -import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.system.service.coderule.dto.CodeRuleQuery; import java.util.Map; import java.util.Set; @@ -21,6 +20,7 @@ public interface ISysCodeRuleService extends IService { /** * 分页查询 + * * @param form * @param pageable * @return @@ -29,6 +29,7 @@ public interface ISysCodeRuleService extends IService { /** * 创建编码 + * * @param form * @return */ @@ -36,18 +37,21 @@ public interface ISysCodeRuleService extends IService { /** * 添加 + * * @param codeRule */ void create(SysCodeRule codeRule); /** * 删除编码 + * * @param ids */ void deleteCodeRule(Set ids); /** * 修改编码 + * * @param codeRule */ void updateCodeRule(SysCodeRule codeRule); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/SysCodeRule.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/SysCodeRule.java index 8563b74..a924d65 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/SysCodeRule.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/SysCodeRule.java @@ -3,10 +3,11 @@ package org.nl.system.service.coderule.dao; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** *

* 编码规则表 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/SysCodeRuleDetail.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/SysCodeRuleDetail.java index b85d88a..5323b19 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/SysCodeRuleDetail.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/SysCodeRuleDetail.java @@ -1,14 +1,14 @@ package org.nl.system.service.coderule.dao; -import java.math.BigDecimal; - import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.math.BigDecimal; + /** *

* 编码规则明细表 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/mapper/SysCodeRuleDetailMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/mapper/SysCodeRuleDetailMapper.java index a76ceae..cf208db 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/mapper/SysCodeRuleDetailMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/mapper/SysCodeRuleDetailMapper.java @@ -1,7 +1,7 @@ package org.nl.system.service.coderule.dao.mapper; -import org.nl.system.service.coderule.dao.SysCodeRuleDetail; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.system.service.coderule.dao.SysCodeRuleDetail; /** *

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/mapper/SysCodeRuleMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/mapper/SysCodeRuleMapper.java index b4042f5..ca0be0b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/mapper/SysCodeRuleMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/dao/mapper/SysCodeRuleMapper.java @@ -1,7 +1,7 @@ package org.nl.system.service.coderule.dao.mapper; -import org.nl.system.service.coderule.dao.SysCodeRule; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.system.service.coderule.dao.SysCodeRule; /** *

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleDetailServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleDetailServiceImpl.java index 778f3f4..4cf4df1 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleDetailServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/coderule/impl/SysCodeRuleDetailServiceImpl.java @@ -31,6 +31,7 @@ import java.util.Date; public class SysCodeRuleDetailServiceImpl extends ServiceImpl implements ISysCodeRuleDetailService { @Autowired private SysCodeRuleDetailMapper codeRuleDetailMapper; + @Override public IPage queryAll(CodeRuleDetailQuery form, PageQuery page) { LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); @@ -47,7 +48,7 @@ public class SysCodeRuleDetailServiceImpl extends ServiceImpl queryAll(Map form, PageQuery pageable) { - String blurry = ObjectUtil.isNotEmpty(form.get("blurry"))?form.get("blurry").toString():null; + String blurry = ObjectUtil.isNotEmpty(form.get("blurry")) ? form.get("blurry").toString() : null; LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); lam.like(ObjectUtil.isNotEmpty(blurry), SysCodeRule::getCode, blurry) .or(ObjectUtil.isNotEmpty(blurry)) @@ -72,7 +72,7 @@ public class SysCodeRuleServiceImpl extends ServiceImpl= maxValue) { numCurr = Integer.parseInt(detail.getInit_value()); detail.setCurrent_value(String.valueOf(numCurr)); - }else{ + } else { detail.setCurrent_value(String.valueOf(numCurr + step)); } } @@ -148,7 +148,7 @@ public class SysCodeRuleServiceImpl extends ServiceImpl { /** * 条件查询 + * * @param query * @param pageQuery * @return @@ -31,6 +31,7 @@ public interface ISysDeptService extends IService { /** * 条件查询树结构 + * * @param query * @return */ @@ -38,6 +39,7 @@ public interface ISysDeptService extends IService { /** * 查询当前部门id的上级id + * * @param deptIds * @return */ @@ -45,6 +47,7 @@ public interface ISysDeptService extends IService { /** * 保存用户部门关系 + * * @param UserId * @param deptIds */ @@ -52,30 +55,35 @@ public interface ISysDeptService extends IService { /** * 删除用户部门关系数据 + * * @param user */ void delUserDeptRelation(String user); /** * 更新部门：同时更新节点 + * * @param dept */ void updateDept(SysDept dept); /** * 删除部门及子部门 + * * @param deptIds */ void delateDept(Set deptIds); /** * 创建部门 + * * @param dept */ void createDept(SysDept dept); /** * 获取部门数组 + * * @param userId * @return */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysDeptMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysDeptMapper.java index 33ce82b..6a30102 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysDeptMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysDeptMapper.java @@ -20,16 +20,19 @@ public interface SysDeptMapper extends BaseMapper { /** * 保存依赖关系 + * * @param UserId * @param deptId */ - void saveDeptRelation(@Param("user") String UserId,@Param("depts") Collection deptId); + void saveDeptRelation(@Param("user") String UserId, @Param("depts") Collection deptId); + void delDeptRelation(@Param("user") String UserId); List getDeptRelation(@Param("deptIds") Collection deptIds); /** * 跟新sub_count字段 + * * @param deptId * @return */ @@ -37,6 +40,7 @@ public interface SysDeptMapper extends BaseMapper { /** * 返回字符串列表 split = , + * * @param pid * @return */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysDeptMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysDeptMapper.xml index 8f4acca..8c40338 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysDeptMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dao/mapper/SysDeptMapper.xml @@ -4,50 +4,43 @@ replace into sys_user_dept values - - (#{user},#{dept}) + + (#{user},#{dept}) - delete from sys_user_dept where user_id = #{user} + delete + from sys_user_dept + where user_id = #{user} - update sys_dept set sub_count = - (select m.count from (select count(*) count from sys_dept where pid = #{pid}) as m) + update sys_dept + set sub_count = + (select m.count from (select count(*) count from sys_dept where pid = #{pid}) as m) where dept_id = #{pid} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dto/DeptTree.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dto/DeptTree.java index db34413..a22ab03 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dto/DeptTree.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/dto/DeptTree.java @@ -17,16 +17,14 @@ package org.nl.system.service.dept.dto; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; -import lombok.Getter; -import lombok.Setter; import java.io.Serializable; import java.util.List; /** -* @author Zheng Jie -* @date 2019-03-25 -*/ + * @author Zheng Jie + * @date 2019-03-25 + */ @Data public class DeptTree implements Serializable { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/impl/SysDeptServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/impl/SysDeptServiceImpl.java index dbe47eb..9f156a2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/impl/SysDeptServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dept/impl/SysDeptServiceImpl.java @@ -6,17 +6,17 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; import org.nl.common.domain.query.PageQuery; +import org.nl.common.domain.vo.DeptVo; import org.nl.common.exception.BadRequestException; +import org.nl.common.utils.CopyUtil; import org.nl.common.utils.SecurityUtils; import org.nl.common.utils.dto.CurrentUser; -import org.nl.common.domain.vo.DeptVo; -import org.nl.system.service.dept.dto.DeptTree; -import org.nl.common.utils.CopyUtil; import org.nl.config.IdUtil; import org.nl.system.service.dept.ISysDeptService; import org.nl.system.service.dept.dao.SysDept; import org.nl.system.service.dept.dao.mapper.SysDeptMapper; import org.nl.system.service.dept.dto.DeptQuery; +import org.nl.system.service.dept.dto.DeptTree; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -52,7 +52,7 @@ public class SysDeptServiceImpl extends ServiceImpl impl } private Map buildTree(List deptDtos) { - List trees= new ArrayList<>(); + List trees = new ArrayList<>(); Set depts = new LinkedHashSet<>(); List deptNames = deptDtos.stream().map(DeptTree::getName).collect(Collectors.toList()); boolean isChild; @@ -84,18 +84,18 @@ public class SysDeptServiceImpl extends ServiceImpl impl @Override public Page queryVo(DeptQuery query, PageQuery pageQuery) { - if (query.getPid_is_null() == null){ - if (query.getPid() == null){ + if (query.getPid_is_null() == null) { + if (query.getPid() == null) { query.setPid_is_null(true); } - if (StringUtils.isNotEmpty(query.getName()) || query.getIs_used()!=null){ + if (StringUtils.isNotEmpty(query.getName()) || query.getIs_used() != null) { query.setPid_is_null(null); } } Page page = this.page(pageQuery.build(SysDept.class), query.build()); page.setRecords(CopyUtil.copyList(page.getRecords(), DeptVo.class)); - if (StringUtils.isNotEmpty(query.getName()) || query.getIs_used()!=null){ - page.getRecords().forEach(a->((DeptVo)a).setHas_children(false) ); + if (StringUtils.isNotEmpty(query.getName()) || query.getIs_used() != null) { + page.getRecords().forEach(a -> ((DeptVo) a).setHas_children(false)); } return page; } @@ -103,10 +103,10 @@ public class SysDeptServiceImpl extends ServiceImpl impl @Override public void saveUserDeptRelation(String userId, Collection deptIds) { - if (StringUtils.isEmpty(userId) || CollectionUtils.isEmpty(deptIds)){ + if (StringUtils.isEmpty(userId) || CollectionUtils.isEmpty(deptIds)) { return; } - sysDeptMapper.saveDeptRelation(userId,deptIds); + sysDeptMapper.saveDeptRelation(userId, deptIds); } @Override @@ -117,13 +117,13 @@ public class SysDeptServiceImpl extends ServiceImpl impl @Override @Transactional(rollbackFor = Exception.class) public void updateDept(SysDept dept) { - if (dept == null ||StringUtils.isEmpty(dept.getDept_id())){ + if (dept == null || StringUtils.isEmpty(dept.getDept_id())) { return; } - this.updateById(dept); - //删除节点信息 + this.updateById(dept); + //删除节点信息 sysDeptMapper.updateSubCount(dept.getDept_id()); - if (StringUtils.isNotEmpty(dept.getPid())){ + if (StringUtils.isNotEmpty(dept.getPid())) { sysDeptMapper.updateSubCount(dept.getPid()); } } @@ -131,7 +131,7 @@ public class SysDeptServiceImpl extends ServiceImpl impl @Override @Transactional(rollbackFor = Exception.class) public void delateDept(Set deptIds) { - if (CollectionUtils.isEmpty(deptIds)){ + if (CollectionUtils.isEmpty(deptIds)) { return; } verification(deptIds); @@ -141,22 +141,24 @@ public class SysDeptServiceImpl extends ServiceImpl impl for (String deptId : deptIds) { depts.add(deptId); String allChild = sysDeptMapper.findAllChild(deptId); - if (StringUtils.isNotEmpty(allChild)){ + if (StringUtils.isNotEmpty(allChild)) { String[] split = allChild.split(","); depts.addAll(Arrays.asList(split)); } } this.remove(new QueryWrapper().in("dept_id", depts)); deptList.forEach(dept -> { - if (StringUtils.isNotEmpty(dept.getPid())){sysDeptMapper.updateSubCount(dept.getPid());} + if (StringUtils.isNotEmpty(dept.getPid())) { + sysDeptMapper.updateSubCount(dept.getPid()); + } }); } private void verification(Set depeIds) { - if (!CollectionUtils.isEmpty(depeIds)){ + if (!CollectionUtils.isEmpty(depeIds)) { List deptRelation = sysDeptMapper.getDeptRelation(depeIds); - if (!CollectionUtils.isEmpty(deptRelation)){ + if (!CollectionUtils.isEmpty(deptRelation)) { throw new BadRequestException("部门存在绑定的人员，请先解绑人员对应部门"); } } @@ -172,7 +174,7 @@ public class SysDeptServiceImpl extends ServiceImpl impl dept.setCreate_time(new Date()); this.save(dept); // 清理缓存 - if (StringUtils.isNotEmpty(dept.getPid())){ + if (StringUtils.isNotEmpty(dept.getPid())) { sysDeptMapper.updateSubCount(dept.getPid()); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/ISysDictService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/ISysDictService.java index f56a0ba..8c168dc 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/ISysDictService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/ISysDictService.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; import org.nl.system.service.dict.dao.Dict; import org.nl.system.service.dict.dto.DictQuery; -import org.springframework.data.domain.Pageable; import java.util.List; import java.util.Map; @@ -23,6 +22,7 @@ public interface ISysDictService extends IService { /** * 分页查找 + * * @param whereJson * @param pageable * @return @@ -31,24 +31,28 @@ public interface ISysDictService extends IService { /** * 新增 + * * @param dict */ void create(Dict dict); /** * 修改字典数据 + * * @param dto */ void updateDict(Dict dto); /** * 通过id批量删除字典 + * * @param ids */ void deleteBatchByIds(Set ids); /** * 分页查询获取字典明细 + * * @param criteria * @param pageable * @return @@ -57,6 +61,7 @@ public interface ISysDictService extends IService { /** * 获取字典明细 + * * @param name * @return */ @@ -64,24 +69,28 @@ public interface ISysDictService extends IService { /** * 添加字典明细 + * * @param resources */ void createDetail(Dict resources); /** * 更新字典明细 + * * @param resources */ void updateDetail(Dict resources); /** * 删除字典 + * * @param id */ void deleteDetail(String id); /** * 查询所有字典信息 + * * @return */ List queryAll(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/Dict.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/Dict.java index 2010f30..fe1b1e7 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/Dict.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/Dict.java @@ -1,13 +1,13 @@ package org.nl.system.service.dict.dao; -import java.math.BigDecimal; - import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.math.BigDecimal; + /** *

* 字典表 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/mapper/SysDictMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/mapper/SysDictMapper.java index d83ff61..5bffec6 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/mapper/SysDictMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/dao/mapper/SysDictMapper.java @@ -1,7 +1,7 @@ package org.nl.system.service.dict.dao.mapper; -import org.nl.system.service.dict.dao.Dict; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.system.service.dict.dao.Dict; /** *

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/ICodeGenConfigService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/ICodeGenConfigService.java index 1ae10b9..7710bf3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/ICodeGenConfigService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/ICodeGenConfigService.java @@ -1,7 +1,7 @@ package org.nl.system.service.generator; -import org.nl.system.service.generator.dao.CodeGenConfig; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.system.service.generator.dao.CodeGenConfig; /** *

@@ -15,6 +15,7 @@ public interface ICodeGenConfigService extends IService { /** * 根据表名查找 + * * @param tableName * @return */ @@ -22,6 +23,7 @@ public interface ICodeGenConfigService extends IService { /** * 根据表名更新 + * * @param tableName * @param genConfig * @return diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/ICodeGeneratorService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/ICodeGeneratorService.java index f380433..7ada3d8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/ICodeGeneratorService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/ICodeGeneratorService.java @@ -1,12 +1,11 @@ package org.nl.system.service.generator; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; import org.nl.system.service.generator.dao.CodeColumnConfig; -import com.baomidou.mybatisplus.extension.service.IService; import org.nl.system.service.generator.dao.CodeGenConfig; import org.nl.system.service.generator.dto.TablesInfo; -import org.springframework.data.domain.Pageable; import org.springframework.http.ResponseEntity; import org.springframework.scheduling.annotation.Async; @@ -26,6 +25,7 @@ public interface ICodeGeneratorService extends IService { /** * 获得所有的表格信息 + * * @param name * @param pageQuery * @return @@ -34,6 +34,7 @@ public interface ICodeGeneratorService extends IService { /** * 得到数据表的元数据 + * * @param tableName 表名 * @return / */ @@ -41,6 +42,7 @@ public interface ICodeGeneratorService extends IService { /** * 根据表名查询表字段 + * * @param tableName * @return */ @@ -48,7 +50,8 @@ public interface ICodeGeneratorService extends IService { /** * 同步表数据 - * @param columnInfos / + * + * @param columnInfos / * @param columnInfoList / */ @Async @@ -56,6 +59,7 @@ public interface ICodeGeneratorService extends IService { /** * 预览代码 + * * @param byTableName * @param columns * @return @@ -64,16 +68,18 @@ public interface ICodeGeneratorService extends IService { /** * 打包下载 - * @param genConfig 配置信息 + * + * @param genConfig 配置信息 * @param columnsPage 字段信息分页数据 - * @param request / - * @param response / + * @param request / + * @param response / */ void download(CodeGenConfig genConfig, IPage columnsPage, HttpServletRequest request, HttpServletResponse response); /** * 代码生成 - * @param genConfig 配置信息 + * + * @param genConfig 配置信息 * @param columnsPage 字段信息分页数据 */ void generator(CodeGenConfig genConfig, IPage columnsPage); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeColumnConfig.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeColumnConfig.java index e61d4e2..845e6d3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeColumnConfig.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeColumnConfig.java @@ -5,15 +5,12 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Builder; import lombok.Data; -import lombok.EqualsAndHashCode; import org.nl.common.utils.GenUtil; import org.nl.system.service.generator.dto.ColumnInfo; +import java.io.Serializable; + /** *

* 列的数据信息表 @@ -34,65 +31,66 @@ public class CodeColumnConfig implements Serializable { @TableId(value = "column_id", type = IdType.ASSIGN_ID) private String column_id; - @ApiModelProperty(value = "表名") + private String table_name; - @ApiModelProperty(value = "数据库字段名称") + private String column_name; - @ApiModelProperty(value = "数据库字段类型") + private String column_type; - @ApiModelProperty(value = "数据库字段键类型") + private String key_type; - @ApiModelProperty(value = "字段额外的参数") + private String extra; - @ApiModelProperty(value = "数据库字段描述") + private String remark; - @ApiModelProperty(value = "是否必填") + private Boolean not_null; - @ApiModelProperty(value = "是否在列表显示") + private Boolean list_show; - @ApiModelProperty(value = "是否表单显示") + private Boolean form_show; - @ApiModelProperty(value = "表单类型") + private String form_type; - @ApiModelProperty(value = "查询 1:模糊 2：精确") + private String query_type; - @ApiModelProperty(value = "字典名称") + private String dict_name; - @ApiModelProperty(value = "日期注解") + private String date_annotation; /** * 创建默认的实体 + * * @param tableName * @param config * @return */ public static CodeColumnConfig createDefault(String tableName, ColumnInfo config) { CodeColumnConfig columnConfig = new CodeColumnConfig(); - columnConfig.setColumn_id(IdUtil.getSnowflake(1,1).nextIdStr()); + columnConfig.setColumn_id(IdUtil.getSnowflake(1, 1).nextIdStr()); columnConfig.setTable_name(tableName); columnConfig.setColumn_name(config.getColumn_name()); columnConfig.setColumn_type(config.getColumn_type()); columnConfig.setKey_type(config.getKey_type()); columnConfig.setExtra(config.getExtra()); columnConfig.setNot_null((ObjectUtil.isNotEmpty(config.getKey_type()) - &&ObjectUtil.isNotEmpty(config.getExtra()) + && ObjectUtil.isNotEmpty(config.getExtra()) && GenUtil.PK.equalsIgnoreCase(config.getKey_type()) - &&GenUtil.EXTRA.equalsIgnoreCase(config.getExtra())) - ?false:ObjectUtil.isNotEmpty(config.getNot_null())?config.getNot_null():false); - columnConfig.setRemark(ObjectUtil.isNotEmpty(config.getRemark())?config.getRemark():null); + && GenUtil.EXTRA.equalsIgnoreCase(config.getExtra())) + ? false : ObjectUtil.isNotEmpty(config.getNot_null()) ? config.getNot_null() : false); + columnConfig.setRemark(ObjectUtil.isNotEmpty(config.getRemark()) ? config.getRemark() : null); columnConfig.setList_show(true); columnConfig.setForm_show(true); return columnConfig; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeGenConfig.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeGenConfig.java index 3d438c1..69ea26e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeGenConfig.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/CodeGenConfig.java @@ -2,11 +2,12 @@ package org.nl.system.service.generator.dao; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import java.io.Serializable; + /** *

* 代码生成配置表 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeColumnConfigMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeColumnConfigMapper.java index e902654..2008a91 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeColumnConfigMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeColumnConfigMapper.java @@ -1,7 +1,7 @@ package org.nl.system.service.generator.dao.mapper; -import org.nl.system.service.generator.dao.CodeColumnConfig; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.system.service.generator.dao.CodeColumnConfig; import org.nl.system.service.generator.dto.ColumnInfo; import org.nl.system.service.generator.dto.TablesInfo; @@ -19,6 +19,7 @@ public interface CodeColumnConfigMapper extends BaseMapper { /** * 分页查找 + * * @param name 表名 * @return 表信息 */ @@ -26,6 +27,7 @@ public interface CodeColumnConfigMapper extends BaseMapper { /** * 分页查询的总数 + * * @param name 表名 * @return 表信息 */ @@ -33,6 +35,7 @@ public interface CodeColumnConfigMapper extends BaseMapper { /** * 获取 + * * @param tableName 表名 * @return 列数据 */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeColumnConfigMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeColumnConfigMapper.xml index e35f1b8..ef3e459 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeColumnConfigMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeColumnConfigMapper.xml @@ -4,18 +4,18 @@ @@ -29,18 +29,18 @@ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeGenConfigMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeGenConfigMapper.java index 1fb385f..10b0b40 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeGenConfigMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dao/mapper/CodeGenConfigMapper.java @@ -1,7 +1,7 @@ package org.nl.system.service.generator.dao.mapper; -import org.nl.system.service.generator.dao.CodeGenConfig; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.system.service.generator.dao.CodeGenConfig; /** *

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dto/ColumnInfo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dto/ColumnInfo.java index 79e389f..093ee5b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dto/ColumnInfo.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/dto/ColumnInfo.java @@ -1,6 +1,5 @@ package org.nl.system.service.generator.dto; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -10,39 +9,39 @@ import lombok.Data; */ @Data public class ColumnInfo { - @ApiModelProperty(value = "数据库字段名称") + private String column_name; - @ApiModelProperty(value = "数据库字段类型") + private String column_type; - @ApiModelProperty(value = "数据库字段键类型") + private String key_type; - @ApiModelProperty(value = "字段额外的参数") + private String extra; - @ApiModelProperty(value = "数据库字段描述") + private String remark; - @ApiModelProperty(value = "是否必填") + private Boolean not_null; - @ApiModelProperty(value = "是否在列表显示") + private Boolean list_show; - @ApiModelProperty(value = "是否表单显示") + private Boolean form_show; - @ApiModelProperty(value = "表单类型") + private String form_type; - @ApiModelProperty(value = "查询 1:模糊 2：精确") + private String query_type; - @ApiModelProperty(value = "字典名称") + private String dict_name; - @ApiModelProperty(value = "日期注解") + private String date_annotation; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/impl/CodeGenConfigServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/impl/CodeGenConfigServiceImpl.java index 7d0f5af..42e89a2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/impl/CodeGenConfigServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/generator/impl/CodeGenConfigServiceImpl.java @@ -40,7 +40,7 @@ public class CodeGenConfigServiceImpl extends ServiceImpl { /** * 分页查询日志 + * * @param criteria * @param pageable * @return @@ -29,6 +30,7 @@ public interface ISysLogService extends IService { /** * 查询异常详情 + * * @param id 日志ID * @return Object */ @@ -46,11 +48,12 @@ public interface ISysLogService extends IService { /** * 保存日志数据 - * @param username 用户 - * @param browser 浏览器 - * @param ip 请求IP + * + * @param username 用户 + * @param browser 浏览器 + * @param ip 请求IP * @param joinPoint / - * @param log 日志实体 + * @param log 日志实体 */ @Async void save(String username, String browser, String ip, ProceedingJoinPoint joinPoint, SysLog log); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logging/dao/SysLog.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logging/dao/SysLog.java index 369f8dc..578d5f7 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logging/dao/SysLog.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logging/dao/SysLog.java @@ -48,7 +48,9 @@ public class SysLog implements Serializable { private String browser; - /** 异常详细 */ + /** + * 异常详细 + */ private byte[] exception_detail; private String create_time; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logging/dao/mapper/SysLogMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logging/dao/mapper/SysLogMapper.java index 3205364..5325791 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logging/dao/mapper/SysLogMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logging/dao/mapper/SysLogMapper.java @@ -1,7 +1,7 @@ package org.nl.system.service.logging.dao.mapper; -import org.nl.system.service.logging.dao.SysLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.system.service.logging.dao.SysLog; /** *

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logging/impl/SysLogServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logging/impl/SysLogServiceImpl.java index eac87a4..1100061 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logging/impl/SysLogServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logging/impl/SysLogServiceImpl.java @@ -49,11 +49,11 @@ public class SysLogServiceImpl extends ServiceImpl impleme @Override public IPage queryAll(Map whereJson, PageQuery pageable) { - String blurry = ObjectUtil.isNotEmpty(whereJson.get("blurry"))?whereJson.get("blurry").toString():null; - String log_type = ObjectUtil.isNotEmpty(whereJson.get("log_type"))?whereJson.get("log_type").toString():null; - String username = ObjectUtil.isNotEmpty(whereJson.get("username"))?whereJson.get("username").toString():null; - String begin_time = ObjectUtil.isNotEmpty(whereJson.get("begin_time"))?whereJson.get("begin_time").toString():null; - String end_time = ObjectUtil.isNotEmpty(whereJson.get("end_time"))?whereJson.get("end_time").toString():null; + String blurry = ObjectUtil.isNotEmpty(whereJson.get("blurry")) ? whereJson.get("blurry").toString() : null; + String log_type = ObjectUtil.isNotEmpty(whereJson.get("log_type")) ? whereJson.get("log_type").toString() : null; + String username = ObjectUtil.isNotEmpty(whereJson.get("username")) ? whereJson.get("username").toString() : null; + String begin_time = ObjectUtil.isNotEmpty(whereJson.get("begin_time")) ? whereJson.get("begin_time").toString() : null; + String end_time = ObjectUtil.isNotEmpty(whereJson.get("end_time")) ? whereJson.get("end_time").toString() : null; LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); lam.eq(ObjectUtil.isNotEmpty(log_type), SysLog::getLog_type, log_type) .eq(ObjectUtil.isNotEmpty(username), SysLog::getUsername, username) @@ -61,7 +61,7 @@ public class SysLogServiceImpl extends ServiceImpl impleme .le(ObjectUtil.isNotEmpty(end_time), SysLog::getCreate_time, end_time) .ge(ObjectUtil.isNotEmpty(begin_time), SysLog::getCreate_time, begin_time) .orderByDesc(SysLog::getCreate_time); - IPage page = new Page<>(pageable.getPage()+1, pageable.getSize()); + IPage page = new Page<>(pageable.getPage() + 1, pageable.getSize()); logMapper.selectPage(page, lam); return page; } @@ -108,10 +108,11 @@ public class SysLogServiceImpl extends ServiceImpl impleme logDto.setUsername(username); logDto.setParams(getParameter(method, joinPoint.getArgs())); logDto.setBrowser(browser); - logDto.setLog_id(IdUtil.getSnowflake(1,1).nextIdStr()); + logDto.setLog_id(IdUtil.getSnowflake(1, 1).nextIdStr()); logDto.setCreate_time(DateUtil.now()); logMapper.insert(logDto); } + /** * 根据方法和传入的参数获取请求参数 */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/IStageImageService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/IStageImageService.java index 037907a..fdae277 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/IStageImageService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/IStageImageService.java @@ -1,11 +1,9 @@ package org.nl.system.service.logicflow; -import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; import org.nl.system.service.logicflow.dao.StageImage; -import com.baomidou.mybatisplus.extension.service.IService; -import org.springframework.data.domain.Pageable; import java.util.List; import java.util.Map; @@ -23,6 +21,7 @@ public interface IStageImageService extends IService { /** * 分页 + * * @param whereJson * @param page * @return @@ -31,18 +30,21 @@ public interface IStageImageService extends IService { /** * 创建 + * * @param entity */ void create(StageImage entity); /** * 更新 + * * @param entity */ void update(StageImage entity); /** * 删除 + * * @param ids */ void deleteAll(Set ids); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/IStageService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/IStageService.java index 3e54179..70d10b1 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/IStageService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/IStageService.java @@ -1,11 +1,9 @@ package org.nl.system.service.logicflow; -import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; import org.nl.system.service.logicflow.dao.Stage; -import com.baomidou.mybatisplus.extension.service.IService; -import org.springframework.data.domain.Pageable; import java.util.List; import java.util.Map; @@ -23,6 +21,7 @@ public interface IStageService extends IService { /** * 分页查询 + * * @param whereJson * @param page * @return @@ -31,18 +30,21 @@ public interface IStageService extends IService { /** * 新增 + * * @param dto */ void create(Stage dto); /** * 修改 + * * @param dto */ void update(Stage dto); /** * 删除 + * * @param ids */ void deleteAll(Set ids); @@ -56,6 +58,7 @@ public interface IStageService extends IService { /** * 添加舞台数据 + * * @param dto */ void addNewStage(Stage dto); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/Stage.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/Stage.java index 33f9a3e..e6b2067 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/Stage.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/Stage.java @@ -2,10 +2,11 @@ package org.nl.system.service.logicflow.dao; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** *

* 舞台主表 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/StageImage.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/StageImage.java index a96dd0d..8651bf0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/StageImage.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/StageImage.java @@ -2,10 +2,11 @@ package org.nl.system.service.logicflow.dao; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** *

* 设备舞台图标表 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/mapper/StageImageMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/mapper/StageImageMapper.java index 9d6eeb8..9193ea9 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/mapper/StageImageMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/mapper/StageImageMapper.java @@ -1,7 +1,7 @@ package org.nl.system.service.logicflow.dao.mapper; -import org.nl.system.service.logicflow.dao.StageImage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.system.service.logicflow.dao.StageImage; /** *

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/mapper/StageMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/mapper/StageMapper.java index abf68d1..b398c4a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/mapper/StageMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/logicflow/dao/mapper/StageMapper.java @@ -1,7 +1,7 @@ package org.nl.system.service.logicflow.dao.mapper; -import org.nl.system.service.logicflow.dao.Stage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.system.service.logicflow.dao.Stage; /** *

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/LuceneExecuteLogService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/LuceneExecuteLogService.java index 8018e89..f00d2dc 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/LuceneExecuteLogService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/LuceneExecuteLogService.java @@ -17,12 +17,13 @@ public interface LuceneExecuteLogService { /** * 设备执行日志,会保留历史记录 * - * @param luceneLogDto 日志结果对象 + * @param luceneLogDto 日志结果对象 */ void deviceExecuteLog(LuceneLogDto luceneLogDto); /** * 接口日志,会保留历史记录 + * * @param luceneLogDto * @throws IOException 日志结果对象 */ @@ -31,8 +32,8 @@ public interface LuceneExecuteLogService { /** * 设备执行日志,会保留历史记录 * - * @param name 日志名称 - * @param message 日志信息 + * @param name 日志名称 + * @param message 日志信息 */ void extLog(String name, String message); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/dto/LuceneLogDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/dto/LuceneLogDto.java index 7cda043..ae5bc50 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/dto/LuceneLogDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/dto/LuceneLogDto.java @@ -69,11 +69,10 @@ public class LuceneLogDto { private String update_time; - - public LuceneLogDto (final String opc_server_code,final String opc_plc_code, - final String device_code,final String to_home,final int last_home, - final int home) { - super (); + public LuceneLogDto(final String opc_server_code, final String opc_plc_code, + final String device_code, final String to_home, final int last_home, + final int home) { + super(); this.device_code = device_code; this.content = "信号" + opc_server_code + "." diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneExecuteLogServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneExecuteLogServiceImpl.java index 0d2e801..e6aa63e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneExecuteLogServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneExecuteLogServiceImpl.java @@ -34,7 +34,7 @@ public class LuceneExecuteLogServiceImpl implements LuceneExecuteLogService { //日志目录 @Value("${logging.file.path}") - private String logPath; + private String logPath; @Override public void deviceItemValue(String device_code, String key, String value) { @@ -87,9 +87,9 @@ public class LuceneExecuteLogServiceImpl implements LuceneExecuteLogService { long endTime = System.currentTimeMillis(); indexWriter.commit(); //实现日志文件按业务独立生成日志文件到指定路径 - DynamicLogger loggerBuilder =new DynamicLogger(logPath+"\\"+luceneLogDto.getLogType()+"\\"); + DynamicLogger loggerBuilder = new DynamicLogger(logPath + "\\" + luceneLogDto.getLogType() + "\\"); Logger logger = loggerBuilder.getLogger(luceneLogDto.getDevice_code()); - logger.info("{}",luceneLogDto.toString()); + logger.info("{}", luceneLogDto.toString()); } catch (Exception e) { log.error(e.getMessage(), e); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneServiceImpl.java index 8bafbdf..c995ad4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/lucene/impl/LuceneServiceImpl.java @@ -1,7 +1,5 @@ package org.nl.system.service.lucene.impl; -import cn.hutool.core.util.CharsetUtil; -import cn.hutool.http.HttpUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import lombok.RequiredArgsConstructor; @@ -9,7 +7,6 @@ import lombok.extern.slf4j.Slf4j; import org.nl.config.lucene.Searcher; import org.nl.system.service.lucene.LuceneService; import org.springframework.beans.factory.annotation.Value; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import java.util.Map; @@ -22,7 +19,7 @@ public class LuceneServiceImpl implements LuceneService { //日志索引目录 @Value("${lucene.index.path}") - private String luceneUrl; + private String luceneUrl; @Override public Map getAll(JSONObject whereJson) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/ISysMenuService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/ISysMenuService.java index f169a41..c51b0f9 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/ISysMenuService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/ISysMenuService.java @@ -30,8 +30,9 @@ public interface ISysMenuService extends IService { /** * 条件查询 + * * @param query / - * @param page / + * @param page / * @return / */ List query(MenuQuery query, PageQuery page); @@ -40,7 +41,7 @@ public interface ISysMenuService extends IService { * 根据ID获取同级与上级数据 * * @param menuDto 菜单对象 - * @param menus / + * @param menus / * @return / */ List getSuperior(MenuDto menuDto, List menus); @@ -72,7 +73,7 @@ public interface ISysMenuService extends IService { * 获取所有子节点，包含自身ID * * @param menuList / - * @param menuSet / + * @param menuSet / * @return / */ Set getChildMenus(List menuList, Set menuSet); @@ -100,6 +101,7 @@ public interface ISysMenuService extends IService { /** * 获取菜单数据 + * * @param userId 用户列表 * @return / */ @@ -115,14 +117,16 @@ public interface ISysMenuService extends IService { /** * 构建菜单 + * * @param menuDtos 菜单 - * @param pid 父id + * @param pid 父id * @return / */ - List buildMenus(List menuDtos,String pid); + List buildMenus(List menuDtos, String pid); /** * 构建菜单 + * * @param systemType 菜单类型 * @return / */ @@ -146,6 +150,7 @@ public interface ISysMenuService extends IService { /** * 实体转换 + * * @param sysMenu 菜单 * @return / */ @@ -153,9 +158,10 @@ public interface ISysMenuService extends IService { /** * 获取菜单 - * @param roleId 角色标识 + * + * @param roleId 角色标识 * @param systemType 系统类型 - * @param category 目录 + * @param category 目录 * @return / */ List getMenusByRole(String roleId, String systemType, String category); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.java index 7964cb9..07d88fd 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.java @@ -34,11 +34,12 @@ public interface SysMenuMapper extends BaseMapper { /** * 获取系统菜单 + * * @param userId * @param systemType * @return */ - List findSystemMenu(@Param("user") String userId,@Param("systemType") String systemType); + List findSystemMenu(@Param("user") String userId, @Param("systemType") String systemType); /** * 根据用户标识获取权限列表 @@ -56,7 +57,7 @@ public interface SysMenuMapper extends BaseMapper { @Delete(value = "delete from sys_roles_menus where menu_id = #{menuId}") void untiedMenu(String menuId); - List getMenusByRole(@Param("systemType") String systemType, @Param("category")String category); + List getMenusByRole(@Param("systemType") String systemType, @Param("category") String category); String findAllChild(String pid); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.xml index 7787999..0481d22 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.xml @@ -52,50 +52,42 @@ AND permission != '' diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dto/MenuQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dto/MenuQuery.java index 01fcf9c..2ac8089 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dto/MenuQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dto/MenuQuery.java @@ -15,6 +15,7 @@ import org.nl.system.service.menu.dao.SysMenu; public class MenuQuery extends BaseQuery { private String pid = ""; private String system_type; + @Override public void paramMapping() { this.doP.put("pid", QParam.builder().k(new String[]{"pid"}).type(QueryTEnum.OREQ).build()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java index d0a7d1a..00c0c92 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java @@ -12,19 +12,19 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.nl.common.domain.constant.DictConstantPool; import org.nl.common.domain.query.PageQuery; -import org.nl.common.exception.BadRequestException; -import org.nl.common.utils.SecurityUtils; import org.nl.common.domain.vo.MenuMetaVo; import org.nl.common.domain.vo.MenuVo; +import org.nl.common.exception.BadRequestException; import org.nl.common.utils.CopyUtil; +import org.nl.common.utils.SecurityUtils; import org.nl.config.IdUtil; import org.nl.system.service.dict.dao.Dict; import org.nl.system.service.dict.dao.mapper.SysDictMapper; import org.nl.system.service.lucene.LuceneExecuteLogService; -import org.nl.system.service.menu.dto.MenuDto; import org.nl.system.service.menu.ISysMenuService; import org.nl.system.service.menu.dao.SysMenu; import org.nl.system.service.menu.dao.mapper.SysMenuMapper; +import org.nl.system.service.menu.dto.MenuDto; import org.nl.system.service.menu.dto.MenuQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -65,7 +65,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl @Override public List query(MenuQuery query, PageQuery page) { - if (StringUtils.isNotEmpty(query.getBlurry())){ + if (StringUtils.isNotEmpty(query.getBlurry())) { query.setPid(null); } Page menuPage = this.page(page.build(), query.build()); @@ -137,7 +137,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl private void addSystemTypeDict(SysMenu resources) { Dict dict = sysDictMapper.selectOne(new QueryWrapper().eq("code", DictConstantPool.DICT_SYS_CODE).orderByDesc("value").last("limit 1")); - Integer currentType = dict!=null?Integer.valueOf(dict.getValue())+1:1; + Integer currentType = dict != null ? Integer.valueOf(dict.getValue()) + 1 : 1; Dict currentSysType = new Dict(); currentSysType.setDict_id(IdUtil.getStringId()); currentSysType.setCode(DictConstantPool.DICT_SYS_CODE); @@ -148,15 +148,17 @@ public class SysMenuServiceImpl extends ServiceImpl impl sysDictMapper.insert(currentSysType); resources.setSystem_type(String.valueOf(currentType)); } + private void updateRootSystemType(SysMenu sysMenu) { String rootMenuId = this.findRootMenuId(sysMenu.getMenu_id()); - if (sysMenu.getMenu_id().equals(rootMenuId)){ + if (sysMenu.getMenu_id().equals(rootMenuId)) { return; } SysMenu rootMenu = this.findById(rootMenuId); sysMenu.setSystem_type(rootMenu.getSystem_type()); this.updateById(sysMenu); } + private String findRootMenuId(String menuId) { SysMenu sysMenu = this.findById(menuId); if (StrUtil.isEmpty(sysMenu.getPid())) { @@ -175,12 +177,12 @@ public class SysMenuServiceImpl extends ServiceImpl impl baseMapper.untiedMenu(menu.getMenu_id()); baseMapper.deleteById(menu.getMenu_id()); String pid = menu.getPid(); - if (StringUtils.isEmpty(pid)){ + if (StringUtils.isEmpty(pid)) { pids.add(pid); } updateSubCnt(pid); } - if (!CollectionUtils.isEmpty(pids)){ + if (!CollectionUtils.isEmpty(pids)) { sysDictMapper.delete(new QueryWrapper().in("para1", pids).eq("code", DictConstantPool.DICT_SYS_CODE)); } } @@ -192,8 +194,8 @@ public class SysMenuServiceImpl extends ServiceImpl impl SysMenu menu = baseMapper.selectById(menuId); // 获取当前菜单的所有子菜单 String allChild = baseMapper.findAllChild(menuId); - List allChildIds = ObjectUtil.isNotEmpty(allChild)?Arrays.asList(allChild.split(",")):null; - if (ObjectUtil.isNotEmpty(allChildIds) && allChildIds.contains(resources.getPid())){ + List allChildIds = ObjectUtil.isNotEmpty(allChild) ? Arrays.asList(allChild.split(",")) : null; + if (ObjectUtil.isNotEmpty(allChildIds) && allChildIds.contains(resources.getPid())) { throw new BadRequestException("上级不能为自己或自己的下级"); } if (resources.getIframe()) { @@ -205,17 +207,17 @@ public class SysMenuServiceImpl extends ServiceImpl impl if ("0".equals(resources.getPid())) { resources.setPid(null); - if (StringUtils.isNotEmpty(menu.getPid())){ + if (StringUtils.isNotEmpty(menu.getPid())) { addSystemTypeDict(resources); } - }else { + } else { resources.setSystem_type(this.findById(resources.getPid()).getSystem_type()); } String oldPid = menu.getPid(); String newPid = resources.getPid(); // 记录的父节点ID - if (oldPid == null && newPid != null){ - sysDictMapper.delete(new QueryWrapper().eq("para1",menu.getMenu_id())); + if (oldPid == null && newPid != null) { + sysDictMapper.delete(new QueryWrapper().eq("para1", menu.getMenu_id())); } menu.setTitle(resources.getTitle()); menu.setComponent(resources.getComponent()); @@ -234,8 +236,8 @@ public class SysMenuServiceImpl extends ServiceImpl impl updateSubCnt(oldPid); updateSubCnt(newPid); //更新SystemType - if (!resources.getSystem_type().equals(menu.getSystem_type())){ - this.update(new UpdateWrapper().set(DictConstantPool.DICT_SYS_CODE,resources.getSystem_type()).in("menu_id",allChildIds)); + if (!resources.getSystem_type().equals(menu.getSystem_type())) { + this.update(new UpdateWrapper().set(DictConstantPool.DICT_SYS_CODE, resources.getSystem_type()).in("menu_id", allChildIds)); } } @@ -354,7 +356,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl public MenuDto doToDto(SysMenu entity) { MenuDto menuDto = new MenuDto(); - if (ObjectUtil.isEmpty(entity)){ + if (ObjectUtil.isEmpty(entity)) { return menuDto; } menuDto.setMenu_id(entity.getMenu_id()); @@ -389,15 +391,15 @@ public class SysMenuServiceImpl extends ServiceImpl impl @Override public List buildMenus(String systemType) { Dict dict = sysDictMapper.selectOne(new QueryWrapper().eq("code", DictConstantPool.DICT_SYS_CODE).eq("value", systemType)); - if (dict == null || StringUtils.isEmpty(dict.getPara1())){ + if (dict == null || StringUtils.isEmpty(dict.getPara1())) { throw new BadRequestException("获取对应的系统菜单不存在"); } String pid = dict.getPara1(); - List menuDtoList = baseMapper.findSystemMenu(SecurityUtils.getCurrentUserId(),systemType); + List menuDtoList = baseMapper.findSystemMenu(SecurityUtils.getCurrentUserId(), systemType); //移除系统级菜单 - menuDtoList.removeIf(a->a.getMenu_id().equals(pid)); + menuDtoList.removeIf(a -> a.getMenu_id().equals(pid)); List menuDtos = this.buildTree(CopyUtil.copyList(menuDtoList, MenuDto.class)); - return this.buildMenus(menuDtos,pid); + return this.buildMenus(menuDtos, pid); } @Override @@ -410,7 +412,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl MenuVo menuVo = new MenuVo(); menuVo.setName(ObjectUtil.isNotEmpty(menuDTO.getComponent_name()) ? menuDTO.getComponent_name() : menuDTO.getTitle()); // 一级目录需要加斜杠，不然会报警告 - menuVo.setPath(pid.equals(menuDTO.getPid())? "/" + menuDTO.getPath() : menuDTO.getPath()); + menuVo.setPath(pid.equals(menuDTO.getPid()) ? "/" + menuDTO.getPath() : menuDTO.getPath()); menuVo.setHidden(menuDTO.getHidden()); // 如果不是外链 if (!menuDTO.getIframe()) { @@ -427,7 +429,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl if (menuDtoList != null && menuDtoList.size() != 0) { menuVo.setAlwaysShow(true); menuVo.setRedirect("noredirect"); - menuVo.setChildren(buildMenus(menuDtoList,pid)); + menuVo.setChildren(buildMenus(menuDtoList, pid)); // 处理是一级菜单并且没有子菜单的情况 } else if (StrUtil.isEmpty(menuDTO.getPid())) { MenuVo menuVo1 = new MenuVo(); @@ -456,7 +458,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl @Override public List getMenusByRole(String roleId, String systemType, String category) { - baseMapper.getMenusByRole(systemType,category); + baseMapper.getMenusByRole(systemType, category); return null; } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/monitor/MonitorService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/monitor/MonitorService.java index d0573f9..baaee66 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/monitor/MonitorService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/monitor/MonitorService.java @@ -24,8 +24,9 @@ import java.util.Map; public interface MonitorService { /** - * 查询数据分页 - * @return Map - */ - Map getServers(); + * 查询数据分页 + * + * @return Map + */ + Map getServers(); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/monitor/impl/MonitorServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/monitor/impl/MonitorServiceImpl.java index b721ec8..9c49a29 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/monitor/impl/MonitorServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/monitor/impl/MonitorServiceImpl.java @@ -50,7 +50,7 @@ public class MonitorServiceImpl implements MonitorService { private final DecimalFormat df = new DecimalFormat("0.00"); @Override - public Map getServers(){ + public Map getServers() { Map resultMap = new LinkedHashMap<>(8); try { SystemInfo si = new SystemInfo(); @@ -75,17 +75,18 @@ public class MonitorServiceImpl implements MonitorService { /** * 获取磁盘信息 + * * @return / */ - private Map getDiskInfo(OperatingSystem os) { - Map diskInfo = new LinkedHashMap<>(); + private Map getDiskInfo(OperatingSystem os) { + Map diskInfo = new LinkedHashMap<>(); FileSystem fileSystem = os.getFileSystem(); List fsArray = fileSystem.getFileStores(); String osName = System.getProperty("os.name"); long available = 0, total = 0; - for (OSFileStore fs : fsArray){ + for (OSFileStore fs : fsArray) { // windows 需要将所有磁盘分区累加，linux 和 mac 直接累加会出现磁盘重复的问题，待修复 - if(osName.toLowerCase().startsWith(ElAdminConstant.WIN)) { + if (osName.toLowerCase().startsWith(ElAdminConstant.WIN)) { available += fs.getUsableSpace(); total += fs.getTotalSpace(); } else { @@ -98,52 +99,55 @@ public class MonitorServiceImpl implements MonitorService { diskInfo.put("total", total > 0 ? FileUtil.getSize(total) : "?"); diskInfo.put("available", FileUtil.getSize(available)); diskInfo.put("used", FileUtil.getSize(used)); - diskInfo.put("usageRate", df.format(used/(double)total * 100)); + diskInfo.put("usageRate", df.format(used / (double) total * 100)); return diskInfo; } /** * 获取交换区信息 + * * @param memory / * @return / */ - private Map getSwapInfo(GlobalMemory memory) { - Map swapInfo = new LinkedHashMap<>(); + private Map getSwapInfo(GlobalMemory memory) { + Map swapInfo = new LinkedHashMap<>(); VirtualMemory virtualMemory = memory.getVirtualMemory(); long total = virtualMemory.getSwapTotal(); long used = virtualMemory.getSwapUsed(); swapInfo.put("total", FormatUtil.formatBytes(total)); swapInfo.put("used", FormatUtil.formatBytes(used)); swapInfo.put("available", FormatUtil.formatBytes(total - used)); - if(used == 0){ + if (used == 0) { swapInfo.put("usageRate", 0); } else { - swapInfo.put("usageRate", df.format(used/(double)total * 100)); + swapInfo.put("usageRate", df.format(used / (double) total * 100)); } return swapInfo; } /** * 获取内存信息 + * * @param memory / * @return / */ - private Map getMemoryInfo(GlobalMemory memory) { - Map memoryInfo = new LinkedHashMap<>(); + private Map getMemoryInfo(GlobalMemory memory) { + Map memoryInfo = new LinkedHashMap<>(); memoryInfo.put("total", FormatUtil.formatBytes(memory.getTotal())); memoryInfo.put("available", FormatUtil.formatBytes(memory.getAvailable())); memoryInfo.put("used", FormatUtil.formatBytes(memory.getTotal() - memory.getAvailable())); - memoryInfo.put("usageRate", df.format((memory.getTotal() - memory.getAvailable())/(double)memory.getTotal() * 100)); + memoryInfo.put("usageRate", df.format((memory.getTotal() - memory.getAvailable()) / (double) memory.getTotal() * 100)); return memoryInfo; } /** * 获取Cpu相关信息 + * * @param processor / * @return / */ - private Map getCpuInfo(CentralProcessor processor) { - Map cpuInfo = new LinkedHashMap<>(); + private Map getCpuInfo(CentralProcessor processor) { + Map cpuInfo = new LinkedHashMap<>(); cpuInfo.put("name", processor.getProcessorIdentifier().getName()); cpuInfo.put("package", processor.getPhysicalPackageCount() + "个物理CPU"); cpuInfo.put("core", processor.getPhysicalProcessorCount() + "个物理核心"); @@ -170,11 +174,12 @@ public class MonitorServiceImpl implements MonitorService { /** * 获取系统相关信息,系统、运行天数、系统IP + * * @param os / * @return / */ - private Map getSystemInfo(OperatingSystem os){ - Map systemInfo = new LinkedHashMap<>(); + private Map getSystemInfo(OperatingSystem os) { + Map systemInfo = new LinkedHashMap<>(); // jvm 运行时间 long time = ManagementFactory.getRuntimeMXBean().getStartTime(); Date date = new Date(time); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/ISysNoticeService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/ISysNoticeService.java index 3a00124..76cf07a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/ISysNoticeService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/ISysNoticeService.java @@ -12,73 +12,83 @@ import java.util.Map; import java.util.Set; /** -* @description 服务接口 -* @author lyd -* @date 2023-05-09 -**/ + * @author lyd + * @description 服务接口 + * @date 2023-05-09 + **/ public interface ISysNoticeService extends IService { /** - * 查询数据分页 - * @param whereJson 条件 - * @param pageable 分页参数 - * @return IPage - */ + * 查询数据分页 + * + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ IPage queryAll(Map whereJson, PageQuery pageable); /** - * 创建 - * @param entity / - */ + * 创建 + * + * @param entity / + */ void create(SysNotice entity); /** - * 编辑 - * @param entity / - */ + * 编辑 + * + * @param entity / + */ void update(SysNotice entity); /** - * 多选删除 - * @param ids / - */ + * 多选删除 + * + * @param ids / + */ void deleteAll(Set ids); /** * 获取未读的接收消息条数 + * * @return */ Integer countByReceiveNotRead(); /** * 获取不同类型的前三条信息 + * * @return */ LinkedList> pageByReceive(); /** * 标记已读 + * * @param id */ void read(String id); /** * 处理信息 + * * @param id */ void deal(String id); /** * 批量已读 + * * @param jsonObject */ void changeRead(JSONObject jsonObject); /** * 写入信息 - * @param msg: 数据信息 + * + * @param msg: 数据信息 * @param title: 唯一 - * @param type: 类型 + * @param type: 类型 */ void createNotice(String msg, String title, String type); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/SysNotice.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/SysNotice.java index b5a8daa..c8dc0b0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/SysNotice.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/SysNotice.java @@ -3,7 +3,6 @@ package org.nl.system.service.notice.dao; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -12,10 +11,10 @@ import lombok.EqualsAndHashCode; import java.io.Serializable; /** -* @description / -* @author lyd -* @date 2023-05-09 -**/ + * @author lyd + * @description / + * @date 2023-05-09 + **/ @Data @Builder @AllArgsConstructor @@ -26,28 +25,28 @@ public class SysNotice implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "notice_id", type = IdType.NONE) - @ApiModelProperty(value = "信息标识") + private String notice_id; - @ApiModelProperty(value = "信息标题") + private String notice_title; - @ApiModelProperty(value = "信息内容") + private String notice_content; - @ApiModelProperty(value = "信息类型") + private String notice_type; - @ApiModelProperty(value = "读取状态") + private String have_read; - @ApiModelProperty(value = "读取时间") + private String read_time; - @ApiModelProperty(value = "处理状态") + private String deal_status; - @ApiModelProperty(value = "创建时间") + private String create_time; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/mapper/SysNoticeMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/mapper/SysNoticeMapper.java index 384f7cf..cd783f5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/mapper/SysNoticeMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dao/mapper/SysNoticeMapper.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.nl.system.service.notice.dao.SysNotice; /** -* @author lyd -* @date 2023-05-09 -**/ + * @author lyd + * @date 2023-05-09 + **/ public interface SysNoticeMapper extends BaseMapper { } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dto/SysNoticeDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dto/SysNoticeDto.java index cf427e1..7627f3e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dto/SysNoticeDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dto/SysNoticeDto.java @@ -1,37 +1,54 @@ package org.nl.system.service.notice.dto; import lombok.Data; + import java.io.Serializable; /** -* @description / -* @author lyd -* @date 2023-05-09 -**/ + * @author lyd + * @description / + * @date 2023-05-09 + **/ @Data public class SysNoticeDto implements Serializable { - /** 信息标识 */ + /** + * 信息标识 + */ private String notice_id; - /** 信息标题 */ + /** + * 信息标题 + */ private String notice_title; - /** 信息内容 */ + /** + * 信息内容 + */ private String notice_content; - /** 信息类型 */ + /** + * 信息类型 + */ private String notice_type; - /** 读取状态 */ + /** + * 读取状态 + */ private String have_read; - /** 读取时间 */ + /** + * 读取时间 + */ private String read_time; - /** 处理状态 */ + /** + * 处理状态 + */ private String deal_status; - /** 创建时间 */ + /** + * 创建时间 + */ private String create_time; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dto/SysNoticeQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dto/SysNoticeQuery.java index 16a59bf..80d4d24 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dto/SysNoticeQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/dto/SysNoticeQuery.java @@ -4,9 +4,9 @@ import org.nl.common.domain.query.BaseQuery; import org.nl.system.service.notice.dao.SysNotice; /** -* @author lyd -* @date 2023-05-09 -**/ + * @author lyd + * @date 2023-05-09 + **/ public class SysNoticeQuery extends BaseQuery { } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java index 3f7bfee..dc906f5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/notice/impl/SysNoticeServiceImpl.java @@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; import org.nl.common.enums.NoticeEnum; @@ -18,12 +17,11 @@ import org.nl.common.exception.BadRequestException; import org.nl.common.mnt.websocket.MsgType; import org.nl.common.mnt.websocket.SocketMsg; import org.nl.common.mnt.websocket.WebSocketServer; -import org.nl.common.utils.SecurityUtils; import org.nl.system.service.dict.dao.Dict; import org.nl.system.service.dict.dao.mapper.SysDictMapper; import org.nl.system.service.notice.ISysNoticeService; -import org.nl.system.service.notice.dao.mapper.SysNoticeMapper; import org.nl.system.service.notice.dao.SysNotice; +import org.nl.system.service.notice.dao.mapper.SysNoticeMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -33,7 +31,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.function.Consumer; /** * @author lyd diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/dao/Param.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/dao/Param.java index b32705b..55be4bc 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/dao/Param.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/dao/Param.java @@ -2,10 +2,11 @@ package org.nl.system.service.param.dao; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** *

* 系统参数表 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/dao/mapper/SysParamMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/dao/mapper/SysParamMapper.java index d2f5c86..6b7b870 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/dao/mapper/SysParamMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/dao/mapper/SysParamMapper.java @@ -1,7 +1,7 @@ package org.nl.system.service.param.dao.mapper; -import org.nl.system.service.param.dao.Param; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.system.service.param.dao.Param; /** *

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/ISysDataPermissionService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/ISysDataPermissionService.java index 5b05226..6140d46 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/ISysDataPermissionService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/ISysDataPermissionService.java @@ -2,10 +2,10 @@ package org.nl.system.service.permission; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; import org.nl.system.service.dict.dao.Dict; import org.nl.system.service.permission.dao.SysDataPermission; -import com.baomidou.mybatisplus.extension.service.IService; import org.nl.system.service.permission.dao.SysDataScope; import org.nl.system.service.permission.dto.SysDataPermissionQuery; import org.nl.system.service.user.dto.UserDataPermissionDto; @@ -25,6 +25,7 @@ public interface ISysDataPermissionService extends IService { /** * 分页查询 + * * @param dataPermissionQuery * @param page * @return @@ -33,36 +34,42 @@ public interface ISysDataPermissionService extends IService { /** * 新增数据权限 + * * @param permission / */ void create(SysDataPermission permission); /** * 修改 + * * @param permission / */ void update(SysDataPermission permission); /** * 批量删除 + * * @param ids / */ void deleteAll(Set ids); /** * 数据范围类型 + * * @return Dict */ List getDataScopeType(); /** * 获取数据权限下拉框 + * * @return / */ List getDataPermissionOption(); /** * 获取数据显示 + * * @param id / * @return / */ @@ -70,12 +77,14 @@ public interface ISysDataPermissionService extends IService { /** * 保存数据权限 + * * @param datas / */ void savePermission(JSONObject datas); /** * 数据展示 + * * @param data / * @return / */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/SysDataPermission.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/SysDataPermission.java index a289345..b855cad 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/SysDataPermission.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/SysDataPermission.java @@ -1,14 +1,13 @@ package org.nl.system.service.permission.dao; -import java.math.BigDecimal; - import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.math.BigDecimal; /** *

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/SysDataScope.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/SysDataScope.java index 41dc8ff..63becb3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/SysDataScope.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/SysDataScope.java @@ -1,10 +1,11 @@ package org.nl.system.service.permission.dao; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** *

* 数据权限规则表 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.java index 0312e64..cdcc817 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.java @@ -1,8 +1,8 @@ package org.nl.system.service.permission.dao.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.nl.system.service.permission.dao.SysDataPermission; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.nl.system.service.permission.dao.SysDataScope; import java.util.List; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.xml index 7311d1f..b4e41f6 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/permission/dao/mapper/SysDataPermissionMapper.xml @@ -7,10 +7,13 @@ INSERT INTO sys_data_scope(self_user_id, permission_scope_type, user_id, dept_id) - VALUES (#{dataScope.self_user_id}, #{dataScope.permission_scope_type}, #{dataScope.user_id}, #{dataScope.dept_id}) + VALUES (#{dataScope.self_user_id}, #{dataScope.permission_scope_type}, #{dataScope.user_id}, + #{dataScope.dept_id}) - DELETE FROM sys_data_scope WHERE self_user_id = #{userId} + DELETE + FROM sys_data_scope + WHERE self_user_id = #{userId} - SELECT DISTINCT menu_id FROM sys_roles_menus WHERE role_id = #{roleId} + SELECT DISTINCT menu_id + FROM sys_roles_menus + WHERE role_id = #{roleId} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java index 559b362..bafd010 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java @@ -148,10 +148,10 @@ public class SysRoleServiceImpl extends ServiceImpl impl @Override public void saveUserRoleRelation(String user, List roles) { - if (StringUtils.isEmpty(user) || CollectionUtils.isEmpty(roles)){ + if (StringUtils.isEmpty(user) || CollectionUtils.isEmpty(roles)) { return; } - roleMapper.saveRoleRelation(user,roles); + roleMapper.saveRoleRelation(user, roles); } @Override diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java index d155507..1b91a8a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/secutiry/impl/OnlineUserService.java @@ -26,13 +26,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; -import org.nl.common.utils.*; -import org.nl.config.RsaProperties; import org.nl.common.exception.BadRequestException; +import org.nl.common.utils.*; import org.nl.common.utils.dto.CurrentUser; +import org.nl.config.RsaProperties; import org.nl.system.service.dept.ISysDeptService; import org.nl.system.service.dept.dao.SysDept; -import org.nl.system.service.secutiry.dto.UserDto; import org.nl.system.service.role.ISysRoleService; import org.nl.system.service.secutiry.dto.AuthUserDto; import org.nl.system.service.user.ISysUserService; @@ -72,11 +71,12 @@ public class OnlineUserService { /** * 保存在线用户信息 + * * @param userDto / - * @param token / + * @param token / * @param request / */ - public void save(SysUser userDto, String token, HttpServletRequest request){ + public void save(SysUser userDto, String token, HttpServletRequest request) { // 获取用户部门 List userDeptByUserId = deptService.getUserDeptByUserId(userDto.getUser_id()); StringBuilder sb = new StringBuilder(); @@ -92,33 +92,35 @@ public class OnlineUserService { String address = StringUtils.getCityInfo(ip); OnlineUserDto onlineUserDto = null; try { - onlineUserDto = new OnlineUserDto(userDto.getUsername(), userDto.getPerson_name(), dept, browser , ip, address, EncryptUtils.desEncrypt(token), new Date()); + onlineUserDto = new OnlineUserDto(userDto.getUsername(), userDto.getPerson_name(), dept, browser, ip, address, EncryptUtils.desEncrypt(token), new Date()); } catch (Exception e) { - log.error(e.getMessage(),e); + log.error(e.getMessage(), e); } redisUtils.set("oline-" + userDto.getUsername(), onlineUserDto, StpUtil.getTokenTimeout()); } /** * 查询全部数据 - * @param filter / + * + * @param filter / * @param pageable / * @return / */ - public Map getAll(String filter, Pageable pageable){ + public Map getAll(String filter, Pageable pageable) { List onlineUserDtos = getAll(filter); return PageUtil.toPage( - PageUtil.toPage(pageable.getPageNumber(),pageable.getPageSize(), onlineUserDtos), + PageUtil.toPage(pageable.getPageNumber(), pageable.getPageSize(), onlineUserDtos), onlineUserDtos.size() ); } /** * 查询全部数据，不分页 + * * @param filter / * @return / */ - public List getAll(String filter){ + public List getAll(String filter) { List keys = redisUtils.scan("oline-*"); Collections.reverse(keys); List onlineUserDtos = new ArrayList<>(); @@ -132,6 +134,7 @@ public class OnlineUserService { /** * 踢出用户 + * * @param key: OnlineUserDto / */ public void kickOut(OnlineUserDto key) { @@ -146,6 +149,7 @@ public class OnlineUserService { /** * 踢出用户 + * * @param key：token / */ public void kickOut(String key) { @@ -156,6 +160,7 @@ public class OnlineUserService { /** * 退出登录 + * * @param token / */ public void logout(String token) { @@ -164,14 +169,15 @@ public class OnlineUserService { /** * 导出 - * @param all / + * + * @param all / * @param response / * @throws IOException / */ public void download(List all, HttpServletResponse response) throws IOException { List> list = new ArrayList<>(); for (OnlineUserDto user : all) { - Map map = new LinkedHashMap<>(); + Map map = new LinkedHashMap<>(); map.put("用户名", user.getUserName()); map.put("部门", user.getDept()); map.put("登录IP", user.getIp()); @@ -185,33 +191,35 @@ public class OnlineUserService { /** * 查询用户 + * * @param key / * @return / */ public OnlineUserDto getOne(String key) { - return (OnlineUserDto)redisUtils.get(key); + return (OnlineUserDto) redisUtils.get(key); } /** * 检测用户是否在之前已经登录，已经登录踢下线 + * * @param userName 用户名 */ - public void checkLoginOnUser(String userName, String igoreToken){ + public void checkLoginOnUser(String userName, String igoreToken) { List onlineUserDtos = getAll(userName); - if(onlineUserDtos ==null || onlineUserDtos.isEmpty()){ + if (onlineUserDtos == null || onlineUserDtos.isEmpty()) { return; } - for(OnlineUserDto onlineUserDto : onlineUserDtos){ - if(onlineUserDto.getUserName().equals(userName)){ + for (OnlineUserDto onlineUserDto : onlineUserDtos) { + if (onlineUserDto.getUserName().equals(userName)) { try { - String token =EncryptUtils.desDecrypt(onlineUserDto.getKey()); - if(StrUtil.isNotEmpty(igoreToken)&&!igoreToken.equals(token)){ + String token = EncryptUtils.desDecrypt(onlineUserDto.getKey()); + if (StrUtil.isNotEmpty(igoreToken) && !igoreToken.equals(token)) { this.kickOut(token); - }else if(StrUtil.isEmpty(igoreToken)){ + } else if (StrUtil.isEmpty(igoreToken)) { this.kickOut(token); } } catch (Exception e) { - log.error("checkUser is error",e); + log.error("checkUser is error", e); } } } @@ -219,6 +227,7 @@ public class OnlineUserService { /** * 根据用户名强退用户 + * * @param username / */ @Async @@ -231,8 +240,9 @@ public class OnlineUserService { } } } + @SneakyThrows - public Map login(Map paramMap, HttpServletRequest request){ + public Map login(Map paramMap, HttpServletRequest request) { // 密码解密 - 前端的加密规则: encrypt AuthUserDto authUser = JSON.toJavaObject((JSON) JSON.toJSON(paramMap), AuthUserDto.class); String password = RsaUtils.decryptByPrivateKey(RsaProperties.privateKey, authUser.getPassword()); @@ -248,9 +258,9 @@ public class OnlineUserService { } // 校验数据库 // 根据用户名查询，在比对密码 - SysUser userInfo = sysUserService.getOne(new QueryWrapper().eq("username",authUser.getUsername())); + SysUser userInfo = sysUserService.getOne(new QueryWrapper().eq("username", authUser.getUsername())); // 这里需要密码加密 - if (userInfo == null||!userInfo.getPassword().equals(SaSecureUtil.md5BySalt(password, GeneralDefinition.SALT))) { + if (userInfo == null || !userInfo.getPassword().equals(SaSecureUtil.md5BySalt(password, GeneralDefinition.SALT))) { throw new BadRequestException("账号或密码错误"); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/IToolLocalStorageService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/IToolLocalStorageService.java index bb7ba66..ca062b1 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/IToolLocalStorageService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/IToolLocalStorageService.java @@ -1,11 +1,10 @@ package org.nl.system.service.tools; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; import org.nl.system.service.tools.dao.ToolLocalStorage; -import com.baomidou.mybatisplus.extension.service.IService; import org.nl.system.service.tools.dto.ToolLocalStorageQuery; -import org.springframework.data.domain.Pageable; import org.springframework.web.multipart.MultipartFile; import java.util.Set; @@ -22,6 +21,7 @@ public interface IToolLocalStorageService extends IService { /** * 查询 + * * @param criteria * @param pageable * @return @@ -30,6 +30,7 @@ public interface IToolLocalStorageService extends IService { /** * 上传文件 + * * @param name * @param file * @return @@ -38,12 +39,14 @@ public interface IToolLocalStorageService extends IService { /** * 修改文件 + * * @param resources */ void update(ToolLocalStorage resources); /** * 删除文件 + * * @param ids */ void deleteAll(Set ids); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/dao/ToolLocalStorage.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/dao/ToolLocalStorage.java index 88a1296..b14de3b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/dao/ToolLocalStorage.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/dao/ToolLocalStorage.java @@ -2,10 +2,11 @@ package org.nl.system.service.tools.dao; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** *

* 本地存储表 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/dao/mapper/ToolLocalStorageMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/dao/mapper/ToolLocalStorageMapper.java index 488006c..53f1407 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/dao/mapper/ToolLocalStorageMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/dao/mapper/ToolLocalStorageMapper.java @@ -1,7 +1,7 @@ package org.nl.system.service.tools.dao.mapper; -import org.nl.system.service.tools.dao.ToolLocalStorage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.nl.system.service.tools.dao.ToolLocalStorage; /** *

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/impl/ToolLocalStorageServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/impl/ToolLocalStorageServiceImpl.java index e90cb8d..6e6797c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/impl/ToolLocalStorageServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/tools/impl/ToolLocalStorageServiceImpl.java @@ -5,15 +5,15 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.common.domain.query.PageQuery; -import org.nl.config.FileProperties; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.FileUtil; import org.nl.common.utils.SecurityUtils; +import org.nl.config.FileProperties; +import org.nl.system.service.tools.IToolLocalStorageService; import org.nl.system.service.tools.dao.ToolLocalStorage; import org.nl.system.service.tools.dao.mapper.ToolLocalStorageMapper; -import org.nl.system.service.tools.IToolLocalStorageService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.nl.system.service.tools.dto.ToolLocalStorageQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -50,8 +50,8 @@ public class ToolLocalStorageServiceImpl extends ServiceImpl { /** * 更新用户头像 + * * @param avatar * @return */ @@ -30,6 +31,7 @@ public interface ISysUserService extends IService { /** * 获取用户详情 + * * @param query * @param pageQuery * @return @@ -38,18 +40,21 @@ public interface ISysUserService extends IService { /** * 创建 + * * @param userDetail */ void create(Map userDetail); /** * 更新 + * * @param userDetail */ void update(Map userDetail); /** * 获取权限 + * * @param permissionId * @return */ @@ -57,6 +62,7 @@ public interface ISysUserService extends IService { /** * 通过用户Id获取用户数据权限 + * * @param userId * @return */ @@ -64,18 +70,21 @@ public interface ISysUserService extends IService { /** * 删除用户权限 + * * @param userId */ void deleteDataPermissionById(String userId); /** * 插入数据权限 + * * @param userDataPermissionDto */ void insertDataPermission(UserDataPermissionDto userDataPermissionDto); /** * 获取用户 + * * @param deptId * @return */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java index 032de9e..8ef537b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.java @@ -2,7 +2,6 @@ package org.nl.system.service.user.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; import org.nl.common.domain.query.PageQuery; import org.nl.system.service.user.dao.SysUser; import org.nl.system.service.user.dto.SysUserDetail; @@ -22,9 +21,9 @@ import java.util.Map; */ public interface SysUserMapper extends BaseMapper { - List getUserDetail(@Param("query") UserQuery query, @Param("page")PageQuery page); + List getUserDetail(@Param("query") UserQuery query, @Param("page") PageQuery page); - List> getDetailForMap(@Param("query") UserQuery query, @Param("page")PageQuery page); + List> getDetailForMap(@Param("query") UserQuery query, @Param("page") PageQuery page); List getUserDataPermissionByPermissionId(String permissionId); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml index 719c300..d9a382f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/user/dao/mapper/SysUserMapper.xml @@ -2,7 +2,10 @@ - sys_user.user_id as userId, + sys_user + . + user_id + as userId, sys_user.username as username, sys_user.person_name as personName, sys_user.gender, @@ -25,33 +28,36 @@ sys_user.extuser_id as extuserId - INSERT INTO sys_user_data_permission(user_id, permission_scope_type, permission_id) VALUES (#{dataPermission.user_id}, #{dataPermission.permission_scope_type}, #{dataPermission.permission_id}) + INSERT INTO sys_user_data_permission(user_id, permission_scope_type, permission_id) + VALUES (#{dataPermission.user_id}, #{dataPermission.permission_scope_type}, #{dataPermission.permission_id}) - DELETE FROM sys_user_data_permission WHERE user_id = #{userId} + DELETE + FROM sys_user_data_permission + WHERE user_id = #{userId} - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -123,17 +129,21 @@ - SELECT - IF(LENGTH(SUM(w.plan_qty))>0,SUM(w.plan_qty),0) AS plan_qty, - IF(LENGTH(SUM(w.real_qty))>0,SUM(w.real_qty),0) AS real_qty, - IF(LENGTH(SUM(w.qualified_qty))>0,SUM(w.qualified_qty),0) AS qualified_qty, - IF(LENGTH(SUM(w.unqualified_qty))>0,SUM(w.unqualified_qty),0) AS unqualified_qty - FROM - pdm_bd_workorder w + SELECT IF(LENGTH(SUM(w.plan_qty)) > 0, SUM(w.plan_qty), 0) AS plan_qty, + IF(LENGTH(SUM(w.real_qty)) > 0, SUM(w.real_qty), 0) AS real_qty, + IF(LENGTH(SUM(w.qualified_qty)) > 0, SUM(w.qualified_qty), 0) AS qualified_qty, + IF(LENGTH(SUM(w.unqualified_qty)) > 0, SUM(w.unqualified_qty), 0) AS unqualified_qty + FROM pdm_bd_workorder w WHERE - DATE( w.produce_date ) = CURDATE() AND w.team = #{dayShift}; + DATE ( w.produce_date ) = CURDATE() + AND w.team = #{dayShift}; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/controller/DasDeviceCheckRecordController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/controller/DasDeviceCheckRecordController.java index 77af655..6e81fe8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/controller/DasDeviceCheckRecordController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/controller/DasDeviceCheckRecordController.java @@ -1,7 +1,6 @@ package org.nl.wms.das.device.check.controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -16,13 +15,14 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; import java.util.Set; + /** -* @author lyd -* @date 2023-08-01 -**/ + * @author lyd + * @date 2023-08-01 + **/ @Slf4j @RestController -@Api(tags = "设备点检功能管理") + @RequestMapping("/api/dasDeviceCheckRecord") public class DasDeviceCheckRecordController { @@ -31,29 +31,29 @@ public class DasDeviceCheckRecordController { @GetMapping @Log("查询设备点检功能") - @ApiOperation("查询设备点检功能") - public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ - return new ResponseEntity<>(TableDataInfo.build(dasDeviceCheckRecordService.queryAll(whereJson,page)),HttpStatus.OK); + + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(dasDeviceCheckRecordService.queryAll(whereJson, page)), HttpStatus.OK); } @PostMapping @Log("新增设备点检功能") - @ApiOperation("新增设备点检功能") - public ResponseEntity create(@Validated @RequestBody DasDeviceCheckRecord entity){ + + public ResponseEntity create(@Validated @RequestBody DasDeviceCheckRecord entity) { dasDeviceCheckRecordService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping @Log("修改设备点检功能") - @ApiOperation("修改设备点检功能") - public ResponseEntity update(@Validated @RequestBody DasDeviceCheckRecord entity){ + + public ResponseEntity update(@Validated @RequestBody DasDeviceCheckRecord entity) { dasDeviceCheckRecordService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除设备点检功能") - @ApiOperation("删除设备点检功能") + @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { dasDeviceCheckRecordService.deleteAll(ids); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/IDasDeviceCheckRecordService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/IDasDeviceCheckRecordService.java index 86d4074..675550b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/IDasDeviceCheckRecordService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/IDasDeviceCheckRecordService.java @@ -1,8 +1,8 @@ package org.nl.wms.das.device.check.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.nl.common.domain.query.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.das.device.check.service.dao.DasDeviceCheckRecord; import org.nl.wms.pda.service.dao.vo.PdaResponseVo; @@ -10,36 +10,40 @@ import java.util.Map; import java.util.Set; /** -* @description 服务接口 -* @author lyd -* @date 2023-08-01 -**/ + * @author lyd + * @description 服务接口 + * @date 2023-08-01 + **/ public interface IDasDeviceCheckRecordService extends IService { /** - * 查询数据分页 - * @param whereJson 条件 - * @param pageable 分页参数 - * @return IPage - */ + * 查询数据分页 + * + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ IPage queryAll(Map whereJson, PageQuery pageable); /** * 创建 + * * @param entity * @return */ PdaResponseVo create(DasDeviceCheckRecord entity); /** - * 编辑 - * @param entity / - */ + * 编辑 + * + * @param entity / + */ void update(DasDeviceCheckRecord entity); /** - * 多选删除 - * @param ids / - */ + * 多选删除 + * + * @param ids / + */ void deleteAll(Set ids); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/dao/DasDeviceCheckRecord.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/dao/DasDeviceCheckRecord.java index ec302ca..f945570 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/dao/DasDeviceCheckRecord.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/dao/DasDeviceCheckRecord.java @@ -3,17 +3,16 @@ package org.nl.wms.das.device.check.service.dao; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; /** -* @description / -* @author lyd -* @date 2023-08-01 -**/ + * @author lyd + * @description / + * @date 2023-08-01 + **/ @Data @EqualsAndHashCode(callSuper = false) @TableName("das_device_check_record") @@ -22,25 +21,25 @@ public class DasDeviceCheckRecord implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "record_id", type = IdType.NONE) - @ApiModelProperty(value = "记录标识") + private String record_id; - @ApiModelProperty(value = "账号") + private String username; - @ApiModelProperty(value = "用户名") + private String person_name; - @ApiModelProperty(value = "记录时间") + private String record_time; - @ApiModelProperty(value = "设备号") + private String device_code; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "点检状态") + private String check_status; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/dao/mapper/DasDeviceCheckRecordMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/dao/mapper/DasDeviceCheckRecordMapper.java index 0e6bb98..b7afcea 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/dao/mapper/DasDeviceCheckRecordMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/dao/mapper/DasDeviceCheckRecordMapper.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.nl.wms.das.device.check.service.dao.DasDeviceCheckRecord; /** -* @author lyd -* @date 2023-08-01 -**/ + * @author lyd + * @date 2023-08-01 + **/ public interface DasDeviceCheckRecordMapper extends BaseMapper { } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/dto/DasDeviceCheckRecordDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/dto/DasDeviceCheckRecordDto.java index 1f1fe18..ce8b3fe 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/dto/DasDeviceCheckRecordDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/dto/DasDeviceCheckRecordDto.java @@ -1,34 +1,49 @@ package org.nl.wms.das.device.check.service.dto; import lombok.Data; + import java.io.Serializable; /** -* @description / -* @author lyd -* @date 2023-08-01 -**/ + * @author lyd + * @description / + * @date 2023-08-01 + **/ @Data public class DasDeviceCheckRecordDto implements Serializable { - /** 记录标识 */ + /** + * 记录标识 + */ private String record_id; - /** 账号 */ + /** + * 账号 + */ private String username; - /** 用户名 */ + /** + * 用户名 + */ private String person_name; - /** 记录时间 */ + /** + * 记录时间 + */ private String record_time; - /** 设备号 */ + /** + * 设备号 + */ private String device_code; - /** 备注 */ + /** + * 备注 + */ private String remark; - /** 点检状态 */ + /** + * 点检状态 + */ private String check_status; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/dto/DasDeviceCheckRecordQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/dto/DasDeviceCheckRecordQuery.java index 38d6b1f..45fad1a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/dto/DasDeviceCheckRecordQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/dto/DasDeviceCheckRecordQuery.java @@ -4,9 +4,9 @@ import org.nl.common.domain.query.BaseQuery; import org.nl.wms.das.device.check.service.dao.DasDeviceCheckRecord; /** -* @author lyd -* @date 2023-08-01 -**/ + * @author lyd + * @date 2023-08-01 + **/ public class DasDeviceCheckRecordQuery extends BaseQuery { } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/impl/DasDeviceCheckRecordServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/impl/DasDeviceCheckRecordServiceImpl.java index fc0c9d2..e0e6102 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/impl/DasDeviceCheckRecordServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/check/service/impl/DasDeviceCheckRecordServiceImpl.java @@ -12,8 +12,8 @@ import org.nl.common.exception.BadRequestException; import org.nl.system.service.user.ISysUserService; import org.nl.system.service.user.dao.SysUser; import org.nl.wms.das.device.check.service.IDasDeviceCheckRecordService; -import org.nl.wms.das.device.check.service.dao.mapper.DasDeviceCheckRecordMapper; import org.nl.wms.das.device.check.service.dao.DasDeviceCheckRecord; +import org.nl.wms.das.device.check.service.dao.mapper.DasDeviceCheckRecordMapper; import org.nl.wms.pda.service.dao.vo.PdaResponseVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -22,10 +22,10 @@ import java.util.Map; import java.util.Set; /** -* @description 服务实现 -* @author lyd -* @date 2023-08-01 -**/ + * @author lyd + * @description 服务实现 + * @date 2023-08-01 + **/ @Slf4j @Service public class DasDeviceCheckRecordServiceImpl extends ServiceImpl implements IDasDeviceCheckRecordService { @@ -36,7 +36,7 @@ public class DasDeviceCheckRecordServiceImpl extends ServiceImpl queryAll(Map whereJson, PageQuery page){ + public IPage queryAll(Map whereJson, PageQuery page) { LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); IPage pages = new Page<>(page.getPage() + 1, page.getSize()); dasDeviceCheckRecordMapper.selectPage(pages, lam); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/controller/DasDeviceOperationRecordController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/controller/DasDeviceOperationRecordController.java index 83f1834..71a1465 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/controller/DasDeviceOperationRecordController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/controller/DasDeviceOperationRecordController.java @@ -1,7 +1,6 @@ package org.nl.wms.das.device.operation.controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -16,13 +15,14 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; import java.util.Set; + /** -* @author lyd -* @date 2023-08-09 -**/ + * @author lyd + * @date 2023-08-09 + **/ @Slf4j @RestController -@Api(tags = "设备动作操作记录管理") + @RequestMapping("/api/dasDeviceOperationRecord") public class DasDeviceOperationRecordController { @@ -31,29 +31,29 @@ public class DasDeviceOperationRecordController { @GetMapping @Log("查询设备动作操作记录") - @ApiOperation("查询设备动作操作记录") - public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ - return new ResponseEntity<>(TableDataInfo.build(dasDeviceOperationRecordService.queryAll(whereJson,page)),HttpStatus.OK); + + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(dasDeviceOperationRecordService.queryAll(whereJson, page)), HttpStatus.OK); } @PostMapping @Log("新增设备动作操作记录") - @ApiOperation("新增设备动作操作记录") - public ResponseEntity create(@Validated @RequestBody DasDeviceOperationRecord entity){ + + public ResponseEntity create(@Validated @RequestBody DasDeviceOperationRecord entity) { dasDeviceOperationRecordService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping @Log("修改设备动作操作记录") - @ApiOperation("修改设备动作操作记录") - public ResponseEntity update(@Validated @RequestBody DasDeviceOperationRecord entity){ + + public ResponseEntity update(@Validated @RequestBody DasDeviceOperationRecord entity) { dasDeviceOperationRecordService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除设备动作操作记录") - @ApiOperation("删除设备动作操作记录") + @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { dasDeviceOperationRecordService.deleteAll(ids); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/IDasDeviceOperationRecordService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/IDasDeviceOperationRecordService.java index 7ce2fed..3b32426 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/IDasDeviceOperationRecordService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/IDasDeviceOperationRecordService.java @@ -1,8 +1,8 @@ package org.nl.wms.das.device.operation.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.nl.common.domain.query.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.das.device.operation.service.dao.DasDeviceOperationRecord; import org.nl.wms.pda.service.dao.vo.PdaResponseVo; @@ -10,36 +10,40 @@ import java.util.Map; import java.util.Set; /** -* @description 服务接口 -* @author lyd -* @date 2023-08-09 -**/ + * @author lyd + * @description 服务接口 + * @date 2023-08-09 + **/ public interface IDasDeviceOperationRecordService extends IService { /** - * 查询数据分页 - * @param whereJson 条件 - * @param pageable 分页参数 - * @return IPage - */ + * 查询数据分页 + * + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ IPage queryAll(Map whereJson, PageQuery pageable); /** * 创建 + * * @param entity * @return */ PdaResponseVo create(DasDeviceOperationRecord entity); /** - * 编辑 - * @param entity / - */ + * 编辑 + * + * @param entity / + */ void update(DasDeviceOperationRecord entity); /** - * 多选删除 - * @param ids / - */ + * 多选删除 + * + * @param ids / + */ void deleteAll(Set ids); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dao/DasDeviceOperationRecord.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dao/DasDeviceOperationRecord.java index 8d0e1cf..ffb1428 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dao/DasDeviceOperationRecord.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dao/DasDeviceOperationRecord.java @@ -3,17 +3,16 @@ package org.nl.wms.das.device.operation.service.dao; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; /** -* @description / -* @author lyd -* @date 2023-08-09 -**/ + * @author lyd + * @description / + * @date 2023-08-09 + **/ @Data @EqualsAndHashCode(callSuper = false) @TableName("das_device_operation_record") @@ -22,22 +21,22 @@ public class DasDeviceOperationRecord implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "record_id", type = IdType.NONE) - @ApiModelProperty(value = "记录标识") + private String record_id; - @ApiModelProperty(value = "账号") + private String username; - @ApiModelProperty(value = "用户名") + private String person_name; - @ApiModelProperty(value = "记录时间") + private String record_time; - @ApiModelProperty(value = "设备号") + private String device_code; - @ApiModelProperty(value = "动作") + private String device_action; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dao/mapper/DasDeviceOperationRecordMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dao/mapper/DasDeviceOperationRecordMapper.java index 43a0ecb..0cbf1c2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dao/mapper/DasDeviceOperationRecordMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dao/mapper/DasDeviceOperationRecordMapper.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.nl.wms.das.device.operation.service.dao.DasDeviceOperationRecord; /** -* @author lyd -* @date 2023-08-09 -**/ + * @author lyd + * @date 2023-08-09 + **/ public interface DasDeviceOperationRecordMapper extends BaseMapper { } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dto/DasDeviceOperationRecordDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dto/DasDeviceOperationRecordDto.java index 406f330..c1313be 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dto/DasDeviceOperationRecordDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dto/DasDeviceOperationRecordDto.java @@ -1,31 +1,44 @@ package org.nl.wms.das.device.operation.service.dto; import lombok.Data; + import java.io.Serializable; /** -* @description / -* @author lyd -* @date 2023-08-09 -**/ + * @author lyd + * @description / + * @date 2023-08-09 + **/ @Data public class DasDeviceOperationRecordDto implements Serializable { - /** 记录标识 */ + /** + * 记录标识 + */ private String record_id; - /** 账号 */ + /** + * 账号 + */ private String username; - /** 用户名 */ + /** + * 用户名 + */ private String person_name; - /** 记录时间 */ + /** + * 记录时间 + */ private String record_time; - /** 设备号 */ + /** + * 设备号 + */ private String device_code; - /** 动作 */ + /** + * 动作 + */ private String device_action; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dto/DasDeviceOperationRecordQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dto/DasDeviceOperationRecordQuery.java index aa4ef93..710b340 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dto/DasDeviceOperationRecordQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/dto/DasDeviceOperationRecordQuery.java @@ -4,9 +4,9 @@ import org.nl.common.domain.query.BaseQuery; import org.nl.wms.das.device.operation.service.dao.DasDeviceOperationRecord; /** -* @author lyd -* @date 2023-08-09 -**/ + * @author lyd + * @date 2023-08-09 + **/ public class DasDeviceOperationRecordQuery extends BaseQuery { } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/impl/DasDeviceOperationRecordServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/impl/DasDeviceOperationRecordServiceImpl.java index 5acfba5..9faa46b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/impl/DasDeviceOperationRecordServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/device/operation/service/impl/DasDeviceOperationRecordServiceImpl.java @@ -6,16 +6,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; -import org.nl.common.utils.SecurityUtils; import org.nl.system.service.user.ISysUserService; import org.nl.system.service.user.dao.SysUser; import org.nl.wms.das.device.operation.service.IDasDeviceOperationRecordService; -import org.nl.wms.das.device.operation.service.dao.mapper.DasDeviceOperationRecordMapper; import org.nl.wms.das.device.operation.service.dao.DasDeviceOperationRecord; +import org.nl.wms.das.device.operation.service.dao.mapper.DasDeviceOperationRecordMapper; import org.nl.wms.pda.service.dao.vo.PdaResponseVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -24,10 +22,10 @@ import java.util.Map; import java.util.Set; /** -* @description 服务实现 -* @author lyd -* @date 2023-08-09 -**/ + * @author lyd + * @description 服务实现 + * @date 2023-08-09 + **/ @Slf4j @Service public class DasDeviceOperationRecordServiceImpl extends ServiceImpl implements IDasDeviceOperationRecordService { @@ -38,7 +36,7 @@ public class DasDeviceOperationRecordServiceImpl extends ServiceImpl queryAll(Map whereJson, PageQuery page){ + public IPage queryAll(Map whereJson, PageQuery page) { LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); IPage pages = new Page<>(page.getPage() + 1, page.getSize()); dasDeviceOperationRecordMapper.selectPage(pages, lam); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/controller/DasQualityInspectionController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/controller/DasQualityInspectionController.java index 907ddc2..24a512f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/controller/DasQualityInspectionController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/controller/DasQualityInspectionController.java @@ -1,7 +1,6 @@ package org.nl.wms.das.inspection.controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -16,13 +15,14 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; import java.util.Set; + /** -* @author lyd -* @date 2023-08-01 -**/ + * @author lyd + * @date 2023-08-01 + **/ @Slf4j @RestController -@Api(tags = "质检记录管理") + @RequestMapping("/api/dasQualityInspection") public class DasQualityInspectionController { @@ -31,29 +31,29 @@ public class DasQualityInspectionController { @GetMapping @Log("查询质检记录") - @ApiOperation("查询质检记录") - public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ - return new ResponseEntity<>(TableDataInfo.build(dasQualityInspectionService.queryAll(whereJson,page)),HttpStatus.OK); + + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(dasQualityInspectionService.queryAll(whereJson, page)), HttpStatus.OK); } @PostMapping @Log("新增质检记录") - @ApiOperation("新增质检记录") - public ResponseEntity create(@Validated @RequestBody DasQualityInspection entity){ + + public ResponseEntity create(@Validated @RequestBody DasQualityInspection entity) { dasQualityInspectionService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping @Log("修改质检记录") - @ApiOperation("修改质检记录") - public ResponseEntity update(@Validated @RequestBody DasQualityInspection entity){ + + public ResponseEntity update(@Validated @RequestBody DasQualityInspection entity) { dasQualityInspectionService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除质检记录") - @ApiOperation("删除质检记录") + @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { dasQualityInspectionService.deleteAll(ids); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/IDasQualityInspectionService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/IDasQualityInspectionService.java index 0763602..1b96c08 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/IDasQualityInspectionService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/IDasQualityInspectionService.java @@ -1,8 +1,8 @@ package org.nl.wms.das.inspection.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.nl.common.domain.query.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.das.inspection.service.dao.DasQualityInspection; import org.nl.wms.ext.acs.service.dto.to.wms.ApplyTaskRequest; @@ -10,40 +10,45 @@ import java.util.Map; import java.util.Set; /** -* @description 服务接口 -* @author lyd -* @date 2023-08-01 -**/ + * @author lyd + * @description 服务接口 + * @date 2023-08-01 + **/ public interface IDasQualityInspectionService extends IService { /** - * 查询数据分页 - * @param whereJson 条件 - * @param pageable 分页参数 - * @return IPage - */ + * 查询数据分页 + * + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ IPage queryAll(Map whereJson, PageQuery pageable); /** - * 创建 - * @param entity / - */ + * 创建 + * + * @param entity / + */ void create(DasQualityInspection entity); /** - * 编辑 - * @param entity / - */ + * 编辑 + * + * @param entity / + */ void update(DasQualityInspection entity); /** - * 多选删除 - * @param ids / - */ + * 多选删除 + * + * @param ids / + */ void deleteAll(Set ids); /** * 记录质检信息 + * * @param applyTaskRequest */ void createByAcs(ApplyTaskRequest applyTaskRequest); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dao/DasQualityInspection.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dao/DasQualityInspection.java index 340fa07..9705ab2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dao/DasQualityInspection.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dao/DasQualityInspection.java @@ -3,17 +3,16 @@ package org.nl.wms.das.inspection.service.dao; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; /** -* @description / -* @author lyd -* @date 2023-08-01 -**/ + * @author lyd + * @description / + * @date 2023-08-01 + **/ @Data @EqualsAndHashCode(callSuper = false) @TableName("das_quality_inspection") @@ -22,25 +21,25 @@ public class DasQualityInspection implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "inspection_id", type = IdType.NONE) - @ApiModelProperty(value = "检测标识") + private String inspection_id; - @ApiModelProperty(value = "质检时间") + private String inspection_time; - @ApiModelProperty(value = "半成品物料") + private String half_material_code; - @ApiModelProperty(value = "托盘号") + private String vehicle_code; - @ApiModelProperty(value = "数量") + private String material_qty; - @ApiModelProperty(value = "拆垛工位") + private String point_code; - @ApiModelProperty(value = "分拣工单") + private String workorder_code; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dao/mapper/DasQualityInspectionMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dao/mapper/DasQualityInspectionMapper.java index cfbc34d..9110fec 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dao/mapper/DasQualityInspectionMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dao/mapper/DasQualityInspectionMapper.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.nl.wms.das.inspection.service.dao.DasQualityInspection; /** -* @author lyd -* @date 2023-08-01 -**/ + * @author lyd + * @date 2023-08-01 + **/ public interface DasQualityInspectionMapper extends BaseMapper { } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dto/DasQualityInspectionDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dto/DasQualityInspectionDto.java index ce8112c..79a5fc7 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dto/DasQualityInspectionDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dto/DasQualityInspectionDto.java @@ -1,34 +1,49 @@ package org.nl.wms.das.inspection.service.dto; import lombok.Data; + import java.io.Serializable; /** -* @description / -* @author lyd -* @date 2023-08-01 -**/ + * @author lyd + * @description / + * @date 2023-08-01 + **/ @Data public class DasQualityInspectionDto implements Serializable { - /** 检测标识 */ + /** + * 检测标识 + */ private String inspection_id; - /** 质检时间 */ + /** + * 质检时间 + */ private String inspection_time; - /** 半成品物料 */ + /** + * 半成品物料 + */ private String half_material_code; - /** 托盘号 */ + /** + * 托盘号 + */ private String vehicle_code; - /** 数量 */ + /** + * 数量 + */ private String material_qty; - /** 拆垛工位 */ + /** + * 拆垛工位 + */ private String point_code; - /** 分拣工单 */ + /** + * 分拣工单 + */ private String workorder_code; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dto/DasQualityInspectionQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dto/DasQualityInspectionQuery.java index f179558..e68cebc 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dto/DasQualityInspectionQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/dto/DasQualityInspectionQuery.java @@ -4,9 +4,9 @@ import org.nl.common.domain.query.BaseQuery; import org.nl.wms.das.inspection.service.dao.DasQualityInspection; /** -* @author lyd -* @date 2023-08-01 -**/ + * @author lyd + * @date 2023-08-01 + **/ public class DasQualityInspectionQuery extends BaseQuery { } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/impl/DasQualityInspectionServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/impl/DasQualityInspectionServiceImpl.java index 611cd79..186d472 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/impl/DasQualityInspectionServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/das/inspection/service/impl/DasQualityInspectionServiceImpl.java @@ -8,14 +8,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; -import org.nl.common.utils.SecurityUtils; import org.nl.wms.das.inspection.service.IDasQualityInspectionService; -import org.nl.wms.das.inspection.service.dao.mapper.DasQualityInspectionMapper; import org.nl.wms.das.inspection.service.dao.DasQualityInspection; +import org.nl.wms.das.inspection.service.dao.mapper.DasQualityInspectionMapper; import org.nl.wms.database.material.service.IMdBaseMaterialService; import org.nl.wms.database.material.service.dao.MdBaseMaterial; import org.nl.wms.ext.acs.service.dto.to.wms.ApplyTaskRequest; @@ -30,10 +28,10 @@ import java.util.Map; import java.util.Set; /** -* @description 服务实现 -* @author lyd -* @date 2023-08-01 -**/ + * @author lyd + * @description 服务实现 + * @date 2023-08-01 + **/ @Slf4j @Service public class DasQualityInspectionServiceImpl extends ServiceImpl implements IDasQualityInspectionService { @@ -48,7 +46,7 @@ public class DasQualityInspectionServiceImpl extends ServiceImpl queryAll(Map whereJson, PageQuery page){ + public IPage queryAll(Map whereJson, PageQuery page) { LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); IPage pages = new Page<>(page.getPage() + 1, page.getSize()); dasQualityInspectionMapper.selectPage(pages, lam); @@ -105,7 +103,7 @@ public class DasQualityInspectionServiceImpl extends ServiceImpl query(@RequestParam Map whereJson, PageQuery page){ - return new ResponseEntity<>(TableDataInfo.build(mdBaseBrickInfoService.queryAll(whereJson,page)),HttpStatus.OK); + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(mdBaseBrickInfoService.queryAll(whereJson, page)), HttpStatus.OK); } @PostMapping @Log("新增每块砖的信息记录") - @ApiOperation("新增每块砖的信息记录") + //@SaCheckPermission("@el.check('mdBaseBrickInfo:add')") - public ResponseEntity create(@Validated @RequestBody MdBaseBrickInfo entity){ + public ResponseEntity create(@Validated @RequestBody MdBaseBrickInfo entity) { mdBaseBrickInfoService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping @Log("修改每块砖的信息记录") - @ApiOperation("修改每块砖的信息记录") + //@SaCheckPermission("@el.check('mdBaseBrickInfo:edit')") - public ResponseEntity update(@Validated @RequestBody MdBaseBrickInfo entity){ + public ResponseEntity update(@Validated @RequestBody MdBaseBrickInfo entity) { mdBaseBrickInfoService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除每块砖的信息记录") - @ApiOperation("删除每块砖的信息记录") + //@SaCheckPermission("@el.check('mdBaseBrickInfo:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/IMdBaseBrickInfoService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/IMdBaseBrickInfoService.java index 0ebbc47..6bcbb99 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/IMdBaseBrickInfoService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/IMdBaseBrickInfoService.java @@ -1,8 +1,8 @@ package org.nl.wms.database.brick.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.nl.common.domain.query.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.database.brick.service.dao.MdBaseBrickInfo; import org.nl.wms.ext.acs.service.dto.BrickInfoDto; @@ -10,53 +10,60 @@ import java.util.Map; import java.util.Set; /** -* @description 服务接口 -* @author lyd -* @date 2023-07-19 -**/ + * @author lyd + * @description 服务接口 + * @date 2023-07-19 + **/ public interface IMdBaseBrickInfoService extends IService { /** - * 查询数据分页 - * @param whereJson 条件 - * @param pageable 分页参数 - * @return IPage - */ + * 查询数据分页 + * + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ IPage queryAll(Map whereJson, PageQuery pageable); /** - * 创建 - * @param entity / - */ + * 创建 + * + * @param entity / + */ void create(MdBaseBrickInfo entity); /** - * 编辑 - * @param entity / - */ + * 编辑 + * + * @param entity / + */ void update(MdBaseBrickInfo entity); /** - * 多选删除 - * @param ids / - */ + * 多选删除 + * + * @param ids / + */ void deleteAll(Set ids); /** * 添加每块砖信息记录 + * * @param dto 砖块 */ void addBrickInfo(BrickInfoDto dto); /** * 将所有当前位置的砖块设置组盘标识 + * * @param deviceCode : 放砖位置-压制对接位 - * @param groupId 组盘标识 + * @param groupId 组盘标识 */ void setGroupByCurrentAllBrick(String deviceCode, String groupId); /** * 工单合格数量 + * * @param workorderCode / * @return / */ @@ -64,6 +71,7 @@ public interface IMdBaseBrickInfoService extends IService { /** * 工单不合格数量 + * * @param workorderCode / * @return / */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/dao/MdBaseBrickInfo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/dao/MdBaseBrickInfo.java index d06b713..a17d6b8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/dao/MdBaseBrickInfo.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/dao/MdBaseBrickInfo.java @@ -3,17 +3,16 @@ package org.nl.wms.database.brick.service.dao; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; /** -* @description / -* @author lyd -* @date 2023-07-19 -**/ + * @author lyd + * @description / + * @date 2023-07-19 + **/ @Data @EqualsAndHashCode(callSuper = false) @TableName("md_base_brick_info") @@ -22,63 +21,63 @@ public class MdBaseBrickInfo implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "brick_id", type = IdType.NONE) - @ApiModelProperty(value = "砖块标识") + private String brick_id; - @ApiModelProperty(value = "当前抓取工位") + private String get_station; - @ApiModelProperty(value = "当前放置工位") + private String put_station; - @ApiModelProperty(value = "是否合格") + private Boolean is_qualified; - @ApiModelProperty(value = "激光标刻码") + private String laser_marking_code; - @ApiModelProperty(value = "碾次") + private String grinding_number; - @ApiModelProperty(value = "重量") + private String weight; - @ApiModelProperty(value = "高度1") + private String height1; - @ApiModelProperty(value = "高度2") + private String height2; - @ApiModelProperty(value = "高度3") + private String height3; - @ApiModelProperty(value = "高度4") + private String height4; - @ApiModelProperty(value = "宽度1") + private String width1; - @ApiModelProperty(value = "宽度2") + private String width2; - @ApiModelProperty(value = "长度") + private String len; - @ApiModelProperty(value = "体积") + private String volume; - @ApiModelProperty(value = "平面度") + private String flatness; - @ApiModelProperty(value = "缺陷个数") + private String unqualified_qty; - @ApiModelProperty(value = "组盘标识") + private String group_id; - @ApiModelProperty(value = "是否组盘") + private Boolean is_group; - @ApiModelProperty(value = "工单号") + private String workorder_code; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/dao/mapper/MdBaseBrickInfoMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/dao/mapper/MdBaseBrickInfoMapper.java index 4b9addb..3b1b58d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/dao/mapper/MdBaseBrickInfoMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/dao/mapper/MdBaseBrickInfoMapper.java @@ -4,13 +4,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.nl.wms.database.brick.service.dao.MdBaseBrickInfo; /** -* @author lyd -* @date 2023-07-19 -**/ + * @author lyd + * @date 2023-07-19 + **/ public interface MdBaseBrickInfoMapper extends BaseMapper { /** * 合格数 + * * @param workorderCode 工单号 * @return 数字 */ @@ -18,6 +19,7 @@ public interface MdBaseBrickInfoMapper extends BaseMapper { /** * 不合格数 + * * @param workorderCode 工单号 * @return 数字 */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/dao/mapper/MdBaseBrickInfoMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/dao/mapper/MdBaseBrickInfoMapper.xml index 01f21c2..e0d6445 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/dao/mapper/MdBaseBrickInfoMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/dao/mapper/MdBaseBrickInfoMapper.xml @@ -3,17 +3,15 @@ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/dto/MdBaseBrickInfoDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/dto/MdBaseBrickInfoDto.java index e6cbe0c..977db63 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/dto/MdBaseBrickInfoDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/dto/MdBaseBrickInfoDto.java @@ -1,67 +1,104 @@ package org.nl.wms.database.brick.service.dto; import lombok.Data; + import java.io.Serializable; /** -* @description / -* @author lyd -* @date 2023-07-19 -**/ + * @author lyd + * @description / + * @date 2023-07-19 + **/ @Data public class MdBaseBrickInfoDto implements Serializable { - /** 砖块标识 */ + /** + * 砖块标识 + */ private String brick_id; - /** 当前抓取工位 */ + /** + * 当前抓取工位 + */ private String get_station; - /** 当前放置工位 */ + /** + * 当前放置工位 + */ private String put_station; - /** 是否合格 */ + /** + * 是否合格 + */ private Boolean is_qualified; - /** 激光标刻码 */ + /** + * 激光标刻码 + */ private String laser_marking_code; - /** 碾次 */ + /** + * 碾次 + */ private String grinding_number; - /** 高度1 */ + /** + * 高度1 + */ private String height1; - /** 高度2 */ + /** + * 高度2 + */ private String height2; - /** 高度3 */ + /** + * 高度3 + */ private String height3; - /** 高度4 */ + /** + * 高度4 + */ private String height4; - /** 宽度1 */ + /** + * 宽度1 + */ private String width1; - /** 宽度2 */ + /** + * 宽度2 + */ private String width2; - /** 长度 */ + /** + * 长度 + */ private String len; - /** 体积 */ + /** + * 体积 + */ private String volume; - /** 平面度 */ + /** + * 平面度 + */ private String flatness; - /** 缺陷个数 */ + /** + * 缺陷个数 + */ private String unqualified_qty; - /** 组盘标识 */ + /** + * 组盘标识 + */ private String group_id; - /** 是否组盘 */ + /** + * 是否组盘 + */ private Boolean is_group; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/dto/MdBaseBrickInfoQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/dto/MdBaseBrickInfoQuery.java index d56a61b..6a95c9d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/dto/MdBaseBrickInfoQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/brick/service/dto/MdBaseBrickInfoQuery.java @@ -4,9 +4,9 @@ import org.nl.common.domain.query.BaseQuery; import org.nl.wms.database.brick.service.dao.MdBaseBrickInfo; /** -* @author lyd -* @date 2023-07-19 -**/ + * @author lyd + * @date 2023-07-19 + **/ public class MdBaseBrickInfoQuery extends BaseQuery { } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/controller/MdBaseClassstandardController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/controller/MdBaseClassstandardController.java index 68a1e92..7908c16 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/controller/MdBaseClassstandardController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/controller/MdBaseClassstandardController.java @@ -1,7 +1,6 @@ package org.nl.wms.database.classification.controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -19,12 +18,12 @@ import java.util.List; import java.util.Map; /** -* @author lyd -* @date 2023-05-11 -**/ + * @author lyd + * @date 2023-05-11 + **/ @Slf4j @RestController -@Api(tags = "基础分类管理") + @RequestMapping("/api/Classstandard") public class MdBaseClassstandardController { @@ -33,29 +32,29 @@ public class MdBaseClassstandardController { @GetMapping @Log("查询基础分类") - @ApiOperation("查询基础分类") - public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ - return new ResponseEntity<>(TableDataInfo.build(mdBaseClassstandardService.queryAll(whereJson,page)),HttpStatus.OK); + + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(mdBaseClassstandardService.queryAll(whereJson, page)), HttpStatus.OK); } @PostMapping @Log("新增基础分类") - @ApiOperation("新增基础分类") - public ResponseEntity create(@Validated @RequestBody MdBaseClassstandard entity){ + + public ResponseEntity create(@Validated @RequestBody MdBaseClassstandard entity) { mdBaseClassstandardService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping @Log("修改基础分类") - @ApiOperation("修改基础分类") - public ResponseEntity update(@Validated @RequestBody MdBaseClassstandard entity){ + + public ResponseEntity update(@Validated @RequestBody MdBaseClassstandard entity) { mdBaseClassstandardService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除基础分类") - @ApiOperation("删除基础分类") + @DeleteMapping public ResponseEntity delete(@RequestBody List ids) { mdBaseClassstandardService.deleteAll(ids); @@ -64,19 +63,19 @@ public class MdBaseClassstandardController { @GetMapping("/getClassName") @Log("获取分类名称下拉框") - @ApiOperation("获取分类名称下拉框") + public ResponseEntity getClassName() { return new ResponseEntity<>(mdBaseClassstandardService.getClassName(), HttpStatus.OK); } @GetMapping("/loadClass") @Log("查询基础类型") - @ApiOperation("查询基础类型") + public ResponseEntity query(@RequestParam Map whereJson) { return new ResponseEntity<>(mdBaseClassstandardService.loadClass(whereJson), HttpStatus.OK); } - @ApiOperation("查询类别:根据ID获取同级与上级数据") + @PostMapping("/superior") public ResponseEntity getSuperior(@RequestBody String id) { MdBaseClassstandard classstandard = mdBaseClassstandardService.getById(id); @@ -86,7 +85,7 @@ public class MdBaseClassstandardController { @PostMapping("/getClassByCode") @Log("根据编码获取分类名称下拉框") - @ApiOperation("根据编码获取分类名称下拉框") + public ResponseEntity getClassByCode(@RequestBody String code) { return new ResponseEntity<>(mdBaseClassstandardService.getClassByCode(code), HttpStatus.OK); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/IMdBaseClassstandardService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/IMdBaseClassstandardService.java index 5a010af..6fa94f5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/IMdBaseClassstandardService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/IMdBaseClassstandardService.java @@ -10,46 +10,52 @@ import java.util.List; import java.util.Map; /** -* @description 服务接口 -* @author lyd -* @date 2023-05-11 -**/ + * @author lyd + * @description 服务接口 + * @date 2023-05-11 + **/ public interface IMdBaseClassstandardService extends IService { /** - * 查询数据分页 - * @param whereJson 条件 - * @param pageable 分页参数 - * @return IPage - */ + * 查询数据分页 + * + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ IPage queryAll(Map whereJson, PageQuery pageable); /** - * 创建 - * @param entity / - */ + * 创建 + * + * @param entity / + */ void create(MdBaseClassstandard entity); /** - * 编辑 - * @param entity / - */ + * 编辑 + * + * @param entity / + */ void update(MdBaseClassstandard entity); /** - * 多选删除 - * @param ids / - */ + * 多选删除 + * + * @param ids / + */ void deleteAll(List ids); /** * 获取下拉框 + * * @return */ List getClassName(); /** * loadClass + * * @param whereJson * @return */ @@ -57,6 +63,7 @@ public interface IMdBaseClassstandardService extends IService { } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dto/MdBaseClassstandardDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dto/MdBaseClassstandardDto.java index 09830e6..3113d05 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dto/MdBaseClassstandardDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dto/MdBaseClassstandardDto.java @@ -1,73 +1,114 @@ package org.nl.wms.database.classification.service.dto; import lombok.Data; + import java.io.Serializable; /** -* @description / -* @author lyd -* @date 2023-05-11 -**/ + * @author lyd + * @description / + * @date 2023-05-11 + **/ @Data public class MdBaseClassstandardDto implements Serializable { - /** 分类标识 */ + /** + * 分类标识 + */ private String class_id; - /** 分类编码 */ + /** + * 分类编码 + */ private String class_code; - /** 分类名称 */ + /** + * 分类名称 + */ private String class_name; - /** 分类简要描述 */ + /** + * 分类简要描述 + */ private String class_desc; - /** 上级分类标识 */ + /** + * 上级分类标识 + */ private String parent_class_id; - /** 子级数目 */ + /** + * 子级数目 + */ private String sub_count; - /** 是否叶子 */ + /** + * 是否叶子 + */ private Boolean is_leaf; - /** 是否可修改 */ + /** + * 是否可修改 + */ private Boolean is_modify; - /** 是否删除 */ + /** + * 是否删除 + */ private Boolean is_delete; - /** 级别 */ + /** + * 级别 + */ private String class_level; - /** 外部标识 */ + /** + * 外部标识 + */ private String ext_id; - /** 外部上级标识 */ + /** + * 外部上级标识 + */ private String ext_parent_id; - /** 车间编码 */ + /** + * 车间编码 + */ private String workshop_code; - /** 备注 */ + /** + * 备注 + */ private String remark; - /** 创建人 */ + /** + * 创建人 + */ private String create_id; - /** 创建人 */ + /** + * 创建人 + */ private String create_name; - /** 创建时间 */ + /** + * 创建时间 + */ private String create_time; - /** 修改人 */ + /** + * 修改人 + */ private String update_id; - /** 修改人 */ + /** + * 修改人 + */ private String update_name; - /** 修改时间 */ + /** + * 修改时间 + */ private String update_time; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dto/MdBaseClassstandardQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dto/MdBaseClassstandardQuery.java index bbf449a..1a8dcf0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dto/MdBaseClassstandardQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/dto/MdBaseClassstandardQuery.java @@ -4,9 +4,9 @@ import org.nl.common.domain.query.BaseQuery; import org.nl.wms.database.classification.service.dao.MdBaseClassstandard; /** -* @author lyd -* @date 2023-05-11 -**/ + * @author lyd + * @date 2023-05-11 + **/ public class MdBaseClassstandardQuery extends BaseQuery { } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/impl/MdBaseClassstandardServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/impl/MdBaseClassstandardServiceImpl.java index 47e2dfa..e6914f1 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/impl/MdBaseClassstandardServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/classification/service/impl/MdBaseClassstandardServiceImpl.java @@ -17,7 +17,6 @@ import org.nl.wms.database.classification.service.dao.mapper.MdBaseClassstandard import org.nl.wms.database.classification.service.dto.MdBaseClassstandardTrees; import org.nl.wms.sch.task_manage.GeneralDefinition; import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -202,9 +201,9 @@ public class MdBaseClassstandardServiceImpl extends ServiceImpl classstandardList = mdBaseClassstandardMapper .selectList(new LambdaQueryWrapper() - .eq(MdBaseClassstandard::getIs_delete, false) - .eq(MdBaseClassstandard::getParent_class_id, "0") - .or(la -> la.isNull(MdBaseClassstandard::getParent_class_id))); + .eq(MdBaseClassstandard::getIs_delete, false) + .eq(MdBaseClassstandard::getParent_class_id, "0") + .or(la -> la.isNull(MdBaseClassstandard::getParent_class_id))); res.addAll(classstandardList); return res; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/controller/MdBaseMaterialController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/controller/MdBaseMaterialController.java index f842443..5aed83d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/controller/MdBaseMaterialController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/controller/MdBaseMaterialController.java @@ -1,7 +1,6 @@ package org.nl.wms.database.material.controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + import lombok.extern.slf4j.Slf4j; import org.nl.common.annotation.Limit; import org.nl.common.base.TableDataInfo; @@ -18,13 +17,14 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; import java.util.Set; + /** -* @author lyd -* @date 2023-05-05 -**/ + * @author lyd + * @date 2023-05-05 + **/ @Slf4j @RestController -@Api(tags = "物料基础信息管理") + @RequestMapping("/api/mdBaseMaterial") public class MdBaseMaterialController { @@ -35,32 +35,32 @@ public class MdBaseMaterialController { @GetMapping @Log("查询物料基础信息") - @ApiOperation("查询物料基础信息") + //@SaCheckPermission("@el.check('mdBaseMaterial:list')") - public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ - return new ResponseEntity<>(TableDataInfo.build(mdBaseMaterialService.queryAll(whereJson,page)),HttpStatus.OK); + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(mdBaseMaterialService.queryAll(whereJson, page)), HttpStatus.OK); } @PostMapping @Log("新增物料基础信息") - @ApiOperation("新增物料基础信息") + //@SaCheckPermission("@el.check('mdBaseMaterial:add')") - public ResponseEntity create(@Validated @RequestBody MdBaseMaterial entity){ + public ResponseEntity create(@Validated @RequestBody MdBaseMaterial entity) { mdBaseMaterialService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping @Log("修改物料基础信息") - @ApiOperation("修改物料基础信息") + //@SaCheckPermission("@el.check('mdBaseMaterial:edit')") - public ResponseEntity update(@Validated @RequestBody MdBaseMaterial entity){ + public ResponseEntity update(@Validated @RequestBody MdBaseMaterial entity) { mdBaseMaterialService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除物料基础信息") - @ApiOperation("删除物料基础信息") + //@SaCheckPermission("@el.check('mdBaseMaterial:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { @@ -70,7 +70,7 @@ public class MdBaseMaterialController { @PostMapping("/synchronize") @Log("物料同步") - @ApiOperation("物料同步") + @Limit(period = 1, count = 1) //@SaCheckPermission("materialtype:list") public ResponseEntity synchronize(@RequestBody Map whereJson) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/IMdBaseMaterialService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/IMdBaseMaterialService.java index 29f26f0..09a7453 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/IMdBaseMaterialService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/IMdBaseMaterialService.java @@ -1,9 +1,8 @@ package org.nl.wms.database.material.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.nl.common.domain.query.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.database.material.service.dao.MdBaseMaterial; import org.nl.wms.database.material.service.dto.MdBaseMaterialQuery; @@ -11,40 +10,45 @@ import java.util.Map; import java.util.Set; /** -* @description 服务接口 -* @author lyd -* @date 2023-05-05 -**/ + * @author lyd + * @description 服务接口 + * @date 2023-05-05 + **/ public interface IMdBaseMaterialService extends IService { /** - * 查询数据分页 - * @param whereJson 条件 - * @param pageable 分页参数 - * @return IPage - */ + * 查询数据分页 + * + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ IPage queryAll(Map whereJson, PageQuery pageable); /** - * 创建 - * @param entity / - */ + * 创建 + * + * @param entity / + */ void create(MdBaseMaterial entity); /** - * 编辑 - * @param entity / - */ + * 编辑 + * + * @param entity / + */ void update(MdBaseMaterial entity); /** - * 多选删除 - * @param ids / - */ + * 多选删除 + * + * @param ids / + */ void deleteAll(Set ids); /** * 根据物料编码获取物料信息 + * * @param materialCode * @return */ @@ -52,6 +56,7 @@ public interface IMdBaseMaterialService extends IService { /** * 获取库存物料 + * * @param whereJson * @param page * @return diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/MdBaseMaterial.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/MdBaseMaterial.java index d093aec..0075357 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/MdBaseMaterial.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/MdBaseMaterial.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,10 +11,10 @@ import java.io.Serializable; import java.math.BigDecimal; /** -* @description / -* @author lyd -* @date 2023-05-05 -**/ + * @author lyd + * @description / + * @date 2023-05-05 + **/ @Data @EqualsAndHashCode(callSuper = false) @TableName("md_base_material") @@ -24,85 +23,85 @@ public class MdBaseMaterial implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "material_id", type = IdType.NONE) - @ApiModelProperty(value = "物料标识") + private String material_id; - @ApiModelProperty(value = "成品物料编码") + private String material_code; - @ApiModelProperty(value = "半成品物料编码") + private String half_material_code; - @ApiModelProperty(value = "原材料物料编码") + private String raw_material_code; - @ApiModelProperty(value = "物料名称 ") + private String material_name; - @ApiModelProperty(value = "物料规格") + private String material_spec; - @ApiModelProperty(value = "物料分类标识") + private String class_id; - @ApiModelProperty(value = "静置时间(分钟)") + private Integer standing_time; - @ApiModelProperty(value = "冷却时间(分钟)") + private Integer cooling_time; - @ApiModelProperty(value = "车间编码") + private String workshop_code; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + private Boolean is_used; - @ApiModelProperty(value = "是否删除") + private Boolean is_delete; - @ApiModelProperty(value = "创建人") + private String create_id; - @ApiModelProperty(value = "创建人") + private String create_name; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改人") + private String update_id; - @ApiModelProperty(value = "修改人") + private String update_name; - @ApiModelProperty(value = "修改时间") + private String update_time; - @ApiModelProperty(value = "外部标识") + private String ext_id; - @ApiModelProperty(value = "外部时间") + private String ext_time; - @ApiModelProperty(value = "物料型号") + private String material_model; - @ApiModelProperty(value = "物料单重") + private String single_weight; - @ApiModelProperty(value = "A") + private String a_long_side; - @ApiModelProperty(value = "B") + private String b_short_side; - @ApiModelProperty(value = "H") + private String h_height; - @ApiModelProperty(value = "W") + private String w_thickness; private String matsize; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/mapper/MdBaseMaterialMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/mapper/MdBaseMaterialMapper.java index 365bb67..6bc1f7f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/mapper/MdBaseMaterialMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/mapper/MdBaseMaterialMapper.java @@ -6,13 +6,14 @@ import org.nl.wms.database.material.service.dao.MdBaseMaterial; import org.nl.wms.database.material.service.dto.MdBaseMaterialQuery; /** -* @author lyd -* @date 2023-05-05 -**/ + * @author lyd + * @date 2023-05-05 + **/ public interface MdBaseMaterialMapper extends BaseMapper { /** * 根据库存获取物料信息 + * * @param pages * @param query * @return diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/mapper/MdBaseMaterialMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/mapper/MdBaseMaterialMapper.xml index 7773cdf..9d75ddf 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/mapper/MdBaseMaterialMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dao/mapper/MdBaseMaterialMapper.xml @@ -4,48 +4,48 @@ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dto/MdBaseMaterialDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dto/MdBaseMaterialDto.java index 56354af..77110e0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dto/MdBaseMaterialDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dto/MdBaseMaterialDto.java @@ -1,65 +1,100 @@ package org.nl.wms.database.material.service.dto; import lombok.Data; + import java.io.Serializable; import java.math.BigDecimal; /** -* @description / -* @author lyd -* @date 2023-05-05 -**/ + * @author lyd + * @description / + * @date 2023-05-05 + **/ @Data public class MdBaseMaterialDto implements Serializable { - /** 物料标识 */ + /** + * 物料标识 + */ private String material_id; - /** 物料编码 */ + /** + * 物料编码 + */ private String material_code; - /** 物料名称 */ + /** + * 物料名称 + */ private String material_name; - /** 物料规格 */ + /** + * 物料规格 + */ private String material_spec; - /** 物料分类标识 */ + /** + * 物料分类标识 + */ private String class_id; - /** 静置时间(分钟) */ + /** + * 静置时间(分钟) + */ private BigDecimal standing_time; - /** 车间编码 */ + /** + * 车间编码 + */ private String workshop_code; - /** 备注 */ + /** + * 备注 + */ private String remark; - /** 是否启用 */ + /** + * 是否启用 + */ private Integer is_used; - /** 是否删除 */ + /** + * 是否删除 + */ private Integer is_delete; - /** 创建人 */ + /** + * 创建人 + */ private String create_id; - /** 创建人 */ + /** + * 创建人 + */ private String create_name; - /** 创建时间 */ + /** + * 创建时间 + */ private String create_time; - /** 修改人 */ + /** + * 修改人 + */ private String update_id; - /** 修改人 */ + /** + * 修改人 + */ private String update_name; - /** 修改时间 */ + /** + * 修改时间 + */ private String update_time; - /** 外部标识 */ + /** + * 外部标识 + */ private String ext_id; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dto/MdBaseMaterialQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dto/MdBaseMaterialQuery.java index 9088a41..5035eb9 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dto/MdBaseMaterialQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/dto/MdBaseMaterialQuery.java @@ -5,9 +5,9 @@ import lombok.Data; import java.io.Serializable; /** -* @author lyd -* @date 2023-05-05 -**/ + * @author lyd + * @date 2023-05-05 + **/ @Data public class MdBaseMaterialQuery implements Serializable { private String blurry; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java index f6f9016..255f468 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/material/service/impl/MdBaseMaterialServiceImpl.java @@ -3,7 +3,6 @@ package org.nl.wms.database.material.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -20,19 +19,17 @@ import org.nl.wms.database.material.service.dto.MdBaseMaterialQuery; import org.nl.wms.ext.mes.service.dao.mapper.MesRequestMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.function.Consumer; /** -* @description 服务实现 -* @author lyd -* @date 2023-05-05 -**/ + * @author lyd + * @description 服务实现 + * @date 2023-05-05 + **/ @Slf4j @Service public class MdBaseMaterialServiceImpl extends ServiceImpl implements IMdBaseMaterialService { @@ -43,7 +40,7 @@ public class MdBaseMaterialServiceImpl extends ServiceImpl queryAll(Map whereJson, PageQuery page){ + public IPage queryAll(Map whereJson, PageQuery page) { String blurry = ObjectUtil.isNotEmpty(whereJson.get("blurry")) ? whereJson.get("blurry").toString() : null; Boolean is_used = ObjectUtil.isNotEmpty(whereJson.get("is_used")) ? Boolean.valueOf(whereJson.get("is_used").toString()) : null; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/controller/MdBaseVehicleController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/controller/MdBaseVehicleController.java index 64271da..29ce05b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/controller/MdBaseVehicleController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/controller/MdBaseVehicleController.java @@ -1,7 +1,6 @@ package org.nl.wms.database.vehicle.controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -16,13 +15,14 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; import java.util.Set; + /** -* @author lyd -* @date 2023-05-11 -**/ + * @author lyd + * @date 2023-05-11 + **/ @Slf4j @RestController -@Api(tags = "载具维护管理") + @RequestMapping("/api/mdBaseVehicle") public class MdBaseVehicleController { @@ -31,32 +31,32 @@ public class MdBaseVehicleController { @GetMapping @Log("查询载具维护") - @ApiOperation("查询载具维护") + //@SaCheckPermission("@el.check('mdBaseVehicle:list')") - public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ - return new ResponseEntity<>(TableDataInfo.build(mdBaseVehicleService.queryAll(whereJson,page)),HttpStatus.OK); + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(mdBaseVehicleService.queryAll(whereJson, page)), HttpStatus.OK); } @PostMapping @Log("新增载具维护") - @ApiOperation("新增载具维护") + //@SaCheckPermission("@el.check('mdBaseVehicle:add')") - public ResponseEntity create(@Validated @RequestBody MdBaseVehicle entity){ + public ResponseEntity create(@Validated @RequestBody MdBaseVehicle entity) { mdBaseVehicleService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping @Log("修改载具维护") - @ApiOperation("修改载具维护") + //@SaCheckPermission("@el.check('mdBaseVehicle:edit')") - public ResponseEntity update(@Validated @RequestBody MdBaseVehicle entity){ + public ResponseEntity update(@Validated @RequestBody MdBaseVehicle entity) { mdBaseVehicleService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除载具维护") - @ApiOperation("删除载具维护") + //@SaCheckPermission("@el.check('mdBaseVehicle:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/IMdBaseVehicleService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/IMdBaseVehicleService.java index 1444e28..bfd049b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/IMdBaseVehicleService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/IMdBaseVehicleService.java @@ -1,43 +1,47 @@ package org.nl.wms.database.vehicle.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.nl.common.domain.query.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.database.vehicle.service.dao.MdBaseVehicle; import java.util.Map; import java.util.Set; /** -* @description 服务接口 -* @author lyd -* @date 2023-05-11 -**/ + * @author lyd + * @description 服务接口 + * @date 2023-05-11 + **/ public interface IMdBaseVehicleService extends IService { /** - * 查询数据分页 - * @param whereJson 条件 - * @param pageable 分页参数 - * @return IPage - */ + * 查询数据分页 + * + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ IPage queryAll(Map whereJson, PageQuery pageable); /** - * 创建 - * @param entity / - */ + * 创建 + * + * @param entity / + */ void create(MdBaseVehicle entity); /** - * 编辑 - * @param entity / - */ + * 编辑 + * + * @param entity / + */ void update(MdBaseVehicle entity); /** - * 多选删除 - * @param ids / - */ + * 多选删除 + * + * @param ids / + */ void deleteAll(Set ids); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/MdBaseVehicle.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/MdBaseVehicle.java index 65ef1b8..2816309 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/MdBaseVehicle.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/MdBaseVehicle.java @@ -3,18 +3,17 @@ package org.nl.wms.database.vehicle.service.dao; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.math.BigDecimal; import java.io.Serializable; +import java.math.BigDecimal; /** -* @description / -* @author lyd -* @date 2023-05-11 -**/ + * @author lyd + * @description / + * @date 2023-05-11 + **/ @Data @EqualsAndHashCode(callSuper = false) @TableName("md_base_vehicle") @@ -23,58 +22,58 @@ public class MdBaseVehicle implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "vehicle_code", type = IdType.NONE) - @ApiModelProperty(value = "载具编码") + private String vehicle_code; - @ApiModelProperty(value = "载具名称") + private String vehicle_name; - @ApiModelProperty(value = "载具类型") + private String vehicle_type; - @ApiModelProperty(value = "一维码") + private String one_code; - @ApiModelProperty(value = "二维码") + private String two_code; - @ApiModelProperty(value = "RFID编码") + private String rfid_code; - @ApiModelProperty(value = "载具宽度") + private BigDecimal vehicle_width; - @ApiModelProperty(value = "载具长度") + private BigDecimal vehicle_long; - @ApiModelProperty(value = "载具高度") + private BigDecimal vehicle_height; - @ApiModelProperty(value = "载具超仓位类型") + private String overstruct_type; - @ApiModelProperty(value = "占仓位数") + private BigDecimal occupystruct_qty; - @ApiModelProperty(value = "外部标识") + private String ext_id; - @ApiModelProperty(value = "创建人") + private String create_id; - @ApiModelProperty(value = "创建人") + private String create_name; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改人") + private String update_id; - @ApiModelProperty(value = "修改人") + private String update_name; - @ApiModelProperty(value = "修改时间") + private String update_time; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/mapper/MdBaseVehicleMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/mapper/MdBaseVehicleMapper.java index 9dc21e3..9bd4bb3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/mapper/MdBaseVehicleMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dao/mapper/MdBaseVehicleMapper.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.nl.wms.database.vehicle.service.dao.MdBaseVehicle; /** -* @author lyd -* @date 2023-05-11 -**/ + * @author lyd + * @date 2023-05-11 + **/ public interface MdBaseVehicleMapper extends BaseMapper { } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dto/MdBaseVehicleDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dto/MdBaseVehicleDto.java index 737739f..81c42e8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dto/MdBaseVehicleDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dto/MdBaseVehicleDto.java @@ -1,68 +1,105 @@ package org.nl.wms.database.vehicle.service.dto; -import java.math.BigDecimal; import lombok.Data; + import java.io.Serializable; +import java.math.BigDecimal; /** -* @description / -* @author lyd -* @date 2023-05-11 -**/ + * @author lyd + * @description / + * @date 2023-05-11 + **/ @Data public class MdBaseVehicleDto implements Serializable { - /** 载具编码 */ + /** + * 载具编码 + */ private String vehicle_code; - /** 载具名称 */ + /** + * 载具名称 + */ private String vehicle_name; - /** 载具类型 */ + /** + * 载具类型 + */ private String vehicle_type; - /** 一维码 */ + /** + * 一维码 + */ private String one_code; - /** 二维码 */ + /** + * 二维码 + */ private String two_code; - /** RFID编码 */ + /** + * RFID编码 + */ private String rfid_code; - /** 载具宽度 */ + /** + * 载具宽度 + */ private BigDecimal vehicle_width; - /** 载具长度 */ + /** + * 载具长度 + */ private BigDecimal vehicle_long; - /** 载具高度 */ + /** + * 载具高度 + */ private BigDecimal vehicle_height; - /** 载具超仓位类型 */ + /** + * 载具超仓位类型 + */ private String overstruct_type; - /** 占仓位数 */ + /** + * 占仓位数 + */ private BigDecimal occupystruct_qty; - /** 外部标识 */ + /** + * 外部标识 + */ private String ext_id; - /** 创建人 */ + /** + * 创建人 + */ private String create_id; - /** 创建人 */ + /** + * 创建人 + */ private String create_name; - /** 创建时间 */ + /** + * 创建时间 + */ private String create_time; - /** 修改人 */ + /** + * 修改人 + */ private String update_id; - /** 修改人 */ + /** + * 修改人 + */ private String update_name; - /** 修改时间 */ + /** + * 修改时间 + */ private String update_time; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dto/MdBaseVehicleQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dto/MdBaseVehicleQuery.java index 7048638..6bd2703 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dto/MdBaseVehicleQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/dto/MdBaseVehicleQuery.java @@ -4,9 +4,9 @@ import org.nl.common.domain.query.BaseQuery; import org.nl.wms.database.vehicle.service.dao.MdBaseVehicle; /** -* @author lyd -* @date 2023-05-11 -**/ + * @author lyd + * @date 2023-05-11 + **/ public class MdBaseVehicleQuery extends BaseQuery { } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/impl/MdBaseVehicleServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/impl/MdBaseVehicleServiceImpl.java index cf5f734..35d80e6 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/impl/MdBaseVehicleServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/vehicle/service/impl/MdBaseVehicleServiceImpl.java @@ -7,14 +7,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; import org.nl.wms.database.vehicle.service.IMdBaseVehicleService; -import org.nl.wms.database.vehicle.service.dao.mapper.MdBaseVehicleMapper; import org.nl.wms.database.vehicle.service.dao.MdBaseVehicle; +import org.nl.wms.database.vehicle.service.dao.mapper.MdBaseVehicleMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -22,10 +21,10 @@ import java.util.Map; import java.util.Set; /** -* @description 服务实现 -* @author lyd -* @date 2023-05-11 -**/ + * @author lyd + * @description 服务实现 + * @date 2023-05-11 + **/ @Slf4j @Service public class MdBaseVehicleServiceImpl extends ServiceImpl implements IMdBaseVehicleService { @@ -34,7 +33,7 @@ public class MdBaseVehicleServiceImpl extends ServiceImpl queryAll(Map whereJson, PageQuery page){ + public IPage queryAll(Map whereJson, PageQuery page) { String vehicle_type = ObjectUtil.isNotEmpty(whereJson.get("vehicle_type")) ? whereJson.get("vehicle_type").toString() : null; String vehicle_code = ObjectUtil.isNotEmpty(whereJson.get("vehicle_code")) ? whereJson.get("vehicle_code").toString() : null; LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/controller/MdBaseWorkshopController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/controller/MdBaseWorkshopController.java index 1c63c37..9c08b87 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/controller/MdBaseWorkshopController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/controller/MdBaseWorkshopController.java @@ -1,7 +1,6 @@ package org.nl.wms.database.workshop.controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -16,13 +15,14 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; import java.util.Set; + /** -* @author lyd -* @date 2023-05-05 -**/ + * @author lyd + * @date 2023-05-05 + **/ @Slf4j @RestController -@Api(tags = "车间基础信息管理") + @RequestMapping("/api/mdBaseWorkshop") public class MdBaseWorkshopController { @@ -31,32 +31,32 @@ public class MdBaseWorkshopController { @GetMapping @Log("查询车间基础信息") - @ApiOperation("查询车间基础信息") + //@SaCheckPermission("@el.check('mdBaseWorkshop:list')") - public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ - return new ResponseEntity<>(TableDataInfo.build(mdBaseWorkshopService.queryAll(whereJson,page)),HttpStatus.OK); + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(mdBaseWorkshopService.queryAll(whereJson, page)), HttpStatus.OK); } @PostMapping @Log("新增车间基础信息") - @ApiOperation("新增车间基础信息") + //@SaCheckPermission("@el.check('mdBaseWorkshop:add')") - public ResponseEntity create(@Validated @RequestBody MdBaseWorkshop entity){ + public ResponseEntity create(@Validated @RequestBody MdBaseWorkshop entity) { mdBaseWorkshopService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping @Log("修改车间基础信息") - @ApiOperation("修改车间基础信息") + //@SaCheckPermission("@el.check('mdBaseWorkshop:edit')") - public ResponseEntity update(@Validated @RequestBody MdBaseWorkshop entity){ + public ResponseEntity update(@Validated @RequestBody MdBaseWorkshop entity) { mdBaseWorkshopService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除车间基础信息") - @ApiOperation("删除车间基础信息") + //@SaCheckPermission("@el.check('mdBaseWorkshop:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { @@ -66,9 +66,9 @@ public class MdBaseWorkshopController { @GetMapping("/getWorkShopList") @Log("获取车间下拉框") - @ApiOperation("获取车间下拉框") + //@SaCheckPermission("@el.check('mdBaseWorkshop:list')") - public ResponseEntity getWorkShopList(){ - return new ResponseEntity<>(mdBaseWorkshopService.getWorkShopList(),HttpStatus.OK); + public ResponseEntity getWorkShopList() { + return new ResponseEntity<>(mdBaseWorkshopService.getWorkShopList(), HttpStatus.OK); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/IMdBaseWorkshopService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/IMdBaseWorkshopService.java index be158c6..57fdb0e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/IMdBaseWorkshopService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/IMdBaseWorkshopService.java @@ -1,8 +1,8 @@ package org.nl.wms.database.workshop.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.nl.common.domain.query.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.database.workshop.service.dao.MdBaseWorkshop; import java.util.List; @@ -10,40 +10,45 @@ import java.util.Map; import java.util.Set; /** -* @description 服务接口 -* @author lyd -* @date 2023-05-05 -**/ + * @author lyd + * @description 服务接口 + * @date 2023-05-05 + **/ public interface IMdBaseWorkshopService extends IService { /** - * 查询数据分页 - * @param whereJson 条件 - * @param pageable 分页参数 - * @return IPage - */ + * 查询数据分页 + * + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ IPage queryAll(Map whereJson, PageQuery pageable); /** - * 创建 - * @param entity / - */ + * 创建 + * + * @param entity / + */ void create(MdBaseWorkshop entity); /** - * 编辑 - * @param entity / - */ + * 编辑 + * + * @param entity / + */ void update(MdBaseWorkshop entity); /** - * 多选删除 - * @param ids / - */ + * 多选删除 + * + * @param ids / + */ void deleteAll(Set ids); /** * 获取车间下拉框 + * * @return */ List getWorkShopList(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/MdBaseWorkshop.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/MdBaseWorkshop.java index 37a487a..0d5b0a2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/MdBaseWorkshop.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/MdBaseWorkshop.java @@ -3,55 +3,53 @@ package org.nl.wms.database.workshop.service.dao; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Table; import java.io.Serializable; /** -* @description / -* @author lyd -* @date 2023-05-05 -**/ + * @author lyd + * @description / + * @date 2023-05-05 + **/ @Data @EqualsAndHashCode(callSuper = false) @TableName("md_base_workshop") public class MdBaseWorkshop implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "workshop_code", type = IdType.NONE) - @ApiModelProperty(value = "车间编码") + private String workshop_code; - @ApiModelProperty(value = "车间名称 ") + private String workshop_name; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + private Boolean is_used; - @ApiModelProperty(value = "是否删除") + private Boolean is_delete; - @ApiModelProperty(value = "创建人") + private String create_id; - @ApiModelProperty(value = "创建人") + private String create_name; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改人") + private String update_id; - @ApiModelProperty(value = "修改人") + private String update_name; - @ApiModelProperty(value = "修改时间") + private String update_time; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/mapper/MdBaseWorkshopMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/mapper/MdBaseWorkshopMapper.java index 8b4819d..769f1b7 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/mapper/MdBaseWorkshopMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dao/mapper/MdBaseWorkshopMapper.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.nl.wms.database.workshop.service.dao.MdBaseWorkshop; /** -* @author lyd -* @date 2023-05-05 -**/ + * @author lyd + * @date 2023-05-05 + **/ public interface MdBaseWorkshopMapper extends BaseMapper { } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dto/MdBaseWorkshopDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dto/MdBaseWorkshopDto.java index c9a3178..7e86a5c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dto/MdBaseWorkshopDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dto/MdBaseWorkshopDto.java @@ -1,46 +1,69 @@ package org.nl.wms.database.workshop.service.dto; import lombok.Data; + import java.io.Serializable; /** -* @description / -* @author lyd -* @date 2023-05-05 -**/ + * @author lyd + * @description / + * @date 2023-05-05 + **/ @Data public class MdBaseWorkshopDto implements Serializable { - /** 车间编码 */ + /** + * 车间编码 + */ private String workshop_code; - /** 车间名称 */ + /** + * 车间名称 + */ private String workshop_name; - /** 备注 */ + /** + * 备注 + */ private String remark; - /** 是否启用 */ + /** + * 是否启用 + */ private String is_used; - /** 是否删除 */ + /** + * 是否删除 + */ private String is_delete; - /** 创建人 */ + /** + * 创建人 + */ private Long create_id; - /** 创建人 */ + /** + * 创建人 + */ private String create_name; - /** 创建时间 */ + /** + * 创建时间 + */ private String create_time; - /** 修改人 */ + /** + * 修改人 + */ private Long update_id; - /** 修改人 */ + /** + * 修改人 + */ private String update_name; - /** 修改时间 */ + /** + * 修改时间 + */ private String update_time; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dto/MdBaseWorkshopQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dto/MdBaseWorkshopQuery.java index a05b258..a4d0379 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dto/MdBaseWorkshopQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/dto/MdBaseWorkshopQuery.java @@ -4,9 +4,9 @@ import org.nl.common.domain.query.BaseQuery; import org.nl.wms.database.workshop.service.dao.MdBaseWorkshop; /** -* @author lyd -* @date 2023-05-05 -**/ + * @author lyd + * @date 2023-05-05 + **/ public class MdBaseWorkshopQuery extends BaseQuery { } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/impl/MdBaseWorkshopServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/impl/MdBaseWorkshopServiceImpl.java index aae4573..b354f40 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/impl/MdBaseWorkshopServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/database/workshop/service/impl/MdBaseWorkshopServiceImpl.java @@ -9,8 +9,8 @@ import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; import org.nl.common.utils.SecurityUtils; import org.nl.wms.database.workshop.service.IMdBaseWorkshopService; -import org.nl.wms.database.workshop.service.dao.mapper.MdBaseWorkshopMapper; import org.nl.wms.database.workshop.service.dao.MdBaseWorkshop; +import org.nl.wms.database.workshop.service.dao.mapper.MdBaseWorkshopMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -20,10 +20,10 @@ import java.util.Set; /** -* @description 服务实现 -* @author lyd -* @date 2023-05-05 -**/ + * @author lyd + * @description 服务实现 + * @date 2023-05-05 + **/ @Slf4j @Service public class MdBaseWorkshopServiceImpl extends ServiceImpl implements IMdBaseWorkshopService { @@ -32,7 +32,7 @@ public class MdBaseWorkshopServiceImpl extends ServiceImpl queryAll(Map whereJson, PageQuery page){ + public IPage queryAll(Map whereJson, PageQuery page) { LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); IPage pages = new Page<>(page.getPage() + 1, page.getSize()); mdBaseWorkshopMapper.selectPage(pages, lam); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/autotask/AutoCallMaterials.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/autotask/AutoCallMaterials.java index 50c2f22..d943e5f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/autotask/AutoCallMaterials.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/autotask/AutoCallMaterials.java @@ -44,8 +44,8 @@ public class AutoCallMaterials { // 校验记录表是否达到两条 List list = requestMaterialRecordService.list( new LambdaQueryWrapper() - .eq(PdmBdRequestMaterialRecord::getDevice_code, workorder.getPoint_code()) - .eq(PdmBdRequestMaterialRecord::getIs_delete, false)); + .eq(PdmBdRequestMaterialRecord::getDevice_code, workorder.getPoint_code()) + .eq(PdmBdRequestMaterialRecord::getIs_delete, false)); if (list.size() >= 2) { return; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/autotask/AutoIssueWorkOrder.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/autotask/AutoIssueWorkOrder.java index 238f5c6..8f0c4fd 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/autotask/AutoIssueWorkOrder.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/autotask/AutoIssueWorkOrder.java @@ -36,6 +36,7 @@ public class AutoIssueWorkOrder { private WmsToAcsService wmsToAcsService; @Autowired private ISysNoticeService noticeService; + @SneakyThrows public void run() { // 获取压制每台设备的第一条工单 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/controller/AcsToWmsController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/controller/AcsToWmsController.java index d66cf3a..bab53e3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/controller/AcsToWmsController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/controller/AcsToWmsController.java @@ -2,10 +2,7 @@ package org.nl.wms.ext.acs.controller; import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.nl.common.logging.annotation.Log; import org.nl.wms.ext.acs.service.AcsToWmsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; @@ -21,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController; * @Date: 2023/6/16 */ @RestController -@Api(tags = "acs请求lms") + @RequestMapping("/api/wms") @Slf4j public class AcsToWmsController { @@ -29,7 +26,7 @@ public class AcsToWmsController { private AcsToWmsService acsToWmsService; @PostMapping("/apply") - @ApiOperation("新增任务管理") + @SaIgnore public ResponseEntity apply(@RequestBody JSONObject param) { return new ResponseEntity<>(acsToWmsService.acsApply(param), HttpStatus.OK); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java index d66d55e..f470d8e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java @@ -14,6 +14,7 @@ import org.nl.wms.ext.acs.service.dto.to.wms.ApplyTaskRequest; public interface AcsToWmsService { /** * ACS请求接口 + * * @param param * @return */ @@ -21,6 +22,7 @@ public interface AcsToWmsService { /** * 任务：申请补满料盅托盘(叫料) + * * @param param * @return */ @@ -28,6 +30,7 @@ public interface AcsToWmsService { /** * 任务：申请补空料盅托盘(叫空盘) + * * @param param * @return */ @@ -35,6 +38,7 @@ public interface AcsToWmsService { /** * 任务：申请取走空料盅托盘(送空盘) + * * @param param * @return */ @@ -42,6 +46,7 @@ public interface AcsToWmsService { /** * 任务：申请取走满料盅托盘（入库） + * * @param param * @return */ @@ -49,6 +54,7 @@ public interface AcsToWmsService { /** * 任务：申请强制取走满料盅托盘(强制入库) + * * @param param * @return */ @@ -56,6 +62,7 @@ public interface AcsToWmsService { /** * 任务：分拣回收剩料 + * * @param param * @return */ @@ -63,6 +70,7 @@ public interface AcsToWmsService { /** * 强制去包装位(半托) 记录不包装 --- 业务不需要 + * * @param param * @return */ @@ -70,6 +78,7 @@ public interface AcsToWmsService { /** * 质检记录 + * * @param param * @return */ @@ -77,6 +86,7 @@ public interface AcsToWmsService { /** * 分拣 - 记录钢托与木托的绑定 + * * @param param * @return */ @@ -84,6 +94,7 @@ public interface AcsToWmsService { /** * 反馈压机残留重量 + * * @param param * @return */ @@ -91,6 +102,7 @@ public interface AcsToWmsService { /** * 申请贴标 + * * @param param * @return */ @@ -98,6 +110,7 @@ public interface AcsToWmsService { /** * 单次放置完成 - 每块砖的信息 + * * @param param * @return */ @@ -105,6 +118,7 @@ public interface AcsToWmsService { /** * 人工排产确认 + * * @param param * @return */ @@ -112,6 +126,7 @@ public interface AcsToWmsService { /** * 工单完成 + * * @param param * @return */ @@ -119,6 +134,7 @@ public interface AcsToWmsService { /** * 扫码成功申请 + * * @param param * @return */ @@ -126,6 +142,7 @@ public interface AcsToWmsService { /** * 扫码成功申请 - 判断是否静置完成 + * * @param baseRequest * @return */ @@ -133,6 +150,7 @@ public interface AcsToWmsService { /** * 扫码成功申请 - 入窑记录时间 + * * @param baseRequest * @return */ @@ -140,6 +158,7 @@ public interface AcsToWmsService { /** * 压机叫料 + * * @param param * @return */ @@ -147,6 +166,7 @@ public interface AcsToWmsService { /** * 任务反馈 + * * @param param * @return */ @@ -154,6 +174,7 @@ public interface AcsToWmsService { /** * 获取组盘信息 + * * @param param * @return */ @@ -161,6 +182,7 @@ public interface AcsToWmsService { /** * 实时修改点位状态 + * * @param param * @return */ @@ -168,6 +190,7 @@ public interface AcsToWmsService { /** * 布料记录 - 上传MES + * * @param param * @return */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java index ab3ab82..d505198 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java @@ -18,13 +18,16 @@ public interface WmsToAcsService { /** * 下发工单 + * * @param list: 工单链表 * @return */ AcsResponse order(List list); + /** * 下发任务 * 统一在这里维护 + * * @param list: 任务链表 * @return */ @@ -32,6 +35,7 @@ public interface WmsToAcsService { /** * 下发信号 - 覆膜机释放托盘 + * * @param list * @return */ @@ -39,6 +43,7 @@ public interface WmsToAcsService { /** * 获取设备状态 + * * @param list * @return */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/BrickInfoDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/BrickInfoDto.java index c3b6319..fea7f71 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/BrickInfoDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/BrickInfoDto.java @@ -10,36 +10,68 @@ import org.nl.wms.ext.acs.service.dto.to.BaseRequest; */ @Data public class BrickInfoDto extends BaseRequest { - /** 当前抓取工位 **/ + /** + * 当前抓取工位 + **/ private String get_station; - /** 当前放置工位 **/ + /** + * 当前放置工位 + **/ private String put_station; - /** 是否合格 **/ + /** + * 是否合格 + **/ private String is_qualified; - /** 激光标刻码 **/ + /** + * 激光标刻码 + **/ private String laser_marking_code; - /** 碾次 **/ + /** + * 碾次 + **/ private String grinding_number; - /** 重量 */ + /** + * 重量 + */ private String weight; - /** 高度1 **/ + /** + * 高度1 + **/ private String height1; - /** 高度2 **/ + /** + * 高度2 + **/ private String height2; - /** 高度3 **/ + /** + * 高度3 + **/ private String height3; - /** 高度4 **/ + /** + * 高度4 + **/ private String height4; - /** 宽度1 **/ + /** + * 宽度1 + **/ private String width1; - /** 宽度2 **/ + /** + * 宽度2 + **/ private String width2; - /** 长度 **/ + /** + * 长度 + **/ private String len; - /** 体积 **/ + /** + * 体积 + **/ private String volume; - /** 平面度 **/ + /** + * 平面度 + **/ private String flatness; - /** 缺陷个数 **/ + /** + * 缺陷个数 + **/ private String unqualified_qty; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/PalletizeDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/PalletizeDto.java index 8d59416..527d190 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/PalletizeDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/PalletizeDto.java @@ -9,112 +9,220 @@ import lombok.Data; */ @Data public class PalletizeDto { - /** 产品编号 */ + /** + * 产品编号 + */ private String product_code; - /** A长边 */ + /** + * A长边 + */ private String AlongSide; - /** B短边 */ + /** + * B短边 + */ private String BshortSide; - /** H梯形高 */ + /** + * H梯形高 + */ private String Htrapezoidal; - /** W厚度 */ + /** + * W厚度 + */ private String Wthickness; - /** 当前垛盘数 */ + /** + * 当前垛盘数 + */ private String tray_qty; - /** 垛盘高度 */ + /** + * 垛盘高度 + */ private String tray_high; - /** 垛型类别 */ + /** + * 垛型类别 + */ private String crib_category; - /** 码垛X1行 */ + /** + * 码垛X1行 + */ private String palletX1_line; - /** 码垛Y1列 */ + /** + * 码垛Y1列 + */ private String palletY1_row; - /** 码垛A1角度 */ + /** + * 码垛A1角度 + */ private String palletA1_angle; - /** 码垛X2行 */ + /** + * 码垛X2行 + */ private String palletX2_line; - /** 码垛Y2列 */ + /** + * 码垛Y2列 + */ private String palletY2_row; - /** 码垛A2角度 */ + /** + * 码垛A2角度 + */ private String palletA2_angle; - /** 码垛X3行 */ + /** + * 码垛X3行 + */ private String palletX3_line; - /** 码垛Y3列 */ + /** + * 码垛Y3列 + */ private String palletY3_row; - /** 码垛A3角度 */ + /** + * 码垛A3角度 + */ private String palletA3_angle; - /** 压垛X1行 */ + /** + * 压垛X1行 + */ private String pressCribX1_line; - /** 压垛Y1列 */ + /** + * 压垛Y1列 + */ private String pressCribY1_row; - /** 压垛A1角度 */ + /** + * 压垛A1角度 + */ private String pressCribA1_angle; - /** 压垛X2行 */ + /** + * 压垛X2行 + */ private String pressCribX2_line; - /** 压垛Y2列 */ + /** + * 压垛Y2列 + */ private String pressCribY2_row; - /** 压垛A2角度 */ + /** + * 压垛A2角度 + */ private String pressCribA2_angle; - /** 压垛X3行 */ + /** + * 压垛X3行 + */ private String pressCribX3_line; - /** 压垛Y3列 */ + /** + * 压垛Y3列 + */ private String pressCribY3_row; - /** 压垛A3角度 */ + /** + * 压垛A3角度 + */ private String pressCribA3_angle; - /** Z轴偏移 */ + /** + * Z轴偏移 + */ private String Zoffset; - /** 码垛层数 */ + /** + * 码垛层数 + */ private String pallet_layerQty; - /** 压垛层数 */ + /** + * 压垛层数 + */ private String pressCrib_layerQty; - /** 码层X1间隔 */ + /** + * 码层X1间隔 + */ private String codeLayerX1_interval; - /** 码层Y1间隔 */ + /** + * 码层Y1间隔 + */ private String codeLayerY1_interval; - /** 码层X2间隔 */ + /** + * 码层X2间隔 + */ private String codeLayerX2_interval; - /** 码层Y2间隔 */ + /** + * 码层Y2间隔 + */ private String codeLayerY2_interval; - /** 码层X3间隔 */ + /** + * 码层X3间隔 + */ private String codeLayerX3_interval; - /** 码层Y3间隔 */ + /** + * 码层Y3间隔 + */ private String codeLayerY3_interval; - /** 码层X1偏移 */ + /** + * 码层X1偏移 + */ private String codeLayerX1_offset; - /** 码层Y1偏移 */ + /** + * 码层Y1偏移 + */ private String codeLayerY1_offset; - /** 码层X2偏移 */ + /** + * 码层X2偏移 + */ private String codeLayerX2_offset; - /** 码层Y2偏移 */ + /** + * 码层Y2偏移 + */ private String codeLayerY2_offset; - /** 码层X3偏移 */ + /** + * 码层X3偏移 + */ private String codeLayerX3_offset; - /** 码层Y3偏移 */ + /** + * 码层Y3偏移 + */ private String codeLayerY3_offset; - /** 压层X1间隔 */ + /** + * 压层X1间隔 + */ private String pressLayerX1_interval; - /** 压层Y1间隔 */ + /** + * 压层Y1间隔 + */ private String pressLayerY1_interval; - /** 压层X2间隔 */ + /** + * 压层X2间隔 + */ private String pressLayerX2_interval; - /** 压层Y2间隔 */ + /** + * 压层Y2间隔 + */ private String pressLayerY2_interval; - /** 压层X3间隔 */ + /** + * 压层X3间隔 + */ private String pressLayerX3_interval; - /** 压层Y3间隔 */ + /** + * 压层Y3间隔 + */ private String pressLayerY3_interval; - /** 压层X1偏移 */ + /** + * 压层X1偏移 + */ private String pressLayerX1_offset; - /** 压层Y1偏移 */ + /** + * 压层Y1偏移 + */ private String pressLayerY1_offset; - /** 压层X2偏移 */ + /** + * 压层X2偏移 + */ private String pressLayerX2_offset; - /** 压层Y2偏移 */ + /** + * 压层Y2偏移 + */ private String pressLayerY2_offset; - /** 压层X3偏移 */ + /** + * 压层X3偏移 + */ private String pressLayerX3_offset; - /** 压层Y3偏移 */ + /** + * 压层Y3偏移 + */ private String pressLayerY3_offset; - /** 工具坐标 */ + /** + * 工具坐标 + */ private String tool_coordinate; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/SignalData.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/SignalData.java index 240d4cb..2b75c7b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/SignalData.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/SignalData.java @@ -11,7 +11,7 @@ import lombok.Data; public class SignalData { /** - * to_command + * to_command */ private String code; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/BaseResponse.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/BaseResponse.java index bb606ed..f624625 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/BaseResponse.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/BaseResponse.java @@ -64,6 +64,7 @@ public class BaseResponse implements Serializable { response.setResponseDate(DateUtil.now()); return response; } + public static BaseResponse responseOk(String requestNo, String message) { BaseResponse response = new BaseResponse(); response.setRequestNo(requestNo); @@ -72,6 +73,7 @@ public class BaseResponse implements Serializable { response.setResponseDate(DateUtil.now()); return response; } + public static BaseResponse responseOk(String requestNo, HashMap parameters) { BaseResponse response = new BaseResponse(); response.setRequestNo(requestNo); @@ -90,6 +92,7 @@ public class BaseResponse implements Serializable { response.setResponseDate(DateUtil.now()); return response; } + public static BaseResponse responseError(String requestNo, int code, String message) { BaseResponse response = new BaseResponse(); response.setRequestNo(requestNo); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/ApplyTaskResponse.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/ApplyTaskResponse.java index ca27255..f285d7b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/ApplyTaskResponse.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/ApplyTaskResponse.java @@ -50,6 +50,7 @@ public class ApplyTaskResponse extends BaseResponse { response.setIs_satisfy(0); return response; } + public static ApplyTaskResponse responseOk(String requestNo, String message, int is_satisfy) { ApplyTaskResponse response = new ApplyTaskResponse(); response.setRequestNo(requestNo); @@ -60,6 +61,7 @@ public class ApplyTaskResponse extends BaseResponse { response.setIs_satisfy(is_satisfy); return response; } + public static ApplyTaskResponse responseError(String requestNo, String message) { ApplyTaskResponse response = new ApplyTaskResponse(); response.setRequestNo(requestNo); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/CancelTaskRequest.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/CancelTaskRequest.java index 749bef8..8f636c8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/CancelTaskRequest.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/CancelTaskRequest.java @@ -31,7 +31,7 @@ public class CancelTaskRequest extends BaseRequest { /** * 扩展属性 */ - Map params; + Map params; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/GetPalletizeResponse.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/GetPalletizeResponse.java index 12ab084..eb59cf5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/GetPalletizeResponse.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/GetPalletizeResponse.java @@ -3,8 +3,8 @@ package org.nl.wms.ext.acs.service.dto.to.acs; import cn.hutool.core.date.DateUtil; import cn.hutool.http.HttpStatus; import lombok.Data; -import org.nl.wms.ext.acs.service.dto.to.BaseResponse; import org.nl.wms.ext.acs.service.dto.PalletizeDto; +import org.nl.wms.ext.acs.service.dto.to.BaseResponse; /** * @Author: lyd @@ -35,6 +35,7 @@ public class GetPalletizeResponse extends BaseResponse { response.setResponseDate(DateUtil.now()); return response; } + public static GetPalletizeResponse responseOk(String requestNo, PalletizeDto palletizeDto, Integer material_qty) { GetPalletizeResponse response = new GetPalletizeResponse(); response.setRequestNo(requestNo); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/PutActionRequest.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/PutActionRequest.java index d926880..a620848 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/PutActionRequest.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/acs/PutActionRequest.java @@ -3,8 +3,8 @@ package org.nl.wms.ext.acs.service.dto.to.acs; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import lombok.Data; -import org.nl.wms.ext.acs.service.dto.to.BaseRequest; import org.nl.wms.ext.acs.service.dto.SignalData; +import org.nl.wms.ext.acs.service.dto.to.BaseRequest; import java.util.List; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/ApplyDeviceDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/ApplyDeviceDto.java index 68a7c18..3c020f9 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/ApplyDeviceDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/ApplyDeviceDto.java @@ -13,20 +13,20 @@ public class ApplyDeviceDto { /** * 设备编码 */ - private String device_code; + private String device_code; /** * 数量 */ - private String qty; + private String qty; /** * 载具号 */ - private String vehicle_code; + private String vehicle_code; /** * 载具类型 */ - private String vehicle_type; + private String vehicle_type; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/ApplyTaskRequest.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/ApplyTaskRequest.java index be3bcb4..830c043 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/ApplyTaskRequest.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/ApplyTaskRequest.java @@ -1,8 +1,8 @@ package org.nl.wms.ext.acs.service.dto.to.wms; import lombok.Data; -import org.nl.wms.ext.acs.service.dto.to.BaseRequest; import org.nl.wms.ext.acs.service.dto.PalletizeDto; +import org.nl.wms.ext.acs.service.dto.to.BaseRequest; import java.util.List; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/FeedBackTaskStatusRequest.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/FeedBackTaskStatusRequest.java index 3bbf020..0c9100f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/FeedBackTaskStatusRequest.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/dto/to/wms/FeedBackTaskStatusRequest.java @@ -12,12 +12,12 @@ import org.nl.wms.ext.acs.service.dto.to.BaseRequest; public class FeedBackTaskStatusRequest extends BaseRequest { /** - * 任务id + * 任务id */ private String task_id; /** - * 任务code + * 任务code */ private String task_code; @@ -32,7 +32,7 @@ public class FeedBackTaskStatusRequest extends BaseRequest { private String task_type; /** - * 车号 + * 车号 */ private String car_no; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 0b949cf..683ed78 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -676,14 +676,14 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { if (!rawMaterialCode.equals(one.getRedundance_material_code())) { throw new BadRequestException("物料不一样!"); } - if (ObjectUtil.isNotEmpty(basePoint)) { - // 记录当前位置 - one.setPoint_code(basePoint.getPoint_code()); - one.setPoint_name(basePoint.getPoint_name()); - one.setMove_way(one.getMove_way() + " -> " + basePoint.getPoint_code()); - } // 判断是否静置完成 if (CommonUtils.isStandingFinish(one.getInstorage_time(), one.getStanding_time())) { + if (ObjectUtil.isNotEmpty(basePoint)) { + // 记录当前位置 + one.setPoint_code(basePoint.getPoint_code()); + one.setPoint_name(basePoint.getPoint_name()); + one.setMove_way(one.getMove_way() + " -> " + basePoint.getPoint_code()); + } one.setGroup_bind_material_status(GroupBindMaterialStatusEnum.UNBOUND.getValue()); // 记录泥料 MesMudConsumptionDto mesMudConsumptionDto = new MesMudConsumptionDto(); @@ -691,7 +691,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { mesMudConsumptionDto.setPWORKSCHE_ID(productionTask.getWorkorder_code()); mesMudConsumptionDto.setOUT_FINNUM(one.getMaterial_weight()); mesMudConsumptionDto.setPRESSUNIT(devicePoint.getExt_point_code()); - mesMudConsumptionDto.setFBAGCODE(one.getPcsn()); // 吨袋号 + mesMudConsumptionDto.setFBAGCODE(one.getPcsn()); mesMudConsumptionDto.setLOGT("配料仓"); mesMudConsumptionDto.setSENDTIM(DateUtil.now()); mesMudConsumptionDto.setCREATE_TM(DateUtil.now()); @@ -706,7 +706,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { // 泥料数据删除 List list = requestMaterialRecordService.list(new LambdaQueryWrapper() .eq(PdmBdRequestMaterialRecord::getDevice_code, productionTask.getPoint_code()) - .eq(PdmBdRequestMaterialRecord::getWorkorder_id, productionTask.getWorkorder_code()) // 工单编码 + .eq(PdmBdRequestMaterialRecord::getWorkorder_id, productionTask.getWorkorder_code()) .eq(PdmBdRequestMaterialRecord::getIs_delete, false) .eq(PdmBdRequestMaterialRecord::getIs_finish, true) .orderByAsc(PdmBdRequestMaterialRecord::getCreate_time)); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java index d125721..adaf23d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java @@ -28,6 +28,7 @@ import java.util.List; public class WmsToAcsServiceImpl implements WmsToAcsService { @Autowired private ISysInteractRecordService interactRecordService; + @Override public AcsResponse order(List list) { String api = "api/wms/order"; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSaveGdyInfo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSaveGdyInfo.java index 375a618..f1d49c3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSaveGdyInfo.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSaveGdyInfo.java @@ -33,6 +33,7 @@ public class AutoSaveGdyInfo { private MesRequestMapper mesRequestMapper; @Autowired private ISysNoticeService noticeService; + @SneakyThrows public void run() { // 获取当前窑内信息 @@ -41,7 +42,7 @@ public class AutoSaveGdyInfo { long startTime = System.currentTimeMillis(); // 插入数据 list.forEach(mesGdyInfoDto -> { - mesGdyInfoDto.setMSGID(IdUtil.getSnowflake(1,1).nextIdStr()); + mesGdyInfoDto.setMSGID(IdUtil.getSnowflake(1, 1).nextIdStr()); mesGdyInfoDto.setSEND_TM(DateUtil.now()); mesGdyInfoDto.setPRO_SUBUNIT("块"); mesGdyInfoDto.setDEVICE("1"); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSaveProductionInfo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSaveProductionInfo.java index 31be062..4b7cc86 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSaveProductionInfo.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSaveProductionInfo.java @@ -30,6 +30,7 @@ public class AutoSaveProductionInfo { private WmsToMesService wmsToMesService; @Autowired private ISysNoticeService noticeService; + @SneakyThrows public void run() { // 1、获取所有半成品实时库存 @@ -38,7 +39,7 @@ public class AutoSaveProductionInfo { long startTime = System.currentTimeMillis(); // 2、设置唯一标识 list.forEach(mi -> { - mi.setMSGID(IdUtil.getSnowflake(1,1).nextIdStr()); + mi.setMSGID(IdUtil.getSnowflake(1, 1).nextIdStr()); mi.setSEND_TM(DateUtil.now()); mi.setSTOCK_UNIT("块"); mi.setCREATE_TM(DateUtil.now()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSaveShelfInformation.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSaveShelfInformation.java index 66d1673..d981678 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSaveShelfInformation.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSaveShelfInformation.java @@ -2,7 +2,6 @@ package org.nl.wms.ext.mes.autotask; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.ObjectUtil; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.nl.system.service.notice.ISysNoticeService; @@ -30,6 +29,7 @@ public class AutoSaveShelfInformation { private WmsToMesService wmsToMesService; @Autowired private ISysNoticeService noticeService; + @SneakyThrows public void run() { // 获取所有货架上的信息 @@ -38,7 +38,7 @@ public class AutoSaveShelfInformation { long startTime = System.currentTimeMillis(); String now = DateUtil.now(); mesShelfInfos.forEach(shelfInfo -> { - shelfInfo.setMSGID(IdUtil.getSnowflake(1,1).nextIdStr()); + shelfInfo.setMSGID(IdUtil.getSnowflake(1, 1).nextIdStr()); shelfInfo.setCREATE_TM(now); shelfInfo.setSEND_TM(now); shelfInfo.setOP_FLAG(GeneralDefinition.NO); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSaveWaitGdyInfo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSaveWaitGdyInfo.java index 64558f0..75e836f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSaveWaitGdyInfo.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSaveWaitGdyInfo.java @@ -33,6 +33,7 @@ public class AutoSaveWaitGdyInfo { private MesRequestMapper mesRequestMapper; @Autowired private ISysNoticeService noticeService; + @SneakyThrows public void run() { // 获取滚筒线内数据 @@ -42,7 +43,7 @@ public class AutoSaveWaitGdyInfo { log.info("获取滚筒线内数据：{}", list); // 存入表中 list.forEach(mesGdyInfoWaitDto -> { - mesGdyInfoWaitDto.setMSGID(IdUtil.getSnowflake(1,1).nextIdStr()); + mesGdyInfoWaitDto.setMSGID(IdUtil.getSnowflake(1, 1).nextIdStr()); mesGdyInfoWaitDto.setPRO_SUBUNIT("块"); mesGdyInfoWaitDto.setCREATE_TM(DateUtil.now()); mesGdyInfoWaitDto.setOP_FLAG(GeneralDefinition.NO); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSynMaterialInfo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSynMaterialInfo.java index c39b48b..1b77849 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSynMaterialInfo.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSynMaterialInfo.java @@ -18,6 +18,7 @@ import org.springframework.stereotype.Component; public class AutoSynMaterialInfo { @Autowired private WmsToMesService wmsToMesService; + @SneakyThrows public void run() { wmsToMesService.synchronizeMaterialInfo(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSynWorkOrderInfo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSynWorkOrderInfo.java index d773ddb..ec06172 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSynWorkOrderInfo.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/autotask/AutoSynWorkOrderInfo.java @@ -3,14 +3,10 @@ package org.nl.wms.ext.mes.autotask; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.nl.wms.ext.mes.service.WmsToMesService; -import org.redisson.api.RLock; -import org.redisson.api.RedissonClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.annotation.Order; import org.springframework.stereotype.Component; -import java.util.concurrent.TimeUnit; - /** * @Author: lyd * @Description: 自动同步工单 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/controller/MesToWmsController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/controller/MesToWmsController.java index c4bf793..a1e498a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/controller/MesToWmsController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/controller/MesToWmsController.java @@ -1,17 +1,7 @@ package org.nl.wms.ext.mes.controller; import cn.dev33.satoken.annotation.SaIgnore; -import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; -import org.nl.common.logging.annotation.Log; -import org.nl.wms.ext.mes.service.MesToWmsService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -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; @@ -21,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController; * @Date: 2023/8/30 */ @RestController -@Api(tags = "mes请求lms") + @RequestMapping("/api/mes") @Slf4j @SaIgnore diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/controller/WmsToMesController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/controller/WmsToMesController.java index 7829ea3..3d2a728 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/controller/WmsToMesController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/controller/WmsToMesController.java @@ -1,16 +1,13 @@ package org.nl.wms.ext.mes.controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; import org.nl.common.logging.annotation.Log; -import org.nl.wms.database.classification.service.dao.MdBaseClassstandard; import org.nl.wms.ext.mes.service.WmsToMesService; import org.nl.wms.ext.mes.service.dto.ScrapDto; import org.nl.wms.ext.mes.service.dto.ScrapQuery; -import org.nl.wms.pdm.workorder.service.dto.PdmBdWorkorderQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -23,24 +20,25 @@ import org.springframework.web.bind.annotation.*; * @Date: 2023/11/29 */ @RestController -@Api(tags = "mes请求lms") + @RequestMapping("/api/mes") @Slf4j public class WmsToMesController { @Autowired private WmsToMesService wmsToMesService; + @GetMapping("/mesScrapInfo") @Log("查询工序报废信息") - @ApiOperation("查询工序报废信息") - public ResponseEntity queryMesScrapInfo(ScrapQuery query, PageQuery page){ - return new ResponseEntity<>(TableDataInfo.build(wmsToMesService.queryMesScrapInfo(query,page)), HttpStatus.OK); + + public ResponseEntity queryMesScrapInfo(ScrapQuery query, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(wmsToMesService.queryMesScrapInfo(query, page)), HttpStatus.OK); } @PostMapping("/addScrap") @Log("新增工序报废") - @ApiOperation("新增工序报废") + //@SaCheckPermission("@el.check('mdBaseClassstandard:add')") - public ResponseEntity addScrap(@Validated @RequestBody ScrapDto entity){ + public ResponseEntity addScrap(@Validated @RequestBody ScrapDto entity) { wmsToMesService.addScrap(entity); return new ResponseEntity<>(HttpStatus.CREATED); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/MesToWmsService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/MesToWmsService.java index 4b67424..1b5e4c0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/MesToWmsService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/MesToWmsService.java @@ -1,7 +1,5 @@ package org.nl.wms.ext.mes.service; -import com.alibaba.fastjson.JSONObject; - /** * @Author: lyd * @Description: mes请求wms diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/WmsToMesService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/WmsToMesService.java index 6a81223..65412f3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/WmsToMesService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/WmsToMesService.java @@ -17,6 +17,7 @@ import java.util.List; public interface WmsToMesService { /** * wms上报mes泥料消耗记录 + * * @param mesMudConsumptionDto */ void reportMudConsumption(MesMudConsumptionDto mesMudConsumptionDto); @@ -25,6 +26,7 @@ public interface WmsToMesService { * 同步物料数据 */ void synchronizeMaterialInfo(); + /** * 同步工单数据 */ @@ -32,48 +34,56 @@ public interface WmsToMesService { /** * wms上报产出数据给mes + * * @param groupId */ void reportProductData(String groupId); /** * wms入滚筒线上报半成品入库信息 + * * @param groupId */ void reportSemiProductionInfoIn(String groupId); /** * wms出滚筒线上报半成品出库信息 + * * @param groupId */ void reportSemiProductionInfoOut(String groupId); /** * wms上报入窑记录信息 + * * @param group */ void reportGdyMaterialInfoIn(SchBaseVehiclematerialgroup group); /** * wms上报出窑数据 + * * @param groupId */ void reportGdyMaterialInfoOut(String groupId); /** * 获取所有半成品实时库存 + * * @return */ List getAllMesSemiProductionInfos(); /** * 插入MES数据库 + * * @param obj */ void saveSemiProductionBatchToMes(MesSemiProductionInfo obj); /** * 获取当前窑内信息 + * * @return */ List getAllMesGdyInfos(); @@ -81,42 +91,49 @@ public interface WmsToMesService { /** * 统计当前设备的不合格位置的数量作为不合格数 * 上报压机判废信息 + * * @param workorderCode */ void reportPressUnusedMaterial(PdmBdWorkorder workorderCode); /** * 获取所有待入窑数据 + * * @return */ List getAllWaitIntoGdyInfos(); /** * 上报mes砖块检测信息 + * * @param brickInfo */ void reportBrickInfo(MdBaseBrickInfo brickInfo); /** * 获取货架所有数据 + * * @return */ List getAllShelfInfos(); /** * 插入货架信息 + * * @param shelfInfo */ void saveShelfInfoBatchToMes(MesShelfInfo shelfInfo); /** * 获取所有客户信息 + * * @return */ List getCusterInfo(); /** * 获取客户信息 + * * @param custerNo * @return */ @@ -124,6 +141,7 @@ public interface WmsToMesService { /** * 分页获取数据 + * * @param currentPage * @param currentSize * @return @@ -132,6 +150,7 @@ public interface WmsToMesService { /** * 获取总数 + * * @param materialId * @return */ @@ -139,6 +158,7 @@ public interface WmsToMesService { /** * 获取用户实体 + * * @param custerName * @return */ @@ -146,18 +166,21 @@ public interface WmsToMesService { /** * 上报布料机数据 + * * @param spreaderDto */ void reportSpreaderInfoToMes(SpreaderDto spreaderDto); /** * 上报包装数据 + * * @param mesPackDto */ void reportPackInfo(MesPackDto mesPackDto); /** * 分页获取上报给mes的工序判废信息 + * * @param query * @param page * @return @@ -166,6 +189,7 @@ public interface WmsToMesService { /** * 新增工序报废 + * * @param entity */ void addScrap(ScrapDto entity); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.java index d0ef370..88b2a77 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.java @@ -2,10 +2,8 @@ package org.nl.wms.ext.mes.service.dao.mapper; import com.alibaba.fastjson.JSONObject; import com.baomidou.dynamic.datasource.annotation.DS; -import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.nl.wms.database.material.service.dao.MdBaseMaterial; -import org.nl.wms.ext.mes.autotask.AutoSaveWaitGdyInfo; import org.nl.wms.ext.mes.service.dto.*; import java.util.List; @@ -20,76 +18,107 @@ public interface MesRequestMapper { @DS("oracle") List getMesMaterialInfos(@Param("time") String time); + @DS("oracle") List getMesMaterialInfos2(); + @DS("oracle") List getMesWorkOrderInfos(); + @DS("oracle") void updateWorkOrderRead(@Param("list") List list); + @DS("oracle") void insertMudConsumptionInfo(MesMudConsumptionDto mudObject); + @DS("oracle") void insertProductData(MesProductDataDto mesProductDataDto); + @DS("oracle") void insertSemiProductInfo(MesSemiProductionInfoInDto semiProductionInfoInDto); + @DS("oracle") void insertSemiProductOutInfo(MesSemiProductionInfoOutDto semiProductionInfoOutDto); + @DS("oracle") void insertGdyMaterialIn(MesGdyMaterialInDto gdyMaterialInDto); + @DS("oracle") void insertGdyMaterialOut(MesGdyMaterialOutDto gdyMaterialOutDto); + @DS("mysql") List getAllMesSemiProductionInfos(); + @DS("oracle") void saveSemiProductionBatchToMes(MesSemiProductionInfo obj); + @DS("mysql") List getAllMesGdyInfos(); + @DS("oracle") void insertGdyMaterial(MesGdyInfoDto mesGdyInfoDto); + @DS("mysql") int countFPNumber(String workorderCode, String pointCode); + @DS("oracle") void insertMesUnusedInfo(MesUnusedDto mesUnusedDto); + @DS("mysql") List getAllWaitIntoGdyInfos(); + @DS("oracle") void insertGdyMaterialWait(MesGdyInfoWaitDto mesGdyInfoWaitDto); + @DS("oracle") void insertQSPressMonitorData(MesQSPressMonitorData mesQSPressMonitorData); + @DS("mysql") List getAllShelfInfos(); + @DS("oracle") void saveShelfInfoBatchToMes(MesShelfInfo shelfInfo); + @DS("oracle") List getCusterInfo(); + @DS("oracle") CusterDo getCusterByNo(String custerNo); + @DS("oracle") List selectPageMesOrder(String materialId, int currentPage, int currentSize); + /** * 获取当前物料的订单总数 + * * @param materialId * @return */ @DS("oracle") int getOrderTotalByMaterial(String materialId); + @DS("oracle") CusterDo getCusterByName(String custerName); + @DS("oracle") void reportSpreaderInfoToMes(SpreaderDto spreaderDto); + @DS("oracle") void reportPackInfo(MesPackDto mesPackDto); /** * 无参分页 - 自写 + * * @param currentPage * @param currentSize * @return */ @DS("oracle") List selectMesScrapInfo(int currentPage, int currentSize); + @DS("oracle") int getSemiProductGXPFTotal(); + @DS("oracle") void reportSemiProductGXPF(SemiProductGXPFDo semiProductGXPFDo); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml index 0f399ea..bc55cf1 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dao/mapper/MesRequestMapper.xml @@ -2,113 +2,160 @@ - INSERT INTO "LMSTELCOM"."RECEIVE_MUDMATERIEL_OUT"(MSGID, PWORKSCHE_ID, OUT_FINNUM, PRESSUNIT, FBAGCODE, LOGT, SENDTIM - , CREATE_TM, OP_FLAG) VALUES (#{MSGID}, #{PWORKSCHE_ID}, #{OUT_FINNUM}, #{PRESSUNIT}, #{FBAGCODE}, #{LOGT} - , #{SENDTIM}, #{CREATE_TM}, #{OP_FLAG}) + INSERT INTO "LMSTELCOM"."RECEIVE_MUDMATERIEL_OUT"( MSGID, PWORKSCHE_ID, OUT_FINNUM, PRESSUNIT, FBAGCODE, LOGT + , SENDTIM + , CREATE_TM, OP_FLAG) + VALUES ( #{MSGID}, #{PWORKSCHE_ID}, #{OUT_FINNUM}, #{PRESSUNIT}, #{FBAGCODE}, #{LOGT} + , #{SENDTIM}, #{CREATE_TM}, #{OP_FLAG}) - INSERT INTO "LMSTELCOM"."RECEIVE_R_SEMIPRODUCT"(MSGID, FORDER_NO, PWORKSCHE_ID, FPRODUCT_MATERIAL_ID - , FPRODUCT_MATERIAL_NAME, FMATSPEC, FMATMODEL, BATCHNO, PRESSUNIT, FTEAM, TRAY_NO, PRO_SUBNUM - , PRO_SUBUNIT, CHECKERIN_TIM, PRODATE, CREATE_TM, OP_FLAG) VALUES (#{MSGID}, #{FORDER_NO}, #{PWORKSCHE_ID} - , #{FPRODUCT_MATERIAL_ID}, #{FPRODUCT_MATERIAL_NAME}, #{FMATSPEC}, #{FMATMODEL}, #{BATCHNO}, #{PRESSUNIT} - , #{FTEAM}, #{TRAY_NO}, #{PRO_SUBNUM}, #{PRO_SUBUNIT}, #{CHECKERIN_TIM}, #{PRODATE}, #{CREATE_TM}, #{OP_FLAG}) + INSERT INTO "LMSTELCOM"."RECEIVE_R_SEMIPRODUCT"( MSGID, FORDER_NO, PWORKSCHE_ID, FPRODUCT_MATERIAL_ID + , FPRODUCT_MATERIAL_NAME, FMATSPEC, FMATMODEL, BATCHNO, PRESSUNIT + , FTEAM, TRAY_NO, PRO_SUBNUM + , PRO_SUBUNIT, CHECKERIN_TIM, PRODATE, CREATE_TM, OP_FLAG) + VALUES ( #{MSGID}, #{FORDER_NO}, #{PWORKSCHE_ID} + , #{FPRODUCT_MATERIAL_ID}, #{FPRODUCT_MATERIAL_NAME}, #{FMATSPEC}, #{FMATMODEL}, #{BATCHNO}, #{PRESSUNIT} + , #{FTEAM}, #{TRAY_NO}, #{PRO_SUBNUM}, #{PRO_SUBUNIT}, #{CHECKERIN_TIM}, #{PRODATE}, #{CREATE_TM} + , #{OP_FLAG}) - INSERT INTO "LMSTELCOM"."RECEIVE_CS_SEMIPROINFO_IN"(MSGID, FORDER_NO, PWORKSCHE_ID, PRESSUNIT, FSCHEDULE_ID - , FPRODUCT_MATERIAL_ID, FPRODUCT_MATERIAL_NAME, FMATSPEC, FMATMODEL, BATCHNO, FTEAM, TRAY_NO, PRO_SUBNUM - , PRO_SUBUNIT, CHECKERIN_TIM, PRODATE, CREATE_TM, OP_FLAG) VALUES (#{MSGID}, #{FORDER_NO}, #{PWORKSCHE_ID} - , #{PRESSUNIT}, #{FSCHEDULE_ID}, #{FPRODUCT_MATERIAL_ID}, #{FPRODUCT_MATERIAL_NAME}, #{FMATSPEC}, #{FMATMODEL} - , #{BATCHNO}, #{FTEAM}, #{TRAY_NO}, #{PRO_SUBNUM}, #{PRO_SUBUNIT}, #{CHECKERIN_TIM}, #{PRODATE}, #{CREATE_TM} - , #{OP_FLAG}) + INSERT INTO "LMSTELCOM"."RECEIVE_CS_SEMIPROINFO_IN"( MSGID, FORDER_NO, PWORKSCHE_ID, PRESSUNIT, FSCHEDULE_ID + , FPRODUCT_MATERIAL_ID, FPRODUCT_MATERIAL_NAME, FMATSPEC + , FMATMODEL, BATCHNO, FTEAM, TRAY_NO, PRO_SUBNUM + , PRO_SUBUNIT, CHECKERIN_TIM, PRODATE, CREATE_TM, OP_FLAG) + VALUES ( #{MSGID}, #{FORDER_NO}, #{PWORKSCHE_ID} + , #{PRESSUNIT}, #{FSCHEDULE_ID}, #{FPRODUCT_MATERIAL_ID}, #{FPRODUCT_MATERIAL_NAME}, #{FMATSPEC} + , #{FMATMODEL} + , #{BATCHNO}, #{FTEAM}, #{TRAY_NO}, #{PRO_SUBNUM}, #{PRO_SUBUNIT}, #{CHECKERIN_TIM}, #{PRODATE} + , #{CREATE_TM} + , #{OP_FLAG}) - INSERT INTO "LMSTELCOM"."RECEIVE_CS_SEMIPROINFO_OUT"(MSGID, SEMIPRODUCT_BATCHNO, PRODUCT_BATCHNO, FPRODUCT_MATERIAL_ID - , FPRODUCT_MATERIAL_NAME, FMATSPEC, FMATMODEL, PRO_SUBNUM, PRO_SUBUNIT, STOCK, STOCK_NAME, CHECKEROUT_TIM, OUTTYPE - , CREATE_TM, OP_FLAG) VALUES (#{MSGID}, #{SEMIPRODUCT_BATCHNO}, #{PRODUCT_BATCHNO}, #{FPRODUCT_MATERIAL_ID} - , #{FPRODUCT_MATERIAL_NAME}, #{FMATSPEC}, #{FMATMODEL}, #{PRO_SUBNUM}, #{PRO_SUBUNIT}, #{STOCK}, #{STOCK_NAME} - , #{CHECKEROUT_TIM}, #{OUTTYPE}, #{CREATE_TM}, #{OP_FLAG}) + INSERT INTO "LMSTELCOM"."RECEIVE_CS_SEMIPROINFO_OUT"( MSGID, SEMIPRODUCT_BATCHNO, PRODUCT_BATCHNO + , FPRODUCT_MATERIAL_ID + , FPRODUCT_MATERIAL_NAME, FMATSPEC, FMATMODEL, PRO_SUBNUM + , PRO_SUBUNIT, STOCK, STOCK_NAME, CHECKEROUT_TIM, OUTTYPE + , CREATE_TM, OP_FLAG) + VALUES ( #{MSGID}, #{SEMIPRODUCT_BATCHNO}, #{PRODUCT_BATCHNO}, #{FPRODUCT_MATERIAL_ID} + , #{FPRODUCT_MATERIAL_NAME}, #{FMATSPEC}, #{FMATMODEL}, #{PRO_SUBNUM}, #{PRO_SUBUNIT}, #{STOCK} + , #{STOCK_NAME} + , #{CHECKEROUT_TIM}, #{OUTTYPE}, #{CREATE_TM}, #{OP_FLAG}) - INSERT INTO "LMSTELCOM"."RECEIVE_GDY_MATIN"(MSGID, TRAY_NO, FPRODUCT_MATERIAL_ID, FPRODUCT_MATERIAL_NAME - , FMATSPEC, FMATMODEL, BATCHNO, PRESSUNIT, PRO_SUBNUM, PRO_SUBUNIT, FCONVERTRATE, STOCK, DEVICE, IN_DATE - , CREATE_TM, OP_FLAG) VALUES (#{MSGID}, #{TRAY_NO}, #{FPRODUCT_MATERIAL_ID}, #{FPRODUCT_MATERIAL_NAME} - , #{FMATSPEC}, #{FMATMODEL}, #{BATCHNO}, #{PRESSUNIT}, #{PRO_SUBNUM}, #{PRO_SUBUNIT}, #{FCONVERTRATE} - , #{STOCK}, #{DEVICE}, #{IN_DATE}, #{CREATE_TM}, #{OP_FLAG}) + INSERT INTO "LMSTELCOM"."RECEIVE_GDY_MATIN"( MSGID, TRAY_NO, FPRODUCT_MATERIAL_ID, FPRODUCT_MATERIAL_NAME + , FMATSPEC, FMATMODEL, BATCHNO, PRESSUNIT, PRO_SUBNUM, PRO_SUBUNIT + , FCONVERTRATE, STOCK, DEVICE, IN_DATE + , CREATE_TM, OP_FLAG) + VALUES ( #{MSGID}, #{TRAY_NO}, #{FPRODUCT_MATERIAL_ID}, #{FPRODUCT_MATERIAL_NAME} + , #{FMATSPEC}, #{FMATMODEL}, #{BATCHNO}, #{PRESSUNIT}, #{PRO_SUBNUM}, #{PRO_SUBUNIT}, #{FCONVERTRATE} + , #{STOCK}, #{DEVICE}, #{IN_DATE}, #{CREATE_TM}, #{OP_FLAG}) - INSERT INTO "LMSTELCOM"."RECEIVE_GDY_MATOUT"(MSGID, TRAY_NO, FPRODUCT_MATERIAL_ID, FPRODUCT_MATERIAL_NAME - , FMATSPEC, FMATMODEL, BATCHNO, PRESSUNIT, PRO_SUBNUM, PRO_SUBUNIT, FCONVERTRATE, STOCK, DEVICE, OUT_DATE - , CREATE_TM, OP_FLAG) VALUES (#{MSGID}, #{TRAY_NO}, #{FPRODUCT_MATERIAL_ID}, #{FPRODUCT_MATERIAL_NAME} - , #{FMATSPEC}, #{FMATMODEL}, #{BATCHNO}, #{PRESSUNIT}, #{PRO_SUBNUM}, #{PRO_SUBUNIT}, #{FCONVERTRATE} - , #{STOCK}, #{DEVICE}, #{OUT_DATE}, #{CREATE_TM}, #{OP_FLAG}) + INSERT INTO "LMSTELCOM"."RECEIVE_GDY_MATOUT"( MSGID, TRAY_NO, FPRODUCT_MATERIAL_ID, FPRODUCT_MATERIAL_NAME + , FMATSPEC, FMATMODEL, BATCHNO, PRESSUNIT, PRO_SUBNUM, PRO_SUBUNIT + , FCONVERTRATE, STOCK, DEVICE, OUT_DATE + , CREATE_TM, OP_FLAG) + VALUES ( #{MSGID}, #{TRAY_NO}, #{FPRODUCT_MATERIAL_ID}, #{FPRODUCT_MATERIAL_NAME} + , #{FMATSPEC}, #{FMATMODEL}, #{BATCHNO}, #{PRESSUNIT}, #{PRO_SUBNUM}, #{PRO_SUBUNIT}, #{FCONVERTRATE} + , #{STOCK}, #{DEVICE}, #{OUT_DATE}, #{CREATE_TM}, #{OP_FLAG}) - INSERT INTO "LMSTELCOM"."RECEIVE_CS_SEMIPRODUCTIONINFO"(MSGID, SEND_TM, BATCHNO, ORDER_NO, STOCK_NUM - , STOCK_UNIT, MATERIAL_ID, MATERIAL_NAME, PROSPEC, PROMODEL, PRODATE, PRESSUNIT, CREATE_TM, OP_FLAG) - VALUES - (#{MSGID}, #{SEND_TM}, #{BATCHNO}, #{ORDER_NO}, #{STOCK_NUM} - , #{STOCK_UNIT}, #{MATERIAL_ID}, #{MATERIAL_NAME}, #{PROSPEC}, #{PROMODEL} - , #{PRODATE}, #{PRESSUNIT}, #{CREATE_TM}, #{OP_FLAG}) + INSERT INTO "LMSTELCOM"."RECEIVE_CS_SEMIPRODUCTIONINFO"( MSGID, SEND_TM, BATCHNO, ORDER_NO, STOCK_NUM + , STOCK_UNIT, MATERIAL_ID, MATERIAL_NAME, PROSPEC + , PROMODEL, PRODATE, PRESSUNIT, CREATE_TM, OP_FLAG) + VALUES ( #{MSGID}, #{SEND_TM}, #{BATCHNO}, #{ORDER_NO}, #{STOCK_NUM} + , #{STOCK_UNIT}, #{MATERIAL_ID}, #{MATERIAL_NAME}, #{PROSPEC}, #{PROMODEL} + , #{PRODATE}, #{PRESSUNIT}, #{CREATE_TM}, #{OP_FLAG}) - INSERT INTO "LMSTELCOM"."RECEIVE_GDY_MAT"(MSGID, SEND_TM, TRAY_NO, FPRODUCT_MATERIAL_ID, FPRODUCT_MATERIAL_NAME - , FMATSPEC, FMATMODEL, BATCHNO, PRESSUNIT, PRO_SUBNUM, PRO_SUBUNIT, DEVICE, DEVICEUNITPOST, IN_DATE, CREATE_TM - , OP_FLAG) - VALUES (#{MSGID}, #{SEND_TM}, #{TRAY_NO}, #{FPRODUCT_MATERIAL_ID}, #{FPRODUCT_MATERIAL_NAME} - , #{FMATSPEC}, #{FMATMODEL}, #{BATCHNO}, #{PRESSUNIT}, #{PRO_SUBNUM}, #{PRO_SUBUNIT}, #{DEVICE}, #{DEVICEUNITPOST} - , #{IN_DATE}, #{CREATE_TM}, #{OP_FLAG}) + INSERT INTO "LMSTELCOM"."RECEIVE_GDY_MAT"( MSGID, SEND_TM, TRAY_NO, FPRODUCT_MATERIAL_ID, FPRODUCT_MATERIAL_NAME + , FMATSPEC, FMATMODEL, BATCHNO, PRESSUNIT, PRO_SUBNUM, PRO_SUBUNIT + , DEVICE, DEVICEUNITPOST, IN_DATE, CREATE_TM + , OP_FLAG) + VALUES ( #{MSGID}, #{SEND_TM}, #{TRAY_NO}, #{FPRODUCT_MATERIAL_ID}, #{FPRODUCT_MATERIAL_NAME} + , #{FMATSPEC}, #{FMATMODEL}, #{BATCHNO}, #{PRESSUNIT}, #{PRO_SUBNUM}, #{PRO_SUBUNIT}, #{DEVICE} + , #{DEVICEUNITPOST} + , #{IN_DATE}, #{CREATE_TM}, #{OP_FLAG}) - INSERT INTO "LMSTELCOM"."RECEIVE_R_SEMIPRODUCT_JKPF"(MSGID, FORDER_NO, PWORKSCHE_ID, FSCHEDULE_ID, FPRODUCT_MATERIAL_ID - , FPRODUCT_MATERIAL_NAME, FMATSPEC, FMATMODEL, BATCHNO, PRESSUNIT, FTEAM, FPSUBNUM, FP_SUBUNIT, PRODATE - , CREATE_TM, OP_FLAG) - VALUES (#{MSGID}, #{FORDER_NO}, #{PWORKSCHE_ID}, #{FSCHEDULE_ID}, #{FPRODUCT_MATERIAL_ID}, #{FPRODUCT_MATERIAL_NAME}, #{FMATSPEC} - , #{FMATMODEL}, #{BATCHNO}, #{PRESSUNIT}, #{FTEAM}, #{FPSUBNUM}, #{FP_SUBUNIT}, #{PRODATE}, #{CREATE_TM}, #{OP_FLAG}) + INSERT INTO "LMSTELCOM"."RECEIVE_R_SEMIPRODUCT_JKPF"( MSGID, FORDER_NO, PWORKSCHE_ID, FSCHEDULE_ID + , FPRODUCT_MATERIAL_ID + , FPRODUCT_MATERIAL_NAME, FMATSPEC, FMATMODEL, BATCHNO + , PRESSUNIT, FTEAM, FPSUBNUM, FP_SUBUNIT, PRODATE + , CREATE_TM, OP_FLAG) + VALUES ( #{MSGID}, #{FORDER_NO}, #{PWORKSCHE_ID}, #{FSCHEDULE_ID}, #{FPRODUCT_MATERIAL_ID} + , #{FPRODUCT_MATERIAL_NAME}, #{FMATSPEC} + , #{FMATMODEL}, #{BATCHNO}, #{PRESSUNIT}, #{FTEAM}, #{FPSUBNUM}, #{FP_SUBUNIT}, #{PRODATE}, #{CREATE_TM} + , #{OP_FLAG}) - INSERT INTO "LMSTELCOM"."RECEIVE_GDY_MATWAIT"(MSGID, SEND_TM, TRAY_NO, FPRODUCT_MATERIAL_ID, FPRODUCT_MATERIAL_NAME - , FMATSPEC, FMATMODEL, BATCHNO, PRESSUNIT, PRO_SUBNUM, PRO_SUBUNIT, CREATE_TM, OP_FLAG) - VALUES (#{MSGID}, #{SEND_TM}, #{TRAY_NO}, #{FPRODUCT_MATERIAL_ID}, #{FPRODUCT_MATERIAL_NAME}, #{FMATSPEC} - , #{FMATMODEL}, #{BATCHNO}, #{PRESSUNIT}, #{PRO_SUBNUM}, #{PRO_SUBUNIT}, #{CREATE_TM}, #{OP_FLAG}) + INSERT INTO "LMSTELCOM"."RECEIVE_GDY_MATWAIT"( MSGID, SEND_TM, TRAY_NO, FPRODUCT_MATERIAL_ID + , FPRODUCT_MATERIAL_NAME + , FMATSPEC, FMATMODEL, BATCHNO, PRESSUNIT, PRO_SUBNUM, PRO_SUBUNIT + , CREATE_TM, OP_FLAG) + VALUES ( #{MSGID}, #{SEND_TM}, #{TRAY_NO}, #{FPRODUCT_MATERIAL_ID}, #{FPRODUCT_MATERIAL_NAME}, #{FMATSPEC} + , #{FMATMODEL}, #{BATCHNO}, #{PRESSUNIT}, #{PRO_SUBNUM}, #{PRO_SUBUNIT}, #{CREATE_TM}, #{OP_FLAG}) - INSERT INTO "LMSTELCOM"."RECEIVE_QS_PRESS_MONITORDATA"(BRICK_ID, GET_STATION, PUT_STATION, IS_QUALIFIED, LASER_MARKING_CODE - , WEIGHT, HEIGHT1, HEIGHT2, HEIGHT3, HEIGHT4, WIDTH1, WIDTH2, LEN, VOLUME, FLATNESS, UNQUALIFIED_QTY, WORKORDER_CODE - , CREATE_TM, OP_FLAG, MATERIAL_ID, MATERIAL_NAME, MATERIAL_SPEC, MATERIAL_MODEL, MACHINE_WET) VALUES - (#{BRICK_ID}, #{GET_STATION}, #{PUT_STATION}, #{IS_QUALIFIED}, #{LASER_MARKING_CODE} - , #{WEIGHT}, #{HEIGHT1}, #{HEIGHT2}, #{HEIGHT3}, #{HEIGHT4}, #{WIDTH1}, #{WIDTH2}, #{LEN}, #{VOLUME}, #{FLATNESS} - , #{UNQUALIFIED_QTY}, #{WORKORDER_CODE}, #{CREATE_TM}, #{OP_FLAG}, #{MATERIAL_ID}, #{MATERIAL_NAME} - , #{MATERIAL_SPEC}, #{MATERIAL_MODEL}, #{MACHINE_WET}) + INSERT INTO "LMSTELCOM"."RECEIVE_QS_PRESS_MONITORDATA"( BRICK_ID, GET_STATION, PUT_STATION, IS_QUALIFIED + , LASER_MARKING_CODE + , WEIGHT, HEIGHT1, HEIGHT2, HEIGHT3, HEIGHT4, WIDTH1 + , WIDTH2, LEN, VOLUME, FLATNESS, UNQUALIFIED_QTY + , WORKORDER_CODE + , CREATE_TM, OP_FLAG, MATERIAL_ID, MATERIAL_NAME + , MATERIAL_SPEC, MATERIAL_MODEL, MACHINE_WET) + VALUES ( #{BRICK_ID}, #{GET_STATION}, #{PUT_STATION}, #{IS_QUALIFIED}, #{LASER_MARKING_CODE} + , #{WEIGHT}, #{HEIGHT1}, #{HEIGHT2}, #{HEIGHT3}, #{HEIGHT4}, #{WIDTH1}, #{WIDTH2}, #{LEN}, #{VOLUME} + , #{FLATNESS} + , #{UNQUALIFIED_QTY}, #{WORKORDER_CODE}, #{CREATE_TM}, #{OP_FLAG}, #{MATERIAL_ID}, #{MATERIAL_NAME} + , #{MATERIAL_SPEC}, #{MATERIAL_MODEL}, #{MACHINE_WET}) - INSERT INTO "LMSTELCOM"."RECEIVE_LMS_BINSTA"(MSGID, SEND_TM, GROUP_ID, VEHICLE_TYPE, VEHICLE_CODE, MATERIAL_ID - , MATERIAL_NAME, MATSPEC, MATMODEL, SOURCE_VEHICLE_CODE, POINT_CODE, POINT_NAME, IS_FIRING, IS_FULL, PCSN - , INSTORAGE_TIME, STANDING_TIME, MATERIAL_QTY, MATERIAL_WEIGHT, WORKORDER_CODE, GROUP_NUMBER - , GROUP_BIND_MATERIAL_STATUS, MOVE_WAY, REMARK, UPDATE_TIME, OUT_KILN_TIME, INTO_KILN_TIME, CREATE_TM, OP_FLAG) - VALUES (#{MSGID}, #{SEND_TM}, #{GROUP_ID}, #{VEHICLE_TYPE}, #{VEHICLE_CODE}, #{MATERIAL_ID}, #{MATERIAL_NAME} - , #{MATSPEC}, #{MATMODEL}, #{SOURCE_VEHICLE_CODE}, #{POINT_CODE}, #{POINT_NAME}, #{IS_FIRING}, #{IS_FULL}, #{PCSN} - , #{INSTORAGE_TIME}, #{STANDING_TIME}, #{MATERIAL_QTY}, #{MATERIAL_WEIGHT}, #{WORKORDER_CODE}, #{GROUP_NUMBER} - , #{GROUP_BIND_MATERIAL_STATUS}, #{MOVE_WAY}, #{REMARK}, #{UPDATE_TIME}, #{OUT_KILN_TIME}, #{INTO_KILN_TIME} - , #{CREATE_TM}, #{OP_FLAG}) + INSERT INTO "LMSTELCOM"."RECEIVE_LMS_BINSTA"( MSGID, SEND_TM, GROUP_ID, VEHICLE_TYPE, VEHICLE_CODE, MATERIAL_ID + , MATERIAL_NAME, MATSPEC, MATMODEL, SOURCE_VEHICLE_CODE, POINT_CODE + , POINT_NAME, IS_FIRING, IS_FULL, PCSN + , INSTORAGE_TIME, STANDING_TIME, MATERIAL_QTY, MATERIAL_WEIGHT + , WORKORDER_CODE, GROUP_NUMBER + , GROUP_BIND_MATERIAL_STATUS, MOVE_WAY, REMARK, UPDATE_TIME + , OUT_KILN_TIME, INTO_KILN_TIME, CREATE_TM, OP_FLAG) + VALUES ( #{MSGID}, #{SEND_TM}, #{GROUP_ID}, #{VEHICLE_TYPE}, #{VEHICLE_CODE}, #{MATERIAL_ID}, #{MATERIAL_NAME} + , #{MATSPEC}, #{MATMODEL}, #{SOURCE_VEHICLE_CODE}, #{POINT_CODE}, #{POINT_NAME}, #{IS_FIRING}, #{IS_FULL} + , #{PCSN} + , #{INSTORAGE_TIME}, #{STANDING_TIME}, #{MATERIAL_QTY}, #{MATERIAL_WEIGHT}, #{WORKORDER_CODE} + , #{GROUP_NUMBER} + , #{GROUP_BIND_MATERIAL_STATUS}, #{MOVE_WAY}, #{REMARK}, #{UPDATE_TIME}, #{OUT_KILN_TIME} + , #{INTO_KILN_TIME} + , #{CREATE_TM}, #{OP_FLAG}) - INSERT INTO "LMSTELCOM"."RECEIVE_MUDLAYOUT_RECORD"(MSGID, TIM, ACT_WEIGHT, THEO_WEIGHT, MATERIAL_ID, MATERIAL_NAME - , MATERIAL_SPEC, MATERIAL_MODEL, FPROBATCH, CREATE_TM, OP_FLAG) - VALUES (#{MSGID}, #{TIM}, #{ACT_WEIGHT}, #{THEO_WEIGHT}, #{MATERIAL_ID}, #{MATERIAL_NAME}, #{MATERIAL_SPEC} - , #{MATERIAL_MODEL}, #{FPROBATCH,jdbcType=VARCHAR,typeHandler=org.nl.wms.util.StringHandler}, #{CREATE_TM}, #{OP_FLAG}) + INSERT INTO "LMSTELCOM"."RECEIVE_MUDLAYOUT_RECORD"( MSGID, TIM, ACT_WEIGHT, THEO_WEIGHT, MATERIAL_ID + , MATERIAL_NAME + , MATERIAL_SPEC, MATERIAL_MODEL, FPROBATCH, CREATE_TM + , OP_FLAG) + VALUES ( #{MSGID}, #{TIM}, #{ACT_WEIGHT}, #{THEO_WEIGHT}, #{MATERIAL_ID}, #{MATERIAL_NAME}, #{MATERIAL_SPEC} + , #{MATERIAL_MODEL}, #{FPROBATCH,jdbcType=VARCHAR,typeHandler=org.nl.wms.util.StringHandler} + , #{CREATE_TM}, #{OP_FLAG}) - INSERT INTO "LMSTELCOM"."RECEIVE_R_PRODUCT_PACK"(MSGID, BATCHNO, TRAY_NO, PRO_NUM, PRO_UNIT, PRO_SUBNUM, PRO_SUBUNIT - , MATERIAL_ID, MATERIAL_NAME, PROSPEC, PROMODEL, CHECKERIN_TIM, ORDER_NO) - VALUES (#{MSGID}, #{BATCHNO}, #{TRAY_NO}, #{PRO_NUM}, #{PRO_UNIT}, #{PRO_SUBNUM}, #{PRO_SUBUNIT}, #{MATERIAL_ID} - , #{MATERIAL_NAME}, #{PROSPEC}, #{PROMODEL}, #{CHECKERIN_TIM}, #{ORDER_NO}) + INSERT INTO "LMSTELCOM"."RECEIVE_R_PRODUCT_PACK"( MSGID, BATCHNO, TRAY_NO, PRO_NUM, PRO_UNIT, PRO_SUBNUM + , PRO_SUBUNIT + , MATERIAL_ID, MATERIAL_NAME, PROSPEC, PROMODEL, CHECKERIN_TIM + , ORDER_NO) + VALUES ( #{MSGID}, #{BATCHNO}, #{TRAY_NO}, #{PRO_NUM}, #{PRO_UNIT}, #{PRO_SUBNUM}, #{PRO_SUBUNIT} + , #{MATERIAL_ID} + , #{MATERIAL_NAME}, #{PROSPEC}, #{PROMODEL}, #{CHECKERIN_TIM}, #{ORDER_NO}) - INSERT INTO "LMSTELCOM"."RECEIVE_R_SEMIPRODUCT_GXPF"(MSGID, FORDER_NO, BATCHNO, DEVICE, FTEAM, PRODATE, WORKUNIT - , FP_NUM, FP_UNIT, FP_SUBNUM, FP_SUBUNIT, FP_REASON, FP_REMARK, IFJJ, EDTPFJJ_PROMATNO, CHECKERIN, CHECKERIN_TIM - , CREATE_TM, OP_FLAG) VALUES (#{MSGID}, #{FORDER_NO}, #{BATCHNO}, #{DEVICE}, #{FTEAM}, #{PRODATE}, #{WORKUNIT} - , #{FP_NUM}, #{FP_UNIT}, #{FP_SUBNUM}, #{FP_SUBUNIT}, #{FP_REASON}, #{FP_REMARK}, #{IFJJ}, #{EDTPFJJ_PROMATNO} - , #{CHECKERIN}, #{CHECKERIN_TIM}, #{CREATE_TM}, #{OP_FLAG}) + INSERT INTO "LMSTELCOM"."RECEIVE_R_SEMIPRODUCT_GXPF"( MSGID, FORDER_NO, BATCHNO, DEVICE, FTEAM, PRODATE + , WORKUNIT + , FP_NUM, FP_UNIT, FP_SUBNUM, FP_SUBUNIT, FP_REASON + , FP_REMARK, IFJJ, EDTPFJJ_PROMATNO, CHECKERIN + , CHECKERIN_TIM + , CREATE_TM, OP_FLAG) + VALUES ( #{MSGID}, #{FORDER_NO}, #{BATCHNO}, #{DEVICE}, #{FTEAM}, #{PRODATE}, #{WORKUNIT} + , #{FP_NUM}, #{FP_UNIT}, #{FP_SUBNUM}, #{FP_SUBUNIT}, #{FP_REASON}, #{FP_REMARK}, #{IFJJ} + , #{EDTPFJJ_PROMATNO} + , #{CHECKERIN}, #{CHECKERIN_TIM}, #{CREATE_TM}, #{OP_FLAG}) UPDATE "LMSTELCOM"."SEND_POP_SCHEDULE_PRESS" @@ -120,219 +167,202 @@ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesMudConsumptionDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesMudConsumptionDto.java index 256227f..050f915 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesMudConsumptionDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesMudConsumptionDto.java @@ -29,21 +29,37 @@ import java.math.BigDecimal; public class MesMudConsumptionDto implements Serializable { // 唯一标识 private String MSGID; - /** 压机作业计划号 */ + /** + * 压机作业计划号 + */ private String PWORKSCHE_ID; - /** 配料作业计划号 */ + /** + * 配料作业计划号 + */ private String FWORKSCHE_ID; - /** 配料批次号 */ + /** + * 配料批次号 + */ private String FPROBATCH; - /** 配料吨袋号 */ + /** + * 配料吨袋号 + */ private String FBAGCODE; - /** 泥料仓库编号 */ + /** + * 泥料仓库编号 + */ private String LOGT; - /** 出库数量 */ + /** + * 出库数量 + */ private BigDecimal OUT_NUMBER; - /** 出库重量 */ + /** + * 出库重量 + */ private BigDecimal OUT_FINNUM; - /** 出库理论重量 */ + /** + * 出库理论重量 + */ private BigDecimal OUT_THEONUM; private String PRESSUNIT; private String SENDTIM; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesProductDataDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesProductDataDto.java index a4f8d31..504117f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesProductDataDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesProductDataDto.java @@ -24,11 +24,17 @@ public class MesProductDataDto implements Serializable { private String PRESSUNIT; private String FTEAM; private String TRAY_NO; - /** 重量 */ + /** + * 重量 + */ private BigDecimal PRO_NUM; - /** 重量单位 */ + /** + * 重量单位 + */ private String PRO_UNIT; - /** 数量 */ + /** + * 数量 + */ private BigDecimal PRO_SUBNUM; private String PRO_SUBUNIT; private BigDecimal FP_SUBUNIT; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesWorkOrderDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesWorkOrderDto.java index d6f5ecf..d8873d9 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesWorkOrderDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/MesWorkOrderDto.java @@ -11,52 +11,100 @@ import java.math.BigDecimal; */ @Data public class MesWorkOrderDto { - /** 唯一标识 */ + /** + * 唯一标识 + */ private String MSGID; - /** 压机计划号 */ + /** + * 压机计划号 + */ private String PWORKSCHE_ID; - /** 日计划号 */ + /** + * 日计划号 + */ private String FSCHEDULE_ID; - /** 生产订单号 */ + /** + * 生产订单号 + */ private String FORDER_NO; - /** 生产日期 */ + /** + * 生产日期 + */ private String FPRODUCT_DATE; - /** 批次号 */ + /** + * 批次号 + */ private String BATCHNO; - /** 压机号 */ + /** + * 压机号 + */ private String PRESSUNIT; - /** 配料批次号 */ + /** + * 配料批次号 + */ private String FPROBATCH; - /** 物料编码 */ + /** + * 物料编码 + */ private String FPRODUCT_MATERIAL_ID; - /** 物料名称 */ + /** + * 物料名称 + */ private String FPRODUCT_MATERIAL_NAME; - /** 规格 */ + /** + * 规格 + */ private String FMATSPEC; - /** 型号 */ + /** + * 型号 + */ private String FMATMODEL; - /** 辅数量 */ + /** + * 辅数量 + */ private BigDecimal FPRODUCT_SUBNUM; - /** 辅单位 */ + /** + * 辅单位 + */ private String FPRODUCT_SUBUNIT; - /** 数量 */ + /** + * 数量 + */ private BigDecimal FPRODUCT_NUM; - /** 单位 */ + /** + * 单位 + */ private String FPRODUCT_UNIT; - /** 转换率 */ + /** + * 转换率 + */ private String FCONVERTRATE; - /** 班组 */ + /** + * 班组 + */ private String FTEAM; - /** 开始时间 */ + /** + * 开始时间 + */ private String BEGINTIME; - /** 结束时间 */ + /** + * 结束时间 + */ private String ENDTIME; - /** 写入时间 */ + /** + * 写入时间 + */ private String CREATE_TM; - /** 读取标志 */ + /** + * 读取标志 + */ private String OP_FLAG; - /** 结果 */ + /** + * 结果 + */ private String OP_REPLAY; - /** 读取时间 */ + /** + * 读取时间 + */ private String OP_TM; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/ResultForMes.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/ResultForMes.java index 8205e6e..0f5f885 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/ResultForMes.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/dto/ResultForMes.java @@ -1,7 +1,6 @@ package org.nl.wms.ext.mes.service.dto; import cn.hutool.http.HttpStatus; -import com.sun.org.apache.regexp.internal.RE; import lombok.Data; /** @@ -13,6 +12,7 @@ import lombok.Data; public class ResultForMes { private int status; private String message; + public static ResultForMes requestRefuse(String message) { ResultForMes result = new ResultForMes(); result.setStatus(HttpStatus.HTTP_BAD_REQUEST); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/MesToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/MesToWmsServiceImpl.java index dcb5e62..dc08289 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/MesToWmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/MesToWmsServiceImpl.java @@ -1,6 +1,5 @@ package org.nl.wms.ext.mes.service.impl; -import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.nl.wms.ext.mes.service.MesToWmsService; import org.springframework.stereotype.Service; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java index 0177c19..5b3c05c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mes/service/impl/WmsToMesServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -486,7 +485,7 @@ public class WmsToMesServiceImpl implements WmsToMesService { PdmBdWorkorder workorder = pdmBdWorkorderService.getByCode(gtp.getWorkorder_code()); mesWorkOrderDto = JSON.parseObject(workorder.getExt_data(), MesWorkOrderDto.class); } - semiProductGXPFDo.setMSGID(IdUtil.getSnowflake(1,1).nextIdStr()); + semiProductGXPFDo.setMSGID(IdUtil.getSnowflake(1, 1).nextIdStr()); semiProductGXPFDo.setFORDER_NO(mesWorkOrderDto.getFORDER_NO()); semiProductGXPFDo.setBATCHNO(mesWorkOrderDto.getBATCHNO()); semiProductGXPFDo.setDEVICE(mesWorkOrderDto.getPRESSUNIT()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mms/service/WmsToMmsService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mms/service/WmsToMmsService.java index dfd2613..5f825cd 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mms/service/WmsToMmsService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mms/service/WmsToMmsService.java @@ -10,6 +10,7 @@ import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder; public interface WmsToMmsService { /** * 混碾对接 + * * @param workorder */ void addRequestMaterial(PdmBdWorkorder workorder); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mms/service/dao/mapper/MmsRequestMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mms/service/dao/mapper/MmsRequestMapper.xml index f40e691..cea82df 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mms/service/dao/mapper/MmsRequestMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mms/service/dao/mapper/MmsRequestMapper.xml @@ -3,7 +3,8 @@ - INSERT INTO 压机要料表(日期, 配方号, 压机号, 生产订单号, 已配料) VALUES (#{request_date}, #{material_code} - , #{device_code}, #{production_order}, #{is_used}) + INSERT INTO 压机要料表(日期, 配方号, 压机号, 生产订单号, 已配料) + VALUES ( #{request_date}, #{material_code} + , #{device_code}, #{production_order}, #{is_used}) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mms/service/impl/WmsToMmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mms/service/impl/WmsToMmsServiceImpl.java index d6746de..fa830d5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mms/service/impl/WmsToMmsServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/mms/service/impl/WmsToMmsServiceImpl.java @@ -24,6 +24,7 @@ public class WmsToMmsServiceImpl implements WmsToMmsService { public MmsRequestMapper mmsRequestMapper; @Autowired private ISchBasePointService pointService; + @Override public void addRequestMaterial(PdmBdWorkorder workorder) { // 插入：压机、原材料、生产订单号、插入时间 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/controller/SysInteractRecordController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/controller/SysInteractRecordController.java index bc14d7c..fb2b521 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/controller/SysInteractRecordController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/controller/SysInteractRecordController.java @@ -1,7 +1,6 @@ package org.nl.wms.ext.record.controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -16,13 +15,14 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; import java.util.Set; + /** -* @author lyd -* @date 2023-07-19 -**/ + * @author lyd + * @date 2023-07-19 + **/ @Slf4j @RestController -@Api(tags = "外部系统接口记录管理") + @RequestMapping("/api/sysInteractRecord") public class SysInteractRecordController { @@ -31,29 +31,29 @@ public class SysInteractRecordController { @GetMapping @Log("查询外部系统接口记录") - @ApiOperation("查询外部系统接口记录") - public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ - return new ResponseEntity<>(TableDataInfo.build(sysInteractRecordService.queryAll(whereJson,page)),HttpStatus.OK); + + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(sysInteractRecordService.queryAll(whereJson, page)), HttpStatus.OK); } @PostMapping @Log("新增外部系统接口记录") - @ApiOperation("新增外部系统接口记录") - public ResponseEntity create(@Validated @RequestBody SysInteractRecord entity){ + + public ResponseEntity create(@Validated @RequestBody SysInteractRecord entity) { sysInteractRecordService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping @Log("修改外部系统接口记录") - @ApiOperation("修改外部系统接口记录") - public ResponseEntity update(@Validated @RequestBody SysInteractRecord entity){ + + public ResponseEntity update(@Validated @RequestBody SysInteractRecord entity) { sysInteractRecordService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除外部系统接口记录") - @ApiOperation("删除外部系统接口记录") + @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { sysInteractRecordService.deleteAll(ids); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/ISysInteractRecordService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/ISysInteractRecordService.java index d1fea31..1cdce8a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/ISysInteractRecordService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/ISysInteractRecordService.java @@ -1,6 +1,5 @@ package org.nl.wms.ext.record.service; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.nl.common.domain.query.PageQuery; @@ -8,7 +7,6 @@ import org.nl.system.service.param.dao.Param; import org.nl.wms.ext.acs.service.dto.ResultForAcs; import org.nl.wms.ext.acs.service.dto.to.BaseResponse; import org.nl.wms.ext.record.service.dao.SysInteractRecord; -import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder; import org.nl.wms.pdm.workorder.service.dao.vo.AcsWorkOrderVo; import java.util.List; @@ -16,78 +14,88 @@ import java.util.Map; import java.util.Set; /** -* @description 服务接口 -* @author lyd -* @date 2023-07-19 -**/ + * @author lyd + * @description 服务接口 + * @date 2023-07-19 + **/ public interface ISysInteractRecordService extends IService { /** - * 查询数据分页 - * @param whereJson 条件 - * @param pageable 分页参数 - * @return IPage - */ + * 查询数据分页 + * + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ IPage queryAll(Map whereJson, PageQuery pageable); /** - * 创建 - * @param entity / - */ + * 创建 + * + * @param entity / + */ void create(SysInteractRecord entity); /** - * 编辑 - * @param entity / - */ + * 编辑 + * + * @param entity / + */ void update(SysInteractRecord entity); /** - * 多选删除 - * @param ids / - */ + * 多选删除 + * + * @param ids / + */ void deleteAll(Set ids); /** * 创建记录 - * @param request 请求 - * @param response 响应 + * + * @param request 请求 + * @param response 响应 * @param direction 方向 */ void saveRecord(Object request, BaseResponse response, String direction); /** * 记录对接日志 - * @param workorder 工单 + * + * @param workorder 工单 * @param resultForAcs 结果 - * @param direction 方向 + * @param direction 方向 */ void saveRecord(AcsWorkOrderVo workorder, ResultForAcs resultForAcs, String direction); /** * 保存对接记录 - * @param name 保存对接记录 - * @param request 请求参数 - * @param response 响应参数，分类别 + * + * @param name 保存对接记录 + * @param request 请求参数 + * @param response 响应参数，分类别 * @param direction 请求方向 */ void saveRecord(String name, K request, V response, String direction); /** * 根据天数删除 + * * @param day 天数 */ void deleteByDay(String day); /** * 删除记录 - * @param maxRowsToKeep 最大保存容量 + * + * @param maxRowsToKeep 最大保存容量 * @param maxRowsToDelete 最大删除数 */ void deleteByRows(Param maxRowsToKeep, Param maxRowsToDelete); /** * 获取所有标题 + * * @return / */ List getAllInteractName(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/SysInteractRecord.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/SysInteractRecord.java index f5ef9a9..ef5b833 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/SysInteractRecord.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/SysInteractRecord.java @@ -3,17 +3,16 @@ package org.nl.wms.ext.record.service.dao; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; /** -* @description / -* @author lyd -* @date 2023-07-19 -**/ + * @author lyd + * @description / + * @date 2023-07-19 + **/ @Data @EqualsAndHashCode(callSuper = false) @TableName("sys_interact_record") @@ -22,31 +21,31 @@ public class SysInteractRecord implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "interact_id", type = IdType.NONE) - @ApiModelProperty(value = "对接标识") + private String interact_id; - @ApiModelProperty(value = "对接名称") + private String interact_name; - @ApiModelProperty(value = "响应编码") + private int code; - @ApiModelProperty(value = "响应信息") + private String message; - @ApiModelProperty(value = "请求报文") + private String request_param; - @ApiModelProperty(value = "响应结果") + private String response_param; - @ApiModelProperty(value = "记录时间") + private String record_time; - @ApiModelProperty(value = "方向") + private String direction; - @ApiModelProperty(value = "是否成功") + private Boolean is_success; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/mapper/SysInteractRecordMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/mapper/SysInteractRecordMapper.java index 5d24081..4be57f9 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/mapper/SysInteractRecordMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/mapper/SysInteractRecordMapper.java @@ -6,9 +6,9 @@ import org.nl.wms.ext.record.service.dao.SysInteractRecord; import java.util.List; /** -* @author lyd -* @date 2023-07-19 -**/ + * @author lyd + * @date 2023-07-19 + **/ public interface SysInteractRecordMapper extends BaseMapper { void deleteByDay(String day); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/mapper/SysInteractRecordMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/mapper/SysInteractRecordMapper.xml index 9a16974..e51414f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/mapper/SysInteractRecordMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dao/mapper/SysInteractRecordMapper.xml @@ -3,17 +3,16 @@ - DELETE FROM sys_interact_record + DELETE + FROM sys_interact_record WHERE record_time DATE_SUB(NOW(), INTERVAL #{day} DAY); CALL DeleteRowsIfNeeded(#{maxRowsToKeep}, #{maxRowsToDelete}) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dto/SysInteractRecordDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dto/SysInteractRecordDto.java index 3939677..bae0500 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dto/SysInteractRecordDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dto/SysInteractRecordDto.java @@ -1,40 +1,59 @@ package org.nl.wms.ext.record.service.dto; import lombok.Data; + import java.io.Serializable; /** -* @description / -* @author lyd -* @date 2023-07-19 -**/ + * @author lyd + * @description / + * @date 2023-07-19 + **/ @Data public class SysInteractRecordDto implements Serializable { - /** 对接标识 */ + /** + * 对接标识 + */ private String interact_id; - /** 对接编码 */ + /** + * 对接编码 + */ private String interact_code; - /** 响应编码 */ + /** + * 响应编码 + */ private String code; - /** 响应信息 */ + /** + * 响应信息 + */ private String message; - /** 请求报文 */ + /** + * 请求报文 + */ private String request_param; - /** 响应结果 */ + /** + * 响应结果 + */ private String response_param; - /** 记录时间 */ + /** + * 记录时间 + */ private String record_time; - /** 方向 */ + /** + * 方向 + */ private String direction; - /** 是否成功 */ + /** + * 是否成功 + */ private Boolean is_success; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dto/SysInteractRecordQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dto/SysInteractRecordQuery.java index 3222808..cbed512 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dto/SysInteractRecordQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/dto/SysInteractRecordQuery.java @@ -4,9 +4,9 @@ import org.nl.common.domain.query.BaseQuery; import org.nl.wms.ext.record.service.dao.SysInteractRecord; /** -* @author lyd -* @date 2023-07-19 -**/ + * @author lyd + * @date 2023-07-19 + **/ public class SysInteractRecordQuery extends BaseQuery { } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java index be5c5c0..849c000 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/record/service/impl/SysInteractRecordServiceImpl.java @@ -18,8 +18,8 @@ import org.nl.wms.ext.acs.service.dto.to.BaseResponse; import org.nl.wms.ext.acs.service.dto.to.wms.AcsResponse; import org.nl.wms.ext.mes.service.dto.ResultForMes; import org.nl.wms.ext.record.service.ISysInteractRecordService; -import org.nl.wms.ext.record.service.dao.mapper.SysInteractRecordMapper; import org.nl.wms.ext.record.service.dao.SysInteractRecord; +import org.nl.wms.ext.record.service.dao.mapper.SysInteractRecordMapper; import org.nl.wms.pdm.workorder.service.dao.vo.AcsWorkOrderVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -30,10 +30,10 @@ import java.util.Map; import java.util.Set; /** -* @description 服务实现 -* @author lyd -* @date 2023-07-19 -**/ + * @author lyd + * @description 服务实现 + * @date 2023-07-19 + **/ @Slf4j @Service public class SysInteractRecordServiceImpl extends ServiceImpl implements ISysInteractRecordService { @@ -42,7 +42,7 @@ public class SysInteractRecordServiceImpl extends ServiceImpl queryAll(Map whereJson, PageQuery page){ + public IPage queryAll(Map whereJson, PageQuery page) { String blurry = ObjectUtil.isNotEmpty(whereJson.get("blurry")) ? whereJson.get("blurry").toString() : null; String interactDirection = ObjectUtil.isNotEmpty(whereJson.get("interact_direction")) @@ -52,7 +52,7 @@ public class SysInteractRecordServiceImpl extends ServiceImpl lam = new LambdaQueryWrapper<>(); - lam.eq(interactDirection!=null, SysInteractRecord::getDirection, interactDirection) + lam.eq(interactDirection != null, SysInteractRecord::getDirection, interactDirection) .eq(ObjectUtil.isNotEmpty(interactName), SysInteractRecord::getInteract_name, interactName) .eq(ObjectUtil.isNotEmpty(httpCode), SysInteractRecord::getCode, httpCode) .and(blurry != null, s -> s.like(SysInteractRecord::getInteract_name, blurry) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java index 03fbd23..ae0069a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/controller/PdaController.java @@ -2,8 +2,6 @@ package org.nl.wms.pda.controller; import cn.dev33.satoken.annotation.SaIgnore; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.nl.common.logging.annotation.Log; import org.nl.wms.das.device.check.service.IDasDeviceCheckRecordService; @@ -15,7 +13,6 @@ import org.nl.wms.pda.service.dao.dto.*; import org.nl.wms.pda.service.dao.vo.PdaResponseVo; import org.nl.wms.pda.service.dao.vo.RequestMaterialInfoVo; import org.nl.wms.pdm.workorder.service.IPdmBdWorkorderService; -import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -32,7 +29,7 @@ import org.springframework.web.bind.annotation.RestController; */ @Slf4j @RestController -@Api(tags = "手持接口") + @RequestMapping("/api/pda") @SaIgnore public class PdaController { @@ -44,235 +41,236 @@ public class PdaController { private PdaService pdaService; @Autowired private IPdmBdWorkorderService workorderService; + @PostMapping("/deviceCheck/verify") @Log("设备点检") - @ApiOperation("设备点检") - public ResponseEntity deviceCheck(@Validated @RequestBody DasDeviceCheckRecord entity){ + + public ResponseEntity deviceCheck(@Validated @RequestBody DasDeviceCheckRecord entity) { return new ResponseEntity<>(deviceCheckRecordService.create(entity), HttpStatus.OK); } @PostMapping("/deviceCheck/deviceInfo") @Log("设备下拉框数据") - @ApiOperation("设备下拉框数据") - public ResponseEntity deviceInfo(){ + + public ResponseEntity deviceInfo() { return new ResponseEntity<>(pdaService.getDeviceInfo(), HttpStatus.OK); } @PostMapping("/deviceCheck/deviceStatus") @Log("设备状态下拉框数据") - @ApiOperation("设备状态下拉框数据") - public ResponseEntity deviceStatus(){ + + public ResponseEntity deviceStatus() { return new ResponseEntity<>(pdaService.getDeviceStatus(), HttpStatus.OK); } @PostMapping("/deviceSwitchover/deviceAction") @Log("设备动作下拉框数据") - @ApiOperation("设备动作下拉框数据") - public ResponseEntity deviceAction(){ + + public ResponseEntity deviceAction() { return new ResponseEntity<>(pdaService.deviceAction(), HttpStatus.OK); } @PostMapping("/deviceSwitchover/verify") @Log("设备动作切换") - @ApiOperation("设备动作切换") - public ResponseEntity deviceSwitchover(@Validated @RequestBody DasDeviceOperationRecord entity){ + + public ResponseEntity deviceSwitchover(@Validated @RequestBody DasDeviceOperationRecord entity) { return new ResponseEntity<>(deviceOperationRecordService.create(entity), HttpStatus.OK); } @PostMapping("/group/getPressCode") @Log("获取压机编码") - @ApiOperation("获取压机编码") - public ResponseEntity getPressCode(){ + + public ResponseEntity getPressCode() { return new ResponseEntity<>(pdaService.getDeviceInfo(), HttpStatus.OK); } @PostMapping("/group/getVehicleType") @Log("获取载具类型") - @ApiOperation("获取载具类型") - public ResponseEntity getVehicleType(){ + + public ResponseEntity getVehicleType() { return new ResponseEntity<>(pdaService.getVehicleType(), HttpStatus.OK); } @PostMapping("/group/getPressWorkOrder") @Log("获取工单编码") - @ApiOperation("获取工单编码") + @Deprecated - public ResponseEntity getPressWorkOrder(@RequestBody JSONObject param){ + public ResponseEntity getPressWorkOrder(@RequestBody JSONObject param) { return new ResponseEntity<>(workorderService.getDeviceProductionTask(param.getString("point_code")), HttpStatus.OK); } @PostMapping("/group/manual") @Log("人工组盘") - @ApiOperation("人工组盘") - public ResponseEntity manualDiskAssembly(@Validated @RequestBody ManualGroupDto entity){ + + public ResponseEntity manualDiskAssembly(@Validated @RequestBody ManualGroupDto entity) { return new ResponseEntity<>(pdaService.manualCreateByPda(entity), HttpStatus.OK); } @PostMapping("/move/getBlendingCode") @Log("获取混碾机编码") - @ApiOperation("获取混碾机编码") - public ResponseEntity getBlendingCode(){ + + public ResponseEntity getBlendingCode() { return new ResponseEntity<>(pdaService.getBlendingCode(), HttpStatus.OK); } @PostMapping("/move/sendTask") @Log("生成混碾->压机任务") - @ApiOperation("生成混碾->压机任务") - public ResponseEntity sendTask(@Validated @RequestBody BlendingMoveDto blendingMoveDto){ + + public ResponseEntity sendTask(@Validated @RequestBody BlendingMoveDto blendingMoveDto) { return new ResponseEntity<>(pdaService.sendTask(blendingMoveDto), HttpStatus.OK); } @PostMapping("/forcedResting/show") @Log("显示静置时长") - @ApiOperation("显示静置时长") - public ResponseEntity forcedRestingShow(){ + + public ResponseEntity forcedRestingShow() { return new ResponseEntity<>(pdaService.forcedRestingShow(), HttpStatus.OK); } @PostMapping("/forcedResting/submit") @Log("强制静置") - @ApiOperation("强制静置") - public ResponseEntity forcedResting(@Validated @RequestBody ForcedRestingDto forcedRestingDto){ + + public ResponseEntity forcedResting(@Validated @RequestBody ForcedRestingDto forcedRestingDto) { return new ResponseEntity<>(pdaService.forcedResting(forcedRestingDto), HttpStatus.OK); } @PostMapping("/manualSorting/orders") @Log("人工分拣-显示工单") - @ApiOperation("人工分拣-显示工单") - public ResponseEntity manualOrders(){ + + public ResponseEntity manualOrders() { return new ResponseEntity<>(pdaService.manualOrders(), HttpStatus.OK); } @PostMapping("/manualSorting/productionScheduling") @Log("人工分拣-开工") - @ApiOperation("人工分拣-开工") - public ResponseEntity productionScheduling(@Validated @RequestBody ManualSortingDto manualSortingDto){ + + public ResponseEntity productionScheduling(@Validated @RequestBody ManualSortingDto manualSortingDto) { return new ResponseEntity<>(pdaService.productionScheduling(manualSortingDto), HttpStatus.OK); } @PostMapping("/manualSorting/productionComplete") @Log("人工分拣-完工") - @ApiOperation("人工分拣-完工") - public ResponseEntity productionComplete(@Validated @RequestBody ManualSortingDto manualSortingDto){ + + public ResponseEntity productionComplete(@Validated @RequestBody ManualSortingDto manualSortingDto) { return new ResponseEntity<>(pdaService.productionComplete(manualSortingDto), HttpStatus.OK); } @PostMapping("/manualSorting/emptyDiskIntoStorageTask") @Log("人工分拣-空盘入库-动作") - @ApiOperation("人工分拣-空盘入库-动作") - public ResponseEntity emptyDiskIntoStorageTask(){ + + public ResponseEntity emptyDiskIntoStorageTask() { return new ResponseEntity<>(pdaService.emptyDiskIntoStorageTask(), HttpStatus.OK); } @PostMapping("/manualSorting/emptyDiskIntoStorageShow") @Log("人工分拣-空盘入库-显示任务信息") - @ApiOperation("人工分拣-空盘入库-显示任务信息") - public ResponseEntity emptyDiskIntoStorageShow(){ + + public ResponseEntity emptyDiskIntoStorageShow() { return new ResponseEntity<>(pdaService.emptyDiskIntoStorageShow(), HttpStatus.OK); } @PostMapping("/manualSorting/callingWoodenPalletTask") @Log("人工分拣-呼叫木托盘-动作") - @ApiOperation("人工分拣-呼叫木托盘-动作") - public ResponseEntity callingWoodenPalletTask(){ + + public ResponseEntity callingWoodenPalletTask() { return new ResponseEntity<>(pdaService.callingWoodenPalletTask(), HttpStatus.OK); } @PostMapping("/manualSorting/callingWoodenPalletTaskShow") @Log("人工分拣-呼叫木托盘-显示任务信息") - @ApiOperation("人工分拣-呼叫木托盘-显示任务信息") - public ResponseEntity callingWoodenPalletTaskShow(){ + + public ResponseEntity callingWoodenPalletTaskShow() { return new ResponseEntity<>(pdaService.callingWoodenPalletTaskShow(), HttpStatus.OK); } @PostMapping("/manualSorting/callingMaterialTask") @Log("人工分拣-呼叫物料-动作") - @ApiOperation("人工分拣-呼叫物料-动作") - public ResponseEntity callingMaterialTask(){ + + public ResponseEntity callingMaterialTask() { return new ResponseEntity<>(pdaService.callingMaterialTask(), HttpStatus.OK); } @PostMapping("/manualSorting/callingMaterialTaskShow") @Log("人工分拣-呼叫物料-显示任务信息") - @ApiOperation("人工分拣-呼叫物料-显示任务信息") - public ResponseEntity callingMaterialTaskShow(){ + + public ResponseEntity callingMaterialTaskShow() { return new ResponseEntity<>(pdaService.callingMaterialTaskShow(), HttpStatus.OK); } @PostMapping("/manualSorting/callingResidueMaterialTask") @Log("人工分拣-剩料入库-动作") - @ApiOperation("人工分拣-剩料入库-动作") - public ResponseEntity callingResidueMaterialTask(@Validated @RequestBody ManualResidueInDto manualResidueInDto){ + + public ResponseEntity callingResidueMaterialTask(@Validated @RequestBody ManualResidueInDto manualResidueInDto) { return new ResponseEntity<>(pdaService.callingResidueMaterialTask(manualResidueInDto), HttpStatus.OK); } @PostMapping("/manualSorting/callingResidueMaterialTaskShow") @Log("人工分拣-剩料入库-显示任务信息") - @ApiOperation("人工分拣-剩料入库-显示任务信息") - public ResponseEntity callingResidueMaterialTaskShow(){ + + public ResponseEntity callingResidueMaterialTaskShow() { return new ResponseEntity<>(pdaService.callingResidueMaterialTaskShow(), HttpStatus.OK); } @PostMapping("/manualSorting/packingTask") @Log("人工分拣-包装入库-动作") - @ApiOperation("人工分拣-包装入库-动作") - public ResponseEntity packingTask(@Validated @RequestBody ManualResidueInDto manualResidueInDto){ + + public ResponseEntity packingTask(@Validated @RequestBody ManualResidueInDto manualResidueInDto) { return new ResponseEntity<>(pdaService.packingTask(manualResidueInDto), HttpStatus.OK); } @PostMapping("/manualSorting/packingTaskShow") @Log("人工分拣-包装入库-显示任务信息") - @ApiOperation("人工分拣-包装入库-显示任务信息") - public ResponseEntity packingTaskShow(){ + + public ResponseEntity packingTaskShow() { return new ResponseEntity<>(pdaService.packingTaskShow(), HttpStatus.OK); } @PostMapping("/manualSorting/bindingVehicle") @Log("人工分拣-载具绑定") - @ApiOperation("人工分拣-载具绑定") - public ResponseEntity bindingVehicle(@Validated @RequestBody VehicleBindingDto vehicleBindingDto){ + + public ResponseEntity bindingVehicle(@Validated @RequestBody VehicleBindingDto vehicleBindingDto) { return new ResponseEntity<>(pdaService.bindingVehicle(vehicleBindingDto), HttpStatus.OK); } @PostMapping("/pressSendMaterial/pressTask") @Log("压机送料-动作") - @ApiOperation("压机送料-动作") - public ResponseEntitypressTask(@Validated @RequestBody PressMoveDto pressMoveDto){ + + public ResponseEntity pressTask(@Validated @RequestBody PressMoveDto pressMoveDto) { return new ResponseEntity<>(pdaService.pressTask(pressMoveDto), HttpStatus.OK); } @PostMapping("/pressSendMaterial/pressPointList") @Log("压机送料-下拉框") - @ApiOperation("压机送料-下拉框") - public ResponseEntitypressPointList(){ + + public ResponseEntity pressPointList() { return new ResponseEntity<>(pdaService.pressPointList(), HttpStatus.OK); } @PostMapping("/shelf/materialQuery") @Log("货架盘点-物料查询") - @ApiOperation("货架盘点-物料查询") - public ResponseEntitymaterialQuery(@Validated @RequestBody CommonQueryDto commonQueryDto){ + + public ResponseEntity materialQuery(@Validated @RequestBody CommonQueryDto commonQueryDto) { return new ResponseEntity<>(pdaService.materialQuery(commonQueryDto), HttpStatus.OK); } @PostMapping("/shelf/updateData") @Log("货架盘点-更新") - @ApiOperation("货架盘点-更新") - public ResponseEntityupdateData(@Validated @RequestBody ShelfSaveDto shelfSaveDto){ + + public ResponseEntity updateData(@Validated @RequestBody ShelfSaveDto shelfSaveDto) { return new ResponseEntity<>(pdaService.updateData(shelfSaveDto), HttpStatus.OK); } @PostMapping("/mix/requestInfo") @Log("要料信息-查询") - @ApiOperation("要料信息-查询") - public ResponseEntityrequestInfo(){ + + public ResponseEntity requestInfo() { return new ResponseEntity<>(pdaService.requestInfo(), HttpStatus.OK); } @PostMapping("/mix/deleteInfo") @Log("要料信息-查询") - @ApiOperation("要料信息-查询") - public ResponseEntitydeleteMaterialInfo(@RequestBody RequestMaterialInfoVo requestMaterialInfoVo){ + + public ResponseEntity deleteMaterialInfo(@RequestBody RequestMaterialInfoVo requestMaterialInfoVo) { return new ResponseEntity<>(pdaService.deleteMaterialInfo(requestMaterialInfoVo), HttpStatus.OK); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/PdaService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/PdaService.java index a79539e..e6f5923 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/PdaService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/PdaService.java @@ -13,24 +13,28 @@ import java.util.List; public interface PdaService { /** * 获取设备信息 + * * @return */ List getDeviceInfo(); /** * 获取设备状态 + * * @return */ List getDeviceStatus(); /** * 设备动作 + * * @return */ List deviceAction(); /** * 人工通过手持组盘 + * * @param entity * @return */ @@ -38,12 +42,14 @@ public interface PdaService { /** * 获取混碾机编码 + * * @return */ List getBlendingCode(); /** * 生成混碾->压机任务 + * * @param blendingMoveDto * @return */ @@ -51,6 +57,7 @@ public interface PdaService { /** * 强制静置 + * * @param forcedRestingDto * @return */ @@ -58,24 +65,28 @@ public interface PdaService { /** * 显示静置时长 + * * @return */ List forcedRestingShow(); /** * 获取载具类型 + * * @return */ List getVehicleType(); /** * 人工分拣-显示工单 + * * @return */ List manualOrders(); /** * 人工分拣-开工 + * * @param manualSortingDto * @return */ @@ -83,6 +94,7 @@ public interface PdaService { /** * 人工分拣-完工 + * * @param manualSortingDto * @return */ @@ -90,42 +102,49 @@ public interface PdaService { /** * 人工分拣-空盘入库-动作 + * * @return */ PdaResponseVo emptyDiskIntoStorageTask(); /** * 人工分拣-空盘入库-显示任务信息 + * * @return */ List emptyDiskIntoStorageShow(); /** * 人工分拣-呼叫木托盘-动作 + * * @return */ PdaResponseVo callingWoodenPalletTask(); /** * 人工分拣-呼叫木托盘-显示任务信息 + * * @return */ List callingWoodenPalletTaskShow(); /** * 人工分拣-呼叫物料-动作 + * * @return */ PdaResponseVo callingMaterialTask(); /** * 人工分拣-呼叫物料-显示任务信息 + * * @return */ List callingMaterialTaskShow(); /** * 人工分拣-剩料入库-动作 + * * @param manualResidueInDto * @return */ @@ -133,12 +152,14 @@ public interface PdaService { /** * 人工分拣-剩料入库-显示任务信息 + * * @return */ List callingResidueMaterialTaskShow(); /** * 人工分拣-包装入库-动作 + * * @param manualResidueInDto * @return */ @@ -146,12 +167,14 @@ public interface PdaService { /** * 人工分拣-包装入库-显示任务信息 + * * @return */ List packingTaskShow(); /** * 人工分拣-载具绑定 + * * @param vehicleBindingDto * @return */ @@ -159,6 +182,7 @@ public interface PdaService { /** * 压机送料-动作 + * * @param pressMoveDto * @return */ @@ -166,6 +190,7 @@ public interface PdaService { /** * 货架盘点-物料查询 + * * @param commonQueryDto * @return */ @@ -173,6 +198,7 @@ public interface PdaService { /** * 货架盘点-更新 + * * @param shelfSaveDto * @return */ @@ -180,18 +206,21 @@ public interface PdaService { /** * 压机送料-下拉框 + * * @return */ List pressPointList(); /** * 要料信息-查询 + * * @return */ List requestInfo(); /** * 要料信息-查询 + * * @param requestMaterialInfoVo * @return */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/BlendingMoveDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/BlendingMoveDto.java index 22ea84b..cbc53ce 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/BlendingMoveDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/dto/BlendingMoveDto.java @@ -2,8 +2,6 @@ package org.nl.wms.pda.service.dao.dto; import lombok.Data; -import java.math.BigDecimal; - /** * @Author: lyd * @Description: 混碾搬运参数 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.java index 9dea357..90e510a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.java @@ -18,6 +18,7 @@ public interface PdaMapper { /** * 根据区域编码和点位名称获取信息 + * * @param device * @param type * @return @@ -26,6 +27,7 @@ public interface PdaMapper { /** * 获取压机对应可用的满盅位 + * * @param endPointCode * @return */ @@ -35,12 +37,14 @@ public interface PdaMapper { /** * 获取人工分拣的工单 + * * @return */ List getManualOrders(); /** * 根据起点获取任务 + * * @param point_code * @return */ @@ -48,6 +52,7 @@ public interface PdaMapper { /** * 根据终点获取任务 + * * @param point_code * @return */ @@ -55,12 +60,14 @@ public interface PdaMapper { /** * 获取所有点位 + * * @return */ List getAllPoint(); /** * 查询物料 + * * @param commonQueryDto * @return */ @@ -68,12 +75,14 @@ public interface PdaMapper { /** * 压机对接为 + * * @return */ List getAllPressPoint(); /** * 要料信息 + * * @return */ List requestInfo(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.xml index 31944a1..105c8f3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/dao/mapper/PdaMapper.xml @@ -3,167 +3,154 @@ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java index ee8710c..4df7636 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java @@ -68,6 +68,7 @@ public class PdaServiceImpl implements PdaService { private WmsToAcsService wmsToAcsService; @Autowired private IPdmBdRequestMaterialRecordService requestMaterialRecordService; + @Override public List getDeviceInfo() { // 暂定压机区域 @@ -101,7 +102,7 @@ public class PdaServiceImpl implements PdaService { // 获取物料 MdBaseMaterial material = materialService.getById(bdWorkorder.getMaterial_id()); SchBaseVehiclematerialgroup group = new SchBaseVehiclematerialgroup(); - group.setGroup_id(IdUtil.getSnowflake(1,1).nextIdStr()); + group.setGroup_id(IdUtil.getSnowflake(1, 1).nextIdStr()); group.setVehicle_type(entity.getVehicle_type()); group.setVehicle_code(entity.getVehicle_code()); group.setMaterial_id(bdWorkorder.getMaterial_id()); @@ -115,7 +116,7 @@ public class PdaServiceImpl implements PdaService { group.setWorkorder_code(bdWorkorder.getWorkorder_code()); group.setGroup_status(GroupStatusEnum.IN_STORAGE.getType()); group.setMove_way(basePoint.getPoint_code()); - group.setBuss_move_id(IdUtil.getSnowflake(1,1).nextIdStr()); + group.setBuss_move_id(IdUtil.getSnowflake(1, 1).nextIdStr()); group.setCreate_id(SecurityUtils.getCurrentUserId()); group.setCreate_name(SecurityUtils.getCurrentNickName()); group.setCreate_time(DateUtil.now()); @@ -185,14 +186,15 @@ public class PdaServiceImpl implements PdaService { // 查询工单 PdmBdWorkorder bdWorkorder = workorderService.getByCode(manualSortingDto.getWorkorder_code()); if (ObjectUtil.isEmpty(bdWorkorder)) { - throw new BadRequestException("工单：[" + bdWorkorder.getWorkorder_code() + "]不存在"); + throw new BadRequestException("工单：[" + bdWorkorder.getWorkorder_code() + "]不存在"); } switch (bdWorkorder.getWorkorder_status()) { case "3": - throw new BadRequestException("工单：[" + bdWorkorder.getWorkorder_code() + "]已开工"); + throw new BadRequestException("工单：[" + bdWorkorder.getWorkorder_code() + "]已开工"); case "5": - throw new BadRequestException("工单：[" + bdWorkorder.getWorkorder_code() + "]已完工"); - default: break; + throw new BadRequestException("工单：[" + bdWorkorder.getWorkorder_code() + "]已完工"); + default: + break; } // 开工 bdWorkorder.setOperator(manualSortingDto.getUsername()); @@ -200,7 +202,7 @@ public class PdaServiceImpl implements PdaService { bdWorkorder.setWorkorder_status(WorkOrderStatusEnum.PRODUCING.getCode()); TaskUtils.setWorkOrderUpdateByPC(bdWorkorder); workorderService.updateById(bdWorkorder); - return PdaResponseVo.pdaResultOk("工单：[" + bdWorkorder.getWorkorder_code() + "]开工成功"); + return PdaResponseVo.pdaResultOk("工单：[" + bdWorkorder.getWorkorder_code() + "]开工成功"); } @Override @@ -208,20 +210,21 @@ public class PdaServiceImpl implements PdaService { // 查询工单 PdmBdWorkorder bdWorkorder = workorderService.getByCode(manualSortingDto.getWorkorder_code()); if (ObjectUtil.isEmpty(bdWorkorder)) { - throw new BadRequestException("工单：[" + bdWorkorder.getWorkorder_code() + "]不存在"); + throw new BadRequestException("工单：[" + bdWorkorder.getWorkorder_code() + "]不存在"); } switch (bdWorkorder.getWorkorder_status()) { case "1": - throw new BadRequestException("工单：[" + bdWorkorder.getWorkorder_code() + "]未开工"); + throw new BadRequestException("工单：[" + bdWorkorder.getWorkorder_code() + "]未开工"); case "5": - throw new BadRequestException("工单：[" + bdWorkorder.getWorkorder_code() + "]已完工"); - default: break; + throw new BadRequestException("工单：[" + bdWorkorder.getWorkorder_code() + "]已完工"); + default: + break; } TaskUtils.setWorkOrderUpdateByPC(bdWorkorder); bdWorkorder.setRealproduceend_date(DateUtil.now()); bdWorkorder.setWorkorder_status(WorkOrderStatusEnum.COMPLETE.getCode()); workorderService.updateById(bdWorkorder); - return PdaResponseVo.pdaResultOk("工单：[" + bdWorkorder.getWorkorder_code() + "]完工成功"); + return PdaResponseVo.pdaResultOk("工单：[" + bdWorkorder.getWorkorder_code() + "]完工成功"); } @Override @@ -327,7 +330,7 @@ public class PdaServiceImpl implements PdaService { throw new BadRequestException("人工分拣未开工"); } PdmBdVehicleBinding vehicleBinding = new PdmBdVehicleBinding(); - vehicleBinding.setAssociate_id(IdUtil.getSnowflake(1,1).nextIdStr()); + vehicleBinding.setAssociate_id(IdUtil.getSnowflake(1, 1).nextIdStr()); vehicleBinding.setOrigin_vehicle_code(vehicleBindingDto.getTarget_vehicle_code()); vehicleBinding.setOrigin_vehicle_type(GeneralDefinition.STEEL_TRAY); vehicleBinding.setTarget_vehicle_code(vehicleBindingDto.getTarget_vehicle_code()); @@ -382,7 +385,7 @@ public class PdaServiceImpl implements PdaService { // 空位 PointUtils.clearPoint(basePoint); return PdaResponseVo.pdaResultOk("货位清空成功"); - } else if (shelfSaveDto.getPoint_status().equals(PointStatusEnum.FULL_POINT.getCode())){ + } else if (shelfSaveDto.getPoint_status().equals(PointStatusEnum.FULL_POINT.getCode())) { // 设置物料 toSaveGroupMaterial(shelfSaveDto); basePoint.setVehicle_code(shelfSaveDto.getVehicle_code()); @@ -417,6 +420,7 @@ public class PdaServiceImpl implements PdaService { /** * 保存组盘信息 + * * @param shelfSaveDto */ private void toSaveGroupMaterial(ShelfSaveDto shelfSaveDto) { @@ -426,7 +430,7 @@ public class PdaServiceImpl implements PdaService { throw new BadRequestException("物料信息不存在"); } SchBaseVehiclematerialgroup group = new SchBaseVehiclematerialgroup(); - group.setGroup_id(IdUtil.getSnowflake(1,1).nextIdStr()); + group.setGroup_id(IdUtil.getSnowflake(1, 1).nextIdStr()); group.setMaterial_qty(Integer.valueOf(shelfSaveDto.getMaterial_qty())); group.setMaterial_id(shelfSaveDto.getMaterial_id()); group.setGroup_bind_material_status(GroupBindMaterialStatusEnum.BOUND.getValue()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/controller/PdmBdMudConsumptionController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/controller/PdmBdMudConsumptionController.java index 53e9fbc..ac7c6fa 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/controller/PdmBdMudConsumptionController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/controller/PdmBdMudConsumptionController.java @@ -1,7 +1,6 @@ package org.nl.wms.pdm.consumption.controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -16,13 +15,14 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; import java.util.Set; + /** -* @author lyd -* @date 2023-08-11 -**/ + * @author lyd + * @date 2023-08-11 + **/ @Slf4j @RestController -@Api(tags = "泥料消耗记录管理") + @RequestMapping("/api/pdmBdMudConsumption") public class PdmBdMudConsumptionController { @@ -31,32 +31,32 @@ public class PdmBdMudConsumptionController { @GetMapping @Log("查询泥料消耗记录") - @ApiOperation("查询泥料消耗记录") + //@SaCheckPermission("@el.check('pdmBdMudConsumption:list')") - public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ - return new ResponseEntity<>(TableDataInfo.build(pdmBdMudConsumptionService.queryAll(whereJson,page)),HttpStatus.OK); + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(pdmBdMudConsumptionService.queryAll(whereJson, page)), HttpStatus.OK); } @PostMapping @Log("新增泥料消耗记录") - @ApiOperation("新增泥料消耗记录") + //@SaCheckPermission("@el.check('pdmBdMudConsumption:add')") - public ResponseEntity create(@Validated @RequestBody PdmBdMudConsumption entity){ + public ResponseEntity create(@Validated @RequestBody PdmBdMudConsumption entity) { pdmBdMudConsumptionService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping @Log("修改泥料消耗记录") - @ApiOperation("修改泥料消耗记录") + //@SaCheckPermission("@el.check('pdmBdMudConsumption:edit')") - public ResponseEntity update(@Validated @RequestBody PdmBdMudConsumption entity){ + public ResponseEntity update(@Validated @RequestBody PdmBdMudConsumption entity) { pdmBdMudConsumptionService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除泥料消耗记录") - @ApiOperation("删除泥料消耗记录") + //@SaCheckPermission("@el.check('pdmBdMudConsumption:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/IPdmBdMudConsumptionService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/IPdmBdMudConsumptionService.java index 2dfbdf2..becc139 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/IPdmBdMudConsumptionService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/IPdmBdMudConsumptionService.java @@ -1,44 +1,48 @@ package org.nl.wms.pdm.consumption.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.nl.common.domain.query.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.pdm.consumption.service.dao.PdmBdMudConsumption; import java.util.Map; import java.util.Set; /** -* @description 服务接口 -* @author lyd -* @date 2023-08-11 -**/ + * @author lyd + * @description 服务接口 + * @date 2023-08-11 + **/ public interface IPdmBdMudConsumptionService extends IService { /** - * 查询数据分页 - * @param whereJson 条件 - * @param pageable 分页参数 - * @return IPage - */ + * 查询数据分页 + * + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ IPage queryAll(Map whereJson, PageQuery pageable); /** * 创建 + * * @param entity * @return */ String create(PdmBdMudConsumption entity); /** - * 编辑 - * @param entity / - */ + * 编辑 + * + * @param entity / + */ void update(PdmBdMudConsumption entity); /** - * 多选删除 - * @param ids / - */ + * 多选删除 + * + * @param ids / + */ void deleteAll(Set ids); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dao/PdmBdMudConsumption.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dao/PdmBdMudConsumption.java index 4c10c3b..e54fa8d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dao/PdmBdMudConsumption.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dao/PdmBdMudConsumption.java @@ -3,18 +3,17 @@ package org.nl.wms.pdm.consumption.service.dao; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.math.BigDecimal; import java.io.Serializable; +import java.math.BigDecimal; /** -* @description / -* @author lyd -* @date 2023-08-11 -**/ + * @author lyd + * @description / + * @date 2023-08-11 + **/ @Data @EqualsAndHashCode(callSuper = false) @TableName("pdm_bd_mud_consumption") @@ -23,34 +22,34 @@ public class PdmBdMudConsumption implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "record_id", type = IdType.NONE) - @ApiModelProperty(value = "记录标识") + private String record_id; - @ApiModelProperty(value = "泥料编码") + private String raw_material_code; - @ApiModelProperty(value = "设备编码") + private String device_code; - @ApiModelProperty(value = "泥料重量") + private BigDecimal weight; - @ApiModelProperty(value = "工单号") + private String workorder_code; - @ApiModelProperty(value = "物料id") + private String material_id; - @ApiModelProperty(value = "记录时间") + private String record_time; - @ApiModelProperty(value = "组盘标识") + private String group_id; - @ApiModelProperty(value = "下料位编码") + private String current_point; - @ApiModelProperty(value = "是否读取") + private Boolean is_read; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dao/mapper/PdmBdMudConsumptionMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dao/mapper/PdmBdMudConsumptionMapper.java index 4e6c41e..ecbbaa9 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dao/mapper/PdmBdMudConsumptionMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dao/mapper/PdmBdMudConsumptionMapper.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.nl.wms.pdm.consumption.service.dao.PdmBdMudConsumption; /** -* @author lyd -* @date 2023-08-11 -**/ + * @author lyd + * @date 2023-08-11 + **/ public interface PdmBdMudConsumptionMapper extends BaseMapper { } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dto/PdmBdMudConsumptionDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dto/PdmBdMudConsumptionDto.java index 57cc820..a4cc4fd 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dto/PdmBdMudConsumptionDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dto/PdmBdMudConsumptionDto.java @@ -1,41 +1,60 @@ package org.nl.wms.pdm.consumption.service.dto; -import java.math.BigDecimal; import lombok.Data; + import java.io.Serializable; +import java.math.BigDecimal; /** -* @description / -* @author lyd -* @date 2023-08-11 -**/ + * @author lyd + * @description / + * @date 2023-08-11 + **/ @Data public class PdmBdMudConsumptionDto implements Serializable { - /** 记录标识 */ + /** + * 记录标识 + */ private String record_id; - /** 泥料编码 */ + /** + * 泥料编码 + */ private String raw_material_code; - /** 设备编码 */ + /** + * 设备编码 + */ private String device_code; - /** 泥料重量 */ + /** + * 泥料重量 + */ private BigDecimal weight; - /** 工单号 */ + /** + * 工单号 + */ private String workorder_code; - /** 物料id */ + /** + * 物料id + */ private String material_id; - /** 记录时间 */ + /** + * 记录时间 + */ private String record_time; - /** 组盘标识 */ + /** + * 组盘标识 + */ private String group_id; - /** 下料位编码 */ + /** + * 下料位编码 + */ private String current_point; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dto/PdmBdMudConsumptionQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dto/PdmBdMudConsumptionQuery.java index 4ae6a5a..6dc5aee 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dto/PdmBdMudConsumptionQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/dto/PdmBdMudConsumptionQuery.java @@ -4,9 +4,9 @@ import org.nl.common.domain.query.BaseQuery; import org.nl.wms.pdm.consumption.service.dao.PdmBdMudConsumption; /** -* @author lyd -* @date 2023-08-11 -**/ + * @author lyd + * @date 2023-08-11 + **/ public class PdmBdMudConsumptionQuery extends BaseQuery { } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/impl/PdmBdMudConsumptionServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/impl/PdmBdMudConsumptionServiceImpl.java index c3eabc0..1bd6c1c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/impl/PdmBdMudConsumptionServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/consumption/service/impl/PdmBdMudConsumptionServiceImpl.java @@ -6,14 +6,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; -import org.nl.common.utils.SecurityUtils; import org.nl.wms.pdm.consumption.service.IPdmBdMudConsumptionService; -import org.nl.wms.pdm.consumption.service.dao.mapper.PdmBdMudConsumptionMapper; import org.nl.wms.pdm.consumption.service.dao.PdmBdMudConsumption; +import org.nl.wms.pdm.consumption.service.dao.mapper.PdmBdMudConsumptionMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -21,10 +19,10 @@ import java.util.Map; import java.util.Set; /** -* @description 服务实现 -* @author lyd -* @date 2023-08-11 -**/ + * @author lyd + * @description 服务实现 + * @date 2023-08-11 + **/ @Slf4j @Service public class PdmBdMudConsumptionServiceImpl extends ServiceImpl implements IPdmBdMudConsumptionService { @@ -33,7 +31,7 @@ public class PdmBdMudConsumptionServiceImpl extends ServiceImpl queryAll(Map whereJson, PageQuery page){ + public IPage queryAll(Map whereJson, PageQuery page) { LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); IPage pages = new Page<>(page.getPage() + 1, page.getSize()); pdmBdMudConsumptionMapper.selectPage(pages, lam); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/controller/PdmBdRequestMaterialRecordController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/controller/PdmBdRequestMaterialRecordController.java index ca2c04f..8befb93 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/controller/PdmBdRequestMaterialRecordController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/controller/PdmBdRequestMaterialRecordController.java @@ -1,7 +1,6 @@ package org.nl.wms.pdm.record.controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -16,13 +15,14 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; import java.util.Set; + /** -* @author lyd -* @date 2023-07-05 -**/ + * @author lyd + * @date 2023-07-05 + **/ @Slf4j @RestController -@Api(tags = "压机提前要料管理") + @RequestMapping("/api/pdmBdRequestMaterialRecord") public class PdmBdRequestMaterialRecordController { @@ -31,32 +31,32 @@ public class PdmBdRequestMaterialRecordController { @GetMapping @Log("查询压机提前要料") - @ApiOperation("查询压机提前要料") + //@SaCheckPermission("@el.check('pdmBdRequestMaterialRecord:list')") - public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ - return new ResponseEntity<>(TableDataInfo.build(pdmBdRequestMaterialRecordService.queryAll(whereJson,page)),HttpStatus.OK); + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(pdmBdRequestMaterialRecordService.queryAll(whereJson, page)), HttpStatus.OK); } @PostMapping @Log("新增压机提前要料") - @ApiOperation("新增压机提前要料") + //@SaCheckPermission("@el.check('pdmBdRequestMaterialRecord:add')") - public ResponseEntity create(@Validated @RequestBody PdmBdRequestMaterialRecord entity){ + public ResponseEntity create(@Validated @RequestBody PdmBdRequestMaterialRecord entity) { pdmBdRequestMaterialRecordService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping @Log("修改压机提前要料") - @ApiOperation("修改压机提前要料") + //@SaCheckPermission("@el.check('pdmBdRequestMaterialRecord:edit')") - public ResponseEntity update(@Validated @RequestBody PdmBdRequestMaterialRecord entity){ + public ResponseEntity update(@Validated @RequestBody PdmBdRequestMaterialRecord entity) { pdmBdRequestMaterialRecordService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除压机提前要料") - @ApiOperation("删除压机提前要料") + //@SaCheckPermission("@el.check('pdmBdRequestMaterialRecord:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/IPdmBdRequestMaterialRecordService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/IPdmBdRequestMaterialRecordService.java index 2f9c62f..adff362 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/IPdmBdRequestMaterialRecordService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/IPdmBdRequestMaterialRecordService.java @@ -1,8 +1,8 @@ package org.nl.wms.pdm.record.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.nl.common.domain.query.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.pdm.record.service.dao.PdmBdRequestMaterialRecord; import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder; @@ -12,47 +12,53 @@ import java.util.Map; import java.util.Set; /** -* @description 服务接口 -* @author lyd -* @date 2023-07-05 -**/ + * @author lyd + * @description 服务接口 + * @date 2023-07-05 + **/ public interface IPdmBdRequestMaterialRecordService extends IService { /** - * 查询数据分页 - * @param whereJson 条件 - * @param pageable 分页参数 - * @return IPage - */ + * 查询数据分页 + * + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ IPage queryAll(Map whereJson, PageQuery pageable); /** - * 创建 - * @param entity / - */ + * 创建 + * + * @param entity / + */ void create(PdmBdRequestMaterialRecord entity); /** - * 编辑 - * @param entity / - */ + * 编辑 + * + * @param entity / + */ void update(PdmBdRequestMaterialRecord entity); /** - * 多选删除 - * @param ids / - */ + * 多选删除 + * + * @param ids / + */ void deleteAll(Set ids); /** * 叫料完成 + * * @param recordId 记录id - * @param weight 重量 + * @param weight 重量 */ void callMaterialFinish(String recordId, BigDecimal weight); /** * 记录要料信息 + * * @param workorder * @return */ @@ -60,6 +66,7 @@ public interface IPdmBdRequestMaterialRecordService extends IService { List getLeftJoinWorkOrderList(String materialCode); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dao/mapper/PdmBdRequestMaterialRecordMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dao/mapper/PdmBdRequestMaterialRecordMapper.xml index 69c8802..d6d0b67 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dao/mapper/PdmBdRequestMaterialRecordMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dao/mapper/PdmBdRequestMaterialRecordMapper.xml @@ -4,13 +4,12 @@ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dto/PdmBdRequestMaterialRecordDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dto/PdmBdRequestMaterialRecordDto.java index 726d221..ad0ded5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dto/PdmBdRequestMaterialRecordDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dto/PdmBdRequestMaterialRecordDto.java @@ -1,36 +1,50 @@ package org.nl.wms.pdm.record.service.dto; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; + import java.io.Serializable; /** -* @description / -* @author lyd -* @date 2023-07-05 -**/ + * @author lyd + * @description / + * @date 2023-07-05 + **/ @Data public class PdmBdRequestMaterialRecordDto implements Serializable { - /** 要料记录标识 */ + /** + * 要料记录标识 + */ private String record_id; - /** 压机编号 */ + /** + * 压机编号 + */ private String device_code; - /** 物料 */ + /** + * 物料 + */ private String material_id; - /** 工单 */ + /** + * 工单 + */ private String workorder_id; - /** 叫料时间 */ + /** + * 叫料时间 + */ private String create_time; - /** 是否上料成功 */ + /** + * 是否上料成功 + */ private Boolean is_finish; - /** 上料时间 */ + /** + * 上料时间 + */ private String update_time; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dto/PdmBdRequestMaterialRecordQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dto/PdmBdRequestMaterialRecordQuery.java index a18c96d..e025632 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dto/PdmBdRequestMaterialRecordQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/dto/PdmBdRequestMaterialRecordQuery.java @@ -4,9 +4,9 @@ import org.nl.common.domain.query.BaseQuery; import org.nl.wms.pdm.record.service.dao.PdmBdRequestMaterialRecord; /** -* @author lyd -* @date 2023-07-05 -**/ + * @author lyd + * @date 2023-07-05 + **/ public class PdmBdRequestMaterialRecordQuery extends BaseQuery { } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/impl/PdmBdRequestMaterialRecordServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/impl/PdmBdRequestMaterialRecordServiceImpl.java index 71d3511..d1878ee 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/impl/PdmBdRequestMaterialRecordServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/record/service/impl/PdmBdRequestMaterialRecordServiceImpl.java @@ -7,14 +7,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; -import org.nl.common.utils.SecurityUtils; import org.nl.wms.pdm.record.service.IPdmBdRequestMaterialRecordService; -import org.nl.wms.pdm.record.service.dao.mapper.PdmBdRequestMaterialRecordMapper; import org.nl.wms.pdm.record.service.dao.PdmBdRequestMaterialRecord; +import org.nl.wms.pdm.record.service.dao.mapper.PdmBdRequestMaterialRecordMapper; import org.nl.wms.pdm.workorder.service.IPdmBdWorkorderService; import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder; import org.nl.wms.util.TaskUtils; @@ -27,10 +25,10 @@ import java.util.Map; import java.util.Set; /** -* @description 服务实现 -* @author lyd -* @date 2023-07-05 -**/ + * @author lyd + * @description 服务实现 + * @date 2023-07-05 + **/ @Slf4j @Service public class PdmBdRequestMaterialRecordServiceImpl extends ServiceImpl implements IPdmBdRequestMaterialRecordService { @@ -41,7 +39,7 @@ public class PdmBdRequestMaterialRecordServiceImpl extends ServiceImpl queryAll(Map whereJson, PageQuery page){ + public IPage queryAll(Map whereJson, PageQuery page) { LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); IPage pages = new Page<>(page.getPage() + 1, page.getSize()); pdmBdRequestMaterialRecordMapper.selectPage(pages, lam); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/controller/PdmBdMaterialResidueController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/controller/PdmBdMaterialResidueController.java index 3df312a..3c6fb9f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/controller/PdmBdMaterialResidueController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/controller/PdmBdMaterialResidueController.java @@ -1,7 +1,6 @@ package org.nl.wms.pdm.residue.controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -16,13 +15,14 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; import java.util.Set; + /** -* @author lyd -* @date 2023-07-28 -**/ + * @author lyd + * @date 2023-07-28 + **/ @Slf4j @RestController -@Api(tags = "压机泥料剩余记录管理") + @RequestMapping("/api/pdmBdMaterialResidue") public class PdmBdMaterialResidueController { @@ -31,32 +31,32 @@ public class PdmBdMaterialResidueController { @GetMapping @Log("查询压机泥料剩余记录") - @ApiOperation("查询压机泥料剩余记录") + //@SaCheckPermission("@el.check('pdmBdMaterialResidue:list')") - public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ - return new ResponseEntity<>(TableDataInfo.build(pdmBdMaterialResidueService.queryAll(whereJson,page)),HttpStatus.OK); + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(pdmBdMaterialResidueService.queryAll(whereJson, page)), HttpStatus.OK); } @PostMapping @Log("新增压机泥料剩余记录") - @ApiOperation("新增压机泥料剩余记录") + //@SaCheckPermission("@el.check('pdmBdMaterialResidue:add')") - public ResponseEntity create(@Validated @RequestBody PdmBdMaterialResidue entity){ + public ResponseEntity create(@Validated @RequestBody PdmBdMaterialResidue entity) { pdmBdMaterialResidueService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping @Log("修改压机泥料剩余记录") - @ApiOperation("修改压机泥料剩余记录") + //@SaCheckPermission("@el.check('pdmBdMaterialResidue:edit')") - public ResponseEntity update(@Validated @RequestBody PdmBdMaterialResidue entity){ + public ResponseEntity update(@Validated @RequestBody PdmBdMaterialResidue entity) { pdmBdMaterialResidueService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除压机泥料剩余记录") - @ApiOperation("删除压机泥料剩余记录") + //@SaCheckPermission("@el.check('pdmBdMaterialResidue:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/IPdmBdMaterialResidueService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/IPdmBdMaterialResidueService.java index 8694115..d99e224 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/IPdmBdMaterialResidueService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/IPdmBdMaterialResidueService.java @@ -1,8 +1,8 @@ package org.nl.wms.pdm.residue.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.nl.common.domain.query.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.ext.acs.service.dto.to.wms.ApplyTaskRequest; import org.nl.wms.pdm.residue.service.dao.PdmBdMaterialResidue; @@ -10,40 +10,45 @@ import java.util.Map; import java.util.Set; /** -* @description 服务接口 -* @author lyd -* @date 2023-07-28 -**/ + * @author lyd + * @description 服务接口 + * @date 2023-07-28 + **/ public interface IPdmBdMaterialResidueService extends IService { /** - * 查询数据分页 - * @param whereJson 条件 - * @param pageable 分页参数 - * @return IPage - */ + * 查询数据分页 + * + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ IPage queryAll(Map whereJson, PageQuery pageable); /** - * 创建 - * @param entity / - */ + * 创建 + * + * @param entity / + */ void create(PdmBdMaterialResidue entity); /** - * 编辑 - * @param entity / - */ + * 编辑 + * + * @param entity / + */ void update(PdmBdMaterialResidue entity); /** - * 多选删除 - * @param ids / - */ + * 多选删除 + * + * @param ids / + */ void deleteAll(Set ids); /** * 添加数据 + * * @param applyTaskRequest */ void addByApplyTaskRequest(ApplyTaskRequest applyTaskRequest); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dao/PdmBdMaterialResidue.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dao/PdmBdMaterialResidue.java index 980ddbc..668a42c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dao/PdmBdMaterialResidue.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dao/PdmBdMaterialResidue.java @@ -3,17 +3,16 @@ package org.nl.wms.pdm.residue.service.dao; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; /** -* @description / -* @author lyd -* @date 2023-07-28 -**/ + * @author lyd + * @description / + * @date 2023-07-28 + **/ @Data @EqualsAndHashCode(callSuper = false) @TableName("pdm_bd_material_residue") @@ -22,25 +21,25 @@ public class PdmBdMaterialResidue implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "record_id", type = IdType.NONE) - @ApiModelProperty(value = "记录标识") + private String record_id; - @ApiModelProperty(value = "泥料编码") + private String raw_material_code; - @ApiModelProperty(value = "设备编码") + private String device_code; - @ApiModelProperty(value = "泥料编码") + private String weight; - @ApiModelProperty(value = "工单号") + private String workorder_code; - @ApiModelProperty(value = "物料id") + private String material_id; - @ApiModelProperty(value = "记录时间") + private String record_time; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dao/mapper/PdmBdMaterialResidueMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dao/mapper/PdmBdMaterialResidueMapper.java index da60465..78ced00 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dao/mapper/PdmBdMaterialResidueMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dao/mapper/PdmBdMaterialResidueMapper.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.nl.wms.pdm.residue.service.dao.PdmBdMaterialResidue; /** -* @author lyd -* @date 2023-07-28 -**/ + * @author lyd + * @date 2023-07-28 + **/ public interface PdmBdMaterialResidueMapper extends BaseMapper { } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dto/PdmBdMaterialResidueDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dto/PdmBdMaterialResidueDto.java index dd40ff7..39d3b64 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dto/PdmBdMaterialResidueDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dto/PdmBdMaterialResidueDto.java @@ -1,34 +1,49 @@ package org.nl.wms.pdm.residue.service.dto; import lombok.Data; + import java.io.Serializable; /** -* @description / -* @author lyd -* @date 2023-07-28 -**/ + * @author lyd + * @description / + * @date 2023-07-28 + **/ @Data public class PdmBdMaterialResidueDto implements Serializable { - /** 记录标识 */ + /** + * 记录标识 + */ private String record_id; - /** 泥料编码 */ + /** + * 泥料编码 + */ private String raw_material_code; - /** 设备编码 */ + /** + * 设备编码 + */ private String device_code; - /** 泥料编码 */ + /** + * 泥料编码 + */ private String weight; - /** 工单号 */ + /** + * 工单号 + */ private String workorder_code; - /** 物料id */ + /** + * 物料id + */ private String material_id; - /** 记录时间 */ + /** + * 记录时间 + */ private String record_time; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dto/PdmBdMaterialResidueQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dto/PdmBdMaterialResidueQuery.java index 90fff91..83bf169 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dto/PdmBdMaterialResidueQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/dto/PdmBdMaterialResidueQuery.java @@ -4,9 +4,9 @@ import org.nl.common.domain.query.BaseQuery; import org.nl.wms.pdm.residue.service.dao.PdmBdMaterialResidue; /** -* @author lyd -* @date 2023-07-28 -**/ + * @author lyd + * @date 2023-07-28 + **/ public class PdmBdMaterialResidueQuery extends BaseQuery { } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/impl/PdmBdMaterialResidueServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/impl/PdmBdMaterialResidueServiceImpl.java index 0394474..dc6a442 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/impl/PdmBdMaterialResidueServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/residue/service/impl/PdmBdMaterialResidueServiceImpl.java @@ -7,15 +7,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; import org.nl.common.exception.BadRequestException; -import org.nl.common.utils.SecurityUtils; import org.nl.wms.ext.acs.service.dto.to.wms.ApplyTaskRequest; import org.nl.wms.pdm.residue.service.IPdmBdMaterialResidueService; -import org.nl.wms.pdm.residue.service.dao.mapper.PdmBdMaterialResidueMapper; import org.nl.wms.pdm.residue.service.dao.PdmBdMaterialResidue; +import org.nl.wms.pdm.residue.service.dao.mapper.PdmBdMaterialResidueMapper; import org.nl.wms.pdm.workorder.service.IPdmBdWorkorderService; import org.nl.wms.pdm.workorder.service.dao.PdmBdWorkorder; import org.springframework.beans.factory.annotation.Autowired; @@ -25,10 +23,10 @@ import java.util.Map; import java.util.Set; /** -* @description 服务实现 -* @author lyd -* @date 2023-07-28 -**/ + * @author lyd + * @description 服务实现 + * @date 2023-07-28 + **/ @Slf4j @Service public class PdmBdMaterialResidueServiceImpl extends ServiceImpl implements IPdmBdMaterialResidueService { @@ -39,7 +37,7 @@ public class PdmBdMaterialResidueServiceImpl extends ServiceImpl queryAll(Map whereJson, PageQuery page){ + public IPage queryAll(Map whereJson, PageQuery page) { LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); IPage pages = new Page<>(page.getPage() + 1, page.getSize()); pdmBdMaterialResidueMapper.selectPage(pages, lam); @@ -76,7 +74,7 @@ public class PdmBdMaterialResidueServiceImpl extends ServiceImpl query(PdmBdProductionProcessTrackingQuery query, PageQuery page){ + public ResponseEntity query(PdmBdProductionProcessTrackingQuery query, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(pdmBdProductionProcessTrackingService - .queryAll(query,page)),HttpStatus.OK); + .queryAll(query, page)), HttpStatus.OK); } @PostMapping @Log("新增生产过程跟踪表") - @ApiOperation("新增生产过程跟踪表") + //@SaCheckPermission("@el.check('pdmBdProductionProcessTracking:add')") - public ResponseEntity create(@Validated @RequestBody PdmBdProductionProcessTracking entity){ + public ResponseEntity create(@Validated @RequestBody PdmBdProductionProcessTracking entity) { pdmBdProductionProcessTrackingService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping @Log("修改生产过程跟踪表") - @ApiOperation("修改生产过程跟踪表") + //@SaCheckPermission("@el.check('pdmBdProductionProcessTracking:edit')") - public ResponseEntity update(@Validated @RequestBody PdmBdProductionProcessTracking entity){ + public ResponseEntity update(@Validated @RequestBody PdmBdProductionProcessTracking entity) { pdmBdProductionProcessTrackingService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除生产过程跟踪表") - @ApiOperation("删除生产过程跟踪表") + //@SaCheckPermission("@el.check('pdmBdProductionProcessTracking:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/IPdmBdProductionProcessTrackingService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/IPdmBdProductionProcessTrackingService.java index 7e23c06..505c47a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/IPdmBdProductionProcessTrackingService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/IPdmBdProductionProcessTrackingService.java @@ -1,44 +1,47 @@ package org.nl.wms.pdm.track.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.nl.common.domain.query.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.pdm.track.service.dao.PdmBdProductionProcessTracking; import org.nl.wms.pdm.track.service.dto.PdmBdProductionProcessTrackingQuery; -import java.util.Map; import java.util.Set; /** -* @description 服务接口 -* @author lyd -* @date 2023-07-21 -**/ + * @author lyd + * @description 服务接口 + * @date 2023-07-21 + **/ public interface IPdmBdProductionProcessTrackingService extends IService { /** - * 查询数据分页 - * @param whereJson 条件 - * @param pageable 分页参数 - * @return IPage - */ + * 查询数据分页 + * + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ IPage queryAll(PdmBdProductionProcessTrackingQuery whereJson, PageQuery pageable); /** - * 创建 - * @param entity / - */ + * 创建 + * + * @param entity / + */ void create(PdmBdProductionProcessTracking entity); /** - * 编辑 - * @param entity / - */ + * 编辑 + * + * @param entity / + */ void update(PdmBdProductionProcessTracking entity); /** - * 多选删除 - * @param ids / - */ + * 多选删除 + * + * @param ids / + */ void deleteAll(Set ids); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/PdmBdProductionProcessTracking.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/PdmBdProductionProcessTracking.java index efa1b22..3db8337 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/PdmBdProductionProcessTracking.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/PdmBdProductionProcessTracking.java @@ -4,17 +4,16 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; /** -* @description / -* @author lyd -* @date 2023-07-21 -**/ + * @author lyd + * @description / + * @date 2023-07-21 + **/ @Data @EqualsAndHashCode(callSuper = false) @TableName("pdm_bd_production_process_tracking") @@ -23,19 +22,19 @@ public class PdmBdProductionProcessTracking implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "process_id", type = IdType.NONE) - @ApiModelProperty(value = "跟踪标识") + private String process_id; - @ApiModelProperty(value = "记录时间") + private String record_time; - @ApiModelProperty(value = "动作") + private String process_action; - @ApiModelProperty(value = "地点") + private String process_location; - @ApiModelProperty(value = "链路id") + private String buss_move_id; @TableField(exist = false) private String vehicle_code; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/mapper/PdmBdProductionProcessTrackingMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/mapper/PdmBdProductionProcessTrackingMapper.java index ece735f..242b583 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/mapper/PdmBdProductionProcessTrackingMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/mapper/PdmBdProductionProcessTrackingMapper.java @@ -6,9 +6,9 @@ import org.nl.wms.pdm.track.service.dao.PdmBdProductionProcessTracking; import org.nl.wms.pdm.track.service.dto.PdmBdProductionProcessTrackingQuery; /** -* @author lyd -* @date 2023-07-21 -**/ + * @author lyd + * @date 2023-07-21 + **/ public interface PdmBdProductionProcessTrackingMapper extends BaseMapper { IPage selectPageLeftJoin(IPage pages, diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/mapper/PdmBdProductionProcessTrackingMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/mapper/PdmBdProductionProcessTrackingMapper.xml index 676f341..a63e929 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/mapper/PdmBdProductionProcessTrackingMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/track/service/dao/mapper/PdmBdProductionProcessTrackingMapper.xml @@ -4,21 +4,21 @@ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/vo/AcsWorkOrderVo.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/vo/AcsWorkOrderVo.java index 6251b46..5af1d46 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/vo/AcsWorkOrderVo.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dao/vo/AcsWorkOrderVo.java @@ -66,7 +66,7 @@ public class AcsWorkOrderVo { */ private String standard_size_height1; /** - * 标准尺寸2 + * 标准尺寸2 */ private String standard_size_height2; /** diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dto/PdmBdWorkorderDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dto/PdmBdWorkorderDto.java index 5bb9151..0ee2f28 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dto/PdmBdWorkorderDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dto/PdmBdWorkorderDto.java @@ -1,105 +1,166 @@ package org.nl.wms.pdm.workorder.service.dto; import lombok.Data; + import java.io.Serializable; import java.math.BigDecimal; /** -* @description / -* @author lyd -* @date 2023-05-05 -**/ + * @author lyd + * @description / + * @date 2023-05-05 + **/ @Data public class PdmBdWorkorderDto implements Serializable { - /** 工单标识 */ + /** + * 工单标识 + */ private String workorder_id; - /** 工单编号 */ + /** + * 工单编号 + */ private String workorder_code; - /** 计划数量 */ + /** + * 计划数量 + */ private BigDecimal plan_qty; - /** 实际数量 */ + /** + * 实际数量 + */ private BigDecimal real_qty; - /** 物料标识 */ + /** + * 物料标识 + */ private String material_id; - /** 原材料物料标识 */ + /** + * 原材料物料标识 + */ private String raw_material_id; - /** 载具类型 */ + /** + * 载具类型 + */ private String vehicle_type; - /** 计划开始时间 */ + /** + * 计划开始时间 + */ private String planproducestart_date; - /** 计划结束时间 */ + /** + * 计划结束时间 + */ private String planproduceend_date; - /** 实际开始时间 */ + /** + * 实际开始时间 + */ private String realproducestart_date; - /** 实际结束时间 */ + /** + * 实际结束时间 + */ private String realproduceend_date; - /** 静置时间(分钟) */ + /** + * 静置时间(分钟) + */ private BigDecimal standing_time; - /** 点位编码 */ + /** + * 点位编码 + */ private String point_code; - /** 点位名称 */ + /** + * 点位名称 + */ private String point_name; - /** 区域编码 */ + /** + * 区域编码 + */ private String region_code; - /** 区域名称 */ + /** + * 区域名称 + */ private String region_name; - /** 工单状态 */ + /** + * 工单状态 + */ private String workorder_status; - /** 是否需要AGV搬运 */ + /** + * 是否需要AGV搬运 + */ private String is_needmove; - /** 工单类型 */ + /** + * 工单类型 + */ private String workorder_type; - /** 回传MES状态 */ + /** + * 回传MES状态 + */ private String passback_status; - /** 车间编码 */ + /** + * 车间编码 + */ private String workshop_code; - /** 外部标识 */ + /** + * 外部标识 + */ private String ext_id; - /** 外部标识 */ + /** + * 外部标识 + */ private String ext_data; - /** 是否删除 */ + /** + * 是否删除 + */ private Boolean is_delete; - /** 创建人 */ + /** + * 创建人 + */ private String create_id; - /** 创建人 */ + /** + * 创建人 + */ private String create_name; - /** 创建时间 */ + /** + * 创建时间 + */ private String create_time; - /** 修改人 */ + /** + * 修改人 + */ private String update_id; - /** 修改人 */ + /** + * 修改人 + */ private String update_name; - /** 修改时间 */ + /** + * 修改时间 + */ private String update_time; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dto/PdmBdWorkorderQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dto/PdmBdWorkorderQuery.java index 3ca8719..28b478d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dto/PdmBdWorkorderQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/dto/PdmBdWorkorderQuery.java @@ -6,9 +6,9 @@ import java.io.Serializable; import java.util.List; /** -* @author lyd -* @date 2023-05-05 -**/ + * @author lyd + * @date 2023-05-05 + **/ @Data public class PdmBdWorkorderQuery implements Serializable { private String workorder_code; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java index d5188f6..ee43602 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pdm/workorder/service/impl/PdmBdWorkorderServiceImpl.java @@ -348,6 +348,7 @@ public class PdmBdWorkorderServiceImpl extends ServiceImpl mudTransfer(JSONObject json, PageQuery page){ + + public ResponseEntity mudTransfer(JSONObject json, PageQuery page) { return null; } @GetMapping("/inventoryAlert") @Log("库存物料提示记录表") - @ApiOperation("库存物料提示记录表") - public ResponseEntity inventoryAlert(JSONObject json, PageQuery page){ + + public ResponseEntity inventoryAlert(JSONObject json, PageQuery page) { return null; } @GetMapping("/intoKilnReport") @Log("入窑记录报表") - @ApiOperation("入窑记录报表") - public ResponseEntity intoKilnReport(Map json, PageQuery page){ - return new ResponseEntity<>(TableDataInfo.build(reportService.intoKilnReport(json,page)), HttpStatus.OK); + + public ResponseEntity intoKilnReport(Map json, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(reportService.intoKilnReport(json, page)), HttpStatus.OK); } + @GetMapping("/outKilnReport") @Log("出窑窑记录报表") - @ApiOperation("出窑窑记录报表") - public ResponseEntity outKilnReport(Map json, PageQuery page){ - return new ResponseEntity<>(TableDataInfo.build(reportService.outKilnReport(json,page)), HttpStatus.OK); + + public ResponseEntity outKilnReport(Map json, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(reportService.outKilnReport(json, page)), HttpStatus.OK); } + @GetMapping("/inKilnReport") @Log("窑内物料实时报表") - @ApiOperation("窑内物料实时报表") - public ResponseEntity inKilnReport(Map json, PageQuery page){ - return new ResponseEntity<>(TableDataInfo.build(reportService.inKilnReport(json,page)), HttpStatus.OK); + + public ResponseEntity inKilnReport(Map json, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(reportService.inKilnReport(json, page)), HttpStatus.OK); } @GetMapping("/inventoryMaterialTimeoutWarning") @Log("库存物料超时提示") - @ApiOperation("库存物料超时提示") - public ResponseEntity inventoryMaterialTimeoutWarning(Map json, PageQuery page){ - return new ResponseEntity<>(TableDataInfo.build(reportService.inventoryMaterialTimeoutWarning(json,page)), HttpStatus.OK); + + public ResponseEntity inventoryMaterialTimeoutWarning(Map json, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(reportService.inventoryMaterialTimeoutWarning(json, page)), HttpStatus.OK); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/ReportService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/ReportService.java index 24c7269..273478b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/ReportService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/ReportService.java @@ -15,6 +15,7 @@ import java.util.Map; public interface ReportService { /** * 入窑记录报表 + * * @param json * @param page * @return @@ -23,6 +24,7 @@ public interface ReportService { /** * 出窑窑记录报表 + * * @param json * @param page * @return @@ -31,6 +33,7 @@ public interface ReportService { /** * 窑内物料实时报表 + * * @param json * @param page * @return @@ -39,6 +42,7 @@ public interface ReportService { /** * 物料警告 + * * @param json * @param page * @return diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml index 242b311..057228c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/dao/mapper/ReportMapper.xml @@ -2,63 +2,60 @@ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/impl/ReportServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/impl/ReportServiceImpl.java index 3ebbfda..0ba7295 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/impl/ReportServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/report/service/impl/ReportServiceImpl.java @@ -24,6 +24,7 @@ import java.util.Map; public class ReportServiceImpl implements ReportService { @Autowired private ReportMapper reportMapper; + @Override public IPage intoKilnReport(Map query, PageQuery page) { IPage pages = new Page<>(page.getPage() + 1, page.getSize()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/controller/SchBaseVehiclematerialgroupController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/controller/SchBaseVehiclematerialgroupController.java index 9b03915..957bb57 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/controller/SchBaseVehiclematerialgroupController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/controller/SchBaseVehiclematerialgroupController.java @@ -1,8 +1,6 @@ package org.nl.wms.sch.group.controller; import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -16,15 +14,15 @@ import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.Map; import java.util.Set; + /** -* @author lyd -* @date 2023-05-16 -**/ + * @author lyd + * @date 2023-05-16 + **/ @Slf4j @RestController -@Api(tags = "组盘信息管理管理") + @RequestMapping("/api/schBaseVehiclematerialgroup") public class SchBaseVehiclematerialgroupController { @@ -33,33 +31,33 @@ public class SchBaseVehiclematerialgroupController { @GetMapping @Log("查询组盘信息管理") - @ApiOperation("查询组盘信息管理") + //@SaCheckPermission("@el.check('schBaseVehiclematerialgroup:list')") - public ResponseEntity query(SchBaseVehiclematerialgroupQuery whereJson, PageQuery page){ + public ResponseEntity query(SchBaseVehiclematerialgroupQuery whereJson, PageQuery page) { return new ResponseEntity<>(TableDataInfo.build(schBaseVehiclematerialgroupService - .queryAll(whereJson,page)),HttpStatus.OK); + .queryAll(whereJson, page)), HttpStatus.OK); } @PostMapping @Log("新增组盘信息管理") - @ApiOperation("新增组盘信息管理") + //@SaCheckPermission("@el.check('schBaseVehiclematerialgroup:add')") - public ResponseEntity create(@Validated @RequestBody SchBaseVehiclematerialgroup entity){ + public ResponseEntity create(@Validated @RequestBody SchBaseVehiclematerialgroup entity) { schBaseVehiclematerialgroupService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping @Log("修改组盘信息管理") - @ApiOperation("修改组盘信息管理") + //@SaCheckPermission("@el.check('schBaseVehiclematerialgroup:edit')") - public ResponseEntity update(@Validated @RequestBody SchBaseVehiclematerialgroup entity){ + public ResponseEntity update(@Validated @RequestBody SchBaseVehiclematerialgroup entity) { schBaseVehiclematerialgroupService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除组盘信息管理") - @ApiOperation("删除组盘信息管理") + //@SaCheckPermission("@el.check('schBaseVehiclematerialgroup:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { @@ -69,8 +67,8 @@ public class SchBaseVehiclematerialgroupController { @PostMapping("/getGroup") @Log("获取组盘信息管理") - @ApiOperation("获取组盘信息管理") - public ResponseEntity getGroup(@RequestBody JSONObject entity){ + + public ResponseEntity getGroup(@RequestBody JSONObject entity) { return new ResponseEntity<>(schBaseVehiclematerialgroupService.getGroup(entity), HttpStatus.OK); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/ISchBaseVehiclematerialgroupService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/ISchBaseVehiclematerialgroupService.java index 2986a53..3db19c2 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/ISchBaseVehiclematerialgroupService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/ISchBaseVehiclematerialgroupService.java @@ -2,52 +2,53 @@ package org.nl.wms.sch.group.service; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.nl.common.domain.query.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; -import org.nl.wms.pda.service.dao.dto.ManualGroupDto; -import org.nl.wms.pda.service.dao.vo.PdaResponseVo; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup; import org.nl.wms.sch.group.service.dto.SchBaseVehiclematerialgroupQuery; -import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum; -import java.util.Map; import java.util.Set; /** -* @description 服务接口 -* @author lyd -* @date 2023-05-16 -**/ + * @author lyd + * @description 服务接口 + * @date 2023-05-16 + **/ public interface ISchBaseVehiclematerialgroupService extends IService { /** - * 查询数据分页 - * @param whereJson 条件 - * @param pageable 分页参数 - * @return IPage - */ + * 查询数据分页 + * + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ IPage queryAll(SchBaseVehiclematerialgroupQuery whereJson, PageQuery pageable); /** - * 创建 - * @param entity / - */ + * 创建 + * + * @param entity / + */ void create(SchBaseVehiclematerialgroup entity); /** - * 编辑 - * @param entity / - */ + * 编辑 + * + * @param entity / + */ void update(SchBaseVehiclematerialgroup entity); /** - * 多选删除 - * @param ids / - */ + * 多选删除 + * + * @param ids / + */ void deleteAll(Set ids); /** * 根据载具编码返回数据 + * * @param entity * @return */ @@ -55,9 +56,10 @@ public interface ISchBaseVehiclematerialgroupService extends IService { IPage selectPageLeftJoin(IPage pages, SchBaseVehiclematerialgroupQuery query); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml index 0a62297..93fad54 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/group/service/dao/mapper/SchBaseVehiclematerialgroupMapper.xml @@ -4,11 +4,11 @@ - SELECT vg.* , ma.material_name , ma.material_code @@ -58,15 +59,12 @@ AND vg.group_bind_material_status = '2' - SELECT - p.* - FROM - `sch_base_point` p - LEFT JOIN sch_base_task t ON t.task_code = p.ing_task_code - WHERE p.ing_task_code IS NOT NULL AND p.ing_task_code != '' AND (t.task_status = '5' OR t.task_status = '6') + SELECT p.* + FROM `sch_base_point` p + LEFT JOIN sch_base_task t ON t.task_code = p.ing_task_code + WHERE p.ing_task_code IS NOT NULL + AND p.ing_task_code != '' AND (t.task_status = '5' OR t.task_status = '6') - SELECT - p.*, - IF(LENGTH(vg.material_qty)>0,vg.material_qty,0) AS material_qty, - IF(LENGTH(mm.material_code)>0,mm.material_code,'-') AS material_code, - IF(LENGTH(mm.material_name)>0,mm.material_name,'-') AS material_name, - IF(LENGTH(mm.material_spec)>0,mm.material_spec,'-') AS material_spec, - IF(LENGTH(mm.material_model)>0,mm.material_model,'-') AS material_model, - IF(LENGTH(mm.raw_material_code)>0,mm.raw_material_code,'-') AS raw_material_code + p.*, + IF(LENGTH(vg.material_qty)>0,vg.material_qty,0) AS material_qty, + IF(LENGTH(mm.material_code)>0,mm.material_code,'-') AS material_code, + IF(LENGTH(mm.material_name)>0,mm.material_name,'-') AS material_name, + IF(LENGTH(mm.material_spec)>0,mm.material_spec,'-') AS material_spec, + IF(LENGTH(mm.material_model)>0,mm.material_model,'-') AS material_model, + IF(LENGTH(mm.raw_material_code)>0,mm.raw_material_code,'-') AS raw_material_code FROM - `sch_base_point` p + `sch_base_point` p LEFT JOIN sch_base_vehiclematerialgroup vg ON vg.vehicle_code = p.vehicle_code AND vg.vehicle_type = p.vehicle_type AND vg.group_bind_material_status = '2' LEFT JOIN md_base_material mm ON mm.material_id = vg.material_id @@ -47,7 +45,7 @@ p.workshop_code = #{whereJson.workshop_code} - AND (p.point_code LIKE '%${whereJson.blurry}%' OR p.point_name LIKE '%${whereJson.blurry}%') + AND (p.point_code LIKE '%${whereJson.blurry}%' OR p.point_name LIKE '%${whereJson.blurry}%') AND p.region_code = #{whereJson.region_code} diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/SchBasePointDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/SchBasePointDto.java index 736c3ea..e1c9aab 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/SchBasePointDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/SchBasePointDto.java @@ -1,116 +1,184 @@ package org.nl.wms.sch.point.service.dto; -import java.math.BigDecimal; import lombok.Data; + import java.io.Serializable; /** -* @description / -* @author lyd -* @date 2023-05-15 -**/ + * @author lyd + * @description / + * @date 2023-05-15 + **/ @Data public class SchBasePointDto implements Serializable { - /** 点位编码 */ + /** + * 点位编码 + */ private String point_code; - /** 点位名称 */ + /** + * 点位名称 + */ private String point_name; - /** 区域编码 */ + /** + * 区域编码 + */ private String region_code; - /** 区域名称 */ + /** + * 区域名称 + */ private String region_name; - /** 点位类型 */ + /** + * 点位类型 + */ private String point_type; - /** 点位状态 */ + /** + * 点位状态 + */ private String point_status; - /** 允许的物料类型 */ + /** + * 允许的物料类型 + */ private String can_material_type; - /** 允许的载具类型 */ + /** + * 允许的载具类型 + */ private String can_vehicle_type; - /** 载具允许最大数量 */ + /** + * 载具允许最大数量 + */ private Integer vehicle_max_qty; - /** 载具类型 */ + /** + * 载具类型 + */ private String vehicle_type; - /** 载具编码 */ + /** + * 载具编码 + */ private String vehicle_code; - /** 载具数量 */ + /** + * 载具数量 + */ private Integer vehicle_qty; - /** 块 */ + /** + * 块 + */ private Integer block_num; - /** 排 */ + /** + * 排 + */ private Integer row_num; - /** 列 */ + /** + * 列 + */ private Integer col_num; - /** 层 */ + /** + * 层 + */ private Integer layer_num; - /** 入库顺序 */ + /** + * 入库顺序 + */ private Integer in_order_seq; - /** 出库顺序 */ + /** + * 出库顺序 + */ private Integer out_order_seq; - /** 入空载具顺序 */ + /** + * 入空载具顺序 + */ private Integer in_empty_seq; - /** 出空载具顺序 */ + /** + * 出空载具顺序 + */ private Integer out_empty_seq; - /** 父点位编码 */ + /** + * 父点位编码 + */ private String parent_point_code; - /** 外部点位编码 */ + /** + * 外部点位编码 + */ private String ext_point_code; - /** 在执行的任务标识 */ + /** + * 在执行的任务标识 + */ private String ing_task_code; - /** 是否创建工单 */ + /** + * 是否创建工单 + */ private Boolean is_has_workder; - /** 车间编码 */ + /** + * 车间编码 + */ private String workshop_code; - /** 是否自动 */ + /** + * 是否自动 + */ private Boolean is_auto; - /** 备注 */ + /** + * 备注 + */ private String remark; - /** 是否启用 */ + /** + * 是否启用 + */ private Boolean is_used; - /** 创建人 */ + /** + * 创建人 + */ private String create_id; - /** 创建人 */ + /** + * 创建人 + */ private String create_name; - /** 创建时间 */ + /** + * 创建时间 + */ private String create_time; - /** 修改人 */ + /** + * 修改人 + */ private String update_id; - /** 修改人 */ + /** + * 修改人 + */ private String update_name; - /** 修改时间 */ + /** + * 修改时间 + */ private String update_time; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/SchBasePointQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/SchBasePointQuery.java index e4eb6b5..e29e207 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/SchBasePointQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/dto/SchBasePointQuery.java @@ -1,15 +1,13 @@ package org.nl.wms.sch.point.service.dto; import lombok.Data; -import org.nl.common.domain.query.BaseQuery; -import org.nl.wms.sch.point.service.dao.SchBasePoint; import java.io.Serializable; /** -* @author lyd -* @date 2023-05-15 -**/ + * @author lyd + * @date 2023-05-15 + **/ @Data public class SchBasePointQuery implements Serializable { private String blurry; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java index 624f4f4..d11a5f1 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/point/service/impl/SchBasePointServiceImpl.java @@ -30,9 +30,7 @@ import org.springframework.stereotype.Service; import java.util.Arrays; import java.util.List; -import java.util.Map; import java.util.Set; -import java.util.function.Consumer; import java.util.stream.Collectors; /** diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/controller/SchBaseRegionController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/controller/SchBaseRegionController.java index c9f7d90..2231d3f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/controller/SchBaseRegionController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/controller/SchBaseRegionController.java @@ -1,7 +1,6 @@ package org.nl.wms.sch.region.controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -16,13 +15,14 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; import java.util.Set; + /** -* @author lyd -* @date 2023-05-15 -**/ + * @author lyd + * @date 2023-05-15 + **/ @Slf4j @RestController -@Api(tags = "区域管理管理") + @RequestMapping("/api/schBaseRegion") public class SchBaseRegionController { @@ -31,32 +31,32 @@ public class SchBaseRegionController { @GetMapping @Log("查询区域管理") - @ApiOperation("查询区域管理") + //@SaCheckPermission("@el.check('schBaseRegion:list')") - public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ - return new ResponseEntity<>(TableDataInfo.build(regionService.queryAll(whereJson,page)),HttpStatus.OK); + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(regionService.queryAll(whereJson, page)), HttpStatus.OK); } @PostMapping @Log("新增区域管理") - @ApiOperation("新增区域管理") + //@SaCheckPermission("@el.check('schBaseRegion:add')") - public ResponseEntity create(@Validated @RequestBody SchBaseRegion entity){ + public ResponseEntity create(@Validated @RequestBody SchBaseRegion entity) { regionService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping @Log("修改区域管理") - @ApiOperation("修改区域管理") + //@SaCheckPermission("@el.check('schBaseRegion:edit')") - public ResponseEntity update(@Validated @RequestBody SchBaseRegion entity){ + public ResponseEntity update(@Validated @RequestBody SchBaseRegion entity) { regionService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除区域管理") - @ApiOperation("删除区域管理") + //@SaCheckPermission("@el.check('schBaseRegion:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { @@ -66,15 +66,15 @@ public class SchBaseRegionController { @PostMapping("/getRegionList") @Log("获取区域下拉框") - @ApiOperation("获取区域下拉框") + //@SaCheckPermission("@el.check('schBaseRegion:list')") - public ResponseEntity getRegionList(@RequestBody(required = false) SchBaseRegion region){ - return new ResponseEntity<>(regionService.getRegionList(region),HttpStatus.OK); + public ResponseEntity getRegionList(@RequestBody(required = false) SchBaseRegion region) { + return new ResponseEntity<>(regionService.getRegionList(region), HttpStatus.OK); } @PostMapping("/getPointStatusSelectById") @Log("获取点位状态下拉框") - @ApiOperation("获取点位状态下拉框") + //@SaCheckPermission("region:add") public ResponseEntity getPointStatusSelectById(@RequestBody String region_id) { return new ResponseEntity<>(regionService.getPointStatusSelectById(region_id), HttpStatus.OK); @@ -82,7 +82,7 @@ public class SchBaseRegionController { @PostMapping("/getPointTypeSelectById") @Log("获取点位类型下拉框") - @ApiOperation("获取点位类型下拉框") + //@SaCheckPermission("region:add") public ResponseEntity getPointTypeSelectById(@RequestBody String region_id) { return new ResponseEntity<>(regionService.getPointTypeSelectById(region_id), HttpStatus.OK); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/ISchBaseRegionService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/ISchBaseRegionService.java index 3168b26..8504773 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/ISchBaseRegionService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/ISchBaseRegionService.java @@ -2,8 +2,8 @@ package org.nl.wms.sch.region.service; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.nl.common.domain.query.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.sch.region.service.dao.SchBaseRegion; import java.util.List; @@ -11,40 +11,45 @@ import java.util.Map; import java.util.Set; /** -* @description 服务接口 -* @author lyd -* @date 2023-05-15 -**/ + * @author lyd + * @description 服务接口 + * @date 2023-05-15 + **/ public interface ISchBaseRegionService extends IService { /** - * 查询数据分页 - * @param whereJson 条件 - * @param pageable 分页参数 - * @return IPage - */ + * 查询数据分页 + * + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ IPage queryAll(Map whereJson, PageQuery pageable); /** - * 创建 - * @param entity / - */ + * 创建 + * + * @param entity / + */ void create(SchBaseRegion entity); /** - * 编辑 - * @param entity / - */ + * 编辑 + * + * @param entity / + */ void update(SchBaseRegion entity); /** - * 多选删除 - * @param ids / - */ + * 多选删除 + * + * @param ids / + */ void deleteAll(Set ids); /** * 区域下拉框 + * * @param region 区域 * @return / */ @@ -52,6 +57,7 @@ public interface ISchBaseRegionService extends IService { /** * 获取点位状态下拉框 + * * @param regionId / * @return / */ @@ -59,6 +65,7 @@ public interface ISchBaseRegionService extends IService { /** * 获取点位类型下拉框 + * * @param regionId / * @return / */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dao/SchBaseRegion.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dao/SchBaseRegion.java index 0a6f49f..b28a5b5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dao/SchBaseRegion.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dao/SchBaseRegion.java @@ -3,15 +3,14 @@ package org.nl.wms.sch.region.service.dao; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; /** - * @description / * @author lyd + * @description / * @date 2023-05-16 **/ @Data @@ -22,46 +21,46 @@ public class SchBaseRegion implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "region_code", type = IdType.NONE) - @ApiModelProperty(value = "区域编码") + private String region_code; - @ApiModelProperty(value = "区域名称") + private String region_name; - @ApiModelProperty(value = "点位类型说明") + private String point_type_explain; - @ApiModelProperty(value = "点位状态说明") + private String point_status_explain; - @ApiModelProperty(value = "是否创建工单") + private Boolean is_has_workder; - @ApiModelProperty(value = "车间编码") + private String workshop_code; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "创建人") + private String create_id; - @ApiModelProperty(value = "创建人") + private String create_name; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改人") + private String update_id; - @ApiModelProperty(value = "修改人") + private String update_name; - @ApiModelProperty(value = "修改时间") + private String update_time; - @ApiModelProperty(value = "顺和号") + private Integer order_seq; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dao/mapper/SchBaseRegionMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dao/mapper/SchBaseRegionMapper.java index 2837734..4045711 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dao/mapper/SchBaseRegionMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dao/mapper/SchBaseRegionMapper.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.nl.wms.sch.region.service.dao.SchBaseRegion; /** -* @author lyd -* @date 2023-05-15 -**/ + * @author lyd + * @date 2023-05-15 + **/ public interface SchBaseRegionMapper extends BaseMapper { } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dto/SchBaseRegionDto.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dto/SchBaseRegionDto.java index 2f704a5..e00fd00 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dto/SchBaseRegionDto.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dto/SchBaseRegionDto.java @@ -1,55 +1,84 @@ package org.nl.wms.sch.region.service.dto; import lombok.Data; + import java.io.Serializable; /** - * @description / * @author lyd + * @description / * @date 2023-05-16 **/ @Data public class SchBaseRegionDto implements Serializable { - /** 区域编码 */ + /** + * 区域编码 + */ private String region_code; - /** 区域名称 */ + /** + * 区域名称 + */ private String region_name; - /** 点位类型说明 */ + /** + * 点位类型说明 + */ private String point_type_explain; - /** 点位状态说明 */ + /** + * 点位状态说明 + */ private String point_status_explain; - /** 是否创建工单 */ + /** + * 是否创建工单 + */ private Boolean is_has_workder; - /** 车间编码 */ + /** + * 车间编码 + */ private String workshop_code; - /** 备注 */ + /** + * 备注 + */ private String remark; - /** 创建人 */ + /** + * 创建人 + */ private String create_id; - /** 创建人 */ + /** + * 创建人 + */ private String create_name; - /** 创建时间 */ + /** + * 创建时间 + */ private String create_time; - /** 修改人 */ + /** + * 修改人 + */ private String update_id; - /** 修改人 */ + /** + * 修改人 + */ private String update_name; - /** 修改时间 */ + /** + * 修改时间 + */ private String update_time; - /** 顺和号 */ + /** + * 顺和号 + */ private Integer order_seq; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dto/SchBaseRegionQuery.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dto/SchBaseRegionQuery.java index 6a3d20f..9b8c4fe 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dto/SchBaseRegionQuery.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/dto/SchBaseRegionQuery.java @@ -4,9 +4,9 @@ import org.nl.common.domain.query.BaseQuery; import org.nl.wms.sch.region.service.dao.SchBaseRegion; /** -* @author lyd -* @date 2023-05-15 -**/ + * @author lyd + * @date 2023-05-15 + **/ public class SchBaseRegionQuery extends BaseQuery { } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/impl/SchBaseRegionServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/impl/SchBaseRegionServiceImpl.java index 20494bd..6275ab6 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/impl/SchBaseRegionServiceImpl.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/region/service/impl/SchBaseRegionServiceImpl.java @@ -1,7 +1,6 @@ package org.nl.wms.sch.region.service.impl; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -9,21 +8,18 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.nl.common.domain.query.PageQuery; -import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; import org.nl.wms.sch.region.service.ISchBaseRegionService; -import org.nl.wms.sch.region.service.dao.mapper.SchBaseRegionMapper; import org.nl.wms.sch.region.service.dao.SchBaseRegion; +import org.nl.wms.sch.region.service.dao.mapper.SchBaseRegionMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.function.Consumer; /** * @author lyd diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java index 542094f..adfc6b4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskController.java @@ -1,10 +1,6 @@ package org.nl.wms.sch.task.controller; import cn.dev33.satoken.annotation.SaIgnore; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -16,17 +12,17 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import sun.security.krb5.internal.PAData; import java.util.Map; import java.util.Set; + /** -* @author lyd -* @date 2023-05-15 -**/ + * @author lyd + * @date 2023-05-15 + **/ @Slf4j @RestController -@Api(tags = "任务管理管理") + @RequestMapping("/api/schBaseTask") public class SchBaseTaskController { @@ -35,32 +31,32 @@ public class SchBaseTaskController { @GetMapping @Log("查询任务管理") - @ApiOperation("查询任务管理") + //@SaCheckPermission("@el.check('schBaseTask:list')") - public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ - return new ResponseEntity<>(TableDataInfo.build(schBaseTaskService.queryAll(whereJson,page)),HttpStatus.OK); + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(schBaseTaskService.queryAll(whereJson, page)), HttpStatus.OK); } @PostMapping @Log("新增任务管理") - @ApiOperation("新增任务管理") + //@SaCheckPermission("@el.check('schBaseTask:add')") - public ResponseEntity create(@Validated @RequestBody SchBaseTask entity){ + public ResponseEntity create(@Validated @RequestBody SchBaseTask entity) { schBaseTaskService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping @Log("修改任务管理") - @ApiOperation("修改任务管理") + //@SaCheckPermission("@el.check('schBaseTask:edit')") - public ResponseEntity update(@Validated @RequestBody SchBaseTask entity){ + public ResponseEntity update(@Validated @RequestBody SchBaseTask entity) { schBaseTaskService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除任务管理") - @ApiOperation("删除任务管理") + //@SaCheckPermission("@el.check('schBaseTask:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { @@ -70,16 +66,16 @@ public class SchBaseTaskController { @GetMapping("/taskStatusList") @Log("任务状态下拉框") - @ApiOperation("任务状态下拉框") + @SaIgnore //@SaCheckPermission("@el.check('schBaseTask:list')") - public ResponseEntity getTaskStatusList(){ - return new ResponseEntity<>(TableDataInfo.build(schBaseTaskService.getTaskStatusList()),HttpStatus.OK); + public ResponseEntity getTaskStatusList() { + return new ResponseEntity<>(TableDataInfo.build(schBaseTaskService.getTaskStatusList()), HttpStatus.OK); } @PutMapping("/operation") @Log("任务操作") - @ApiOperation("任务操作") + //@SaCheckPermission("task:edit") public ResponseEntity update(@RequestBody Map map) { schBaseTaskService.operation(map); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskconfigController.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskconfigController.java index 86f6b7c..ea9b17b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskconfigController.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/controller/SchBaseTaskconfigController.java @@ -1,7 +1,6 @@ package org.nl.wms.sch.task.controller; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; + import lombok.extern.slf4j.Slf4j; import org.nl.common.base.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -16,13 +15,14 @@ import org.springframework.web.bind.annotation.*; import java.util.Map; import java.util.Set; + /** -* @author lyd -* @date 2023-05-15 -**/ + * @author lyd + * @date 2023-05-15 + **/ @Slf4j @RestController -@Api(tags = "任务配置管理") + @RequestMapping("/api/schBaseTaskconfig") public class SchBaseTaskconfigController { @@ -31,32 +31,32 @@ public class SchBaseTaskconfigController { @GetMapping @Log("查询任务配置") - @ApiOperation("查询任务配置") + //@SaCheckPermission("@el.check('schBaseTaskconfig:list')") - public ResponseEntity query(@RequestParam Map whereJson, PageQuery page){ - return new ResponseEntity<>(TableDataInfo.build(schBaseTaskconfigService.queryAll(whereJson,page)),HttpStatus.OK); + public ResponseEntity query(@RequestParam Map whereJson, PageQuery page) { + return new ResponseEntity<>(TableDataInfo.build(schBaseTaskconfigService.queryAll(whereJson, page)), HttpStatus.OK); } @PostMapping @Log("新增任务配置") - @ApiOperation("新增任务配置") + //@SaCheckPermission("@el.check('schBaseTaskconfig:add')") - public ResponseEntity create(@Validated @RequestBody SchBaseTaskconfig entity){ + public ResponseEntity create(@Validated @RequestBody SchBaseTaskconfig entity) { schBaseTaskconfigService.create(entity); return new ResponseEntity<>(HttpStatus.CREATED); } @PutMapping @Log("修改任务配置") - @ApiOperation("修改任务配置") + //@SaCheckPermission("@el.check('schBaseTaskconfig:edit')") - public ResponseEntity update(@Validated @RequestBody SchBaseTaskconfig entity){ + public ResponseEntity update(@Validated @RequestBody SchBaseTaskconfig entity) { schBaseTaskconfigService.update(entity); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @Log("删除任务配置") - @ApiOperation("删除任务配置") + //@SaCheckPermission("@el.check('schBaseTaskconfig:del')") @DeleteMapping public ResponseEntity delete(@RequestBody Set ids) { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java index 3362e06..b546fd8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskService.java @@ -3,8 +3,8 @@ package org.nl.wms.sch.task.service; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.nl.common.domain.query.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.ext.acs.service.dto.to.BaseRequest; import org.nl.wms.sch.task.service.dao.SchBaseTask; import org.nl.wms.sch.task_manage.task.core.TaskStatus; @@ -75,28 +75,31 @@ public interface ISchBaseTaskService extends IService { * * @param config_code 任务配置 * @param device_code 设备 - * @param direction 方向 + * @param direction 方向 * @return / */ List findUnFinishTasksByTaskConfig(String config_code, String device_code, String direction); /** - * 获取任务数据 + * 获取任务数据 + * * @param config_code 配置编码 - * @param status 状态 + * @param status 状态 * @return */ List findTasksByTaskStatus(String config_code, TaskStatus status); /** * 任务申请 - * @see BaseRequest + * * @param param / + * @see BaseRequest */ void apply(JSONObject param); /** * 获取任务状态下拉框 + * * @return / */ JSONArray getTaskStatusList(); @@ -110,6 +113,7 @@ public interface ISchBaseTaskService extends IService { /** * 获取任务数据 + * * @param taskCode 任务编码 * @return / */ @@ -117,12 +121,15 @@ public interface ISchBaseTaskService extends IService { /** * 返回当前设备搬运木控盘的任务数量 + * * @param deviceCode 设备 * @return / */ int getEmptyVehicleCarryingByDevice(String deviceCode); + /** * 返回当前设备搬运满料的任务数量 + * * @param deviceCode 设备 * @return / */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskconfigService.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskconfigService.java index 1d28781..e75a1f5 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskconfigService.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/ISchBaseTaskconfigService.java @@ -1,43 +1,47 @@ package org.nl.wms.sch.task.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.nl.common.domain.query.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; +import org.nl.common.domain.query.PageQuery; import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig; import java.util.Map; import java.util.Set; /** -* @description 服务接口 -* @author lyd -* @date 2023-05-15 -**/ + * @author lyd + * @description 服务接口 + * @date 2023-05-15 + **/ public interface ISchBaseTaskconfigService extends IService { /** - * 查询数据分页 - * @param whereJson 条件 - * @param pageable 分页参数 - * @return IPage - */ + * 查询数据分页 + * + * @param whereJson 条件 + * @param pageable 分页参数 + * @return IPage + */ IPage queryAll(Map whereJson, PageQuery pageable); /** - * 创建 - * @param entity / - */ + * 创建 + * + * @param entity / + */ void create(SchBaseTaskconfig entity); /** - * 编辑 - * @param entity / - */ + * 编辑 + * + * @param entity / + */ void update(SchBaseTaskconfig entity); /** - * 多选删除 - * @param ids / - */ + * 多选删除 + * + * @param ids / + */ void deleteAll(Set ids); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java index 781a239..a41d5f0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTask.java @@ -3,18 +3,17 @@ package org.nl.wms.sch.task.service.dao; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.math.BigDecimal; import java.io.Serializable; +import java.math.BigDecimal; /** -* @description / -* @author lyd -* @date 2023-05-15 -**/ + * @author lyd + * @description / + * @date 2023-05-15 + **/ @Data @EqualsAndHashCode(callSuper = false) @TableName("sch_base_task") @@ -23,102 +22,100 @@ public class SchBaseTask implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "task_id", type = IdType.NONE) - @ApiModelProperty(value = "任务标识") + private String task_id; - @ApiModelProperty(value = "任务编码") + private String task_code; - @ApiModelProperty(value = "任务状态") private String task_status; - @ApiModelProperty(value = "配置编码") + private String config_code; - @ApiModelProperty(value = "点位1") + private String point_code1; - @ApiModelProperty(value = "点位2") + private String point_code2; - @ApiModelProperty(value = "点位3") + private String point_code3; - @ApiModelProperty(value = "点位4") + private String point_code4; - @ApiModelProperty(value = "组盘标识") + private String group_id; - @ApiModelProperty(value = "载具类型") + private String vehicle_type; - @ApiModelProperty(value = "载具数量") + private Integer vehicle_qty; - @ApiModelProperty(value = "载具编码") + private String vehicle_code; - @ApiModelProperty(value = "载具编码2") + private String vehicle_code2; - @ApiModelProperty(value = "处理状态") + private String handle_status; - @ApiModelProperty(value = "车号") + private String car_no; - @ApiModelProperty(value = "任务组标识") private Long task_group_id; - @ApiModelProperty(value = "任务组顺序号") + private BigDecimal task_group_seq; - @ApiModelProperty(value = "任务完成类型") + private String finished_type; - @ApiModelProperty(value = "生成方式") + private String create_mode; - @ApiModelProperty(value = "链路标识") + private String acs_trace_id; - @ApiModelProperty(value = "生成任务的请求参数") + private String request_param; - @ApiModelProperty(value = "下发任务的请求参数") + private String response_param; - @ApiModelProperty(value = "车间编码") + private String workshop_code; - @ApiModelProperty(value = "额外组盘信息") + private String ext_group_data; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否删除") + private Boolean is_delete; - @ApiModelProperty(value = "创建人") + private String create_id; - @ApiModelProperty(value = "创建人") + private String create_name; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改人") + private String update_id; - @ApiModelProperty(value = "修改人") + private String update_name; - @ApiModelProperty(value = "修改时间") + private String update_time; } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTaskconfig.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTaskconfig.java index e7423ca..6db5c08 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTaskconfig.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/SchBaseTaskconfig.java @@ -4,19 +4,18 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import java.math.BigDecimal; import java.io.Serializable; +import java.math.BigDecimal; import java.util.List; /** -* @description / -* @author lyd -* @date 2023-05-15 -**/ + * @author lyd + * @description / + * @date 2023-05-15 + **/ @Data @EqualsAndHashCode(callSuper = false) @TableName("sch_base_taskconfig") @@ -25,124 +24,124 @@ public class SchBaseTaskconfig implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "config_id", type = IdType.NONE) - @ApiModelProperty(value = "配置标识") + private String config_id; - @ApiModelProperty(value = "配置编码") + private String config_code; - @ApiModelProperty(value = "配置名称") + private String config_name; - @ApiModelProperty(value = "路由编码") + private String route_plan_code; - @ApiModelProperty(value = "任务取放类型") + private String task_qf_type; - @ApiModelProperty(value = "acs任务类型") + private String acs_task_type; - @ApiModelProperty(value = "任务名字") + private String task_name; - @ApiModelProperty(value = "任务类型") + private String task_type; - @ApiModelProperty(value = "任务方向") + private String task_direction; - @ApiModelProperty(value = "优先级") + private String priority; - @ApiModelProperty(value = "允许最大任务生成数") + private Integer task_create_max_num; - @ApiModelProperty(value = "允许最大任务下发数") + private Integer task_issue_max_num; - @ApiModelProperty(value = "是否自动下发") + private Boolean is_auto_issue; - @ApiModelProperty(value = "起点区域配置") + private String start_region_str; - @ApiModelProperty(value = "终点区域配置") + private String next_region_str; - @ApiModelProperty(value = "起点点位前缀") + private String start_point_pre; - @ApiModelProperty(value = "终点点位前缀") + private String next_region_pre; - @ApiModelProperty(value = "是否校验工单") + private Boolean is_check_workorder; - @ApiModelProperty(value = "是否判断起点锁定") + private Boolean is_check_start_lock; - @ApiModelProperty(value = "是否立即创建") + private Boolean is_immediate_create; - @ApiModelProperty(value = "是否判断终点锁定") + private Boolean is_check_next_lock; - @ApiModelProperty(value = "是否起点自动") + private Boolean is_start_auto; - @ApiModelProperty(value = "是否终点自动") + private Boolean is_next_auto; - @ApiModelProperty(value = "是否锁定起点") + private Boolean is_lock_start; - @ApiModelProperty(value = "是否锁定终点") + private Boolean is_lock_next; - @ApiModelProperty(value = "生成任务的请求参数") + private String request_param; - @ApiModelProperty(value = "下发任务的请求参数") + private String response_param; - @ApiModelProperty(value = "是否按组控制下发顺序") + private Boolean is_group_congrol_issue_seq; - @ApiModelProperty(value = "任务未完成通知时间数") + private BigDecimal unfinish_notify_time; - @ApiModelProperty(value = "sql配置") + private String sql_param; - @ApiModelProperty(value = "车间编码") + private String workshop_code; - @ApiModelProperty(value = "备注") + private String remark; - @ApiModelProperty(value = "是否启用") + private Boolean is_used; - @ApiModelProperty(value = "是否删除") + private Boolean is_delete; - @ApiModelProperty(value = "创建人") + private String create_id; - @ApiModelProperty(value = "创建人") + private String create_name; - @ApiModelProperty(value = "创建时间") + private String create_time; - @ApiModelProperty(value = "修改人") + private String update_id; - @ApiModelProperty(value = "修改人") + private String update_name; - @ApiModelProperty(value = "修改时间") + private String update_time; @TableField(exist = false) diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.java index eb7dc36..25e7a0f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.java @@ -6,9 +6,9 @@ import org.nl.wms.sch.task.service.dao.SchBaseTask; import java.math.BigDecimal; /** -* @author lyd -* @date 2023-05-15 -**/ + * @author lyd + * @date 2023-05-15 + **/ public interface SchBaseTaskMapper extends BaseMapper { int getEmptyVehicleCarryingByDevice(String deviceCode); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.xml index 4f0516e..07b666d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task/service/dao/mapper/SchBaseTaskMapper.xml @@ -3,37 +3,31 @@ SELECT - p.* + p.* FROM - `sch_base_point` p + `sch_base_point` p WHERE p.point_type = '1' - AND (p.ing_task_code = '' OR p.ing_task_code IS NULL) - AND p.point_status = '1' - AND p.region_code IN - - #{code} - + AND (p.ing_task_code = '' OR p.ing_task_code IS NULL) + AND p.point_status = '1' + AND p.region_code IN + + #{code} + ORDER BY - p.in_empty_seq ASC + p.in_empty_seq ASC diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQKTask.java index 6b153b6..6c5548b 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQKTask.java @@ -59,6 +59,7 @@ public class FJQKTask extends AbstractTask { private WmsToAcsService wmsToAcsService; @Autowired private FJMapper fjMapper; + @Override @Transactional(rollbackFor = Exception.class) protected void create() throws BadRequestException { @@ -161,6 +162,7 @@ public class FJQKTask extends AbstractTask { /** * 找到的是覆膜机设备位置,父位才是对接位 + * * @param startRegionStr * @param extGroupData * @return @@ -263,6 +265,7 @@ public class FJQKTask extends AbstractTask { TaskUtils.setUpdateByType(taskObj, taskFinishedType); taskService.updateById(taskObj); } + public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { // 载具编码：前面需要根据任务判断，没有载具不能生成任务 String startPoint = taskObj.getPoint_code1(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java index 6105012..9993e2d 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQLTask.java @@ -64,6 +64,7 @@ public class FJQLTask extends AbstractTask { @Autowired private IPdmBdProductionProcessTrackingService processTrackingService; + @Override protected void create() throws BadRequestException { // 获取任务 @@ -154,6 +155,7 @@ public class FJQLTask extends AbstractTask { /** * 找起点：到钢托盘缓存找一个物料与分拣工单的物料相同的物料 * 还需要判断是否烧制，选择已经烧制的物料 + * * @param startRegionStr * @param requestParam * @return @@ -227,7 +229,7 @@ public class FJQLTask extends AbstractTask { PointUtils.setUpdateByType(startPointObj, taskFinishedType); PointUtils.clearPoint(startPointObj); SchBaseVehiclematerialgroup vehicleMaterialGroupObj = - vehiclematerialgroupService.getById(taskObj.getGroup_id()); + vehiclematerialgroupService.getById(taskObj.getGroup_id()); // 等到变成空盘才能解除 vehicleMaterialGroupObj.setPoint_code(endPointObj.getPoint_code()); vehicleMaterialGroupObj.setPoint_name(endPointObj.getPoint_name()); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQZRKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQZRKTask.java index 0bca6f7..04fb521 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQZRKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJQZRKTask.java @@ -19,7 +19,10 @@ import org.nl.wms.sch.task.service.dao.SchBaseTask; import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig; import org.nl.wms.sch.task_manage.AbstractTask; import org.nl.wms.sch.task_manage.GeneralDefinition; -import org.nl.wms.sch.task_manage.enums.*; +import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum; +import org.nl.wms.sch.task_manage.enums.GroupStatusEnum; +import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum; +import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum; import org.nl.wms.sch.task_manage.task.TaskType; import org.nl.wms.sch.task_manage.task.core.TaskStatus; import org.nl.wms.util.PointUtils; @@ -54,6 +57,7 @@ public class FJQZRKTask extends AbstractTask { private IPdmBdWorkorderService workorderService; @Autowired private ISchBaseVehiclematerialgroupService vehiclematerialgroupService; + @Override protected void create() throws BadRequestException { // 最后一坨不需要呼叫空盘 @@ -119,6 +123,7 @@ public class FJQZRKTask extends AbstractTask { /** * 到对应的区域中获取放置点 + * * @param nextRegionStr * @return */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJRKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJRKTask.java index c8c7fae..f34c8f7 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJRKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJRKTask.java @@ -58,6 +58,7 @@ public class FJRKTask extends AbstractTask { private ISchBaseVehiclematerialgroupService vehiclematerialgroupService; @Autowired private FJMapper fjMapper; + @Override protected void create() throws BadRequestException { // 最后一坨不需要呼叫空盘 @@ -156,6 +157,7 @@ public class FJRKTask extends AbstractTask { /** * 从覆膜区找个空木托盘 + * * @param startRegionStr * @param extData * @return @@ -180,6 +182,7 @@ public class FJRKTask extends AbstractTask { /** * 到对应的区域中获取放置点 + * * @param nextRegionStr * @return */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSKTask.java index 5de40a4..335e8bd 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSKTask.java @@ -3,7 +3,6 @@ package org.nl.wms.sch.task_manage.task.tasks.fj; import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.esotericsoftware.minlog.Log; import lombok.extern.slf4j.Slf4j; import org.nl.common.exception.BadRequestException; import org.nl.system.service.notice.ISysNoticeService; @@ -131,6 +130,7 @@ public class FJSKTask extends AbstractTask { /** * 找叠托位，无锁的位置即可 + * * @param nextRegionStr * @return */ @@ -194,6 +194,7 @@ public class FJSKTask extends AbstractTask { } this.cancelTask(taskObj, TaskFinishedTypeEnum.MANUAL_PC); } + public void finishTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { // 获取参数 String endPoint = taskObj.getPoint_code2(); @@ -226,6 +227,7 @@ public class FJSKTask extends AbstractTask { TaskUtils.setUpdateByType(taskObj, taskFinishedType); taskService.updateById(taskObj); } + public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { // 获取参数 String endPoint = taskObj.getPoint_code2(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java index 81f258e..910109c 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/FJSLTask.java @@ -55,6 +55,7 @@ public class FJSLTask extends AbstractTask { @Autowired private ISysNoticeService noticeService; + @Override protected void create() throws BadRequestException { // 获取任务 diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/mapper/FJMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/mapper/FJMapper.java index 473f339..ff483bc 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/mapper/FJMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/mapper/FJMapper.java @@ -13,12 +13,14 @@ import java.util.List; */ public interface FJMapper { List findPointForFJQL(List regionCode, String materialId); + List findPointForFJSK(List regionCode); SchBasePoint findPointForFJQK(List regionCode, @Param("fluentPut") JSONObject fluentPut); /** * 获取库存剩余数量 + * * @return */ int getInventoryQuantity(String material_id); @@ -26,6 +28,7 @@ public interface FJMapper { /** * 获取满托需要多少块 * eg: 2*7*6 + * * @param materialId * @return */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/mapper/FJMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/mapper/FJMapper.xml index 1d81f90..030e09e 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/mapper/FJMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/fj/mapper/FJMapper.xml @@ -3,19 +3,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java index 5ea9bc0..05cba83 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/HNMLTask.java @@ -298,6 +298,7 @@ public class HNMLTask extends AbstractTask { /** * 组盘 + * * @param param 具体参数 * @return */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/mapper/HNMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/mapper/HNMapper.java index e64c205..2ebf5a3 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/mapper/HNMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/mapper/HNMapper.java @@ -14,6 +14,7 @@ import java.util.List; public interface HNMapper extends BaseMapper { // 通过叫料单 List findPointForHNML(List regionCode, String materialId); + // 通过工单与点位更新 List findPointForHNMLAndWorkOrder(List regionCode, String materialCode); } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/mapper/HNMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/mapper/HNMapper.xml index 0869e49..4c32dab 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/mapper/HNMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/hn/mapper/HNMapper.xml @@ -3,12 +3,12 @@ - SELECT - p.*, - p2.point_code AS device_code + p.*, + p2.point_code AS device_code FROM - `sch_base_point` p + `sch_base_point` p LEFT JOIN ( - SELECT - p2.point_code - FROM - sch_base_point p2 - WHERE - p2.point_code IN ( - SELECT w.point_code FROM pdm_bd_workorder w - WHERE w.raw_material_code = #{materialCode} AND w.workorder_status = '3' - ) - AND p2.point_status = '1' - ORDER BY p2.update_time LIMIT 1 + SELECT + p2.point_code + FROM + sch_base_point p2 + WHERE + p2.point_code IN ( + SELECT w.point_code FROM pdm_bd_workorder w + WHERE w.raw_material_code = #{materialCode} AND w.workorder_status = '3' + ) + AND p2.point_status = '1' + ORDER BY p2.update_time LIMIT 1 ) p2 ON p.parent_point_code LIKE CONCAT('%', p2.point_code, '%') WHERE - p.point_type = '5' + p.point_type = '5' AND p.point_status = '1' AND (p.ing_task_code = '' OR p.ing_task_code IS NULL) AND p.region_code IN diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/GZYQLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/GZYQLTask.java index 7e68486..7edcffb 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/GZYQLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yao/GZYQLTask.java @@ -53,6 +53,7 @@ public class GZYQLTask extends AbstractTask { private ISysNoticeService noticeService; @Autowired private YZMapper yzMapper; + @Override protected void create() throws BadRequestException { // 获取任务 @@ -127,6 +128,7 @@ public class GZYQLTask extends AbstractTask { /** * 找到有货最多的那层搬运到入窑口 + * * @param startRegionStr * @param jsonObject * @return @@ -216,6 +218,7 @@ public class GZYQLTask extends AbstractTask { TaskUtils.setUpdateByType(taskObj, taskFinishedType); taskService.updateById(taskObj); } + public void cancelTask(SchBaseTask taskObj, TaskFinishedTypeEnum taskFinishedType) { // 获取参数 String startPoint = taskObj.getPoint_code1(); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQKTask.java index daca434..e5793c7 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZQKTask.java @@ -119,6 +119,7 @@ public class YZQKTask extends AbstractTask { /** * 业务过程：到指定的区域获取空托盘 + * * @param startRegionStr * @param requestParam * @return diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSKTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSKTask.java index 7e854f4..a86a84f 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSKTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSKTask.java @@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.extern.slf4j.Slf4j; import org.nl.common.exception.BadRequestException; import org.nl.system.service.notice.ISysNoticeService; -import org.nl.wms.sch.group.service.ISchBaseVehiclematerialgroupService; -import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup; import org.nl.wms.sch.point.service.ISchBasePointService; import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.task.service.ISchBaseTaskService; @@ -16,7 +14,6 @@ import org.nl.wms.sch.task.service.dao.SchBaseTask; import org.nl.wms.sch.task.service.dao.SchBaseTaskconfig; import org.nl.wms.sch.task_manage.AbstractTask; import org.nl.wms.sch.task_manage.GeneralDefinition; -import org.nl.wms.sch.task_manage.enums.GroupBindMaterialStatusEnum; import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum; import org.nl.wms.sch.task_manage.enums.PointStatusEnum; import org.nl.wms.sch.task_manage.enums.TaskFinishedTypeEnum; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java index 044c333..d5ef986 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/YZSLTask.java @@ -71,6 +71,7 @@ public class YZSLTask extends AbstractTask { private IPdmBdProductionProcessTrackingService processTrackingService; @Autowired private WmsToMesService wmsToMesService; + @Override @Transactional(rollbackFor = Exception.class) protected void create() throws BadRequestException { diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.java index 34110ba..e531ae4 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.java @@ -12,11 +12,13 @@ import java.util.List; */ public interface YZMapper { List findPointForYZQL(List regionCode, String materialId); + @Deprecated List findPointForYZSL(JSONObject param); /** * 统计输送线数量 + * * @param regionCode * @param pointType * @return diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.xml index 864c64f..92d561a 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/yz/mapper/YZMapper.xml @@ -3,41 +3,38 @@ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/CommonUtils.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/CommonUtils.java index 63b2518..b205487 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/CommonUtils.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/CommonUtils.java @@ -19,9 +19,8 @@ import java.util.*; */ public class CommonUtils { /** - * * @param inStorageTime 入库时间 - * @param standingTime 静置时间 / 分钟 + * @param standingTime 静置时间 / 分钟 * @return */ public static boolean isStandingFinish(String inStorageTime, Integer standingTime) { @@ -35,6 +34,7 @@ public class CommonUtils { /** * 还有几分钟静置完成 + * * @param inputDateString * @param staticDurationMinutes * @return @@ -55,7 +55,7 @@ public class CommonUtils { Date estimatedCompletionTime = new Date(currentDate.getTime() + timeDifferenceMillis); // 格式化预计完成时间为字符串 String estimatedCompletionTimeString = dateFormat.format(estimatedCompletionTime); - return "距离静置完成还有 " + String.format("%.2f", timeDifferenceMinutes) + " 分钟" + ", 预计完成时间为：" + estimatedCompletionTimeString; + return "距离静置完成还有 " + String.format("%.2f", timeDifferenceMinutes) + " 分钟" + ", 预计完成时间为：" + estimatedCompletionTimeString; } catch (ParseException e) { e.printStackTrace(); } @@ -64,6 +64,7 @@ public class CommonUtils { /** * 获取当前时间是白晚班 + * * @return */ public static String getDayShift() { @@ -96,6 +97,7 @@ public class CommonUtils { /** * 请求ACS释放一个木托盘 + * * @param map * @param deviceCode * @return diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/MesUtils.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/MesUtils.java index 90204f0..d1b30c8 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/MesUtils.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/MesUtils.java @@ -23,10 +23,11 @@ import org.nl.wms.sch.task_manage.enums.NoticeTypeEnum; public class MesUtils { /** * 一次发单条数据 + * * @param api * @param object - * @return * @param + * @return */ public static ResultForMes notifyMes(String api, T object) { SysParamServiceImpl sysParamService = SpringContextHolder.getBean(SysParamServiceImpl.class); diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/MyEventListener.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/MyEventListener.java index 1f120aa..0194e98 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/MyEventListener.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/MyEventListener.java @@ -1,7 +1,6 @@ package org.nl.wms.util; import org.springframework.context.ApplicationEvent; -import org.springframework.stereotype.Component; /** * @Author: lyd diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/MyListener.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/MyListener.java index 54a6219..1d0c7cc 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/MyListener.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/MyListener.java @@ -12,6 +12,6 @@ import org.springframework.stereotype.Component; public class MyListener implements ApplicationListener { @Override public void onApplicationEvent(MyEventListener myEventListener) { - System.out.println("事件："+myEventListener.toString()); + System.out.println("事件：" + myEventListener.toString()); } } diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/PointUtils.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/PointUtils.java index 497bc7b..88b65e9 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/PointUtils.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/PointUtils.java @@ -5,7 +5,6 @@ import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import org.nl.common.utils.SecurityUtils; import org.nl.config.SpringContextHolder; -import org.nl.wms.sch.group.service.dao.SchBaseVehiclematerialgroup; import org.nl.wms.sch.point.service.dao.SchBasePoint; import org.nl.wms.sch.point.service.impl.SchBasePointServiceImpl; import org.nl.wms.sch.task_manage.GeneralDefinition; diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java index 5f5a53a..842d715 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/TaskUtils.java @@ -31,11 +31,13 @@ public class TaskUtils { taskObj.setCreate_name(GeneralDefinition.ACS_NAME); taskObj.setCreate_time(DateUtil.now()); } + public static void setCreateByPda(SchBaseTask taskObj) { taskObj.setCreate_id(SecurityUtils.getCurrentUserId()); taskObj.setCreate_name(SecurityUtils.getCurrentNickName()); taskObj.setCreate_time(DateUtil.now()); } + public static void setCreateByAcsOrPda(SchBaseTask taskObj, JSONObject param) { // 如果是人工创建，会带个用户过来 if (ObjectUtil.isNotEmpty(param.getString(FieldConstant.USER_ID))) { @@ -77,6 +79,7 @@ public class TaskUtils { setGroupUpdateByPC(groupEntity); } } + public static void setWorkOrderUpdateByAcs(PdmBdWorkorder pdmBdWorkorder) { pdmBdWorkorder.setUpdate_id(GeneralDefinition.ACS_ID); pdmBdWorkorder.setUpdate_name(GeneralDefinition.ACS_NAME); @@ -141,10 +144,12 @@ public class TaskUtils { return list.size() > 0; } - /**不需要转换 + /** + * 不需要转换 * 转成ACS需要的载具类型 * ACS载具类型：1 2 3 ... * LMS载具类型：3 4 5 ... + * * @param acsVehicleType * @return */ @@ -161,10 +166,12 @@ public class TaskUtils { return lmsVehicleType; } - /**不需要转换 + /** + * 不需要转换 * 转成LMS需要的载具类型 * ACS载具类型：1 2 3 ... * LMS载具类型：3 4 5 ... + * * @param lmsVehicleType * @return */ @@ -183,6 +190,7 @@ public class TaskUtils { /** * 如果传来的载具编码是0，就返回null, 否则替换成四位数，用零补齐 + * * @param acsVehicleCode * @return */ @@ -197,6 +205,7 @@ public class TaskUtils { * 将输入的字符串相乘得出值 * eg: 2*7*6 * return: 84 + * * @param needFullNumberStr * @return */ diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/XmlFormatter.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/XmlFormatter.java index 8f35f59..93522ba 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/XmlFormatter.java +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/XmlFormatter.java @@ -1,8 +1,8 @@ package org.nl.wms.util; -import java.io.File; -import java.io.FileWriter; -import java.io.IOException; +import org.w3c.dom.Document; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -13,10 +13,9 @@ import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; - -import org.w3c.dom.Document; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; /** * @Author: lyd diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/test/mapper/TestMapper.xml b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/test/mapper/TestMapper.xml index caac9be..f00f3b0 100644 --- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/test/mapper/TestMapper.xml +++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/util/test/mapper/TestMapper.xml @@ -60,9 +60,9 @@ SELECT point_code, point_name, region_name FROM sch_base_point WHERE 1 = 1 - - AND point_code = #{pointCode} - + + AND point_code = #{pointCode} +