From 5d0c331d8087862059be15e4653daf82ea3e1007 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 4 Mar 2025 17:25:35 +0800 Subject: [PATCH] =?UTF-8?q?3/4=20=E5=8E=BB=E6=8E=89=E6=89=80=E6=9C=89?= =?UTF-8?q?=E6=9C=AA=E5=BC=95=E7=94=A8=E5=A4=9A=E4=BD=99=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/aspect/AuthorizeAspect.java | 3 +- .../java/com/glxp/api/aspect/LogAspect.java | 2 +- .../glxp/api/config/CustomerSqlInjector.java | 1 - .../glxp/api/config/InsertIgnoreBatch.java | 1 - .../glxp/api/config/Knife4jConfiguration.java | 1 - .../api/config/MasterDataSourceConfig.java | 4 - .../java/com/glxp/api/config/MinioConfig.java | 1 - .../com/glxp/api/config/ReplaceBatch.java | 2 - .../com/glxp/api/config/WebMvcConfig.java | 8 -- .../constant/BasicExportStatusTimeEnum.java | 1 - .../alihealth/AlihealthBusController.java | 4 +- .../controller/auth/AuthAdminController.java | 1 - .../controller/auth/AuthCheckController.java | 6 +- .../controller/auth/AuthUserController.java | 23 +++-- .../api/controller/auth/DeptController.java | 5 +- .../controller/auth/DeptUserController.java | 4 +- .../controller/auth/InvBusUserController.java | 1 - .../auth/InvWarehouseController.java | 1 - .../api/controller/auth/LoginController.java | 13 ++- .../auth/SysDictDataController.java | 6 +- .../auth/SysDictTypeController.java | 4 +- .../controller/auth/SysMenuController.java | 6 +- .../controller/auth/SysRoleController.java | 4 +- .../controller/auth/SysUserController.java | 9 +- .../basic/BasicBussinessTypeController.java | 3 - .../controller/basic/BasicCorpController.java | 3 - .../basic/BasicCorpImportLogController.java | 1 - .../basic/BasicInCodeController.java | 5 - .../basic/BasicOrderPrintController.java | 11 ++- .../BasicProductsImportLogController.java | 2 - .../basic/EntrustReceController.java | 2 - .../basic/UdiRelevanceController.java | 2 +- .../controller/basic/UdiRlSupController.java | 2 +- .../controller/basic/UdiSyncController.java | 2 - .../controller/inout/IoCodeController.java | 7 -- .../inout/IoCodeTempController.java | 14 +-- .../controller/inout/IoOrderController.java | 3 - .../inout/IoOrderDetailBizController.java | 15 +-- .../inout/IoOrderDetailResultController.java | 16 +-- .../inout/IoOrderInvoiceController.java | 9 +- .../inout/IoOrderReviewController.java | 18 ++-- .../inout/IoOrderUploadController.java | 2 - .../inout/IoStatDataController.java | 15 --- .../inv/DeviceInspectTakeController.java | 1 - .../inv/DeviceReceiveDetailController.java | 1 - .../controller/inv/InnerOrderController.java | 1 - .../inv/InvMAOrderDetailController.java | 2 - .../inv/InvPreinProductController.java | 4 - .../controller/inv/InvProductController.java | 1 - .../inv/InvRemindSetController.java | 5 +- .../controller/inv/UdiTraceController.java | 5 - .../purchase/PurApplyController.java | 5 - .../purchase/PurArrivalController.java | 7 +- .../purchase/PurDeliveryController.java | 2 - .../purchase/PurOrderController.java | 17 ++-- .../purchase/PurPlanController.java | 6 -- .../purchase/PurReturnedController.java | 13 ++- .../purchase/SupCertController.java | 4 - .../purchase/SupCertRemindMsgController.java | 3 - .../purchase/SupCertSetController.java | 1 - .../purchase/SupCompanyController.java | 1 - .../purchase/SupManufacturerController.java | 2 - .../purchase/SupProductController.java | 5 - .../controller/sup/CustomerController.java | 2 - .../sync/SpsSyncBasicController.java | 3 - .../sync/SpsSyncDownloadController.java | 29 ++---- .../sync/SpsSyncExportStatusController.java | 13 +-- .../sync/SyncDataSetController.java | 6 +- .../controller/sync/SyncDelController.java | 8 +- .../api/controller/sync/TestController.java | 3 - .../system/ClassifyCodeController.java | 4 +- .../controller/system/CompanyController.java | 4 +- .../system/ConnectTestController.java | 4 +- .../system/DeviceKeyController.java | 6 +- .../system/SysMenuHelpController.java | 7 +- .../system/SysMsgTodoController.java | 3 - .../system/SysParamConfigController.java | 7 +- .../system/SysPdfModuleController.java | 3 +- .../system/SysPdfTemplateController.java | 1 - .../system/SysRemindMsgController.java | 1 - ...stemPDFTemplateRelevanceBizController.java | 8 -- ...temPDFTemplateRelevanceCodeController.java | 2 - .../controller/test/TestCodeController.java | 15 +-- .../thrsys/ThirdAliDrugController.java | 1 - .../thrsys/ThirdSysApiController.java | 4 +- .../thrsys/ThirdUploadSetController.java | 6 +- .../thrsys/ThrCorpExportLogController.java | 1 - .../ThrInvProductsExportLogController.java | 5 +- .../ThrInvProductsImportLogController.java | 2 - .../thrsys/ThrInvWarehouseController.java | 1 - .../thrsys/ThrOrderExportLogController.java | 5 +- .../thrsys/ThrProductsAddController.java | 2 - .../thrsys/ThrProductsAddDiController.java | 5 +- .../ThrProductsImportLogController.java | 3 +- .../thrsys/ThrSystemController.java | 2 +- .../com/glxp/api/dao/auth/AuthAdminDao.java | 2 - .../glxp/api/dao/auth/AuthCompanyMapper.java | 1 - .../glxp/api/dao/auth/AuthRoleAdminDao.java | 1 - .../com/glxp/api/dao/auth/AuthRoleDao.java | 1 - .../java/com/glxp/api/dao/auth/DeptDao.java | 1 - .../com/glxp/api/dao/auth/DeptUserDao.java | 1 - .../com/glxp/api/dao/auth/InvBusUserDao.java | 2 - .../glxp/api/dao/auth/InvWarehouseDao.java | 2 - .../dao/auth/SysCustomConfigDetailDao.java | 1 - .../dao/auth/WarehouseBussinessTypeDao.java | 1 - .../api/dao/basic/BasicBussinessTypeDao.java | 1 - .../api/dao/basic/BasicCorpExportLogDao.java | 1 - .../glxp/api/dao/basic/BasicHospTypeDao.java | 8 +- .../api/dao/basic/BasicNewUploadDiDao.java | 3 - .../BasicProductsRegistrationCertDao.java | 1 - .../dao/basic/CompanyProductRelevanceDao.java | 1 - .../glxp/api/dao/basic/ProductInfoDao.java | 1 - .../com/glxp/api/dao/basic/UdiProductDao.java | 1 - .../api/dao/collect/RelCodeBatchMapper.java | 2 - .../api/dao/collect/RelCodeDetailMapper.java | 3 - .../com/glxp/api/dao/inout/IoCodeDao.java | 2 - .../glxp/api/dao/inout/IoCodeRelMapper.java | 1 - .../api/dao/inout/IoOrderDetailBizDao.java | 1 - .../com/glxp/api/dao/inout/ReceiveDao.java | 3 - .../glxp/api/dao/inout/ReceiveDetailDao.java | 1 - .../api/dao/inv/DeviceInspectTaskMapper.java | 3 - .../api/dao/inv/InvPreInProductDetailDao.java | 8 -- .../api/dao/inv/InvPreProductDetailDao.java | 7 -- .../glxp/api/dao/inv/InvPreinDetailDao.java | 3 - .../glxp/api/dao/inv/InvProductNewDao.java | 5 - .../glxp/api/dao/purchase/PurArrivalDao.java | 1 - .../api/dao/purchase/PurArrivalDetailDao.java | 1 - .../api/dao/purchase/PurDeliveryCodeDao.java | 1 - .../glxp/api/dao/purchase/PurDeliveryDao.java | 1 - .../dao/purchase/PurDeliveryDetailDao.java | 3 - .../api/dao/purchase/PurOrderDetailDao.java | 3 - .../api/dao/purchase/PurPlanDetailDao.java | 2 - .../glxp/api/dao/purchase/PurReturnedDao.java | 1 - .../dao/purchase/PurReturnedDetailDao.java | 3 - .../com/glxp/api/dao/purchase/SupCertDao.java | 1 - .../api/dao/purchase/SupCertRemindMsgDao.java | 1 - .../glxp/api/dao/purchase/SupCertSetDao.java | 1 - .../glxp/api/dao/purchase/SupCompanyDao.java | 2 - .../api/dao/purchase/SupManufacturerDao.java | 1 - .../glxp/api/dao/purchase/SupProductDao.java | 2 - .../com/glxp/api/dao/sync/BasicExportDao.java | 1 - .../glxp/api/dao/sync/BasicExportTimeDao.java | 1 - .../dao/sync/SyncDataChangeBustypesDao.java | 1 - .../com/glxp/api/dao/system/CompanyDao.java | 1 - .../com/glxp/api/dao/system/SetupDao.java | 2 - .../glxp/api/dao/system/SysMsgTodoMapper.java | 2 +- .../api/dao/system/SysRemindMsgMapper.java | 2 - .../api/dao/system/SysRemindSetMapper.java | 3 - .../system/SystemPDFTemplateRelevanceDao.java | 2 - .../dao/thrsys/BasicInsMaterialMapper.java | 1 - .../api/dao/thrsys/ThirdAliDrugMapper.java | 6 +- .../api/dao/thrsys/ThrBusTypeOriginDao.java | 2 - .../api/dao/thrsys/ThrInvWarehouseDao.java | 1 - .../api/dao/thrsys/ThrManufacturerMapper.java | 1 - .../com/glxp/api/dao/thrsys/ThrOrderDao.java | 2 - .../api/dao/thrsys/ThrOrderDetailDao.java | 1 - .../api/dao/thrsys/ThrProductsAddDao.java | 2 - .../api/dao/thrsys/ThrProductsAddDiDao.java | 1 - .../api/dao/thrsys/ThrSystemBusApiDao.java | 1 - .../entity/alihealth/YcFileCodeUploadVo.java | 4 - .../com/glxp/api/entity/auth/AuthCompany.java | 2 - .../com/glxp/api/entity/auth/InvSpace.java | 1 - .../basic/BasicBussinessTypeEntity.java | 1 - .../basic/BasicCorpsExportLogEntity.java | 5 +- .../basic/BasicCorpsImportDetailEntity.java | 5 +- .../basic/BasicCorpsImportLogEntity.java | 5 +- .../api/entity/basic/BasicHospTypeEntity.java | 3 +- .../api/entity/basic/BasicProductsEntity.java | 1 - .../BasicProductsImportDetailEntity.java | 5 +- .../basic/BasicProductsImportLogEntity.java | 5 +- .../BasicProductsRegistrationCertEntity.java | 2 - .../entity/basic/BasicUdirelTypeEntity.java | 5 +- .../basic/CompanyProductRelevanceEntity.java | 3 +- .../api/entity/basic/EntrustReceEntity.java | 1 - .../api/entity/basic/UdiProductEntity.java | 1 - .../glxp/api/entity/inout/IoCodeEntity.java | 3 - .../api/entity/inout/IoCodeLostEntity.java | 4 +- .../api/entity/inout/IoCodeTempEntity.java | 1 - .../entity/inout/IoOrderDetailBizEntity.java | 1 - .../entity/inout/IoOrderInvoiceEntity.java | 8 +- .../api/entity/inout/PurReceiveEntity.java | 3 +- .../api/entity/purchase/PurApplyEntity.java | 3 +- .../api/entity/purchase/PurOrderEntity.java | 3 +- .../api/entity/purchase/PurPlanEntity.java | 3 +- .../entity/sync/BasicExportStatusEntity.java | 7 +- .../api/entity/sync/SyncEditLogEntity.java | 5 +- .../api/entity/sync/SyncEditTypeEntity.java | 5 +- .../api/entity/system/SysMenuHelpEntity.java | 4 - .../api/entity/system/SysMsgTodoEntity.java | 5 +- .../api/entity/system/SysRemindMsgEntity.java | 3 +- .../entity/system/SystemPDFModuleEntity.java | 1 - .../com/glxp/api/entity/thrsys/CodeRel.java | 1 - .../glxp/api/entity/thrsys/ThirdAliDrug.java | 7 +- .../entity/thrsys/ThrOrderDetailEntity.java | 3 +- .../thrsys/ThrProductsImportDetailEntity.java | 5 +- .../api/handler/GlobalExceptionHandler.java | 6 +- .../serviceClient/AlihealthClient.java | 6 -- .../serviceClient/NmpaUdiClient.java | 1 + .../api/idc/controller/ConnectController.java | 14 ++- .../api/idc/controller/DeleteController.java | 14 ++- .../api/idc/controller/FileController.java | 26 ++--- .../api/idc/controller/IdcController.java | 43 ++++---- .../glxp/api/idc/service/ConnectService.java | 5 +- .../api/idc/service/DownloadRestTemplate.java | 16 +-- .../com/glxp/api/idc/service/FileService.java | 12 +-- .../com/glxp/api/idc/service/IdcService.java | 16 ++- .../idc/service/impl/ConnectServiceImpl.java | 26 +++-- .../idc/service/impl/DeleteServiceImpl.java | 24 +++-- .../api/idc/service/impl/FileServiceImpl.java | 40 +++----- .../api/idc/service/impl/IdcServiceImpl.java | 55 ++++------- .../java/com/glxp/api/idc/utils/DBAUtils.java | 99 +++++++++---------- .../java/com/glxp/api/idc/utils/IDCUtils.java | 34 +++---- .../java/com/glxp/api/idc/utils/UriUtils.java | 21 ++-- .../alihealth/AliYljgSearchbillReqeust.java | 2 - .../AlihealthKytCommonParametersReqeust.java | 3 - .../AlihealthKytDrugrescodeReqeust.java | 1 - .../AlihealthYljgCodedetailReqeust.java | 1 - .../AlihealthYljgUploadinoutbillReqeust.java | 4 - .../local/AliBillsDisposeReqeust.java | 1 - .../local/AlihealthGetRelCodeReqeust.java | 1 - .../AlihealthRelCodeInsertYljgReqeust.java | 1 - ...healthYljgLocalListupoutDetailReqeust.java | 1 - .../AlihealthYljgLocalListupoutReqeust.java | 1 - .../api/req/auth/AuthUserSaveRequest.java | 1 - .../req/basic/BasicHospTypeFilterRequest.java | 3 - .../api/req/basic/BasicHospTypeRequest.java | 2 - .../basic/BasicUnitMaintainFilterRequest.java | 2 +- .../basic/CompanyProductRelevanceRequest.java | 1 - .../api/req/basic/CopyCustomerIdRequest.java | 2 - .../req/basic/FilterOrderPrintRequest.java | 1 - .../api/req/basic/UdiRelevanceRequest.java | 1 - .../api/req/inout/AddBizProductReqeust.java | 2 - .../req/inout/AddReceiveDetailRequest.java | 1 - .../inout/FilterOrderDetailBizRequest.java | 2 - .../glxp/api/req/inout/IoCodeLostRequest.java | 3 - .../api/req/inout/IoOrderInvoiceRequest.java | 6 -- .../req/inout/UpdateReceiveDetailRequest.java | 3 - .../api/req/inv/invInnerOrderprintReques.java | 1 - .../api/req/purchase/FilterImageRequest.java | 1 - .../api/req/purchase/PostPurOrderRequest.java | 2 - .../req/purchase/PurApplyDetailRequest.java | 3 - .../api/req/system/SysMenuHelpRequest.java | 2 - .../req/thrsys/AddThrDiProductsExcelVo.java | 2 - .../api/req/thrsys/FilterThrCorpRequest.java | 2 +- .../thrsys/FilterThrInvProductsRequest.java | 2 +- .../api/req/thrsys/FilterThrOrderRequest.java | 2 +- .../req/thrsys/FilterThrProductsRequest.java | 1 - .../glxp/api/req/thrsys/ThrOnhandRequest.java | 2 +- .../api/req/thrsys/ThrProductsRequest.java | 4 +- .../thrsys/ThrUnitMaintainFilterRequest.java | 2 +- .../AlihealthKytDrugrescodeResponse.java | 3 +- .../AlihealthKytSearchbillResponse.java | 5 +- .../AlihealthKytSinglerelationResponse.java | 1 - .../AlihealthYljgCodedetailResponse.java | 4 +- .../res/basic/BasicCorpExportLogResponse.java | 1 - .../api/res/basic/BasicHospTypeResponse.java | 4 - .../api/res/basic/InvProductNewResponse.java | 1 - .../basic/UdiRelevanceExportJsonResponse.java | 4 +- .../api/res/inout/AcceptOrderResponse.java | 1 - .../api/res/inout/IoCodeLostResponse.java | 3 - .../glxp/api/res/inout/IoCodeResponse.java | 1 - .../res/inout/IoOrderDetailCodeResponse.java | 1 - .../api/res/inout/IoOrderInvoiceResponse.java | 4 - .../glxp/api/res/inout/IoOrderResponse.java | 1 - .../api/res/inout/ioUploadOrderResponse.java | 1 + .../api/res/purchase/PurOrderResponse.java | 1 - .../res/sync/SpsSyncDeviceTaskResponse.java | 3 +- .../res/sync/SpsSyncOtherDataResponse.java | 2 - .../res/thrsys/ThrBusTypeOriginResponse.java | 3 - .../api/res/thrsys/ThrProductsResponse.java | 1 - .../glxp/api/res/thrsys/UdiInfoResponse.java | 2 - .../glxp/api/service/CustomServiceImpl.java | 1 - .../alihealth/AlihealthBusService.java | 3 - .../impl/AlihealthBusServiceImpl.java | 7 +- .../api/service/auth/AuthAdminService.java | 2 - .../api/service/auth/AuthCompanyService.java | 6 +- .../service/auth/AuthRoleAdminService.java | 1 - .../api/service/auth/AuthRoleService.java | 2 - .../glxp/api/service/auth/DeptService.java | 1 - .../api/service/auth/DeptUserService.java | 2 - .../api/service/auth/InvBusUserService.java | 1 - .../api/service/auth/InvSpaceService.java | 1 - .../api/service/auth/InvWarehouseService.java | 1 - .../auth/WarehouseBussinessTypeService.java | 1 - .../service/auth/WarehouseUserService.java | 2 - .../auth/impl/AuthAdminServiceImpl.java | 3 +- .../auth/impl/AuthCheckServiceImpl.java | 1 - .../auth/impl/AuthRoleAdminServiceImpl.java | 2 - .../auth/impl/AuthRoleServiceImpl.java | 4 - .../auth/impl/CustomerInfoServiceImpl.java | 3 - .../service/auth/impl/DeptServiceImpl.java | 1 - .../auth/impl/DeptUserServiceImpl.java | 2 - .../auth/impl/InvBusUserServiceImpl.java | 3 - .../auth/impl/InvWarehouseServiceImpl.java | 1 - .../auth/impl/SysCustomConfigServiceImpl.java | 1 - .../auth/impl/SysDictDataServiceImpl.java | 2 - .../auth/impl/SysDictTypeServiceImpl.java | 2 - .../auth/impl/SysPdaKeyServiceImpl.java | 1 - .../service/auth/impl/SysRoleServiceImpl.java | 3 - .../auth/impl/UserRegisterServiceImpl.java | 1 - .../WarehouseBussinessTypeServiceImpl.java | 1 - .../auth/impl/WarehouseUserServiceImpl.java | 1 - .../basic/BasicBackUpdateProductService.java | 14 +-- .../api/service/basic/BasicCorpService.java | 1 - .../service/basic/BasicGenExcelService.java | 3 - .../service/basic/BasicGenJsonService.java | 4 - .../service/basic/BasicHospTypeService.java | 1 - .../basic/BasicNewUploadDiService.java | 3 - .../basic/BasicUpdateProductService.java | 3 +- .../basic/CompanyProductsRelService.java | 2 - .../basic/IBasicBusTypeChangeService.java | 1 - .../api/service/basic/UdiContrastService.java | 15 +-- .../api/service/basic/UdiProductService.java | 1 - .../impl/BasicBusTypeChangeServiceImpl.java | 3 - .../impl/BasicBussinessTypeServiceImpl.java | 1 - .../impl/BasicCorpExportLogServiceImpl.java | 1 - .../impl/BasicCorpImportLogServiceImpl.java | 3 +- .../basic/impl/BasicCorpServiceImpl.java | 1 - .../basic/impl/BasicHospTypeServiceImpl.java | 2 - .../impl/BasicNewUploadDiServiceImpl.java | 4 - .../impl/BasicProductSetServiceImpl.java | 1 - .../BasicProductsExportLogServiceImpl.java | 1 - .../BasicProductsImportDetailServiceImpl.java | 6 +- .../BasicProductsImportLogServiceImpl.java | 1 - .../impl/BasicUnitMaintainServiceImpl.java | 1 - .../CompanyProductRelevanceServiceImpl.java | 3 - .../basic/impl/EntrustReceServiceImpl.java | 1 - .../basic/impl/ProductInfoServiceImpl.java | 2 - .../basic/impl/UdiCompanyServiceImpl.java | 1 - .../basic/impl/UdiProductServiceImpl.java | 2 - .../basic/impl/UdiRelevanceServiceImpl.java | 2 - .../basic/impl/UdiRlSupServiceImpl.java | 2 - .../service/collect/RelCodeBatchService.java | 9 -- .../service/collect/RelCodeDetailService.java | 1 - .../dev/impl/DeviceInfoServiceImpl.java | 1 - .../api/service/inout/IoAddInoutService.java | 5 +- .../service/inout/IoChangeInoutService.java | 3 - .../service/inout/IoCheckInoutService.java | 24 ++--- .../api/service/inout/IoGenInvService.java | 6 +- .../inout/IoOrderDetailBizService.java | 1 - .../inout/IoOrderDetailCodeService.java | 2 - .../inout/IoOrderDetailResultService.java | 1 - .../service/inout/ReceivedetailService.java | 2 - .../inout/impl/IoCodeLostServiceImpl.java | 11 +-- .../inout/impl/IoCodeRelServiceImpl.java | 1 - .../api/service/inout/impl/IoCodeService.java | 2 - .../service/inout/impl/IoCodeTempService.java | 22 +++-- .../impl/IoOrderDetailBizServiceImpl.java | 7 -- .../impl/IoOrderDetailResultServiceImpl.java | 1 - .../inout/impl/IoOrderInvoiceService.java | 4 - .../inout/impl/IoOrderServiceImpl.java | 5 +- .../inout/impl/ReceiveDetailServiceImpl.java | 1 - .../inv/DeviceReceiveOrderDetailService.java | 2 - .../inv/DeviceReceiveOrderService.java | 1 - .../inv/InvInnerOrderPrintService.java | 1 - .../service/inv/InvMAOrderDetailService.java | 1 - .../service/inv/InvPreinDetailService.java | 6 -- .../api/service/inv/InvPreinOrderService.java | 2 - .../inv/InvPreinProductDetailService.java | 3 - .../service/inv/InvPreinProductService.java | 1 - .../DeviceReceiveOrderDetailServiceImpl.java | 10 +- .../inv/impl/InnerOrderDetailServiceImpl.java | 1 - .../inv/impl/InnerOrderServiceImpl.java | 1 - .../inv/impl/InvCountCodesServiceImpl.java | 1 - .../inv/impl/InvCountOrderServiceImpl.java | 11 +-- .../impl/InvInnerOrderPdfTempServiceImpl.java | 2 - .../impl/InvInnerOrderPrintServiceImpl.java | 7 +- .../inv/impl/InvMAOrderDetailServiceImpl.java | 12 ++- .../service/inv/impl/InvPlaceServiceImpl.java | 2 +- .../InvPreInProductDetailServiceImpl.java | 5 - .../inv/impl/InvPreProductServiceImpl.java | 1 - .../inv/impl/InvPreinDetailServiceImpl.java | 1 - .../inv/impl/InvProductServiceNew.java | 7 -- .../impl/SysLogininforServiceImpl.java | 1 - .../monitor/impl/SysOperLogServiceImpl.java | 1 - .../purchase/CustomerContactService.java | 6 -- .../api/service/purchase/PurOrderService.java | 4 - .../purchase/PurPlanDetailService.java | 3 - .../api/service/purchase/PurPlanService.java | 2 - .../impl/CustomerContactServiceImpl.java | 5 - .../impl/PurApplyDetailImplService.java | 2 - .../purchase/impl/PurApplyServiceImpl.java | 1 - .../impl/PurArrivalDetailServiceImpl.java | 1 - .../purchase/impl/PurArrivalServiceImpl.java | 2 - .../impl/PurDeliveryDetailServiceImpl.java | 1 - .../purchase/impl/PurDeliveryServiceImpl.java | 1 - .../impl/PurOrderDetailServiceImpl.java | 1 - .../purchase/impl/PurOrderServiceImpl.java | 7 -- .../impl/PurPlanDetailServiceImpl.java | 2 - .../purchase/impl/PurPlanServiceImpl.java | 1 - .../impl/PurReturnedDetailServiceImpl.java | 1 - .../purchase/impl/PurReturnedServiceImpl.java | 1 - .../purchase/impl/SupCertRemindMsgImpl.java | 4 - .../purchase/impl/SupCertServiceImpl.java | 3 - .../purchase/impl/SupCertSetServiceImpl.java | 1 - .../impl/SupManufacturerServiceImpl.java | 1 - .../purchase/impl/SupProductServiceImpl.java | 3 - .../api/service/sync/BasicExportService.java | 1 - .../service/sync/BasicExportTimeService.java | 3 - .../service/sync/SpsSyncDownloadService.java | 4 - .../api/service/sync/SyncEditLogService.java | 4 +- .../api/service/sync/SyncEditTypeService.java | 2 +- .../sync/impl/BasicDownloadServiceImpl.java | 2 - .../sync/impl/BasicExportServiceImpl.java | 1 - .../sync/impl/BasicExportTimeServiceImpl.java | 2 - .../api/service/system/CompanyService.java | 1 - .../service/system/SysMenuHelpService.java | 2 - .../api/service/system/SysMsgTodoService.java | 2 +- .../service/system/SysRemindMsgService.java | 1 - .../service/system/SysRemindSetService.java | 1 - .../SystemPDFTemplateRelevanceBizService.java | 1 - ...SystemPDFTemplateRelevanceCodeService.java | 2 - .../system/impl/ClassifyCodeServiceImpl.java | 1 - .../system/impl/CompanyServiceImpl.java | 3 - .../system/impl/SysMenuHelpServiceImpl.java | 10 +- .../system/impl/SysMsgTodoServiceImpl.java | 2 +- .../system/impl/SysRemindMsgServiceImpl.java | 7 +- .../system/impl/SysRemindSetServiceImpl.java | 1 - ...SystemPDFTemplateRelevanceServiceImpl.java | 3 - .../impl/SystemParamConfigServiceImpl.java | 1 - .../system/impl/ThirdSysApiServiceImpl.java | 1 - .../thrsys/BasicInsMaterialService.java | 1 - .../service/thrsys/ThirdAliDrugService.java | 18 ++-- .../api/service/thrsys/ThrCorpService.java | 2 - .../api/service/thrsys/ThrCorpsDlService.java | 1 - .../api/service/thrsys/ThrHslbService.java | 1 - .../thrsys/ThrInvProductsDlService.java | 5 +- .../thrsys/ThrInvWarehouseService.java | 1 - .../thrsys/ThrManufacturerService.java | 2 - .../api/service/thrsys/ThrOrderService.java | 2 - .../service/thrsys/ThrProductTypeService.java | 1 - .../thrsys/ThrSystemDetailService.java | 2 +- .../api/service/thrsys/ThrSystemService.java | 1 - .../impl/ThrCorpExportLogServiceImpl.java | 2 - .../impl/ThrCorpImportDetailServiceImpl.java | 3 - .../impl/ThrCorpImportLogServiceImpl.java | 1 - .../thrsys/impl/ThrCorpServiceImpl.java | 1 - .../thrsys/impl/ThrDeptServiceImpl.java | 1 - .../impl/ThrInvProductsDetailServiceImpl.java | 3 - .../ThrInvProductsExportLogServiceImpl.java | 1 - .../ThrInvProductsImportLogServiceImpl.java | 1 - .../impl/ThrInvProductsServiceImpl.java | 4 - .../impl/ThrInvWarehouseServiceImpl.java | 2 - .../impl/ThrOrderDetailServiceImpl.java | 1 - .../impl/ThrOrderExportLogServiceImpl.java | 1 - .../impl/ThrOrderImportDetailServiceImpl.java | 1 - .../impl/ThrOrderImportLogServiceImpl.java | 2 - .../thrsys/impl/ThrOrderServiceImpl.java | 9 -- .../thrsys/impl/ThrProductsAddDiService.java | 5 - .../impl/ThrProductsAddServiceImpl.java | 1 - .../impl/ThrProductsExportLogServiceImpl.java | 1 - .../ThrProductsImportDetailServiceImpl.java | 1 - .../impl/ThrProductsImportLogServiceImpl.java | 1 - .../thrsys/impl/ThrProductsServiceImpl.java | 1 - .../impl/ThrSystemDetailServiceImpl.java | 3 +- .../thrsys/impl/ThrSystemServiceImpl.java | 1 - .../com/glxp/api/task/AsyncDiDlService.java | 2 - .../com/glxp/api/task/AsyncHeartTask.java | 1 - .../java/com/glxp/api/task/AsyncSpsTask.java | 13 +-- .../com/glxp/api/task/UploadDrugDataTask.java | 1 - .../glxp/api/upload/DownloadController.java | 1 - .../com/glxp/api/upload/uploadController.java | 2 - .../java/com/glxp/api/util/FileUtils.java | 18 +--- .../java/com/glxp/api/util/HttpClient.java | 1 - .../java/com/glxp/api/util/MinioUtil.java | 1 - .../api/util/alihealth/AlihealthUtils.java | 4 +- .../glxp/api/util/alihealth/CopyUtils.java | 2 - .../glxp/api/util/page/ListPageRequest.java | 1 - .../api/util/redis/RedisDelayedQueue.java | 6 +- 469 files changed, 533 insertions(+), 1375 deletions(-) diff --git a/src/main/java/com/glxp/api/aspect/AuthorizeAspect.java b/src/main/java/com/glxp/api/aspect/AuthorizeAspect.java index 5cc3b4c9..dfddd8c9 100644 --- a/src/main/java/com/glxp/api/aspect/AuthorizeAspect.java +++ b/src/main/java/com/glxp/api/aspect/AuthorizeAspect.java @@ -2,11 +2,11 @@ package com.glxp.api.aspect; import cn.hutool.core.util.StrUtil; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.dao.auth.AuthLicenseDao; import com.glxp.api.entity.auth.AuthLicense; import com.glxp.api.exception.JsonException; import com.glxp.api.util.JwtUtils; -import com.glxp.api.common.enums.ResultEnum; import io.jsonwebtoken.Claims; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -19,7 +19,6 @@ import org.springframework.stereotype.Component; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; -import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.lang.reflect.Method; diff --git a/src/main/java/com/glxp/api/aspect/LogAspect.java b/src/main/java/com/glxp/api/aspect/LogAspect.java index ba83ace7..dc7eb45e 100644 --- a/src/main/java/com/glxp/api/aspect/LogAspect.java +++ b/src/main/java/com/glxp/api/aspect/LogAspect.java @@ -4,6 +4,7 @@ import cn.hutool.core.lang.Dict; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.ObjectUtil; import com.glxp.api.annotation.Log; +import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.constant.BusinessStatus; import com.glxp.api.entity.monitor.OperLogDTO; import com.glxp.api.exception.JsonException; @@ -11,7 +12,6 @@ import com.glxp.api.service.monitor.OperLogService; import com.glxp.api.util.JsonUtils; import com.glxp.api.util.ServletUtils; import com.glxp.api.util.SpringUtils; -import com.glxp.api.common.enums.ResultEnum; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.aspectj.lang.JoinPoint; diff --git a/src/main/java/com/glxp/api/config/CustomerSqlInjector.java b/src/main/java/com/glxp/api/config/CustomerSqlInjector.java index 9d417ca6..1f06cb71 100644 --- a/src/main/java/com/glxp/api/config/CustomerSqlInjector.java +++ b/src/main/java/com/glxp/api/config/CustomerSqlInjector.java @@ -3,7 +3,6 @@ package com.glxp.api.config; import com.baomidou.mybatisplus.core.injector.AbstractMethod; import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector; import com.baomidou.mybatisplus.core.metadata.TableInfo; -import org.springframework.stereotype.Component; import java.util.List; diff --git a/src/main/java/com/glxp/api/config/InsertIgnoreBatch.java b/src/main/java/com/glxp/api/config/InsertIgnoreBatch.java index b07e6dc2..3e56a112 100644 --- a/src/main/java/com/glxp/api/config/InsertIgnoreBatch.java +++ b/src/main/java/com/glxp/api/config/InsertIgnoreBatch.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.injector.AbstractMethod; import com.baomidou.mybatisplus.core.metadata.TableFieldInfo; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.sql.SqlScriptUtils; import lombok.Setter; import lombok.experimental.Accessors; diff --git a/src/main/java/com/glxp/api/config/Knife4jConfiguration.java b/src/main/java/com/glxp/api/config/Knife4jConfiguration.java index 3d62c2ff..98d47f5e 100644 --- a/src/main/java/com/glxp/api/config/Knife4jConfiguration.java +++ b/src/main/java/com/glxp/api/config/Knife4jConfiguration.java @@ -1,7 +1,6 @@ package com.glxp.api.config; -import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; diff --git a/src/main/java/com/glxp/api/config/MasterDataSourceConfig.java b/src/main/java/com/glxp/api/config/MasterDataSourceConfig.java index f47a3396..9242e821 100644 --- a/src/main/java/com/glxp/api/config/MasterDataSourceConfig.java +++ b/src/main/java/com/glxp/api/config/MasterDataSourceConfig.java @@ -2,12 +2,8 @@ package com.glxp.api.config; import com.baomidou.mybatisplus.core.MybatisConfiguration; import com.baomidou.mybatisplus.core.config.GlobalConfig; -import com.baomidou.mybatisplus.core.injector.ISqlInjector; -import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; -import com.baomidou.mybatisplus.extension.plugins.inner.BlockAttackInnerInterceptor; import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; import org.apache.ibatis.session.SqlSessionFactory; -import org.mybatis.spring.SqlSessionFactoryBean; import org.mybatis.spring.annotation.MapperScan; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/src/main/java/com/glxp/api/config/MinioConfig.java b/src/main/java/com/glxp/api/config/MinioConfig.java index 23c81fdb..5f5a1804 100644 --- a/src/main/java/com/glxp/api/config/MinioConfig.java +++ b/src/main/java/com/glxp/api/config/MinioConfig.java @@ -4,7 +4,6 @@ import io.minio.MinioClient; import io.minio.errors.InvalidEndpointException; import io.minio.errors.InvalidPortException; import lombok.Data; -import lombok.RequiredArgsConstructor; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/glxp/api/config/ReplaceBatch.java b/src/main/java/com/glxp/api/config/ReplaceBatch.java index 122fa820..2c03d5c4 100644 --- a/src/main/java/com/glxp/api/config/ReplaceBatch.java +++ b/src/main/java/com/glxp/api/config/ReplaceBatch.java @@ -1,6 +1,5 @@ package com.glxp.api.config; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.core.enums.SqlMethod; import com.baomidou.mybatisplus.core.injector.AbstractMethod; import com.baomidou.mybatisplus.core.metadata.TableFieldInfo; @@ -10,7 +9,6 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.sql.SqlScriptUtils; import lombok.Setter; import lombok.experimental.Accessors; -import org.apache.ibatis.executor.keygen.Jdbc3KeyGenerator; import org.apache.ibatis.executor.keygen.KeyGenerator; import org.apache.ibatis.executor.keygen.NoKeyGenerator; import org.apache.ibatis.mapping.MappedStatement; diff --git a/src/main/java/com/glxp/api/config/WebMvcConfig.java b/src/main/java/com/glxp/api/config/WebMvcConfig.java index 4042c592..dea03d39 100644 --- a/src/main/java/com/glxp/api/config/WebMvcConfig.java +++ b/src/main/java/com/glxp/api/config/WebMvcConfig.java @@ -1,18 +1,10 @@ package com.glxp.api.config; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.module.SimpleModule; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import org.springframework.context.annotation.Configuration; -import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.web.servlet.config.annotation.CorsRegistry; -import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import java.util.List; - @Configuration public class WebMvcConfig implements WebMvcConfigurer { diff --git a/src/main/java/com/glxp/api/constant/BasicExportStatusTimeEnum.java b/src/main/java/com/glxp/api/constant/BasicExportStatusTimeEnum.java index b6f47f4a..d19c190d 100644 --- a/src/main/java/com/glxp/api/constant/BasicExportStatusTimeEnum.java +++ b/src/main/java/com/glxp/api/constant/BasicExportStatusTimeEnum.java @@ -3,7 +3,6 @@ package com.glxp.api.constant; import com.baomidou.mybatisplus.annotation.EnumValue; import lombok.AllArgsConstructor; import lombok.Getter; -import org.springframework.beans.factory.annotation.Value; /** * task最后执行时间key diff --git a/src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java b/src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java index a650a738..fdf2b020 100644 --- a/src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java +++ b/src/main/java/com/glxp/api/controller/alihealth/AlihealthBusController.java @@ -43,7 +43,9 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; @Slf4j diff --git a/src/main/java/com/glxp/api/controller/auth/AuthAdminController.java b/src/main/java/com/glxp/api/controller/auth/AuthAdminController.java index 06495603..9b102ac1 100644 --- a/src/main/java/com/glxp/api/controller/auth/AuthAdminController.java +++ b/src/main/java/com/glxp/api/controller/auth/AuthAdminController.java @@ -15,7 +15,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.List; -import java.util.stream.Collectors; /** * 管理员相关 diff --git a/src/main/java/com/glxp/api/controller/auth/AuthCheckController.java b/src/main/java/com/glxp/api/controller/auth/AuthCheckController.java index a8023c18..7b729f6c 100644 --- a/src/main/java/com/glxp/api/controller/auth/AuthCheckController.java +++ b/src/main/java/com/glxp/api/controller/auth/AuthCheckController.java @@ -2,15 +2,15 @@ package com.glxp.api.controller.auth; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.Log; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.auth.AuthCheckEntity; import com.glxp.api.req.auth.FilterAuthCheckRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.auth.AuthCheckService; import com.glxp.api.util.RsaUtils; -import com.glxp.api.common.enums.ResultEnum; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java index 5198f11d..5f836180 100644 --- a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java @@ -5,24 +5,33 @@ import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.Log; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.controller.BaseController; -import com.glxp.api.entity.auth.*; +import com.glxp.api.entity.auth.AuthAdmin; +import com.glxp.api.entity.auth.DeptEntity; +import com.glxp.api.entity.auth.WarehouseUserEntity; import com.glxp.api.req.auth.*; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.common.enums.ResultEnum; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.service.auth.*; +import com.glxp.api.service.auth.AuthAdminService; +import com.glxp.api.service.auth.DeptService; +import com.glxp.api.service.auth.WarehouseUserService; import com.glxp.api.util.PasswordUtils; import com.glxp.api.util.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; /** * 管理员相关 diff --git a/src/main/java/com/glxp/api/controller/auth/DeptController.java b/src/main/java/com/glxp/api/controller/auth/DeptController.java index c863ebb5..10cd73aa 100644 --- a/src/main/java/com/glxp/api/controller/auth/DeptController.java +++ b/src/main/java/com/glxp/api/controller/auth/DeptController.java @@ -25,7 +25,10 @@ import com.glxp.api.service.auth.DeptUserService; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.system.SystemParamConfigService; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; diff --git a/src/main/java/com/glxp/api/controller/auth/DeptUserController.java b/src/main/java/com/glxp/api/controller/auth/DeptUserController.java index d6cfef3c..09d7b729 100644 --- a/src/main/java/com/glxp/api/controller/auth/DeptUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/DeptUserController.java @@ -4,6 +4,8 @@ import cn.hutool.core.collection.CollUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.Log; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.auth.DeptEntity; import com.glxp.api.entity.auth.DeptUserEntity; @@ -13,8 +15,6 @@ import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.auth.DeptUserResponse; import com.glxp.api.service.auth.DeptService; import com.glxp.api.service.auth.DeptUserService; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.service.auth.WarehouseUserService; import com.glxp.api.service.inout.IoOrderService; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/glxp/api/controller/auth/InvBusUserController.java b/src/main/java/com/glxp/api/controller/auth/InvBusUserController.java index c1a8ac0d..b7831993 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvBusUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvBusUserController.java @@ -29,7 +29,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; -import java.util.ArrayList; import java.util.Collections; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index c8eabf87..207c9c25 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -25,7 +25,6 @@ import com.glxp.api.res.auth.InvWarehouseThirdSysResponse; import com.glxp.api.res.basic.BasicBussinessTypeResponse; import com.glxp.api.service.auth.*; import com.glxp.api.service.basic.IBasicBussinessTypeService; -import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.IntUtil; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/glxp/api/controller/auth/LoginController.java b/src/main/java/com/glxp/api/controller/auth/LoginController.java index c8c0cb59..96500434 100644 --- a/src/main/java/com/glxp/api/controller/auth/LoginController.java +++ b/src/main/java/com/glxp/api/controller/auth/LoginController.java @@ -6,6 +6,9 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.SecureUtil; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.Log; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.Constant; import com.glxp.api.controller.BaseController; @@ -21,19 +24,15 @@ import com.glxp.api.req.auth.PCLoginRequest; import com.glxp.api.req.auth.UpdatePasswordRequest; import com.glxp.api.res.auth.LoginResponse; import com.glxp.api.res.auth.LoginUserInfoResponse; +import com.glxp.api.res.auth.WebTitleResponse; import com.glxp.api.res.inout.ioUploadOrderResponse; +import com.glxp.api.service.auth.*; import com.glxp.api.service.inout.IoOrderUtilsService; -import com.glxp.api.res.auth.WebTitleResponse; -import com.glxp.api.service.system.CompanyService; import com.glxp.api.service.monitor.LogininforService; -import com.glxp.api.common.enums.ResultEnum; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.service.auth.*; +import com.glxp.api.service.system.CompanyService; import com.glxp.api.util.*; import com.glxp.api.vo.inv.InvWarehouseTreeVo; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.BindingResult; diff --git a/src/main/java/com/glxp/api/controller/auth/SysDictDataController.java b/src/main/java/com/glxp/api/controller/auth/SysDictDataController.java index 33f4bb2e..92c0869c 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysDictDataController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysDictDataController.java @@ -1,21 +1,19 @@ package com.glxp.api.controller.auth; import cn.dev33.satoken.annotation.SaCheckPermission; -import cn.hutool.core.util.ObjectUtil; import com.glxp.api.annotation.Log; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.SysDictData; import com.glxp.api.req.auth.SysDictDataRequest; import com.glxp.api.service.auth.ISysDictDataService; import com.glxp.api.service.auth.ISysDictTypeService; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; import java.util.List; /** diff --git a/src/main/java/com/glxp/api/controller/auth/SysDictTypeController.java b/src/main/java/com/glxp/api/controller/auth/SysDictTypeController.java index 61c2be68..d466f710 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysDictTypeController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysDictTypeController.java @@ -4,6 +4,8 @@ package com.glxp.api.controller.auth; import cn.dev33.satoken.annotation.SaCheckPermission; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.Log; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.Constant; import com.glxp.api.controller.BaseController; @@ -11,8 +13,6 @@ import com.glxp.api.entity.auth.SysDictType; import com.glxp.api.req.auth.SysDictTypeRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.auth.ISysDictTypeService; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/glxp/api/controller/auth/SysMenuController.java b/src/main/java/com/glxp/api/controller/auth/SysMenuController.java index 55b04e50..9a53efa4 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysMenuController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysMenuController.java @@ -3,15 +3,13 @@ package com.glxp.api.controller.auth; import cn.hutool.core.lang.tree.Tree; import cn.hutool.http.HttpUtil; import com.glxp.api.annotation.Log; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.Constant; import com.glxp.api.controller.BaseController; -import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.SysMenu; -import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.ISysMenuService; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/glxp/api/controller/auth/SysRoleController.java b/src/main/java/com/glxp/api/controller/auth/SysRoleController.java index 58a3f662..c754a366 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysRoleController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysRoleController.java @@ -3,6 +3,8 @@ package com.glxp.api.controller.auth; import cn.dev33.satoken.annotation.SaCheckPermission; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.Log; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.Constant; import com.glxp.api.controller.BaseController; @@ -14,8 +16,6 @@ import com.glxp.api.req.auth.FilterRoleRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.auth.AuthAdminService; import com.glxp.api.service.auth.ISysRoleService; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/glxp/api/controller/auth/SysUserController.java b/src/main/java/com/glxp/api/controller/auth/SysUserController.java index ea3dd8df..15bb6184 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysUserController.java @@ -8,11 +8,14 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.Log; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.*; -import com.glxp.api.req.auth.FilterAuthUserRequest; import com.glxp.api.req.auth.AuthUserSaveRequest; +import com.glxp.api.req.auth.FilterAuthUserRequest; import com.glxp.api.req.auth.FilterDeptUserReqeust; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.auth.AuthAdminResponse; @@ -20,12 +23,8 @@ import com.glxp.api.res.auth.DeptUserResponse; import com.glxp.api.service.auth.*; import com.glxp.api.util.PasswordUtils; import com.glxp.api.util.StreamUtils; -import com.glxp.api.common.enums.ResultEnum; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.util.StringUtils; import lombok.RequiredArgsConstructor; -import org.codehaus.groovy.util.StringUtil; import org.springframework.beans.BeanUtils; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.BindingResult; diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java index 1dba2671..43e87ec7 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java @@ -30,10 +30,7 @@ import com.glxp.api.res.basic.BasicBussinessTypeResponse; import com.glxp.api.res.basic.BussinessTypExportResponse; import com.glxp.api.res.basic.CandidateRequest; import com.glxp.api.service.auth.CustomerService; -import com.glxp.api.service.auth.InvBusUserService; -import com.glxp.api.service.auth.WarehouseBussinessTypeService; import com.glxp.api.service.basic.IBasicBussinessTypeService; -import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.FileUtils; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java index 3c0c78ff..093716dc 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpController.java @@ -19,7 +19,6 @@ import com.glxp.api.entity.sync.SocketMsgEntity; import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; -import com.glxp.api.httpClient.serviceClient.ErpBasicClient; import com.glxp.api.req.basic.*; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest; @@ -29,9 +28,7 @@ import com.glxp.api.res.basic.BasicErpUnitsResponse; import com.glxp.api.res.basic.BasicProductThirdSysResponse; import com.glxp.api.res.basic.BasicUnitMaintainResponse; import com.glxp.api.service.basic.BasicCorpService; -import com.glxp.api.service.system.CompanyService; import com.glxp.api.service.system.SystemParamConfigService; -import com.glxp.api.service.thrsys.ThrCorpService; import com.glxp.api.service.thrsys.ThrSystemDetailService; import com.glxp.api.service.thrsys.ThrSystemService; import com.glxp.api.service.thrsys.ThrUnitImportService; diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCorpImportLogController.java b/src/main/java/com/glxp/api/controller/basic/BasicCorpImportLogController.java index 9b801b7e..a1828630 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicCorpImportLogController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicCorpImportLogController.java @@ -9,7 +9,6 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.BusinessType; -import com.glxp.api.entity.basic.BasicCorpsImportDetailEntity; import com.glxp.api.entity.basic.BasicCorpsImportLogEntity; import com.glxp.api.req.basic.FilterCorpImportLogRequest; import com.glxp.api.req.system.DeleteRequest; diff --git a/src/main/java/com/glxp/api/controller/basic/BasicInCodeController.java b/src/main/java/com/glxp/api/controller/basic/BasicInCodeController.java index 448546f1..939e31b5 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicInCodeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicInCodeController.java @@ -5,13 +5,9 @@ import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.Log; -import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; -import com.glxp.api.entity.basic.BasicCorpEntity; -import com.glxp.api.entity.inout.IoOrderDetailBizEntity; -import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.req.inout.FilterOrderDetailBizRequest; import com.glxp.api.req.inout.FilterOrderRequest; import com.glxp.api.req.inv.invInnerOrderprintReques; @@ -22,7 +18,6 @@ import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.service.inv.InvInnerOrderPrintService; import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java index 7166765a..e89c277e 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java @@ -15,11 +15,12 @@ import com.glxp.api.entity.inout.IoCodeEntity; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.inout.IoOrderInvoiceEntity; -import com.glxp.api.entity.system.*; +import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity; +import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; +import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.req.basic.FilterOrderPrintRequest; import com.glxp.api.req.inout.FilterOrderRequest; -import com.glxp.api.req.thrsys.UdiwmsOrderDetailRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.service.basic.IBasicBussinessTypeService; @@ -29,9 +30,11 @@ import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inout.impl.IoOrderInvoiceService; -import com.glxp.api.service.system.*; +import com.glxp.api.service.system.SystemPDFModuleService; +import com.glxp.api.service.system.SystemPDFTemplateRelevanceCodeService; +import com.glxp.api.service.system.SystemPDFTemplateService; +import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.service.thrsys.ThrProductsService; -import com.glxp.api.util.DateUtil; import com.glxp.api.util.FileUtils; import com.glxp.api.util.IntUtil; import com.glxp.api.util.JasperUtils; diff --git a/src/main/java/com/glxp/api/controller/basic/BasicProductsImportLogController.java b/src/main/java/com/glxp/api/controller/basic/BasicProductsImportLogController.java index 1a913d20..2115de94 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicProductsImportLogController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicProductsImportLogController.java @@ -19,8 +19,6 @@ import com.glxp.api.res.basic.UdiRelevanceExportJsonResponse; import com.glxp.api.service.basic.BasicProductsImportDetailService; import com.glxp.api.service.basic.BasicProductsImportLogService; import com.glxp.api.util.CustomUtil; -import org.apache.poi.ss.usermodel.CellType; -import org.apache.poi.ss.usermodel.Row; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.validation.BindingResult; diff --git a/src/main/java/com/glxp/api/controller/basic/EntrustReceController.java b/src/main/java/com/glxp/api/controller/basic/EntrustReceController.java index 2f140976..40f98146 100644 --- a/src/main/java/com/glxp/api/controller/basic/EntrustReceController.java +++ b/src/main/java/com/glxp/api/controller/basic/EntrustReceController.java @@ -11,13 +11,11 @@ import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.basic.DlEntrustReceEntity; import com.glxp.api.entity.basic.EntrustReceEntity; -import com.glxp.api.req.auth.BussinessTypeFilterRequest; import com.glxp.api.req.basic.BasicEntrustRecRequest; import com.glxp.api.req.basic.FilterBussinessTypeRequest; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.EntrustReceResponse; -import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.EntrustReceService; import com.glxp.api.service.basic.IBasicBussinessTypeService; diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java index 4917c707..32eace7e 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java @@ -9,10 +9,10 @@ import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.constant.SyncDelType; import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.SocketMsgType; +import com.glxp.api.constant.SyncDelType; import com.glxp.api.controller.BaseController; import com.glxp.api.controller.sync.SpsSyncWebSocket; import com.glxp.api.dao.basic.UdiRelevanceDao; diff --git a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java index 8d96d9d0..82a5c442 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java @@ -27,8 +27,8 @@ import com.glxp.api.req.system.CompanyRequest; import com.glxp.api.req.system.DeleteCompanyFileRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.CompanyProductRelevanceResponse; -import com.glxp.api.res.basic.UdiRlSupResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; +import com.glxp.api.res.basic.UdiRlSupResponse; import com.glxp.api.service.auth.AuthAdminService; import com.glxp.api.service.auth.CustomerInfoService; import com.glxp.api.service.basic.*; diff --git a/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java b/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java index 6ef33fde..79c77631 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiSyncController.java @@ -3,7 +3,6 @@ package com.glxp.api.controller.basic; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.Page; import com.github.pagehelper.PageInfo; @@ -15,7 +14,6 @@ import com.glxp.api.controller.BaseController; import com.glxp.api.dao.basic.BasicProductsRegistrationCertDao; import com.glxp.api.dto.DictDto; import com.glxp.api.entity.basic.*; -import com.glxp.api.entity.dev.DeviceInfoEntity; import com.glxp.api.req.basic.*; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.basic.*; diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeController.java index 833a6266..3e666cd4 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeController.java @@ -2,13 +2,11 @@ package com.glxp.api.controller.inout; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; -import com.glxp.api.dao.inout.IoOrderDao; import com.glxp.api.entity.alihealth.YcFileCodeUploadVo; import com.glxp.api.entity.inout.IoCodeEntity; import com.glxp.api.entity.inout.IoOrderEntity; @@ -23,18 +21,13 @@ import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.util.Excel.ExcelHandler; -import com.glxp.api.util.Excel.ExcelTemplateEnum; import com.glxp.api.util.Excel.Exception.RenException; -import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; -import java.util.Date; import java.util.List; /** diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index f4dbd38b..868bc268 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -1,8 +1,6 @@ package com.glxp.api.controller.inout; -import cn.hutool.Hutool; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; @@ -12,8 +10,8 @@ import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.constant.*; import com.glxp.api.constant.Constant; +import com.glxp.api.constant.*; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.InvWarehouseEntity; @@ -21,14 +19,11 @@ import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiProductEntity; -import com.glxp.api.entity.collect.RelCodeDetail; import com.glxp.api.entity.inout.*; import com.glxp.api.entity.inv.InvPreInProductDetailEntity; import com.glxp.api.entity.inv.InvPreProductDetailEntity; -import com.glxp.api.entity.inv.InvPreinDetailEntity; import com.glxp.api.entity.purchase.SupCertEntity; import com.glxp.api.entity.purchase.SupProductEntity; -import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.req.basic.CompanyProductRelevanceRequest; import com.glxp.api.req.inout.AddEnterCodeRequest; import com.glxp.api.req.inout.AddOrderRequest; @@ -36,18 +31,15 @@ import com.glxp.api.req.inout.FilterCodeRequest; import com.glxp.api.req.inout.PostOrderRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; -import com.glxp.api.res.basic.UdiRlSupResponse; -import com.glxp.api.res.collect.RelCodeDetailResponse; import com.glxp.api.res.inout.AddCodeResult; import com.glxp.api.res.inout.IoCodeTempResponse; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.*; -import com.glxp.api.service.collect.RelCodeBatchService; -import com.glxp.api.service.collect.RelCodeDetailService; import com.glxp.api.service.inout.*; import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inout.impl.IoCodeTempService; -import com.glxp.api.service.inv.*; +import com.glxp.api.service.inv.InvPreProductDetailService; +import com.glxp.api.service.inv.InvPreinProductDetailService; import com.glxp.api.service.inv.impl.InvProductServiceNew; import com.glxp.api.service.purchase.SupCertService; import com.glxp.api.service.purchase.SupProductService; diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index 1d77210f..7a59f891 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -2,7 +2,6 @@ package com.glxp.api.controller.inout; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.text.StrBuilder; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -51,8 +50,6 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; -import org.java_websocket.server.WebSocketServer; -import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java index 0cd7bec5..a2d55448 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java @@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONObject; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.CusRedissonAnnotation; @@ -20,7 +19,6 @@ import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.RedissonCacheKey; import com.glxp.api.controller.BaseController; import com.glxp.api.dao.basic.UdiRelevanceDao; -import com.glxp.api.dao.inout.IoOrderDetailBizDao; import com.glxp.api.entity.alihealth.AliYljgBillDetail; import com.glxp.api.entity.alihealth.AliYljgBillDetailDrug; import com.glxp.api.entity.alihealth.AliYljgBillDetailDrugCode; @@ -31,9 +29,6 @@ import com.glxp.api.entity.basic.*; import com.glxp.api.entity.inout.*; import com.glxp.api.entity.purchase.PurOrderDetailEntity; import com.glxp.api.entity.purchase.PurOrderEntity; -import com.glxp.api.entity.purchase.SupCertEntity; -import com.glxp.api.entity.purchase.SupProductEntity; -import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; import com.glxp.api.entity.thrsys.ThrOrderEntity; import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity; @@ -42,11 +37,9 @@ import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.req.inout.*; import com.glxp.api.req.inv.FilterInvoiceRequest; import com.glxp.api.req.system.DeleteRequest; -import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.inout.IoOrderDetailBizResponse; -import com.glxp.api.res.inout.IoOrderDetailCodeResponse; import com.glxp.api.res.inout.IoOrderDetailResultResponse; import com.glxp.api.res.inout.IoOrderInvoiceResponse; import com.glxp.api.service.alihealth.AlihealthBusService; @@ -57,8 +50,6 @@ import com.glxp.api.service.inout.impl.IoCodeTempService; import com.glxp.api.service.inout.impl.IoOrderInvoiceService; import com.glxp.api.service.purchase.PurOrderDetailService; import com.glxp.api.service.purchase.PurOrderService; -import com.glxp.api.service.purchase.SupCertService; -import com.glxp.api.service.purchase.SupProductService; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.service.thrsys.ThrOrderDetailService; import com.glxp.api.service.thrsys.ThrOrderService; @@ -67,7 +58,6 @@ import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.IntUtil; import com.glxp.api.util.OrderNoTypeBean; import com.glxp.api.util.udi.FilterUdiUtils; -import com.glxp.api.util.udi.UdiCalCountUtil; import org.springframework.beans.BeanUtils; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.BindingResult; @@ -76,7 +66,10 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import java.math.BigDecimal; -import java.util.*; +import java.util.Arrays; +import java.util.Comparator; +import java.util.Date; +import java.util.List; import java.util.stream.Collectors; /** diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java index a7ef9739..0d584863 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java @@ -1,9 +1,7 @@ package com.glxp.api.controller.inout; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageInfo; @@ -11,13 +9,9 @@ import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantType; import com.glxp.api.controller.BaseController; -import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.AuthCompany; -import com.glxp.api.entity.auth.InvWarehouseEntity; -import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; import com.glxp.api.entity.inout.IoOrderEntity; @@ -28,13 +22,10 @@ import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.req.inout.*; import com.glxp.api.res.inout.CptTraceOrderResponse; import com.glxp.api.res.inout.CptTraceResultResponse; -import com.glxp.api.res.inout.IoCodeResponse; import com.glxp.api.res.inout.IoOrderDetailResultResponse; import com.glxp.api.service.auth.AuthCompanyService; -import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.inout.*; -import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inout.impl.IoOrderInvoiceService; import com.glxp.api.service.system.SystemPDFModuleService; import com.glxp.api.service.system.SystemPDFTemplateService; @@ -54,10 +45,11 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; import java.text.SimpleDateFormat; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 单据扫码明细查询接口 diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java index 0d7305bf..9813e720 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java @@ -11,21 +11,20 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.controller.BaseController; -import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; -import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.inout.IoOrderInvoiceEntity; import com.glxp.api.req.inout.FilterOrderDetailCodeRequest; import com.glxp.api.req.inout.IoOrderInvoiceRequest; import com.glxp.api.req.inout.RefreshInoiceRequest; import com.glxp.api.req.system.DeleteRequest; -import com.glxp.api.res.inout.*; +import com.glxp.api.res.inout.IoOrderDetailResultResponse; +import com.glxp.api.res.inout.IoOrderInvoiceResponse; +import com.glxp.api.res.inout.IoOrderResponse; +import com.glxp.api.res.inout.RefreshInoiceResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderDetailCodeService; import com.glxp.api.service.inout.impl.IoOrderInvoiceService; -import com.glxp.api.util.CustomUtil; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java index 604a7d6e..3c71b31a 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java @@ -6,7 +6,6 @@ import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; @@ -19,44 +18,39 @@ import com.glxp.api.constant.ConstantType; import com.glxp.api.controller.BaseController; import com.glxp.api.dao.basic.BasicProductsDao; import com.glxp.api.dao.inout.IoCodeDao; -import com.glxp.api.dao.inout.IoCodeTempDao; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.basic.EntrustReceEntity; -import com.glxp.api.entity.collect.RelCodeBatch; -import com.glxp.api.entity.inout.*; +import com.glxp.api.entity.inout.IoCodeEntity; +import com.glxp.api.entity.inout.IoCodeTempEntity; +import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.system.SystemParamConfigEntity; -import com.glxp.api.req.alihealth.AlihealthYljgSinglerelationReqeust; import com.glxp.api.req.alihealth.AlihealthYljgUploadinoutbillReqeust; import com.glxp.api.req.inout.FilterOrderDetailResultRequest; import com.glxp.api.req.inout.ReviewFinishRequest; import com.glxp.api.req.inout.ReviewSpmsRequest; import com.glxp.api.req.inout.UpdateExportStatusRequest; import com.glxp.api.req.sync.SpsSyncDataRequest; -import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.alihealth.AlihealthYljgSinglerelationResponse; import com.glxp.api.res.inout.AcceptOrderResponse; import com.glxp.api.res.inout.IoOrderDetailResultResponse; -import com.glxp.api.res.sync.SpsSyncOrderResponse; import com.glxp.api.service.auth.AuthAdminService; import com.glxp.api.service.basic.EntrustReceService; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.collect.RelCodeBatchService; -import com.glxp.api.service.collect.RelCodeDetailService; -import com.glxp.api.service.inout.*; +import com.glxp.api.service.inout.IoCheckInoutService; +import com.glxp.api.service.inout.IoOrderDetailResultService; +import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inout.impl.IoCodeTempService; import com.glxp.api.service.sync.SpsSyncDownloadService; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.*; import com.glxp.api.util.alihealth.AlihealthYljgUtils; -import com.glxp.api.util.redis.RedisDelayedQueue; import com.glxp.api.util.udi.FilterUdiUtils; import com.glxp.api.util.udi.UdiCalCountUtil; import com.google.common.collect.Lists; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderUploadController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderUploadController.java index 6f2fb1c9..bf58eeb1 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderUploadController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderUploadController.java @@ -4,8 +4,6 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.idc.utils.IDCUtils; import com.glxp.api.util.FileUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; diff --git a/src/main/java/com/glxp/api/controller/inout/IoStatDataController.java b/src/main/java/com/glxp/api/controller/inout/IoStatDataController.java index db94f076..b3e68454 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoStatDataController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoStatDataController.java @@ -1,29 +1,14 @@ package com.glxp.api.controller.inout; -import com.github.pagehelper.PageInfo; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.constant.SocketMsgType; import com.glxp.api.controller.BaseController; -import com.glxp.api.controller.sync.SpsSyncWebSocket; -import com.glxp.api.entity.sync.SocketMsgEntity; -import com.glxp.api.req.basic.BasicDataRequest; -import com.glxp.api.req.inout.FilterOrderDetailResultRequest; import com.glxp.api.req.inout.FilterStatDataRequest; import com.glxp.api.service.inout.IoStatDataService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.junit.Test; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.client.RestTemplate; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.net.URLEncoder; -import java.util.List; /** * 出入库汇总Test 测试 远程连接 diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java b/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java index db4b4300..1923b7c0 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java +++ b/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java @@ -22,7 +22,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.lang.reflect.Type; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceReceiveDetailController.java b/src/main/java/com/glxp/api/controller/inv/DeviceReceiveDetailController.java index fc1933e3..4dd04131 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceReceiveDetailController.java +++ b/src/main/java/com/glxp/api/controller/inv/DeviceReceiveDetailController.java @@ -8,7 +8,6 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.inv.DeviceReceiveOrderDetailEntity; -import com.glxp.api.req.inv.AddDeviceReceiveOrderDetailRequest; import com.glxp.api.req.inv.FilterDeviceReceiveOrderDetailRequest; import com.glxp.api.res.inv.DeviceReceiveOrderDetailResponse; import com.glxp.api.service.inv.DeviceReceiveOrderDetailService; diff --git a/src/main/java/com/glxp/api/controller/inv/InnerOrderController.java b/src/main/java/com/glxp/api/controller/inv/InnerOrderController.java index 58b16aae..3ae19be6 100644 --- a/src/main/java/com/glxp/api/controller/inv/InnerOrderController.java +++ b/src/main/java/com/glxp/api/controller/inv/InnerOrderController.java @@ -25,7 +25,6 @@ import com.glxp.api.service.inv.InnerOrderService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import lombok.RequiredArgsConstructor; -import org.springframework.beans.BeanUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/glxp/api/controller/inv/InvMAOrderDetailController.java b/src/main/java/com/glxp/api/controller/inv/InvMAOrderDetailController.java index 6384fb8e..87d50f99 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvMAOrderDetailController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvMAOrderDetailController.java @@ -1,6 +1,5 @@ package com.glxp.api.controller.inv; -import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.Log; @@ -9,7 +8,6 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.inv.InvMAOrderDetailEntity; -import com.glxp.api.req.inv.AddInvMAOrderDetailRequest; import com.glxp.api.req.inv.FilterInvMAOrderDetailRequest; import com.glxp.api.res.inv.InvMAOrderDetailResponse; import com.glxp.api.service.inv.InvMAOrderDetailService; diff --git a/src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java b/src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java index 8a004c14..c76467cb 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvPreinProductController.java @@ -8,18 +8,14 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.inv.InvPreInProductDetailEntity; -import com.glxp.api.entity.inv.InvPreProductDetailEntity; import com.glxp.api.req.inv.FilterInvPreProductDetailRequest; -import com.glxp.api.req.inv.FilterInvPreinDetailRequest; import com.glxp.api.req.inv.FilterInvPreinProductRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.inv.InvPreProductDetailResponse; import com.glxp.api.res.inv.InvPreProductPageResponse; -import com.glxp.api.res.inv.InvPreinDetailResponse; import com.glxp.api.res.inv.InvPreinProductResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.WarehouseUserService; -import com.glxp.api.service.inv.InvPreinDetailService; import com.glxp.api.service.inv.InvPreinProductDetailService; import com.glxp.api.service.inv.InvPreinProductService; import com.glxp.api.util.udi.FilterUdiUtils; diff --git a/src/main/java/com/glxp/api/controller/inv/InvProductController.java b/src/main/java/com/glxp/api/controller/inv/InvProductController.java index 6c440b6f..2dae5005 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvProductController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvProductController.java @@ -1,6 +1,5 @@ package com.glxp.api.controller.inv; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; diff --git a/src/main/java/com/glxp/api/controller/inv/InvRemindSetController.java b/src/main/java/com/glxp/api/controller/inv/InvRemindSetController.java index 57c1042f..06d4b145 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvRemindSetController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvRemindSetController.java @@ -15,7 +15,10 @@ import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.res.inv.InvRemindSetResponse; import com.glxp.api.service.inv.InvRemindSetService; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import java.util.List; diff --git a/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java b/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java index 36999548..35a68715 100644 --- a/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java +++ b/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java @@ -1,6 +1,5 @@ package com.glxp.api.controller.inv; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -12,12 +11,10 @@ import com.glxp.api.dao.inout.IoCodeDao; import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.inout.IoCodeEntity; -import com.glxp.api.entity.inv.InvProductEntity; import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.req.inout.FilterCodeRequest; import com.glxp.api.req.inout.FilterOrderRequest; import com.glxp.api.req.inv.FilterCodeTraceRequest; -import com.glxp.api.req.inv.FilterInvProductDetailRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.inout.IoOrderResponse; @@ -25,10 +22,8 @@ import com.glxp.api.res.inv.UdiTraceResponse; import com.glxp.api.service.basic.UdiProductService; import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.inout.IoOrderService; -import com.glxp.api.service.inv.impl.InvProductServiceNew; import com.glxp.api.util.MsDateUtil; import com.glxp.api.util.udi.FilterUdiUtils; -import com.glxp.api.vo.basic.InvProductNewVo; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java index 154e7f23..8f716d0f 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurApplyController.java @@ -2,7 +2,6 @@ package com.glxp.api.controller.purchase; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.Log; @@ -23,9 +22,6 @@ import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.purchase.PurApplyResponse; import com.glxp.api.res.purchase.PurOrderDetailResponse; import com.glxp.api.service.auth.CustomerService; -import com.glxp.api.service.basic.IBasicBussinessTypeService; -import com.glxp.api.service.basic.UdiRelevanceService; -import com.glxp.api.service.basic.UdiRlSupService; import com.glxp.api.service.purchase.PurApplyDetailService; import com.glxp.api.service.purchase.PurApplyService; import com.glxp.api.service.purchase.PurPlanDetailService; @@ -33,7 +29,6 @@ import com.glxp.api.service.purchase.PurPlanService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import lombok.RequiredArgsConstructor; -import org.springframework.beans.BeanUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/glxp/api/controller/purchase/PurArrivalController.java b/src/main/java/com/glxp/api/controller/purchase/PurArrivalController.java index 03740195..616ddc5c 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurArrivalController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurArrivalController.java @@ -17,10 +17,12 @@ import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderEntity; -import com.glxp.api.entity.purchase.*; +import com.glxp.api.entity.purchase.PurApplyEntity; +import com.glxp.api.entity.purchase.PurArrivalDetailEntity; +import com.glxp.api.entity.purchase.PurArrivalEntity; +import com.glxp.api.entity.purchase.PurDeliveryDetailEntity; import com.glxp.api.req.purchase.PostPurArrivalRequest; import com.glxp.api.req.purchase.PurArrivalRequest; -import com.glxp.api.req.purchase.PurDeliveryRequest; import com.glxp.api.req.purchase.PurOrderDetailRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.purchase.PurArrivalDetailResponse; @@ -42,7 +44,6 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.constraints.NotEmpty; -import java.math.BigDecimal; import java.util.Arrays; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java b/src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java index 4abc7ff4..6e78a9e4 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurDeliveryController.java @@ -43,13 +43,11 @@ import com.glxp.api.util.OrderNoTypeBean; import com.glxp.api.util.RedisUtil; import com.glxp.api.util.udi.UdiCalCountUtil; import lombok.RequiredArgsConstructor; -import org.springframework.beans.BeanUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.constraints.NotEmpty; -import java.math.BigDecimal; import java.util.Arrays; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java index fbb6a7ea..baea81b5 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurOrderController.java @@ -17,28 +17,33 @@ import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderEntity; -import com.glxp.api.entity.purchase.*; -import com.glxp.api.req.purchase.*; +import com.glxp.api.entity.purchase.PurApplyEntity; +import com.glxp.api.entity.purchase.PurOrderDetailEntity; +import com.glxp.api.entity.purchase.PurOrderEntity; +import com.glxp.api.entity.purchase.PurPlanDetailEntity; +import com.glxp.api.req.purchase.PostPurOrderRequest; +import com.glxp.api.req.purchase.PurOrderDetailRequest; +import com.glxp.api.req.purchase.PurOrderRequest; +import com.glxp.api.req.purchase.PurPlanDetailRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.purchase.PurOrderDetailResponse; import com.glxp.api.res.purchase.PurOrderResponse; -import com.glxp.api.res.purchase.PurPlanResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderService; -import com.glxp.api.service.purchase.*; +import com.glxp.api.service.purchase.PurOrderDetailService; +import com.glxp.api.service.purchase.PurOrderService; +import com.glxp.api.service.purchase.PurPlanDetailService; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import lombok.RequiredArgsConstructor; -import org.springframework.beans.BeanUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.constraints.NotEmpty; -import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; diff --git a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java index 67d0177a..464b49f2 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurPlanController.java @@ -13,7 +13,6 @@ import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; -import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderEntity; @@ -26,12 +25,9 @@ import com.glxp.api.req.purchase.PurApplyDetailRequest; import com.glxp.api.req.purchase.PurPlanDetailRequest; import com.glxp.api.req.purchase.PurPlanRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.purchase.PurOrderDetailResponse; import com.glxp.api.res.purchase.PurPlanResponse; import com.glxp.api.service.auth.CustomerService; -import com.glxp.api.service.basic.BasicCorpService; -import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.service.purchase.PurApplyDetailService; @@ -42,13 +38,11 @@ import com.glxp.api.util.CustomUtil; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import lombok.RequiredArgsConstructor; -import org.springframework.beans.BeanUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.constraints.NotEmpty; -import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; diff --git a/src/main/java/com/glxp/api/controller/purchase/PurReturnedController.java b/src/main/java/com/glxp/api/controller/purchase/PurReturnedController.java index 16023096..ff891bb5 100644 --- a/src/main/java/com/glxp/api/controller/purchase/PurReturnedController.java +++ b/src/main/java/com/glxp/api/controller/purchase/PurReturnedController.java @@ -17,19 +17,19 @@ import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderEntity; -import com.glxp.api.entity.purchase.*; -import com.glxp.api.req.purchase.*; +import com.glxp.api.entity.purchase.PurApplyEntity; +import com.glxp.api.entity.purchase.PurReturnedDetailEntity; +import com.glxp.api.entity.purchase.PurReturnedEntity; +import com.glxp.api.req.purchase.PostPurReturnedRequest; +import com.glxp.api.req.purchase.PurOrderDetailRequest; +import com.glxp.api.req.purchase.PurReturnedRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.purchase.PurArrivalDetailResponse; -import com.glxp.api.res.purchase.PurArrivalResponse; import com.glxp.api.res.purchase.PurReturnedDetailResponse; import com.glxp.api.res.purchase.PurReturnedResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderService; -import com.glxp.api.service.purchase.PurArrivalDetailService; -import com.glxp.api.service.purchase.PurArrivalService; import com.glxp.api.service.purchase.PurReturnedDetailService; import com.glxp.api.service.purchase.PurReturnedService; import com.glxp.api.util.CustomUtil; @@ -41,7 +41,6 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.constraints.NotEmpty; -import java.math.BigDecimal; import java.util.Arrays; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java index 9eac7f54..48badd55 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertController.java @@ -16,14 +16,11 @@ import com.glxp.api.constant.ConstantStatus; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.purchase.*; import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; -import com.glxp.api.entity.system.SystemPDFModuleEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.exception.JsonException; import com.glxp.api.req.inout.InspectionPDFTemplateRequest; -import com.glxp.api.req.inout.SystemPDFModuleRequest; import com.glxp.api.req.purchase.*; import com.glxp.api.req.system.DeleteCompanyFileRequest; -import com.glxp.api.req.system.FilterPdfModuleRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.purchase.SupProductResponse; import com.glxp.api.service.auth.AuthAdminService; @@ -34,7 +31,6 @@ import com.glxp.api.service.purchase.SupProductService; import com.glxp.api.service.system.SystemPDFModuleService; import com.glxp.api.service.system.SystemPDFTemplateService; import com.glxp.api.util.JasperUtils; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertRemindMsgController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertRemindMsgController.java index 94adfe02..c0fc59ac 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertRemindMsgController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertRemindMsgController.java @@ -2,7 +2,6 @@ package com.glxp.api.controller.purchase; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; @@ -10,9 +9,7 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.dao.purchase.SupCertRemindMsgDao; -import com.glxp.api.entity.basic.BasicCorpsImportLogEntity; import com.glxp.api.entity.purchase.SupCertRemindMsgEntity; -import com.glxp.api.req.basic.FilterCorpImportLogRequest; import com.glxp.api.req.purchase.FilterCertRemindMsgRequest; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.res.purchase.SupCertRemindMsgResponse; diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java b/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java index 6f03c763..a1805018 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCertSetController.java @@ -3,7 +3,6 @@ package com.glxp.api.controller.purchase; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import com.github.pagehelper.PageInfo; - import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; diff --git a/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java b/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java index f503f4da..246c4a9b 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupCompanyController.java @@ -35,7 +35,6 @@ import com.glxp.api.service.auth.CustomerInfoService; import com.glxp.api.service.basic.BasicCorpService; import com.glxp.api.service.purchase.*; import com.glxp.api.util.CustomUtil; -import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java b/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java index 3a00d31c..732fc818 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java @@ -24,8 +24,6 @@ import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.auth.AuthAdminService; import com.glxp.api.service.purchase.*; -import com.glxp.api.service.system.CompanyService; -import com.glxp.api.util.StringUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java index 19a21501..9d04e8ec 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java @@ -1,11 +1,9 @@ package com.glxp.api.controller.purchase; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; - import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; @@ -31,9 +29,6 @@ import com.glxp.api.res.purchase.SupProductResponse; import com.glxp.api.service.auth.AuthAdminService; import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.purchase.*; -import com.glxp.api.service.thrsys.ThrProductsService; -import com.glxp.api.service.thrsys.ThrSystemService; -import com.glxp.api.util.GennerOrderUtils; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/glxp/api/controller/sup/CustomerController.java b/src/main/java/com/glxp/api/controller/sup/CustomerController.java index 374a5c89..c73679ae 100644 --- a/src/main/java/com/glxp/api/controller/sup/CustomerController.java +++ b/src/main/java/com/glxp/api/controller/sup/CustomerController.java @@ -18,7 +18,6 @@ import com.glxp.api.req.auth.CustomerInfoFilterRequest; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.alihealth.AlihealthKytGetentinfoResponse; -import com.glxp.api.res.alihealth.AlihealthKytSinglerelationResponse; import com.glxp.api.service.auth.AuthAdminService; import com.glxp.api.service.auth.AuthRoleAdminService; import com.glxp.api.service.auth.CustomerInfoService; @@ -27,7 +26,6 @@ import com.glxp.api.service.system.CompanyService; import com.glxp.api.util.alihealth.AlihealthUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncBasicController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncBasicController.java index 7c7ca0ae..9ecc5e80 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncBasicController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncBasicController.java @@ -11,17 +11,14 @@ import com.glxp.api.constant.BusinessType; import com.glxp.api.dao.basic.BasicProductsDao; import com.glxp.api.dao.basic.CompanyProductRelevanceDao; import com.glxp.api.dao.basic.UdiRelevanceDao; -import com.glxp.api.dao.thrsys.ThrProductsAddDao; import com.glxp.api.dao.thrsys.ThrProductsAddDiDao; import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.thrsys.ThrProductsAddDiEntity; import com.glxp.api.req.sync.SpsSyncBasicRlRequest; -import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.service.basic.CompanyProductRelevanceService; import com.glxp.api.service.basic.UdiProductService; -import com.glxp.api.service.thrsys.ThrProductsAddService; import com.glxp.api.util.IntUtil; import io.swagger.annotations.Api; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java index b857a11b..fadaa87a 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java @@ -14,22 +14,20 @@ import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.*; -import com.glxp.api.constant.Constant; import com.glxp.api.dao.auth.*; -import com.glxp.api.dao.basic.*; -import com.glxp.api.dao.collect.RelCodeBatchMapper; -import com.glxp.api.dao.collect.RelCodeDetailMapper; +import com.glxp.api.dao.basic.BasicBusTypeChangeDao; +import com.glxp.api.dao.basic.BasicBusTypePreDao; +import com.glxp.api.dao.basic.BasicBussinessTypeDao; +import com.glxp.api.dao.basic.EntrustReceDao; import com.glxp.api.dao.dev.*; import com.glxp.api.dao.inout.*; -import com.glxp.api.dao.inv.*; -import com.glxp.api.dao.purchase.*; +import com.glxp.api.dao.inv.DeviceInspectTaskDetailMapper; +import com.glxp.api.dao.inv.DeviceInspectTaskMapper; import com.glxp.api.dao.schedule.SystemParamConfigDao; import com.glxp.api.dao.system.*; import com.glxp.api.dao.thrsys.*; import com.glxp.api.entity.auth.*; import com.glxp.api.entity.basic.*; -import com.glxp.api.entity.collect.RelCodeBatch; -import com.glxp.api.entity.collect.RelCodeDetail; import com.glxp.api.entity.dev.*; import com.glxp.api.entity.inout.*; import com.glxp.api.entity.inv.DeviceInspectTaskEntity; @@ -44,9 +42,6 @@ import com.glxp.api.req.sync.SyncUpLoadRequest; import com.glxp.api.res.sync.*; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.IBasicBussinessTypeService; -import com.glxp.api.service.collect.RelCodeBatchService; -import com.glxp.api.service.collect.RelCodeDetailService; -import com.glxp.api.service.dev.DeviceUpkeepService; import com.glxp.api.service.inout.IoAddInoutService; import com.glxp.api.service.inout.IoCheckInoutService; import com.glxp.api.service.inout.IoOrderService; @@ -56,7 +51,10 @@ import com.glxp.api.service.sync.BasicDownloadService; import com.glxp.api.service.sync.BasicExportService; import com.glxp.api.service.sync.SpsSyncDownloadService; import com.glxp.api.service.sync.SyncDataBustypeService; -import com.glxp.api.util.*; +import com.glxp.api.util.CustomUtil; +import com.glxp.api.util.DateUtil; +import com.glxp.api.util.IntUtil; +import com.glxp.api.util.JsonUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -65,7 +63,6 @@ import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; import org.apache.ibatis.session.TransactionIsolationLevel; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.transaction.annotation.Transactional; @@ -75,18 +72,12 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import javax.annotation.Resources; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.*; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.util.ArrayList; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java index 31dd3733..0e3fd530 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncExportStatusController.java @@ -9,7 +9,8 @@ import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.constant.*; +import com.glxp.api.constant.BasicExportStatusEnum; +import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.sync.BasicExportStatusEntity; import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; import com.glxp.api.req.sync.BasicExportStatusRequest; @@ -17,17 +18,11 @@ import com.glxp.api.req.sync.BasicExportTimeRequest; import com.glxp.api.req.sync.ManualSyncDataReq; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.sync.SpSyncUdiResponse; -import com.glxp.api.res.sync.SpsSyncBusResponse; -import com.glxp.api.res.sync.SpsSyncDataResponse; -import com.glxp.api.res.sync.SpsSyncOrderResponse; import com.glxp.api.res.system.SyncDataSetResponse; import com.glxp.api.service.sync.BasicExportService; import com.glxp.api.service.sync.BasicExportTimeService; import com.glxp.api.service.sync.SpsSyncDownloadService; import com.glxp.api.service.sync.SyncDataSetService; -import com.glxp.api.task.TaskExecutorConfig; -import com.glxp.api.util.CustomUtil; import com.glxp.api.util.DateUtil; import com.glxp.api.util.RedisUtil; import lombok.RequiredArgsConstructor; @@ -40,7 +35,9 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; -import java.io.*; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.util.Date; diff --git a/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java b/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java index 386f3182..2384fee9 100644 --- a/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java +++ b/src/main/java/com/glxp/api/controller/sync/SyncDataSetController.java @@ -2,6 +2,9 @@ package com.glxp.api.controller.sync; import cn.hutool.core.collection.CollUtil; import com.glxp.api.annotation.AuthRuleAnnotation; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.entity.sync.SyncDataBustypeEntity; import com.glxp.api.entity.sync.SyncDataSetEntity; @@ -10,9 +13,6 @@ import com.glxp.api.service.sync.SyncDataBustypeService; import com.glxp.api.service.sync.SyncDataChangeBustypeService; import com.glxp.api.service.sync.SyncDataSetService; import com.glxp.api.util.RedisUtil; -import com.glxp.api.common.enums.ResultEnum; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import org.springframework.beans.BeanUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/glxp/api/controller/sync/SyncDelController.java b/src/main/java/com/glxp/api/controller/sync/SyncDelController.java index 33e76ecb..0ce5d7ea 100644 --- a/src/main/java/com/glxp/api/controller/sync/SyncDelController.java +++ b/src/main/java/com/glxp/api/controller/sync/SyncDelController.java @@ -13,7 +13,6 @@ import com.glxp.api.constant.SyncDelType; import com.glxp.api.controller.BaseController; import com.glxp.api.dao.dev.DeviceInfoMapper; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; -import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.dev.DeviceInfoEntity; import com.glxp.api.entity.inv.DeviceInspectTaskDetailEntity; @@ -22,13 +21,16 @@ import com.glxp.api.entity.sync.SyncEditLogEntity; import com.glxp.api.entity.sync.SyncEditTypeEntity; import com.glxp.api.entity.thrsys.CodeRel; import com.glxp.api.httpClient.serviceClient.ErpBasicClient; -import com.glxp.api.req.basic.*; +import com.glxp.api.req.basic.BasicDataRequest; +import com.glxp.api.req.basic.DeleteBasicDataRequest; import com.glxp.api.req.system.DeleteCompanyFileRequest; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.service.auth.InvBusUserService; import com.glxp.api.service.auth.WarehouseBussinessTypeService; import com.glxp.api.service.basic.*; -import com.glxp.api.service.inout.*; +import com.glxp.api.service.inout.IoOrderDetailBizService; +import com.glxp.api.service.inout.IoOrderDetailCodeService; +import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inout.impl.IoCodeTempService; import com.glxp.api.service.inv.DeviceInspectTaskDetailService; diff --git a/src/main/java/com/glxp/api/controller/sync/TestController.java b/src/main/java/com/glxp/api/controller/sync/TestController.java index 9c6aeb66..0d9c1556 100644 --- a/src/main/java/com/glxp/api/controller/sync/TestController.java +++ b/src/main/java/com/glxp/api/controller/sync/TestController.java @@ -1,16 +1,13 @@ package com.glxp.api.controller.sync; import cn.hutool.core.util.StrUtil; -import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.Log; -import com.glxp.api.annotation.RepeatSubmit; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.SocketMsgType; import com.glxp.api.entity.sync.SocketMsgEntity; import com.glxp.api.idc.utils.IDCUtils; -import com.glxp.api.res.inout.IoCodeResponse; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/glxp/api/controller/system/ClassifyCodeController.java b/src/main/java/com/glxp/api/controller/system/ClassifyCodeController.java index 7ce3e554..b775beab 100644 --- a/src/main/java/com/glxp/api/controller/system/ClassifyCodeController.java +++ b/src/main/java/com/glxp/api/controller/system/ClassifyCodeController.java @@ -1,12 +1,12 @@ package com.glxp.api.controller.system; import com.github.pagehelper.PageInfo; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.entity.system.ClassifyCodeEntity; import com.glxp.api.req.system.FilterClassifyCodeRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.system.ClassifyCodeService; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/glxp/api/controller/system/CompanyController.java b/src/main/java/com/glxp/api/controller/system/CompanyController.java index 52426ba6..dcce4277 100644 --- a/src/main/java/com/glxp/api/controller/system/CompanyController.java +++ b/src/main/java/com/glxp/api/controller/system/CompanyController.java @@ -1,12 +1,12 @@ package com.glxp.api.controller.system; import com.glxp.api.annotation.Log; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.system.CompanyEntity; import com.glxp.api.req.system.CompanyRequest; import com.glxp.api.service.system.CompanyService; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/src/main/java/com/glxp/api/controller/system/ConnectTestController.java b/src/main/java/com/glxp/api/controller/system/ConnectTestController.java index 84e36a4a..301f40d6 100644 --- a/src/main/java/com/glxp/api/controller/system/ConnectTestController.java +++ b/src/main/java/com/glxp/api/controller/system/ConnectTestController.java @@ -1,11 +1,11 @@ package com.glxp.api.controller.system; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.entity.auth.AuthConnectEntity; import com.glxp.api.entity.system.CompanyEntity; import com.glxp.api.req.auth.FilterConnectRequest; import com.glxp.api.service.system.CompanyService; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/glxp/api/controller/system/DeviceKeyController.java b/src/main/java/com/glxp/api/controller/system/DeviceKeyController.java index 108097c5..ba2f8f27 100644 --- a/src/main/java/com/glxp/api/controller/system/DeviceKeyController.java +++ b/src/main/java/com/glxp/api/controller/system/DeviceKeyController.java @@ -2,6 +2,9 @@ package com.glxp.api.controller.system; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.Log; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.system.SysPdaKeyEntity; import com.glxp.api.req.system.DeleteRequest; @@ -9,9 +12,6 @@ import com.glxp.api.req.system.FilterDeviceKeyRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.auth.SysPdaKeyService; import com.glxp.api.util.DateUtil; -import com.glxp.api.common.enums.ResultEnum; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java b/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java index b719d599..3817a27d 100644 --- a/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java +++ b/src/main/java/com/glxp/api/controller/system/SysMenuHelpController.java @@ -15,10 +15,11 @@ import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.auth.ISysMenuService; import com.glxp.api.service.system.SysMenuHelpService; import com.glxp.api.util.StringUtils; -import org.apache.commons.collections.CollectionUtils; -import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; diff --git a/src/main/java/com/glxp/api/controller/system/SysMsgTodoController.java b/src/main/java/com/glxp/api/controller/system/SysMsgTodoController.java index 9176d968..78df83e6 100644 --- a/src/main/java/com/glxp/api/controller/system/SysMsgTodoController.java +++ b/src/main/java/com/glxp/api/controller/system/SysMsgTodoController.java @@ -1,12 +1,9 @@ package com.glxp.api.controller.system; import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.pagehelper.PageInfo; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.entity.system.SysMsgTodoEntity; import com.glxp.api.req.system.SysMsgTodoQuery; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.system.SysMsgTodoService; diff --git a/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java b/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java index 7e74e865..a7f183ae 100644 --- a/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java +++ b/src/main/java/com/glxp/api/controller/system/SysParamConfigController.java @@ -6,6 +6,9 @@ import cn.hutool.core.util.ReflectUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.Log; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.dao.schedule.ScheduledDao; import com.glxp.api.entity.system.ProductRemarkSetEntity; @@ -17,10 +20,6 @@ import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.system.SystemParamConfigResponse; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.CronUtils; -import com.glxp.api.common.enums.ResultEnum; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; -import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java b/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java index 053f0a1b..0c113223 100644 --- a/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java +++ b/src/main/java/com/glxp/api/controller/system/SysPdfModuleController.java @@ -14,8 +14,8 @@ import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity; import com.glxp.api.req.basic.FilterBussinessTypeRequest; import com.glxp.api.req.system.FilterPdfModuleRequest; -import com.glxp.api.req.system.SysPdfModuleSaveRequest; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; +import com.glxp.api.req.system.SysPdfModuleSaveRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.system.SystemPDFModuleResponse; import com.glxp.api.res.system.SystemPDFModuleSelectResponse; @@ -24,7 +24,6 @@ import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.system.SystemPDFModuleService; import com.glxp.api.service.system.SystemPDFTemplateRelevanceService; import com.glxp.api.service.system.SystemPDFTemplateService; -import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java b/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java index 3eb6874d..3fdc11d2 100644 --- a/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java +++ b/src/main/java/com/glxp/api/controller/system/SysPdfTemplateController.java @@ -1,6 +1,5 @@ package com.glxp.api.controller.system; -import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.Log; diff --git a/src/main/java/com/glxp/api/controller/system/SysRemindMsgController.java b/src/main/java/com/glxp/api/controller/system/SysRemindMsgController.java index 3b11ac1b..9668b662 100644 --- a/src/main/java/com/glxp/api/controller/system/SysRemindMsgController.java +++ b/src/main/java/com/glxp/api/controller/system/SysRemindMsgController.java @@ -5,7 +5,6 @@ import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.entity.system.SysRemindMsgEntity; -import com.glxp.api.entity.system.SysRemindSetEntity; import com.glxp.api.req.system.FilterSysRemindMsgRequest; import com.glxp.api.service.system.SysRemindMsgService; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceBizController.java b/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceBizController.java index 884da7d7..7ca99b08 100644 --- a/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceBizController.java +++ b/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceBizController.java @@ -1,24 +1,16 @@ package com.glxp.api.controller.system; import com.github.pagehelper.PageInfo; -import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; -import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity; -import com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity; -import com.glxp.api.entity.thrsys.ThrDeptEntity; import com.glxp.api.req.basic.FilterBusTypeChangeRequest; -import com.glxp.api.req.basic.FilterBussinessTypeRequest; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.BasicBusTypeChangeResponse; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; import com.glxp.api.service.basic.IBasicBusTypeChangeService; -import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.system.SystemPDFTemplateRelevanceBizService; -import com.glxp.api.service.system.impl.SystemPDFTemplateRelevanceBizServiceImpl; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceCodeController.java b/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceCodeController.java index 5625b9b8..a9285d94 100644 --- a/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceCodeController.java +++ b/src/main/java/com/glxp/api/controller/system/SystemPDFTemplateRelevanceCodeController.java @@ -4,8 +4,6 @@ import com.github.pagehelper.PageInfo; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; -import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity; -import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity; import com.glxp.api.req.basic.FilterBussinessTypeRequest; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; diff --git a/src/main/java/com/glxp/api/controller/test/TestCodeController.java b/src/main/java/com/glxp/api/controller/test/TestCodeController.java index 3896a4cd..ba94c694 100644 --- a/src/main/java/com/glxp/api/controller/test/TestCodeController.java +++ b/src/main/java/com/glxp/api/controller/test/TestCodeController.java @@ -1,25 +1,16 @@ package com.glxp.api.controller.test; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.dao.AliCodeTestMapper; -import com.glxp.api.dao.auth.AuthCompanyMapper; import com.glxp.api.entity.alihealth.*; -import com.glxp.api.entity.collect.RelCodeBatch; -import com.glxp.api.entity.collect.RelCodeDetail; import com.glxp.api.entity.thrsys.ThirdAliDrug; import com.glxp.api.req.alihealth.AlihealthKytDrugrescodeReqeust; import com.glxp.api.req.alihealth.AlihealthKytSearchbillReqeust; import com.glxp.api.req.alihealth.AlihealthYljgListupoutDetailReqeust; import com.glxp.api.req.alihealth.AlihealthYljgListupoutReqeust; -import com.glxp.api.req.alihealth.local.AlihealthRelCodeInsertReqeust; -import com.glxp.api.req.alihealth.local.AlihealthThirdAliDrugInsertReqeust; import com.glxp.api.req.alihealth.local.AlihealthKytThirdAliSearchbillInsertReqeust; -import com.glxp.api.res.alihealth.AlihealthKytSinglerelationResponse; -import com.glxp.api.service.collect.RelCodeBatchService; -import com.glxp.api.service.collect.RelCodeDetailService; -import com.glxp.api.service.thrsys.ThirdAliDrugService; +import com.glxp.api.req.alihealth.local.AlihealthThirdAliDrugInsertReqeust; import com.glxp.api.util.DateUtil; import com.glxp.api.util.alihealth.AlihealthUtils; import com.glxp.api.util.alihealth.AlihealthYljgUtils; @@ -28,7 +19,9 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; @RestController diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java b/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java index a002320d..a88c28fc 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThirdAliDrugController.java @@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.CusRedissonAnnotation; import com.glxp.api.annotation.RepeatSubmit; import com.glxp.api.common.enums.ResultEnum; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThirdSysApiController.java b/src/main/java/com/glxp/api/controller/thrsys/ThirdSysApiController.java index 6f52ada4..31c6df1c 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThirdSysApiController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThirdSysApiController.java @@ -2,13 +2,13 @@ package com.glxp.api.controller.thrsys; import com.github.pagehelper.PageInfo; import com.glxp.api.annotation.Log; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.system.ThirdSysApiEntity; import com.glxp.api.req.system.FilterSysApiRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.system.ThirdSysApiService; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThirdUploadSetController.java b/src/main/java/com/glxp/api/controller/thrsys/ThirdUploadSetController.java index 8016e9a8..43dd80a2 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThirdUploadSetController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThirdUploadSetController.java @@ -3,14 +3,14 @@ package com.glxp.api.controller.thrsys; import cn.hutool.core.collection.CollUtil; import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.annotation.Log; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.sync.SyncDataBustypeEntity; import com.glxp.api.entity.system.SyncUploadDataSetEntity; import com.glxp.api.service.system.SyncUploadDataBustypeService; import com.glxp.api.service.system.SyncUploadDataSetService; -import com.glxp.api.common.enums.ResultEnum; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java index dcf29e67..910ae654 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrCorpExportLogController.java @@ -2,7 +2,6 @@ package com.glxp.api.controller.thrsys; import cn.hutool.core.bean.BeanUtil; import com.github.pagehelper.PageInfo; - import com.glxp.api.annotation.Log; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java index cc4b806f..6f48c775 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsExportLogController.java @@ -12,7 +12,10 @@ import com.glxp.api.entity.thrsys.ThrInvProductsExportLogEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.httpClient.serviceClient.impl.ErpInvClientImpl; import com.glxp.api.req.system.DeleteRequest; -import com.glxp.api.req.thrsys.*; +import com.glxp.api.req.thrsys.FilterThrCorpExportLogRequest; +import com.glxp.api.req.thrsys.FilterThrInvProductsRequest; +import com.glxp.api.req.thrsys.ThrInvProductsExportRequest; +import com.glxp.api.req.thrsys.ThrOnhandRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.thrsys.ThrInvProductResponse; import com.glxp.api.service.thrsys.ThrInvProductsDlService; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsImportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsImportLogController.java index 4b7af015..31ce243e 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsImportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvProductsImportLogController.java @@ -9,9 +9,7 @@ import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.thrsys.ThrInvProductsImportDetailEntity; import com.glxp.api.entity.thrsys.ThrInvProductsImportLogEntity; import com.glxp.api.req.system.DeleteRequest; -import com.glxp.api.req.thrsys.FilterThrCorpExportLogRequest; import com.glxp.api.req.thrsys.FilterThrCorpImportLogRequest; -import com.glxp.api.req.thrsys.FilterThrCorpRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.thrsys.ThrInvProductsDetailService; import com.glxp.api.service.thrsys.ThrInvProductsImportLogService; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java index 1c53a8c3..170e4114 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvWarehouseController.java @@ -13,7 +13,6 @@ import com.glxp.api.entity.thrsys.ThrInvWarehouseEntity; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.thrsys.FilterThrSubInvWarehouseRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.thrsys.ThrInvWarehouseResponse; import com.glxp.api.service.thrsys.ThrDeptService; import com.glxp.api.service.thrsys.ThrInvWarehouseService; import org.springframework.validation.BindingResult; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java index 7243bdea..d7268781 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrOrderExportLogController.java @@ -13,7 +13,10 @@ import com.glxp.api.entity.thrsys.ThrOrderExportLogEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.httpClient.serviceClient.impl.ErpOrderClientImpl; import com.glxp.api.req.system.DeleteRequest; -import com.glxp.api.req.thrsys.*; +import com.glxp.api.req.thrsys.FilterThrCorpImportLogRequest; +import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest; +import com.glxp.api.req.thrsys.FilterThrOrderRequest; +import com.glxp.api.req.thrsys.ThrOrderExportRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.thrsys.ThrOrderResponse; import com.glxp.api.service.thrsys.ThrOrderDetailService; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddController.java index dd105eab..38648d5a 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddController.java @@ -10,14 +10,12 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.basic.UdiRelevanceEntity; -import com.glxp.api.entity.thrsys.ThrProductsAddDiEntity; import com.glxp.api.entity.thrsys.ThrProductsAddEntity; import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.exception.JsonException; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.thrsys.FilterThrProductsRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.service.auth.AuthAdminService; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.basic.UdiRelevanceService; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java index 0ca232a2..f9cdf1db 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java @@ -14,7 +14,10 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.dao.system.ClassifyCodeDao; import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.entity.basic.*; +import com.glxp.api.entity.basic.BasicNewUploadDiEntity; +import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; +import com.glxp.api.entity.basic.UdiProductEntity; +import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.system.ClassifyCodeEntity; import com.glxp.api.entity.thrsys.CodeRel; import com.glxp.api.entity.thrsys.ThrProductsAddDiEntity; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java index c10a1420..6348b321 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrProductsImportLogController.java @@ -6,9 +6,8 @@ import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; -import com.glxp.api.entity.thrsys.ThrCorpImportLogEntity; -import com.glxp.api.entity.thrsys.ThrProductsImportLogEntity; import com.glxp.api.entity.thrsys.ThrProductsImportDetailEntity; +import com.glxp.api.entity.thrsys.ThrProductsImportLogEntity; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.thrsys.FilterThrProductsImportLogRequest; import com.glxp.api.res.PageSimpleResponse; diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java index 1a5e8386..132459bd 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrSystemController.java @@ -11,8 +11,8 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity; -import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; +import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.httpClient.serviceClient.ErpBasicClient; import com.glxp.api.req.thrsys.FilterBasicThirdSysDetailRequest; import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest; diff --git a/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java b/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java index 5b0f1880..101a83c7 100644 --- a/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java +++ b/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java @@ -1,9 +1,7 @@ package com.glxp.api.dao.auth; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.dao.inout.IoCodeTempDao; import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.req.auth.FilterAuthUserRequest; import com.glxp.api.req.auth.UpdateUserRequset; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/auth/AuthCompanyMapper.java b/src/main/java/com/glxp/api/dao/auth/AuthCompanyMapper.java index 100fee5b..9f26c92f 100644 --- a/src/main/java/com/glxp/api/dao/auth/AuthCompanyMapper.java +++ b/src/main/java/com/glxp/api/dao/auth/AuthCompanyMapper.java @@ -1,6 +1,5 @@ package com.glxp.api.dao.auth; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.auth.AuthCompany; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/auth/AuthRoleAdminDao.java b/src/main/java/com/glxp/api/dao/auth/AuthRoleAdminDao.java index 1bbba2da..72649697 100644 --- a/src/main/java/com/glxp/api/dao/auth/AuthRoleAdminDao.java +++ b/src/main/java/com/glxp/api/dao/auth/AuthRoleAdminDao.java @@ -1,7 +1,6 @@ package com.glxp.api.dao.auth; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.auth.AuthRole; import com.glxp.api.entity.auth.AuthRoleAdmin; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/auth/AuthRoleDao.java b/src/main/java/com/glxp/api/dao/auth/AuthRoleDao.java index 2e1d0f13..9027a9ca 100644 --- a/src/main/java/com/glxp/api/dao/auth/AuthRoleDao.java +++ b/src/main/java/com/glxp/api/dao/auth/AuthRoleDao.java @@ -2,7 +2,6 @@ package com.glxp.api.dao.auth; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.auth.AuthRole; -import com.glxp.api.req.auth.AuthRoleQueryRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/dao/auth/DeptDao.java b/src/main/java/com/glxp/api/dao/auth/DeptDao.java index 615e994d..6c4762f9 100644 --- a/src/main/java/com/glxp/api/dao/auth/DeptDao.java +++ b/src/main/java/com/glxp/api/dao/auth/DeptDao.java @@ -2,7 +2,6 @@ package com.glxp.api.dao.auth; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.auth.DeptEntity; -import com.glxp.api.entity.auth.DeptUserEntity; import com.glxp.api.req.auth.FilterInvWarehouseRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/dao/auth/DeptUserDao.java b/src/main/java/com/glxp/api/dao/auth/DeptUserDao.java index 8285ad24..f164d4de 100644 --- a/src/main/java/com/glxp/api/dao/auth/DeptUserDao.java +++ b/src/main/java/com/glxp/api/dao/auth/DeptUserDao.java @@ -1,7 +1,6 @@ package com.glxp.api.dao.auth; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.DeptUserEntity; import com.glxp.api.req.auth.FilterDeptUserReqeust; import com.glxp.api.res.auth.DeptUserResponse; diff --git a/src/main/java/com/glxp/api/dao/auth/InvBusUserDao.java b/src/main/java/com/glxp/api/dao/auth/InvBusUserDao.java index 78e8d57d..36490a8a 100644 --- a/src/main/java/com/glxp/api/dao/auth/InvBusUserDao.java +++ b/src/main/java/com/glxp/api/dao/auth/InvBusUserDao.java @@ -2,10 +2,8 @@ package com.glxp.api.dao.auth; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.auth.InvBusUserEntity; -import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.auth.WarehouseBussinessTypeEntity; import com.glxp.api.req.auth.FilterInvBusUserRequest; -import com.glxp.api.res.auth.InvBusUserResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java b/src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java index 9ae8b1c4..fd16de9e 100644 --- a/src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java +++ b/src/main/java/com/glxp/api/dao/auth/InvWarehouseDao.java @@ -1,7 +1,6 @@ package com.glxp.api.dao.auth; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.auth.DeptEntity; import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.req.auth.FilterInvSubWarehouseRequest; import com.glxp.api.req.auth.FilterInvWarehouseRequest; @@ -10,7 +9,6 @@ import com.glxp.api.vo.inv.InvWarehouseTreeVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import java.util.Date; import java.util.List; @Mapper diff --git a/src/main/java/com/glxp/api/dao/auth/SysCustomConfigDetailDao.java b/src/main/java/com/glxp/api/dao/auth/SysCustomConfigDetailDao.java index c1a066dc..47c115f3 100644 --- a/src/main/java/com/glxp/api/dao/auth/SysCustomConfigDetailDao.java +++ b/src/main/java/com/glxp/api/dao/auth/SysCustomConfigDetailDao.java @@ -4,7 +4,6 @@ package com.glxp.api.dao.auth; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.auth.SysCustomConfigDetailEntity; import com.glxp.api.req.auth.SysCustomConfigDetailRequest; -import com.glxp.api.req.system.DeleteRequest; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java b/src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java index ab71fa63..6c9d5c3d 100644 --- a/src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java +++ b/src/main/java/com/glxp/api/dao/auth/WarehouseBussinessTypeDao.java @@ -1,7 +1,6 @@ package com.glxp.api.dao.auth; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.auth.InvBusUserEntity; import com.glxp.api.entity.auth.WarehouseBussinessTypeEntity; import com.glxp.api.req.auth.FilterInvBusTypeRequest; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java b/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java index b4f2478e..42e13fe8 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicBussinessTypeDao.java @@ -1,6 +1,5 @@ package com.glxp.api.dao.basic; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.req.basic.FilterBussinessTypeRequest; diff --git a/src/main/java/com/glxp/api/dao/basic/BasicCorpExportLogDao.java b/src/main/java/com/glxp/api/dao/basic/BasicCorpExportLogDao.java index 885d83e2..4fbb419f 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicCorpExportLogDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicCorpExportLogDao.java @@ -1,7 +1,6 @@ package com.glxp.api.dao.basic; -import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.BasicCorpsExportLogEntity; import com.glxp.api.req.basic.FilterCorpExportLogRequest; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/basic/BasicHospTypeDao.java b/src/main/java/com/glxp/api/dao/basic/BasicHospTypeDao.java index d37e3dad..9ff4866e 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicHospTypeDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicHospTypeDao.java @@ -1,15 +1,13 @@ package com.glxp.api.dao.basic; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.BasicHospTypeEntity; - -import java.util.List; - import com.glxp.api.res.basic.BasicHospTypeResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.List; + @Mapper public interface BasicHospTypeDao extends BaseMapperPlus { @@ -18,4 +16,4 @@ public interface BasicHospTypeDao extends BaseMapperPlus selectLowTypeAll(@Param("code") String code); -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/dao/basic/BasicNewUploadDiDao.java b/src/main/java/com/glxp/api/dao/basic/BasicNewUploadDiDao.java index 9a674fa4..19c2ac3e 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicNewUploadDiDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicNewUploadDiDao.java @@ -2,11 +2,8 @@ package com.glxp.api.dao.basic; import com.glxp.api.entity.basic.BasicNewUploadDiEntity; -import com.glxp.api.req.basic.FilterBasicNewUploadDiRequest; import org.apache.ibatis.annotations.Mapper; -import java.util.List; - @Mapper public interface BasicNewUploadDiDao { diff --git a/src/main/java/com/glxp/api/dao/basic/BasicProductsRegistrationCertDao.java b/src/main/java/com/glxp/api/dao/basic/BasicProductsRegistrationCertDao.java index 599fa344..7a7de1db 100644 --- a/src/main/java/com/glxp/api/dao/basic/BasicProductsRegistrationCertDao.java +++ b/src/main/java/com/glxp/api/dao/basic/BasicProductsRegistrationCertDao.java @@ -1,7 +1,6 @@ package com.glxp.api.dao.basic; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; import com.glxp.api.entity.basic.BasicProductsRegistrationCertEntity; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java b/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java index 5641bea0..b598970a 100644 --- a/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java +++ b/src/main/java/com/glxp/api/dao/basic/CompanyProductRelevanceDao.java @@ -3,7 +3,6 @@ package com.glxp.api.dao.basic; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; -import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.req.basic.CompanyProductRelevanceRequest; import com.glxp.api.res.basic.CompanyProductRelevanceResponse; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/basic/ProductInfoDao.java b/src/main/java/com/glxp/api/dao/basic/ProductInfoDao.java index eeffbcc6..84ba52b2 100644 --- a/src/main/java/com/glxp/api/dao/basic/ProductInfoDao.java +++ b/src/main/java/com/glxp/api/dao/basic/ProductInfoDao.java @@ -1,7 +1,6 @@ package com.glxp.api.dao.basic; import com.glxp.api.entity.basic.ProductInfoEntity; -import com.glxp.api.util.page.ListPageRequest; import com.glxp.api.req.basic.ProductInfoFilterRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/dao/basic/UdiProductDao.java b/src/main/java/com/glxp/api/dao/basic/UdiProductDao.java index f47fdc20..ee131fd3 100644 --- a/src/main/java/com/glxp/api/dao/basic/UdiProductDao.java +++ b/src/main/java/com/glxp/api/dao/basic/UdiProductDao.java @@ -4,7 +4,6 @@ import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.req.basic.UdiInfoRequest; -import com.glxp.api.res.basic.UdiRelevanceResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/dao/collect/RelCodeBatchMapper.java b/src/main/java/com/glxp/api/dao/collect/RelCodeBatchMapper.java index 1444da15..33adc761 100644 --- a/src/main/java/com/glxp/api/dao/collect/RelCodeBatchMapper.java +++ b/src/main/java/com/glxp/api/dao/collect/RelCodeBatchMapper.java @@ -1,9 +1,7 @@ package com.glxp.api.dao.collect; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.collect.RelCodeBatch; -import com.glxp.api.entity.collect.RelCodeDetail; import com.glxp.api.req.collect.RelCodeBatchRequest; import com.glxp.api.res.collect.RelCodeBatchResponse; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/collect/RelCodeDetailMapper.java b/src/main/java/com/glxp/api/dao/collect/RelCodeDetailMapper.java index 40447209..4011fdbf 100644 --- a/src/main/java/com/glxp/api/dao/collect/RelCodeDetailMapper.java +++ b/src/main/java/com/glxp/api/dao/collect/RelCodeDetailMapper.java @@ -1,10 +1,7 @@ package com.glxp.api.dao.collect; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.dao.thrsys.ThrManufacturerMapper; import com.glxp.api.entity.collect.RelCodeDetail; -import com.glxp.api.entity.thrsys.ThrManufacturerEntity; import com.glxp.api.req.collect.RelCodeDetailRequest; import com.glxp.api.res.collect.RelCodeDetailResponse; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/inout/IoCodeDao.java b/src/main/java/com/glxp/api/dao/inout/IoCodeDao.java index ac91e9b7..7b155420 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoCodeDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoCodeDao.java @@ -4,11 +4,9 @@ import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.alihealth.YcFileCodeUploadVo; import com.glxp.api.entity.inout.IoCodeEntity; import com.glxp.api.req.inout.FilterCodeRequest; -import com.glxp.api.req.inout.YcFileCodeUploadRequest; import com.glxp.api.res.inout.IoCodeResponse; import java.util.List; -import java.util.Map; public interface IoCodeDao extends BaseMapperPlus { diff --git a/src/main/java/com/glxp/api/dao/inout/IoCodeRelMapper.java b/src/main/java/com/glxp/api/dao/inout/IoCodeRelMapper.java index 8be0ca5a..84e3889c 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoCodeRelMapper.java +++ b/src/main/java/com/glxp/api/dao/inout/IoCodeRelMapper.java @@ -1,6 +1,5 @@ package com.glxp.api.dao.inout; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.inout.IoCodeRelEntity; import com.glxp.api.req.inout.IoOrderRelRequest; diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java index bf52faf9..c6394806 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java @@ -5,7 +5,6 @@ import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.req.inout.FilterOrderDetailBizRequest; import com.glxp.api.req.inout.FilterOrderDetailCodeRequest; import com.glxp.api.res.inout.IoOrderDetailBizResponse; -import com.glxp.api.res.inout.IoOrderDetailCodeResponse; import com.glxp.api.res.inout.IoOrderDetailResultResponse; import com.glxp.api.res.inout.IoOrderInvoiceResponse; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/dao/inout/ReceiveDao.java b/src/main/java/com/glxp/api/dao/inout/ReceiveDao.java index ea88180f..ec325847 100644 --- a/src/main/java/com/glxp/api/dao/inout/ReceiveDao.java +++ b/src/main/java/com/glxp/api/dao/inout/ReceiveDao.java @@ -1,11 +1,8 @@ package com.glxp.api.dao.inout; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.inout.IoOrderDetailResultEntity; import com.glxp.api.entity.inout.PurReceiveEntity; -import com.glxp.api.req.inout.FilterOrderRequest; import com.glxp.api.req.inout.FilterReceiveRequest; -import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.res.inout.ReceiveResponse; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/inout/ReceiveDetailDao.java b/src/main/java/com/glxp/api/dao/inout/ReceiveDetailDao.java index c0258375..b9d27e4b 100644 --- a/src/main/java/com/glxp/api/dao/inout/ReceiveDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inout/ReceiveDetailDao.java @@ -5,7 +5,6 @@ import com.glxp.api.entity.inout.PurReceiveDetailEntity; import com.glxp.api.req.inout.FilterReceiveDetailRequest; import com.glxp.api.req.inout.UpdateReceiveDetailRequest; import com.glxp.api.res.inout.ReceiveDetailResponse; -import com.glxp.api.res.inout.ReceiveResponse; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceInspectTaskMapper.java b/src/main/java/com/glxp/api/dao/inv/DeviceInspectTaskMapper.java index b783801d..7fc9bb6b 100644 --- a/src/main/java/com/glxp/api/dao/inv/DeviceInspectTaskMapper.java +++ b/src/main/java/com/glxp/api/dao/inv/DeviceInspectTaskMapper.java @@ -1,10 +1,7 @@ package com.glxp.api.dao.inv; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.dao.purchase.SupCompanyDao; import com.glxp.api.entity.inv.DeviceInspectTaskEntity; -import com.glxp.api.entity.purchase.SupCompanyEntity; import com.glxp.api.req.inv.FilterDeviceInspectTakeRequest; import com.glxp.api.res.inv.DeviceInspectTakeResponse; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/inv/InvPreInProductDetailDao.java b/src/main/java/com/glxp/api/dao/inv/InvPreInProductDetailDao.java index 29985693..8a15c220 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvPreInProductDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvPreInProductDetailDao.java @@ -2,16 +2,8 @@ package com.glxp.api.dao.inv; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.inv.InvPreInProductDetailEntity; -import com.glxp.api.req.inv.FilterInvPlaceRequest; import com.glxp.api.req.inv.FilterInvPreProductDetailRequest; -import com.glxp.api.req.inv.FilterInvPreinProductRequest; -import com.glxp.api.req.inv.FilterInvProductDetailRequest; -import com.glxp.api.res.inout.IoOrderResponse; -import com.glxp.api.res.inv.InvPlaceDetailResponse; -import com.glxp.api.res.inv.InvPreinProductResponse; -import com.glxp.api.vo.basic.InvProductNewVo; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/glxp/api/dao/inv/InvPreProductDetailDao.java b/src/main/java/com/glxp/api/dao/inv/InvPreProductDetailDao.java index 39d33d64..69c66af3 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvPreProductDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvPreProductDetailDao.java @@ -2,15 +2,8 @@ package com.glxp.api.dao.inv; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.inv.InvPreProductDetailEntity; -import com.glxp.api.req.inv.FilterInvPlaceRequest; import com.glxp.api.req.inv.FilterInvPreProductDetailRequest; -import com.glxp.api.req.inv.FilterInvPreinProductRequest; import com.glxp.api.req.inv.FilterInvProductDetailRequest; -import com.glxp.api.res.inout.IoOrderResponse; -import com.glxp.api.res.inv.InvPlaceDetailResponse; -import com.glxp.api.res.inv.InvPreinProductResponse; -import com.glxp.api.vo.basic.InvProductNewVo; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/glxp/api/dao/inv/InvPreinDetailDao.java b/src/main/java/com/glxp/api/dao/inv/InvPreinDetailDao.java index 599e1e93..9ffe52aa 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvPreinDetailDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvPreinDetailDao.java @@ -2,11 +2,8 @@ package com.glxp.api.dao.inv; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.inv.InvPreinDetailEntity; -import com.glxp.api.entity.inv.InvPreinOrderEntity; import com.glxp.api.req.inv.FilterInvPreinDetailRequest; -import com.glxp.api.req.inv.FilterInvPreinRequest; import com.glxp.api.res.inv.InvPreinDetailResponse; -import com.glxp.api.res.inv.InvPreinOrderResponse; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/glxp/api/dao/inv/InvProductNewDao.java b/src/main/java/com/glxp/api/dao/inv/InvProductNewDao.java index 4d0b6108..0901d317 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvProductNewDao.java +++ b/src/main/java/com/glxp/api/dao/inv/InvProductNewDao.java @@ -1,15 +1,10 @@ package com.glxp.api.dao.inv; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.vo.basic.InvProductNewVo; -import com.glxp.api.entity.inv.InvProductEntity; import com.glxp.api.req.inv.FilterInvPlaceRequest; import com.glxp.api.req.inv.FilterInvProductDetailRequest; -import com.glxp.api.req.inv.FilterInvProductRequest; -import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.res.inv.BindInvSpaceRequest; import com.glxp.api.res.inv.InvPlaceDetailResponse; -import com.glxp.api.res.inv.InvProductResponse; import com.glxp.api.vo.basic.InvProductNewVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/dao/purchase/PurArrivalDao.java b/src/main/java/com/glxp/api/dao/purchase/PurArrivalDao.java index 45bdf545..d577ec94 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurArrivalDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurArrivalDao.java @@ -1,6 +1,5 @@ package com.glxp.api.dao.purchase; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.purchase.PurArrivalEntity; import com.glxp.api.req.purchase.PurArrivalRequest; diff --git a/src/main/java/com/glxp/api/dao/purchase/PurArrivalDetailDao.java b/src/main/java/com/glxp/api/dao/purchase/PurArrivalDetailDao.java index 34312543..60e168b4 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurArrivalDetailDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurArrivalDetailDao.java @@ -1,6 +1,5 @@ package com.glxp.api.dao.purchase; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.purchase.PurArrivalDetailEntity; diff --git a/src/main/java/com/glxp/api/dao/purchase/PurDeliveryCodeDao.java b/src/main/java/com/glxp/api/dao/purchase/PurDeliveryCodeDao.java index f22044b4..539f51a5 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurDeliveryCodeDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurDeliveryCodeDao.java @@ -1,6 +1,5 @@ package com.glxp.api.dao.purchase; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.purchase.PurDeliveryCodeEntity; diff --git a/src/main/java/com/glxp/api/dao/purchase/PurDeliveryDao.java b/src/main/java/com/glxp/api/dao/purchase/PurDeliveryDao.java index 3329cf22..52618959 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurDeliveryDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurDeliveryDao.java @@ -1,6 +1,5 @@ package com.glxp.api.dao.purchase; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.purchase.PurDeliveryEntity; import com.glxp.api.req.purchase.PurDeliveryRequest; diff --git a/src/main/java/com/glxp/api/dao/purchase/PurDeliveryDetailDao.java b/src/main/java/com/glxp/api/dao/purchase/PurDeliveryDetailDao.java index cabde009..326abb50 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurDeliveryDetailDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurDeliveryDetailDao.java @@ -1,13 +1,10 @@ package com.glxp.api.dao.purchase; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.purchase.PurDeliveryDetailEntity; -import com.glxp.api.entity.purchase.PurOrderDetailEntity; import com.glxp.api.req.purchase.PurOrderDetailRequest; import com.glxp.api.res.purchase.PurDeliveryDetailResponse; -import com.glxp.api.res.purchase.PurOrderDetailResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/dao/purchase/PurOrderDetailDao.java b/src/main/java/com/glxp/api/dao/purchase/PurOrderDetailDao.java index af1d1c9a..5f597e4a 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurOrderDetailDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurOrderDetailDao.java @@ -1,12 +1,9 @@ package com.glxp.api.dao.purchase; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.purchase.PurOrderDetailEntity; -import com.glxp.api.entity.purchase.PurPlanDetailEntity; import com.glxp.api.req.purchase.PurOrderDetailRequest; -import com.glxp.api.req.purchase.PurPlanDetailRequest; import com.glxp.api.res.purchase.PurOrderDetailResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/dao/purchase/PurPlanDetailDao.java b/src/main/java/com/glxp/api/dao/purchase/PurPlanDetailDao.java index 36fcf331..41aef3fc 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurPlanDetailDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurPlanDetailDao.java @@ -3,8 +3,6 @@ package com.glxp.api.dao.purchase; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.BasicProductsEntity; -import com.glxp.api.entity.basic.ProductInfoEntity; -import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.purchase.PurPlanDetailEntity; import com.glxp.api.req.purchase.PurPlanDetailRequest; import com.glxp.api.res.purchase.PurOrderDetailResponse; diff --git a/src/main/java/com/glxp/api/dao/purchase/PurReturnedDao.java b/src/main/java/com/glxp/api/dao/purchase/PurReturnedDao.java index ba30b681..6df8a028 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurReturnedDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurReturnedDao.java @@ -1,6 +1,5 @@ package com.glxp.api.dao.purchase; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.purchase.PurReturnedEntity; import com.glxp.api.req.purchase.PurReturnedRequest; diff --git a/src/main/java/com/glxp/api/dao/purchase/PurReturnedDetailDao.java b/src/main/java/com/glxp/api/dao/purchase/PurReturnedDetailDao.java index 93f21248..8363687d 100644 --- a/src/main/java/com/glxp/api/dao/purchase/PurReturnedDetailDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/PurReturnedDetailDao.java @@ -1,12 +1,9 @@ package com.glxp.api.dao.purchase; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.purchase.PurReturnedDetailEntity; -import com.glxp.api.entity.purchase.PurReturnedDetailEntity; import com.glxp.api.req.purchase.PurOrderDetailRequest; -import com.glxp.api.res.purchase.PurOrderDetailResponse; import com.glxp.api.res.purchase.PurReturnedDetailResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/dao/purchase/SupCertDao.java b/src/main/java/com/glxp/api/dao/purchase/SupCertDao.java index d1633838..8c60c647 100644 --- a/src/main/java/com/glxp/api/dao/purchase/SupCertDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupCertDao.java @@ -1,7 +1,6 @@ package com.glxp.api.dao.purchase; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.purchase.SupCertEntity; import com.glxp.api.req.inout.AddBizProductReqeust; diff --git a/src/main/java/com/glxp/api/dao/purchase/SupCertRemindMsgDao.java b/src/main/java/com/glxp/api/dao/purchase/SupCertRemindMsgDao.java index 8f58bc77..5bf3f25e 100644 --- a/src/main/java/com/glxp/api/dao/purchase/SupCertRemindMsgDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupCertRemindMsgDao.java @@ -1,6 +1,5 @@ package com.glxp.api.dao.purchase; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.purchase.SupCertRemindMsgEntity; import com.glxp.api.req.purchase.FilterCertRemindMsgRequest; diff --git a/src/main/java/com/glxp/api/dao/purchase/SupCertSetDao.java b/src/main/java/com/glxp/api/dao/purchase/SupCertSetDao.java index 979a7e8e..0a418fdf 100644 --- a/src/main/java/com/glxp/api/dao/purchase/SupCertSetDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupCertSetDao.java @@ -1,7 +1,6 @@ package com.glxp.api.dao.purchase; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.purchase.SupCertSetEntity; import com.glxp.api.req.purchase.FilterCertSetsRequest; diff --git a/src/main/java/com/glxp/api/dao/purchase/SupCompanyDao.java b/src/main/java/com/glxp/api/dao/purchase/SupCompanyDao.java index 1317299c..78d9b36f 100644 --- a/src/main/java/com/glxp/api/dao/purchase/SupCompanyDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupCompanyDao.java @@ -1,9 +1,7 @@ package com.glxp.api.dao.purchase; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.purchase.SupCertSetEntity; import com.glxp.api.entity.purchase.SupCompanyEntity; import com.glxp.api.req.purchase.FilterSupCompanyRequest; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/purchase/SupManufacturerDao.java b/src/main/java/com/glxp/api/dao/purchase/SupManufacturerDao.java index b9111aca..e3bc95d1 100644 --- a/src/main/java/com/glxp/api/dao/purchase/SupManufacturerDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupManufacturerDao.java @@ -1,7 +1,6 @@ package com.glxp.api.dao.purchase; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.purchase.SupManufacturerEntity; import com.glxp.api.req.purchase.FilterSupManufacturerRequest; diff --git a/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java b/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java index a4c1bab6..09d39865 100644 --- a/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java +++ b/src/main/java/com/glxp/api/dao/purchase/SupProductDao.java @@ -1,9 +1,7 @@ package com.glxp.api.dao.purchase; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.purchase.PurDeliveryDetailEntity; import com.glxp.api.entity.purchase.SupProductEntity; import com.glxp.api.req.purchase.FilterPoductRequest; import com.glxp.api.res.purchase.SupProductResponse; diff --git a/src/main/java/com/glxp/api/dao/sync/BasicExportDao.java b/src/main/java/com/glxp/api/dao/sync/BasicExportDao.java index 9e4f8c0a..868f83bd 100644 --- a/src/main/java/com/glxp/api/dao/sync/BasicExportDao.java +++ b/src/main/java/com/glxp/api/dao/sync/BasicExportDao.java @@ -1,6 +1,5 @@ package com.glxp.api.dao.sync; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.sync.BasicExportStatusEntity; import com.glxp.api.req.sync.BasicExportStatusRequest; diff --git a/src/main/java/com/glxp/api/dao/sync/BasicExportTimeDao.java b/src/main/java/com/glxp/api/dao/sync/BasicExportTimeDao.java index 26f4a668..4eba023f 100644 --- a/src/main/java/com/glxp/api/dao/sync/BasicExportTimeDao.java +++ b/src/main/java/com/glxp/api/dao/sync/BasicExportTimeDao.java @@ -1,6 +1,5 @@ package com.glxp.api.dao.sync; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; import com.glxp.api.req.sync.BasicExportTimeRequest; diff --git a/src/main/java/com/glxp/api/dao/sync/SyncDataChangeBustypesDao.java b/src/main/java/com/glxp/api/dao/sync/SyncDataChangeBustypesDao.java index 2a6cdc6f..cb686fe5 100644 --- a/src/main/java/com/glxp/api/dao/sync/SyncDataChangeBustypesDao.java +++ b/src/main/java/com/glxp/api/dao/sync/SyncDataChangeBustypesDao.java @@ -1,6 +1,5 @@ package com.glxp.api.dao.sync; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.sync.SyncDataChangeBustypesEntity; diff --git a/src/main/java/com/glxp/api/dao/system/CompanyDao.java b/src/main/java/com/glxp/api/dao/system/CompanyDao.java index ece07261..f746151e 100644 --- a/src/main/java/com/glxp/api/dao/system/CompanyDao.java +++ b/src/main/java/com/glxp/api/dao/system/CompanyDao.java @@ -1,7 +1,6 @@ package com.glxp.api.dao.system; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.auth.AliKeyEntity; import com.glxp.api.entity.system.CompanyEntity; import com.glxp.api.req.auth.FilterCompanyRequest; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/system/SetupDao.java b/src/main/java/com/glxp/api/dao/system/SetupDao.java index 7c249c3f..7cb42da5 100644 --- a/src/main/java/com/glxp/api/dao/system/SetupDao.java +++ b/src/main/java/com/glxp/api/dao/system/SetupDao.java @@ -1,7 +1,5 @@ package com.glxp.api.dao.system; -import com.glxp.api.entity.system.SetupEntity; -import com.glxp.api.req.system.FilterSetupRequest; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/src/main/java/com/glxp/api/dao/system/SysMsgTodoMapper.java b/src/main/java/com/glxp/api/dao/system/SysMsgTodoMapper.java index cab369a3..f881a014 100644 --- a/src/main/java/com/glxp/api/dao/system/SysMsgTodoMapper.java +++ b/src/main/java/com/glxp/api/dao/system/SysMsgTodoMapper.java @@ -1,7 +1,7 @@ package com.glxp.api.dao.system; -import com.glxp.api.entity.system.SysMsgTodoEntity; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.system.SysMsgTodoEntity; import com.glxp.api.req.system.SysMsgTodoQuery; import com.glxp.api.vo.system.SysMsgTodoVo; diff --git a/src/main/java/com/glxp/api/dao/system/SysRemindMsgMapper.java b/src/main/java/com/glxp/api/dao/system/SysRemindMsgMapper.java index 343138f6..ad26b02e 100644 --- a/src/main/java/com/glxp/api/dao/system/SysRemindMsgMapper.java +++ b/src/main/java/com/glxp/api/dao/system/SysRemindMsgMapper.java @@ -2,9 +2,7 @@ package com.glxp.api.dao.system; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.system.SysRemindMsgEntity; -import com.glxp.api.entity.system.SysRemindSetEntity; import com.glxp.api.req.system.FilterSysRemindMsgRequest; -import com.glxp.api.req.system.FilterSysRemindSetRequest; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/glxp/api/dao/system/SysRemindSetMapper.java b/src/main/java/com/glxp/api/dao/system/SysRemindSetMapper.java index fdfa0830..6e55404c 100644 --- a/src/main/java/com/glxp/api/dao/system/SysRemindSetMapper.java +++ b/src/main/java/com/glxp/api/dao/system/SysRemindSetMapper.java @@ -1,9 +1,6 @@ package com.glxp.api.dao.system; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.dao.inv.InvPreProductDao; -import com.glxp.api.entity.inv.InvPreProductEntity; import com.glxp.api.entity.system.SysRemindSetEntity; import com.glxp.api.req.system.FilterSysRemindSetRequest; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateRelevanceDao.java b/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateRelevanceDao.java index 6809093d..9d68bc8e 100644 --- a/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateRelevanceDao.java +++ b/src/main/java/com/glxp/api/dao/system/SystemPDFTemplateRelevanceDao.java @@ -3,12 +3,10 @@ package com.glxp.api.dao.system; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; -import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity; import com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/glxp/api/dao/thrsys/BasicInsMaterialMapper.java b/src/main/java/com/glxp/api/dao/thrsys/BasicInsMaterialMapper.java index ed047a67..eb2bf810 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/BasicInsMaterialMapper.java +++ b/src/main/java/com/glxp/api/dao/thrsys/BasicInsMaterialMapper.java @@ -1,6 +1,5 @@ package com.glxp.api.dao.thrsys; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.thrsys.BasicInsMaterialEntity; import com.glxp.api.req.thrsys.ThrInsMaterialFeeRequest; diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThirdAliDrugMapper.java b/src/main/java/com/glxp/api/dao/thrsys/ThirdAliDrugMapper.java index 91e0c436..1d74b794 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThirdAliDrugMapper.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThirdAliDrugMapper.java @@ -3,8 +3,8 @@ package com.glxp.api.dao.thrsys; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.entity.thrsys.ThirdAliDrug; import com.glxp.api.req.thrsys.ThirdAliDrugRequest; -import com.glxp.api.res.collect.RelCodeDetailResponse; -import org.apache.ibatis.annotations.*; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -16,4 +16,4 @@ public interface ThirdAliDrugMapper extends BaseMapper { int saveOrUpdateBatch(@Param("list") List list); List filterList(ThirdAliDrugRequest thirdAliDrug); -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrBusTypeOriginDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrBusTypeOriginDao.java index 1b64b9da..dd3910cb 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrBusTypeOriginDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrBusTypeOriginDao.java @@ -1,12 +1,10 @@ package com.glxp.api.dao.thrsys; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity; import com.glxp.api.req.thrsys.FilterThrBusTypeOriginRequest; import com.glxp.api.res.thrsys.ThrBusTypeOriginResponse; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrInvWarehouseDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrInvWarehouseDao.java index 5827b08b..349c3891 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrInvWarehouseDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrInvWarehouseDao.java @@ -3,7 +3,6 @@ package com.glxp.api.dao.thrsys; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.thrsys.ThrInvWarehouseEntity; import com.glxp.api.req.thrsys.FilterThrSubInvWarehouseRequest; -import com.glxp.api.res.thrsys.ThrInvWarehouseResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrManufacturerMapper.java b/src/main/java/com/glxp/api/dao/thrsys/ThrManufacturerMapper.java index e38264b5..428b6d2d 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrManufacturerMapper.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrManufacturerMapper.java @@ -1,7 +1,6 @@ package com.glxp.api.dao.thrsys; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.thrsys.ThrManufacturerEntity; import com.glxp.api.req.thrsys.FilterBasicProducstRequest; import com.glxp.api.req.thrsys.FilterThrCorpRequest; diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrOrderDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrOrderDao.java index f2f7f9a0..4f1643dc 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrOrderDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrOrderDao.java @@ -2,10 +2,8 @@ package com.glxp.api.dao.thrsys; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity; import com.glxp.api.entity.thrsys.ThrOrderEntity; import com.glxp.api.req.thrsys.FilterThrOrderRequest; -import com.glxp.api.res.thrsys.ThrBusTypeOriginResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrOrderDetailDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrOrderDetailDao.java index 8962c76d..d57310fa 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrOrderDetailDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrOrderDetailDao.java @@ -3,7 +3,6 @@ package com.glxp.api.dao.thrsys; import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; -import com.glxp.api.entity.thrsys.ThrOrderEntity; import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrProductsAddDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrProductsAddDao.java index 6072f91e..ef547752 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrProductsAddDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrProductsAddDao.java @@ -2,11 +2,9 @@ package com.glxp.api.dao.thrsys; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.thrsys.ThrDeptEntity; import com.glxp.api.entity.thrsys.ThrProductsAddEntity; import com.glxp.api.req.thrsys.FilterThrProductsRequest; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrProductsAddDiDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrProductsAddDiDao.java index 1707808d..9234f034 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrProductsAddDiDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrProductsAddDiDao.java @@ -5,7 +5,6 @@ import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.thrsys.ThrProductsAddDiEntity; import com.glxp.api.req.thrsys.FilterThrProductsRequest; import com.glxp.api.res.thrsys.ThrProductsAddDiResponse; -import com.glxp.api.res.thrsys.UdiInfoResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/src/main/java/com/glxp/api/dao/thrsys/ThrSystemBusApiDao.java b/src/main/java/com/glxp/api/dao/thrsys/ThrSystemBusApiDao.java index 7f9d137a..278b3063 100644 --- a/src/main/java/com/glxp/api/dao/thrsys/ThrSystemBusApiDao.java +++ b/src/main/java/com/glxp/api/dao/thrsys/ThrSystemBusApiDao.java @@ -1,7 +1,6 @@ package com.glxp.api.dao.thrsys; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.thrsys.ThrOrderEntity; import com.glxp.api.entity.thrsys.ThrSystemBusApiEntity; import com.glxp.api.req.thrsys.FilterBasicThirdSysDetailRequest; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/entity/alihealth/YcFileCodeUploadVo.java b/src/main/java/com/glxp/api/entity/alihealth/YcFileCodeUploadVo.java index 81459869..a269122c 100644 --- a/src/main/java/com/glxp/api/entity/alihealth/YcFileCodeUploadVo.java +++ b/src/main/java/com/glxp/api/entity/alihealth/YcFileCodeUploadVo.java @@ -2,11 +2,7 @@ package com.glxp.api.entity.alihealth; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; -import io.swagger.annotations.ApiOperation; import lombok.Data; -import org.springframework.web.bind.annotation.GetMapping; - -import javax.servlet.http.HttpServletResponse; @Data public class YcFileCodeUploadVo { diff --git a/src/main/java/com/glxp/api/entity/auth/AuthCompany.java b/src/main/java/com/glxp/api/entity/auth/AuthCompany.java index 22356fee..b6e59910 100644 --- a/src/main/java/com/glxp/api/entity/auth/AuthCompany.java +++ b/src/main/java/com/glxp/api/entity/auth/AuthCompany.java @@ -1,8 +1,6 @@ package com.glxp.api.entity.auth; -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 lombok.Data; diff --git a/src/main/java/com/glxp/api/entity/auth/InvSpace.java b/src/main/java/com/glxp/api/entity/auth/InvSpace.java index 7e9e30f5..baad7b2b 100644 --- a/src/main/java/com/glxp/api/entity/auth/InvSpace.java +++ b/src/main/java/com/glxp/api/entity/auth/InvSpace.java @@ -1,6 +1,5 @@ package com.glxp.api.entity.auth; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java index d5c19182..b3814959 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicBussinessTypeEntity.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 com.glxp.api.constant.ConstantType; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/entity/basic/BasicCorpsExportLogEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicCorpsExportLogEntity.java index ffbbe865..a76c7aba 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicCorpsExportLogEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicCorpsExportLogEntity.java @@ -4,9 +4,10 @@ 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 java.util.Date; import lombok.Data; +import java.util.Date; + @Data @TableName(value = "basic_corps_export_log") public class BasicCorpsExportLogEntity { @@ -94,4 +95,4 @@ public class BasicCorpsExportLogEntity { public static final String COL_UPDATETIME = "updateTime"; public static final String COL_REMARK = "remark"; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/basic/BasicCorpsImportDetailEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicCorpsImportDetailEntity.java index cec9747b..7d29aa09 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicCorpsImportDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicCorpsImportDetailEntity.java @@ -4,9 +4,10 @@ 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 java.util.Date; import lombok.Data; +import java.util.Date; + @Data @TableName(value = "basic_corps_import_detail") public class BasicCorpsImportDetailEntity { @@ -133,4 +134,4 @@ public class BasicCorpsImportDetailEntity { @TableField(value = "remark") private String remark; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/basic/BasicCorpsImportLogEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicCorpsImportLogEntity.java index 4c96518f..211770c3 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicCorpsImportLogEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicCorpsImportLogEntity.java @@ -4,9 +4,10 @@ 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 java.util.Date; import lombok.Data; +import java.util.Date; + @Data @TableName(value = "basic_corps_import_log") public class BasicCorpsImportLogEntity { @@ -53,4 +54,4 @@ public class BasicCorpsImportLogEntity { private String remark; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/basic/BasicHospTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicHospTypeEntity.java index 4bdea27d..5dceda43 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicHospTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicHospTypeEntity.java @@ -4,11 +4,10 @@ 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 lombok.Data; import java.util.Date; -import lombok.Data; - @Data @TableName(value = "basic_hosp_type") public class BasicHospTypeEntity { diff --git a/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java index 94f91608..10b3a8a0 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicProductsEntity.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 com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/glxp/api/entity/basic/BasicProductsImportDetailEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicProductsImportDetailEntity.java index 51d9ebd1..bb88c3c1 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicProductsImportDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicProductsImportDetailEntity.java @@ -4,9 +4,10 @@ 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 java.util.Date; import lombok.Data; +import java.util.Date; + @Data @TableName(value = "basic_products_import_detail") public class BasicProductsImportDetailEntity { @@ -112,4 +113,4 @@ public class BasicProductsImportDetailEntity { public static final String COL_UPDATETIME = "updateTime"; public static final String COL_REMARK = "remark"; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/basic/BasicProductsImportLogEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicProductsImportLogEntity.java index a13054ba..c29543c7 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicProductsImportLogEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicProductsImportLogEntity.java @@ -4,9 +4,10 @@ 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 java.util.Date; import lombok.Data; +import java.util.Date; + @Data @TableName(value = "basic_products_import_log") public class BasicProductsImportLogEntity { @@ -77,4 +78,4 @@ public class BasicProductsImportLogEntity { public static final String COL_UPDATETIME = "updateTime"; public static final String COL_REMARK = "remark"; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/basic/BasicProductsRegistrationCertEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicProductsRegistrationCertEntity.java index 0f96ab4a..11852825 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicProductsRegistrationCertEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicProductsRegistrationCertEntity.java @@ -4,10 +4,8 @@ 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 java.math.BigDecimal; import java.util.Date; @Data diff --git a/src/main/java/com/glxp/api/entity/basic/BasicUdirelTypeEntity.java b/src/main/java/com/glxp/api/entity/basic/BasicUdirelTypeEntity.java index 20addbdc..ec44339d 100644 --- a/src/main/java/com/glxp/api/entity/basic/BasicUdirelTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/BasicUdirelTypeEntity.java @@ -4,9 +4,10 @@ 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 java.util.Date; import lombok.Data; +import java.util.Date; + /** * 耗材字典菜单表 */ @@ -64,4 +65,4 @@ public class BasicUdirelTypeEntity { public static final String COL_CREATEUSER = "createUser"; public static final String COL_UPDATEUSER = "updateUser"; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/basic/CompanyProductRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/CompanyProductRelevanceEntity.java index 3235a5d8..181bf5ee 100644 --- a/src/main/java/com/glxp/api/entity/basic/CompanyProductRelevanceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/CompanyProductRelevanceEntity.java @@ -4,12 +4,11 @@ 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 lombok.Data; import java.math.BigDecimal; import java.util.Date; -import lombok.Data; - @Data @TableName(value = "company_product_relevance") public class CompanyProductRelevanceEntity { diff --git a/src/main/java/com/glxp/api/entity/basic/EntrustReceEntity.java b/src/main/java/com/glxp/api/entity/basic/EntrustReceEntity.java index b04b2be4..219bcc4e 100644 --- a/src/main/java/com/glxp/api/entity/basic/EntrustReceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/EntrustReceEntity.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; -import org.apache.xpath.operations.Bool; import java.util.Date; diff --git a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java index ee932b2d..7973c507 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiProductEntity.java @@ -8,7 +8,6 @@ import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.math.BigDecimal; import java.util.Date; /** diff --git a/src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java b/src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java index b0f36729..19aa2a4e 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoCodeEntity.java @@ -1,14 +1,11 @@ package com.glxp.api.entity.inout; -import com.alibaba.fastjson.annotation.JSONField; 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 com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; -import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; -import org.springframework.http.codec.json.Jackson2JsonEncoder; import java.io.Serializable; import java.math.BigDecimal; diff --git a/src/main/java/com/glxp/api/entity/inout/IoCodeLostEntity.java b/src/main/java/com/glxp/api/entity/inout/IoCodeLostEntity.java index 9d98abb2..21590d88 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoCodeLostEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoCodeLostEntity.java @@ -4,12 +4,10 @@ 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 lombok.Data; import java.util.Date; -import com.glxp.api.util.page.ListPageRequest; -import lombok.Data; - /** * 扫码缺失字段信息补齐表 */ diff --git a/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java b/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java index a4623a54..e658193e 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoCodeTempEntity.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 com.fasterxml.jackson.annotation.JsonIdentityReference; import lombok.Data; import java.math.BigDecimal; diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java index 8c2f74d0..89e912d4 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import java.math.BigDecimal; -import java.util.List; @Data @TableName(value = "io_order_detail_biz") diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java index e849c439..28011a6c 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java @@ -4,16 +4,14 @@ 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 java.util.Date; -import java.util.List; - -import kotlin.jvm.internal.Lambda; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Date; +import java.util.List; + @Builder @AllArgsConstructor @NoArgsConstructor diff --git a/src/main/java/com/glxp/api/entity/inout/PurReceiveEntity.java b/src/main/java/com/glxp/api/entity/inout/PurReceiveEntity.java index c277a6db..fa138682 100644 --- a/src/main/java/com/glxp/api/entity/inout/PurReceiveEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/PurReceiveEntity.java @@ -4,11 +4,10 @@ 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 lombok.Data; import java.util.Date; -import lombok.Data; - @Data @TableName(value = "pur_receive") public class PurReceiveEntity { diff --git a/src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java index 046767e2..d1b0bbbb 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurApplyEntity.java @@ -4,9 +4,10 @@ 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 java.util.Date; import lombok.Data; +import java.util.Date; + @Data @TableName(value = "pur_apply") public class PurApplyEntity { diff --git a/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java index 920eff29..d8616b7f 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java @@ -4,11 +4,10 @@ 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 lombok.Data; import java.util.Date; -import lombok.Data; - @Data @TableName(value = "pur_order") public class PurOrderEntity { diff --git a/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java b/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java index 93928037..9f14185f 100644 --- a/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java +++ b/src/main/java/com/glxp/api/entity/purchase/PurPlanEntity.java @@ -4,9 +4,10 @@ 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 java.util.Date; import lombok.Data; +import java.util.Date; + @Data @TableName(value = "pur_plan") public class PurPlanEntity { diff --git a/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java index d86c32cd..d05b6170 100644 --- a/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java +++ b/src/main/java/com/glxp/api/entity/sync/BasicExportStatusEntity.java @@ -1,18 +1,15 @@ package com.glxp.api.entity.sync; -import java.util.Date; - -import cn.hutool.core.date.DateUtil; 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 com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.ibatis.type.JdbcType; + +import java.util.Date; @Data diff --git a/src/main/java/com/glxp/api/entity/sync/SyncEditLogEntity.java b/src/main/java/com/glxp/api/entity/sync/SyncEditLogEntity.java index 20fbdeaa..5ce18f72 100644 --- a/src/main/java/com/glxp/api/entity/sync/SyncEditLogEntity.java +++ b/src/main/java/com/glxp/api/entity/sync/SyncEditLogEntity.java @@ -4,11 +4,10 @@ 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.ApiModel; -import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; @Data @TableName(value = "sync_edit_log") diff --git a/src/main/java/com/glxp/api/entity/sync/SyncEditTypeEntity.java b/src/main/java/com/glxp/api/entity/sync/SyncEditTypeEntity.java index b1a071f3..a1ad7909 100644 --- a/src/main/java/com/glxp/api/entity/sync/SyncEditTypeEntity.java +++ b/src/main/java/com/glxp/api/entity/sync/SyncEditTypeEntity.java @@ -4,11 +4,10 @@ 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.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import java.io.Serializable; import lombok.Data; +import java.io.Serializable; + @Data @TableName(value = "sync_edit_type") public class SyncEditTypeEntity implements Serializable { diff --git a/src/main/java/com/glxp/api/entity/system/SysMenuHelpEntity.java b/src/main/java/com/glxp/api/entity/system/SysMenuHelpEntity.java index f5292a53..1b2993d2 100644 --- a/src/main/java/com/glxp/api/entity/system/SysMenuHelpEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SysMenuHelpEntity.java @@ -4,11 +4,7 @@ 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 java.util.Date; - -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; @Data @TableName(value = "sys_menu_help") diff --git a/src/main/java/com/glxp/api/entity/system/SysMsgTodoEntity.java b/src/main/java/com/glxp/api/entity/system/SysMsgTodoEntity.java index a61826eb..e9d1672f 100644 --- a/src/main/java/com/glxp/api/entity/system/SysMsgTodoEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SysMsgTodoEntity.java @@ -4,14 +4,13 @@ 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 java.io.Serializable; -import java.time.LocalDateTime; - import com.glxp.api.enums.DealStatusEnum; import com.glxp.api.enums.PushStatusEnum; import com.glxp.api.enums.TodoMsgTypeEnum; import lombok.Data; +import java.time.LocalDateTime; + /** * * @TableName sys_msg_todo diff --git a/src/main/java/com/glxp/api/entity/system/SysRemindMsgEntity.java b/src/main/java/com/glxp/api/entity/system/SysRemindMsgEntity.java index 7dacec60..ffe89a05 100644 --- a/src/main/java/com/glxp/api/entity/system/SysRemindMsgEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SysRemindMsgEntity.java @@ -4,11 +4,10 @@ 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 lombok.Data; import java.util.Date; -import lombok.Data; - @Data @TableName(value = "sys_remind_msg") public class SysRemindMsgEntity { diff --git a/src/main/java/com/glxp/api/entity/system/SystemPDFModuleEntity.java b/src/main/java/com/glxp/api/entity/system/SystemPDFModuleEntity.java index d68ff1d0..ea06a7d1 100644 --- a/src/main/java/com/glxp/api/entity/system/SystemPDFModuleEntity.java +++ b/src/main/java/com/glxp/api/entity/system/SystemPDFModuleEntity.java @@ -1,6 +1,5 @@ package com.glxp.api.entity.system; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; diff --git a/src/main/java/com/glxp/api/entity/thrsys/CodeRel.java b/src/main/java/com/glxp/api/entity/thrsys/CodeRel.java index cd3aa939..49b6a73b 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/CodeRel.java +++ b/src/main/java/com/glxp/api/entity/thrsys/CodeRel.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 java.util.Date; diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThirdAliDrug.java b/src/main/java/com/glxp/api/entity/thrsys/ThirdAliDrug.java index 92306b56..e3bd6518 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThirdAliDrug.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThirdAliDrug.java @@ -6,15 +6,14 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; - -import java.io.Serializable; -import java.util.Date; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; +import java.util.Date; + @ApiModel(description = "third_ali_drug") @Data @Builder diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrOrderDetailEntity.java index 0217e5c3..b963e12e 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrOrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrOrderDetailEntity.java @@ -4,13 +4,12 @@ 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 lombok.Data; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; -import lombok.Data; - @Data @TableName(value = "thr_order_detail") public class ThrOrderDetailEntity implements Serializable { diff --git a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsImportDetailEntity.java b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsImportDetailEntity.java index 97806442..1b6d1ca7 100644 --- a/src/main/java/com/glxp/api/entity/thrsys/ThrProductsImportDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/thrsys/ThrProductsImportDetailEntity.java @@ -4,9 +4,10 @@ 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 java.util.Date; import lombok.Data; +import java.util.Date; + @Data @TableName(value = "thr_products_import_detail") public class ThrProductsImportDetailEntity { @@ -154,4 +155,4 @@ public class ThrProductsImportDetailEntity { public static final String COL_UPDATEUSER = "updateUser"; public static final String COL_REMARK = "remark"; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/handler/GlobalExceptionHandler.java b/src/main/java/com/glxp/api/handler/GlobalExceptionHandler.java index 5b521317..edc1971f 100644 --- a/src/main/java/com/glxp/api/handler/GlobalExceptionHandler.java +++ b/src/main/java/com/glxp/api/handler/GlobalExceptionHandler.java @@ -1,9 +1,9 @@ package com.glxp.api.handler; -import com.glxp.api.exception.JsonException; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.exception.JsonException; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; @@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestControllerAdvice; @RestControllerAdvice @Slf4j public class GlobalExceptionHandler { - + // 拦截API异常 @ExceptionHandler(value = JsonException.class) public BaseResponse handlerJsonException(JsonException e) { @@ -29,5 +29,5 @@ public class GlobalExceptionHandler { // 返回对应的错误信息 return ResultVOUtils.error(ResultEnum.NOT_NETWORK); } - + } diff --git a/src/main/java/com/glxp/api/httpClient/serviceClient/AlihealthClient.java b/src/main/java/com/glxp/api/httpClient/serviceClient/AlihealthClient.java index 65809bed..86eabfd4 100644 --- a/src/main/java/com/glxp/api/httpClient/serviceClient/AlihealthClient.java +++ b/src/main/java/com/glxp/api/httpClient/serviceClient/AlihealthClient.java @@ -1,12 +1,6 @@ package com.glxp.api.httpClient.serviceClient; -import cn.hutool.http.HttpUtil; import com.glxp.api.req.alihealth.AlihealthKytCommonParametersReqeust; -import com.glxp.api.util.alihealth.AlihealthUtils; -import org.springframework.beans.factory.annotation.Value; - -import javax.annotation.Resource; -import java.util.Map; public interface AlihealthClient { String accessAliInterface(AlihealthKytCommonParametersReqeust alihealthKytCommonParametersReqeust, String appSecret); diff --git a/src/main/java/com/glxp/api/httpClient/serviceClient/NmpaUdiClient.java b/src/main/java/com/glxp/api/httpClient/serviceClient/NmpaUdiClient.java index 39285e8c..cd69b78a 100644 --- a/src/main/java/com/glxp/api/httpClient/serviceClient/NmpaUdiClient.java +++ b/src/main/java/com/glxp/api/httpClient/serviceClient/NmpaUdiClient.java @@ -1,6 +1,7 @@ package com.glxp.api.httpClient.serviceClient; import com.glxp.api.entity.basic.UdiProductEntity; + import java.util.List; public interface NmpaUdiClient { diff --git a/src/main/java/com/glxp/api/idc/controller/ConnectController.java b/src/main/java/com/glxp/api/idc/controller/ConnectController.java index 434eb64d..b27f5c56 100644 --- a/src/main/java/com/glxp/api/idc/controller/ConnectController.java +++ b/src/main/java/com/glxp/api/idc/controller/ConnectController.java @@ -1,17 +1,15 @@ package com.glxp.api.idc.controller; -import java.util.Map; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.idc.service.ConnectService; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.idc.service.ConnectService; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.Map; @@ -28,7 +26,7 @@ public class ConnectController { @RequestMapping(value = "/spssync/common/connect") @ResponseBody public BaseResponse connect(HttpServletRequest request, @RequestBody Map params) { - + return connectService.connectStatus(request,params); } diff --git a/src/main/java/com/glxp/api/idc/controller/DeleteController.java b/src/main/java/com/glxp/api/idc/controller/DeleteController.java index 41136aed..8e32de5b 100644 --- a/src/main/java/com/glxp/api/idc/controller/DeleteController.java +++ b/src/main/java/com/glxp/api/idc/controller/DeleteController.java @@ -1,18 +1,16 @@ package com.glxp.api.idc.controller; -import java.util.Map; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import com.glxp.api.idc.service.DeleteService; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.idc.service.DeleteService; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.Map; diff --git a/src/main/java/com/glxp/api/idc/controller/FileController.java b/src/main/java/com/glxp/api/idc/controller/FileController.java index 92c9e2eb..f0e8cc3b 100644 --- a/src/main/java/com/glxp/api/idc/controller/FileController.java +++ b/src/main/java/com/glxp/api/idc/controller/FileController.java @@ -1,19 +1,13 @@ package com.glxp.api.idc.controller; -import java.util.Map; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.idc.service.FileService; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; - -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; - -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.idc.service.FileService; +import java.util.Map; @@ -33,19 +27,19 @@ public class FileController { public BaseResponse upload(HttpServletRequest request, @RequestBody Map params) { return fileService.fileUpload(request,params); } - + @RequestMapping(value = "/spssync/file/download") @ResponseBody public BaseResponse download(HttpServletRequest request, @RequestBody Map params) { return fileService.fileDownload(request,params); } - + @RequestMapping(value = "/spssync/file/downloadFile") @ResponseBody public BaseResponse downloadFile(HttpServletRequest request, @RequestBody Map params) { return fileService.downloadFile(request,params); } - + @RequestMapping(value = "/spssync/file/uploadFile") public BaseResponse uploadFile(HttpServletRequest request, @RequestParam(value = "content" , required = false) String content, @@ -54,7 +48,7 @@ public class FileController { return fileService.receiveFile(request, content, files); } - - + + } diff --git a/src/main/java/com/glxp/api/idc/controller/IdcController.java b/src/main/java/com/glxp/api/idc/controller/IdcController.java index d70d4cdf..88a31cb4 100644 --- a/src/main/java/com/glxp/api/idc/controller/IdcController.java +++ b/src/main/java/com/glxp/api/idc/controller/IdcController.java @@ -1,5 +1,23 @@ package com.glxp.api.idc.controller; +import cn.hutool.core.io.IoUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.dao.idc.DbDao; +import com.glxp.api.idc.service.IdcService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.client.RestTemplate; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -9,31 +27,6 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.Map; -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpMethod; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.client.RestTemplate; -import org.springframework.web.multipart.MultipartFile; - -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.dao.idc.DbDao; -import com.glxp.api.idc.service.IdcService; - -import cn.hutool.core.io.IoUtil; -import lombok.extern.slf4j.Slf4j; - /** * 中继服务接口 diff --git a/src/main/java/com/glxp/api/idc/service/ConnectService.java b/src/main/java/com/glxp/api/idc/service/ConnectService.java index 0b6f402c..9de34e3f 100644 --- a/src/main/java/com/glxp/api/idc/service/ConnectService.java +++ b/src/main/java/com/glxp/api/idc/service/ConnectService.java @@ -1,10 +1,9 @@ package com.glxp.api.idc.service; -import java.util.Map; +import com.glxp.api.common.res.BaseResponse; import javax.servlet.http.HttpServletRequest; - -import com.glxp.api.common.res.BaseResponse; +import java.util.Map; /*连通状态服务*/ public interface ConnectService { diff --git a/src/main/java/com/glxp/api/idc/service/DownloadRestTemplate.java b/src/main/java/com/glxp/api/idc/service/DownloadRestTemplate.java index 205d08be..31b37a7d 100644 --- a/src/main/java/com/glxp/api/idc/service/DownloadRestTemplate.java +++ b/src/main/java/com/glxp/api/idc/service/DownloadRestTemplate.java @@ -1,21 +1,15 @@ package com.glxp.api.idc.service; -import java.io.IOException; -import java.net.URI; - +import cn.hutool.core.lang.Assert; +import com.beust.jcommander.internal.Nullable; import org.springframework.http.HttpMethod; import org.springframework.http.client.ClientHttpRequest; import org.springframework.http.client.ClientHttpRequestFactory; import org.springframework.http.client.ClientHttpResponse; -import org.springframework.web.client.RequestCallback; -import org.springframework.web.client.ResourceAccessException; -import org.springframework.web.client.ResponseExtractor; -import org.springframework.web.client.RestClientException; -import org.springframework.web.client.RestTemplate; +import org.springframework.web.client.*; -import com.beust.jcommander.internal.Nullable; - -import cn.hutool.core.lang.Assert; +import java.io.IOException; +import java.net.URI; public class DownloadRestTemplate extends RestTemplate { public DownloadRestTemplate(ClientHttpRequestFactory requestFactory) { diff --git a/src/main/java/com/glxp/api/idc/service/FileService.java b/src/main/java/com/glxp/api/idc/service/FileService.java index 11e071ae..804de404 100644 --- a/src/main/java/com/glxp/api/idc/service/FileService.java +++ b/src/main/java/com/glxp/api/idc/service/FileService.java @@ -1,16 +1,14 @@ package com.glxp.api.idc.service; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - +import com.glxp.api.common.res.BaseResponse; import org.springframework.web.multipart.MultipartFile; -import com.glxp.api.common.res.BaseResponse; +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; -/*文件服务*/ +/*文件服务*/ public interface FileService { BaseResponse upload(List list); BaseResponse download(List list); diff --git a/src/main/java/com/glxp/api/idc/service/IdcService.java b/src/main/java/com/glxp/api/idc/service/IdcService.java index 67ebe23a..4b442677 100644 --- a/src/main/java/com/glxp/api/idc/service/IdcService.java +++ b/src/main/java/com/glxp/api/idc/service/IdcService.java @@ -1,13 +1,11 @@ package com.glxp.api.idc.service; -import java.util.Map; +import com.glxp.api.common.res.BaseResponse; +import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - -import org.springframework.web.multipart.MultipartFile; - -import com.glxp.api.common.res.BaseResponse; +import java.util.Map; /*数据中继数据中心(接收)*/ @@ -21,7 +19,7 @@ public interface IdcService { String content,MultipartFile[] files); BaseResponse send(Map params); BaseResponse send(String messageType,String tableName,Map params); - + BaseResponse taskList(HttpServletRequest request,Map params); BaseResponse download(HttpServletRequest request,Map params); @@ -31,12 +29,12 @@ public interface IdcService { public void asyncFetchUdiTask(); BaseResponse downlaodSuccess(HttpServletRequest request,Map params); - + void asyncUdiTask(); void asyncSpsTask(); - + void downloadFile(String fileName,HttpServletResponse response) ; - + BaseResponse onceSync(String tableName,boolean isUpload); boolean signleDownloadFile(String syncIp, String fileName); } diff --git a/src/main/java/com/glxp/api/idc/service/impl/ConnectServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/ConnectServiceImpl.java index 38acff82..fc31f146 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/ConnectServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/ConnectServiceImpl.java @@ -1,16 +1,5 @@ package com.glxp.api.idc.service.impl; -import java.util.HashMap; -import java.util.Map; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.stereotype.Service; - import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.glxp.api.common.res.BaseResponse; @@ -18,6 +7,15 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.dao.idc.DbDao; import com.glxp.api.idc.service.ConnectService; import com.glxp.api.idc.utils.IDCUtils; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.util.HashMap; +import java.util.Map; /*连通检测*/ @@ -43,7 +41,7 @@ public class ConnectServiceImpl implements ConnectService { Map map = new HashMap(); map.put("level", level); Map config = new HashMap<>(); - try + try { if(level==0) { config = dbDao.get("select syncIp as paramValue from sync_data_set limit 1"); @@ -51,7 +49,7 @@ public class ConnectServiceImpl implements ConnectService { config = dbDao.get("select * from system_param_config where paramKey='upper_server_ip'"); } } catch (Exception ex) { - + } String msg = "UDI管理系统"; for(int i=1;i map = new HashMap<>(); @@ -35,12 +33,12 @@ public class DeleteServiceImpl implements DeleteService { public boolean syncDelete(Map params) { createTable(); String sql = "insert into idc_delete (id,tableName,updateTime,uniqueValue) values ('"+CustomUtil.getId()+"','"+params.get("tableName").toString().toLowerCase()+"',now(),'"+JSON.toJSONString(params.get("uniqueValue"))+"')"; - + if(dbDao.save(sql)>0) return true; return false; } - + private void createTable() { try { jdbcTemplate.execute("create table idc_delete (id varchar(36),tableName varchar(100),uniqueValue varchar(600),updateTime datetime,PRIMARY KEY (id))"); @@ -55,4 +53,4 @@ public class DeleteServiceImpl implements DeleteService { } } -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java index e548f43c..496ef9d6 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/FileServiceImpl.java @@ -1,25 +1,5 @@ package com.glxp.api.idc.service.impl; -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.lang3.StringUtils; -import org.apache.tools.ant.util.DateUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.glxp.api.common.res.BaseResponse; @@ -29,13 +9,21 @@ import com.glxp.api.idc.service.FileService; import com.glxp.api.idc.service.IdcService; import com.glxp.api.idc.utils.IDCUtils; import com.glxp.api.util.FileUtils; +import okhttp3.*; +import org.apache.commons.lang3.StringUtils; +import org.apache.tools.ant.util.DateUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; -import okhttp3.MediaType; -import okhttp3.MultipartBody; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.RequestBody; -import okhttp3.Response; +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.io.IOException; +import java.util.*; +import java.util.concurrent.TimeUnit; /*文件服务*/ diff --git a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java index 2f2ea6de..5dbd9e2b 100644 --- a/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java +++ b/src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java @@ -1,34 +1,5 @@ package com.glxp.api.idc.service.impl; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; -import java.util.concurrent.TimeUnit; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.text.WordUtils; -import org.apache.tools.ant.util.DateUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.jdbc.core.JdbcTemplate; -import org.springframework.scheduling.annotation.Async; -import org.springframework.scheduling.support.CronSequenceGenerator; -import org.springframework.stereotype.Service; -import org.springframework.web.multipart.MultipartFile; - import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.glxp.api.common.res.BaseResponse; @@ -46,14 +17,26 @@ import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.DateUtil; import com.glxp.api.util.FileUtils; - import lombok.extern.slf4j.Slf4j; -import okhttp3.MediaType; -import okhttp3.MultipartBody; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.RequestBody; -import okhttp3.Response; +import okhttp3.*; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.text.WordUtils; +import org.apache.tools.ant.util.DateUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.scheduling.annotation.Async; +import org.springframework.scheduling.support.CronSequenceGenerator; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.util.*; +import java.util.concurrent.TimeUnit; /*数据中继数据中心(接收)*/ @Slf4j diff --git a/src/main/java/com/glxp/api/idc/utils/DBAUtils.java b/src/main/java/com/glxp/api/idc/utils/DBAUtils.java index 872902f2..4e6973a6 100644 --- a/src/main/java/com/glxp/api/idc/utils/DBAUtils.java +++ b/src/main/java/com/glxp/api/idc/utils/DBAUtils.java @@ -1,15 +1,14 @@ package com.glxp.api.idc.utils; -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - +import com.glxp.api.util.DateUtil; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.glxp.api.util.DateUtil; +import java.util.Date; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; @@ -20,7 +19,7 @@ import com.glxp.api.util.DateUtil; public class DBAUtils { private static final Logger logger = LoggerFactory.getLogger(DBAUtils.class); private static final String keywords = ",limit,offset,sort,order,isLike,menuId,menuCode,page,isAuto,pageNo,pageSize,pageNum,sqlOrder,join,"; - + /*解析where条件*/ public static String parseWhere(String sql,Map columns,Map params,String dataWhere) { return parseWhere(sql,columns,params,dataWhere,false); @@ -29,7 +28,7 @@ public class DBAUtils { String where=""; boolean isAnd0 = false; boolean isLike = params!=null&¶ms.get("isLike")!=null&¶ms.get("isLike").toString().equals("true") ? true : false; - + if(sql.contains("sqlWhere")||!sql.contains(""); String str = sql.substring(b+1,c); int e1 = str.indexOf("#{"); @@ -99,8 +98,8 @@ public class DBAUtils { } sql = sql.length()>c+5 ? sql.substring(0,a) +str+sql.substring(c+5) : sql.substring(0,a) +str; } - - } + + } if(sql.contains("")) { sql = n>0 ? sql.replaceAll("", " where ") : sql.replaceAll("", ""); if(!StringUtils.isEmpty(dataWhere)&&!sql.contains("sqlWhere")) { @@ -113,7 +112,7 @@ public class DBAUtils { int a1,a2,b1,b2; a1 = sql.indexOf("[==isLike]"); a2 = sql.indexOf("",a1+1); - + if(a1>0&&a2>0) { if(isLike) { sql = sql.length()>a2+5 ? sql.substring(0,a1)+sql.substring(a1 +10, a2) +sql.substring(a2+5) : sql.substring(0,a1)+sql.substring(a1 +10, a2); @@ -131,11 +130,11 @@ public class DBAUtils { } } } - + sql =parseParams(sql,columns,params); return sql; } - + public static String parseParams(String sql,Map columns,Map params) { String[] iStr={"#{","${"}; for(int k=0;k<2;k++) { @@ -153,12 +152,12 @@ public class DBAUtils { sql = sql.substring(0,a1)+(dataType.equals("0") ? "'" : "")+value+(dataType.equals("0") ? "'" : "")+sql.substring(a2 +1); } } - + return sql; - + } - - + + /*生成where条件*/ public static String convertWhere(Map colums,Map params,String dataWhere) { String where=convertWhere(colums,params,dataWhere,""); @@ -181,7 +180,7 @@ public class DBAUtils { if(obj!=null) value = obj.toString(); if(!StringUtils.isEmpty(value)&&!keywords.contains(","+key+",")&&(StringUtils.isEmpty(sql)||(!StringUtils.isEmpty(sql)&&!sql.contains("{"+key+"}")))) { - + if(key.equals("sqlWhere")||key.equals("join")) { where+=(!StringUtils.isEmpty(where) ? " and " : "") +" "+value; } else { @@ -189,12 +188,12 @@ public class DBAUtils { String wh = ""; for (String cn:cns) { String columnName = cn;//StringUtils.propertyToField(cn); - - + + if(colums!=null&&isKey&&colums.get(cn)==null) { logger.error("列名"+columnName+"不存在,属性"+cn+"错误."); } else { - if(!StringUtils.isEmpty(wh)) + if(!StringUtils.isEmpty(wh)) wh+=" or "; if(isLike) { wh+="instr("+columnName+",'"+value+"')>0"; @@ -207,21 +206,21 @@ public class DBAUtils { } } } - + if(!StringUtils.isEmpty(dataWhere)) { if(!StringUtils.isEmpty(where)) { where = "("+where+") and ("+dataWhere+")"; } else { where = dataWhere; } - } - if(!StringUtils.isEmpty(where)) + } + if(!StringUtils.isEmpty(where)) where = "("+where+")"; return where; } - - - + + + /*生成insert语句*/ public static String parseInsert(Map params,Map columns) { String ins=""; @@ -229,28 +228,28 @@ public class DBAUtils { String sql=""; for(String key : columns.keySet()){ String value = ""; - + if(params.get(key)!=null) value = params.get(key).toString(); Map map = (Map) columns.get(key); String dataType = map.get("dataType").toString(); String extra = map.get("extra")!=null&&map.get("extra").toString().toLowerCase().contains("auto") ? "A" : "N"; - + if(map.get("columnKey").toString().equals("PRI")&&extra.equals("N")) { if(StringUtils.isEmpty(value)) { - + } } - + value = DBAUtils.escape(value); if(!StringUtils.isEmpty(value)) { if(!StringUtils.isEmpty(ins)) ins+=","; ins+=map.get("columnName").toString(); - + if(!StringUtils.isEmpty(vas)) vas+=","; - + if(StringUtils.isEmpty(value)) { vas+="null"; } else { @@ -268,34 +267,34 @@ public class DBAUtils { str = DateUtil.formatDate(IDCUtils.parseDate(value),"yyyy-MM-dd HH:mm:ss"); } vas+="cast('"+str+"' as datetime)"; - + } } } } if(!StringUtils.isEmpty(ins)&&!StringUtils.isEmpty(vas)) { sql = "("+ins+") values ("+vas+")"; - } - + } + return sql; } - - - + + + public static String convertColumnType(String dataType,String dbType,String width) { String columnType = dataType.toLowerCase(); if(dbType.contains("oracle.")) { columnType = columnType.contains("varchar") ? width.contains("(") ? ("varchar2" +width) : ("varchar2(" +width+")") : - columnType.contains("char") ? width.contains("(") ? ("char" +width) : ("char(" +width+")") : + columnType.contains("char") ? width.contains("(") ? ("char" +width) : ("char(" +width+")") : columnType.contains("date")||columnType.contains("time") ? "date" : columnType.contains("int")||columnType.contains("num")||columnType.contains("dec") ? width.contains("(") ? ("number"+width+"") : ("number("+width+")") : ""; } else { columnType = columnType.contains("varchar") ? width.contains("(") ? ("varchar" +width) : ("varchar(" +width+")") : - columnType.contains("char") ? width.contains("(") ? ("char" +width) : ("char(" +width+")") : + columnType.contains("char") ? width.contains("(") ? ("char" +width) : ("char(" +width+")") : columnType.contains("date")||columnType.contains("time") ? "datetime" : columnType.contains("int")||columnType.contains("num")||columnType.contains("dec") ? width !=null && width.contains(",") ? width.contains("(") ? ("decimal"+width+"") : ("decimal("+width+")") : "int" : ""; } - + return columnType; } private static String aliasNameChars = "_hijklmnopqrstuvwxyzabcdefg9876543210"; @@ -343,7 +342,7 @@ public class DBAUtils { } return result; } - + public static String tableJoinWhere(String tableName,Map columns) { String result = ""; if(tableName.contains(",")) { @@ -353,10 +352,10 @@ public class DBAUtils { //result = mTname+".id="+sTname+"."+mTname+"_id"; } return result; - + } - - + + /*从update语句解析select*/ public static String updateSqlToSelectSql(String sql,Map map) { String aSql = sql.toLowerCase(); @@ -386,7 +385,7 @@ public class DBAUtils { } return result; } - + public static String escape(String str) { String value = str; if(value!=null&&value.contains("'")) { @@ -395,6 +394,6 @@ public class DBAUtils { } return value; } - - + + } diff --git a/src/main/java/com/glxp/api/idc/utils/IDCUtils.java b/src/main/java/com/glxp/api/idc/utils/IDCUtils.java index 70c2cff1..2b266436 100644 --- a/src/main/java/com/glxp/api/idc/utils/IDCUtils.java +++ b/src/main/java/com/glxp/api/idc/utils/IDCUtils.java @@ -1,5 +1,11 @@ package com.glxp.api.idc.utils; +import com.alibaba.fastjson.JSON; +import okhttp3.*; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -8,18 +14,6 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Map; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.alibaba.fastjson.JSON; - -import okhttp3.MediaType; -import okhttp3.OkHttpClient; -import okhttp3.Request; -import okhttp3.RequestBody; -import okhttp3.Response; - @@ -31,13 +25,13 @@ public class IDCUtils { private static String aliasNameChars = "_hijklmnopqrstuvwxyzabcdefg9876543210"; private static String realNamechars = "abcdefghijklmnopqrstuvwxyz_0123456789"; private final static String MONTH_EN = "JanFebMarAprMayJunJulAugSepOctNovDec"; - + //判断是否json字符串 public static boolean isJson(String json) { if(json!=null&&json.contains("{")&&json.contains("}")&&json.contains("\"")) return true; return false; - } + } public static Date parseDate(String str) { return parseDate(str,"yyyy-MM-dd HH:mm:ss"); } @@ -110,11 +104,11 @@ public class IDCUtils { dateStr=df.format(new Date(Long.valueOf(str))); } dateStr = dateStr.replace("T", " "); - + Date date = null; try { date = df.parse(dateStr); - + } catch (ParseException e) { logger.error(e.getMessage()); } @@ -138,9 +132,9 @@ public class IDCUtils { } } } - + } - + public static String post(String url, Map params) { OkHttpClient client = new OkHttpClient().newBuilder() .build(); @@ -163,8 +157,8 @@ public class IDCUtils { } return result; } - - + + public static void writeFile(byte[] file, String filePath, String fileName) throws Exception { File targetFile = new File(filePath); if (!targetFile.exists()) { diff --git a/src/main/java/com/glxp/api/idc/utils/UriUtils.java b/src/main/java/com/glxp/api/idc/utils/UriUtils.java index 1478eb25..3806ecf9 100644 --- a/src/main/java/com/glxp/api/idc/utils/UriUtils.java +++ b/src/main/java/com/glxp/api/idc/utils/UriUtils.java @@ -1,5 +1,14 @@ package com.glxp.api.idc.utils; +import cn.hutool.core.io.IoUtil; +import com.alibaba.fastjson.JSON; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.stereotype.Service; + +import javax.servlet.http.HttpServletRequest; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; @@ -7,18 +16,6 @@ import java.util.Enumeration; import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletRequest; - -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpMethod; -import org.springframework.stereotype.Service; - -import com.alibaba.fastjson.JSON; - -import cn.hutool.core.io.IoUtil; -import lombok.extern.slf4j.Slf4j; - @Slf4j @Service public class UriUtils { diff --git a/src/main/java/com/glxp/api/req/alihealth/AliYljgSearchbillReqeust.java b/src/main/java/com/glxp/api/req/alihealth/AliYljgSearchbillReqeust.java index b9be471c..ca37a0dc 100644 --- a/src/main/java/com/glxp/api/req/alihealth/AliYljgSearchbillReqeust.java +++ b/src/main/java/com/glxp/api/req/alihealth/AliYljgSearchbillReqeust.java @@ -1,13 +1,11 @@ package com.glxp.api.req.alihealth; import com.baomidou.mybatisplus.annotation.TableField; -import com.glxp.api.entity.alihealth.AliYljgBillDetailDrugCode; import com.glxp.api.util.page.ListPageRequest; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; -import java.util.List; @Data public class AliYljgSearchbillReqeust extends ListPageRequest { diff --git a/src/main/java/com/glxp/api/req/alihealth/AlihealthKytCommonParametersReqeust.java b/src/main/java/com/glxp/api/req/alihealth/AlihealthKytCommonParametersReqeust.java index 1f32bdc2..72add1af 100644 --- a/src/main/java/com/glxp/api/req/alihealth/AlihealthKytCommonParametersReqeust.java +++ b/src/main/java/com/glxp/api/req/alihealth/AlihealthKytCommonParametersReqeust.java @@ -2,9 +2,6 @@ package com.glxp.api.req.alihealth; import lombok.Data; -import java.text.SimpleDateFormat; -import java.util.Date; - /** * 基础参数 */ diff --git a/src/main/java/com/glxp/api/req/alihealth/AlihealthKytDrugrescodeReqeust.java b/src/main/java/com/glxp/api/req/alihealth/AlihealthKytDrugrescodeReqeust.java index 20772d31..b544fc05 100644 --- a/src/main/java/com/glxp/api/req/alihealth/AlihealthKytDrugrescodeReqeust.java +++ b/src/main/java/com/glxp/api/req/alihealth/AlihealthKytDrugrescodeReqeust.java @@ -1,6 +1,5 @@ package com.glxp.api.req.alihealth; -import io.swagger.models.auth.In; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/alihealth/AlihealthYljgCodedetailReqeust.java b/src/main/java/com/glxp/api/req/alihealth/AlihealthYljgCodedetailReqeust.java index 7709a9b8..d3c6895b 100644 --- a/src/main/java/com/glxp/api/req/alihealth/AlihealthYljgCodedetailReqeust.java +++ b/src/main/java/com/glxp/api/req/alihealth/AlihealthYljgCodedetailReqeust.java @@ -1,6 +1,5 @@ package com.glxp.api.req.alihealth; -import com.glxp.api.req.alihealth.local.AlihealthYljgLocaCodedetailReqeust; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/alihealth/AlihealthYljgUploadinoutbillReqeust.java b/src/main/java/com/glxp/api/req/alihealth/AlihealthYljgUploadinoutbillReqeust.java index d4eaf3c0..794a915b 100644 --- a/src/main/java/com/glxp/api/req/alihealth/AlihealthYljgUploadinoutbillReqeust.java +++ b/src/main/java/com/glxp/api/req/alihealth/AlihealthYljgUploadinoutbillReqeust.java @@ -1,11 +1,7 @@ package com.glxp.api.req.alihealth; -import com.glxp.api.req.alihealth.AlihealthKytCommonParametersReqeust; -import io.swagger.models.auth.In; import lombok.Data; -import java.util.Date; - @Data public class AlihealthYljgUploadinoutbillReqeust extends AlihealthKytCommonParametersReqeust { private String bill_code; diff --git a/src/main/java/com/glxp/api/req/alihealth/local/AliBillsDisposeReqeust.java b/src/main/java/com/glxp/api/req/alihealth/local/AliBillsDisposeReqeust.java index 22f28365..6787f65d 100644 --- a/src/main/java/com/glxp/api/req/alihealth/local/AliBillsDisposeReqeust.java +++ b/src/main/java/com/glxp/api/req/alihealth/local/AliBillsDisposeReqeust.java @@ -1,6 +1,5 @@ package com.glxp.api.req.alihealth.local; -import com.glxp.api.entity.collect.IoCollectCodeBackup; import com.glxp.api.entity.inout.IoOrderEntity; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/alihealth/local/AlihealthGetRelCodeReqeust.java b/src/main/java/com/glxp/api/req/alihealth/local/AlihealthGetRelCodeReqeust.java index d7ecae57..150d8bb3 100644 --- a/src/main/java/com/glxp/api/req/alihealth/local/AlihealthGetRelCodeReqeust.java +++ b/src/main/java/com/glxp/api/req/alihealth/local/AlihealthGetRelCodeReqeust.java @@ -1,7 +1,6 @@ package com.glxp.api.req.alihealth.local; import com.glxp.api.entity.collect.IoCollectCodeBackup; -import com.glxp.api.req.alihealth.AlihealthYljgUploadinoutbillReqeust; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/req/alihealth/local/AlihealthRelCodeInsertYljgReqeust.java b/src/main/java/com/glxp/api/req/alihealth/local/AlihealthRelCodeInsertYljgReqeust.java index abfac271..702db544 100644 --- a/src/main/java/com/glxp/api/req/alihealth/local/AlihealthRelCodeInsertYljgReqeust.java +++ b/src/main/java/com/glxp/api/req/alihealth/local/AlihealthRelCodeInsertYljgReqeust.java @@ -1,6 +1,5 @@ package com.glxp.api.req.alihealth.local; -import com.glxp.api.req.alihealth.AlihealthKytDrugrescodeReqeust; import com.glxp.api.req.alihealth.AlihealthYljgUploadinoutbillReqeust; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/alihealth/local/AlihealthYljgLocalListupoutDetailReqeust.java b/src/main/java/com/glxp/api/req/alihealth/local/AlihealthYljgLocalListupoutDetailReqeust.java index 0b1fe9df..8b588c10 100644 --- a/src/main/java/com/glxp/api/req/alihealth/local/AlihealthYljgLocalListupoutDetailReqeust.java +++ b/src/main/java/com/glxp/api/req/alihealth/local/AlihealthYljgLocalListupoutDetailReqeust.java @@ -1,7 +1,6 @@ package com.glxp.api.req.alihealth.local; import com.glxp.api.req.alihealth.AlihealthYljgListupoutDetailReqeust; -import com.glxp.api.req.alihealth.AlihealthYljgListupoutReqeust; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/alihealth/local/AlihealthYljgLocalListupoutReqeust.java b/src/main/java/com/glxp/api/req/alihealth/local/AlihealthYljgLocalListupoutReqeust.java index 0bc1f379..dc5735e4 100644 --- a/src/main/java/com/glxp/api/req/alihealth/local/AlihealthYljgLocalListupoutReqeust.java +++ b/src/main/java/com/glxp/api/req/alihealth/local/AlihealthYljgLocalListupoutReqeust.java @@ -1,7 +1,6 @@ package com.glxp.api.req.alihealth.local; import com.glxp.api.req.alihealth.AlihealthYljgListupoutReqeust; -import com.glxp.api.req.alihealth.AlihealthYljgUploadinoutbillReqeust; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/auth/AuthUserSaveRequest.java b/src/main/java/com/glxp/api/req/auth/AuthUserSaveRequest.java index cf47565d..d89b5ac0 100644 --- a/src/main/java/com/glxp/api/req/auth/AuthUserSaveRequest.java +++ b/src/main/java/com/glxp/api/req/auth/AuthUserSaveRequest.java @@ -2,7 +2,6 @@ package com.glxp.api.req.auth; import lombok.Data; -import javax.validation.constraints.NotEmpty; import java.util.List; /** diff --git a/src/main/java/com/glxp/api/req/basic/BasicHospTypeFilterRequest.java b/src/main/java/com/glxp/api/req/basic/BasicHospTypeFilterRequest.java index adf339bd..7bd2ebbe 100644 --- a/src/main/java/com/glxp/api/req/basic/BasicHospTypeFilterRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicHospTypeFilterRequest.java @@ -1,11 +1,8 @@ package com.glxp.api.req.basic; -import com.glxp.api.res.basic.BasicErpUnitsResponse; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; -import java.util.List; - @Data public class BasicHospTypeFilterRequest extends ListPageRequest { diff --git a/src/main/java/com/glxp/api/req/basic/BasicHospTypeRequest.java b/src/main/java/com/glxp/api/req/basic/BasicHospTypeRequest.java index 91aee5a5..2f135b69 100644 --- a/src/main/java/com/glxp/api/req/basic/BasicHospTypeRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicHospTypeRequest.java @@ -1,7 +1,5 @@ package com.glxp.api.req.basic; -import com.glxp.api.entity.basic.UdiProductEntity; -import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java b/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java index 679c7261..229fc670 100644 --- a/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java @@ -1,7 +1,7 @@ package com.glxp.api.req.basic; -import com.glxp.api.util.page.ListPageRequest; import com.glxp.api.res.basic.BasicErpUnitsResponse; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java index b40bcd0e..974195e2 100644 --- a/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java +++ b/src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java @@ -1,6 +1,5 @@ package com.glxp.api.req.basic; -import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/basic/CopyCustomerIdRequest.java b/src/main/java/com/glxp/api/req/basic/CopyCustomerIdRequest.java index 2b46b073..fa1b3683 100644 --- a/src/main/java/com/glxp/api/req/basic/CopyCustomerIdRequest.java +++ b/src/main/java/com/glxp/api/req/basic/CopyCustomerIdRequest.java @@ -3,8 +3,6 @@ package com.glxp.api.req.basic; import lombok.Data; import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Null; import javax.validation.constraints.Size; @Data diff --git a/src/main/java/com/glxp/api/req/basic/FilterOrderPrintRequest.java b/src/main/java/com/glxp/api/req/basic/FilterOrderPrintRequest.java index ee95b9c8..cacbf29a 100644 --- a/src/main/java/com/glxp/api/req/basic/FilterOrderPrintRequest.java +++ b/src/main/java/com/glxp/api/req/basic/FilterOrderPrintRequest.java @@ -1,6 +1,5 @@ package com.glxp.api.req.basic; -import com.glxp.api.util.page.ListPageRequest; import lombok.Data; /** diff --git a/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java b/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java index ba1c6f83..f3e08ffb 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java @@ -1,6 +1,5 @@ package com.glxp.api.req.basic; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/inout/AddBizProductReqeust.java b/src/main/java/com/glxp/api/req/inout/AddBizProductReqeust.java index 03faf434..b2be6d78 100644 --- a/src/main/java/com/glxp/api/req/inout/AddBizProductReqeust.java +++ b/src/main/java/com/glxp/api/req/inout/AddBizProductReqeust.java @@ -2,8 +2,6 @@ package com.glxp.api.req.inout; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.glxp.api.entity.alihealth.AliYljgBillDetail; -import com.glxp.api.entity.alihealth.AliYljgBillDetailDrug; import com.glxp.api.entity.alihealth.AliYljgSearchbill; import com.glxp.api.entity.inout.IoOrderEntity; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/inout/AddReceiveDetailRequest.java b/src/main/java/com/glxp/api/req/inout/AddReceiveDetailRequest.java index 3c0a0ac6..99066433 100644 --- a/src/main/java/com/glxp/api/req/inout/AddReceiveDetailRequest.java +++ b/src/main/java/com/glxp/api/req/inout/AddReceiveDetailRequest.java @@ -3,7 +3,6 @@ package com.glxp.api.req.inout; import com.glxp.api.entity.inout.PurReceiveEntity; import lombok.Data; -import java.util.Date; import java.util.List; @Data diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailBizRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailBizRequest.java index 53fcadd9..cc6682cb 100644 --- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailBizRequest.java +++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailBizRequest.java @@ -3,8 +3,6 @@ package com.glxp.api.req.inout; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; -import java.util.List; - /** * 单据业务详情查询参数 */ diff --git a/src/main/java/com/glxp/api/req/inout/IoCodeLostRequest.java b/src/main/java/com/glxp/api/req/inout/IoCodeLostRequest.java index f10babb4..c3dc58a4 100644 --- a/src/main/java/com/glxp/api/req/inout/IoCodeLostRequest.java +++ b/src/main/java/com/glxp/api/req/inout/IoCodeLostRequest.java @@ -1,8 +1,5 @@ package com.glxp.api.req.inout; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java b/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java index ce64b1ee..4ccea327 100644 --- a/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java +++ b/src/main/java/com/glxp/api/req/inout/IoOrderInvoiceRequest.java @@ -1,11 +1,5 @@ package com.glxp.api.req.inout; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.glxp.api.entity.inout.IoOrderDetailResultEntity; -import com.glxp.api.entity.inout.IoOrderInvoiceEntity; -import com.glxp.api.entity.purchase.SupCertSetEntity; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/inout/UpdateReceiveDetailRequest.java b/src/main/java/com/glxp/api/req/inout/UpdateReceiveDetailRequest.java index 2f2fd707..6e4f1f48 100644 --- a/src/main/java/com/glxp/api/req/inout/UpdateReceiveDetailRequest.java +++ b/src/main/java/com/glxp/api/req/inout/UpdateReceiveDetailRequest.java @@ -1,10 +1,7 @@ package com.glxp.api.req.inout; -import com.glxp.api.entity.inout.PurReceiveEntity; import lombok.Data; -import java.util.List; - @Data public class UpdateReceiveDetailRequest { diff --git a/src/main/java/com/glxp/api/req/inv/invInnerOrderprintReques.java b/src/main/java/com/glxp/api/req/inv/invInnerOrderprintReques.java index 7cfb9bbd..fb723724 100644 --- a/src/main/java/com/glxp/api/req/inv/invInnerOrderprintReques.java +++ b/src/main/java/com/glxp/api/req/inv/invInnerOrderprintReques.java @@ -1,7 +1,6 @@ package com.glxp.api.req.inv; -import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/purchase/FilterImageRequest.java b/src/main/java/com/glxp/api/req/purchase/FilterImageRequest.java index 7ebf026b..cf582f32 100644 --- a/src/main/java/com/glxp/api/req/purchase/FilterImageRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/FilterImageRequest.java @@ -1,7 +1,6 @@ package com.glxp.api.req.purchase; -import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/purchase/PostPurOrderRequest.java b/src/main/java/com/glxp/api/req/purchase/PostPurOrderRequest.java index e78fdd1a..675abc0f 100644 --- a/src/main/java/com/glxp/api/req/purchase/PostPurOrderRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PostPurOrderRequest.java @@ -3,8 +3,6 @@ package com.glxp.api.req.purchase; import com.glxp.api.entity.purchase.PurOrderDetailEntity; import com.glxp.api.entity.purchase.PurOrderEntity; -import com.glxp.api.entity.purchase.PurPlanDetailEntity; -import com.glxp.api.entity.purchase.PurPlanEntity; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/req/purchase/PurApplyDetailRequest.java b/src/main/java/com/glxp/api/req/purchase/PurApplyDetailRequest.java index 69bdb769..505effa8 100644 --- a/src/main/java/com/glxp/api/req/purchase/PurApplyDetailRequest.java +++ b/src/main/java/com/glxp/api/req/purchase/PurApplyDetailRequest.java @@ -3,9 +3,6 @@ package com.glxp.api.req.purchase; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - /** * @author anthony.ywj * @date 2022-10-12 diff --git a/src/main/java/com/glxp/api/req/system/SysMenuHelpRequest.java b/src/main/java/com/glxp/api/req/system/SysMenuHelpRequest.java index 151f7dbf..b43cba96 100644 --- a/src/main/java/com/glxp/api/req/system/SysMenuHelpRequest.java +++ b/src/main/java/com/glxp/api/req/system/SysMenuHelpRequest.java @@ -3,8 +3,6 @@ package com.glxp.api.req.system; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; -import java.util.Date; - /** * @author : zhangsan * @date : 2023/3/20 14:03 diff --git a/src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsExcelVo.java b/src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsExcelVo.java index 94be458f..a1874e31 100644 --- a/src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsExcelVo.java +++ b/src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsExcelVo.java @@ -1,8 +1,6 @@ package com.glxp.api.req.thrsys; import com.alibaba.excel.annotation.ExcelProperty; -import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpRequest.java index 9847bf3a..9603fbbb 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrCorpRequest.java @@ -1,8 +1,8 @@ package com.glxp.api.req.thrsys; -import com.glxp.api.util.page.ListPageRequest; import com.glxp.api.res.thrsys.ThrCorpsResponse; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrInvProductsRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrInvProductsRequest.java index 5b1c72f7..c686a2d2 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterThrInvProductsRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrInvProductsRequest.java @@ -1,8 +1,8 @@ package com.glxp.api.req.thrsys; -import com.glxp.api.util.page.ListPageRequest; import com.glxp.api.res.thrsys.ThrInvProductResponse; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java index dc51f5d0..a1e451dc 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrOrderRequest.java @@ -1,8 +1,8 @@ package com.glxp.api.req.thrsys; -import com.glxp.api.util.page.ListPageRequest; import com.glxp.api.res.thrsys.ThrOrderResponse; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java index 0eab9263..3bc3c8b4 100644 --- a/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java @@ -1,7 +1,6 @@ package com.glxp.api.req.thrsys; -import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/thrsys/ThrOnhandRequest.java b/src/main/java/com/glxp/api/req/thrsys/ThrOnhandRequest.java index e60a0a7b..f7b2a637 100644 --- a/src/main/java/com/glxp/api/req/thrsys/ThrOnhandRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/ThrOnhandRequest.java @@ -1,8 +1,8 @@ package com.glxp.api.req.thrsys; -import com.glxp.api.util.page.ListPageRequest; import com.glxp.api.res.thrsys.ThrInvProductResponse; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/req/thrsys/ThrProductsRequest.java b/src/main/java/com/glxp/api/req/thrsys/ThrProductsRequest.java index a6350727..147a3d9a 100644 --- a/src/main/java/com/glxp/api/req/thrsys/ThrProductsRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/ThrProductsRequest.java @@ -3,11 +3,9 @@ package com.glxp.api.req.thrsys; import lombok.Data; -import java.util.Date; - /** *

- * + * *

* * @author ${author} diff --git a/src/main/java/com/glxp/api/req/thrsys/ThrUnitMaintainFilterRequest.java b/src/main/java/com/glxp/api/req/thrsys/ThrUnitMaintainFilterRequest.java index 44c52ecf..822c3951 100644 --- a/src/main/java/com/glxp/api/req/thrsys/ThrUnitMaintainFilterRequest.java +++ b/src/main/java/com/glxp/api/req/thrsys/ThrUnitMaintainFilterRequest.java @@ -1,8 +1,8 @@ package com.glxp.api.req.thrsys; -import com.glxp.api.util.page.ListPageRequest; import com.glxp.api.res.thrsys.ThrCorpsResponse; +import com.glxp.api.util.page.ListPageRequest; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/res/alihealth/AlihealthKytDrugrescodeResponse.java b/src/main/java/com/glxp/api/res/alihealth/AlihealthKytDrugrescodeResponse.java index e9d95422..be14a7c2 100644 --- a/src/main/java/com/glxp/api/res/alihealth/AlihealthKytDrugrescodeResponse.java +++ b/src/main/java/com/glxp/api/res/alihealth/AlihealthKytDrugrescodeResponse.java @@ -1,7 +1,5 @@ package com.glxp.api.res.alihealth; -import java.util.Date; - import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; @@ -11,6 +9,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Objects; diff --git a/src/main/java/com/glxp/api/res/alihealth/AlihealthKytSearchbillResponse.java b/src/main/java/com/glxp/api/res/alihealth/AlihealthKytSearchbillResponse.java index 15283d00..139674e5 100644 --- a/src/main/java/com/glxp/api/res/alihealth/AlihealthKytSearchbillResponse.java +++ b/src/main/java/com/glxp/api/res/alihealth/AlihealthKytSearchbillResponse.java @@ -8,7 +8,10 @@ import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Objects; @Data public class AlihealthKytSearchbillResponse extends AlihealthKytCommonParametersResponse { diff --git a/src/main/java/com/glxp/api/res/alihealth/AlihealthKytSinglerelationResponse.java b/src/main/java/com/glxp/api/res/alihealth/AlihealthKytSinglerelationResponse.java index 2d091a1c..e8af0d19 100644 --- a/src/main/java/com/glxp/api/res/alihealth/AlihealthKytSinglerelationResponse.java +++ b/src/main/java/com/glxp/api/res/alihealth/AlihealthKytSinglerelationResponse.java @@ -6,7 +6,6 @@ import cn.hutool.json.JSONUtil; import com.glxp.api.entity.collect.RelCodeBatch; import com.glxp.api.entity.collect.RelCodeDetail; import com.glxp.api.util.udi.FilterUdiUtils; - import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; diff --git a/src/main/java/com/glxp/api/res/alihealth/AlihealthYljgCodedetailResponse.java b/src/main/java/com/glxp/api/res/alihealth/AlihealthYljgCodedetailResponse.java index 2389f871..86efb5cd 100644 --- a/src/main/java/com/glxp/api/res/alihealth/AlihealthYljgCodedetailResponse.java +++ b/src/main/java/com/glxp/api/res/alihealth/AlihealthYljgCodedetailResponse.java @@ -10,7 +10,9 @@ import lombok.Data; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; @Data public class AlihealthYljgCodedetailResponse extends AlihealthKytCommonParametersResponse{ diff --git a/src/main/java/com/glxp/api/res/basic/BasicCorpExportLogResponse.java b/src/main/java/com/glxp/api/res/basic/BasicCorpExportLogResponse.java index 1bff4902..1729589a 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicCorpExportLogResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicCorpExportLogResponse.java @@ -2,7 +2,6 @@ package com.glxp.api.res.basic; import com.glxp.api.entity.basic.BasicCorpEntity; -import com.glxp.api.entity.thrsys.ThrCorpEntity; import com.glxp.api.res.thrsys.ThrCorpsResponse; import lombok.Data; diff --git a/src/main/java/com/glxp/api/res/basic/BasicHospTypeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicHospTypeResponse.java index 24a4646c..f40b9796 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicHospTypeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicHospTypeResponse.java @@ -1,9 +1,5 @@ package com.glxp.api.res.basic; -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 lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/res/basic/InvProductNewResponse.java b/src/main/java/com/glxp/api/res/basic/InvProductNewResponse.java index c7485b3d..58aa2431 100644 --- a/src/main/java/com/glxp/api/res/basic/InvProductNewResponse.java +++ b/src/main/java/com/glxp/api/res/basic/InvProductNewResponse.java @@ -3,7 +3,6 @@ package com.glxp.api.res.basic; 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 lombok.Data; import java.math.BigDecimal; diff --git a/src/main/java/com/glxp/api/res/basic/UdiRelevanceExportJsonResponse.java b/src/main/java/com/glxp/api/res/basic/UdiRelevanceExportJsonResponse.java index e2b44175..08176cbe 100644 --- a/src/main/java/com/glxp/api/res/basic/UdiRelevanceExportJsonResponse.java +++ b/src/main/java/com/glxp/api/res/basic/UdiRelevanceExportJsonResponse.java @@ -1,7 +1,9 @@ package com.glxp.api.res.basic; -import com.glxp.api.entity.basic.*; +import com.glxp.api.entity.basic.UdiProductEntity; +import com.glxp.api.entity.basic.UdiRelevanceEntity; +import com.glxp.api.entity.basic.UdiRlSupEntity; import com.glxp.api.entity.thrsys.ThrProductsEntity; import lombok.Data; diff --git a/src/main/java/com/glxp/api/res/inout/AcceptOrderResponse.java b/src/main/java/com/glxp/api/res/inout/AcceptOrderResponse.java index 0be91b5d..a72aefa1 100644 --- a/src/main/java/com/glxp/api/res/inout/AcceptOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/AcceptOrderResponse.java @@ -1,6 +1,5 @@ package com.glxp.api.res.inout; -import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/res/inout/IoCodeLostResponse.java b/src/main/java/com/glxp/api/res/inout/IoCodeLostResponse.java index e448a2fd..5de244df 100644 --- a/src/main/java/com/glxp/api/res/inout/IoCodeLostResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoCodeLostResponse.java @@ -1,8 +1,5 @@ package com.glxp.api.res.inout; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/res/inout/IoCodeResponse.java b/src/main/java/com/glxp/api/res/inout/IoCodeResponse.java index 86e50c4b..86185a66 100644 --- a/src/main/java/com/glxp/api/res/inout/IoCodeResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoCodeResponse.java @@ -1,6 +1,5 @@ package com.glxp.api.res.inout; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderDetailCodeResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderDetailCodeResponse.java index 79d65918..0c4c1214 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderDetailCodeResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderDetailCodeResponse.java @@ -1,6 +1,5 @@ package com.glxp.api.res.inout; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.math.BigDecimal; diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java index ba4061da..cdd2606a 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java @@ -1,9 +1,5 @@ package com.glxp.api.res.inout; -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 lombok.Data; import java.math.BigDecimal; diff --git a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java index cc381c6d..8cc47026 100644 --- a/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/IoOrderResponse.java @@ -1,7 +1,6 @@ package com.glxp.api.res.inout; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/glxp/api/res/inout/ioUploadOrderResponse.java b/src/main/java/com/glxp/api/res/inout/ioUploadOrderResponse.java index 0d82796a..a6577bb7 100644 --- a/src/main/java/com/glxp/api/res/inout/ioUploadOrderResponse.java +++ b/src/main/java/com/glxp/api/res/inout/ioUploadOrderResponse.java @@ -2,6 +2,7 @@ package com.glxp.api.res.inout; import com.glxp.api.entity.inout.*; import lombok.Data; + import java.util.List; @Data diff --git a/src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java b/src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java index 4f7f1c88..067ff7f1 100644 --- a/src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java +++ b/src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java @@ -1,6 +1,5 @@ package com.glxp.api.res.purchase; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/res/sync/SpsSyncDeviceTaskResponse.java b/src/main/java/com/glxp/api/res/sync/SpsSyncDeviceTaskResponse.java index 5ce85acd..b26f4ad7 100644 --- a/src/main/java/com/glxp/api/res/sync/SpsSyncDeviceTaskResponse.java +++ b/src/main/java/com/glxp/api/res/sync/SpsSyncDeviceTaskResponse.java @@ -1,10 +1,9 @@ package com.glxp.api.res.sync; - import com.glxp.api.entity.dev.*; -import com.glxp.api.entity.inv.DeviceInspectTaskEntity; import com.glxp.api.entity.inv.DeviceInspectTaskDetailEntity; +import com.glxp.api.entity.inv.DeviceInspectTaskEntity; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/res/sync/SpsSyncOtherDataResponse.java b/src/main/java/com/glxp/api/res/sync/SpsSyncOtherDataResponse.java index b5ee4f12..6cd62b80 100644 --- a/src/main/java/com/glxp/api/res/sync/SpsSyncOtherDataResponse.java +++ b/src/main/java/com/glxp/api/res/sync/SpsSyncOtherDataResponse.java @@ -1,9 +1,7 @@ package com.glxp.api.res.sync; -import com.glxp.api.entity.basic.*; import com.glxp.api.entity.inout.IoCodeLostEntity; import com.glxp.api.entity.inout.IoCodeRelEntity; -import com.glxp.api.entity.purchase.*; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/res/thrsys/ThrBusTypeOriginResponse.java b/src/main/java/com/glxp/api/res/thrsys/ThrBusTypeOriginResponse.java index 1d0c28da..65c2fc90 100644 --- a/src/main/java/com/glxp/api/res/thrsys/ThrBusTypeOriginResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/ThrBusTypeOriginResponse.java @@ -1,8 +1,5 @@ package com.glxp.api.res.thrsys; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/res/thrsys/ThrProductsResponse.java b/src/main/java/com/glxp/api/res/thrsys/ThrProductsResponse.java index c458ecbe..7ffb9974 100644 --- a/src/main/java/com/glxp/api/res/thrsys/ThrProductsResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/ThrProductsResponse.java @@ -1,6 +1,5 @@ package com.glxp.api.res.thrsys; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import java.util.Date; diff --git a/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java b/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java index 22e8ee60..b64f754a 100644 --- a/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java @@ -1,8 +1,6 @@ package com.glxp.api.res.thrsys; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.annotation.TableField; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/service/CustomServiceImpl.java b/src/main/java/com/glxp/api/service/CustomServiceImpl.java index f21355ca..b9ab7da6 100644 --- a/src/main/java/com/glxp/api/service/CustomServiceImpl.java +++ b/src/main/java/com/glxp/api/service/CustomServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.BaseMapperPlus; diff --git a/src/main/java/com/glxp/api/service/alihealth/AlihealthBusService.java b/src/main/java/com/glxp/api/service/alihealth/AlihealthBusService.java index 9ea0dbd1..fb941f8d 100644 --- a/src/main/java/com/glxp/api/service/alihealth/AlihealthBusService.java +++ b/src/main/java/com/glxp/api/service/alihealth/AlihealthBusService.java @@ -2,10 +2,7 @@ package com.glxp.api.service.alihealth; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.entity.alihealth.AliYljgBillDetail; -import com.glxp.api.entity.alihealth.AliYljgBillDetailDrug; -import com.glxp.api.entity.alihealth.AliYljgBillDetailDrugCode; import com.glxp.api.entity.alihealth.AliYljgSearchbill; -import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.req.alihealth.AliYljgSearchbillReqeust; import org.springframework.web.multipart.MultipartFile; diff --git a/src/main/java/com/glxp/api/service/alihealth/impl/AlihealthBusServiceImpl.java b/src/main/java/com/glxp/api/service/alihealth/impl/AlihealthBusServiceImpl.java index 8b7cc1e8..6fe420b8 100644 --- a/src/main/java/com/glxp/api/service/alihealth/impl/AlihealthBusServiceImpl.java +++ b/src/main/java/com/glxp/api/service/alihealth/impl/AlihealthBusServiceImpl.java @@ -4,13 +4,17 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; +import com.alibaba.excel.EasyExcel; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.dao.basic.CompanyProductRelevanceDao; -import com.glxp.api.entity.alihealth.*; +import com.glxp.api.entity.alihealth.AliYljgBillDetail; +import com.glxp.api.entity.alihealth.AliYljgSearchbill; +import com.glxp.api.entity.alihealth.YcFileCodeUploadVo; +import com.glxp.api.entity.alihealth.YcFileOrderUploadVo; import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.inout.IoCodeLostEntity; @@ -38,7 +42,6 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import com.alibaba.excel.EasyExcel; import javax.annotation.Resource; import java.io.IOException; diff --git a/src/main/java/com/glxp/api/service/auth/AuthAdminService.java b/src/main/java/com/glxp/api/service/auth/AuthAdminService.java index cbb25cd4..41198bff 100644 --- a/src/main/java/com/glxp/api/service/auth/AuthAdminService.java +++ b/src/main/java/com/glxp/api/service/auth/AuthAdminService.java @@ -2,11 +2,9 @@ package com.glxp.api.service.auth; import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.entity.auth.SysUserRole; import com.glxp.api.req.auth.FilterAuthUserRequest; import com.glxp.api.req.auth.FilterNoSelectUserRequest; import com.glxp.api.req.auth.UpdateUserRequset; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/auth/AuthCompanyService.java b/src/main/java/com/glxp/api/service/auth/AuthCompanyService.java index e9e77f96..4ca45e81 100644 --- a/src/main/java/com/glxp/api/service/auth/AuthCompanyService.java +++ b/src/main/java/com/glxp/api/service/auth/AuthCompanyService.java @@ -1,11 +1,9 @@ package com.glxp.api.service.auth; -import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.auth.AuthCompany; import com.glxp.api.dao.auth.AuthCompanyMapper; +import com.glxp.api.entity.auth.AuthCompany; +import org.springframework.stereotype.Service; @Service public class AuthCompanyService extends ServiceImpl { diff --git a/src/main/java/com/glxp/api/service/auth/AuthRoleAdminService.java b/src/main/java/com/glxp/api/service/auth/AuthRoleAdminService.java index 178a7a51..6712c1dd 100644 --- a/src/main/java/com/glxp/api/service/auth/AuthRoleAdminService.java +++ b/src/main/java/com/glxp/api/service/auth/AuthRoleAdminService.java @@ -1,7 +1,6 @@ package com.glxp.api.service.auth; -import com.glxp.api.entity.auth.AuthRole; import com.glxp.api.entity.auth.AuthRoleAdmin; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/auth/AuthRoleService.java b/src/main/java/com/glxp/api/service/auth/AuthRoleService.java index 04907af1..16873ebf 100644 --- a/src/main/java/com/glxp/api/service/auth/AuthRoleService.java +++ b/src/main/java/com/glxp/api/service/auth/AuthRoleService.java @@ -2,8 +2,6 @@ package com.glxp.api.service.auth; import com.glxp.api.entity.auth.AuthRole; -import com.glxp.api.entity.basic.BasicBussinessTypeRoleEntity; -import com.glxp.api.req.auth.AuthRoleQueryRequest; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/auth/DeptService.java b/src/main/java/com/glxp/api/service/auth/DeptService.java index 344313f5..28c59cff 100644 --- a/src/main/java/com/glxp/api/service/auth/DeptService.java +++ b/src/main/java/com/glxp/api/service/auth/DeptService.java @@ -3,7 +3,6 @@ package com.glxp.api.service.auth; import com.glxp.api.entity.auth.DeptEntity; import com.glxp.api.req.auth.FilterInvWarehouseRequest; -import org.apache.ibatis.annotations.Param; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/auth/DeptUserService.java b/src/main/java/com/glxp/api/service/auth/DeptUserService.java index 0a1a9313..056f1d0d 100644 --- a/src/main/java/com/glxp/api/service/auth/DeptUserService.java +++ b/src/main/java/com/glxp/api/service/auth/DeptUserService.java @@ -1,10 +1,8 @@ package com.glxp.api.service.auth; -import com.glxp.api.entity.auth.DeptEntity; import com.glxp.api.entity.auth.DeptUserEntity; import com.glxp.api.req.auth.FilterDeptUserReqeust; import com.glxp.api.res.auth.DeptUserResponse; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/auth/InvBusUserService.java b/src/main/java/com/glxp/api/service/auth/InvBusUserService.java index 8460681b..38823624 100644 --- a/src/main/java/com/glxp/api/service/auth/InvBusUserService.java +++ b/src/main/java/com/glxp/api/service/auth/InvBusUserService.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.auth.InvBusUserEntity; import com.glxp.api.entity.auth.WarehouseBussinessTypeEntity; import com.glxp.api.req.auth.FilterInvBusUserRequest; -import com.glxp.api.res.auth.InvBusUserResponse; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/auth/InvSpaceService.java b/src/main/java/com/glxp/api/service/auth/InvSpaceService.java index b7bf3077..1fcc01d5 100644 --- a/src/main/java/com/glxp/api/service/auth/InvSpaceService.java +++ b/src/main/java/com/glxp/api/service/auth/InvSpaceService.java @@ -1,6 +1,5 @@ package com.glxp.api.service.auth; -import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.entity.auth.InvSpace; import com.glxp.api.req.auth.FilterInvSpaceRequest; diff --git a/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java b/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java index b872649e..acadf20e 100644 --- a/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java +++ b/src/main/java/com/glxp/api/service/auth/InvWarehouseService.java @@ -1,6 +1,5 @@ package com.glxp.api.service.auth; -import com.glxp.api.entity.auth.DeptEntity; import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.req.auth.FilterInvSubWarehouseRequest; import com.glxp.api.req.auth.FilterInvWarehouseRequest; diff --git a/src/main/java/com/glxp/api/service/auth/WarehouseBussinessTypeService.java b/src/main/java/com/glxp/api/service/auth/WarehouseBussinessTypeService.java index ae263775..6ac921da 100644 --- a/src/main/java/com/glxp/api/service/auth/WarehouseBussinessTypeService.java +++ b/src/main/java/com/glxp/api/service/auth/WarehouseBussinessTypeService.java @@ -5,7 +5,6 @@ import com.glxp.api.entity.auth.WarehouseBussinessTypeEntity; import com.glxp.api.req.auth.FilterInvBusTypeRequest; import com.glxp.api.req.auth.FilterInvLinkDataRequest; import com.glxp.api.res.basic.BasicBussinessTypeResponse; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java b/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java index c43a385f..1d4c9784 100644 --- a/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java +++ b/src/main/java/com/glxp/api/service/auth/WarehouseUserService.java @@ -4,8 +4,6 @@ package com.glxp.api.service.auth; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.WarehouseUserEntity; import com.glxp.api.req.auth.FilterInvLinkDataRequest; -import com.glxp.api.req.auth.FilterInvUserRequest; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java index 68e6b469..b340744e 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java @@ -3,7 +3,7 @@ package com.glxp.api.service.auth.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ArrayUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; +import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.dao.auth.AuthAdminDao; import com.glxp.api.dao.auth.SysUserRoleMapper; import com.glxp.api.entity.auth.AuthAdmin; @@ -15,7 +15,6 @@ import com.glxp.api.req.auth.FilterNoSelectUserRequest; import com.glxp.api.req.auth.FilterUserRoleRequest; import com.glxp.api.req.auth.UpdateUserRequset; import com.glxp.api.service.auth.AuthAdminService; -import com.glxp.api.common.enums.ResultEnum; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/auth/impl/AuthCheckServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthCheckServiceImpl.java index 09a7c0ba..081481bc 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/AuthCheckServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthCheckServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.auth.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.AuthCheckDao; import com.glxp.api.entity.auth.AuthCheckEntity; import com.glxp.api.req.auth.FilterAuthCheckRequest; diff --git a/src/main/java/com/glxp/api/service/auth/impl/AuthRoleAdminServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthRoleAdminServiceImpl.java index e37f8771..1c78a9fe 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/AuthRoleAdminServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthRoleAdminServiceImpl.java @@ -1,14 +1,12 @@ package com.glxp.api.service.auth.impl; import com.glxp.api.dao.auth.AuthRoleAdminDao; -import com.glxp.api.entity.auth.AuthRole; import com.glxp.api.entity.auth.AuthRoleAdmin; import com.glxp.api.service.auth.AuthRoleAdminService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.Collections; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java index 6c62712f..6031ac2e 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java @@ -4,15 +4,11 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.AuthRoleDao; import com.glxp.api.dao.basic.BasicBussinessTypeRoleDao; import com.glxp.api.entity.auth.AuthRole; -import com.glxp.api.entity.basic.BasicBussinessTypeRoleEntity; -import com.glxp.api.req.auth.AuthRoleQueryRequest; import com.glxp.api.service.auth.AuthRoleService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Date; import java.util.List; @Service diff --git a/src/main/java/com/glxp/api/service/auth/impl/CustomerInfoServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/CustomerInfoServiceImpl.java index 750b6743..5db58d19 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/CustomerInfoServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/CustomerInfoServiceImpl.java @@ -1,8 +1,5 @@ package com.glxp.api.service.auth.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.CustomerInfoDao; import com.glxp.api.entity.auth.CustomerDetailEntity; import com.glxp.api.entity.auth.CustomerInfoEntity; diff --git a/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java index 7a951a2e..58b97b30 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/DeptServiceImpl.java @@ -2,7 +2,6 @@ package com.glxp.api.service.auth.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.DeptDao; import com.glxp.api.entity.auth.DeptEntity; import com.glxp.api.req.auth.FilterInvWarehouseRequest; diff --git a/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java index 12fc78fc..b69e5b01 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/DeptUserServiceImpl.java @@ -1,10 +1,8 @@ package com.glxp.api.service.auth.impl; import cn.hutool.core.collection.CollUtil; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.DeptDao; import com.glxp.api.dao.auth.DeptUserDao; -import com.glxp.api.entity.auth.DeptEntity; import com.glxp.api.entity.auth.DeptUserEntity; import com.glxp.api.req.auth.FilterDeptUserReqeust; import com.glxp.api.res.auth.DeptUserResponse; diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvBusUserServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvBusUserServiceImpl.java index df48dce3..14b9d415 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/InvBusUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/InvBusUserServiceImpl.java @@ -3,16 +3,13 @@ package com.glxp.api.service.auth.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.InvBusUserDao; import com.glxp.api.entity.auth.InvBusUserEntity; import com.glxp.api.entity.auth.WarehouseBussinessTypeEntity; import com.glxp.api.req.auth.FilterInvBusUserRequest; -import com.glxp.api.res.auth.InvBusUserResponse; import com.glxp.api.service.auth.InvBusUserService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.util.Collections; diff --git a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java index 971bd3b1..62fb3da0 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/InvWarehouseServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ReflectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.InvWarehouseDao; import com.glxp.api.dao.thrsys.ThrSystemDao; import com.glxp.api.entity.auth.InvWarehouseEntity; diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysCustomConfigServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysCustomConfigServiceImpl.java index f4258c01..72beae71 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/SysCustomConfigServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysCustomConfigServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.auth.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.SysCustomConfigDao; import com.glxp.api.entity.auth.SysCustomConfigEntity; import com.glxp.api.req.auth.SysCustomConfigRequest; diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java index 02c9cbf9..0d209fc1 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysDictDataServiceImpl.java @@ -1,7 +1,5 @@ package com.glxp.api.service.auth.impl; -import cn.hutool.core.collection.CollUtil; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.SysDictDataMapper; import com.glxp.api.entity.auth.SysDictData; import com.glxp.api.exception.ServiceException; diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java index cd90a0a8..43412e1d 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysDictTypeServiceImpl.java @@ -1,7 +1,6 @@ package com.glxp.api.service.auth.impl; import cn.hutool.core.collection.CollUtil; -import com.github.pagehelper.PageHelper; import com.glxp.api.constant.Constant; import com.glxp.api.dao.auth.SysDictDataMapper; import com.glxp.api.dao.auth.SysDictTypeMapper; @@ -12,7 +11,6 @@ import com.glxp.api.req.auth.SysDictDataRequest; import com.glxp.api.req.auth.SysDictTypeRequest; import com.glxp.api.service.auth.ISysDictTypeService; import lombok.RequiredArgsConstructor; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysPdaKeyServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysPdaKeyServiceImpl.java index a987e800..4950976e 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/SysPdaKeyServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysPdaKeyServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.auth.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.SysPdaKeyDao; import com.glxp.api.entity.system.SysPdaKeyEntity; import com.glxp.api.req.system.DeleteRequest; diff --git a/src/main/java/com/glxp/api/service/auth/impl/SysRoleServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/SysRoleServiceImpl.java index 743a1cc0..b2825bdb 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/SysRoleServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/SysRoleServiceImpl.java @@ -3,9 +3,6 @@ package com.glxp.api.service.auth.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.github.pagehelper.PageHelper; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.dao.auth.SysRoleMapper; import com.glxp.api.dao.auth.SysRoleMenuMapper; diff --git a/src/main/java/com/glxp/api/service/auth/impl/UserRegisterServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/UserRegisterServiceImpl.java index c46e3bdd..2665c12a 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/UserRegisterServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/UserRegisterServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.auth.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.UserRegisterDao; import com.glxp.api.entity.auth.UserRegisterEntity; import com.glxp.api.req.auth.UserResisterFilterRequest; diff --git a/src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java index 400ae6cf..9811b01f 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/WarehouseBussinessTypeServiceImpl.java @@ -3,7 +3,6 @@ package com.glxp.api.service.auth.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.WarehouseBussinessTypeDao; import com.glxp.api.entity.auth.WarehouseBussinessTypeEntity; import com.glxp.api.req.auth.FilterInvBusTypeRequest; diff --git a/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java index c374342e..5fc1b41d 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/WarehouseUserServiceImpl.java @@ -2,7 +2,6 @@ package com.glxp.api.service.auth.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.WarehouseUserDao; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.WarehouseUserEntity; diff --git a/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java b/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java index a20c637e..bbc66116 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicBackUpdateProductService.java @@ -1,29 +1,17 @@ package com.glxp.api.service.basic; -import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.constant.ConstantStatus; import com.glxp.api.dto.BasicProductsCreateDto; -import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity; -import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.entity.thrsys.ThrProductsEntity; -import com.glxp.api.entity.thrsys.ThrSystemEntity; -import com.glxp.api.httpClient.serviceClient.ErpBasicClient; import com.glxp.api.req.thrsys.FilterThrProductsRequest; -import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.thrsys.ThrProductsResponse; -import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.service.thrsys.ThrProductsService; -import com.glxp.api.service.thrsys.ThrSystemService; -import com.glxp.api.util.CustomUtil; -import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.RedisUtil; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.*; +import java.util.List; @Service public class BasicBackUpdateProductService { diff --git a/src/main/java/com/glxp/api/service/basic/BasicCorpService.java b/src/main/java/com/glxp/api/service/basic/BasicCorpService.java index ad552942..5d4eb74a 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicCorpService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicCorpService.java @@ -4,7 +4,6 @@ package com.glxp.api.service.basic; import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; -import com.glxp.api.res.thrsys.ThrCorpsResponse; import com.glxp.api.res.thrsys.ThrUnitMaintainResponse; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/basic/BasicGenExcelService.java b/src/main/java/com/glxp/api/service/basic/BasicGenExcelService.java index d006d95b..271ffef1 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicGenExcelService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicGenExcelService.java @@ -15,9 +15,6 @@ import com.glxp.api.req.basic.BasicCorpsExportRequest; import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; import com.glxp.api.res.basic.BasicCorpExportLogResponse; import com.glxp.api.res.basic.UdiRelevanceExportJsonResponse; -import com.glxp.api.service.basic.BasicCorpExportLogService; -import com.glxp.api.service.basic.BasicCorpService; -import com.glxp.api.service.basic.BasicProductsExportLogService; import com.glxp.api.service.sync.SyncDataSetService; import com.glxp.api.util.ExcelUtil; import org.springframework.beans.BeanUtils; diff --git a/src/main/java/com/glxp/api/service/basic/BasicGenJsonService.java b/src/main/java/com/glxp/api/service/basic/BasicGenJsonService.java index 9cb55e55..b6e3abce 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicGenJsonService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicGenJsonService.java @@ -24,10 +24,6 @@ import com.glxp.api.res.basic.BasicCorpExportLogResponse; import com.glxp.api.res.basic.UdiRelevanceExportJsonResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.thrsys.ThrCorpsResponse; -import com.glxp.api.service.basic.BasicCorpExportLogService; -import com.glxp.api.service.basic.BasicCorpService; -import com.glxp.api.service.basic.BasicProductsExportLogService; -import com.glxp.api.service.basic.UdiRelevanceService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; diff --git a/src/main/java/com/glxp/api/service/basic/BasicHospTypeService.java b/src/main/java/com/glxp/api/service/basic/BasicHospTypeService.java index 2455c9a4..c9d56d30 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicHospTypeService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicHospTypeService.java @@ -8,7 +8,6 @@ import com.glxp.api.req.basic.FilterUdiRelRequest; import com.glxp.api.res.basic.BasicHospTypeResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; - import java.util.List; public interface BasicHospTypeService extends IService { diff --git a/src/main/java/com/glxp/api/service/basic/BasicNewUploadDiService.java b/src/main/java/com/glxp/api/service/basic/BasicNewUploadDiService.java index c3bf3cfd..77205823 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicNewUploadDiService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicNewUploadDiService.java @@ -1,9 +1,6 @@ package com.glxp.api.service.basic; import com.glxp.api.entity.basic.BasicNewUploadDiEntity; -import com.glxp.api.req.basic.FilterBasicNewUploadDiRequest; - -import java.util.List; public interface BasicNewUploadDiService { diff --git a/src/main/java/com/glxp/api/service/basic/BasicUpdateProductService.java b/src/main/java/com/glxp/api/service/basic/BasicUpdateProductService.java index 19286e1a..1e3a03b0 100644 --- a/src/main/java/com/glxp/api/service/basic/BasicUpdateProductService.java +++ b/src/main/java/com/glxp/api/service/basic/BasicUpdateProductService.java @@ -10,8 +10,8 @@ import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.entity.thrsys.ThrSystemEntity; -import com.glxp.api.req.basic.UdiCombineRequest; import com.glxp.api.req.basic.FilterUdiRelRequest; +import com.glxp.api.req.basic.UdiCombineRequest; import com.glxp.api.req.thrsys.FilterThrProductsRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.thrsys.ThrProductsService; @@ -22,7 +22,6 @@ import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.HttpClient; import com.glxp.api.util.udi.FilterUdiUtils; import com.glxp.api.util.udi.UdiInfoUtil; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java b/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java index cb4282bb..96be0a6d 100644 --- a/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java +++ b/src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java @@ -3,12 +3,10 @@ package com.glxp.api.service.basic; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; -import com.glxp.api.entity.basic.UdiRlSupEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.req.basic.SupplementRequest; import com.glxp.api.req.basic.UdiInfoExportRequest; import com.glxp.api.req.basic.UdiInfoRequest; -import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java b/src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java index 1cb2d3a6..a5256d7a 100644 --- a/src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java +++ b/src/main/java/com/glxp/api/service/basic/IBasicBusTypeChangeService.java @@ -2,7 +2,6 @@ package com.glxp.api.service.basic; import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; -import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.req.basic.FilterBusTypeChangeRequest; import com.glxp.api.res.basic.BasicBusTypeChangeResponse; diff --git a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java index 0f581d42..0af8856f 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiContrastService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiContrastService.java @@ -21,8 +21,8 @@ import com.glxp.api.exception.JsonException; import com.glxp.api.httpClient.serviceClient.impl.NmpaUdiClientImpl; import com.glxp.api.req.alihealth.AlihealthKytDrugrescodeReqeust; import com.glxp.api.req.alihealth.local.AlihealthThirdAliDrugInsertReqeust; -import com.glxp.api.req.basic.UdiCombineRequest; import com.glxp.api.req.basic.FilterUdiRelRequest; +import com.glxp.api.req.basic.UdiCombineRequest; import com.glxp.api.req.basic.YbDrugDetailFilterRequest; import com.glxp.api.req.thrsys.FilterThrProductsRequest; import com.glxp.api.req.thrsys.ThirdAliDrugRequest; @@ -31,14 +31,13 @@ import com.glxp.api.req.thrsys.ThrInsMaterialFeeRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.service.auth.AuthAliUserService; -import com.glxp.api.service.auth.CustomerInfoService; -import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.thrsys.BasicInsMaterialService; -import com.glxp.api.service.thrsys.ThirdAliDrugService; import com.glxp.api.service.thrsys.ThrProductsService; import com.glxp.api.service.thrsys.YbDrugService; -import com.glxp.api.util.*; -import com.glxp.api.util.alihealth.AlihealthUtils; +import com.glxp.api.util.CustomUtil; +import com.glxp.api.util.DimaUtil; +import com.glxp.api.util.GennerOrderUtils; +import com.glxp.api.util.IntUtil; import com.glxp.api.util.alihealth.CopyUtils; import com.glxp.api.util.udi.UdiInfoUtil; import lombok.extern.slf4j.Slf4j; @@ -48,7 +47,9 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; /** * 耗材字典对照 diff --git a/src/main/java/com/glxp/api/service/basic/UdiProductService.java b/src/main/java/com/glxp/api/service/basic/UdiProductService.java index 9bafc57a..40d7a74a 100644 --- a/src/main/java/com/glxp/api/service/basic/UdiProductService.java +++ b/src/main/java/com/glxp/api/service/basic/UdiProductService.java @@ -9,7 +9,6 @@ import com.glxp.api.req.basic.UdiInfoRequest; import com.glxp.api.req.basic.UpdateLevelDrugRequest; import com.glxp.api.req.thrsys.ThirdAliDrugRequest; import com.glxp.api.res.DiLevelResponse; -import com.glxp.api.res.basic.UdiRelevanceResponse; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java index 16ad39a6..8b80a03e 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBusTypeChangeServiceImpl.java @@ -1,13 +1,10 @@ package com.glxp.api.service.basic.impl; -import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicBusTypeChangeDao; -import com.glxp.api.dao.basic.BasicBussinessTypeDao; import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; -import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.req.basic.FilterBusTypeChangeRequest; import com.glxp.api.res.basic.BasicBusTypeChangeResponse; import com.glxp.api.service.auth.CustomerService; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java index f0d75c5c..526aae8c 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java @@ -23,7 +23,6 @@ import javax.annotation.Resource; import java.util.Collections; import java.util.Date; import java.util.List; -import java.util.stream.Collectors; @Slf4j @Service diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpExportLogServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpExportLogServiceImpl.java index cd3defc5..928e704e 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpExportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpExportLogServiceImpl.java @@ -2,7 +2,6 @@ package com.glxp.api.service.basic.impl; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.StrUtil; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicCorpExportLogDao; import com.glxp.api.entity.basic.BasicCorpsExportLogEntity; import com.glxp.api.req.basic.FilterCorpExportLogRequest; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportLogServiceImpl.java index f3812235..f90c6bc5 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpImportLogServiceImpl.java @@ -1,9 +1,8 @@ package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; -import com.github.pagehelper.PageHelper; -import com.glxp.api.dao.basic.BasicCorpImportLogDao; import com.glxp.api.dao.basic.BasicCorpDao; +import com.glxp.api.dao.basic.BasicCorpImportLogDao; import com.glxp.api.dao.thrsys.ThrCorpDao; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.entity.basic.BasicCorpsImportLogEntity; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java index a5d6b2c0..d2294108 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java @@ -2,7 +2,6 @@ package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicCorpDao; import com.glxp.api.entity.basic.BasicCorpEntity; import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java index 54f58836..2705ec76 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicHospTypeServiceImpl.java @@ -4,11 +4,9 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicHospTypeDao; import com.glxp.api.dao.basic.UdiRelevanceDao; import com.glxp.api.entity.basic.BasicHospTypeEntity; -import com.glxp.api.entity.basic.BasicHospTypeRelEntity; import com.glxp.api.entity.basic.UdiRelevanceEntity; import com.glxp.api.req.basic.BasicHospTypeFilterRequest; import com.glxp.api.req.basic.BasicHospTypeRequest; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicNewUploadDiServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicNewUploadDiServiceImpl.java index 0a922929..02aa728c 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicNewUploadDiServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicNewUploadDiServiceImpl.java @@ -1,16 +1,12 @@ package com.glxp.api.service.basic.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicNewUploadDiDao; import com.glxp.api.entity.basic.BasicNewUploadDiEntity; -import com.glxp.api.req.basic.FilterBasicNewUploadDiRequest; import com.glxp.api.service.basic.BasicNewUploadDiService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.Collections; -import java.util.List; @Service @Transactional(rollbackFor = Exception.class) diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicProductSetServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicProductSetServiceImpl.java index 175590ad..6ee30e96 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicProductSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicProductSetServiceImpl.java @@ -1,7 +1,6 @@ package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicProductSetDao; import com.glxp.api.entity.basic.BasicProductSetEntity; import com.glxp.api.req.basic.FilterBasicProductSetrequest; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsExportLogServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsExportLogServiceImpl.java index 4daafe0e..a696cff7 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsExportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsExportLogServiceImpl.java @@ -2,7 +2,6 @@ package com.glxp.api.service.basic.impl; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.StrUtil; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicProductsExportLogDao; import com.glxp.api.entity.basic.BasicProductsExportLogEntity; import com.glxp.api.req.basic.FilterUdiEpLogRequest; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportDetailServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportDetailServiceImpl.java index 99b4f7a9..d478b09c 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportDetailServiceImpl.java @@ -1,13 +1,15 @@ package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicProductsImportDetailDao; import com.glxp.api.dao.basic.UdiProductDao; import com.glxp.api.dao.basic.UdiRelevanceDao; import com.glxp.api.dao.basic.UdiRlSupDao; import com.glxp.api.dao.thrsys.ThrProductsDao; -import com.glxp.api.entity.basic.*; +import com.glxp.api.entity.basic.BasicProductsImportDetailEntity; +import com.glxp.api.entity.basic.UdiProductEntity; +import com.glxp.api.entity.basic.UdiRelevanceEntity; +import com.glxp.api.entity.basic.UdiRlSupEntity; import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.req.basic.FilterUdiIpLogRequest; import com.glxp.api.res.basic.UdiRelevanceExportJsonResponse; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java index 04093779..610d24ef 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicProductsImportLogServiceImpl.java @@ -2,7 +2,6 @@ package com.glxp.api.service.basic.impl; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; -import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.ConstantStatus; diff --git a/src/main/java/com/glxp/api/service/basic/impl/BasicUnitMaintainServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/BasicUnitMaintainServiceImpl.java index cb07db71..f3bd93dd 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/BasicUnitMaintainServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/BasicUnitMaintainServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.basic.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicUnitMaintainDao; import com.glxp.api.entity.basic.BasicUnitMaintainEntity; import com.glxp.api.req.basic.BasicUnitMaintainFilterRequest; diff --git a/src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java index 5130e1ec..86772a6f 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/CompanyProductRelevanceServiceImpl.java @@ -5,9 +5,7 @@ import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.CompanyProductRelevanceDao; -import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; import com.glxp.api.req.basic.CompanyProductRelevanceRequest; import com.glxp.api.req.basic.CopyCustomerIdRequest; @@ -15,7 +13,6 @@ import com.glxp.api.res.basic.CompanyProductRelevanceResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.basic.CompanyProductRelevanceService; import org.springframework.beans.BeanUtils; -import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java index 7d43c495..981b12fb 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/EntrustReceServiceImpl.java @@ -2,7 +2,6 @@ package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.InvWarehouseDao; import com.glxp.api.dao.basic.EntrustReceDao; import com.glxp.api.entity.basic.DlEntrustReceEntity; diff --git a/src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java index ec3b8e1f..ad748adb 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/ProductInfoServiceImpl.java @@ -2,12 +2,10 @@ package com.glxp.api.service.basic.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.ProductInfoDao; import com.glxp.api.entity.basic.ProductInfoEntity; import com.glxp.api.req.basic.ProductInfoFilterRequest; import com.glxp.api.service.basic.ProductInfoService; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiCompanyServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiCompanyServiceImpl.java index 8014f4a5..72762c63 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiCompanyServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiCompanyServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.basic.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.UdiCompanyDao; import com.glxp.api.entity.basic.UdiCompanyEntity; import com.glxp.api.req.basic.UdiCompanyRequest; diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java index 8477b9ae..39adc085 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.ConstantStatus; @@ -21,7 +20,6 @@ import com.glxp.api.exception.JsonException; import com.glxp.api.req.basic.*; import com.glxp.api.req.thrsys.ThirdAliDrugRequest; import com.glxp.api.res.DiLevelResponse; -import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.basic.UdiContrastService; import com.glxp.api.service.basic.UdiProductService; diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java index fb1b1866..de93e2a8 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiRelevanceServiceImpl.java @@ -2,9 +2,7 @@ package com.glxp.api.service.basic.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.dao.basic.UdiRelevanceDao; import com.glxp.api.entity.basic.UdiEntity; diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java index a03f63ce..1e88ed01 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiRlSupServiceImpl.java @@ -1,7 +1,5 @@ package com.glxp.api.service.basic.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.UdiRlSupDao; import com.glxp.api.entity.basic.UdiRlSupEntity; import com.glxp.api.req.basic.CompanyProductRelevanceRequest; diff --git a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java index b91383b3..0e2d9898 100644 --- a/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java +++ b/src/main/java/com/glxp/api/service/collect/RelCodeBatchService.java @@ -12,13 +12,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.dao.auth.AuthCompanyMapper; import com.glxp.api.dao.collect.RelCodeBatchMapper; import com.glxp.api.dao.inout.IoCodeTempDao; import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.entity.auth.AuthCompany; import com.glxp.api.entity.auth.CustomerInfoEntity; import com.glxp.api.entity.basic.ProductInfoEntity; import com.glxp.api.entity.basic.UdiEntity; @@ -27,12 +24,9 @@ import com.glxp.api.entity.collect.RelCodeBatch; import com.glxp.api.entity.collect.RelCodeDetail; import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.entity.sync.SyncDataSetEntity; -import com.glxp.api.entity.system.CompanyEntity; import com.glxp.api.exception.JsonException; -import com.glxp.api.req.alihealth.AlihealthYljgCodedetailReqeust; import com.glxp.api.req.alihealth.AlihealthYljgSinglerelationReqeust; import com.glxp.api.req.alihealth.local.AlihealthRelCodeInsertReqeust; -import com.glxp.api.req.alihealth.local.AlihealthYljgLocaCodedetailReqeust; import com.glxp.api.req.collect.RelCodeBatchRequest; import com.glxp.api.req.collect.RelCodeDetailRequest; import com.glxp.api.res.alihealth.AlihealthKytSinglerelationResponse; @@ -44,12 +38,9 @@ import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.basic.ProductInfoService; import com.glxp.api.service.basic.UdiProductService; import com.glxp.api.service.sync.SyncDataSetService; -import com.glxp.api.service.system.CompanyService; import com.glxp.api.util.HttpClient; -import com.glxp.api.util.StringUtils; import com.glxp.api.util.alihealth.AlihealthUtils; import com.glxp.api.util.alihealth.AlihealthYljgUtils; -import com.glxp.api.util.redis.RedisDelayedQueue; import com.glxp.api.util.udi.FilterUdiUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; diff --git a/src/main/java/com/glxp/api/service/collect/RelCodeDetailService.java b/src/main/java/com/glxp/api/service/collect/RelCodeDetailService.java index 90d0308b..1d44b076 100644 --- a/src/main/java/com/glxp/api/service/collect/RelCodeDetailService.java +++ b/src/main/java/com/glxp/api/service/collect/RelCodeDetailService.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.basic.BasicProductsDao; import com.glxp.api.dao.collect.RelCodeDetailMapper; import com.glxp.api.entity.basic.BasicProductsEntity; diff --git a/src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java index 4d632ff6..ebfcbcef 100644 --- a/src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceInfoServiceImpl.java @@ -2,7 +2,6 @@ package com.glxp.api.service.dev.impl; import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; diff --git a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java index b50fcbfa..79fa4df6 100644 --- a/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoAddInoutService.java @@ -13,18 +13,15 @@ import com.glxp.api.constant.ConstantStatus; import com.glxp.api.dao.inout.IoOrderDetailCodeDao; import com.glxp.api.entity.basic.*; import com.glxp.api.entity.inout.*; -import com.glxp.api.service.inout.impl.IoCodeTempService; -import com.glxp.api.vo.basic.InvProductNewVo; import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.exception.JsonException; import com.glxp.api.req.basic.FilterCompanyProductRelevanceRequest; -import com.glxp.api.entity.inout.PdaCodeEntity; import com.glxp.api.req.inout.PostOrderRequest; import com.glxp.api.req.udims.PostUdimsOrderRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.service.basic.*; import com.glxp.api.service.inout.impl.IoCodeService; -import com.glxp.api.service.inv.impl.InvProductServiceNew; +import com.glxp.api.service.inout.impl.IoCodeTempService; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.DateUtil; diff --git a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java index 0d71e396..6803d5bd 100644 --- a/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoChangeInoutService.java @@ -6,7 +6,6 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; -import com.glxp.api.constant.ConstantType; import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.basic.BasicBusTypePreEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; @@ -18,12 +17,10 @@ import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inout.impl.IoCodeTempService; import com.glxp.api.service.inout.impl.IoOrderInvoiceService; import com.glxp.api.service.inv.impl.InvProductServiceNew; -import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.DateUtil; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; -import com.glxp.api.vo.basic.InvProductNewVo; import org.springframework.beans.BeanUtils; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index a092fb25..14c9103b 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -1,12 +1,8 @@ package com.glxp.api.service.inout; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.lang.UUID; -import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; -import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; @@ -16,12 +12,7 @@ import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.inout.*; -import com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity; -import com.glxp.api.entity.inv.InvPreinDetailEntity; import com.glxp.api.entity.system.SystemParamConfigEntity; -import com.glxp.api.exception.JsonException; -import com.glxp.api.exception.ServiceException; -import com.glxp.api.res.inout.IoCodeResponse; import com.glxp.api.res.inout.IoOrderCheckResultResponse; import com.glxp.api.res.inout.IoOrderDetailBizResponse; import com.glxp.api.res.inout.IoOrderDetailCodeResponse; @@ -30,17 +21,15 @@ import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.basic.UdiProductService; import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inout.impl.IoCodeTempService; -import com.glxp.api.service.inout.impl.IoOrderInvoiceService; -import com.glxp.api.service.inv.InvPreinDetailService; -import com.glxp.api.service.inv.InvPreinOrderService; import com.glxp.api.service.inv.InvPreinProductDetailService; import com.glxp.api.service.system.SystemParamConfigService; -import com.glxp.api.util.*; +import com.glxp.api.util.CustomUtil; +import com.glxp.api.util.GennerOrderUtils; +import com.glxp.api.util.IntUtil; +import com.glxp.api.util.OrderNoTypeBean; import com.glxp.api.util.udi.FilterUdiUtils; import com.glxp.api.util.udi.UdiCalCountUtil; import lombok.RequiredArgsConstructor; -import net.sf.jasperreports.engine.JRException; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.context.annotation.Lazy; import org.springframework.scheduling.annotation.Async; @@ -48,8 +37,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.io.IOException; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; import static com.glxp.api.constant.ConstantStatus.ORDER_STATUS_CHECK_PROCESS; diff --git a/src/main/java/com/glxp/api/service/inout/IoGenInvService.java b/src/main/java/com/glxp/api/service/inout/IoGenInvService.java index 566080ec..cdb85c30 100644 --- a/src/main/java/com/glxp/api/service/inout/IoGenInvService.java +++ b/src/main/java/com/glxp/api/service/inout/IoGenInvService.java @@ -12,13 +12,13 @@ import com.glxp.api.service.basic.IBasicBusTypePreService; import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.inout.impl.IoCodeService; import com.glxp.api.service.inv.*; -import com.glxp.api.service.inv.impl.InvProductServiceNew; -import com.glxp.api.vo.basic.InvProductNewVo; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; @Service diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java index 8f80eabd..dfced72c 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java @@ -6,7 +6,6 @@ import com.glxp.api.req.inout.AddBizProductReqeust; import com.glxp.api.req.inout.FilterOrderDetailBizRequest; import com.glxp.api.req.inout.FilterOrderDetailCodeRequest; import com.glxp.api.res.inout.IoOrderDetailBizResponse; -import com.glxp.api.res.inout.IoOrderDetailCodeResponse; import com.glxp.api.res.inout.IoOrderDetailResultResponse; import com.glxp.api.res.inout.IoOrderInvoiceResponse; diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java index 08f4df78..4b032c2b 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailCodeService.java @@ -1,11 +1,9 @@ package com.glxp.api.service.inout; -import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; import com.glxp.api.req.inout.FilterOrderDetailCodeRequest; import com.glxp.api.res.inout.IoOrderDetailCodeResponse; -import java.math.BigDecimal; import java.util.List; public interface IoOrderDetailCodeService { diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java b/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java index 9f6affdf..a9040a30 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java @@ -1,6 +1,5 @@ package com.glxp.api.service.inout; -import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; import com.glxp.api.entity.inout.IoOrderDetailResultEntity; import com.glxp.api.req.inout.CptTraceRequest; import com.glxp.api.req.inout.FilterOrderDetailResultRequest; diff --git a/src/main/java/com/glxp/api/service/inout/ReceivedetailService.java b/src/main/java/com/glxp/api/service/inout/ReceivedetailService.java index 15e4c842..c8a01e8f 100644 --- a/src/main/java/com/glxp/api/service/inout/ReceivedetailService.java +++ b/src/main/java/com/glxp/api/service/inout/ReceivedetailService.java @@ -2,10 +2,8 @@ package com.glxp.api.service.inout; import com.glxp.api.entity.inout.PurReceiveDetailEntity; import com.glxp.api.req.inout.FilterReceiveDetailRequest; -import com.glxp.api.req.inout.FilterReceiveRequest; import com.glxp.api.req.inout.UpdateReceiveDetailRequest; import com.glxp.api.res.inout.ReceiveDetailResponse; -import com.glxp.api.res.inout.ReceiveResponse; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java index 80250132..1299b720 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java @@ -3,21 +3,18 @@ package com.glxp.api.service.inout.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.inout.IoCodeLostMapper; +import com.glxp.api.entity.inout.IoCodeLostEntity; import com.glxp.api.req.inout.IoCodeLostRequest; import com.glxp.api.res.collect.RelCodeDetailResponse; import com.glxp.api.res.inout.IoCodeLostResponse; import com.glxp.api.service.collect.RelCodeDetailService; +import com.glxp.api.service.inout.IoCodeLostService; import com.glxp.api.util.MsDateUtil; import org.springframework.stereotype.Service; - -import javax.annotation.Resource; - -import com.glxp.api.dao.inout.IoCodeLostMapper; -import com.glxp.api.entity.inout.IoCodeLostEntity; -import com.glxp.api.service.inout.IoCodeLostService; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.util.Collections; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeRelServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeRelServiceImpl.java index edeb11ff..fa39d8cc 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeRelServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeRelServiceImpl.java @@ -3,7 +3,6 @@ package com.glxp.api.service.inout.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inout.IoCodeRelMapper; import com.glxp.api.entity.inout.IoCodeRelEntity; import com.glxp.api.req.inout.IoOrderRelRequest; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeService.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeService.java index a1d2c436..861118a7 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeService.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeService.java @@ -16,7 +16,6 @@ import com.glxp.api.entity.alihealth.YcFileCodeUploadVo; import com.glxp.api.entity.inout.IoCodeEntity; import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.req.inout.FilterCodeRequest; -import com.glxp.api.req.inout.YcFileCodeUploadRequest; import com.glxp.api.res.inout.IoCodeResponse; import com.glxp.api.res.inout.IoCodeTempResponse; import org.springframework.stereotype.Service; @@ -26,7 +25,6 @@ import javax.annotation.Resource; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Map; @Service @Transactional(rollbackFor = Exception.class) diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempService.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempService.java index 4c3ab219..461850b0 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempService.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempService.java @@ -1,7 +1,6 @@ package com.glxp.api.service.inout.impl; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -16,20 +15,20 @@ import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.auth.AuthCompanyMapper; import com.glxp.api.dao.inout.IoCodeDao; import com.glxp.api.dao.inout.IoCodeTempDao; -import com.glxp.api.dao.inout.IoOrderDetailBizDao; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.AuthCompany; import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiProductEntity; -import com.glxp.api.entity.collect.RelCodeBatch; import com.glxp.api.entity.collect.RelCodeDetail; -import com.glxp.api.entity.inout.*; +import com.glxp.api.entity.inout.IoCodeEntity; +import com.glxp.api.entity.inout.IoCodeLostEntity; +import com.glxp.api.entity.inout.IoCodeTempEntity; +import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.purchase.SupCertEntity; import com.glxp.api.entity.purchase.SupProductEntity; import com.glxp.api.req.alihealth.AlihealthYljgCodedetailReqeust; -import com.glxp.api.req.alihealth.local.AlihealthYljgLocaCodedetailReqeust; import com.glxp.api.req.basic.CompanyProductRelevanceRequest; import com.glxp.api.req.inout.AddOrderRequest; import com.glxp.api.req.inout.FilterCodeRequest; @@ -39,16 +38,16 @@ import com.glxp.api.res.inout.AddCodeResult; import com.glxp.api.res.inout.IoCodeTempResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.InvWarehouseService; -import com.glxp.api.service.basic.*; +import com.glxp.api.service.basic.IBasicBussinessTypeService; +import com.glxp.api.service.basic.UdiProductService; +import com.glxp.api.service.basic.UdiRelevanceService; +import com.glxp.api.service.basic.UdiRlSupService; import com.glxp.api.service.collect.RelCodeBatchService; import com.glxp.api.service.collect.RelCodeDetailService; import com.glxp.api.service.inout.*; -import com.glxp.api.service.inv.InvPreProductDetailService; -import com.glxp.api.service.inv.InvPreinProductDetailService; import com.glxp.api.service.inv.impl.InvProductServiceNew; import com.glxp.api.service.purchase.SupCertService; import com.glxp.api.service.purchase.SupProductService; -import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.*; import com.glxp.api.util.alihealth.AlihealthYljgUtils; import com.glxp.api.util.page.PageQuery; @@ -62,7 +61,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Locale; @Service @Transactional(rollbackFor = Exception.class) diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java index 2855d45d..c81167c1 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java @@ -10,8 +10,6 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.dao.inout.IoOrderDetailBizDao; -import com.glxp.api.dao.inout.IoOrderDetailCodeDao; -import com.glxp.api.dao.inout.IoOrderInvoiceMapper; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.InvWarehouseEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; @@ -22,20 +20,16 @@ import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.inout.IoOrderInvoiceEntity; import com.glxp.api.entity.purchase.SupCertEntity; import com.glxp.api.entity.purchase.SupProductEntity; -import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.req.inout.AddBizProductReqeust; import com.glxp.api.req.inout.FilterOrderDetailBizRequest; import com.glxp.api.req.inout.FilterOrderDetailCodeRequest; -import com.glxp.api.req.inout.IoOrderInvoiceRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.inout.IoOrderDetailBizResponse; -import com.glxp.api.res.inout.IoOrderDetailCodeResponse; import com.glxp.api.res.inout.IoOrderDetailResultResponse; import com.glxp.api.res.inout.IoOrderInvoiceResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.auth.InvWarehouseService; import com.glxp.api.service.basic.IBasicBussinessTypeService; -import com.glxp.api.service.basic.UdiContrastService; import com.glxp.api.service.basic.UdiProductService; import com.glxp.api.service.basic.UdiRelevanceService; import com.glxp.api.service.inout.IoCheckInoutService; @@ -44,7 +38,6 @@ import com.glxp.api.service.inout.IoOrderDetailCodeService; import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.service.purchase.SupCertService; import com.glxp.api.service.purchase.SupProductService; -import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.DateUtil; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.IntUtil; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java index 0b563046..718040f8 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inout.IoOrderDetailResultDao; -import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; import com.glxp.api.entity.inout.IoOrderDetailResultEntity; import com.glxp.api.req.inout.CptTraceRequest; import com.glxp.api.req.inout.FilterOrderDetailResultRequest; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceService.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceService.java index e682c94a..5a5d2e7f 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceService.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderInvoiceService.java @@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inout.IoOrderDetailCodeDao; import com.glxp.api.dao.inout.IoOrderInvoiceMapper; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; @@ -13,10 +12,7 @@ import com.glxp.api.entity.inout.IoOrderInvoiceEntity; import com.glxp.api.req.inout.IoOrderInvoiceRequest; import com.glxp.api.res.inout.IoOrderInvoiceResponse; import com.glxp.api.res.inout.IoOrderResponse; -import org.apache.regexp.RE; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; - import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index 3d2e04e4..ed52017f 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -38,7 +38,10 @@ import com.glxp.api.req.thrsys.UdiwmsOrderRequest; import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.res.inout.OrderNoResult; import com.glxp.api.service.basic.IBasicBussinessTypeService; -import com.glxp.api.service.inout.*; +import com.glxp.api.service.inout.IoOrderDetailBizService; +import com.glxp.api.service.inout.IoOrderDetailCodeService; +import com.glxp.api.service.inout.IoOrderDetailResultService; +import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.service.inv.*; import com.glxp.api.service.inv.impl.InvProductServiceNew; import com.glxp.api.service.system.SyncUploadDataBustypeService; diff --git a/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java index c7823280..99196ab8 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/ReceiveDetailServiceImpl.java @@ -8,7 +8,6 @@ import com.glxp.api.req.inout.FilterReceiveDetailRequest; import com.glxp.api.req.inout.UpdateReceiveDetailRequest; import com.glxp.api.res.inout.ReceiveDetailResponse; import com.glxp.api.service.inout.ReceivedetailService; -import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/inv/DeviceReceiveOrderDetailService.java b/src/main/java/com/glxp/api/service/inv/DeviceReceiveOrderDetailService.java index 745fb871..b15685df 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceReceiveOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/DeviceReceiveOrderDetailService.java @@ -2,10 +2,8 @@ package com.glxp.api.service.inv; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.entity.inv.DeviceReceiveOrderDetailEntity; -import com.glxp.api.req.inv.AddDeviceReceiveOrderDetailRequest; import com.glxp.api.req.inv.FilterDeviceReceiveOrderDetailRequest; import com.glxp.api.res.inv.DeviceReceiveOrderDetailResponse; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/inv/DeviceReceiveOrderService.java b/src/main/java/com/glxp/api/service/inv/DeviceReceiveOrderService.java index 650c88db..710e3ede 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceReceiveOrderService.java +++ b/src/main/java/com/glxp/api/service/inv/DeviceReceiveOrderService.java @@ -4,7 +4,6 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.entity.inv.DeviceReceiveOrderEntity; import com.glxp.api.req.inv.FilterDeviceReceiveOrderRequest; import com.glxp.api.res.inv.DeviceReceiveOrderResponse; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/inv/InvInnerOrderPrintService.java b/src/main/java/com/glxp/api/service/inv/InvInnerOrderPrintService.java index 51ff2bb5..9fd0039f 100644 --- a/src/main/java/com/glxp/api/service/inv/InvInnerOrderPrintService.java +++ b/src/main/java/com/glxp/api/service/inv/InvInnerOrderPrintService.java @@ -6,7 +6,6 @@ import com.glxp.api.req.inv.InnerOrderQRCodeTextPDFTemplateRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.inv.InnerOrderPrintResponse; - import java.util.List; public interface InvInnerOrderPrintService { diff --git a/src/main/java/com/glxp/api/service/inv/InvMAOrderDetailService.java b/src/main/java/com/glxp/api/service/inv/InvMAOrderDetailService.java index b55ef30b..4429845a 100644 --- a/src/main/java/com/glxp/api/service/inv/InvMAOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/InvMAOrderDetailService.java @@ -2,7 +2,6 @@ package com.glxp.api.service.inv; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.entity.inv.InvMAOrderDetailEntity; -import com.glxp.api.req.inv.AddInvMAOrderDetailRequest; import com.glxp.api.req.inv.FilterInvMAOrderDetailRequest; import com.glxp.api.res.inv.InvMAOrderDetailResponse; diff --git a/src/main/java/com/glxp/api/service/inv/InvPreinDetailService.java b/src/main/java/com/glxp/api/service/inv/InvPreinDetailService.java index 0e50312f..f25073e6 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPreinDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPreinDetailService.java @@ -1,14 +1,8 @@ package com.glxp.api.service.inv; -import com.glxp.api.entity.inv.InvPreProductDetailEntity; import com.glxp.api.entity.inv.InvPreinDetailEntity; -import com.glxp.api.req.inv.FilterInvPreProductDetailRequest; import com.glxp.api.req.inv.FilterInvPreinDetailRequest; -import com.glxp.api.req.inv.FilterInvPreinProductRequest; -import com.glxp.api.req.inv.FilterInvPreinRequest; -import com.glxp.api.res.inv.InvPreProductDetailResponse; import com.glxp.api.res.inv.InvPreinDetailResponse; -import com.glxp.api.res.inv.InvPreinOrderResponse; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/inv/InvPreinOrderService.java b/src/main/java/com/glxp/api/service/inv/InvPreinOrderService.java index 5c955e71..6825cf3a 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPreinOrderService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPreinOrderService.java @@ -1,9 +1,7 @@ package com.glxp.api.service.inv; import com.glxp.api.entity.inv.InvPreinOrderEntity; -import com.glxp.api.req.inout.FilterOrderRequest; import com.glxp.api.req.inv.FilterInvPreinRequest; -import com.glxp.api.res.inout.IoOrderResponse; import com.glxp.api.res.inv.InvPreinOrderResponse; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/inv/InvPreinProductDetailService.java b/src/main/java/com/glxp/api/service/inv/InvPreinProductDetailService.java index a7953c9d..5c10c879 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPreinProductDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPreinProductDetailService.java @@ -1,10 +1,7 @@ package com.glxp.api.service.inv; import com.glxp.api.entity.inv.InvPreInProductDetailEntity; -import com.glxp.api.entity.inv.InvPreProductDetailEntity; -import com.glxp.api.entity.inv.InvPreinDetailEntity; import com.glxp.api.req.inv.FilterInvPreProductDetailRequest; -import com.glxp.api.req.inv.FilterInvProductDetailRequest; import com.glxp.api.res.inv.InvPreProductDetailResponse; import java.math.BigDecimal; diff --git a/src/main/java/com/glxp/api/service/inv/InvPreinProductService.java b/src/main/java/com/glxp/api/service/inv/InvPreinProductService.java index 37da0799..eabacbda 100644 --- a/src/main/java/com/glxp/api/service/inv/InvPreinProductService.java +++ b/src/main/java/com/glxp/api/service/inv/InvPreinProductService.java @@ -1,7 +1,6 @@ package com.glxp.api.service.inv; import com.glxp.api.entity.inv.InvPreinProductEntity; -import com.glxp.api.req.inv.FilterInvPreinDetailRequest; import com.glxp.api.req.inv.FilterInvPreinProductRequest; import com.glxp.api.res.inv.InvPreinProductResponse; diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java index c4058758..9a8be5ce 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java @@ -7,27 +7,23 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.inv.DeviceReceiveOrderDetailDao; -import com.glxp.api.dao.inv.InvProductDao; import com.glxp.api.dao.inv.InvProductNewDao; import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.inv.DeviceReceiveOrderDetailEntity; -import com.glxp.api.vo.basic.InvProductNewVo; -import com.glxp.api.entity.inv.InvProductEntity; -import com.glxp.api.req.inv.AddDeviceReceiveOrderDetailRequest; import com.glxp.api.req.inv.FilterDeviceReceiveOrderDetailRequest; import com.glxp.api.req.inv.FilterInvProductDetailRequest; import com.glxp.api.res.inv.DeviceReceiveOrderDetailResponse; import com.glxp.api.service.inv.DeviceReceiveOrderDetailService; import com.glxp.api.util.udi.FilterUdiUtils; +import com.glxp.api.vo.basic.InvProductNewVo; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.*; -import java.util.stream.Collectors; +import java.util.Collections; +import java.util.List; @Slf4j @Service diff --git a/src/main/java/com/glxp/api/service/inv/impl/InnerOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InnerOrderDetailServiceImpl.java index 5fe328b3..d57a6aeb 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InnerOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InnerOrderDetailServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.inv.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inv.InnerOrderDetailDao; import com.glxp.api.entity.inv.InnerOrderDetailEntity; import com.glxp.api.req.inv.InnerOrderDetailRequest; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InnerOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InnerOrderServiceImpl.java index 84c294c6..08f6dd4c 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InnerOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InnerOrderServiceImpl.java @@ -1,7 +1,6 @@ package com.glxp.api.service.inv.impl; import cn.hutool.core.util.StrUtil; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inv.InnerOrderDao; import com.glxp.api.entity.inv.InnerOrderEntity; import com.glxp.api.req.inv.InnerOrderRequest; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvCountCodesServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvCountCodesServiceImpl.java index c9b9c48f..2c874c7a 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvCountCodesServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvCountCodesServiceImpl.java @@ -6,7 +6,6 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.dao.basic.UdiRelevanceDao; import com.glxp.api.dao.inv.InvCountCodesDao; import com.glxp.api.dao.inv.InvCountOrderDetailDao; import com.glxp.api.entity.basic.UdiEntity; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java index 5d2e4087..5a7a60e5 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvCountOrderServiceImpl.java @@ -2,7 +2,6 @@ package com.glxp.api.service.inv.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; @@ -14,9 +13,7 @@ import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.basic.BasicBusTypeChangeDao; import com.glxp.api.dao.basic.BasicBussinessTypeDao; -import com.glxp.api.dao.basic.BasicCorpDao; import com.glxp.api.dao.basic.UdiRlSupDao; -import com.glxp.api.dao.inout.IoCodeDao; import com.glxp.api.dao.inout.IoCodeTempDao; import com.glxp.api.dao.inout.IoOrderDao; import com.glxp.api.dao.inv.InvCountCodesDao; @@ -26,23 +23,20 @@ import com.glxp.api.dao.inv.InvProductNewDao; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; -import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.inv.InvCountCodesEntity; import com.glxp.api.entity.inv.InvCountOrderDetailEntity; import com.glxp.api.entity.inv.InvCountOrderEntity; -import com.glxp.api.vo.basic.InvProductNewVo; -import com.glxp.api.req.inv.*; +import com.glxp.api.req.inv.AddInvCountOrderSaveRequest; +import com.glxp.api.req.inv.FilterInvCountOrderRequest; import com.glxp.api.res.inv.InvCountOrderResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.inv.InvCountCodesService; import com.glxp.api.service.inv.InvCountOrderService; import com.glxp.api.util.CustomUtil; -import com.glxp.api.util.DateUtil; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; -import com.glxp.api.util.udi.FilterUdiUtils; import com.glxp.api.util.udi.UdiCalCountUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -53,7 +47,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Date; import java.util.List; -import java.util.stream.Collectors; @Slf4j @Service diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPdfTempServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPdfTempServiceImpl.java index e1b428e6..3021b298 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPdfTempServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPdfTempServiceImpl.java @@ -1,12 +1,10 @@ package com.glxp.api.service.inv.impl; -import cn.hutool.core.thread.ThreadUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.glxp.api.dao.inv.InvInnerOrderPdfTempDao; import com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity; import com.glxp.api.req.inv.DeleteStPrintTempRequest; -import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.service.inv.InvInnerOrderPdfTempService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java index 193bb928..620dd055 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java @@ -1,7 +1,6 @@ package com.glxp.api.service.inv.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.dao.basic.UdiRelevanceDao; @@ -13,10 +12,12 @@ import com.glxp.api.entity.inv.InnerOrderDetailEntity; import com.glxp.api.entity.inv.InvInnerOrderPdfTempEntity; import com.glxp.api.entity.inv.InvInnerOrderPrintEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; -import com.glxp.api.entity.system.SystemPDFModuleEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.req.basic.FilterUdiRelRequest; -import com.glxp.api.req.inv.*; +import com.glxp.api.req.inv.DeleteStPrintTempRequest; +import com.glxp.api.req.inv.FilterinnerOrderprintRequest; +import com.glxp.api.req.inv.InnerOrderQRCodeTextPDFTemplateRequest; +import com.glxp.api.req.inv.PdfPrintCountEntity; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.basic.UdiRelevanceResponse; import com.glxp.api.res.inv.InnerOrderPrintResponse; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java index ec34a7e6..2a5031cb 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java @@ -7,11 +7,12 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.inv.*; import com.glxp.api.entity.basic.UdiEntity; -import com.glxp.api.entity.inv.*; -import com.glxp.api.req.inv.AddInvMAOrderDetailRequest; +import com.glxp.api.entity.inv.InvMAExplanationEntity; +import com.glxp.api.entity.inv.InvMAOrderDetailEntity; +import com.glxp.api.entity.inv.InvMAOrderEntity; +import com.glxp.api.entity.inv.InvProductEntity; import com.glxp.api.req.inv.FilterInvMAOrderDetailRequest; import com.glxp.api.req.inv.FilterInvProductDetailRequest; import com.glxp.api.res.inv.InvMAOrderDetailResponse; @@ -23,8 +24,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.*; -import java.util.stream.Collectors; +import java.util.Collections; +import java.util.Date; +import java.util.List; @Slf4j @Service diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java index acba6247..b595e798 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java @@ -10,11 +10,11 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.dao.auth.InvSpaceDao; import com.glxp.api.dao.auth.InvWarehouseDao; import com.glxp.api.dao.inv.InvProductNewDao; -import com.glxp.api.vo.basic.InvProductNewVo; import com.glxp.api.req.inv.FilterInvPlaceRequest; import com.glxp.api.res.inv.BindInvSpaceRequest; import com.glxp.api.res.inv.InvPlaceDetailResponse; import com.glxp.api.service.inv.InvPlaceService; +import com.glxp.api.vo.basic.InvProductNewVo; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java index 8852ca81..77c576da 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreInProductDetailServiceImpl.java @@ -1,7 +1,6 @@ package com.glxp.api.service.inv.impl; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.date.DateTime; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; @@ -11,15 +10,11 @@ import com.glxp.api.dao.basic.BasicBussinessTypeDao; import com.glxp.api.dao.basic.UdiProductDao; import com.glxp.api.dao.inout.IoOrderDao; import com.glxp.api.dao.inv.InvPreInProductDetailDao; -import com.glxp.api.dao.inv.InvPreProductDetailDao; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.inout.IoOrderEntity; import com.glxp.api.entity.inv.InvPreInProductDetailEntity; -import com.glxp.api.entity.inv.InvPreinDetailEntity; import com.glxp.api.req.inv.FilterInvPreProductDetailRequest; -import com.glxp.api.req.inv.FilterInvProductDetailRequest; import com.glxp.api.res.inv.InvPreProductDetailResponse; -import com.glxp.api.service.inv.InvPreProductDetailService; import com.glxp.api.service.inv.InvPreinProductDetailService; import com.glxp.api.util.DateUtil; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreProductServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreProductServiceImpl.java index 9a7b47bb..10eb5791 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreProductServiceImpl.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.inv.InvPreProductDao; import com.glxp.api.entity.inv.InvPreProductEntity; -import com.glxp.api.entity.inv.InvProductEntity; import com.glxp.api.req.inv.FilterInvPreProductRequest; import com.glxp.api.res.inv.InvPreProductResponse; import com.glxp.api.service.inv.InvPreProductService; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvPreinDetailServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/InvPreinDetailServiceImpl.java index 36130693..1d01a31d 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvPreinDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvPreinDetailServiceImpl.java @@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.constant.ConstantStatus; -import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.inv.InvPreinDetailDao; import com.glxp.api.entity.inv.InvPreinDetailEntity; import com.glxp.api.req.inv.FilterInvPreinDetailRequest; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceNew.java b/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceNew.java index f4493981..459be50f 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceNew.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvProductServiceNew.java @@ -9,18 +9,11 @@ import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.basic.BasicBussinessTypeDao; import com.glxp.api.dao.basic.UdiProductDao; import com.glxp.api.dao.inout.IoOrderDao; -import com.glxp.api.dao.inout.IoOrderDetailBizDao; -import com.glxp.api.dao.inv.InvPreInProductDetailDao; -import com.glxp.api.dao.inv.InvPreProductDetailDao; -import com.glxp.api.dao.inv.InvProductDao; import com.glxp.api.dao.inv.InvProductNewDao; import com.glxp.api.entity.auth.InvSpace; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; -import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.inout.IoOrderEntity; -import com.glxp.api.entity.inv.InvProductEntity; import com.glxp.api.req.inv.FilterInvProductDetailRequest; -import com.glxp.api.res.inv.InvPlaceDetailResponse; import com.glxp.api.res.inv.InvProductDetailResponse; import com.glxp.api.service.auth.InvSpaceService; import com.glxp.api.util.IntUtil; diff --git a/src/main/java/com/glxp/api/service/monitor/impl/SysLogininforServiceImpl.java b/src/main/java/com/glxp/api/service/monitor/impl/SysLogininforServiceImpl.java index 29a11f32..3b13be60 100644 --- a/src/main/java/com/glxp/api/service/monitor/impl/SysLogininforServiceImpl.java +++ b/src/main/java/com/glxp/api/service/monitor/impl/SysLogininforServiceImpl.java @@ -2,7 +2,6 @@ package com.glxp.api.service.monitor.impl; import cn.hutool.http.useragent.UserAgent; import cn.hutool.http.useragent.UserAgentUtil; -import com.github.pagehelper.PageHelper; import com.glxp.api.constant.Constant; import com.glxp.api.dao.monitor.SysLogininforMapper; import com.glxp.api.entity.monitor.SysLogininfor; diff --git a/src/main/java/com/glxp/api/service/monitor/impl/SysOperLogServiceImpl.java b/src/main/java/com/glxp/api/service/monitor/impl/SysOperLogServiceImpl.java index 84a093c2..4541e561 100644 --- a/src/main/java/com/glxp/api/service/monitor/impl/SysOperLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/monitor/impl/SysOperLogServiceImpl.java @@ -1,7 +1,6 @@ package com.glxp.api.service.monitor.impl; import cn.hutool.core.bean.BeanUtil; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.monitor.SysOperLogMapper; import com.glxp.api.entity.monitor.OperLogDTO; import com.glxp.api.entity.monitor.SysOperLog; diff --git a/src/main/java/com/glxp/api/service/purchase/CustomerContactService.java b/src/main/java/com/glxp/api/service/purchase/CustomerContactService.java index 4378cdc0..2e7eaf37 100644 --- a/src/main/java/com/glxp/api/service/purchase/CustomerContactService.java +++ b/src/main/java/com/glxp/api/service/purchase/CustomerContactService.java @@ -1,13 +1,7 @@ package com.glxp.api.service.purchase; - - import com.glxp.api.entity.purchase.CustomerContactEntity; -import com.glxp.api.req.purchase.CustomerContactFilterRequest; -import com.glxp.api.req.system.DeleteRequest; - -import java.util.List; public interface CustomerContactService { diff --git a/src/main/java/com/glxp/api/service/purchase/PurOrderService.java b/src/main/java/com/glxp/api/service/purchase/PurOrderService.java index c1ca6868..d23191e4 100644 --- a/src/main/java/com/glxp/api/service/purchase/PurOrderService.java +++ b/src/main/java/com/glxp/api/service/purchase/PurOrderService.java @@ -1,13 +1,9 @@ package com.glxp.api.service.purchase; -import com.glxp.api.entity.inout.PurReceiveEntity; import com.glxp.api.entity.purchase.PurOrderEntity; -import com.glxp.api.entity.purchase.PurPlanEntity; import com.glxp.api.req.purchase.PurOrderRequest; -import com.glxp.api.req.purchase.PurPlanRequest; import com.glxp.api.res.purchase.PurOrderResponse; -import com.glxp.api.res.purchase.PurPlanResponse; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/purchase/PurPlanDetailService.java b/src/main/java/com/glxp/api/service/purchase/PurPlanDetailService.java index 3c1fddfd..ca57cf10 100644 --- a/src/main/java/com/glxp/api/service/purchase/PurPlanDetailService.java +++ b/src/main/java/com/glxp/api/service/purchase/PurPlanDetailService.java @@ -1,13 +1,10 @@ package com.glxp.api.service.purchase; - import com.glxp.api.entity.basic.BasicProductsEntity; -import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.purchase.PurPlanDetailEntity; import com.glxp.api.req.purchase.PurPlanDetailRequest; import com.glxp.api.res.purchase.PurOrderDetailResponse; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/purchase/PurPlanService.java b/src/main/java/com/glxp/api/service/purchase/PurPlanService.java index cb231189..edfd1646 100644 --- a/src/main/java/com/glxp/api/service/purchase/PurPlanService.java +++ b/src/main/java/com/glxp/api/service/purchase/PurPlanService.java @@ -1,11 +1,9 @@ package com.glxp.api.service.purchase; - import com.glxp.api.entity.purchase.PurPlanEntity; import com.glxp.api.req.purchase.PurPlanRequest; import com.glxp.api.res.purchase.PurPlanResponse; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/CustomerContactServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/CustomerContactServiceImpl.java index 7fa855d6..79a54fd4 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/CustomerContactServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/CustomerContactServiceImpl.java @@ -1,17 +1,12 @@ package com.glxp.api.service.purchase.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.purchase.CustomerContacDao; import com.glxp.api.entity.purchase.CustomerContactEntity; -import com.glxp.api.req.purchase.CustomerContactFilterRequest; -import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.service.purchase.CustomerContactService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.Collections; -import java.util.List; @Service @Transactional(rollbackFor = Exception.class) diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java index 7c619dce..44381336 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyDetailImplService.java @@ -1,7 +1,5 @@ package com.glxp.api.service.purchase.impl; -import com.github.pagehelper.PageHelper; - import com.glxp.api.dao.purchase.PurApplyDetailDao; import com.glxp.api.entity.purchase.PurApplyDetailEntity; import com.glxp.api.req.purchase.PurApplyDetailRequest; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyServiceImpl.java index dbcdc07e..c26b8f5e 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurApplyServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurApplyServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.purchase.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.purchase.PurApplyDao; import com.glxp.api.entity.purchase.PurApplyEntity; import com.glxp.api.req.purchase.PurApplyRequest; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalDetailServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalDetailServiceImpl.java index 619f5888..613a9e67 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalDetailServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.purchase.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.purchase.PurArrivalDetailDao; import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.purchase.PurArrivalDetailEntity; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalServiceImpl.java index 07340b3f..5fd01983 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurArrivalServiceImpl.java @@ -1,11 +1,9 @@ package com.glxp.api.service.purchase.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.purchase.PurArrivalDao; import com.glxp.api.entity.purchase.PurArrivalEntity; import com.glxp.api.req.purchase.PurArrivalRequest; import com.glxp.api.res.purchase.PurArrivalResponse; -import com.glxp.api.res.purchase.PurOrderResponse; import com.glxp.api.service.purchase.PurArrivalService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryDetailServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryDetailServiceImpl.java index f7738299..ce9bbafe 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryDetailServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.purchase.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.purchase.PurDeliveryDetailDao; import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.purchase.PurDeliveryDetailEntity; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryServiceImpl.java index 4408930c..ba504ddf 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurDeliveryServiceImpl.java @@ -1,7 +1,6 @@ package com.glxp.api.service.purchase.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.ConstantStatus; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailServiceImpl.java index e08c9a32..9f5ea058 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurOrderDetailServiceImpl.java @@ -1,7 +1,6 @@ package com.glxp.api.service.purchase.impl; import cn.hutool.core.collection.CollUtil; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.purchase.PurOrderDetailDao; import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.purchase.PurOrderDetailEntity; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java index d8784602..c1ef52c0 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurOrderServiceImpl.java @@ -2,18 +2,11 @@ package com.glxp.api.service.purchase.impl; import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.purchase.PurOrderDao; -import com.glxp.api.dao.purchase.PurPlanDao; -import com.glxp.api.entity.inout.PurReceiveEntity; import com.glxp.api.entity.purchase.PurOrderEntity; -import com.glxp.api.entity.purchase.PurPlanEntity; import com.glxp.api.req.purchase.PurOrderRequest; -import com.glxp.api.req.purchase.PurPlanRequest; import com.glxp.api.res.purchase.PurOrderResponse; -import com.glxp.api.res.purchase.PurPlanResponse; import com.glxp.api.service.purchase.PurOrderService; -import com.glxp.api.service.purchase.PurPlanService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailServiceImpl.java index 3c9d909d..35cee803 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurPlanDetailServiceImpl.java @@ -1,9 +1,7 @@ package com.glxp.api.service.purchase.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.purchase.PurPlanDetailDao; import com.glxp.api.entity.basic.BasicProductsEntity; -import com.glxp.api.entity.inout.IoOrderDetailBizEntity; import com.glxp.api.entity.purchase.PurPlanDetailEntity; import com.glxp.api.req.purchase.PurPlanDetailRequest; import com.glxp.api.res.purchase.PurOrderDetailResponse; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurPlanServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurPlanServiceImpl.java index 1cbafb21..c277a29e 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurPlanServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurPlanServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.purchase.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.purchase.PurPlanDao; import com.glxp.api.entity.purchase.PurPlanEntity; import com.glxp.api.req.purchase.PurPlanRequest; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedDetailServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedDetailServiceImpl.java index 8393f191..8065e001 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedDetailServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.purchase.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.purchase.PurReturnedDetailDao; import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.purchase.PurReturnedDetailEntity; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedServiceImpl.java index 40bfe73d..a268bd44 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/PurReturnedServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.purchase.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.purchase.PurReturnedDao; import com.glxp.api.entity.purchase.PurReturnedEntity; import com.glxp.api.req.purchase.PurReturnedRequest; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java index 0ec38b47..378a82ae 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCertRemindMsgImpl.java @@ -1,15 +1,11 @@ package com.glxp.api.service.purchase.impl; -import cn.hutool.core.exceptions.ExceptionUtil; -import cn.hutool.core.thread.ThreadUtil; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.constant.ConstantStatus; -import com.glxp.api.dao.basic.UdiCompanyDao; import com.glxp.api.dao.purchase.SupCertDao; import com.glxp.api.dao.purchase.SupCertRemindMsgDao; import com.glxp.api.entity.purchase.SupCertEntity; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java index 4da935d5..41a6417c 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCertServiceImpl.java @@ -3,8 +3,6 @@ package com.glxp.api.service.purchase.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; -import com.glxp.api.common.res.BaseResponse; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.dao.purchase.SupCertDao; import com.glxp.api.entity.purchase.SupCertEntity; @@ -22,7 +20,6 @@ import com.glxp.api.service.purchase.SupProductService; import com.glxp.api.util.IntUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestBody; import javax.annotation.Resource; import java.util.Collections; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupCertSetServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupCertSetServiceImpl.java index a7a74b9c..021a2b29 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupCertSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupCertSetServiceImpl.java @@ -1,7 +1,6 @@ package com.glxp.api.service.purchase.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.purchase.SupCertSetDao; import com.glxp.api.entity.purchase.SupCertSetEntity; import com.glxp.api.req.purchase.FilterCertSetsRequest; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupManufacturerServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupManufacturerServiceImpl.java index 1fec4613..6190587c 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupManufacturerServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupManufacturerServiceImpl.java @@ -3,7 +3,6 @@ package com.glxp.api.service.purchase.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.purchase.SupManufacturerDao; import com.glxp.api.entity.purchase.SupManufacturerEntity; import com.glxp.api.req.purchase.FilterSupManufacturerRequest; diff --git a/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java b/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java index 6bb574f3..ad94fe6c 100644 --- a/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/purchase/impl/SupProductServiceImpl.java @@ -2,10 +2,7 @@ package com.glxp.api.service.purchase.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; -import com.glxp.api.constant.ConstantStatus; import com.glxp.api.dao.purchase.SupProductDao; import com.glxp.api.entity.purchase.SupProductEntity; import com.glxp.api.req.purchase.FilterPoductRequest; diff --git a/src/main/java/com/glxp/api/service/sync/BasicExportService.java b/src/main/java/com/glxp/api/service/sync/BasicExportService.java index 9c7342aa..64114d99 100644 --- a/src/main/java/com/glxp/api/service/sync/BasicExportService.java +++ b/src/main/java/com/glxp/api/service/sync/BasicExportService.java @@ -2,7 +2,6 @@ package com.glxp.api.service.sync; import com.baomidou.mybatisplus.extension.service.IService; -import com.glxp.api.dao.sync.BasicExportDao; import com.glxp.api.entity.sync.BasicExportStatusEntity; import com.glxp.api.req.sync.BasicExportStatusRequest; diff --git a/src/main/java/com/glxp/api/service/sync/BasicExportTimeService.java b/src/main/java/com/glxp/api/service/sync/BasicExportTimeService.java index 5e10d0f1..ec600fa9 100644 --- a/src/main/java/com/glxp/api/service/sync/BasicExportTimeService.java +++ b/src/main/java/com/glxp/api/service/sync/BasicExportTimeService.java @@ -1,9 +1,6 @@ package com.glxp.api.service.sync; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.service.IService; -import com.glxp.api.dao.BaseMapperPlus; import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; import com.glxp.api.req.sync.BasicExportTimeRequest; import com.glxp.api.service.CustomService; diff --git a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java index 7e2c3de4..15c82556 100644 --- a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java +++ b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java @@ -12,7 +12,6 @@ import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.*; import com.glxp.api.controller.sync.SpsSyncWebSocket; -import com.glxp.api.constant.Constant; import com.glxp.api.dao.basic.BasicProductsDao; import com.glxp.api.entity.basic.*; import com.glxp.api.entity.collect.RelCodeBatch; @@ -26,14 +25,12 @@ import com.glxp.api.entity.sync.BasicExportStatusEntity; import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; import com.glxp.api.entity.sync.SocketMsgEntity; import com.glxp.api.entity.sync.SyncDataBustypeEntity; -import com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity; import com.glxp.api.entity.thrsys.ThrManufacturerEntity; import com.glxp.api.req.basic.ProductInfoFilterRequest; import com.glxp.api.req.basic.UdiCompanyRequest; import com.glxp.api.req.inout.FilterOrderRequest; import com.glxp.api.req.sync.SpsSyncDataRequest; import com.glxp.api.res.sync.SpSyncUdiResponse; -import com.glxp.api.res.sync.SpsSyncDeviceTaskResponse; import com.glxp.api.res.sync.SpsSyncDrugDataTaskResponse; import com.glxp.api.res.sync.SpsSyncOrderResponse; import com.glxp.api.res.system.SyncDataSetResponse; @@ -52,7 +49,6 @@ import com.glxp.api.service.thrsys.ThrManufacturerService; import com.glxp.api.util.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.exception.ExceptionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeanUtils; diff --git a/src/main/java/com/glxp/api/service/sync/SyncEditLogService.java b/src/main/java/com/glxp/api/service/sync/SyncEditLogService.java index 2b3f973f..4ee786b3 100644 --- a/src/main/java/com/glxp/api/service/sync/SyncEditLogService.java +++ b/src/main/java/com/glxp/api/service/sync/SyncEditLogService.java @@ -1,9 +1,9 @@ package com.glxp.api.service.sync; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.sync.SyncEditLogEntity; import com.glxp.api.dao.sync.SyncEditLogMapper; +import com.glxp.api.entity.sync.SyncEditLogEntity; +import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/com/glxp/api/service/sync/SyncEditTypeService.java b/src/main/java/com/glxp/api/service/sync/SyncEditTypeService.java index d041ddb8..07382882 100644 --- a/src/main/java/com/glxp/api/service/sync/SyncEditTypeService.java +++ b/src/main/java/com/glxp/api/service/sync/SyncEditTypeService.java @@ -1,9 +1,9 @@ package com.glxp.api.service.sync; -import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.sync.SyncEditTypeMapper; import com.glxp.api.entity.sync.SyncEditTypeEntity; +import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/com/glxp/api/service/sync/impl/BasicDownloadServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/BasicDownloadServiceImpl.java index 139ca9c2..5956da53 100644 --- a/src/main/java/com/glxp/api/service/sync/impl/BasicDownloadServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sync/impl/BasicDownloadServiceImpl.java @@ -1,8 +1,6 @@ package com.glxp.api.service.sync.impl; -import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.sync.BasicDownloadDao; import com.glxp.api.entity.sync.BasicDownloadStatusEntity; import com.glxp.api.req.sync.BasicDownloadRequest; diff --git a/src/main/java/com/glxp/api/service/sync/impl/BasicExportServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/BasicExportServiceImpl.java index 9be0bd60..5fb409c5 100644 --- a/src/main/java/com/glxp/api/service/sync/impl/BasicExportServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sync/impl/BasicExportServiceImpl.java @@ -2,7 +2,6 @@ package com.glxp.api.service.sync.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.sync.BasicExportDao; import com.glxp.api.entity.sync.BasicExportStatusEntity; import com.glxp.api.req.sync.BasicExportStatusRequest; diff --git a/src/main/java/com/glxp/api/service/sync/impl/BasicExportTimeServiceImpl.java b/src/main/java/com/glxp/api/service/sync/impl/BasicExportTimeServiceImpl.java index 646b09da..292a8c47 100644 --- a/src/main/java/com/glxp/api/service/sync/impl/BasicExportTimeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/sync/impl/BasicExportTimeServiceImpl.java @@ -1,7 +1,6 @@ package com.glxp.api.service.sync.impl; import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.sync.BasicExportTimeDao; import com.glxp.api.entity.sync.BasicExportStatusTimeEntity; import com.glxp.api.req.sync.BasicExportTimeRequest; @@ -10,7 +9,6 @@ import com.glxp.api.service.sync.BasicExportTimeService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; import java.util.Collections; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/system/CompanyService.java b/src/main/java/com/glxp/api/service/system/CompanyService.java index 1543dbd0..13adeda5 100644 --- a/src/main/java/com/glxp/api/service/system/CompanyService.java +++ b/src/main/java/com/glxp/api/service/system/CompanyService.java @@ -1,6 +1,5 @@ package com.glxp.api.service.system; -import com.glxp.api.entity.auth.AliKeyEntity; import com.glxp.api.entity.system.CompanyEntity; import com.glxp.api.req.auth.FilterCompanyRequest; diff --git a/src/main/java/com/glxp/api/service/system/SysMenuHelpService.java b/src/main/java/com/glxp/api/service/system/SysMenuHelpService.java index 4faecdd4..1d33a0ab 100644 --- a/src/main/java/com/glxp/api/service/system/SysMenuHelpService.java +++ b/src/main/java/com/glxp/api/service/system/SysMenuHelpService.java @@ -1,7 +1,5 @@ package com.glxp.api.service.system; -import com.glxp.api.entity.inout.IoOrderInvoiceEntity; -import com.glxp.api.entity.monitor.SysOperLog; import com.glxp.api.entity.system.SysMenuHelpEntity; import com.glxp.api.req.system.SysMenuHelpRequest; diff --git a/src/main/java/com/glxp/api/service/system/SysMsgTodoService.java b/src/main/java/com/glxp/api/service/system/SysMsgTodoService.java index e071f698..471f5337 100644 --- a/src/main/java/com/glxp/api/service/system/SysMsgTodoService.java +++ b/src/main/java/com/glxp/api/service/system/SysMsgTodoService.java @@ -1,7 +1,7 @@ package com.glxp.api.service.system; -import com.glxp.api.entity.system.SysMsgTodoEntity; import com.baomidou.mybatisplus.extension.service.IService; +import com.glxp.api.entity.system.SysMsgTodoEntity; import com.glxp.api.req.system.SysMsgTodoQuery; import com.glxp.api.vo.system.SysMsgTodoVo; diff --git a/src/main/java/com/glxp/api/service/system/SysRemindMsgService.java b/src/main/java/com/glxp/api/service/system/SysRemindMsgService.java index 751865ac..0e8bb6ae 100644 --- a/src/main/java/com/glxp/api/service/system/SysRemindMsgService.java +++ b/src/main/java/com/glxp/api/service/system/SysRemindMsgService.java @@ -1,7 +1,6 @@ package com.glxp.api.service.system; import com.glxp.api.entity.system.SysRemindMsgEntity; -import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.req.system.FilterSysRemindMsgRequest; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/system/SysRemindSetService.java b/src/main/java/com/glxp/api/service/system/SysRemindSetService.java index 6c8b8162..781d256b 100644 --- a/src/main/java/com/glxp/api/service/system/SysRemindSetService.java +++ b/src/main/java/com/glxp/api/service/system/SysRemindSetService.java @@ -2,7 +2,6 @@ package com.glxp.api.service.system; import com.glxp.api.entity.system.SysRemindSetEntity; import com.glxp.api.req.system.FilterSysRemindSetRequest; -import com.glxp.api.util.page.TableDataInfo; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceBizService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceBizService.java index cb22c07d..e64c9644 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceBizService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceBizService.java @@ -3,7 +3,6 @@ package com.glxp.api.service.system; import com.baomidou.mybatisplus.extension.service.IService; import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity; -import com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; diff --git a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceCodeService.java b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceCodeService.java index f349a8d6..b4c4b989 100644 --- a/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceCodeService.java +++ b/src/main/java/com/glxp/api/service/system/SystemPDFTemplateRelevanceCodeService.java @@ -2,11 +2,9 @@ package com.glxp.api.service.system; import com.baomidou.mybatisplus.extension.service.IService; -import com.glxp.api.entity.system.SysPdfTemplateRelevanceBizEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceCodeEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; import com.glxp.api.res.system.SystemPDFTemplateRelevanceResponse; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/system/impl/ClassifyCodeServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/ClassifyCodeServiceImpl.java index 103e583d..50548e7e 100644 --- a/src/main/java/com/glxp/api/service/system/impl/ClassifyCodeServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/ClassifyCodeServiceImpl.java @@ -2,7 +2,6 @@ package com.glxp.api.service.system.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.system.ClassifyCodeDao; import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.entity.system.ClassifyCodeEntity; diff --git a/src/main/java/com/glxp/api/service/system/impl/CompanyServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/CompanyServiceImpl.java index 1348ac08..245f7abb 100644 --- a/src/main/java/com/glxp/api/service/system/impl/CompanyServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/CompanyServiceImpl.java @@ -1,8 +1,6 @@ package com.glxp.api.service.system.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.system.CompanyDao; -import com.glxp.api.entity.auth.AliKeyEntity; import com.glxp.api.entity.system.CompanyEntity; import com.glxp.api.req.auth.FilterCompanyRequest; import com.glxp.api.service.system.CompanyService; @@ -10,7 +8,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.Collections; import java.util.List; @Service diff --git a/src/main/java/com/glxp/api/service/system/impl/SysMenuHelpServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SysMenuHelpServiceImpl.java index eb6e8a52..60a48fb9 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SysMenuHelpServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SysMenuHelpServiceImpl.java @@ -1,19 +1,13 @@ package com.glxp.api.service.system.impl; -import com.github.pagehelper.PageHelper; -import com.glxp.api.dao.monitor.SysOperLogMapper; -import com.glxp.api.req.system.SysMenuHelpRequest; -import com.glxp.api.util.DateUtil; -import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.glxp.api.dao.system.SysMenuHelpMapper; import com.glxp.api.entity.system.SysMenuHelpEntity; +import com.glxp.api.req.system.SysMenuHelpRequest; import com.glxp.api.service.system.SysMenuHelpService; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import javax.xml.crypto.Data; -import java.util.Date; import java.util.List; @Service diff --git a/src/main/java/com/glxp/api/service/system/impl/SysMsgTodoServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SysMsgTodoServiceImpl.java index 5477621a..c77a3f2e 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SysMsgTodoServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SysMsgTodoServiceImpl.java @@ -2,10 +2,10 @@ package com.glxp.api.service.system.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.system.SysMsgTodoMapper; import com.glxp.api.entity.system.SysMsgTodoEntity; import com.glxp.api.req.system.SysMsgTodoQuery; import com.glxp.api.service.system.SysMsgTodoService; -import com.glxp.api.dao.system.SysMsgTodoMapper; import com.glxp.api.vo.system.SysMsgTodoVo; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/system/impl/SysRemindMsgServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SysRemindMsgServiceImpl.java index 0df3d40a..c7634962 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SysRemindMsgServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SysRemindMsgServiceImpl.java @@ -1,13 +1,10 @@ package com.glxp.api.service.system.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; -import com.glxp.api.req.system.FilterSysRemindMsgRequest; -import org.springframework.stereotype.Service; - import com.glxp.api.dao.system.SysRemindMsgMapper; import com.glxp.api.entity.system.SysRemindMsgEntity; +import com.glxp.api.req.system.FilterSysRemindMsgRequest; import com.glxp.api.service.system.SysRemindMsgService; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; diff --git a/src/main/java/com/glxp/api/service/system/impl/SysRemindSetServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SysRemindSetServiceImpl.java index c56f81f9..16b0ef64 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SysRemindSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SysRemindSetServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.system.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.system.SysRemindSetMapper; import com.glxp.api.entity.system.SysRemindSetEntity; import com.glxp.api.req.system.FilterSysRemindSetRequest; diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceServiceImpl.java index 32af8bac..a33854f7 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemPDFTemplateRelevanceServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.system.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.system.SystemPDFTemplateRelevanceDao; import com.glxp.api.entity.system.SystemPDFTemplateRelevanceEntity; import com.glxp.api.req.system.FilterPdfTemplateRelevanceRequest; @@ -10,9 +9,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; @Service @Transactional(rollbackFor = Exception.class) diff --git a/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java index 06658c08..6032e470 100644 --- a/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/SystemParamConfigServiceImpl.java @@ -2,7 +2,6 @@ package com.glxp.api.service.system.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.schedule.SystemParamConfigDao; import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.req.system.FilterParamConfigRequest; diff --git a/src/main/java/com/glxp/api/service/system/impl/ThirdSysApiServiceImpl.java b/src/main/java/com/glxp/api/service/system/impl/ThirdSysApiServiceImpl.java index 2db76874..1bcd6366 100644 --- a/src/main/java/com/glxp/api/service/system/impl/ThirdSysApiServiceImpl.java +++ b/src/main/java/com/glxp/api/service/system/impl/ThirdSysApiServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.system.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.system.ThirdSysApiDao; import com.glxp.api.entity.system.ThirdSysApiEntity; import com.glxp.api.req.system.FilterSysApiRequest; diff --git a/src/main/java/com/glxp/api/service/thrsys/BasicInsMaterialService.java b/src/main/java/com/glxp/api/service/thrsys/BasicInsMaterialService.java index 418e1abf..9c222706 100644 --- a/src/main/java/com/glxp/api/service/thrsys/BasicInsMaterialService.java +++ b/src/main/java/com/glxp/api/service/thrsys/BasicInsMaterialService.java @@ -1,7 +1,6 @@ package com.glxp.api.service.thrsys; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.BasicInsMaterialMapper; import com.glxp.api.entity.thrsys.BasicInsMaterialEntity; import com.glxp.api.req.thrsys.ThrInsMaterialFeeRequest; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThirdAliDrugService.java b/src/main/java/com/glxp/api/service/thrsys/ThirdAliDrugService.java index de0f6ed8..76fcf4b4 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThirdAliDrugService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThirdAliDrugService.java @@ -3,29 +3,23 @@ package com.glxp.api.service.thrsys; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.StrUtil; -import cn.hutool.json.JSONUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.glxp.api.dao.thrsys.ThirdAliDrugMapper; +import com.glxp.api.entity.thrsys.ThirdAliDrug; import com.glxp.api.exception.JsonException; import com.glxp.api.req.thrsys.ThirdAliDrugRequest; import com.glxp.api.service.auth.CustomerService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; +import javax.annotation.Resource; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.util.*; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.dao.thrsys.ThirdAliDrugMapper; -import com.glxp.api.entity.thrsys.ThirdAliDrug; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.multipart.MultipartFile; - -import javax.annotation.Resource; - @Service @Slf4j diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrCorpService.java b/src/main/java/com/glxp/api/service/thrsys/ThrCorpService.java index 05ba0db5..6beba811 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrCorpService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrCorpService.java @@ -1,11 +1,9 @@ package com.glxp.api.service.thrsys; - import com.glxp.api.entity.thrsys.ThrCorpEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.req.thrsys.FilterThrCorpRequest; -import com.glxp.api.req.thrsys.ThrUnitMaintainFilterRequest; import com.glxp.api.res.thrsys.ThrCorpsResponse; import com.glxp.api.res.thrsys.ThrUnitMaintainResponse; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java index 1268a820..06e90bb1 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrCorpsDlService.java @@ -18,7 +18,6 @@ import com.glxp.api.res.thrsys.ThrCorpsResponse; import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.sync.SyncDataSetService; import com.glxp.api.util.CustomUtil; -import com.glxp.api.util.ExcelUtil; import com.glxp.api.util.RedisUtil; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrHslbService.java b/src/main/java/com/glxp/api/service/thrsys/ThrHslbService.java index 16df07a4..27e005c1 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrHslbService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrHslbService.java @@ -1,7 +1,6 @@ package com.glxp.api.service.thrsys; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.ThrHslbMapper; import com.glxp.api.entity.thrsys.ThrHslbEntity; import com.glxp.api.req.thrsys.FilterThrHslbRequest; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDlService.java b/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDlService.java index 2d78fe54..056b9843 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDlService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrInvProductsDlService.java @@ -7,7 +7,10 @@ import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.constant.Constant; import com.glxp.api.entity.thrsys.*; import com.glxp.api.httpClient.serviceClient.impl.ErpInvClientImpl; -import com.glxp.api.req.thrsys.*; +import com.glxp.api.req.thrsys.FilterThrCorpImportLogRequest; +import com.glxp.api.req.thrsys.FilterThrInvProductsRequest; +import com.glxp.api.req.thrsys.ThrInvProductsExportRequest; +import com.glxp.api.req.thrsys.ThrOnhandRequest; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.thrsys.ThrInvProductResponse; import com.glxp.api.service.auth.CustomerService; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java b/src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java index ae73a903..e3f7bfdf 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrInvWarehouseService.java @@ -3,7 +3,6 @@ package com.glxp.api.service.thrsys; import com.glxp.api.entity.thrsys.ThrInvWarehouseEntity; import com.glxp.api.req.thrsys.FilterThrSubInvWarehouseRequest; -import com.glxp.api.res.thrsys.ThrInvWarehouseResponse; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrManufacturerService.java b/src/main/java/com/glxp/api/service/thrsys/ThrManufacturerService.java index e0ea3078..a2b2eceb 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrManufacturerService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrManufacturerService.java @@ -2,12 +2,10 @@ package com.glxp.api.service.thrsys; import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.dao.thrsys.ThrManufacturerMapper; import com.glxp.api.entity.thrsys.ThrManufacturerEntity; -import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.httpClient.serviceClient.ErpBasicClient; import com.glxp.api.req.thrsys.FilterBasicProducstRequest; import com.glxp.api.req.thrsys.FilterThrCorpRequest; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrOrderService.java b/src/main/java/com/glxp/api/service/thrsys/ThrOrderService.java index 66539c7a..a4caa41c 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrOrderService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrOrderService.java @@ -3,8 +3,6 @@ package com.glxp.api.service.thrsys; import com.glxp.api.entity.thrsys.ThrOrderEntity; import com.glxp.api.req.thrsys.FilterThrOrderRequest; -import com.glxp.api.res.thrsys.ThrErpOrderResponse; -import com.glxp.api.res.thrsys.ThrOrderResponse; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrProductTypeService.java b/src/main/java/com/glxp/api/service/thrsys/ThrProductTypeService.java index 8770190b..0a5a818d 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrProductTypeService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrProductTypeService.java @@ -1,7 +1,6 @@ package com.glxp.api.service.thrsys; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.ThrProductTypeMapper; import com.glxp.api.entity.thrsys.ThrProductTypeEntity; import com.glxp.api.req.thrsys.FilterThrProductTypeRequest; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrSystemDetailService.java b/src/main/java/com/glxp/api/service/thrsys/ThrSystemDetailService.java index 76a6cf88..fcf1f6d0 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrSystemDetailService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrSystemDetailService.java @@ -1,8 +1,8 @@ package com.glxp.api.service.thrsys; import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; +import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.req.thrsys.FilterBasicThirdSysDetailRequest; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrSystemService.java b/src/main/java/com/glxp/api/service/thrsys/ThrSystemService.java index 6f4eec22..35126471 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrSystemService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrSystemService.java @@ -3,7 +3,6 @@ package com.glxp.api.service.thrsys; import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpExportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpExportLogServiceImpl.java index 7c818b2b..51d7c55c 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpExportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpExportLogServiceImpl.java @@ -2,11 +2,9 @@ package com.glxp.api.service.thrsys.impl; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.StrUtil; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.ThrCorpExportLogDao; import com.glxp.api.entity.thrsys.ThrCorpExportLogEntity; import com.glxp.api.req.thrsys.FilterThrCorpExportLogRequest; -import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.thrsys.ThrCorpExportLogService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java index 99b193fc..cf3a8fdc 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportDetailServiceImpl.java @@ -1,17 +1,14 @@ package com.glxp.api.service.thrsys.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.ThrCorpImportDetailDao; import com.glxp.api.entity.thrsys.ThrCorpImportDetailEntity; import com.glxp.api.req.thrsys.FilterThrCorpImportLogRequest; -import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.thrsys.ThrCorpImportDetailService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; -import java.util.Date; import java.util.List; @Service diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportLogServiceImpl.java index c5e4a40b..5c5e7049 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpImportLogServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.thrsys.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.ThrCorpImportLogDao; import com.glxp.api.entity.thrsys.ThrCorpImportLogEntity; import com.glxp.api.req.thrsys.FilterThrCorpImportLogRequest; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java index e42b8681..6cf2e916 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrCorpServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.thrsys.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.ThrCorpDao; import com.glxp.api.entity.thrsys.ThrCorpEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java index f959abda..44260bf9 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrDeptServiceImpl.java @@ -3,7 +3,6 @@ package com.glxp.api.service.thrsys.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.dao.thrsys.ThrDeptDao; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java index 83638cb8..dd491f04 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsDetailServiceImpl.java @@ -1,17 +1,14 @@ package com.glxp.api.service.thrsys.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.ThrInvProductsDetailDao; import com.glxp.api.entity.thrsys.ThrInvProductsImportDetailEntity; import com.glxp.api.req.thrsys.FilterThrCorpImportLogRequest; -import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.thrsys.ThrInvProductsDetailService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; -import java.util.Date; import java.util.List; @Service diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsExportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsExportLogServiceImpl.java index f63db40a..720358c9 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsExportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsExportLogServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.thrsys.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.ThrInvProductsExportLogDao; import com.glxp.api.entity.thrsys.ThrInvProductsExportLogEntity; import com.glxp.api.req.thrsys.FilterThrCorpExportLogRequest; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsImportLogServiceImpl.java index 2151421e..76e5619e 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsImportLogServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.thrsys.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.ThrInvProductsImportLogDao; import com.glxp.api.entity.thrsys.ThrInvProductsImportLogEntity; import com.glxp.api.req.thrsys.FilterThrCorpImportLogRequest; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java index 249da60c..d2cea75a 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvProductsServiceImpl.java @@ -1,18 +1,14 @@ package com.glxp.api.service.thrsys.impl; -import com.github.pagehelper.PageHelper; - import com.glxp.api.dao.thrsys.ThrInvProductsDao; import com.glxp.api.entity.thrsys.ThrInvProductsEntity; import com.glxp.api.req.thrsys.FilterThrInvProductsRequest; -import com.glxp.api.service.auth.CustomerService; import com.glxp.api.service.thrsys.ThrInvProductsService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; -import java.util.Date; import java.util.List; @Service diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java index 26af9ee2..b11c0055 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvWarehouseServiceImpl.java @@ -2,11 +2,9 @@ package com.glxp.api.service.thrsys.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.ThrInvWarehouseDao; import com.glxp.api.entity.thrsys.ThrInvWarehouseEntity; import com.glxp.api.req.thrsys.FilterThrSubInvWarehouseRequest; -import com.glxp.api.res.thrsys.ThrInvWarehouseResponse; import com.glxp.api.service.thrsys.ThrInvWarehouseService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderDetailServiceImpl.java index eac57ef1..0b8ad02a 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderDetailServiceImpl.java @@ -1,7 +1,6 @@ package com.glxp.api.service.thrsys.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.ThrOrderDetailDao; import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderExportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderExportLogServiceImpl.java index 8bc50058..cd30549d 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderExportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderExportLogServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.thrsys.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.ThrOrderExportLogDao; import com.glxp.api.entity.thrsys.ThrOrderExportLogEntity; import com.glxp.api.req.thrsys.FilterThrCorpImportLogRequest; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java index dd1fa186..9ac085a3 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportDetailServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.thrsys.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.ThrOrderImportDetailDao; import com.glxp.api.entity.thrsys.ThrOrderImportDetailEntity; import com.glxp.api.req.thrsys.FilterThrCorpImportLogRequest; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java index dbb1c2fd..5d5a0f6f 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderImportLogServiceImpl.java @@ -1,7 +1,6 @@ package com.glxp.api.service.thrsys.impl; import cn.hutool.core.bean.BeanUtil; -import com.github.pagehelper.PageHelper; import com.glxp.api.constant.BasicProcessStatus; import com.glxp.api.dao.thrsys.ThrOrderImportLogDao; import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; @@ -13,7 +12,6 @@ import com.glxp.api.service.thrsys.ThrOrderDetailService; import com.glxp.api.service.thrsys.ThrOrderImportDetailService; import com.glxp.api.service.thrsys.ThrOrderImportLogService; import com.glxp.api.service.thrsys.ThrOrderService; -import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java index 9086b847..a8a80ce0 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrOrderServiceImpl.java @@ -1,24 +1,15 @@ package com.glxp.api.service.thrsys.impl; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; -import com.github.pagehelper.PageHelper; - import com.glxp.api.dao.thrsys.ThrOrderDao; import com.glxp.api.dao.thrsys.ThrOrderDetailDao; -import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; import com.glxp.api.entity.thrsys.ThrOrderEntity; -import com.glxp.api.req.thrsys.FilterThrOrderDetailRequest; import com.glxp.api.req.thrsys.FilterThrOrderRequest; -import com.glxp.api.res.thrsys.ThrErpOrderResponse; -import com.glxp.api.res.thrsys.ThrOrderResponse; import com.glxp.api.service.thrsys.ThrOrderService; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.Collections; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java index 1abeb735..17b838d1 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java @@ -7,11 +7,8 @@ import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; -import com.glxp.api.dao.auth.AuthCompanyMapper; import com.glxp.api.dao.thrsys.ThrHslbMapper; import com.glxp.api.dao.thrsys.ThrProductsAddDiDao; -import com.glxp.api.entity.auth.AuthCompany; import com.glxp.api.entity.basic.ProductInfoEntity; import com.glxp.api.entity.thrsys.ThrHslbEntity; import com.glxp.api.entity.thrsys.ThrProductsAddDiEntity; @@ -21,8 +18,6 @@ import com.glxp.api.req.thrsys.FilterThrProductsRequest; import com.glxp.api.res.thrsys.ThrProductsAddDiResponse; import com.glxp.api.res.thrsys.UdiInfoResponse; import com.glxp.api.service.basic.ProductInfoService; -import com.glxp.api.service.thrsys.ThrHslbService; -import com.glxp.api.service.thrsys.ThrProductsService; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.Excel.ExcelHandler; import com.glxp.api.util.Excel.Exception.RenException; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddServiceImpl.java index 9c32eb7f..7a66b896 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.thrsys.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.ThrProductsAddDao; import com.glxp.api.entity.thrsys.ThrProductsAddEntity; import com.glxp.api.req.thrsys.FilterThrProductsRequest; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsExportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsExportLogServiceImpl.java index 89368739..e3012c43 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsExportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsExportLogServiceImpl.java @@ -2,7 +2,6 @@ package com.glxp.api.service.thrsys.impl; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.StrUtil; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.ThrProductsExportLogDao; import com.glxp.api.entity.thrsys.ThrProductsExportLogEntity; import com.glxp.api.req.thrsys.FilterThrProductsExportLogRequest; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java index 03e41f54..13431f3e 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportDetailServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.thrsys.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.ThrProductsImportDetailDao; import com.glxp.api.entity.thrsys.ThrProductsImportDetailEntity; import com.glxp.api.req.thrsys.FilterThrProductsImportLogRequest; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportLogServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportLogServiceImpl.java index e15f84cd..d2f6d09a 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportLogServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsImportLogServiceImpl.java @@ -1,6 +1,5 @@ package com.glxp.api.service.thrsys.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.ThrProductsImportLogDao; import com.glxp.api.entity.thrsys.ThrProductsImportLogEntity; import com.glxp.api.req.thrsys.FilterThrProductsImportLogRequest; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java index 6e450d1f..6732d5fa 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsServiceImpl.java @@ -3,7 +3,6 @@ package com.glxp.api.service.thrsys.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.thrsys.ThrProductsDao; import com.glxp.api.entity.thrsys.ThrProductsEntity; import com.glxp.api.req.thrsys.FilterThrProductsRequest; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemDetailServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemDetailServiceImpl.java index 017e8b35..d058906e 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemDetailServiceImpl.java @@ -1,10 +1,9 @@ package com.glxp.api.service.thrsys.impl; -import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.dao.thrsys.ThrSystemDetailDao; -import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; +import com.glxp.api.entity.thrsys.ThrSystemEntity; import com.glxp.api.httpClient.serviceClient.ErpBasicClient; import com.glxp.api.req.thrsys.FilterBasicThirdSysDetailRequest; import com.glxp.api.service.thrsys.ThrSystemDetailService; diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemServiceImpl.java index 23cbe53f..ecdadd34 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrSystemServiceImpl.java @@ -1,7 +1,6 @@ package com.glxp.api.service.thrsys.impl; import cn.hutool.core.util.StrUtil; -import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.AuthLicenseDao; import com.glxp.api.dao.thrsys.ThrSystemDao; import com.glxp.api.entity.auth.AuthLicense; diff --git a/src/main/java/com/glxp/api/task/AsyncDiDlService.java b/src/main/java/com/glxp/api/task/AsyncDiDlService.java index bdd9664b..74547cce 100644 --- a/src/main/java/com/glxp/api/task/AsyncDiDlService.java +++ b/src/main/java/com/glxp/api/task/AsyncDiDlService.java @@ -2,13 +2,11 @@ package com.glxp.api.task; import cn.hutool.core.exceptions.ExceptionUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSONArray; import com.glxp.api.constant.AsyncDiDlHelper; import com.glxp.api.entity.basic.ProductInfoEntity; import com.glxp.api.entity.basic.UdiProductEntity; import com.glxp.api.service.basic.ProductInfoService; import com.glxp.api.service.basic.UdiProductService; -import com.glxp.api.util.CustomUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/glxp/api/task/AsyncHeartTask.java b/src/main/java/com/glxp/api/task/AsyncHeartTask.java index 48b9128d..ad5a03f2 100644 --- a/src/main/java/com/glxp/api/task/AsyncHeartTask.java +++ b/src/main/java/com/glxp/api/task/AsyncHeartTask.java @@ -5,7 +5,6 @@ import com.glxp.api.dao.schedule.ScheduledDao; import com.glxp.api.entity.system.ScheduledEntity; import com.glxp.api.req.system.ScheduledRequest; import com.glxp.api.res.system.SyncDataSetResponse; -import com.glxp.api.service.basic.BasicBackUpdateProductService; import com.glxp.api.service.sync.SpsSyncDownloadService; import com.glxp.api.service.sync.SyncDataSetService; import com.glxp.api.util.RedisUtil; diff --git a/src/main/java/com/glxp/api/task/AsyncSpsTask.java b/src/main/java/com/glxp/api/task/AsyncSpsTask.java index 3c52b24a..5896a12e 100644 --- a/src/main/java/com/glxp/api/task/AsyncSpsTask.java +++ b/src/main/java/com/glxp/api/task/AsyncSpsTask.java @@ -1,19 +1,16 @@ package com.glxp.api.task; -import javax.annotation.Resource; - +import com.glxp.api.dao.schedule.ScheduledDao; +import com.glxp.api.entity.system.ScheduledEntity; +import com.glxp.api.idc.service.IdcService; +import com.glxp.api.req.system.ScheduledRequest; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.SchedulingConfigurer; import org.springframework.scheduling.config.ScheduledTaskRegistrar; import org.springframework.scheduling.support.CronTrigger; -import org.springframework.stereotype.Component; -import com.glxp.api.dao.schedule.ScheduledDao; -import com.glxp.api.entity.system.ScheduledEntity; -import com.glxp.api.idc.service.IdcService; -import com.glxp.api.req.system.ScheduledRequest; +import javax.annotation.Resource; // //@Component diff --git a/src/main/java/com/glxp/api/task/UploadDrugDataTask.java b/src/main/java/com/glxp/api/task/UploadDrugDataTask.java index e35c345d..c1ae2232 100644 --- a/src/main/java/com/glxp/api/task/UploadDrugDataTask.java +++ b/src/main/java/com/glxp/api/task/UploadDrugDataTask.java @@ -6,7 +6,6 @@ import com.glxp.api.dao.schedule.ScheduledDao; import com.glxp.api.entity.collect.RelCodeBatch; import com.glxp.api.entity.collect.RelCodeDetail; import com.glxp.api.entity.system.ScheduledEntity; -import com.glxp.api.idc.service.IdcService; import com.glxp.api.req.collect.RelCodeBatchRequest; import com.glxp.api.req.collect.RelCodeDetailRequest; import com.glxp.api.req.system.ScheduledRequest; diff --git a/src/main/java/com/glxp/api/upload/DownloadController.java b/src/main/java/com/glxp/api/upload/DownloadController.java index 39b5c6ee..181d21d4 100644 --- a/src/main/java/com/glxp/api/upload/DownloadController.java +++ b/src/main/java/com/glxp/api/upload/DownloadController.java @@ -1,7 +1,6 @@ package com.glxp.api.upload; import cn.hutool.core.exceptions.ExceptionUtil; -import cn.hutool.core.thread.ThreadUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.exception.ExceptionUtils; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/glxp/api/upload/uploadController.java b/src/main/java/com/glxp/api/upload/uploadController.java index 4c46dd5b..63dfe4e6 100644 --- a/src/main/java/com/glxp/api/upload/uploadController.java +++ b/src/main/java/com/glxp/api/upload/uploadController.java @@ -1,10 +1,8 @@ package com.glxp.api.upload; -import cn.hutool.core.exceptions.ExceptionUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.util.MinioUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.exception.ExceptionUtils; diff --git a/src/main/java/com/glxp/api/util/FileUtils.java b/src/main/java/com/glxp/api/util/FileUtils.java index dc27bf73..6d3ce39b 100644 --- a/src/main/java/com/glxp/api/util/FileUtils.java +++ b/src/main/java/com/glxp/api/util/FileUtils.java @@ -2,22 +2,8 @@ package com.glxp.api.util; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; -import org.apache.commons.beanutils.PropertyUtilsBean; - -import java.io.BufferedReader; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.FileReader; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.RandomAccessFile; -import java.io.Reader; -import java.io.UnsupportedEncodingException; + +import java.io.*; import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; diff --git a/src/main/java/com/glxp/api/util/HttpClient.java b/src/main/java/com/glxp/api/util/HttpClient.java index 23d0dff6..679642ba 100644 --- a/src/main/java/com/glxp/api/util/HttpClient.java +++ b/src/main/java/com/glxp/api/util/HttpClient.java @@ -1,6 +1,5 @@ package com.glxp.api.util; -import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; diff --git a/src/main/java/com/glxp/api/util/MinioUtil.java b/src/main/java/com/glxp/api/util/MinioUtil.java index 21b2d235..9d7ac990 100644 --- a/src/main/java/com/glxp/api/util/MinioUtil.java +++ b/src/main/java/com/glxp/api/util/MinioUtil.java @@ -7,7 +7,6 @@ import io.minio.http.Method; import io.minio.policy.PolicyType; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; import org.springframework.web.multipart.MultipartFile; import org.xmlpull.v1.XmlPullParserException; diff --git a/src/main/java/com/glxp/api/util/alihealth/AlihealthUtils.java b/src/main/java/com/glxp/api/util/alihealth/AlihealthUtils.java index a606fec1..4ba96692 100644 --- a/src/main/java/com/glxp/api/util/alihealth/AlihealthUtils.java +++ b/src/main/java/com/glxp/api/util/alihealth/AlihealthUtils.java @@ -4,16 +4,16 @@ import cn.hutool.core.bean.BeanUtil; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.AliConstants; -import com.glxp.api.entity.thrsys.ThirdAliDrug; import com.glxp.api.entity.alihealth.AliKytSearchbill; +import com.glxp.api.entity.thrsys.ThirdAliDrug; import com.glxp.api.httpClient.serviceClient.AlihealthClient; import com.glxp.api.req.alihealth.AlihealthKytCommonParametersReqeust; import com.glxp.api.req.alihealth.AlihealthKytDrugrescodeReqeust; import com.glxp.api.req.alihealth.AlihealthKytSearchbillReqeust; import com.glxp.api.req.alihealth.AlihealthKytSinglerelationReqeust; +import com.glxp.api.req.alihealth.local.AlihealthKytThirdAliSearchbillInsertReqeust; import com.glxp.api.req.alihealth.local.AlihealthRelCodeInsertReqeust; import com.glxp.api.req.alihealth.local.AlihealthThirdAliDrugInsertReqeust; -import com.glxp.api.req.alihealth.local.AlihealthKytThirdAliSearchbillInsertReqeust; import com.glxp.api.res.alihealth.AlihealthKytDrugrescodeResponse; import com.glxp.api.res.alihealth.AlihealthKytSearchbillResponse; import com.glxp.api.res.alihealth.AlihealthKytSinglerelationResponse; diff --git a/src/main/java/com/glxp/api/util/alihealth/CopyUtils.java b/src/main/java/com/glxp/api/util/alihealth/CopyUtils.java index 6127d094..5c3aed3e 100644 --- a/src/main/java/com/glxp/api/util/alihealth/CopyUtils.java +++ b/src/main/java/com/glxp/api/util/alihealth/CopyUtils.java @@ -1,9 +1,7 @@ package com.glxp.api.util.alihealth; -import cn.hutool.core.bean.BeanUtil; import com.glxp.api.util.StringUtils; import lombok.extern.slf4j.Slf4j; -import org.jfree.util.Log; import java.lang.reflect.Field; import java.util.Map; diff --git a/src/main/java/com/glxp/api/util/page/ListPageRequest.java b/src/main/java/com/glxp/api/util/page/ListPageRequest.java index b0bbeb65..ca8d3366 100644 --- a/src/main/java/com/glxp/api/util/page/ListPageRequest.java +++ b/src/main/java/com/glxp/api/util/page/ListPageRequest.java @@ -2,7 +2,6 @@ package com.glxp.api.util.page; import com.github.pagehelper.PageHelper; import lombok.Data; -import lombok.Value; import javax.validation.constraints.Max; import javax.validation.constraints.Min; diff --git a/src/main/java/com/glxp/api/util/redis/RedisDelayedQueue.java b/src/main/java/com/glxp/api/util/redis/RedisDelayedQueue.java index 09e9c76d..5d86def3 100644 --- a/src/main/java/com/glxp/api/util/redis/RedisDelayedQueue.java +++ b/src/main/java/com/glxp/api/util/redis/RedisDelayedQueue.java @@ -2,12 +2,10 @@ package com.glxp.api.util.redis; import org.springframework.stereotype.Component; import redis.clients.jedis.Jedis; +import redis.clients.jedis.resps.Tuple; -import java.util.List; -import java.util.Set; import java.util.Iterator; -import java.util.concurrent.TimeUnit; -import redis.clients.jedis.resps.Tuple; +import java.util.List; @Component public class RedisDelayedQueue {