From 1b6eb549d8e955804692978d56f050aa942219dd Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 20 Oct 2023 11:15:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DeptDeviceDetailController.java | 14 ++++---- .../DeviceAssetCertController.java | 8 ++--- .../DeviceAssetLoacationController.java | 2 +- .../DeviceAssetUserController.java | 2 +- .../DeviceInspectOrderController.java | 12 +++---- .../DeviceInspectPlanController.java | 12 +++---- .../DeviceInspectPlanDelectController.java | 11 ++---- .../DeviceInspectSetController.java | 10 +++--- .../DeviceInspectTakeController.java | 22 ++++-------- .../{inv => dev}/DeviceMAOrderController.java | 12 +++---- .../DeviceMAOrderDetailCotroller.java | 10 +++--- .../DeviceProjectSetController.java | 8 ++--- .../DeviceReceiveDetailController.java | 12 +++---- .../DeviceReceiveOrderController.java | 27 ++++++-------- .../DeviceRepairOrderController.java | 12 +++---- .../DeviceRepairOrderDetailController.java | 12 +++---- .../{inv => dev}/InvMAOrderController.java | 10 +++--- .../InvMAOrderDetailController.java | 12 +++---- .../dao/{inv => dev}/DeptDeviceDetailDao.java | 12 +++---- .../{inv => dev}/DeviceAssetCertMapper.java | 4 +-- .../DeviceAssetLoacationMapper.java | 4 +-- .../{inv => dev}/DeviceAssetUsageMapper.java | 4 +-- .../{inv => dev}/DeviceAssetUserMapper.java | 4 +-- .../{inv => dev}/DeviceInspectOrderDao.java | 10 +++--- .../{inv => dev}/DeviceInspectPlanDao.java | 9 +++-- .../DeviceInspectPlanDelectMapper.java | 6 ++-- .../dao/{inv => dev}/DeviceInspectSetDao.java | 8 ++--- .../DeviceInspectTaskDetailMapper.java | 9 ++--- .../api/dao/dev/DeviceInspectTaskMapper.java | 14 ++++++++ .../dao/{inv => dev}/DeviceMAOrderDao.java | 10 +++--- .../{inv => dev}/DeviceMAOrderDetailDao.java | 10 +++--- .../{inv => dev}/DeviceProjectSetMapper.java | 8 ++--- .../{inv => dev}/DeviceReceiveOrderDao.java | 10 +++--- .../DeviceReceiveOrderDetailDao.java | 10 +++--- .../{inv => dev}/DeviceRepairOrderDao.java | 10 +++--- .../DeviceRepairOrderDetailMapper.java | 8 ++--- .../dao/{inv => dev}/InvMAExplanationDao.java | 6 ++-- .../api/dao/{inv => dev}/InvMAOrderDao.java | 10 +++--- .../dao/{inv => dev}/InvMAOrderDetailDao.java | 10 +++--- .../api/dao/inv/DeviceInspectTaskMapper.java | 18 ---------- .../{inv => dev}/DeptDeviceDetailEntity.java | 2 +- .../{inv => dev}/DeviceAssetCertEntity.java | 2 +- .../DeviceAssetLoacationEntity.java | 2 +- .../{inv => dev}/DeviceAssetUsageEntity.java | 2 +- .../{inv => dev}/DeviceAssetUserEntity.java | 2 +- .../DeviceInspectOrderEntity.java | 4 +-- .../DeviceInspectPlanDelectEntity.java | 4 +-- .../{inv => dev}/DeviceInspectPlanEntity.java | 2 +- .../{inv => dev}/DeviceInspectSetEntity.java | 4 +-- .../DeviceInspectTaskDetailEntity.java | 2 +- .../{inv => dev}/DeviceInspectTaskEntity.java | 2 +- .../DeviceMAOrderDetailEntity.java | 4 +-- .../{inv => dev}/DeviceMAOrderEntity.java | 4 +-- .../entity/{inv => dev}/DeviceProjectSet.java | 2 +- .../DeviceReceiveOrderDetailEntity.java | 2 +- .../DeviceReceiveOrderEntity.java | 2 +- .../DeviceRepairOrderDetailEntity.java | 2 +- .../{inv => dev}/DeviceRepairOrderEntity.java | 2 +- .../{inv => dev}/InvMAExplanationEntity.java | 4 +-- .../{inv => dev}/InvMAOrderDetailEntity.java | 4 +-- .../entity/{inv => dev}/InvMAOrderEntity.java | 4 +-- .../glxp/api/req/basic/BasicDataRequest.java | 2 +- .../{inv => dev}/AddDeptDeviceRequest.java | 2 +- .../AddDeviceInspectOrderRequest.java | 2 +- .../AddDeviceInspectPlanRequest.java | 2 +- .../AddDeviceInspectSetRequest.java | 2 +- .../{inv => dev}/AddDeviceMAOrderRequest.java | 2 +- .../AddDeviceReceiveOrderDetailRequest.java | 2 +- .../AddDeviceRepairOrderRequest.java | 2 +- .../AddInvMAOrderDetailRequest.java | 2 +- .../{inv => dev}/DeviceProjectSetRequest.java | 2 +- .../{inv => dev}/FilterDeptDeviceRequest.java | 2 +- .../FilterDeviceInspectOrderRequest.java | 2 +- .../FilterDeviceInspectPlanRequest.java | 2 +- .../FilterDeviceInspectTakeRequest.java | 2 +- .../FilterDeviceMAOrderDetailRequest.java | 2 +- .../FilterDeviceMAOrderRequest.java | 2 +- ...FilterDeviceReceiveOrderDetailRequest.java | 4 +-- .../FilterDeviceReceiveOrderRequest.java | 2 +- .../FilterDeviceRepairOrderDetailRequest.java | 2 +- .../FilterDeviceRepairOrderRequest.java | 2 +- .../FilterInvMAOrderDetailRequest.java | 2 +- .../{inv => dev}/FilterInvMAOrderRequest.java | 2 +- .../{inv => dev}/PostDeviceCertRequest.java | 4 +-- .../api/res/{inv => dev}/DateRequest.java | 2 +- .../DeptDeviceDetailResponse.java | 2 +- .../DeviceInspectOrderResponse.java | 2 +- .../DeviceInspectPlanResponse.java | 2 +- .../DeviceInspectSetResponse.java | 2 +- .../DeviceInspectTakeResponse.java | 2 +- .../DeviceMAOrderDetailResponse.java | 2 +- .../{inv => dev}/DeviceMAOrderResponse.java | 2 +- .../DeviceProjectSetResponse.java | 2 +- .../DeviceReceiveOrderDetailResponse.java | 2 +- .../DeviceReceiveOrderResponse.java | 2 +- .../DeviceRepairOrderDetailResponse.java | 2 +- .../DeviceRepairOrderResponse.java | 2 +- .../InvMAOrderDetailResponse.java | 2 +- .../res/{inv => dev}/InvMAOrderResponse.java | 2 +- .../{inv => dev}/InvMAProductResponse.java | 2 +- .../res/sync/SpsSyncDeviceTakeResponse.java | 6 ++-- .../res/sync/SpsSyncDeviceTaskResponse.java | 4 +-- .../{inv => dev}/DeptDeviceDetailService.java | 12 +++---- .../{inv => dev}/DeviceAssetCertService.java | 4 +-- .../DeviceAssetLoacationService.java | 6 ++-- .../{inv => dev}/DeviceAssetUsageService.java | 6 ++-- .../{inv => dev}/DeviceAssetUserService.java | 6 ++-- .../DeviceInspectOrderService.java | 10 +++--- .../DeviceInspectPlanDelectService.java | 6 ++-- .../DeviceInspectPlanService.java | 10 +++--- .../{inv => dev}/DeviceInspectSetService.java | 8 ++--- .../DeviceInspectTaskDetailService.java | 9 ++--- .../DeviceInspectTaskService.java | 10 +++--- .../DeviceMAOrderDetailService.java | 8 ++--- .../{inv => dev}/DeviceMAOrderService.java | 10 +++--- .../{inv => dev}/DeviceProjectSetService.java | 11 +++--- .../DeviceReceiveOrderDetailService.java | 11 +++--- .../DeviceReceiveOrderService.java | 9 +++-- .../DeviceRepairOrderDetailService.java | 8 ++--- .../DeviceRepairOrderService.java | 10 +++--- .../{inv => dev}/InvMAOrderDetailService.java | 10 +++--- .../{inv => dev}/InvMAOrderService.java | 8 ++--- .../impl/DeptDeviceDetailServiceImpl.java | 24 ++++++------- .../impl/DeviceAssetCertServiceImpl.java | 8 ++--- .../impl/DeviceInspectOrderServiceImpl.java | 22 ++++++------ .../DeviceInspectPlanDelectServiceImpl.java | 8 ++--- .../impl/DeviceInspectPlanServiceImpl.java | 30 ++++++++-------- .../impl/DeviceInspectSetServiceImpl.java | 16 ++++----- .../impl/DeviceMAOrderDetailServiceImpl.java | 16 ++++----- .../impl/DeviceMAOrderServiceImpl.java | 22 ++++++------ .../DeviceReceiveOrderDetailServiceImpl.java | 22 +++++------- .../impl/DeviceReceiveOrderServiceImpl.java | 35 +++++-------------- .../DeviceRepairOrderDetailServiceImpl.java | 12 +++---- .../impl/DeviceRepairOrderServiceImpl.java | 28 ++++++++------- .../impl/InvMAOrderDetailServiceImpl.java | 16 ++++++--- .../impl/InvMAOrderServiceImpl.java | 16 ++++----- .../inout/impl/IoStatMonthServiceImpl.java | 3 +- .../inout/impl/IoStatQuarterServiceImpl.java | 2 -- .../glxp/api/service/sync/HeartService.java | 14 ++++---- .../com/glxp/api/task/DevicePlanTask.java | 6 ++-- src/main/java/com/glxp/api/util/IdUtil.java | 2 +- .../{inv => dev}/DeptDeviceDetailDao.xml | 8 ++--- .../{inv => dev}/DeviceAssetCertMapper.xml | 8 ++--- .../DeviceAssetLoacationMapper.xml | 4 +-- .../{inv => dev}/DeviceAssetUsageMapper.xml | 4 +-- .../{inv => dev}/DeviceAssetUserMapper.xml | 4 +-- .../{inv => dev}/DeviceInspectOrderDao.xml | 8 ++--- .../{inv => dev}/DeviceInspectPlanDao.xml | 8 ++--- .../DeviceInspectPlanDelectMapper.xml | 6 ++-- .../{inv => dev}/DeviceInspectSetDao.xml | 6 ++-- .../DeviceInspectTaskDetailMapper.xml | 8 ++--- .../{inv => dev}/DeviceInspectTaskMapper.xml | 6 ++-- .../mapper/{inv => dev}/DeviceMAOrderDao.xml | 8 ++--- .../{inv => dev}/DeviceMAOrderDetailDao.xml | 10 +++--- .../{inv => dev}/DeviceProjectSetMapper.xml | 6 ++-- .../{inv => dev}/DeviceReceiveOrderDao.xml | 4 +-- .../DeviceReceiveOrderDetailDao.xml | 14 ++++---- .../{inv => dev}/DeviceRepairOrderDao.xml | 6 ++-- .../DeviceRepairOrderDetailMapper.xml | 6 ++-- .../{inv => dev}/InvMAExplanationDao.xml | 6 ++-- .../mapper/{inv => dev}/InvMAOrderDao.xml | 6 ++-- .../{inv => dev}/InvMAOrderDetailDao.xml | 8 ++--- 162 files changed, 554 insertions(+), 616 deletions(-) rename src/main/java/com/glxp/api/controller/{inv => dev}/DeptDeviceDetailController.java (96%) rename src/main/java/com/glxp/api/controller/{inv => dev}/DeviceAssetCertController.java (95%) rename src/main/java/com/glxp/api/controller/{inv => dev}/DeviceAssetLoacationController.java (84%) rename src/main/java/com/glxp/api/controller/{inv => dev}/DeviceAssetUserController.java (87%) rename src/main/java/com/glxp/api/controller/{inv => dev}/DeviceInspectOrderController.java (91%) rename src/main/java/com/glxp/api/controller/{inv => dev}/DeviceInspectPlanController.java (92%) rename src/main/java/com/glxp/api/controller/{inv => dev}/DeviceInspectPlanDelectController.java (89%) rename src/main/java/com/glxp/api/controller/{inv => dev}/DeviceInspectSetController.java (88%) rename src/main/java/com/glxp/api/controller/{inv => dev}/DeviceInspectTakeController.java (90%) rename src/main/java/com/glxp/api/controller/{inv => dev}/DeviceMAOrderController.java (95%) rename src/main/java/com/glxp/api/controller/{inv => dev}/DeviceMAOrderDetailCotroller.java (92%) rename src/main/java/com/glxp/api/controller/{inv => dev}/DeviceProjectSetController.java (94%) rename src/main/java/com/glxp/api/controller/{inv => dev}/DeviceReceiveDetailController.java (93%) rename src/main/java/com/glxp/api/controller/{inv => dev}/DeviceReceiveOrderController.java (92%) rename src/main/java/com/glxp/api/controller/{inv => dev}/DeviceRepairOrderController.java (94%) rename src/main/java/com/glxp/api/controller/{inv => dev}/DeviceRepairOrderDetailController.java (90%) rename src/main/java/com/glxp/api/controller/{inv => dev}/InvMAOrderController.java (95%) rename src/main/java/com/glxp/api/controller/{inv => dev}/InvMAOrderDetailController.java (93%) rename src/main/java/com/glxp/api/dao/{inv => dev}/DeptDeviceDetailDao.java (74%) rename src/main/java/com/glxp/api/dao/{inv => dev}/DeviceAssetCertMapper.java (85%) rename src/main/java/com/glxp/api/dao/{inv => dev}/DeviceAssetLoacationMapper.java (69%) rename src/main/java/com/glxp/api/dao/{inv => dev}/DeviceAssetUsageMapper.java (69%) rename src/main/java/com/glxp/api/dao/{inv => dev}/DeviceAssetUserMapper.java (70%) rename src/main/java/com/glxp/api/dao/{inv => dev}/DeviceInspectOrderDao.java (75%) rename src/main/java/com/glxp/api/dao/{inv => dev}/DeviceInspectPlanDao.java (72%) rename src/main/java/com/glxp/api/dao/{inv => dev}/DeviceInspectPlanDelectMapper.java (69%) rename src/main/java/com/glxp/api/dao/{inv => dev}/DeviceInspectSetDao.java (71%) rename src/main/java/com/glxp/api/dao/{inv => dev}/DeviceInspectTaskDetailMapper.java (51%) create mode 100644 src/main/java/com/glxp/api/dao/dev/DeviceInspectTaskMapper.java rename src/main/java/com/glxp/api/dao/{inv => dev}/DeviceMAOrderDao.java (76%) rename src/main/java/com/glxp/api/dao/{inv => dev}/DeviceMAOrderDetailDao.java (82%) rename src/main/java/com/glxp/api/dao/{inv => dev}/DeviceProjectSetMapper.java (62%) rename src/main/java/com/glxp/api/dao/{inv => dev}/DeviceReceiveOrderDao.java (80%) rename src/main/java/com/glxp/api/dao/{inv => dev}/DeviceReceiveOrderDetailDao.java (87%) rename src/main/java/com/glxp/api/dao/{inv => dev}/DeviceRepairOrderDao.java (75%) rename src/main/java/com/glxp/api/dao/{inv => dev}/DeviceRepairOrderDetailMapper.java (62%) rename src/main/java/com/glxp/api/dao/{inv => dev}/InvMAExplanationDao.java (77%) rename src/main/java/com/glxp/api/dao/{inv => dev}/InvMAOrderDao.java (65%) rename src/main/java/com/glxp/api/dao/{inv => dev}/InvMAOrderDetailDao.java (77%) delete mode 100644 src/main/java/com/glxp/api/dao/inv/DeviceInspectTaskMapper.java rename src/main/java/com/glxp/api/entity/{inv => dev}/DeptDeviceDetailEntity.java (99%) rename src/main/java/com/glxp/api/entity/{inv => dev}/DeviceAssetCertEntity.java (98%) rename src/main/java/com/glxp/api/entity/{inv => dev}/DeviceAssetLoacationEntity.java (97%) rename src/main/java/com/glxp/api/entity/{inv => dev}/DeviceAssetUsageEntity.java (97%) rename src/main/java/com/glxp/api/entity/{inv => dev}/DeviceAssetUserEntity.java (97%) rename src/main/java/com/glxp/api/entity/{inv => dev}/DeviceInspectOrderEntity.java (98%) rename src/main/java/com/glxp/api/entity/{inv => dev}/DeviceInspectPlanDelectEntity.java (96%) rename src/main/java/com/glxp/api/entity/{inv => dev}/DeviceInspectPlanEntity.java (98%) rename src/main/java/com/glxp/api/entity/{inv => dev}/DeviceInspectSetEntity.java (97%) rename src/main/java/com/glxp/api/entity/{inv => dev}/DeviceInspectTaskDetailEntity.java (97%) rename src/main/java/com/glxp/api/entity/{inv => dev}/DeviceInspectTaskEntity.java (98%) rename src/main/java/com/glxp/api/entity/{inv => dev}/DeviceMAOrderDetailEntity.java (98%) rename src/main/java/com/glxp/api/entity/{inv => dev}/DeviceMAOrderEntity.java (98%) rename src/main/java/com/glxp/api/entity/{inv => dev}/DeviceProjectSet.java (97%) rename src/main/java/com/glxp/api/entity/{inv => dev}/DeviceReceiveOrderDetailEntity.java (98%) rename src/main/java/com/glxp/api/entity/{inv => dev}/DeviceReceiveOrderEntity.java (98%) rename src/main/java/com/glxp/api/entity/{inv => dev}/DeviceRepairOrderDetailEntity.java (97%) rename src/main/java/com/glxp/api/entity/{inv => dev}/DeviceRepairOrderEntity.java (98%) rename src/main/java/com/glxp/api/entity/{inv => dev}/InvMAExplanationEntity.java (96%) rename src/main/java/com/glxp/api/entity/{inv => dev}/InvMAOrderDetailEntity.java (98%) rename src/main/java/com/glxp/api/entity/{inv => dev}/InvMAOrderEntity.java (98%) rename src/main/java/com/glxp/api/req/{inv => dev}/AddDeptDeviceRequest.java (98%) rename src/main/java/com/glxp/api/req/{inv => dev}/AddDeviceInspectOrderRequest.java (96%) rename src/main/java/com/glxp/api/req/{inv => dev}/AddDeviceInspectPlanRequest.java (97%) rename src/main/java/com/glxp/api/req/{inv => dev}/AddDeviceInspectSetRequest.java (95%) rename src/main/java/com/glxp/api/req/{inv => dev}/AddDeviceMAOrderRequest.java (95%) rename src/main/java/com/glxp/api/req/{inv => dev}/AddDeviceReceiveOrderDetailRequest.java (95%) rename src/main/java/com/glxp/api/req/{inv => dev}/AddDeviceRepairOrderRequest.java (97%) rename src/main/java/com/glxp/api/req/{inv => dev}/AddInvMAOrderDetailRequest.java (91%) rename src/main/java/com/glxp/api/req/{inv => dev}/DeviceProjectSetRequest.java (96%) rename src/main/java/com/glxp/api/req/{inv => dev}/FilterDeptDeviceRequest.java (97%) rename src/main/java/com/glxp/api/req/{inv => dev}/FilterDeviceInspectOrderRequest.java (96%) rename src/main/java/com/glxp/api/req/{inv => dev}/FilterDeviceInspectPlanRequest.java (97%) rename src/main/java/com/glxp/api/req/{inv => dev}/FilterDeviceInspectTakeRequest.java (97%) rename src/main/java/com/glxp/api/req/{inv => dev}/FilterDeviceMAOrderDetailRequest.java (90%) rename src/main/java/com/glxp/api/req/{inv => dev}/FilterDeviceMAOrderRequest.java (95%) rename src/main/java/com/glxp/api/req/{inv => dev}/FilterDeviceReceiveOrderDetailRequest.java (95%) rename src/main/java/com/glxp/api/req/{inv => dev}/FilterDeviceReceiveOrderRequest.java (96%) rename src/main/java/com/glxp/api/req/{inv => dev}/FilterDeviceRepairOrderDetailRequest.java (95%) rename src/main/java/com/glxp/api/req/{inv => dev}/FilterDeviceRepairOrderRequest.java (96%) rename src/main/java/com/glxp/api/req/{inv => dev}/FilterInvMAOrderDetailRequest.java (94%) rename src/main/java/com/glxp/api/req/{inv => dev}/FilterInvMAOrderRequest.java (94%) rename src/main/java/com/glxp/api/req/{inv => dev}/PostDeviceCertRequest.java (60%) rename src/main/java/com/glxp/api/res/{inv => dev}/DateRequest.java (84%) rename src/main/java/com/glxp/api/res/{inv => dev}/DeptDeviceDetailResponse.java (98%) rename src/main/java/com/glxp/api/res/{inv => dev}/DeviceInspectOrderResponse.java (98%) rename src/main/java/com/glxp/api/res/{inv => dev}/DeviceInspectPlanResponse.java (98%) rename src/main/java/com/glxp/api/res/{inv => dev}/DeviceInspectSetResponse.java (96%) rename src/main/java/com/glxp/api/res/{inv => dev}/DeviceInspectTakeResponse.java (98%) rename src/main/java/com/glxp/api/res/{inv => dev}/DeviceMAOrderDetailResponse.java (98%) rename src/main/java/com/glxp/api/res/{inv => dev}/DeviceMAOrderResponse.java (96%) rename src/main/java/com/glxp/api/res/{inv => dev}/DeviceProjectSetResponse.java (96%) rename src/main/java/com/glxp/api/res/{inv => dev}/DeviceReceiveOrderDetailResponse.java (98%) rename src/main/java/com/glxp/api/res/{inv => dev}/DeviceReceiveOrderResponse.java (98%) rename src/main/java/com/glxp/api/res/{inv => dev}/DeviceRepairOrderDetailResponse.java (95%) rename src/main/java/com/glxp/api/res/{inv => dev}/DeviceRepairOrderResponse.java (98%) rename src/main/java/com/glxp/api/res/{inv => dev}/InvMAOrderDetailResponse.java (98%) rename src/main/java/com/glxp/api/res/{inv => dev}/InvMAOrderResponse.java (97%) rename src/main/java/com/glxp/api/res/{inv => dev}/InvMAProductResponse.java (94%) rename src/main/java/com/glxp/api/service/{inv => dev}/DeptDeviceDetailService.java (74%) rename src/main/java/com/glxp/api/service/{inv => dev}/DeviceAssetCertService.java (86%) rename src/main/java/com/glxp/api/service/{inv => dev}/DeviceAssetLoacationService.java (62%) rename src/main/java/com/glxp/api/service/{inv => dev}/DeviceAssetUsageService.java (62%) rename src/main/java/com/glxp/api/service/{inv => dev}/DeviceAssetUserService.java (62%) rename src/main/java/com/glxp/api/service/{inv => dev}/DeviceInspectOrderService.java (85%) rename src/main/java/com/glxp/api/service/{inv => dev}/DeviceInspectPlanDelectService.java (77%) rename src/main/java/com/glxp/api/service/{inv => dev}/DeviceInspectPlanService.java (83%) rename src/main/java/com/glxp/api/service/{inv => dev}/DeviceInspectSetService.java (77%) rename src/main/java/com/glxp/api/service/{inv => dev}/DeviceInspectTaskDetailService.java (88%) rename src/main/java/com/glxp/api/service/{inv => dev}/DeviceInspectTaskService.java (86%) rename src/main/java/com/glxp/api/service/{inv => dev}/DeviceMAOrderDetailService.java (83%) rename src/main/java/com/glxp/api/service/{inv => dev}/DeviceMAOrderService.java (83%) rename src/main/java/com/glxp/api/service/{inv => dev}/DeviceProjectSetService.java (90%) rename src/main/java/com/glxp/api/service/{inv => dev}/DeviceReceiveOrderDetailService.java (78%) rename src/main/java/com/glxp/api/service/{inv => dev}/DeviceReceiveOrderService.java (83%) rename src/main/java/com/glxp/api/service/{inv => dev}/DeviceRepairOrderDetailService.java (74%) rename src/main/java/com/glxp/api/service/{inv => dev}/DeviceRepairOrderService.java (84%) rename src/main/java/com/glxp/api/service/{inv => dev}/InvMAOrderDetailService.java (80%) rename src/main/java/com/glxp/api/service/{inv => dev}/InvMAOrderService.java (86%) rename src/main/java/com/glxp/api/service/{inv => dev}/impl/DeptDeviceDetailServiceImpl.java (91%) rename src/main/java/com/glxp/api/service/{inv => dev}/impl/DeviceAssetCertServiceImpl.java (89%) rename src/main/java/com/glxp/api/service/{inv => dev}/impl/DeviceInspectOrderServiceImpl.java (92%) rename src/main/java/com/glxp/api/service/{inv => dev}/impl/DeviceInspectPlanDelectServiceImpl.java (91%) rename src/main/java/com/glxp/api/service/{inv => dev}/impl/DeviceInspectPlanServiceImpl.java (91%) rename src/main/java/com/glxp/api/service/{inv => dev}/impl/DeviceInspectSetServiceImpl.java (86%) rename src/main/java/com/glxp/api/service/{inv => dev}/impl/DeviceMAOrderDetailServiceImpl.java (87%) rename src/main/java/com/glxp/api/service/{inv => dev}/impl/DeviceMAOrderServiceImpl.java (94%) rename src/main/java/com/glxp/api/service/{inv => dev}/impl/DeviceReceiveOrderDetailServiceImpl.java (95%) rename src/main/java/com/glxp/api/service/{inv => dev}/impl/DeviceReceiveOrderServiceImpl.java (81%) rename src/main/java/com/glxp/api/service/{inv => dev}/impl/DeviceRepairOrderDetailServiceImpl.java (86%) rename src/main/java/com/glxp/api/service/{inv => dev}/impl/DeviceRepairOrderServiceImpl.java (92%) rename src/main/java/com/glxp/api/service/{inv => dev}/impl/InvMAOrderDetailServiceImpl.java (95%) rename src/main/java/com/glxp/api/service/{inv => dev}/impl/InvMAOrderServiceImpl.java (93%) rename src/main/resources/mybatis/mapper/{inv => dev}/DeptDeviceDetailDao.xml (94%) rename src/main/resources/mybatis/mapper/{inv => dev}/DeviceAssetCertMapper.xml (92%) rename src/main/resources/mybatis/mapper/{inv => dev}/DeviceAssetLoacationMapper.xml (90%) rename src/main/resources/mybatis/mapper/{inv => dev}/DeviceAssetUsageMapper.xml (89%) rename src/main/resources/mybatis/mapper/{inv => dev}/DeviceAssetUserMapper.xml (90%) rename src/main/resources/mybatis/mapper/{inv => dev}/DeviceInspectOrderDao.xml (92%) rename src/main/resources/mybatis/mapper/{inv => dev}/DeviceInspectPlanDao.xml (95%) rename src/main/resources/mybatis/mapper/{inv => dev}/DeviceInspectPlanDelectMapper.xml (84%) rename src/main/resources/mybatis/mapper/{inv => dev}/DeviceInspectSetDao.xml (81%) rename src/main/resources/mybatis/mapper/{inv => dev}/DeviceInspectTaskDetailMapper.xml (86%) rename src/main/resources/mybatis/mapper/{inv => dev}/DeviceInspectTaskMapper.xml (95%) rename src/main/resources/mybatis/mapper/{inv => dev}/DeviceMAOrderDao.xml (89%) rename src/main/resources/mybatis/mapper/{inv => dev}/DeviceMAOrderDetailDao.xml (90%) rename src/main/resources/mybatis/mapper/{inv => dev}/DeviceProjectSetMapper.xml (90%) rename src/main/resources/mybatis/mapper/{inv => dev}/DeviceReceiveOrderDao.xml (95%) rename src/main/resources/mybatis/mapper/{inv => dev}/DeviceReceiveOrderDetailDao.xml (92%) rename src/main/resources/mybatis/mapper/{inv => dev}/DeviceRepairOrderDao.xml (94%) rename src/main/resources/mybatis/mapper/{inv => dev}/DeviceRepairOrderDetailMapper.xml (88%) rename src/main/resources/mybatis/mapper/{inv => dev}/InvMAExplanationDao.xml (75%) rename src/main/resources/mybatis/mapper/{inv => dev}/InvMAOrderDao.xml (93%) rename src/main/resources/mybatis/mapper/{inv => dev}/InvMAOrderDetailDao.xml (90%) diff --git a/src/main/java/com/glxp/api/controller/inv/DeptDeviceDetailController.java b/src/main/java/com/glxp/api/controller/dev/DeptDeviceDetailController.java similarity index 96% rename from src/main/java/com/glxp/api/controller/inv/DeptDeviceDetailController.java rename to src/main/java/com/glxp/api/controller/dev/DeptDeviceDetailController.java index 320789c8d..7aa1dfdcb 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeptDeviceDetailController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeptDeviceDetailController.java @@ -1,4 +1,4 @@ -package com.glxp.api.controller.inv; +package com.glxp.api.controller.dev; import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; @@ -8,16 +8,16 @@ 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.entity.basic.UdiEntity; -import com.glxp.api.entity.inv.DeptDeviceDetailEntity; +import com.glxp.api.entity.dev.DeptDeviceDetailEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.req.inout.InspectionPDFTemplateRequest; -import com.glxp.api.req.inv.AddDeptDeviceRequest; -import com.glxp.api.req.inv.FilterDeptDeviceRequest; -import com.glxp.api.req.inv.FilterDeviceReceiveOrderRequest; +import com.glxp.api.req.dev.AddDeptDeviceRequest; +import com.glxp.api.req.dev.FilterDeptDeviceRequest; +import com.glxp.api.req.dev.FilterDeviceReceiveOrderRequest; import com.glxp.api.req.system.DeleteRequest; -import com.glxp.api.res.inv.DeptDeviceDetailResponse; -import com.glxp.api.service.inv.DeptDeviceDetailService; +import com.glxp.api.res.dev.DeptDeviceDetailResponse; +import com.glxp.api.service.dev.DeptDeviceDetailService; import com.glxp.api.service.system.SystemPDFModuleService; import com.glxp.api.service.system.SystemPDFTemplateService; import com.glxp.api.util.CustomUtil; diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceAssetCertController.java b/src/main/java/com/glxp/api/controller/dev/DeviceAssetCertController.java similarity index 95% rename from src/main/java/com/glxp/api/controller/inv/DeviceAssetCertController.java rename to src/main/java/com/glxp/api/controller/dev/DeviceAssetCertController.java index 59d1659b3..0e23940a1 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceAssetCertController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceAssetCertController.java @@ -1,4 +1,4 @@ -package com.glxp.api.controller.inv; +package com.glxp.api.controller.dev; import org.springframework.beans.BeanUtils; import cn.hutool.core.util.IdUtil; @@ -10,12 +10,12 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.BusinessType; import com.glxp.api.constant.FileConstant; import com.glxp.api.controller.BaseController; -import com.glxp.api.entity.inv.DeviceAssetCertEntity; +import com.glxp.api.entity.dev.DeviceAssetCertEntity; import com.glxp.api.req.inv.FilterInvCertRequest; -import com.glxp.api.req.inv.PostDeviceCertRequest; +import com.glxp.api.req.dev.PostDeviceCertRequest; import com.glxp.api.req.system.DeleteDeviceFileRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.service.inv.DeviceAssetCertService; +import com.glxp.api.service.dev.DeviceAssetCertService; 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/inv/DeviceAssetLoacationController.java b/src/main/java/com/glxp/api/controller/dev/DeviceAssetLoacationController.java similarity index 84% rename from src/main/java/com/glxp/api/controller/inv/DeviceAssetLoacationController.java rename to src/main/java/com/glxp/api/controller/dev/DeviceAssetLoacationController.java index ec867fa3a..d57823f62 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceAssetLoacationController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceAssetLoacationController.java @@ -1,4 +1,4 @@ -package com.glxp.api.controller.inv; +package com.glxp.api.controller.dev; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceAssetUserController.java b/src/main/java/com/glxp/api/controller/dev/DeviceAssetUserController.java similarity index 87% rename from src/main/java/com/glxp/api/controller/inv/DeviceAssetUserController.java rename to src/main/java/com/glxp/api/controller/dev/DeviceAssetUserController.java index 7b8f1fca5..b009c6a28 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceAssetUserController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceAssetUserController.java @@ -1,4 +1,4 @@ -package com.glxp.api.controller.inv; +package com.glxp.api.controller.dev; import com.glxp.api.controller.BaseController; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceInspectOrderController.java b/src/main/java/com/glxp/api/controller/dev/DeviceInspectOrderController.java similarity index 91% rename from src/main/java/com/glxp/api/controller/inv/DeviceInspectOrderController.java rename to src/main/java/com/glxp/api/controller/dev/DeviceInspectOrderController.java index 36711332b..2bd16525b 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceInspectOrderController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceInspectOrderController.java @@ -1,16 +1,16 @@ -package com.glxp.api.controller.inv; +package com.glxp.api.controller.dev; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.common.req.UpdateRequest; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.entity.inv.DeviceInspectOrderEntity; -import com.glxp.api.req.inv.AddDeviceInspectOrderRequest; -import com.glxp.api.req.inv.FilterDeviceInspectOrderRequest; +import com.glxp.api.entity.dev.DeviceInspectOrderEntity; +import com.glxp.api.req.dev.AddDeviceInspectOrderRequest; +import com.glxp.api.req.dev.FilterDeviceInspectOrderRequest; import com.glxp.api.req.system.DeleteRequest; -import com.glxp.api.res.inv.DeviceInspectOrderResponse; -import com.glxp.api.service.inv.DeviceInspectOrderService; +import com.glxp.api.res.dev.DeviceInspectOrderResponse; +import com.glxp.api.service.dev.DeviceInspectOrderService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceInspectPlanController.java b/src/main/java/com/glxp/api/controller/dev/DeviceInspectPlanController.java similarity index 92% rename from src/main/java/com/glxp/api/controller/inv/DeviceInspectPlanController.java rename to src/main/java/com/glxp/api/controller/dev/DeviceInspectPlanController.java index c2db0cb92..8a9e5af2b 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceInspectPlanController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceInspectPlanController.java @@ -1,16 +1,16 @@ -package com.glxp.api.controller.inv; +package com.glxp.api.controller.dev; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.common.req.UpdateRequest; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.entity.inv.DeviceInspectPlanEntity; -import com.glxp.api.req.inv.AddDeviceInspectPlanRequest; -import com.glxp.api.req.inv.FilterDeviceInspectPlanRequest; +import com.glxp.api.entity.dev.DeviceInspectPlanEntity; +import com.glxp.api.req.dev.AddDeviceInspectPlanRequest; +import com.glxp.api.req.dev.FilterDeviceInspectPlanRequest; import com.glxp.api.req.system.DeleteRequest; -import com.glxp.api.res.inv.DeviceInspectPlanResponse; -import com.glxp.api.service.inv.DeviceInspectPlanService; +import com.glxp.api.res.dev.DeviceInspectPlanResponse; +import com.glxp.api.service.dev.DeviceInspectPlanService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceInspectPlanDelectController.java b/src/main/java/com/glxp/api/controller/dev/DeviceInspectPlanDelectController.java similarity index 89% rename from src/main/java/com/glxp/api/controller/inv/DeviceInspectPlanDelectController.java rename to src/main/java/com/glxp/api/controller/dev/DeviceInspectPlanDelectController.java index d4df8dba3..f5a3e7b6a 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceInspectPlanDelectController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceInspectPlanDelectController.java @@ -1,18 +1,13 @@ -package com.glxp.api.controller.inv; +package com.glxp.api.controller.dev; import cn.hutool.core.util.IdUtil; -import cn.hutool.core.util.StrUtil; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.entity.inv.DeviceInspectPlanDelectEntity; -import com.glxp.api.entity.inv.DeviceInspectSetEntity; -import com.glxp.api.req.inv.AddDeviceInspectSetRequest; -import com.glxp.api.res.inv.DeviceInspectSetResponse; +import com.glxp.api.entity.dev.DeviceInspectPlanDelectEntity; import com.glxp.api.service.auth.CustomerService; -import com.glxp.api.service.inv.DeviceInspectPlanDelectService; +import com.glxp.api.service.dev.DeviceInspectPlanDelectService; import lombok.extern.slf4j.Slf4j; -import org.apache.lucene.util.CollectionUtil; 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/inv/DeviceInspectSetController.java b/src/main/java/com/glxp/api/controller/dev/DeviceInspectSetController.java similarity index 88% rename from src/main/java/com/glxp/api/controller/inv/DeviceInspectSetController.java rename to src/main/java/com/glxp/api/controller/dev/DeviceInspectSetController.java index 7998b781c..cd59e3cc8 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceInspectSetController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceInspectSetController.java @@ -1,12 +1,12 @@ -package com.glxp.api.controller.inv; +package com.glxp.api.controller.dev; import cn.hutool.core.util.StrUtil; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.entity.inv.DeviceInspectSetEntity; -import com.glxp.api.req.inv.AddDeviceInspectSetRequest; -import com.glxp.api.res.inv.DeviceInspectSetResponse; -import com.glxp.api.service.inv.DeviceInspectSetService; +import com.glxp.api.entity.dev.DeviceInspectSetEntity; +import com.glxp.api.req.dev.AddDeviceInspectSetRequest; +import com.glxp.api.res.dev.DeviceInspectSetResponse; +import com.glxp.api.service.dev.DeviceInspectSetService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java b/src/main/java/com/glxp/api/controller/dev/DeviceInspectTakeController.java similarity index 90% rename from src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java rename to src/main/java/com/glxp/api/controller/dev/DeviceInspectTakeController.java index 3a68e8966..9921232c7 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceInspectTakeController.java @@ -1,7 +1,5 @@ -package com.glxp.api.controller.inv; +package com.glxp.api.controller.dev; -import cn.hutool.core.exceptions.ExceptionUtil; -import cn.hutool.core.thread.ThreadUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageInfo; import com.glxp.api.common.res.BaseResponse; @@ -11,24 +9,18 @@ import com.glxp.api.constant.Constant; import com.glxp.api.constant.DeviceStatus; import com.glxp.api.constant.SyncDelType; import com.glxp.api.controller.BaseController; -import com.glxp.api.entity.inv.DeviceInspectTaskDetailEntity; -import com.glxp.api.entity.inv.DeviceInspectTaskEntity; -import com.glxp.api.entity.system.SyncDataSetEntity; +import com.glxp.api.entity.dev.DeviceInspectTaskDetailEntity; +import com.glxp.api.entity.dev.DeviceInspectTaskEntity; import com.glxp.api.http.sync.SpGetHttpClient; import com.glxp.api.req.basic.BasicDataRequest; -import com.glxp.api.req.inv.FilterDeviceInspectTakeRequest; -import com.glxp.api.res.inv.DeviceInspectTakeResponse; -import com.glxp.api.res.sync.SpsSyncDeviceTakeResponse; -import com.glxp.api.service.inv.DeviceInspectTaskDetailService; -import com.glxp.api.service.inv.DeviceInspectTaskService; -import com.glxp.api.service.sync.HeartService; -import com.glxp.api.service.sync.SyncDataSetService; +import com.glxp.api.req.dev.FilterDeviceInspectTakeRequest; +import com.glxp.api.res.dev.DeviceInspectTakeResponse; +import com.glxp.api.service.dev.DeviceInspectTaskDetailService; +import com.glxp.api.service.dev.DeviceInspectTaskService; import com.glxp.api.task.SyncHeartService; import com.glxp.api.util.GennerOrderUtils; -import com.glxp.api.util.OkHttpCli; import com.glxp.api.util.OrderNoTypeBean; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.exception.ExceptionUtils; 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/inv/DeviceMAOrderController.java b/src/main/java/com/glxp/api/controller/dev/DeviceMAOrderController.java similarity index 95% rename from src/main/java/com/glxp/api/controller/inv/DeviceMAOrderController.java rename to src/main/java/com/glxp/api/controller/dev/DeviceMAOrderController.java index 68975b70f..e2341512e 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceMAOrderController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceMAOrderController.java @@ -1,4 +1,4 @@ -package com.glxp.api.controller.inv; +package com.glxp.api.controller.dev; import cn.hutool.json.JSONUtil; import com.github.pagehelper.PageInfo; @@ -6,16 +6,16 @@ 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.entity.inv.DeviceMAOrderEntity; +import com.glxp.api.entity.dev.DeviceMAOrderEntity; import com.glxp.api.entity.system.SystemPDFModuleEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.req.inout.InspectionPDFTemplateRequest; -import com.glxp.api.req.inv.AddDeviceMAOrderRequest; -import com.glxp.api.req.inv.FilterDeviceMAOrderRequest; +import com.glxp.api.req.dev.AddDeviceMAOrderRequest; +import com.glxp.api.req.dev.FilterDeviceMAOrderRequest; import com.glxp.api.req.system.FilterPdfModuleRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.inv.DeviceMAOrderResponse; -import com.glxp.api.service.inv.DeviceMAOrderService; +import com.glxp.api.res.dev.DeviceMAOrderResponse; +import com.glxp.api.service.dev.DeviceMAOrderService; import com.glxp.api.service.system.SystemPDFModuleService; import com.glxp.api.service.system.SystemPDFTemplateService; import com.glxp.api.util.JasperUtils; diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceMAOrderDetailCotroller.java b/src/main/java/com/glxp/api/controller/dev/DeviceMAOrderDetailCotroller.java similarity index 92% rename from src/main/java/com/glxp/api/controller/inv/DeviceMAOrderDetailCotroller.java rename to src/main/java/com/glxp/api/controller/dev/DeviceMAOrderDetailCotroller.java index bc6b280e0..0f4ed446b 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceMAOrderDetailCotroller.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceMAOrderDetailCotroller.java @@ -1,15 +1,15 @@ -package com.glxp.api.controller.inv; +package com.glxp.api.controller.dev; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; 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.entity.inv.DeviceMAOrderDetailEntity; -import com.glxp.api.req.inv.FilterDeviceMAOrderDetailRequest; +import com.glxp.api.entity.dev.DeviceMAOrderDetailEntity; +import com.glxp.api.req.dev.FilterDeviceMAOrderDetailRequest; import com.glxp.api.res.PageSimpleResponse; -import com.glxp.api.res.inv.DeviceMAOrderDetailResponse; -import com.glxp.api.service.inv.DeviceMAOrderDetailService; +import com.glxp.api.res.dev.DeviceMAOrderDetailResponse; +import com.glxp.api.service.dev.DeviceMAOrderDetailService; 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/inv/DeviceProjectSetController.java b/src/main/java/com/glxp/api/controller/dev/DeviceProjectSetController.java similarity index 94% rename from src/main/java/com/glxp/api/controller/inv/DeviceProjectSetController.java rename to src/main/java/com/glxp/api/controller/dev/DeviceProjectSetController.java index a8c57ab71..b504f2a4d 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceProjectSetController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceProjectSetController.java @@ -1,12 +1,12 @@ -package com.glxp.api.controller.inv; +package com.glxp.api.controller.dev; import com.github.pagehelper.PageInfo; 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.req.inv.DeviceProjectSetRequest; -import com.glxp.api.res.inv.DeviceProjectSetResponse; -import com.glxp.api.service.inv.DeviceProjectSetService; +import com.glxp.api.req.dev.DeviceProjectSetRequest; +import com.glxp.api.res.dev.DeviceProjectSetResponse; +import com.glxp.api.service.dev.DeviceProjectSetService; 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/inv/DeviceReceiveDetailController.java b/src/main/java/com/glxp/api/controller/dev/DeviceReceiveDetailController.java similarity index 93% rename from src/main/java/com/glxp/api/controller/inv/DeviceReceiveDetailController.java rename to src/main/java/com/glxp/api/controller/dev/DeviceReceiveDetailController.java index 128ae24e4..cfe83c3b2 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceReceiveDetailController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceReceiveDetailController.java @@ -1,18 +1,18 @@ -package com.glxp.api.controller.inv; +package com.glxp.api.controller.dev; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; 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.entity.inv.DeviceReceiveOrderDetailEntity; +import com.glxp.api.entity.dev.DeviceReceiveOrderDetailEntity; import com.glxp.api.req.basic.FilterUdiRelRequest; -import com.glxp.api.req.inv.AddDeviceReceiveOrderDetailRequest; -import com.glxp.api.req.inv.FilterDeviceReceiveOrderDetailRequest; +import com.glxp.api.req.dev.AddDeviceReceiveOrderDetailRequest; +import com.glxp.api.req.dev.FilterDeviceReceiveOrderDetailRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; -import com.glxp.api.res.inv.DeviceReceiveOrderDetailResponse; +import com.glxp.api.res.dev.DeviceReceiveOrderDetailResponse; import com.glxp.api.service.basic.UdiRelevanceService; -import com.glxp.api.service.inv.DeviceReceiveOrderDetailService; +import com.glxp.api.service.dev.DeviceReceiveOrderDetailService; 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/inv/DeviceReceiveOrderController.java b/src/main/java/com/glxp/api/controller/dev/DeviceReceiveOrderController.java similarity index 92% rename from src/main/java/com/glxp/api/controller/inv/DeviceReceiveOrderController.java rename to src/main/java/com/glxp/api/controller/dev/DeviceReceiveOrderController.java index bdb7b9b0c..8eb0958d1 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceReceiveOrderController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceReceiveOrderController.java @@ -1,4 +1,4 @@ -package com.glxp.api.controller.inv; +package com.glxp.api.controller.dev; import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; @@ -6,25 +6,18 @@ 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.FileConstant; -import com.glxp.api.dao.schedule.SystemParamConfigDao; -import com.glxp.api.entity.inv.DeviceReceiveOrderDetailEntity; -import com.glxp.api.entity.inv.DeviceReceiveOrderEntity; -import com.glxp.api.entity.inv.DeviceRepairOrderDetailEntity; -import com.glxp.api.entity.purchase.SupCertEntity; -import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; +import com.glxp.api.entity.dev.DeviceReceiveOrderEntity; import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; import com.glxp.api.entity.system.SystemPDFTemplateEntity; import com.glxp.api.req.inout.InspectionPDFTemplateRequest; -import com.glxp.api.req.inv.FilterDeptDeviceRequest; -import com.glxp.api.req.inv.FilterDeviceReceiveOrderDetailRequest; -import com.glxp.api.req.inv.FilterDeviceReceiveOrderRequest; -import com.glxp.api.res.inv.DeptDeviceDetailResponse; -import com.glxp.api.res.inv.DeviceReceiveOrderDetailResponse; -import com.glxp.api.res.inv.DeviceReceiveOrderResponse; -import com.glxp.api.service.inv.DeptDeviceDetailService; -import com.glxp.api.service.inv.DeviceReceiveOrderDetailService; -import com.glxp.api.service.inv.DeviceReceiveOrderService; +import com.glxp.api.req.dev.FilterDeptDeviceRequest; +import com.glxp.api.req.dev.FilterDeviceReceiveOrderDetailRequest; +import com.glxp.api.req.dev.FilterDeviceReceiveOrderRequest; +import com.glxp.api.res.dev.DeviceReceiveOrderDetailResponse; +import com.glxp.api.res.dev.DeviceReceiveOrderResponse; +import com.glxp.api.service.dev.DeptDeviceDetailService; +import com.glxp.api.service.dev.DeviceReceiveOrderDetailService; +import com.glxp.api.service.dev.DeviceReceiveOrderService; import com.glxp.api.service.system.SystemPDFModuleService; import com.glxp.api.service.system.SystemPDFTemplateService; import com.glxp.api.service.system.SystemParamConfigService; diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderController.java b/src/main/java/com/glxp/api/controller/dev/DeviceRepairOrderController.java similarity index 94% rename from src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderController.java rename to src/main/java/com/glxp/api/controller/dev/DeviceRepairOrderController.java index f8e1d8503..0c6cbd5d6 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceRepairOrderController.java @@ -1,16 +1,16 @@ -package com.glxp.api.controller.inv; +package com.glxp.api.controller.dev; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.common.req.UpdateRequest; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.entity.inv.DeviceRepairOrderEntity; -import com.glxp.api.req.inv.AddDeviceRepairOrderRequest; -import com.glxp.api.req.inv.FilterDeviceRepairOrderRequest; +import com.glxp.api.entity.dev.DeviceRepairOrderEntity; +import com.glxp.api.req.dev.AddDeviceRepairOrderRequest; +import com.glxp.api.req.dev.FilterDeviceRepairOrderRequest; import com.glxp.api.req.system.DeleteRequest; -import com.glxp.api.res.inv.DeviceRepairOrderResponse; -import com.glxp.api.service.inv.DeviceRepairOrderService; +import com.glxp.api.res.dev.DeviceRepairOrderResponse; +import com.glxp.api.service.dev.DeviceRepairOrderService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java b/src/main/java/com/glxp/api/controller/dev/DeviceRepairOrderDetailController.java similarity index 90% rename from src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java rename to src/main/java/com/glxp/api/controller/dev/DeviceRepairOrderDetailController.java index 9e64b5d8f..8f57409a5 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceRepairOrderDetailController.java +++ b/src/main/java/com/glxp/api/controller/dev/DeviceRepairOrderDetailController.java @@ -1,16 +1,14 @@ -package com.glxp.api.controller.inv; +package com.glxp.api.controller.dev; import org.springframework.beans.BeanUtils; -import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.entity.inv.DeviceRepairOrderDetailEntity; -import com.glxp.api.req.inv.FilterDeviceRepairOrderDetailRequest; -import com.glxp.api.res.inv.DeviceRepairOrderDetailResponse; -import com.glxp.api.service.inv.DeviceRepairOrderDetailService; +import com.glxp.api.entity.dev.DeviceRepairOrderDetailEntity; +import com.glxp.api.req.dev.FilterDeviceRepairOrderDetailRequest; +import com.glxp.api.res.dev.DeviceRepairOrderDetailResponse; +import com.glxp.api.service.dev.DeviceRepairOrderDetailService; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; 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/inv/InvMAOrderController.java b/src/main/java/com/glxp/api/controller/dev/InvMAOrderController.java similarity index 95% rename from src/main/java/com/glxp/api/controller/inv/InvMAOrderController.java rename to src/main/java/com/glxp/api/controller/dev/InvMAOrderController.java index 18e4dd9cd..8b2541d79 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvMAOrderController.java +++ b/src/main/java/com/glxp/api/controller/dev/InvMAOrderController.java @@ -1,14 +1,14 @@ -package com.glxp.api.controller.inv; +package com.glxp.api.controller.dev; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageInfo; 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.entity.inv.InvMAOrderEntity; -import com.glxp.api.req.inv.FilterInvMAOrderRequest; -import com.glxp.api.res.inv.InvMAOrderResponse; -import com.glxp.api.service.inv.InvMAOrderService; +import com.glxp.api.entity.dev.InvMAOrderEntity; +import com.glxp.api.req.dev.FilterInvMAOrderRequest; +import com.glxp.api.res.dev.InvMAOrderResponse; +import com.glxp.api.service.dev.InvMAOrderService; 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/inv/InvMAOrderDetailController.java b/src/main/java/com/glxp/api/controller/dev/InvMAOrderDetailController.java similarity index 93% rename from src/main/java/com/glxp/api/controller/inv/InvMAOrderDetailController.java rename to src/main/java/com/glxp/api/controller/dev/InvMAOrderDetailController.java index fecbc3fe9..2613f8a05 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvMAOrderDetailController.java +++ b/src/main/java/com/glxp/api/controller/dev/InvMAOrderDetailController.java @@ -1,4 +1,4 @@ -package com.glxp.api.controller.inv; +package com.glxp.api.controller.dev; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; @@ -6,11 +6,11 @@ import com.github.pagehelper.PageInfo; 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.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; +import com.glxp.api.entity.dev.InvMAOrderDetailEntity; +import com.glxp.api.req.dev.AddInvMAOrderDetailRequest; +import com.glxp.api.req.dev.FilterInvMAOrderDetailRequest; +import com.glxp.api.res.dev.InvMAOrderDetailResponse; +import com.glxp.api.service.dev.InvMAOrderDetailService; 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/dao/inv/DeptDeviceDetailDao.java b/src/main/java/com/glxp/api/dao/dev/DeptDeviceDetailDao.java similarity index 74% rename from src/main/java/com/glxp/api/dao/inv/DeptDeviceDetailDao.java rename to src/main/java/com/glxp/api/dao/dev/DeptDeviceDetailDao.java index d82753939..309aabece 100644 --- a/src/main/java/com/glxp/api/dao/inv/DeptDeviceDetailDao.java +++ b/src/main/java/com/glxp/api/dao/dev/DeptDeviceDetailDao.java @@ -1,10 +1,10 @@ -package com.glxp.api.dao.inv; +package com.glxp.api.dao.dev; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.inv.DeptDeviceDetailEntity; -import com.glxp.api.req.inv.FilterDeptDeviceRequest; -import com.glxp.api.res.inv.DeptDeviceDetailResponse; -import com.glxp.api.res.inv.DeviceInspectSetResponse; +import com.glxp.api.entity.dev.DeptDeviceDetailEntity; +import com.glxp.api.req.dev.FilterDeptDeviceRequest; +import com.glxp.api.res.dev.DeptDeviceDetailResponse; +import com.glxp.api.res.dev.DeviceInspectSetResponse; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -36,4 +36,4 @@ public interface DeptDeviceDetailDao extends BaseMapper * @return */ DeviceInspectSetResponse selectInspectSet(@Param("code") String code); -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceAssetCertMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceAssetCertMapper.java similarity index 85% rename from src/main/java/com/glxp/api/dao/inv/DeviceAssetCertMapper.java rename to src/main/java/com/glxp/api/dao/dev/DeviceAssetCertMapper.java index 26041ed7d..4b54eb9f2 100644 --- a/src/main/java/com/glxp/api/dao/inv/DeviceAssetCertMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceAssetCertMapper.java @@ -1,7 +1,7 @@ -package com.glxp.api.dao.inv; +package com.glxp.api.dao.dev; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.inv.DeviceAssetCertEntity; +import com.glxp.api.entity.dev.DeviceAssetCertEntity; import com.glxp.api.req.inv.FilterInvCertRequest; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceAssetLoacationMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceAssetLoacationMapper.java similarity index 69% rename from src/main/java/com/glxp/api/dao/inv/DeviceAssetLoacationMapper.java rename to src/main/java/com/glxp/api/dao/dev/DeviceAssetLoacationMapper.java index f80790fc6..9c5c21031 100644 --- a/src/main/java/com/glxp/api/dao/inv/DeviceAssetLoacationMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceAssetLoacationMapper.java @@ -1,7 +1,7 @@ -package com.glxp.api.dao.inv; +package com.glxp.api.dao.dev; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.inv.DeviceAssetLoacationEntity; +import com.glxp.api.entity.dev.DeviceAssetLoacationEntity; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceAssetUsageMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceAssetUsageMapper.java similarity index 69% rename from src/main/java/com/glxp/api/dao/inv/DeviceAssetUsageMapper.java rename to src/main/java/com/glxp/api/dao/dev/DeviceAssetUsageMapper.java index f60770560..e5cfe7055 100644 --- a/src/main/java/com/glxp/api/dao/inv/DeviceAssetUsageMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceAssetUsageMapper.java @@ -1,7 +1,7 @@ -package com.glxp.api.dao.inv; +package com.glxp.api.dao.dev; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.inv.DeviceAssetUsageEntity; +import com.glxp.api.entity.dev.DeviceAssetUsageEntity; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceAssetUserMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceAssetUserMapper.java similarity index 70% rename from src/main/java/com/glxp/api/dao/inv/DeviceAssetUserMapper.java rename to src/main/java/com/glxp/api/dao/dev/DeviceAssetUserMapper.java index 51b274a3e..d04677360 100644 --- a/src/main/java/com/glxp/api/dao/inv/DeviceAssetUserMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceAssetUserMapper.java @@ -1,7 +1,7 @@ -package com.glxp.api.dao.inv; +package com.glxp.api.dao.dev; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.inv.DeviceAssetUserEntity; +import com.glxp.api.entity.dev.DeviceAssetUserEntity; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceInspectOrderDao.java b/src/main/java/com/glxp/api/dao/dev/DeviceInspectOrderDao.java similarity index 75% rename from src/main/java/com/glxp/api/dao/inv/DeviceInspectOrderDao.java rename to src/main/java/com/glxp/api/dao/dev/DeviceInspectOrderDao.java index 9e4d63754..ab1c2728f 100644 --- a/src/main/java/com/glxp/api/dao/inv/DeviceInspectOrderDao.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceInspectOrderDao.java @@ -1,9 +1,9 @@ -package com.glxp.api.dao.inv; +package com.glxp.api.dao.dev; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.inv.DeviceInspectOrderEntity; -import com.glxp.api.req.inv.FilterDeviceInspectOrderRequest; -import com.glxp.api.res.inv.DeviceInspectOrderResponse; +import com.glxp.api.entity.dev.DeviceInspectOrderEntity; +import com.glxp.api.req.dev.FilterDeviceInspectOrderRequest; +import com.glxp.api.res.dev.DeviceInspectOrderResponse; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -28,4 +28,4 @@ public interface DeviceInspectOrderDao extends BaseMapper { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceInspectSetDao.java b/src/main/java/com/glxp/api/dao/dev/DeviceInspectSetDao.java similarity index 71% rename from src/main/java/com/glxp/api/dao/inv/DeviceInspectSetDao.java rename to src/main/java/com/glxp/api/dao/dev/DeviceInspectSetDao.java index 8865a0e75..0df6d6599 100644 --- a/src/main/java/com/glxp/api/dao/inv/DeviceInspectSetDao.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceInspectSetDao.java @@ -1,8 +1,8 @@ -package com.glxp.api.dao.inv; +package com.glxp.api.dao.dev; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.inv.DeviceInspectSetEntity; -import com.glxp.api.res.inv.DeviceInspectSetResponse; +import com.glxp.api.entity.dev.DeviceInspectSetEntity; +import com.glxp.api.res.dev.DeviceInspectSetResponse; import org.apache.ibatis.annotations.Param; public interface DeviceInspectSetDao extends BaseMapper { @@ -14,4 +14,4 @@ public interface DeviceInspectSetDao extends BaseMapper * @return */ DeviceInspectSetResponse selectInspectSet(@Param("code") String code); -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceInspectTaskDetailMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceInspectTaskDetailMapper.java similarity index 51% rename from src/main/java/com/glxp/api/dao/inv/DeviceInspectTaskDetailMapper.java rename to src/main/java/com/glxp/api/dao/dev/DeviceInspectTaskDetailMapper.java index dda5195c3..9e379bf1f 100644 --- a/src/main/java/com/glxp/api/dao/inv/DeviceInspectTaskDetailMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceInspectTaskDetailMapper.java @@ -1,12 +1,9 @@ -package com.glxp.api.dao.inv; +package com.glxp.api.dao.dev; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.dao.purchase.PurOrderDao; -import com.glxp.api.entity.inv.DeviceInspectTaskDetailEntity; -import com.glxp.api.entity.purchase.PurOrderEntity; +import com.glxp.api.entity.dev.DeviceInspectTaskDetailEntity; import org.apache.ibatis.annotations.Mapper; @Mapper public interface DeviceInspectTaskDetailMapper extends BaseMapperPlus { -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/dao/dev/DeviceInspectTaskMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceInspectTaskMapper.java new file mode 100644 index 000000000..6fca16707 --- /dev/null +++ b/src/main/java/com/glxp/api/dao/dev/DeviceInspectTaskMapper.java @@ -0,0 +1,14 @@ +package com.glxp.api.dao.dev; + +import com.glxp.api.dao.BaseMapperPlus; +import com.glxp.api.entity.dev.DeviceInspectTaskEntity; +import com.glxp.api.req.dev.FilterDeviceInspectTakeRequest; +import com.glxp.api.res.dev.DeviceInspectTakeResponse; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface DeviceInspectTaskMapper extends BaseMapperPlus { + List filterList(FilterDeviceInspectTakeRequest filterDeviceInspectTakeRequest); +} diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceMAOrderDao.java b/src/main/java/com/glxp/api/dao/dev/DeviceMAOrderDao.java similarity index 76% rename from src/main/java/com/glxp/api/dao/inv/DeviceMAOrderDao.java rename to src/main/java/com/glxp/api/dao/dev/DeviceMAOrderDao.java index bca18ad28..58d7d6ca7 100644 --- a/src/main/java/com/glxp/api/dao/inv/DeviceMAOrderDao.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceMAOrderDao.java @@ -1,9 +1,9 @@ -package com.glxp.api.dao.inv; +package com.glxp.api.dao.dev; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.inv.DeviceMAOrderEntity; -import com.glxp.api.req.inv.FilterDeviceMAOrderRequest; -import com.glxp.api.res.inv.DeviceMAOrderResponse; +import com.glxp.api.entity.dev.DeviceMAOrderEntity; +import com.glxp.api.req.dev.FilterDeviceMAOrderRequest; +import com.glxp.api.res.dev.DeviceMAOrderResponse; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -29,4 +29,4 @@ public interface DeviceMAOrderDao extends BaseMapper { */ DeviceMAOrderEntity selectByOrderId(@Param("orderId") String orderId); -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceMAOrderDetailDao.java b/src/main/java/com/glxp/api/dao/dev/DeviceMAOrderDetailDao.java similarity index 82% rename from src/main/java/com/glxp/api/dao/inv/DeviceMAOrderDetailDao.java rename to src/main/java/com/glxp/api/dao/dev/DeviceMAOrderDetailDao.java index 06222e3e5..af8d9627a 100644 --- a/src/main/java/com/glxp/api/dao/inv/DeviceMAOrderDetailDao.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceMAOrderDetailDao.java @@ -1,9 +1,9 @@ -package com.glxp.api.dao.inv; +package com.glxp.api.dao.dev; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.inv.DeviceMAOrderDetailEntity; -import com.glxp.api.req.inv.FilterDeviceMAOrderDetailRequest; -import com.glxp.api.res.inv.DeviceMAOrderDetailResponse; +import com.glxp.api.entity.dev.DeviceMAOrderDetailEntity; +import com.glxp.api.req.dev.FilterDeviceMAOrderDetailRequest; +import com.glxp.api.res.dev.DeviceMAOrderDetailResponse; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -44,4 +44,4 @@ public interface DeviceMAOrderDetailDao extends BaseMapper filterList(FilterDeviceRepairOrderRequest filterDeviceRepairOrderRequest); -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceRepairOrderDetailMapper.java b/src/main/java/com/glxp/api/dao/dev/DeviceRepairOrderDetailMapper.java similarity index 62% rename from src/main/java/com/glxp/api/dao/inv/DeviceRepairOrderDetailMapper.java rename to src/main/java/com/glxp/api/dao/dev/DeviceRepairOrderDetailMapper.java index 49366c773..460026864 100644 --- a/src/main/java/com/glxp/api/dao/inv/DeviceRepairOrderDetailMapper.java +++ b/src/main/java/com/glxp/api/dao/dev/DeviceRepairOrderDetailMapper.java @@ -1,9 +1,9 @@ -package com.glxp.api.dao.inv; +package com.glxp.api.dao.dev; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.inv.DeviceRepairOrderDetailEntity; -import com.glxp.api.req.inv.FilterDeviceRepairOrderDetailRequest; -import com.glxp.api.res.inv.DeviceRepairOrderDetailResponse; +import com.glxp.api.entity.dev.DeviceRepairOrderDetailEntity; +import com.glxp.api.req.dev.FilterDeviceRepairOrderDetailRequest; +import com.glxp.api.res.dev.DeviceRepairOrderDetailResponse; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/glxp/api/dao/inv/InvMAExplanationDao.java b/src/main/java/com/glxp/api/dao/dev/InvMAExplanationDao.java similarity index 77% rename from src/main/java/com/glxp/api/dao/inv/InvMAExplanationDao.java rename to src/main/java/com/glxp/api/dao/dev/InvMAExplanationDao.java index 620467633..f902a4b99 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvMAExplanationDao.java +++ b/src/main/java/com/glxp/api/dao/dev/InvMAExplanationDao.java @@ -1,7 +1,7 @@ -package com.glxp.api.dao.inv; +package com.glxp.api.dao.dev; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.inv.InvMAExplanationEntity; +import com.glxp.api.entity.dev.InvMAExplanationEntity; public interface InvMAExplanationDao extends BaseMapper { @@ -12,4 +12,4 @@ public interface InvMAExplanationDao extends BaseMapper * @return */ InvMAExplanationEntity selectByStatus(int status); -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/dao/inv/InvMAOrderDao.java b/src/main/java/com/glxp/api/dao/dev/InvMAOrderDao.java similarity index 65% rename from src/main/java/com/glxp/api/dao/inv/InvMAOrderDao.java rename to src/main/java/com/glxp/api/dao/dev/InvMAOrderDao.java index 9260b3165..9ed41b4a3 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvMAOrderDao.java +++ b/src/main/java/com/glxp/api/dao/dev/InvMAOrderDao.java @@ -1,9 +1,9 @@ -package com.glxp.api.dao.inv; +package com.glxp.api.dao.dev; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.inv.InvMAOrderEntity; -import com.glxp.api.req.inv.FilterInvMAOrderRequest; -import com.glxp.api.res.inv.InvMAOrderResponse; +import com.glxp.api.entity.dev.InvMAOrderEntity; +import com.glxp.api.req.dev.FilterInvMAOrderRequest; +import com.glxp.api.res.dev.InvMAOrderResponse; import java.util.List; @@ -16,4 +16,4 @@ public interface InvMAOrderDao extends BaseMapper { * @return */ List filterList(FilterInvMAOrderRequest filterInvMAOrderRequest); -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/dao/inv/InvMAOrderDetailDao.java b/src/main/java/com/glxp/api/dao/dev/InvMAOrderDetailDao.java similarity index 77% rename from src/main/java/com/glxp/api/dao/inv/InvMAOrderDetailDao.java rename to src/main/java/com/glxp/api/dao/dev/InvMAOrderDetailDao.java index 9805fcd6b..c3d5d9515 100644 --- a/src/main/java/com/glxp/api/dao/inv/InvMAOrderDetailDao.java +++ b/src/main/java/com/glxp/api/dao/dev/InvMAOrderDetailDao.java @@ -1,9 +1,9 @@ -package com.glxp.api.dao.inv; +package com.glxp.api.dao.dev; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.entity.inv.InvMAOrderDetailEntity; -import com.glxp.api.req.inv.FilterInvMAOrderDetailRequest; -import com.glxp.api.res.inv.InvMAOrderDetailResponse; +import com.glxp.api.entity.dev.InvMAOrderDetailEntity; +import com.glxp.api.req.dev.FilterInvMAOrderDetailRequest; +import com.glxp.api.res.dev.InvMAOrderDetailResponse; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -27,4 +27,4 @@ public interface InvMAOrderDetailDao extends BaseMapper */ InvMAOrderDetailEntity selectByOrderIdAndCode(@Param("orderIdFk") String orderIdFk, @Param("code") String code); -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/dao/inv/DeviceInspectTaskMapper.java b/src/main/java/com/glxp/api/dao/inv/DeviceInspectTaskMapper.java deleted file mode 100644 index 9a796cc64..000000000 --- a/src/main/java/com/glxp/api/dao/inv/DeviceInspectTaskMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.glxp.api.dao.inv; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.glxp.api.dao.BaseMapperPlus; -import com.glxp.api.entity.inv.DeviceInspectTaskDetailEntity; -import com.glxp.api.entity.inv.DeviceInspectTaskEntity; -import com.glxp.api.req.inv.FilterDeviceInspectPlanRequest; -import com.glxp.api.req.inv.FilterDeviceInspectTakeRequest; -import com.glxp.api.res.inv.DeviceInspectPlanResponse; -import com.glxp.api.res.inv.DeviceInspectTakeResponse; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -@Mapper -public interface DeviceInspectTaskMapper extends BaseMapperPlus { - List filterList(FilterDeviceInspectTakeRequest filterDeviceInspectTakeRequest); -} diff --git a/src/main/java/com/glxp/api/entity/inv/DeptDeviceDetailEntity.java b/src/main/java/com/glxp/api/entity/dev/DeptDeviceDetailEntity.java similarity index 99% rename from src/main/java/com/glxp/api/entity/inv/DeptDeviceDetailEntity.java rename to src/main/java/com/glxp/api/entity/dev/DeptDeviceDetailEntity.java index 73ed84b99..221c9bfb3 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeptDeviceDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeptDeviceDetailEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.entity.inv; +package com.glxp.api.entity.dev; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceAssetCertEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceAssetCertEntity.java similarity index 98% rename from src/main/java/com/glxp/api/entity/inv/DeviceAssetCertEntity.java rename to src/main/java/com/glxp/api/entity/dev/DeviceAssetCertEntity.java index 47f48e2c6..8e624358c 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceAssetCertEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceAssetCertEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.entity.inv; +package com.glxp.api.entity.dev; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceAssetLoacationEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceAssetLoacationEntity.java similarity index 97% rename from src/main/java/com/glxp/api/entity/inv/DeviceAssetLoacationEntity.java rename to src/main/java/com/glxp/api/entity/dev/DeviceAssetLoacationEntity.java index fa43e185d..3890e32d8 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceAssetLoacationEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceAssetLoacationEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.entity.inv; +package com.glxp.api.entity.dev; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceAssetUsageEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceAssetUsageEntity.java similarity index 97% rename from src/main/java/com/glxp/api/entity/inv/DeviceAssetUsageEntity.java rename to src/main/java/com/glxp/api/entity/dev/DeviceAssetUsageEntity.java index c96e6583b..98d8d9a70 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceAssetUsageEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceAssetUsageEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.entity.inv; +package com.glxp.api.entity.dev; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceAssetUserEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceAssetUserEntity.java similarity index 97% rename from src/main/java/com/glxp/api/entity/inv/DeviceAssetUserEntity.java rename to src/main/java/com/glxp/api/entity/dev/DeviceAssetUserEntity.java index 99f3e6e8d..d319b4e0f 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceAssetUserEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceAssetUserEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.entity.inv; +package com.glxp.api.entity.dev; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceInspectOrderEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceInspectOrderEntity.java similarity index 98% rename from src/main/java/com/glxp/api/entity/inv/DeviceInspectOrderEntity.java rename to src/main/java/com/glxp/api/entity/dev/DeviceInspectOrderEntity.java index b61c8cb16..74c8913d4 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceInspectOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceInspectOrderEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.entity.inv; +package com.glxp.api.entity.dev; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -102,4 +102,4 @@ public class DeviceInspectOrderEntity { @TableField(value = "remark") private String remark; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceInspectPlanDelectEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceInspectPlanDelectEntity.java similarity index 96% rename from src/main/java/com/glxp/api/entity/inv/DeviceInspectPlanDelectEntity.java rename to src/main/java/com/glxp/api/entity/dev/DeviceInspectPlanDelectEntity.java index ee3c7ea34..7999b069b 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceInspectPlanDelectEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceInspectPlanDelectEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.entity.inv; +package com.glxp.api.entity.dev; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -51,4 +51,4 @@ public class DeviceInspectPlanDelectEntity { */ @TableField(value = "updateTime") private Date updateTime; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceInspectPlanEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceInspectPlanEntity.java similarity index 98% rename from src/main/java/com/glxp/api/entity/inv/DeviceInspectPlanEntity.java rename to src/main/java/com/glxp/api/entity/dev/DeviceInspectPlanEntity.java index 8301f9de1..c04f26736 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceInspectPlanEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceInspectPlanEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.entity.inv; +package com.glxp.api.entity.dev; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceInspectSetEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceInspectSetEntity.java similarity index 97% rename from src/main/java/com/glxp/api/entity/inv/DeviceInspectSetEntity.java rename to src/main/java/com/glxp/api/entity/dev/DeviceInspectSetEntity.java index 9f068540f..a7d0c4796 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceInspectSetEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceInspectSetEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.entity.inv; +package com.glxp.api.entity.dev; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -60,4 +60,4 @@ public class DeviceInspectSetEntity { @TableField(value = "remark") private String remark; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskDetailEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceInspectTaskDetailEntity.java similarity index 97% rename from src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskDetailEntity.java rename to src/main/java/com/glxp/api/entity/dev/DeviceInspectTaskDetailEntity.java index 5bd0808ec..53a96c2e9 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceInspectTaskDetailEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.entity.inv; +package com.glxp.api.entity.dev; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceInspectTaskEntity.java similarity index 98% rename from src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskEntity.java rename to src/main/java/com/glxp/api/entity/dev/DeviceInspectTaskEntity.java index 0998c0b98..3d3ae83e4 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceInspectTaskEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceInspectTaskEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.entity.inv; +package com.glxp.api.entity.dev; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceMAOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceMAOrderDetailEntity.java similarity index 98% rename from src/main/java/com/glxp/api/entity/inv/DeviceMAOrderDetailEntity.java rename to src/main/java/com/glxp/api/entity/dev/DeviceMAOrderDetailEntity.java index d85a96d04..49feb0fc5 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceMAOrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceMAOrderDetailEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.entity.inv; +package com.glxp.api.entity.dev; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -134,4 +134,4 @@ public class DeviceMAOrderDetailEntity { public static final String COL_CREATEUSER = "createUser"; public static final String COL_REMARK = "remark"; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceMAOrderEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceMAOrderEntity.java similarity index 98% rename from src/main/java/com/glxp/api/entity/inv/DeviceMAOrderEntity.java rename to src/main/java/com/glxp/api/entity/dev/DeviceMAOrderEntity.java index 0fde0e38d..b288b18d9 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceMAOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceMAOrderEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.entity.inv; +package com.glxp.api.entity.dev; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -83,4 +83,4 @@ public class DeviceMAOrderEntity { public static final String COL_AUDITUSER = "auditUser"; public static final String COL_REMARK = "remark"; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceProjectSet.java b/src/main/java/com/glxp/api/entity/dev/DeviceProjectSet.java similarity index 97% rename from src/main/java/com/glxp/api/entity/inv/DeviceProjectSet.java rename to src/main/java/com/glxp/api/entity/dev/DeviceProjectSet.java index 3de1658aa..3d15abe27 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceProjectSet.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceProjectSet.java @@ -1,4 +1,4 @@ -package com.glxp.api.entity.inv; +package com.glxp.api.entity.dev; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceReceiveOrderDetailEntity.java similarity index 98% rename from src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderDetailEntity.java rename to src/main/java/com/glxp/api/entity/dev/DeviceReceiveOrderDetailEntity.java index 3ff360522..aa20d893b 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceReceiveOrderDetailEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.entity.inv; +package com.glxp.api.entity.dev; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceReceiveOrderEntity.java similarity index 98% rename from src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderEntity.java rename to src/main/java/com/glxp/api/entity/dev/DeviceReceiveOrderEntity.java index e210121ae..0facac455 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceReceiveOrderEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.entity.inv; +package com.glxp.api.entity.dev; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceRepairOrderDetailEntity.java similarity index 97% rename from src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderDetailEntity.java rename to src/main/java/com/glxp/api/entity/dev/DeviceRepairOrderDetailEntity.java index 9bb3d9f3b..7ad9e8edf 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceRepairOrderDetailEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.entity.inv; +package com.glxp.api.entity.dev; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderEntity.java b/src/main/java/com/glxp/api/entity/dev/DeviceRepairOrderEntity.java similarity index 98% rename from src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderEntity.java rename to src/main/java/com/glxp/api/entity/dev/DeviceRepairOrderEntity.java index 8e00a08a9..931d537b4 100644 --- a/src/main/java/com/glxp/api/entity/inv/DeviceRepairOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/DeviceRepairOrderEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.entity.inv; +package com.glxp.api.entity.dev; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/com/glxp/api/entity/inv/InvMAExplanationEntity.java b/src/main/java/com/glxp/api/entity/dev/InvMAExplanationEntity.java similarity index 96% rename from src/main/java/com/glxp/api/entity/inv/InvMAExplanationEntity.java rename to src/main/java/com/glxp/api/entity/dev/InvMAExplanationEntity.java index f54bc947a..760c03770 100644 --- a/src/main/java/com/glxp/api/entity/inv/InvMAExplanationEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/InvMAExplanationEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.entity.inv; +package com.glxp.api.entity.dev; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -40,4 +40,4 @@ public class InvMAExplanationEntity { public static final String COL_STATUS = "status"; public static final String COL_TEXT = "text"; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/entity/inv/InvMAOrderDetailEntity.java b/src/main/java/com/glxp/api/entity/dev/InvMAOrderDetailEntity.java similarity index 98% rename from src/main/java/com/glxp/api/entity/inv/InvMAOrderDetailEntity.java rename to src/main/java/com/glxp/api/entity/dev/InvMAOrderDetailEntity.java index 29515aef5..04302fa6e 100644 --- a/src/main/java/com/glxp/api/entity/inv/InvMAOrderDetailEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/InvMAOrderDetailEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.entity.inv; +package com.glxp.api.entity.dev; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -126,4 +126,4 @@ public class InvMAOrderDetailEntity { 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/inv/InvMAOrderEntity.java b/src/main/java/com/glxp/api/entity/dev/InvMAOrderEntity.java similarity index 98% rename from src/main/java/com/glxp/api/entity/inv/InvMAOrderEntity.java rename to src/main/java/com/glxp/api/entity/dev/InvMAOrderEntity.java index 943c6cdb8..f73ed9692 100644 --- a/src/main/java/com/glxp/api/entity/inv/InvMAOrderEntity.java +++ b/src/main/java/com/glxp/api/entity/dev/InvMAOrderEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.entity.inv; +package com.glxp.api.entity.dev; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; @@ -98,4 +98,4 @@ public class InvMAOrderEntity { public static final String COL_AUDITUSER = "auditUser"; public static final String COL_REMARK = "remark"; -} \ No newline at end of file +} diff --git a/src/main/java/com/glxp/api/req/basic/BasicDataRequest.java b/src/main/java/com/glxp/api/req/basic/BasicDataRequest.java index 410a59023..f3290405e 100644 --- a/src/main/java/com/glxp/api/req/basic/BasicDataRequest.java +++ b/src/main/java/com/glxp/api/req/basic/BasicDataRequest.java @@ -1,6 +1,6 @@ package com.glxp.api.req.basic; -import com.glxp.api.entity.inv.DeviceInspectTaskEntity; +import com.glxp.api.entity.dev.DeviceInspectTaskEntity; import com.glxp.api.req.system.DeleteCompanyFileRequest; import com.glxp.api.req.system.DeleteRequest; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/inv/AddDeptDeviceRequest.java b/src/main/java/com/glxp/api/req/dev/AddDeptDeviceRequest.java similarity index 98% rename from src/main/java/com/glxp/api/req/inv/AddDeptDeviceRequest.java rename to src/main/java/com/glxp/api/req/dev/AddDeptDeviceRequest.java index 065d8933f..b85af50b9 100644 --- a/src/main/java/com/glxp/api/req/inv/AddDeptDeviceRequest.java +++ b/src/main/java/com/glxp/api/req/dev/AddDeptDeviceRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.req.inv; +package com.glxp.api.req.dev; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/inv/AddDeviceInspectOrderRequest.java b/src/main/java/com/glxp/api/req/dev/AddDeviceInspectOrderRequest.java similarity index 96% rename from src/main/java/com/glxp/api/req/inv/AddDeviceInspectOrderRequest.java rename to src/main/java/com/glxp/api/req/dev/AddDeviceInspectOrderRequest.java index dfa4feafe..8defbe54e 100644 --- a/src/main/java/com/glxp/api/req/inv/AddDeviceInspectOrderRequest.java +++ b/src/main/java/com/glxp/api/req/dev/AddDeviceInspectOrderRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.req.inv; +package com.glxp.api.req.dev; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/inv/AddDeviceInspectPlanRequest.java b/src/main/java/com/glxp/api/req/dev/AddDeviceInspectPlanRequest.java similarity index 97% rename from src/main/java/com/glxp/api/req/inv/AddDeviceInspectPlanRequest.java rename to src/main/java/com/glxp/api/req/dev/AddDeviceInspectPlanRequest.java index 8380db3f0..8387ac276 100644 --- a/src/main/java/com/glxp/api/req/inv/AddDeviceInspectPlanRequest.java +++ b/src/main/java/com/glxp/api/req/dev/AddDeviceInspectPlanRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.req.inv; +package com.glxp.api.req.dev; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/inv/AddDeviceInspectSetRequest.java b/src/main/java/com/glxp/api/req/dev/AddDeviceInspectSetRequest.java similarity index 95% rename from src/main/java/com/glxp/api/req/inv/AddDeviceInspectSetRequest.java rename to src/main/java/com/glxp/api/req/dev/AddDeviceInspectSetRequest.java index 2ac4c616a..0462ae68f 100644 --- a/src/main/java/com/glxp/api/req/inv/AddDeviceInspectSetRequest.java +++ b/src/main/java/com/glxp/api/req/dev/AddDeviceInspectSetRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.req.inv; +package com.glxp.api.req.dev; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/inv/AddDeviceMAOrderRequest.java b/src/main/java/com/glxp/api/req/dev/AddDeviceMAOrderRequest.java similarity index 95% rename from src/main/java/com/glxp/api/req/inv/AddDeviceMAOrderRequest.java rename to src/main/java/com/glxp/api/req/dev/AddDeviceMAOrderRequest.java index b98d6c59d..d4a5ed00d 100644 --- a/src/main/java/com/glxp/api/req/inv/AddDeviceMAOrderRequest.java +++ b/src/main/java/com/glxp/api/req/dev/AddDeviceMAOrderRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.req.inv; +package com.glxp.api.req.dev; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/inv/AddDeviceReceiveOrderDetailRequest.java b/src/main/java/com/glxp/api/req/dev/AddDeviceReceiveOrderDetailRequest.java similarity index 95% rename from src/main/java/com/glxp/api/req/inv/AddDeviceReceiveOrderDetailRequest.java rename to src/main/java/com/glxp/api/req/dev/AddDeviceReceiveOrderDetailRequest.java index f6f816f6f..6d3252118 100644 --- a/src/main/java/com/glxp/api/req/inv/AddDeviceReceiveOrderDetailRequest.java +++ b/src/main/java/com/glxp/api/req/dev/AddDeviceReceiveOrderDetailRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.req.inv; +package com.glxp.api.req.dev; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/inv/AddDeviceRepairOrderRequest.java b/src/main/java/com/glxp/api/req/dev/AddDeviceRepairOrderRequest.java similarity index 97% rename from src/main/java/com/glxp/api/req/inv/AddDeviceRepairOrderRequest.java rename to src/main/java/com/glxp/api/req/dev/AddDeviceRepairOrderRequest.java index 45b817b62..36e9d83c4 100644 --- a/src/main/java/com/glxp/api/req/inv/AddDeviceRepairOrderRequest.java +++ b/src/main/java/com/glxp/api/req/dev/AddDeviceRepairOrderRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.req.inv; +package com.glxp.api.req.dev; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/inv/AddInvMAOrderDetailRequest.java b/src/main/java/com/glxp/api/req/dev/AddInvMAOrderDetailRequest.java similarity index 91% rename from src/main/java/com/glxp/api/req/inv/AddInvMAOrderDetailRequest.java rename to src/main/java/com/glxp/api/req/dev/AddInvMAOrderDetailRequest.java index d45812534..329ce801e 100644 --- a/src/main/java/com/glxp/api/req/inv/AddInvMAOrderDetailRequest.java +++ b/src/main/java/com/glxp/api/req/dev/AddInvMAOrderDetailRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.req.inv; +package com.glxp.api.req.dev; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/inv/DeviceProjectSetRequest.java b/src/main/java/com/glxp/api/req/dev/DeviceProjectSetRequest.java similarity index 96% rename from src/main/java/com/glxp/api/req/inv/DeviceProjectSetRequest.java rename to src/main/java/com/glxp/api/req/dev/DeviceProjectSetRequest.java index 35370cf35..a63e846bd 100644 --- a/src/main/java/com/glxp/api/req/inv/DeviceProjectSetRequest.java +++ b/src/main/java/com/glxp/api/req/dev/DeviceProjectSetRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.req.inv; +package com.glxp.api.req.dev; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/inv/FilterDeptDeviceRequest.java b/src/main/java/com/glxp/api/req/dev/FilterDeptDeviceRequest.java similarity index 97% rename from src/main/java/com/glxp/api/req/inv/FilterDeptDeviceRequest.java rename to src/main/java/com/glxp/api/req/dev/FilterDeptDeviceRequest.java index 59fe3536e..59fa775c4 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterDeptDeviceRequest.java +++ b/src/main/java/com/glxp/api/req/dev/FilterDeptDeviceRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.req.inv; +package com.glxp.api.req.dev; import com.baomidou.mybatisplus.annotation.TableField; import com.glxp.api.util.page.ListPageRequest; diff --git a/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectOrderRequest.java b/src/main/java/com/glxp/api/req/dev/FilterDeviceInspectOrderRequest.java similarity index 96% rename from src/main/java/com/glxp/api/req/inv/FilterDeviceInspectOrderRequest.java rename to src/main/java/com/glxp/api/req/dev/FilterDeviceInspectOrderRequest.java index 13fa15a8e..65aa65d11 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectOrderRequest.java +++ b/src/main/java/com/glxp/api/req/dev/FilterDeviceInspectOrderRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.req.inv; +package com.glxp.api.req.dev; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectPlanRequest.java b/src/main/java/com/glxp/api/req/dev/FilterDeviceInspectPlanRequest.java similarity index 97% rename from src/main/java/com/glxp/api/req/inv/FilterDeviceInspectPlanRequest.java rename to src/main/java/com/glxp/api/req/dev/FilterDeviceInspectPlanRequest.java index 3bbe659c2..7ab292cd2 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectPlanRequest.java +++ b/src/main/java/com/glxp/api/req/dev/FilterDeviceInspectPlanRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.req.inv; +package com.glxp.api.req.dev; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java b/src/main/java/com/glxp/api/req/dev/FilterDeviceInspectTakeRequest.java similarity index 97% rename from src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java rename to src/main/java/com/glxp/api/req/dev/FilterDeviceInspectTakeRequest.java index a2b09bc11..8885a41e5 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterDeviceInspectTakeRequest.java +++ b/src/main/java/com/glxp/api/req/dev/FilterDeviceInspectTakeRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.req.inv; +package com.glxp.api.req.dev; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/inv/FilterDeviceMAOrderDetailRequest.java b/src/main/java/com/glxp/api/req/dev/FilterDeviceMAOrderDetailRequest.java similarity index 90% rename from src/main/java/com/glxp/api/req/inv/FilterDeviceMAOrderDetailRequest.java rename to src/main/java/com/glxp/api/req/dev/FilterDeviceMAOrderDetailRequest.java index 8e29c7f5b..171c3ac31 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterDeviceMAOrderDetailRequest.java +++ b/src/main/java/com/glxp/api/req/dev/FilterDeviceMAOrderDetailRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.req.inv; +package com.glxp.api.req.dev; import com.glxp.api.util.page.ListPageRequest; diff --git a/src/main/java/com/glxp/api/req/inv/FilterDeviceMAOrderRequest.java b/src/main/java/com/glxp/api/req/dev/FilterDeviceMAOrderRequest.java similarity index 95% rename from src/main/java/com/glxp/api/req/inv/FilterDeviceMAOrderRequest.java rename to src/main/java/com/glxp/api/req/dev/FilterDeviceMAOrderRequest.java index d3e5eccca..e3b2e54f0 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterDeviceMAOrderRequest.java +++ b/src/main/java/com/glxp/api/req/dev/FilterDeviceMAOrderRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.req.inv; +package com.glxp.api.req.dev; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/inv/FilterDeviceReceiveOrderDetailRequest.java b/src/main/java/com/glxp/api/req/dev/FilterDeviceReceiveOrderDetailRequest.java similarity index 95% rename from src/main/java/com/glxp/api/req/inv/FilterDeviceReceiveOrderDetailRequest.java rename to src/main/java/com/glxp/api/req/dev/FilterDeviceReceiveOrderDetailRequest.java index 897fa1b04..3144ca2a9 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterDeviceReceiveOrderDetailRequest.java +++ b/src/main/java/com/glxp/api/req/dev/FilterDeviceReceiveOrderDetailRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.req.inv; +package com.glxp.api.req.dev; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; @@ -45,5 +45,5 @@ public class FilterDeviceReceiveOrderDetailRequest extends ListPageRequest { private Integer status; private String relId; - + } diff --git a/src/main/java/com/glxp/api/req/inv/FilterDeviceReceiveOrderRequest.java b/src/main/java/com/glxp/api/req/dev/FilterDeviceReceiveOrderRequest.java similarity index 96% rename from src/main/java/com/glxp/api/req/inv/FilterDeviceReceiveOrderRequest.java rename to src/main/java/com/glxp/api/req/dev/FilterDeviceReceiveOrderRequest.java index 59236fab7..e5f1a8ac6 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterDeviceReceiveOrderRequest.java +++ b/src/main/java/com/glxp/api/req/dev/FilterDeviceReceiveOrderRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.req.inv; +package com.glxp.api.req.dev; import com.glxp.api.util.page.ListPageRequest; diff --git a/src/main/java/com/glxp/api/req/inv/FilterDeviceRepairOrderDetailRequest.java b/src/main/java/com/glxp/api/req/dev/FilterDeviceRepairOrderDetailRequest.java similarity index 95% rename from src/main/java/com/glxp/api/req/inv/FilterDeviceRepairOrderDetailRequest.java rename to src/main/java/com/glxp/api/req/dev/FilterDeviceRepairOrderDetailRequest.java index f3d36467c..4a42be392 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterDeviceRepairOrderDetailRequest.java +++ b/src/main/java/com/glxp/api/req/dev/FilterDeviceRepairOrderDetailRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.req.inv; +package com.glxp.api.req.dev; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/inv/FilterDeviceRepairOrderRequest.java b/src/main/java/com/glxp/api/req/dev/FilterDeviceRepairOrderRequest.java similarity index 96% rename from src/main/java/com/glxp/api/req/inv/FilterDeviceRepairOrderRequest.java rename to src/main/java/com/glxp/api/req/dev/FilterDeviceRepairOrderRequest.java index 48774e5d4..3d4f05902 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterDeviceRepairOrderRequest.java +++ b/src/main/java/com/glxp/api/req/dev/FilterDeviceRepairOrderRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.req.inv; +package com.glxp.api.req.dev; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/inv/FilterInvMAOrderDetailRequest.java b/src/main/java/com/glxp/api/req/dev/FilterInvMAOrderDetailRequest.java similarity index 94% rename from src/main/java/com/glxp/api/req/inv/FilterInvMAOrderDetailRequest.java rename to src/main/java/com/glxp/api/req/dev/FilterInvMAOrderDetailRequest.java index 3c7718af7..743032861 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterInvMAOrderDetailRequest.java +++ b/src/main/java/com/glxp/api/req/dev/FilterInvMAOrderDetailRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.req.inv; +package com.glxp.api.req.dev; import com.glxp.api.util.page.ListPageRequest; diff --git a/src/main/java/com/glxp/api/req/inv/FilterInvMAOrderRequest.java b/src/main/java/com/glxp/api/req/dev/FilterInvMAOrderRequest.java similarity index 94% rename from src/main/java/com/glxp/api/req/inv/FilterInvMAOrderRequest.java rename to src/main/java/com/glxp/api/req/dev/FilterInvMAOrderRequest.java index b6518f892..452b8b070 100644 --- a/src/main/java/com/glxp/api/req/inv/FilterInvMAOrderRequest.java +++ b/src/main/java/com/glxp/api/req/dev/FilterInvMAOrderRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.req.inv; +package com.glxp.api.req.dev; import com.glxp.api.util.page.ListPageRequest; import lombok.Data; diff --git a/src/main/java/com/glxp/api/req/inv/PostDeviceCertRequest.java b/src/main/java/com/glxp/api/req/dev/PostDeviceCertRequest.java similarity index 60% rename from src/main/java/com/glxp/api/req/inv/PostDeviceCertRequest.java rename to src/main/java/com/glxp/api/req/dev/PostDeviceCertRequest.java index 8c5435c46..d5c5e43b5 100644 --- a/src/main/java/com/glxp/api/req/inv/PostDeviceCertRequest.java +++ b/src/main/java/com/glxp/api/req/dev/PostDeviceCertRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.req.inv; +package com.glxp.api.req.dev; -import com.glxp.api.entity.inv.DeviceAssetCertEntity; +import com.glxp.api.entity.dev.DeviceAssetCertEntity; import lombok.Data; @Data diff --git a/src/main/java/com/glxp/api/res/inv/DateRequest.java b/src/main/java/com/glxp/api/res/dev/DateRequest.java similarity index 84% rename from src/main/java/com/glxp/api/res/inv/DateRequest.java rename to src/main/java/com/glxp/api/res/dev/DateRequest.java index c153d7a71..4ab51750c 100644 --- a/src/main/java/com/glxp/api/res/inv/DateRequest.java +++ b/src/main/java/com/glxp/api/res/dev/DateRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.res.inv; +package com.glxp.api.res.dev; import lombok.Data; diff --git a/src/main/java/com/glxp/api/res/inv/DeptDeviceDetailResponse.java b/src/main/java/com/glxp/api/res/dev/DeptDeviceDetailResponse.java similarity index 98% rename from src/main/java/com/glxp/api/res/inv/DeptDeviceDetailResponse.java rename to src/main/java/com/glxp/api/res/dev/DeptDeviceDetailResponse.java index 73af99a22..aba2a63b9 100644 --- a/src/main/java/com/glxp/api/res/inv/DeptDeviceDetailResponse.java +++ b/src/main/java/com/glxp/api/res/dev/DeptDeviceDetailResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.res.inv; +package com.glxp.api.res.dev; import lombok.Data; diff --git a/src/main/java/com/glxp/api/res/inv/DeviceInspectOrderResponse.java b/src/main/java/com/glxp/api/res/dev/DeviceInspectOrderResponse.java similarity index 98% rename from src/main/java/com/glxp/api/res/inv/DeviceInspectOrderResponse.java rename to src/main/java/com/glxp/api/res/dev/DeviceInspectOrderResponse.java index e7107573b..2fd7e6810 100644 --- a/src/main/java/com/glxp/api/res/inv/DeviceInspectOrderResponse.java +++ b/src/main/java/com/glxp/api/res/dev/DeviceInspectOrderResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.res.inv; +package com.glxp.api.res.dev; import lombok.Data; diff --git a/src/main/java/com/glxp/api/res/inv/DeviceInspectPlanResponse.java b/src/main/java/com/glxp/api/res/dev/DeviceInspectPlanResponse.java similarity index 98% rename from src/main/java/com/glxp/api/res/inv/DeviceInspectPlanResponse.java rename to src/main/java/com/glxp/api/res/dev/DeviceInspectPlanResponse.java index a34e318cb..51def3267 100644 --- a/src/main/java/com/glxp/api/res/inv/DeviceInspectPlanResponse.java +++ b/src/main/java/com/glxp/api/res/dev/DeviceInspectPlanResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.res.inv; +package com.glxp.api.res.dev; import lombok.Data; diff --git a/src/main/java/com/glxp/api/res/inv/DeviceInspectSetResponse.java b/src/main/java/com/glxp/api/res/dev/DeviceInspectSetResponse.java similarity index 96% rename from src/main/java/com/glxp/api/res/inv/DeviceInspectSetResponse.java rename to src/main/java/com/glxp/api/res/dev/DeviceInspectSetResponse.java index d3af8d86d..631e4af6a 100644 --- a/src/main/java/com/glxp/api/res/inv/DeviceInspectSetResponse.java +++ b/src/main/java/com/glxp/api/res/dev/DeviceInspectSetResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.res.inv; +package com.glxp.api.res.dev; import lombok.Data; diff --git a/src/main/java/com/glxp/api/res/inv/DeviceInspectTakeResponse.java b/src/main/java/com/glxp/api/res/dev/DeviceInspectTakeResponse.java similarity index 98% rename from src/main/java/com/glxp/api/res/inv/DeviceInspectTakeResponse.java rename to src/main/java/com/glxp/api/res/dev/DeviceInspectTakeResponse.java index d87fcdb4a..aa0cc314a 100644 --- a/src/main/java/com/glxp/api/res/inv/DeviceInspectTakeResponse.java +++ b/src/main/java/com/glxp/api/res/dev/DeviceInspectTakeResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.res.inv; +package com.glxp.api.res.dev; import lombok.Data; diff --git a/src/main/java/com/glxp/api/res/inv/DeviceMAOrderDetailResponse.java b/src/main/java/com/glxp/api/res/dev/DeviceMAOrderDetailResponse.java similarity index 98% rename from src/main/java/com/glxp/api/res/inv/DeviceMAOrderDetailResponse.java rename to src/main/java/com/glxp/api/res/dev/DeviceMAOrderDetailResponse.java index 4920837f4..cb05b30f2 100644 --- a/src/main/java/com/glxp/api/res/inv/DeviceMAOrderDetailResponse.java +++ b/src/main/java/com/glxp/api/res/dev/DeviceMAOrderDetailResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.res.inv; +package com.glxp.api.res.dev; import lombok.Data; diff --git a/src/main/java/com/glxp/api/res/inv/DeviceMAOrderResponse.java b/src/main/java/com/glxp/api/res/dev/DeviceMAOrderResponse.java similarity index 96% rename from src/main/java/com/glxp/api/res/inv/DeviceMAOrderResponse.java rename to src/main/java/com/glxp/api/res/dev/DeviceMAOrderResponse.java index 3295787c2..ab5450d9d 100644 --- a/src/main/java/com/glxp/api/res/inv/DeviceMAOrderResponse.java +++ b/src/main/java/com/glxp/api/res/dev/DeviceMAOrderResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.res.inv; +package com.glxp.api.res.dev; import lombok.Data; diff --git a/src/main/java/com/glxp/api/res/inv/DeviceProjectSetResponse.java b/src/main/java/com/glxp/api/res/dev/DeviceProjectSetResponse.java similarity index 96% rename from src/main/java/com/glxp/api/res/inv/DeviceProjectSetResponse.java rename to src/main/java/com/glxp/api/res/dev/DeviceProjectSetResponse.java index 43862670b..6906a6839 100644 --- a/src/main/java/com/glxp/api/res/inv/DeviceProjectSetResponse.java +++ b/src/main/java/com/glxp/api/res/dev/DeviceProjectSetResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.res.inv; +package com.glxp.api.res.dev; import lombok.Data; diff --git a/src/main/java/com/glxp/api/res/inv/DeviceReceiveOrderDetailResponse.java b/src/main/java/com/glxp/api/res/dev/DeviceReceiveOrderDetailResponse.java similarity index 98% rename from src/main/java/com/glxp/api/res/inv/DeviceReceiveOrderDetailResponse.java rename to src/main/java/com/glxp/api/res/dev/DeviceReceiveOrderDetailResponse.java index 76689b5b4..80086429f 100644 --- a/src/main/java/com/glxp/api/res/inv/DeviceReceiveOrderDetailResponse.java +++ b/src/main/java/com/glxp/api/res/dev/DeviceReceiveOrderDetailResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.res.inv; +package com.glxp.api.res.dev; import lombok.Data; diff --git a/src/main/java/com/glxp/api/res/inv/DeviceReceiveOrderResponse.java b/src/main/java/com/glxp/api/res/dev/DeviceReceiveOrderResponse.java similarity index 98% rename from src/main/java/com/glxp/api/res/inv/DeviceReceiveOrderResponse.java rename to src/main/java/com/glxp/api/res/dev/DeviceReceiveOrderResponse.java index 7f9faebe2..7662f583a 100644 --- a/src/main/java/com/glxp/api/res/inv/DeviceReceiveOrderResponse.java +++ b/src/main/java/com/glxp/api/res/dev/DeviceReceiveOrderResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.res.inv; +package com.glxp.api.res.dev; import lombok.Data; diff --git a/src/main/java/com/glxp/api/res/inv/DeviceRepairOrderDetailResponse.java b/src/main/java/com/glxp/api/res/dev/DeviceRepairOrderDetailResponse.java similarity index 95% rename from src/main/java/com/glxp/api/res/inv/DeviceRepairOrderDetailResponse.java rename to src/main/java/com/glxp/api/res/dev/DeviceRepairOrderDetailResponse.java index 30f419857..b98ce4218 100644 --- a/src/main/java/com/glxp/api/res/inv/DeviceRepairOrderDetailResponse.java +++ b/src/main/java/com/glxp/api/res/dev/DeviceRepairOrderDetailResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.res.inv; +package com.glxp.api.res.dev; import lombok.Data; diff --git a/src/main/java/com/glxp/api/res/inv/DeviceRepairOrderResponse.java b/src/main/java/com/glxp/api/res/dev/DeviceRepairOrderResponse.java similarity index 98% rename from src/main/java/com/glxp/api/res/inv/DeviceRepairOrderResponse.java rename to src/main/java/com/glxp/api/res/dev/DeviceRepairOrderResponse.java index d71e366be..471936582 100644 --- a/src/main/java/com/glxp/api/res/inv/DeviceRepairOrderResponse.java +++ b/src/main/java/com/glxp/api/res/dev/DeviceRepairOrderResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.res.inv; +package com.glxp.api.res.dev; import lombok.Data; diff --git a/src/main/java/com/glxp/api/res/inv/InvMAOrderDetailResponse.java b/src/main/java/com/glxp/api/res/dev/InvMAOrderDetailResponse.java similarity index 98% rename from src/main/java/com/glxp/api/res/inv/InvMAOrderDetailResponse.java rename to src/main/java/com/glxp/api/res/dev/InvMAOrderDetailResponse.java index 516448b38..82e242abf 100644 --- a/src/main/java/com/glxp/api/res/inv/InvMAOrderDetailResponse.java +++ b/src/main/java/com/glxp/api/res/dev/InvMAOrderDetailResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.res.inv; +package com.glxp.api.res.dev; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/src/main/java/com/glxp/api/res/inv/InvMAOrderResponse.java b/src/main/java/com/glxp/api/res/dev/InvMAOrderResponse.java similarity index 97% rename from src/main/java/com/glxp/api/res/inv/InvMAOrderResponse.java rename to src/main/java/com/glxp/api/res/dev/InvMAOrderResponse.java index d39b244c2..53fb81d56 100644 --- a/src/main/java/com/glxp/api/res/inv/InvMAOrderResponse.java +++ b/src/main/java/com/glxp/api/res/dev/InvMAOrderResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.res.inv; +package com.glxp.api.res.dev; import lombok.Data; diff --git a/src/main/java/com/glxp/api/res/inv/InvMAProductResponse.java b/src/main/java/com/glxp/api/res/dev/InvMAProductResponse.java similarity index 94% rename from src/main/java/com/glxp/api/res/inv/InvMAProductResponse.java rename to src/main/java/com/glxp/api/res/dev/InvMAProductResponse.java index f24dd5f4e..bb30e9b26 100644 --- a/src/main/java/com/glxp/api/res/inv/InvMAProductResponse.java +++ b/src/main/java/com/glxp/api/res/dev/InvMAProductResponse.java @@ -1,4 +1,4 @@ -package com.glxp.api.res.inv; +package com.glxp.api.res.dev; import lombok.Data; diff --git a/src/main/java/com/glxp/api/res/sync/SpsSyncDeviceTakeResponse.java b/src/main/java/com/glxp/api/res/sync/SpsSyncDeviceTakeResponse.java index aacad0d29..782bd9bb3 100644 --- a/src/main/java/com/glxp/api/res/sync/SpsSyncDeviceTakeResponse.java +++ b/src/main/java/com/glxp/api/res/sync/SpsSyncDeviceTakeResponse.java @@ -1,9 +1,7 @@ package com.glxp.api.res.sync; -import com.glxp.api.entity.inv.DeviceInspectTaskDetailEntity; -import com.glxp.api.entity.inv.DeviceInspectTaskEntity; -import com.glxp.api.entity.purchase.PurOrderDetailEntity; -import com.glxp.api.entity.purchase.PurOrderEntity; +import com.glxp.api.entity.dev.DeviceInspectTaskDetailEntity; +import com.glxp.api.entity.dev.DeviceInspectTaskEntity; import lombok.Data; import java.util.List; 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 b87fa16ea..7314c89dc 100644 --- a/src/main/java/com/glxp/api/res/sync/SpsSyncDeviceTaskResponse.java +++ b/src/main/java/com/glxp/api/res/sync/SpsSyncDeviceTaskResponse.java @@ -1,7 +1,7 @@ package com.glxp.api.res.sync; -import com.glxp.api.entity.inv.DeviceInspectTaskDetailEntity; -import com.glxp.api.entity.inv.DeviceInspectTaskEntity; +import com.glxp.api.entity.dev.DeviceInspectTaskDetailEntity; +import com.glxp.api.entity.dev.DeviceInspectTaskEntity; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/inv/DeptDeviceDetailService.java b/src/main/java/com/glxp/api/service/dev/DeptDeviceDetailService.java similarity index 74% rename from src/main/java/com/glxp/api/service/inv/DeptDeviceDetailService.java rename to src/main/java/com/glxp/api/service/dev/DeptDeviceDetailService.java index dd55310a2..6a32cfdc1 100644 --- a/src/main/java/com/glxp/api/service/inv/DeptDeviceDetailService.java +++ b/src/main/java/com/glxp/api/service/dev/DeptDeviceDetailService.java @@ -1,12 +1,10 @@ -package com.glxp.api.service.inv; +package com.glxp.api.service.dev; import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.entity.inv.DeptDeviceDetailEntity; -import com.glxp.api.entity.inv.DeviceAssetCertEntity; -import com.glxp.api.req.inv.AddDeptDeviceRequest; -import com.glxp.api.req.inv.FilterDeptDeviceRequest; -import com.glxp.api.req.inv.FilterInvCertRequest; -import com.glxp.api.res.inv.DeptDeviceDetailResponse; +import com.glxp.api.entity.dev.DeptDeviceDetailEntity; +import com.glxp.api.req.dev.AddDeptDeviceRequest; +import com.glxp.api.req.dev.FilterDeptDeviceRequest; +import com.glxp.api.res.dev.DeptDeviceDetailResponse; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/inv/DeviceAssetCertService.java b/src/main/java/com/glxp/api/service/dev/DeviceAssetCertService.java similarity index 86% rename from src/main/java/com/glxp/api/service/inv/DeviceAssetCertService.java rename to src/main/java/com/glxp/api/service/dev/DeviceAssetCertService.java index 055797f9c..ff96ae634 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceAssetCertService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceAssetCertService.java @@ -1,7 +1,7 @@ -package com.glxp.api.service.inv; +package com.glxp.api.service.dev; import com.baomidou.mybatisplus.extension.service.IService; -import com.glxp.api.entity.inv.DeviceAssetCertEntity; +import com.glxp.api.entity.dev.DeviceAssetCertEntity; import com.glxp.api.req.inv.FilterInvCertRequest; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/inv/DeviceAssetLoacationService.java b/src/main/java/com/glxp/api/service/dev/DeviceAssetLoacationService.java similarity index 62% rename from src/main/java/com/glxp/api/service/inv/DeviceAssetLoacationService.java rename to src/main/java/com/glxp/api/service/dev/DeviceAssetLoacationService.java index e0b2d673e..bf5833842 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceAssetLoacationService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceAssetLoacationService.java @@ -1,9 +1,9 @@ -package com.glxp.api.service.inv; +package com.glxp.api.service.dev; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.dao.inv.DeviceAssetLoacationMapper; -import com.glxp.api.entity.inv.DeviceAssetLoacationEntity; +import com.glxp.api.dao.dev.DeviceAssetLoacationMapper; +import com.glxp.api.entity.dev.DeviceAssetLoacationEntity; @Service public class DeviceAssetLoacationService extends ServiceImpl { diff --git a/src/main/java/com/glxp/api/service/inv/DeviceAssetUsageService.java b/src/main/java/com/glxp/api/service/dev/DeviceAssetUsageService.java similarity index 62% rename from src/main/java/com/glxp/api/service/inv/DeviceAssetUsageService.java rename to src/main/java/com/glxp/api/service/dev/DeviceAssetUsageService.java index 3ed804b16..6824c2dc7 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceAssetUsageService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceAssetUsageService.java @@ -1,9 +1,9 @@ -package com.glxp.api.service.inv; +package com.glxp.api.service.dev; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.dao.inv.DeviceAssetUsageMapper; -import com.glxp.api.entity.inv.DeviceAssetUsageEntity; +import com.glxp.api.dao.dev.DeviceAssetUsageMapper; +import com.glxp.api.entity.dev.DeviceAssetUsageEntity; @Service public class DeviceAssetUsageService extends ServiceImpl { diff --git a/src/main/java/com/glxp/api/service/inv/DeviceAssetUserService.java b/src/main/java/com/glxp/api/service/dev/DeviceAssetUserService.java similarity index 62% rename from src/main/java/com/glxp/api/service/inv/DeviceAssetUserService.java rename to src/main/java/com/glxp/api/service/dev/DeviceAssetUserService.java index be2151763..181ee9681 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceAssetUserService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceAssetUserService.java @@ -1,9 +1,9 @@ -package com.glxp.api.service.inv; +package com.glxp.api.service.dev; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.inv.DeviceAssetUserEntity; -import com.glxp.api.dao.inv.DeviceAssetUserMapper; +import com.glxp.api.entity.dev.DeviceAssetUserEntity; +import com.glxp.api.dao.dev.DeviceAssetUserMapper; @Service public class DeviceAssetUserService extends ServiceImpl { diff --git a/src/main/java/com/glxp/api/service/inv/DeviceInspectOrderService.java b/src/main/java/com/glxp/api/service/dev/DeviceInspectOrderService.java similarity index 85% rename from src/main/java/com/glxp/api/service/inv/DeviceInspectOrderService.java rename to src/main/java/com/glxp/api/service/dev/DeviceInspectOrderService.java index 581dfde6d..021a777d8 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceInspectOrderService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceInspectOrderService.java @@ -1,10 +1,10 @@ -package com.glxp.api.service.inv; +package com.glxp.api.service.dev; import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.entity.inv.DeviceInspectOrderEntity; -import com.glxp.api.req.inv.AddDeviceInspectOrderRequest; -import com.glxp.api.req.inv.FilterDeviceInspectOrderRequest; -import com.glxp.api.res.inv.DeviceInspectOrderResponse; +import com.glxp.api.entity.dev.DeviceInspectOrderEntity; +import com.glxp.api.req.dev.AddDeviceInspectOrderRequest; +import com.glxp.api.req.dev.FilterDeviceInspectOrderRequest; +import com.glxp.api.res.dev.DeviceInspectOrderResponse; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/inv/DeviceInspectPlanDelectService.java b/src/main/java/com/glxp/api/service/dev/DeviceInspectPlanDelectService.java similarity index 77% rename from src/main/java/com/glxp/api/service/inv/DeviceInspectPlanDelectService.java rename to src/main/java/com/glxp/api/service/dev/DeviceInspectPlanDelectService.java index 7256023fb..12d61bdf0 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceInspectPlanDelectService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceInspectPlanDelectService.java @@ -1,10 +1,8 @@ -package com.glxp.api.service.inv; +package com.glxp.api.service.dev; -import com.glxp.api.dao.inv.DeviceInspectPlanDelectMapper; -import com.glxp.api.entity.inv.DeviceInspectPlanDelectEntity; +import com.glxp.api.entity.dev.DeviceInspectPlanDelectEntity; import com.baomidou.mybatisplus.extension.service.IService; -import javax.annotation.Resource; import java.util.List; public interface DeviceInspectPlanDelectService extends IService { diff --git a/src/main/java/com/glxp/api/service/inv/DeviceInspectPlanService.java b/src/main/java/com/glxp/api/service/dev/DeviceInspectPlanService.java similarity index 83% rename from src/main/java/com/glxp/api/service/inv/DeviceInspectPlanService.java rename to src/main/java/com/glxp/api/service/dev/DeviceInspectPlanService.java index 3dfe99abf..ea9053c3a 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceInspectPlanService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceInspectPlanService.java @@ -1,10 +1,10 @@ -package com.glxp.api.service.inv; +package com.glxp.api.service.dev; import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.entity.inv.DeviceInspectPlanEntity; -import com.glxp.api.req.inv.AddDeviceInspectPlanRequest; -import com.glxp.api.req.inv.FilterDeviceInspectPlanRequest; -import com.glxp.api.res.inv.DeviceInspectPlanResponse; +import com.glxp.api.entity.dev.DeviceInspectPlanEntity; +import com.glxp.api.req.dev.AddDeviceInspectPlanRequest; +import com.glxp.api.req.dev.FilterDeviceInspectPlanRequest; +import com.glxp.api.res.dev.DeviceInspectPlanResponse; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/inv/DeviceInspectSetService.java b/src/main/java/com/glxp/api/service/dev/DeviceInspectSetService.java similarity index 77% rename from src/main/java/com/glxp/api/service/inv/DeviceInspectSetService.java rename to src/main/java/com/glxp/api/service/dev/DeviceInspectSetService.java index f638caebe..a895b933c 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceInspectSetService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceInspectSetService.java @@ -1,9 +1,9 @@ -package com.glxp.api.service.inv; +package com.glxp.api.service.dev; import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.entity.inv.DeviceInspectSetEntity; -import com.glxp.api.req.inv.AddDeviceInspectSetRequest; -import com.glxp.api.res.inv.DeviceInspectSetResponse; +import com.glxp.api.entity.dev.DeviceInspectSetEntity; +import com.glxp.api.req.dev.AddDeviceInspectSetRequest; +import com.glxp.api.res.dev.DeviceInspectSetResponse; /** * 设备巡检设置Service diff --git a/src/main/java/com/glxp/api/service/inv/DeviceInspectTaskDetailService.java b/src/main/java/com/glxp/api/service/dev/DeviceInspectTaskDetailService.java similarity index 88% rename from src/main/java/com/glxp/api/service/inv/DeviceInspectTaskDetailService.java rename to src/main/java/com/glxp/api/service/dev/DeviceInspectTaskDetailService.java index 98e1ae6de..e3065cc89 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceInspectTaskDetailService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceInspectTaskDetailService.java @@ -1,14 +1,11 @@ -package com.glxp.api.service.inv; +package com.glxp.api.service.dev; import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.glxp.api.dao.inv.DeviceInspectTaskMapper; -import com.glxp.api.entity.inv.DeviceInspectPlanDelectEntity; -import com.glxp.api.entity.inv.DeviceInspectTaskEntity; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.entity.inv.DeviceInspectTaskDetailEntity; -import com.glxp.api.dao.inv.DeviceInspectTaskDetailMapper; +import com.glxp.api.entity.dev.DeviceInspectTaskDetailEntity; +import com.glxp.api.dao.dev.DeviceInspectTaskDetailMapper; import javax.annotation.Resource; import java.util.Date; diff --git a/src/main/java/com/glxp/api/service/inv/DeviceInspectTaskService.java b/src/main/java/com/glxp/api/service/dev/DeviceInspectTaskService.java similarity index 86% rename from src/main/java/com/glxp/api/service/inv/DeviceInspectTaskService.java rename to src/main/java/com/glxp/api/service/dev/DeviceInspectTaskService.java index 87201b7a9..a7ab4cb88 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceInspectTaskService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceInspectTaskService.java @@ -1,12 +1,12 @@ -package com.glxp.api.service.inv; +package com.glxp.api.service.dev; import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; -import com.glxp.api.dao.inv.DeviceInspectTaskMapper; -import com.glxp.api.entity.inv.DeviceInspectTaskEntity; -import com.glxp.api.req.inv.FilterDeviceInspectTakeRequest; -import com.glxp.api.res.inv.DeviceInspectTakeResponse; +import com.glxp.api.dao.dev.DeviceInspectTaskMapper; +import com.glxp.api.entity.dev.DeviceInspectTaskEntity; +import com.glxp.api.req.dev.FilterDeviceInspectTakeRequest; +import com.glxp.api.res.dev.DeviceInspectTakeResponse; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/com/glxp/api/service/inv/DeviceMAOrderDetailService.java b/src/main/java/com/glxp/api/service/dev/DeviceMAOrderDetailService.java similarity index 83% rename from src/main/java/com/glxp/api/service/inv/DeviceMAOrderDetailService.java rename to src/main/java/com/glxp/api/service/dev/DeviceMAOrderDetailService.java index 0b34503a6..ff6bf2e45 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceMAOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceMAOrderDetailService.java @@ -1,9 +1,9 @@ -package com.glxp.api.service.inv; +package com.glxp.api.service.dev; import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.entity.inv.DeviceMAOrderDetailEntity; -import com.glxp.api.req.inv.FilterDeviceMAOrderDetailRequest; -import com.glxp.api.res.inv.DeviceMAOrderDetailResponse; +import com.glxp.api.entity.dev.DeviceMAOrderDetailEntity; +import com.glxp.api.req.dev.FilterDeviceMAOrderDetailRequest; +import com.glxp.api.res.dev.DeviceMAOrderDetailResponse; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/inv/DeviceMAOrderService.java b/src/main/java/com/glxp/api/service/dev/DeviceMAOrderService.java similarity index 83% rename from src/main/java/com/glxp/api/service/inv/DeviceMAOrderService.java rename to src/main/java/com/glxp/api/service/dev/DeviceMAOrderService.java index c66755c0f..17931bbdf 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceMAOrderService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceMAOrderService.java @@ -1,10 +1,10 @@ -package com.glxp.api.service.inv; +package com.glxp.api.service.dev; import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.entity.inv.DeviceMAOrderEntity; -import com.glxp.api.req.inv.AddDeviceMAOrderRequest; -import com.glxp.api.req.inv.FilterDeviceMAOrderRequest; -import com.glxp.api.res.inv.DeviceMAOrderResponse; +import com.glxp.api.entity.dev.DeviceMAOrderEntity; +import com.glxp.api.req.dev.AddDeviceMAOrderRequest; +import com.glxp.api.req.dev.FilterDeviceMAOrderRequest; +import com.glxp.api.res.dev.DeviceMAOrderResponse; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/glxp/api/service/inv/DeviceProjectSetService.java b/src/main/java/com/glxp/api/service/dev/DeviceProjectSetService.java similarity index 90% rename from src/main/java/com/glxp/api/service/inv/DeviceProjectSetService.java rename to src/main/java/com/glxp/api/service/dev/DeviceProjectSetService.java index 5678fa818..aaa39ac43 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceProjectSetService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceProjectSetService.java @@ -1,16 +1,15 @@ -package com.glxp.api.service.inv; +package com.glxp.api.service.dev; import org.springframework.beans.BeanUtils; 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.inv.DeviceProjectSetMapper; +import com.glxp.api.dao.dev.DeviceProjectSetMapper; import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.entity.inv.DeviceProjectSet; -import com.glxp.api.req.inv.DeviceProjectSetRequest; -import com.glxp.api.res.inv.DeviceProjectSetResponse; +import com.glxp.api.entity.dev.DeviceProjectSet; +import com.glxp.api.req.dev.DeviceProjectSetRequest; +import com.glxp.api.res.dev.DeviceProjectSetResponse; import com.glxp.api.service.auth.CustomerService; -import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/com/glxp/api/service/inv/DeviceReceiveOrderDetailService.java b/src/main/java/com/glxp/api/service/dev/DeviceReceiveOrderDetailService.java similarity index 78% rename from src/main/java/com/glxp/api/service/inv/DeviceReceiveOrderDetailService.java rename to src/main/java/com/glxp/api/service/dev/DeviceReceiveOrderDetailService.java index 9b0596b6c..ae94df6c0 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceReceiveOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceReceiveOrderDetailService.java @@ -1,11 +1,10 @@ -package com.glxp.api.service.inv; +package com.glxp.api.service.dev; 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 com.glxp.api.entity.dev.DeviceReceiveOrderDetailEntity; +import com.glxp.api.req.dev.AddDeviceReceiveOrderDetailRequest; +import com.glxp.api.req.dev.FilterDeviceReceiveOrderDetailRequest; +import com.glxp.api.res.dev.DeviceReceiveOrderDetailResponse; 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/dev/DeviceReceiveOrderService.java similarity index 83% rename from src/main/java/com/glxp/api/service/inv/DeviceReceiveOrderService.java rename to src/main/java/com/glxp/api/service/dev/DeviceReceiveOrderService.java index 0ace713ba..efabefda0 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceReceiveOrderService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceReceiveOrderService.java @@ -1,10 +1,9 @@ -package com.glxp.api.service.inv; +package com.glxp.api.service.dev; 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 com.glxp.api.entity.dev.DeviceReceiveOrderEntity; +import com.glxp.api.req.dev.FilterDeviceReceiveOrderRequest; +import com.glxp.api.res.dev.DeviceReceiveOrderResponse; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java b/src/main/java/com/glxp/api/service/dev/DeviceRepairOrderDetailService.java similarity index 74% rename from src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java rename to src/main/java/com/glxp/api/service/dev/DeviceRepairOrderDetailService.java index f76cd62c1..992a78717 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceRepairOrderDetailService.java @@ -1,9 +1,9 @@ -package com.glxp.api.service.inv; +package com.glxp.api.service.dev; import com.baomidou.mybatisplus.extension.service.IService; -import com.glxp.api.entity.inv.DeviceRepairOrderDetailEntity; -import com.glxp.api.req.inv.FilterDeviceRepairOrderDetailRequest; -import com.glxp.api.res.inv.DeviceRepairOrderDetailResponse; +import com.glxp.api.entity.dev.DeviceRepairOrderDetailEntity; +import com.glxp.api.req.dev.FilterDeviceRepairOrderDetailRequest; +import com.glxp.api.res.dev.DeviceRepairOrderDetailResponse; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderService.java b/src/main/java/com/glxp/api/service/dev/DeviceRepairOrderService.java similarity index 84% rename from src/main/java/com/glxp/api/service/inv/DeviceRepairOrderService.java rename to src/main/java/com/glxp/api/service/dev/DeviceRepairOrderService.java index 56dcc90ef..7d268796b 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceRepairOrderService.java +++ b/src/main/java/com/glxp/api/service/dev/DeviceRepairOrderService.java @@ -1,10 +1,10 @@ -package com.glxp.api.service.inv; +package com.glxp.api.service.dev; import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.entity.inv.DeviceRepairOrderEntity; -import com.glxp.api.req.inv.AddDeviceRepairOrderRequest; -import com.glxp.api.req.inv.FilterDeviceRepairOrderRequest; -import com.glxp.api.res.inv.DeviceRepairOrderResponse; +import com.glxp.api.entity.dev.DeviceRepairOrderEntity; +import com.glxp.api.req.dev.AddDeviceRepairOrderRequest; +import com.glxp.api.req.dev.FilterDeviceRepairOrderRequest; +import com.glxp.api.res.dev.DeviceRepairOrderResponse; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/inv/InvMAOrderDetailService.java b/src/main/java/com/glxp/api/service/dev/InvMAOrderDetailService.java similarity index 80% rename from src/main/java/com/glxp/api/service/inv/InvMAOrderDetailService.java rename to src/main/java/com/glxp/api/service/dev/InvMAOrderDetailService.java index 36bcb72a9..2d85ea14c 100644 --- a/src/main/java/com/glxp/api/service/inv/InvMAOrderDetailService.java +++ b/src/main/java/com/glxp/api/service/dev/InvMAOrderDetailService.java @@ -1,10 +1,10 @@ -package com.glxp.api.service.inv; +package com.glxp.api.service.dev; 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; +import com.glxp.api.entity.dev.InvMAOrderDetailEntity; +import com.glxp.api.req.dev.AddInvMAOrderDetailRequest; +import com.glxp.api.req.dev.FilterInvMAOrderDetailRequest; +import com.glxp.api.res.dev.InvMAOrderDetailResponse; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/inv/InvMAOrderService.java b/src/main/java/com/glxp/api/service/dev/InvMAOrderService.java similarity index 86% rename from src/main/java/com/glxp/api/service/inv/InvMAOrderService.java rename to src/main/java/com/glxp/api/service/dev/InvMAOrderService.java index 68ee512d3..636b90a08 100644 --- a/src/main/java/com/glxp/api/service/inv/InvMAOrderService.java +++ b/src/main/java/com/glxp/api/service/dev/InvMAOrderService.java @@ -1,9 +1,9 @@ -package com.glxp.api.service.inv; +package com.glxp.api.service.dev; import com.glxp.api.common.res.BaseResponse; -import com.glxp.api.entity.inv.InvMAOrderEntity; -import com.glxp.api.req.inv.FilterInvMAOrderRequest; -import com.glxp.api.res.inv.InvMAOrderResponse; +import com.glxp.api.entity.dev.InvMAOrderEntity; +import com.glxp.api.req.dev.FilterInvMAOrderRequest; +import com.glxp.api.res.dev.InvMAOrderResponse; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeptDeviceDetailServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeptDeviceDetailServiceImpl.java similarity index 91% rename from src/main/java/com/glxp/api/service/inv/impl/DeptDeviceDetailServiceImpl.java rename to src/main/java/com/glxp/api/service/dev/impl/DeptDeviceDetailServiceImpl.java index 6ecc5f2fa..23e7bb9e8 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeptDeviceDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeptDeviceDetailServiceImpl.java @@ -1,4 +1,4 @@ -package com.glxp.api.service.inv.impl; +package com.glxp.api.service.dev.impl; import org.springframework.beans.BeanUtils; import cn.hutool.core.util.StrUtil; @@ -8,18 +8,18 @@ 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.DeviceStatus; -import com.glxp.api.dao.inv.DeptDeviceDetailDao; -import com.glxp.api.dao.inv.DeviceReceiveOrderDao; -import com.glxp.api.dao.inv.DeviceReceiveOrderDetailDao; -import com.glxp.api.entity.inv.DeptDeviceDetailEntity; -import com.glxp.api.entity.inv.DeviceReceiveOrderEntity; -import com.glxp.api.req.inv.AddDeptDeviceRequest; -import com.glxp.api.req.inv.FilterDeptDeviceRequest; -import com.glxp.api.req.inv.FilterDeviceReceiveOrderDetailRequest; -import com.glxp.api.res.inv.DeptDeviceDetailResponse; -import com.glxp.api.res.inv.DeviceReceiveOrderDetailResponse; +import com.glxp.api.dao.dev.DeptDeviceDetailDao; +import com.glxp.api.dao.dev.DeviceReceiveOrderDao; +import com.glxp.api.dao.dev.DeviceReceiveOrderDetailDao; +import com.glxp.api.entity.dev.DeptDeviceDetailEntity; +import com.glxp.api.entity.dev.DeviceReceiveOrderEntity; +import com.glxp.api.req.dev.AddDeptDeviceRequest; +import com.glxp.api.req.dev.FilterDeptDeviceRequest; +import com.glxp.api.req.dev.FilterDeviceReceiveOrderDetailRequest; +import com.glxp.api.res.dev.DeptDeviceDetailResponse; +import com.glxp.api.res.dev.DeviceReceiveOrderDetailResponse; import com.glxp.api.service.auth.CustomerService; -import com.glxp.api.service.inv.DeptDeviceDetailService; +import com.glxp.api.service.dev.DeptDeviceDetailService; import com.glxp.api.util.IdUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceAssetCertServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceAssetCertServiceImpl.java similarity index 89% rename from src/main/java/com/glxp/api/service/inv/impl/DeviceAssetCertServiceImpl.java rename to src/main/java/com/glxp/api/service/dev/impl/DeviceAssetCertServiceImpl.java index 37d53e0c8..5b7637e0f 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceAssetCertServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceAssetCertServiceImpl.java @@ -1,12 +1,12 @@ -package com.glxp.api.service.inv.impl; +package com.glxp.api.service.dev.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; -import com.glxp.api.dao.inv.DeviceAssetCertMapper; -import com.glxp.api.entity.inv.DeviceAssetCertEntity; +import com.glxp.api.dao.dev.DeviceAssetCertMapper; +import com.glxp.api.entity.dev.DeviceAssetCertEntity; import com.glxp.api.req.inv.FilterInvCertRequest; -import com.glxp.api.service.inv.DeviceAssetCertService; +import com.glxp.api.service.dev.DeviceAssetCertService; 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/DeviceInspectOrderServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectOrderServiceImpl.java similarity index 92% rename from src/main/java/com/glxp/api/service/inv/impl/DeviceInspectOrderServiceImpl.java rename to src/main/java/com/glxp/api/service/dev/impl/DeviceInspectOrderServiceImpl.java index a33a6baa8..def03762f 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectOrderServiceImpl.java @@ -1,4 +1,4 @@ -package com.glxp.api.service.inv.impl; +package com.glxp.api.service.dev.impl; import org.springframework.beans.BeanUtils; import cn.hutool.core.util.StrUtil; @@ -6,17 +6,17 @@ 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.inv.DeviceInspectOrderDao; -import com.glxp.api.dao.inv.DeviceInspectPlanDao; -import com.glxp.api.dao.inv.DeviceRepairOrderDao; -import com.glxp.api.entity.inv.DeviceInspectOrderEntity; -import com.glxp.api.entity.inv.DeviceInspectPlanEntity; -import com.glxp.api.entity.inv.DeviceRepairOrderEntity; -import com.glxp.api.req.inv.AddDeviceInspectOrderRequest; -import com.glxp.api.req.inv.FilterDeviceInspectOrderRequest; -import com.glxp.api.res.inv.DeviceInspectOrderResponse; +import com.glxp.api.dao.dev.DeviceInspectOrderDao; +import com.glxp.api.dao.dev.DeviceInspectPlanDao; +import com.glxp.api.dao.dev.DeviceRepairOrderDao; +import com.glxp.api.entity.dev.DeviceInspectOrderEntity; +import com.glxp.api.entity.dev.DeviceInspectPlanEntity; +import com.glxp.api.entity.dev.DeviceRepairOrderEntity; +import com.glxp.api.req.dev.AddDeviceInspectOrderRequest; +import com.glxp.api.req.dev.FilterDeviceInspectOrderRequest; +import com.glxp.api.res.dev.DeviceInspectOrderResponse; import com.glxp.api.service.auth.CustomerService; -import com.glxp.api.service.inv.DeviceInspectOrderService; +import com.glxp.api.service.dev.DeviceInspectOrderService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectPlanDelectServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectPlanDelectServiceImpl.java similarity index 91% rename from src/main/java/com/glxp/api/service/inv/impl/DeviceInspectPlanDelectServiceImpl.java rename to src/main/java/com/glxp/api/service/dev/impl/DeviceInspectPlanDelectServiceImpl.java index 072874859..13fbd4d38 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectPlanDelectServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectPlanDelectServiceImpl.java @@ -1,11 +1,11 @@ -package com.glxp.api.service.inv.impl; +package com.glxp.api.service.dev.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.glxp.api.dao.inv.DeviceInspectPlanDelectMapper; -import com.glxp.api.entity.inv.DeviceInspectPlanDelectEntity; -import com.glxp.api.service.inv.DeviceInspectPlanDelectService; +import com.glxp.api.dao.dev.DeviceInspectPlanDelectMapper; +import com.glxp.api.entity.dev.DeviceInspectPlanDelectEntity; +import com.glxp.api.service.dev.DeviceInspectPlanDelectService; import javax.annotation.Resource; import java.util.List; diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectPlanServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectPlanServiceImpl.java similarity index 91% rename from src/main/java/com/glxp/api/service/inv/impl/DeviceInspectPlanServiceImpl.java rename to src/main/java/com/glxp/api/service/dev/impl/DeviceInspectPlanServiceImpl.java index 747f9e569..d26dcefab 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectPlanServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectPlanServiceImpl.java @@ -1,4 +1,4 @@ -package com.glxp.api.service.inv.impl; +package com.glxp.api.service.dev.impl; import org.springframework.beans.BeanUtils; import cn.hutool.core.util.IdUtil; @@ -10,22 +10,20 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.constant.DeviceStatus; import com.glxp.api.constant.DeviceType; -import com.glxp.api.dao.inv.DeviceInspectPlanDao; -import com.glxp.api.dao.inv.DeviceInspectPlanDelectMapper; -import com.glxp.api.dao.inv.DeviceInspectTaskDetailMapper; -import com.glxp.api.dao.inv.DeviceInspectTaskMapper; -import com.glxp.api.entity.inv.DeviceInspectPlanDelectEntity; -import com.glxp.api.entity.inv.DeviceInspectPlanEntity; -import com.glxp.api.entity.inv.DeviceInspectTaskDetailEntity; -import com.glxp.api.entity.inv.DeviceInspectTaskEntity; -import com.glxp.api.req.inv.AddDeviceInspectPlanRequest; -import com.glxp.api.req.inv.FilterDeviceInspectPlanRequest; -import com.glxp.api.res.inv.DeviceInspectPlanResponse; +import com.glxp.api.dao.dev.DeviceInspectPlanDao; +import com.glxp.api.dao.dev.DeviceInspectPlanDelectMapper; +import com.glxp.api.entity.dev.DeviceInspectPlanDelectEntity; +import com.glxp.api.entity.dev.DeviceInspectPlanEntity; +import com.glxp.api.entity.dev.DeviceInspectTaskDetailEntity; +import com.glxp.api.entity.dev.DeviceInspectTaskEntity; +import com.glxp.api.req.dev.AddDeviceInspectPlanRequest; +import com.glxp.api.req.dev.FilterDeviceInspectPlanRequest; +import com.glxp.api.res.dev.DeviceInspectPlanResponse; import com.glxp.api.service.auth.CustomerService; -import com.glxp.api.service.inv.DeviceInspectOrderService; -import com.glxp.api.service.inv.DeviceInspectPlanService; -import com.glxp.api.service.inv.DeviceInspectTaskDetailService; -import com.glxp.api.service.inv.DeviceInspectTaskService; +import com.glxp.api.service.dev.DeviceInspectOrderService; +import com.glxp.api.service.dev.DeviceInspectPlanService; +import com.glxp.api.service.dev.DeviceInspectTaskDetailService; +import com.glxp.api.service.dev.DeviceInspectTaskService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectSetServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectSetServiceImpl.java similarity index 86% rename from src/main/java/com/glxp/api/service/inv/impl/DeviceInspectSetServiceImpl.java rename to src/main/java/com/glxp/api/service/dev/impl/DeviceInspectSetServiceImpl.java index 215f9c225..c6614d167 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectSetServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceInspectSetServiceImpl.java @@ -1,17 +1,17 @@ -package com.glxp.api.service.inv.impl; +package com.glxp.api.service.dev.impl; import org.springframework.beans.BeanUtils; import cn.hutool.core.util.StrUtil; 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.inv.DeptDeviceDetailDao; -import com.glxp.api.dao.inv.DeviceInspectSetDao; -import com.glxp.api.entity.inv.DeptDeviceDetailEntity; -import com.glxp.api.entity.inv.DeviceInspectSetEntity; -import com.glxp.api.req.inv.AddDeviceInspectSetRequest; -import com.glxp.api.res.inv.DeviceInspectSetResponse; -import com.glxp.api.service.inv.DeviceInspectSetService; +import com.glxp.api.dao.dev.DeptDeviceDetailDao; +import com.glxp.api.dao.dev.DeviceInspectSetDao; +import com.glxp.api.entity.dev.DeptDeviceDetailEntity; +import com.glxp.api.entity.dev.DeviceInspectSetEntity; +import com.glxp.api.req.dev.AddDeviceInspectSetRequest; +import com.glxp.api.res.dev.DeviceInspectSetResponse; +import com.glxp.api.service.dev.DeviceInspectSetService; 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/DeviceMAOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceMAOrderDetailServiceImpl.java similarity index 87% rename from src/main/java/com/glxp/api/service/inv/impl/DeviceMAOrderDetailServiceImpl.java rename to src/main/java/com/glxp/api/service/dev/impl/DeviceMAOrderDetailServiceImpl.java index 596ef9749..373274fce 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceMAOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceMAOrderDetailServiceImpl.java @@ -1,17 +1,17 @@ -package com.glxp.api.service.inv.impl; +package com.glxp.api.service.dev.impl; import cn.hutool.core.util.StrUtil; 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.inv.DeviceMAOrderDetailDao; -import com.glxp.api.dao.inv.DeviceReceiveOrderDetailDao; -import com.glxp.api.entity.inv.DeviceMAOrderDetailEntity; -import com.glxp.api.entity.inv.DeviceReceiveOrderDetailEntity; -import com.glxp.api.req.inv.FilterDeviceMAOrderDetailRequest; -import com.glxp.api.res.inv.DeviceMAOrderDetailResponse; -import com.glxp.api.service.inv.DeviceMAOrderDetailService; +import com.glxp.api.dao.dev.DeviceMAOrderDetailDao; +import com.glxp.api.dao.dev.DeviceReceiveOrderDetailDao; +import com.glxp.api.entity.dev.DeviceMAOrderDetailEntity; +import com.glxp.api.entity.dev.DeviceReceiveOrderDetailEntity; +import com.glxp.api.req.dev.FilterDeviceMAOrderDetailRequest; +import com.glxp.api.res.dev.DeviceMAOrderDetailResponse; +import com.glxp.api.service.dev.DeviceMAOrderDetailService; import groovy.util.logging.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceMAOrderServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceMAOrderServiceImpl.java similarity index 94% rename from src/main/java/com/glxp/api/service/inv/impl/DeviceMAOrderServiceImpl.java rename to src/main/java/com/glxp/api/service/dev/impl/DeviceMAOrderServiceImpl.java index a01839545..19e4d3d2c 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceMAOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceMAOrderServiceImpl.java @@ -1,4 +1,4 @@ -package com.glxp.api.service.inv.impl; +package com.glxp.api.service.dev.impl; import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; @@ -7,17 +7,17 @@ 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.basic.UdiRelevanceDao; -import com.glxp.api.dao.inv.DeviceMAOrderDao; -import com.glxp.api.dao.inv.DeviceMAOrderDetailDao; -import com.glxp.api.dao.inv.DeviceReceiveOrderDetailDao; -import com.glxp.api.entity.inv.DeviceMAOrderDetailEntity; -import com.glxp.api.entity.inv.DeviceMAOrderEntity; -import com.glxp.api.entity.inv.DeviceReceiveOrderDetailEntity; -import com.glxp.api.req.inv.AddDeviceMAOrderRequest; -import com.glxp.api.req.inv.FilterDeviceMAOrderRequest; -import com.glxp.api.res.inv.DeviceMAOrderResponse; +import com.glxp.api.dao.dev.DeviceMAOrderDao; +import com.glxp.api.dao.dev.DeviceMAOrderDetailDao; +import com.glxp.api.dao.dev.DeviceReceiveOrderDetailDao; +import com.glxp.api.entity.dev.DeviceMAOrderDetailEntity; +import com.glxp.api.entity.dev.DeviceMAOrderEntity; +import com.glxp.api.entity.dev.DeviceReceiveOrderDetailEntity; +import com.glxp.api.req.dev.AddDeviceMAOrderRequest; +import com.glxp.api.req.dev.FilterDeviceMAOrderRequest; +import com.glxp.api.res.dev.DeviceMAOrderResponse; import com.glxp.api.service.auth.CustomerService; -import com.glxp.api.service.inv.DeviceMAOrderService; +import com.glxp.api.service.dev.DeviceMAOrderService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceReceiveOrderDetailServiceImpl.java similarity index 95% rename from src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java rename to src/main/java/com/glxp/api/service/dev/impl/DeviceReceiveOrderDetailServiceImpl.java index 175828a35..5802b13bd 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceReceiveOrderDetailServiceImpl.java @@ -1,4 +1,4 @@ -package com.glxp.api.service.inv.impl; +package com.glxp.api.service.dev.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; @@ -7,26 +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.DeptDeviceDetailDao; -import com.glxp.api.dao.inv.DeviceReceiveOrderDetailDao; +import com.glxp.api.dao.dev.DeptDeviceDetailDao; +import com.glxp.api.dao.dev.DeviceReceiveOrderDetailDao; import com.glxp.api.dao.inv.InvProductDao; import com.glxp.api.dao.inv.InvProductDetailDao; import com.glxp.api.entity.basic.UdiEntity; import com.glxp.api.entity.basic.UdiProductEntity; -import com.glxp.api.entity.inv.DeptDeviceDetailEntity; -import com.glxp.api.entity.inv.DeviceReceiveOrderDetailEntity; +import com.glxp.api.entity.dev.DeptDeviceDetailEntity; +import com.glxp.api.entity.dev.DeviceReceiveOrderDetailEntity; import com.glxp.api.entity.inv.InvProductDetailEntity; -import com.glxp.api.entity.inv.InvProductEntity; import com.glxp.api.entity.system.SystemParamConfigEntity; -import com.glxp.api.req.inv.AddDeviceReceiveOrderDetailRequest; -import com.glxp.api.req.inv.FilterDeviceReceiveOrderDetailRequest; +import com.glxp.api.req.dev.AddDeviceReceiveOrderDetailRequest; +import com.glxp.api.req.dev.FilterDeviceReceiveOrderDetailRequest; import com.glxp.api.req.inv.FilterInvProductDetailRequest; import com.glxp.api.res.basic.UdiRelevanceResponse; -import com.glxp.api.res.inv.DeviceReceiveOrderDetailResponse; +import com.glxp.api.res.dev.DeviceReceiveOrderDetailResponse; import com.glxp.api.service.basic.UdiProductService; -import com.glxp.api.service.inv.DeptDeviceDetailService; -import com.glxp.api.service.inv.DeviceReceiveOrderDetailService; +import com.glxp.api.service.dev.DeviceReceiveOrderDetailService; import com.glxp.api.service.system.SystemParamConfigService; import com.glxp.api.util.udi.FilterUdiUtils; import lombok.extern.slf4j.Slf4j; @@ -35,7 +32,6 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.*; -import java.util.stream.Collectors; @Slf4j @Service diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceReceiveOrderServiceImpl.java similarity index 81% rename from src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderServiceImpl.java rename to src/main/java/com/glxp/api/service/dev/impl/DeviceReceiveOrderServiceImpl.java index 47b399178..1e7f634d9 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceReceiveOrderServiceImpl.java @@ -1,48 +1,31 @@ -package com.glxp.api.service.inv.impl; +package com.glxp.api.service.dev.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.pagehelper.PageHelper; -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.FileConstant; -import com.glxp.api.dao.inv.DeviceReceiveOrderDao; -import com.glxp.api.dao.inv.DeviceReceiveOrderDetailDao; +import com.glxp.api.dao.dev.DeviceReceiveOrderDao; +import com.glxp.api.dao.dev.DeviceReceiveOrderDetailDao; import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.entity.inv.DeviceReceiveOrderDetailEntity; -import com.glxp.api.entity.inv.DeviceReceiveOrderEntity; -import com.glxp.api.entity.purchase.SupCertEntity; -import com.glxp.api.entity.purchase.SupCompanyEntity; -import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity; -import com.glxp.api.entity.system.SystemPDFTemplateEntity; -import com.glxp.api.req.inout.InspectionPDFTemplateRequest; -import com.glxp.api.req.inv.FilterDeviceReceiveOrderRequest; -import com.glxp.api.req.purchase.purPlanPrintRequest; -import com.glxp.api.res.inv.DeviceReceiveOrderResponse; +import com.glxp.api.entity.dev.DeviceReceiveOrderDetailEntity; +import com.glxp.api.entity.dev.DeviceReceiveOrderEntity; +import com.glxp.api.req.dev.FilterDeviceReceiveOrderRequest; +import com.glxp.api.res.dev.DeviceReceiveOrderResponse; import com.glxp.api.service.auth.CustomerService; -import com.glxp.api.service.inv.DeptDeviceDetailService; -import com.glxp.api.service.inv.DeviceReceiveOrderService; -import com.glxp.api.service.system.SystemPDFModuleService; -import com.glxp.api.service.system.SystemPDFTemplateService; +import com.glxp.api.service.dev.DeptDeviceDetailService; +import com.glxp.api.service.dev.DeviceReceiveOrderService; import com.glxp.api.util.GennerOrderUtils; -import com.glxp.api.util.JasperUtils; import com.glxp.api.util.OrderNoTypeBean; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.text.SimpleDateFormat; import java.util.*; @Slf4j diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairOrderDetailServiceImpl.java similarity index 86% rename from src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java rename to src/main/java/com/glxp/api/service/dev/impl/DeviceRepairOrderDetailServiceImpl.java index e614dd647..62e269b98 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairOrderDetailServiceImpl.java @@ -1,14 +1,14 @@ -package com.glxp.api.service.inv.impl; +package com.glxp.api.service.dev.impl; 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.inv.DeviceRepairOrderDetailMapper; -import com.glxp.api.entity.inv.DeviceRepairOrderDetailEntity; -import com.glxp.api.req.inv.FilterDeviceRepairOrderDetailRequest; -import com.glxp.api.res.inv.DeviceRepairOrderDetailResponse; -import com.glxp.api.service.inv.DeviceRepairOrderDetailService; +import com.glxp.api.dao.dev.DeviceRepairOrderDetailMapper; +import com.glxp.api.entity.dev.DeviceRepairOrderDetailEntity; +import com.glxp.api.req.dev.FilterDeviceRepairOrderDetailRequest; +import com.glxp.api.res.dev.DeviceRepairOrderDetailResponse; +import com.glxp.api.service.dev.DeviceRepairOrderDetailService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairOrderServiceImpl.java similarity index 92% rename from src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java rename to src/main/java/com/glxp/api/service/dev/impl/DeviceRepairOrderServiceImpl.java index 8a22d4ae6..a0e0d2569 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceRepairOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/DeviceRepairOrderServiceImpl.java @@ -1,5 +1,9 @@ -package com.glxp.api.service.inv.impl; +package com.glxp.api.service.dev.impl; +import com.glxp.api.entity.dev.DeviceInspectTaskDetailEntity; +import com.glxp.api.entity.dev.DeviceInspectTaskEntity; +import com.glxp.api.entity.dev.DeviceRepairOrderDetailEntity; +import com.glxp.api.entity.dev.DeviceRepairOrderEntity; import org.springframework.beans.BeanUtils; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -9,20 +13,18 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.constant.DeviceStatus; import com.glxp.api.constant.DeviceType; -import com.glxp.api.dao.inv.DeviceInspectPlanDao; -import com.glxp.api.dao.inv.DeviceInspectPlanDelectMapper; -import com.glxp.api.dao.inv.DeviceRepairOrderDao; -import com.glxp.api.dao.inv.DeviceRepairOrderDetailMapper; +import com.glxp.api.dao.dev.DeviceInspectPlanDelectMapper; +import com.glxp.api.dao.dev.DeviceRepairOrderDao; +import com.glxp.api.dao.dev.DeviceRepairOrderDetailMapper; import com.glxp.api.entity.auth.AuthAdmin; -import com.glxp.api.entity.inv.*; -import com.glxp.api.req.inv.AddDeviceRepairOrderRequest; -import com.glxp.api.req.inv.FilterDeviceRepairOrderRequest; -import com.glxp.api.res.inv.DeviceRepairOrderResponse; +import com.glxp.api.req.dev.AddDeviceRepairOrderRequest; +import com.glxp.api.req.dev.FilterDeviceRepairOrderRequest; +import com.glxp.api.res.dev.DeviceRepairOrderResponse; import com.glxp.api.service.auth.CustomerService; -import com.glxp.api.service.inv.DeviceInspectOrderService; -import com.glxp.api.service.inv.DeviceInspectTaskDetailService; -import com.glxp.api.service.inv.DeviceInspectTaskService; -import com.glxp.api.service.inv.DeviceRepairOrderService; +import com.glxp.api.service.dev.DeviceInspectOrderService; +import com.glxp.api.service.dev.DeviceInspectTaskDetailService; +import com.glxp.api.service.dev.DeviceInspectTaskService; +import com.glxp.api.service.dev.DeviceRepairOrderService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/InvMAOrderDetailServiceImpl.java similarity index 95% rename from src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java rename to src/main/java/com/glxp/api/service/dev/impl/InvMAOrderDetailServiceImpl.java index 3c91f3fca..e5d9f0c10 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderDetailServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/InvMAOrderDetailServiceImpl.java @@ -1,4 +1,4 @@ -package com.glxp.api.service.inv.impl; +package com.glxp.api.service.dev.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; @@ -8,14 +8,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.ConstantType; +import com.glxp.api.dao.dev.InvMAExplanationDao; +import com.glxp.api.dao.dev.InvMAOrderDao; +import com.glxp.api.dao.dev.InvMAOrderDetailDao; import com.glxp.api.dao.inv.*; import com.glxp.api.entity.basic.UdiEntity; +import com.glxp.api.entity.dev.InvMAExplanationEntity; +import com.glxp.api.entity.dev.InvMAOrderDetailEntity; +import com.glxp.api.entity.dev.InvMAOrderEntity; import com.glxp.api.entity.inv.*; -import com.glxp.api.req.inv.AddInvMAOrderDetailRequest; -import com.glxp.api.req.inv.FilterInvMAOrderDetailRequest; +import com.glxp.api.req.dev.AddInvMAOrderDetailRequest; +import com.glxp.api.req.dev.FilterInvMAOrderDetailRequest; import com.glxp.api.req.inv.FilterInvProductDetailRequest; -import com.glxp.api.res.inv.InvMAOrderDetailResponse; -import com.glxp.api.service.inv.InvMAOrderDetailService; +import com.glxp.api.res.dev.InvMAOrderDetailResponse; +import com.glxp.api.service.dev.InvMAOrderDetailService; import com.glxp.api.util.udi.FilterUdiUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderServiceImpl.java b/src/main/java/com/glxp/api/service/dev/impl/InvMAOrderServiceImpl.java similarity index 93% rename from src/main/java/com/glxp/api/service/inv/impl/InvMAOrderServiceImpl.java rename to src/main/java/com/glxp/api/service/dev/impl/InvMAOrderServiceImpl.java index 761c2a0fa..8ed288867 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvMAOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/dev/impl/InvMAOrderServiceImpl.java @@ -1,4 +1,4 @@ -package com.glxp.api.service.inv.impl; +package com.glxp.api.service.dev.impl; import org.springframework.beans.BeanUtils; import cn.hutool.core.util.StrUtil; @@ -8,14 +8,14 @@ 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.dao.inv.InvMAOrderDao; -import com.glxp.api.dao.inv.InvMAOrderDetailDao; -import com.glxp.api.entity.inv.InvMAOrderDetailEntity; -import com.glxp.api.entity.inv.InvMAOrderEntity; -import com.glxp.api.req.inv.FilterInvMAOrderRequest; -import com.glxp.api.res.inv.InvMAOrderResponse; +import com.glxp.api.dao.dev.InvMAOrderDao; +import com.glxp.api.dao.dev.InvMAOrderDetailDao; +import com.glxp.api.entity.dev.InvMAOrderDetailEntity; +import com.glxp.api.entity.dev.InvMAOrderEntity; +import com.glxp.api.req.dev.FilterInvMAOrderRequest; +import com.glxp.api.res.dev.InvMAOrderResponse; import com.glxp.api.service.auth.CustomerService; -import com.glxp.api.service.inv.InvMAOrderService; +import com.glxp.api.service.dev.InvMAOrderService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoStatMonthServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoStatMonthServiceImpl.java index 75f15164e..002425a10 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoStatMonthServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoStatMonthServiceImpl.java @@ -11,9 +11,8 @@ import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.inout.*; import com.glxp.api.dao.schedule.SystemParamConfigDao; import com.glxp.api.entity.inout.*; -import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.req.inout.FilterStatDataDetailRequest; -import com.glxp.api.res.inv.DateRequest; +import com.glxp.api.res.dev.DateRequest; import com.glxp.api.service.inout.IoStatMonthService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java index 852e3827d..809179268 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoStatQuarterServiceImpl.java @@ -9,9 +9,7 @@ import com.github.pagehelper.PageHelper; import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.inout.*; import com.glxp.api.entity.inout.*; -import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.req.inout.FilterStatDataDetailRequest; -import com.glxp.api.res.inv.DateRequest; import com.glxp.api.service.inout.IoStatQuarterService; import com.glxp.api.util.GennerOrderUtils; import com.glxp.api.util.OrderNoTypeBean; diff --git a/src/main/java/com/glxp/api/service/sync/HeartService.java b/src/main/java/com/glxp/api/service/sync/HeartService.java index 9f074a5dc..4e8b8d1a9 100644 --- a/src/main/java/com/glxp/api/service/sync/HeartService.java +++ b/src/main/java/com/glxp/api/service/sync/HeartService.java @@ -18,16 +18,16 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.*; import com.glxp.api.dao.basic.*; import com.glxp.api.dao.inout.*; -import com.glxp.api.dao.inv.DeviceInspectTaskDetailMapper; -import com.glxp.api.dao.inv.DeviceInspectTaskMapper; +import com.glxp.api.dao.dev.DeviceInspectTaskDetailMapper; +import com.glxp.api.dao.dev.DeviceInspectTaskMapper; import com.glxp.api.dao.purchase.*; import com.glxp.api.dao.thrsys.ThrBusTypeOriginDao; import com.glxp.api.dto.RelaySyncDto; import com.glxp.api.entity.auth.*; import com.glxp.api.entity.basic.*; import com.glxp.api.entity.inout.*; -import com.glxp.api.entity.inv.DeviceInspectTaskDetailEntity; -import com.glxp.api.entity.inv.DeviceInspectTaskEntity; +import com.glxp.api.entity.dev.DeviceInspectTaskDetailEntity; +import com.glxp.api.entity.dev.DeviceInspectTaskEntity; import com.glxp.api.entity.purchase.*; import com.glxp.api.entity.sync.BasicDownloadStatusEntity; import com.glxp.api.entity.sync.BasicExportStatusEntity; @@ -42,9 +42,8 @@ import com.glxp.api.res.sync.*; import com.glxp.api.service.auth.*; import com.glxp.api.service.basic.*; import com.glxp.api.service.inout.*; -import com.glxp.api.service.inout.impl.IoOrderInvoiceService; -import com.glxp.api.service.inv.DeviceInspectTaskDetailService; -import com.glxp.api.service.inv.DeviceInspectTaskService; +import com.glxp.api.service.dev.DeviceInspectTaskDetailService; +import com.glxp.api.service.dev.DeviceInspectTaskService; import com.glxp.api.service.system.*; import com.glxp.api.service.thrsys.*; import com.glxp.api.util.CustomUtil; @@ -57,7 +56,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.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/glxp/api/task/DevicePlanTask.java b/src/main/java/com/glxp/api/task/DevicePlanTask.java index 12520b0b9..eaf9eda28 100644 --- a/src/main/java/com/glxp/api/task/DevicePlanTask.java +++ b/src/main/java/com/glxp/api/task/DevicePlanTask.java @@ -3,12 +3,12 @@ package com.glxp.api.task; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.glxp.api.dao.inv.DeviceInspectPlanDao; +import com.glxp.api.dao.dev.DeviceInspectPlanDao; import com.glxp.api.dao.schedule.ScheduledDao; -import com.glxp.api.entity.inv.DeviceInspectPlanEntity; +import com.glxp.api.entity.dev.DeviceInspectPlanEntity; import com.glxp.api.entity.system.ScheduledEntity; import com.glxp.api.req.system.ScheduledRequest; -import com.glxp.api.service.inv.DeviceInspectPlanService; +import com.glxp.api.service.dev.DeviceInspectPlanService; import com.glxp.api.util.IntUtil; import com.glxp.api.util.RedisUtil; import lombok.extern.slf4j.Slf4j; diff --git a/src/main/java/com/glxp/api/util/IdUtil.java b/src/main/java/com/glxp/api/util/IdUtil.java index 68ccb6916..8077e7a02 100644 --- a/src/main/java/com/glxp/api/util/IdUtil.java +++ b/src/main/java/com/glxp/api/util/IdUtil.java @@ -1,7 +1,7 @@ package com.glxp.api.util; import com.glxp.api.constant.Constant; -import com.glxp.api.dao.inv.DeptDeviceDetailDao; +import com.glxp.api.dao.dev.DeptDeviceDetailDao; import org.springframework.stereotype.Component; import javax.annotation.Resource; diff --git a/src/main/resources/mybatis/mapper/inv/DeptDeviceDetailDao.xml b/src/main/resources/mybatis/mapper/dev/DeptDeviceDetailDao.xml similarity index 94% rename from src/main/resources/mybatis/mapper/inv/DeptDeviceDetailDao.xml rename to src/main/resources/mybatis/mapper/dev/DeptDeviceDetailDao.xml index 9b88b3ee9..f7d4e44ba 100644 --- a/src/main/resources/mybatis/mapper/inv/DeptDeviceDetailDao.xml +++ b/src/main/resources/mybatis/mapper/dev/DeptDeviceDetailDao.xml @@ -1,12 +1,12 @@ - + - select t.id, t.deptCode, t.invCode, @@ -91,7 +91,7 @@ order by t.updateTime desc - select (select `name` from auth_dept where code = t.deptCode) deptName, (select `name` from auth_warehouse where code = t.invCode) invName, t.deviceName, @@ -99,4 +99,4 @@ from dept_device_detail t where t.code = #{code} - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/inv/DeviceAssetCertMapper.xml b/src/main/resources/mybatis/mapper/dev/DeviceAssetCertMapper.xml similarity index 92% rename from src/main/resources/mybatis/mapper/inv/DeviceAssetCertMapper.xml rename to src/main/resources/mybatis/mapper/dev/DeviceAssetCertMapper.xml index 849843294..7de5b64bc 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceAssetCertMapper.xml +++ b/src/main/resources/mybatis/mapper/dev/DeviceAssetCertMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -26,7 +26,7 @@ + + - select * from device_inspect_order where orderId = #{orderId} - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/inv/DeviceInspectPlanDao.xml b/src/main/resources/mybatis/mapper/dev/DeviceInspectPlanDao.xml similarity index 95% rename from src/main/resources/mybatis/mapper/inv/DeviceInspectPlanDao.xml rename to src/main/resources/mybatis/mapper/dev/DeviceInspectPlanDao.xml index cf5ad3aa1..c2d3e6cb1 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceInspectPlanDao.xml +++ b/src/main/resources/mybatis/mapper/dev/DeviceInspectPlanDao.xml @@ -1,13 +1,13 @@ - - select * from device_inspect_plan where orderId = #{orderId} - select t.id, t.orderId, t.deptCode, @@ -81,4 +81,4 @@ order by t.updateTime desc - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/inv/DeviceInspectPlanDelectMapper.xml b/src/main/resources/mybatis/mapper/dev/DeviceInspectPlanDelectMapper.xml similarity index 84% rename from src/main/resources/mybatis/mapper/inv/DeviceInspectPlanDelectMapper.xml rename to src/main/resources/mybatis/mapper/dev/DeviceInspectPlanDelectMapper.xml index 15a6555a6..3ea5529a7 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceInspectPlanDelectMapper.xml +++ b/src/main/resources/mybatis/mapper/dev/DeviceInspectPlanDelectMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -13,4 +13,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/inv/DeviceInspectSetDao.xml b/src/main/resources/mybatis/mapper/dev/DeviceInspectSetDao.xml similarity index 81% rename from src/main/resources/mybatis/mapper/inv/DeviceInspectSetDao.xml rename to src/main/resources/mybatis/mapper/dev/DeviceInspectSetDao.xml index 5f772f523..64f8f7bf0 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceInspectSetDao.xml +++ b/src/main/resources/mybatis/mapper/dev/DeviceInspectSetDao.xml @@ -1,7 +1,7 @@ - - select t.id, t.code, t.frequency, @@ -19,4 +19,4 @@ - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskDetailMapper.xml b/src/main/resources/mybatis/mapper/dev/DeviceInspectTaskDetailMapper.xml similarity index 86% rename from src/main/resources/mybatis/mapper/inv/DeviceInspectTaskDetailMapper.xml rename to src/main/resources/mybatis/mapper/dev/DeviceInspectTaskDetailMapper.xml index 6707f009a..b9d398885 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskDetailMapper.xml +++ b/src/main/resources/mybatis/mapper/dev/DeviceInspectTaskDetailMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -16,7 +16,7 @@ - id, projectCode, projectContent, `status`, `result`, inspectImage, inspectUser, updateTime, + id, projectCode, projectContent, `status`, `result`, inspectImage, inspectUser, updateTime, taskOrderIdFk - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml b/src/main/resources/mybatis/mapper/dev/DeviceInspectTaskMapper.xml similarity index 95% rename from src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml rename to src/main/resources/mybatis/mapper/dev/DeviceInspectTaskMapper.xml index 0d40e5067..f24994e24 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceInspectTaskMapper.xml +++ b/src/main/resources/mybatis/mapper/dev/DeviceInspectTaskMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -27,7 +27,7 @@ - select t.id, t.orderId, diff --git a/src/main/resources/mybatis/mapper/inv/DeviceMAOrderDao.xml b/src/main/resources/mybatis/mapper/dev/DeviceMAOrderDao.xml similarity index 89% rename from src/main/resources/mybatis/mapper/inv/DeviceMAOrderDao.xml rename to src/main/resources/mybatis/mapper/dev/DeviceMAOrderDao.xml index c87c868cb..843a950db 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceMAOrderDao.xml +++ b/src/main/resources/mybatis/mapper/dev/DeviceMAOrderDao.xml @@ -1,13 +1,13 @@ - - select * from device_ma_order where orderId = #{orderId} - select dmo.id, dmo.createUser, dmo.receiveOrderId, @@ -34,4 +34,4 @@ order by dmo.createTime desc - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/inv/DeviceMAOrderDetailDao.xml b/src/main/resources/mybatis/mapper/dev/DeviceMAOrderDetailDao.xml similarity index 90% rename from src/main/resources/mybatis/mapper/inv/DeviceMAOrderDetailDao.xml rename to src/main/resources/mybatis/mapper/dev/DeviceMAOrderDetailDao.xml index fe35890c9..5f5e3de67 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceMAOrderDetailDao.xml +++ b/src/main/resources/mybatis/mapper/dev/DeviceMAOrderDetailDao.xml @@ -1,7 +1,7 @@ - - select bp.cpmctymc productName, bp.ggxh, ip.batchNo, @@ -16,7 +16,7 @@ group by ip.relIdFk - select * from device_ma_order_detail where orderIdFk = #{orderId} @@ -28,7 +28,7 @@ where orderIdFk = #{orderIdFk} - select dmod.id, dmod.orderIdFk, dmod.code, @@ -58,4 +58,4 @@ order by dmod.id - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/inv/DeviceProjectSetMapper.xml b/src/main/resources/mybatis/mapper/dev/DeviceProjectSetMapper.xml similarity index 90% rename from src/main/resources/mybatis/mapper/inv/DeviceProjectSetMapper.xml rename to src/main/resources/mybatis/mapper/dev/DeviceProjectSetMapper.xml index 6a38c6a8c..8a51aa1d8 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceProjectSetMapper.xml +++ b/src/main/resources/mybatis/mapper/dev/DeviceProjectSetMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -19,7 +19,7 @@ id, code, content, `type`, remak, udpateTime, updateUser, `createUser`, createTime - select device_project_set.*, (select employeeName from auth_user where device_project_set.updateUser=auth_user.id) as updateUserName, (select employeeName from auth_user where device_project_set.createUser=auth_user.id) as createUserName diff --git a/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDao.xml b/src/main/resources/mybatis/mapper/dev/DeviceReceiveOrderDao.xml similarity index 95% rename from src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDao.xml rename to src/main/resources/mybatis/mapper/dev/DeviceReceiveOrderDao.xml index ddd10ca55..4bde5936c 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDao.xml +++ b/src/main/resources/mybatis/mapper/dev/DeviceReceiveOrderDao.xml @@ -1,7 +1,7 @@ - - SELECT dro.id, dro.orderId, diff --git a/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDetailDao.xml b/src/main/resources/mybatis/mapper/dev/DeviceReceiveOrderDetailDao.xml similarity index 92% rename from src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDetailDao.xml rename to src/main/resources/mybatis/mapper/dev/DeviceReceiveOrderDetailDao.xml index 9ffbdb1db..106ecdd58 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDetailDao.xml +++ b/src/main/resources/mybatis/mapper/dev/DeviceReceiveOrderDetailDao.xml @@ -1,13 +1,13 @@ - - select * from device_receive_order_detail where orderIdFk = #{orderId} - select drod.*, bp.manufactory, bp.ylqxzcrbarmc, bp.zczbhhzbapzbh,bp.cpmctymc,bp.ggxh from device_receive_order_detail drod left join basic_udirel bu on bu.id = drod.relId @@ -27,7 +27,7 @@ where orderIdFk = #{orderIdFk} - select drod.id, drod.orderIdFk, drod.originCode, @@ -77,7 +77,7 @@ group by bu.uuid - select * from device_receive_order_detail @@ -90,7 +90,7 @@ - select * from device_receive_order_detail @@ -120,4 +120,4 @@ where orderIdFk = #{orderId} and code like '%#' - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDao.xml b/src/main/resources/mybatis/mapper/dev/DeviceRepairOrderDao.xml similarity index 94% rename from src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDao.xml rename to src/main/resources/mybatis/mapper/dev/DeviceRepairOrderDao.xml index 6c4ae681a..0b9e2e6a0 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDao.xml +++ b/src/main/resources/mybatis/mapper/dev/DeviceRepairOrderDao.xml @@ -1,13 +1,13 @@ - - select * from device_repair_order where orderId = #{orderId} - select t.id, t.orderId, t.deptCode, diff --git a/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDetailMapper.xml b/src/main/resources/mybatis/mapper/dev/DeviceRepairOrderDetailMapper.xml similarity index 88% rename from src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDetailMapper.xml rename to src/main/resources/mybatis/mapper/dev/DeviceRepairOrderDetailMapper.xml index 58eae9db2..f33ef36a8 100644 --- a/src/main/resources/mybatis/mapper/inv/DeviceRepairOrderDetailMapper.xml +++ b/src/main/resources/mybatis/mapper/dev/DeviceRepairOrderDetailMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -18,7 +18,7 @@ id, orderIdFk, code, content, `type`, remark, updateUser, updateTime - select * from device_repair_order_detail diff --git a/src/main/resources/mybatis/mapper/inv/InvMAExplanationDao.xml b/src/main/resources/mybatis/mapper/dev/InvMAExplanationDao.xml similarity index 75% rename from src/main/resources/mybatis/mapper/inv/InvMAExplanationDao.xml rename to src/main/resources/mybatis/mapper/dev/InvMAExplanationDao.xml index 43dcfb8d6..d273f4147 100644 --- a/src/main/resources/mybatis/mapper/inv/InvMAExplanationDao.xml +++ b/src/main/resources/mybatis/mapper/dev/InvMAExplanationDao.xml @@ -1,9 +1,9 @@ - - select * from inv_ma_explanation where status = #{status} - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/inv/InvMAOrderDao.xml b/src/main/resources/mybatis/mapper/dev/InvMAOrderDao.xml similarity index 93% rename from src/main/resources/mybatis/mapper/inv/InvMAOrderDao.xml rename to src/main/resources/mybatis/mapper/dev/InvMAOrderDao.xml index ed41d1dec..61e37fe08 100644 --- a/src/main/resources/mybatis/mapper/inv/InvMAOrderDao.xml +++ b/src/main/resources/mybatis/mapper/dev/InvMAOrderDao.xml @@ -1,7 +1,7 @@ - - select ma.id, ma.orderId, ma.invCode, @@ -40,4 +40,4 @@ order by ma.updateTime desc - \ No newline at end of file + diff --git a/src/main/resources/mybatis/mapper/inv/InvMAOrderDetailDao.xml b/src/main/resources/mybatis/mapper/dev/InvMAOrderDetailDao.xml similarity index 90% rename from src/main/resources/mybatis/mapper/inv/InvMAOrderDetailDao.xml rename to src/main/resources/mybatis/mapper/dev/InvMAOrderDetailDao.xml index 45e89d80d..2910eaf8a 100644 --- a/src/main/resources/mybatis/mapper/inv/InvMAOrderDetailDao.xml +++ b/src/main/resources/mybatis/mapper/dev/InvMAOrderDetailDao.xml @@ -1,7 +1,7 @@ - - SELECT mad.id, mad.orderIdFk, mad.CODE, @@ -35,11 +35,11 @@ group by mad.code - select * from inv_ma_order_detail where orderIdFk = #{orderIdFk} and code = #{code} limit 1 - \ No newline at end of file +