From 46f3381719f02dc655eeabdd1340f39d882936e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=AB=B9=E5=A4=A9=E5=8D=AB?= <15010051933@139.com>
Date: Fri, 23 Apr 2021 15:52:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=BC=82=E5=B8=B8=E5=A4=84?=
=?UTF-8?q?=E7=90=86=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
acquisition-business/pom.xml | 11 +-
.../config/GlobalDefaultExceptionHandler.java | 68 ------
.../acquisition/business/constant/Rcode.java | 34 +++
.../business/controller/LoginController.java | 54 ++---
.../controller/TAnnouncementController.java | 21 --
.../TEquipmentAccountController.java | 21 --
.../controller/TEquipmentCheckController.java | 21 --
.../TEquipmentMaintenanceController.java | 21 --
.../TEquipmentMaintenanceCycleController.java | 21 --
.../TEquipmentRepairController.java | 21 --
.../controller/TEquipmentRunController.java | 21 --
.../TEquipmentTroubleController.java | 21 --
.../TEquipmentUsagefeeController.java | 21 --
.../controller/TMaterialEntryController.java | 21 --
.../controller/TMaterialOutController.java | 21 --
.../controller/TMineBasicController.java | 21 --
.../controller/TMineRightController.java | 21 --
.../controller/TMineScopeController.java | 21 --
.../controller/TMineStopeController.java | 21 --
.../controller/TPlanMonthController.java | 21 --
.../controller/TPlanYearController.java | 21 --
.../TProcessesAuxiliaryController.java | 21 --
.../controller/TProcessesBlastController.java | 21 --
.../TProcessesBlastdesignHoleController.java | 21 --
...TProcessesBlastdesignVolumeController.java | 21 --
.../TProcessesCrusherController.java | 21 --
.../TProcessesDiggingController.java | 21 --
.../TProcessesDrillingController.java | 21 --
.../controller/TProcessesTruckController.java | 21 --
.../controller/TSafeTroubleController.java | 21 --
.../controller/TSafeTroubleImgController.java | 21 --
.../TSampleLaboratorysheetController.java | 21 --
.../controller/TSampleListController.java | 21 --
.../controller/TSysDeptController.java | 2 +-
.../controller/TSysDictController.java | 2 +-
.../controller/TSysPowerController.java | 2 +-
.../controller/TSysRoleController.java | 2 +-
.../controller/TSysRolepowerController.java | 2 +-
.../controller/TSysUserController.java | 6 +-
.../controller/TSysUserLoginController.java | 2 +-
.../business/controller/TWagesController.java | 21 --
.../controller/TWeightController.java | 21 --
.../business/entity/TAnnouncement.java | 57 -----
.../business/entity/TEquipmentAccount.java | 143 ------------
.../business/entity/TEquipmentCheck.java | 92 --------
.../entity/TEquipmentMaintenance.java | 96 --------
.../entity/TEquipmentMaintenanceCycle.java | 52 -----
.../business/entity/TEquipmentRepair.java | 102 ---------
.../business/entity/TEquipmentRun.java | 87 --------
.../business/entity/TEquipmentTrouble.java | 101 ---------
.../business/entity/TEquipmentUsagefee.java | 77 -------
.../business/entity/TMaterialEntry.java | 74 ------
.../business/entity/TMaterialOut.java | 120 ----------
.../business/entity/TMineBasic.java | 108 ---------
.../business/entity/TMineRight.java | 138 ------------
.../business/entity/TMineScope.java | 60 -----
.../business/entity/TMineStope.java | 59 -----
.../business/entity/TPlanMonth.java | 134 -----------
.../business/entity/TPlanYear.java | 128 -----------
.../business/entity/TProcessesAuxiliary.java | 107 ---------
.../business/entity/TProcessesBlast.java | 123 ----------
.../entity/TProcessesBlastdesignHole.java | 132 -----------
.../entity/TProcessesBlastdesignVolume.java | 59 -----
.../business/entity/TProcessesCrusher.java | 120 ----------
.../business/entity/TProcessesDigging.java | 138 ------------
.../business/entity/TProcessesDrilling.java | 210 ------------------
.../business/entity/TProcessesTruck.java | 162 --------------
.../business/entity/TSafeTrouble.java | 90 --------
.../business/entity/TSafeTroubleImg.java | 45 ----
.../entity/TSampleLaboratorysheet.java | 131 -----------
.../business/entity/TSampleList.java | 95 --------
.../acquisition/business/entity/TSysDept.java | 2 +-
.../acquisition/business/entity/TSysDict.java | 2 +-
.../business/entity/TSysPower.java | 2 +-
.../acquisition/business/entity/TSysRole.java | 2 +-
.../business/entity/TSysRolepower.java | 2 +-
.../acquisition/business/entity/TSysUser.java | 81 ++++---
.../business/entity/TSysUserLogin.java | 2 +-
.../acquisition/business/entity/TWages.java | 65 ------
.../acquisition/business/entity/TWeight.java | 77 -------
.../business/exception/Assert.java | 112 ----------
.../business/exception/BaseException.java | 48 ----
.../business/exception/BusinessException.java | 20 --
.../exception/BusinessExceptionAssert.java | 57 -----
.../exception/BusinessExceptionEnum.java | 60 -----
.../exception/BusinessOldException.java | 42 ----
.../business/exception/CodeException.java | 19 --
.../exception/CodeExceptionAssert.java | 27 ---
.../business/exception/CodeExceptionEnum.java | 29 ---
.../business/exception/IResponseEnum.java | 12 -
.../business/filter/TokenFilter.java | 1 -
.../business/mapper/TAnnouncementMapper.java | 16 --
.../mapper/TEquipmentAccountMapper.java | 16 --
.../mapper/TEquipmentCheckMapper.java | 16 --
.../TEquipmentMaintenanceCycleMapper.java | 16 --
.../mapper/TEquipmentMaintenanceMapper.java | 16 --
.../mapper/TEquipmentRepairMapper.java | 16 --
.../business/mapper/TEquipmentRunMapper.java | 16 --
.../mapper/TEquipmentTroubleMapper.java | 16 --
.../mapper/TEquipmentUsagefeeMapper.java | 16 --
.../business/mapper/TMaterialEntryMapper.java | 16 --
.../business/mapper/TMaterialOutMapper.java | 16 --
.../business/mapper/TMineBasicMapper.java | 16 --
.../business/mapper/TMineRightMapper.java | 16 --
.../business/mapper/TMineScopeMapper.java | 16 --
.../business/mapper/TMineStopeMapper.java | 16 --
.../business/mapper/TPlanMonthMapper.java | 16 --
.../business/mapper/TPlanYearMapper.java | 16 --
.../mapper/TProcessesAuxiliaryMapper.java | 16 --
.../mapper/TProcessesBlastMapper.java | 16 --
.../TProcessesBlastdesignHoleMapper.java | 16 --
.../TProcessesBlastdesignVolumeMapper.java | 16 --
.../mapper/TProcessesCrusherMapper.java | 16 --
.../mapper/TProcessesDiggingMapper.java | 16 --
.../mapper/TProcessesDrillingMapper.java | 16 --
.../mapper/TProcessesTruckMapper.java | 16 --
.../mapper/TSafeTroubleImgMapper.java | 16 --
.../business/mapper/TSafeTroubleMapper.java | 16 --
.../mapper/TSampleLaboratorysheetMapper.java | 16 --
.../business/mapper/TSampleListMapper.java | 16 --
.../business/mapper/TWagesMapper.java | 16 --
.../business/mapper/TWeightMapper.java | 16 --
.../mapper/xml/TAnnouncementMapper.xml | 5 -
.../mapper/xml/TEquipmentAccountMapper.xml | 5 -
.../mapper/xml/TEquipmentCheckMapper.xml | 5 -
.../xml/TEquipmentMaintenanceCycleMapper.xml | 5 -
.../xml/TEquipmentMaintenanceMapper.xml | 5 -
.../mapper/xml/TEquipmentRepairMapper.xml | 5 -
.../mapper/xml/TEquipmentRunMapper.xml | 5 -
.../mapper/xml/TEquipmentTroubleMapper.xml | 5 -
.../mapper/xml/TEquipmentUsagefeeMapper.xml | 5 -
.../mapper/xml/TMaterialEntryMapper.xml | 5 -
.../mapper/xml/TMaterialOutMapper.xml | 5 -
.../business/mapper/xml/TMineBasicMapper.xml | 5 -
.../business/mapper/xml/TMineRightMapper.xml | 5 -
.../business/mapper/xml/TMineScopeMapper.xml | 5 -
.../business/mapper/xml/TMineStopeMapper.xml | 5 -
.../business/mapper/xml/TPlanMonthMapper.xml | 5 -
.../business/mapper/xml/TPlanYearMapper.xml | 5 -
.../mapper/xml/TProcessesAuxiliaryMapper.xml | 5 -
.../mapper/xml/TProcessesBlastMapper.xml | 5 -
.../xml/TProcessesBlastdesignHoleMapper.xml | 5 -
.../xml/TProcessesBlastdesignVolumeMapper.xml | 5 -
.../mapper/xml/TProcessesCrusherMapper.xml | 5 -
.../mapper/xml/TProcessesDiggingMapper.xml | 5 -
.../mapper/xml/TProcessesDrillingMapper.xml | 5 -
.../mapper/xml/TProcessesTruckMapper.xml | 5 -
.../mapper/xml/TSafeTroubleImgMapper.xml | 5 -
.../mapper/xml/TSafeTroubleMapper.xml | 5 -
.../xml/TSampleLaboratorysheetMapper.xml | 5 -
.../business/mapper/xml/TSampleListMapper.xml | 5 -
.../business/mapper/xml/TWagesMapper.xml | 5 -
.../business/mapper/xml/TWeightMapper.xml | 5 -
.../business/model/BaseController.java | 100 ---------
.../business/model/BaseResponse.java | 110 ---------
.../service/ITAnnouncementService.java | 16 --
.../service/ITEquipmentAccountService.java | 16 --
.../service/ITEquipmentCheckService.java | 16 --
.../ITEquipmentMaintenanceCycleService.java | 16 --
.../ITEquipmentMaintenanceService.java | 16 --
.../service/ITEquipmentRepairService.java | 16 --
.../service/ITEquipmentRunService.java | 16 --
.../service/ITEquipmentTroubleService.java | 16 --
.../service/ITEquipmentUsagefeeService.java | 16 --
.../service/ITMaterialEntryService.java | 16 --
.../service/ITMaterialOutService.java | 16 --
.../business/service/ITMineBasicService.java | 16 --
.../business/service/ITMineRightService.java | 16 --
.../business/service/ITMineScopeService.java | 16 --
.../business/service/ITMineStopeService.java | 16 --
.../business/service/ITPlanMonthService.java | 16 --
.../business/service/ITPlanYearService.java | 16 --
.../service/ITProcessesAuxiliaryService.java | 16 --
.../service/ITProcessesBlastService.java | 16 --
.../ITProcessesBlastdesignHoleService.java | 16 --
.../ITProcessesBlastdesignVolumeService.java | 16 --
.../service/ITProcessesCrusherService.java | 16 --
.../service/ITProcessesDiggingService.java | 16 --
.../service/ITProcessesDrillingService.java | 16 --
.../service/ITProcessesTruckService.java | 16 --
.../service/ITSafeTroubleImgService.java | 16 --
.../service/ITSafeTroubleService.java | 16 --
.../ITSampleLaboratorysheetService.java | 16 --
.../business/service/ITSampleListService.java | 16 --
.../business/service/ITSysDeptService.java | 2 +-
.../business/service/ITSysDictService.java | 2 +-
.../business/service/ITSysPowerService.java | 2 +-
.../business/service/ITSysRoleService.java | 2 +-
.../service/ITSysRolepowerService.java | 2 +-
.../service/ITSysUserLoginService.java | 2 +-
.../business/service/ITSysUserService.java | 5 +-
.../business/service/ITWagesService.java | 16 --
.../business/service/ITWeightService.java | 16 --
.../business/service/impl/LoginService.java | 69 ++----
.../impl/TAnnouncementServiceImpl.java | 20 --
.../impl/TEquipmentAccountServiceImpl.java | 20 --
.../impl/TEquipmentCheckServiceImpl.java | 20 --
...TEquipmentMaintenanceCycleServiceImpl.java | 20 --
.../TEquipmentMaintenanceServiceImpl.java | 20 --
.../impl/TEquipmentRepairServiceImpl.java | 20 --
.../impl/TEquipmentRunServiceImpl.java | 20 --
.../impl/TEquipmentTroubleServiceImpl.java | 20 --
.../impl/TEquipmentUsagefeeServiceImpl.java | 20 --
.../impl/TMaterialEntryServiceImpl.java | 20 --
.../service/impl/TMaterialOutServiceImpl.java | 20 --
.../service/impl/TMineBasicServiceImpl.java | 20 --
.../service/impl/TMineRightServiceImpl.java | 20 --
.../service/impl/TMineScopeServiceImpl.java | 20 --
.../service/impl/TMineStopeServiceImpl.java | 20 --
.../service/impl/TPlanMonthServiceImpl.java | 20 --
.../service/impl/TPlanYearServiceImpl.java | 20 --
.../impl/TProcessesAuxiliaryServiceImpl.java | 20 --
.../impl/TProcessesBlastServiceImpl.java | 20 --
.../TProcessesBlastdesignHoleServiceImpl.java | 20 --
...ProcessesBlastdesignVolumeServiceImpl.java | 20 --
.../impl/TProcessesCrusherServiceImpl.java | 20 --
.../impl/TProcessesDiggingServiceImpl.java | 20 --
.../impl/TProcessesDrillingServiceImpl.java | 20 --
.../impl/TProcessesTruckServiceImpl.java | 20 --
.../impl/TSafeTroubleImgServiceImpl.java | 20 --
.../service/impl/TSafeTroubleServiceImpl.java | 20 --
.../TSampleLaboratorysheetServiceImpl.java | 20 --
.../service/impl/TSampleListServiceImpl.java | 20 --
.../service/impl/TSysDeptServiceImpl.java | 2 +-
.../service/impl/TSysDictServiceImpl.java | 2 +-
.../service/impl/TSysPowerServiceImpl.java | 2 +-
.../service/impl/TSysRoleServiceImpl.java | 2 +-
.../impl/TSysRolepowerServiceImpl.java | 2 +-
.../impl/TSysUserLoginServiceImpl.java | 2 +-
.../service/impl/TSysUserServiceImpl.java | 34 ++-
.../service/impl/TWagesServiceImpl.java | 20 --
.../service/impl/TWeightServiceImpl.java | 20 --
.../acquisition/business/util/RedisUtil.java | 5 +-
.../business/util/dfs/StorePath.java | 3 +-
.../src/main/resources/application-dev.yml | 2 +-
.../im/common}/exception/FdfsException.java | 2 +-
.../FdfsUnsupportStorePathException.java | 2 +-
.../exception/RedisHandleException.java | 2 +-
pom.xml | 24 +-
239 files changed, 200 insertions(+), 6487 deletions(-)
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/config/GlobalDefaultExceptionHandler.java
create mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/constant/Rcode.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TAnnouncementController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentAccountController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentCheckController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentMaintenanceController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentMaintenanceCycleController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentRepairController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentRunController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentTroubleController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentUsagefeeController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TMaterialEntryController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TMaterialOutController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TMineBasicController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TMineRightController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TMineScopeController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TMineStopeController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TPlanMonthController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TPlanYearController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesAuxiliaryController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesBlastController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesBlastdesignHoleController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesBlastdesignVolumeController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesCrusherController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesDiggingController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesDrillingController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesTruckController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSafeTroubleController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSafeTroubleImgController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSampleLaboratorysheetController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSampleListController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TWagesController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TWeightController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TAnnouncement.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentAccount.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentCheck.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentMaintenance.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentMaintenanceCycle.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentRepair.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentRun.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentTrouble.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentUsagefee.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TMaterialEntry.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TMaterialOut.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TMineBasic.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TMineRight.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TMineScope.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TMineStope.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TPlanMonth.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TPlanYear.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesAuxiliary.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesBlast.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesBlastdesignHole.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesBlastdesignVolume.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesCrusher.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesDigging.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesDrilling.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesTruck.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSafeTrouble.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSafeTroubleImg.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSampleLaboratorysheet.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSampleList.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TWages.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TWeight.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/Assert.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/BaseException.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/BusinessException.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/BusinessExceptionAssert.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/BusinessExceptionEnum.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/BusinessOldException.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/CodeException.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/CodeExceptionAssert.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/CodeExceptionEnum.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/IResponseEnum.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TAnnouncementMapper.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentAccountMapper.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentCheckMapper.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentMaintenanceCycleMapper.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentMaintenanceMapper.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentRepairMapper.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentRunMapper.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentTroubleMapper.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentUsagefeeMapper.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TMaterialEntryMapper.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TMaterialOutMapper.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TMineBasicMapper.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TMineRightMapper.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TMineScopeMapper.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TMineStopeMapper.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TPlanMonthMapper.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TPlanYearMapper.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesAuxiliaryMapper.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesBlastMapper.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesBlastdesignHoleMapper.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesBlastdesignVolumeMapper.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesCrusherMapper.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesDiggingMapper.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesDrillingMapper.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesTruckMapper.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TSafeTroubleImgMapper.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TSafeTroubleMapper.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TSampleLaboratorysheetMapper.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TSampleListMapper.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TWagesMapper.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TWeightMapper.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TAnnouncementMapper.xml
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentAccountMapper.xml
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentCheckMapper.xml
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentMaintenanceCycleMapper.xml
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentMaintenanceMapper.xml
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentRepairMapper.xml
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentRunMapper.xml
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentTroubleMapper.xml
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentUsagefeeMapper.xml
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TMaterialEntryMapper.xml
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TMaterialOutMapper.xml
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TMineBasicMapper.xml
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TMineRightMapper.xml
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TMineScopeMapper.xml
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TMineStopeMapper.xml
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TPlanMonthMapper.xml
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TPlanYearMapper.xml
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesAuxiliaryMapper.xml
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesBlastMapper.xml
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesBlastdesignHoleMapper.xml
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesBlastdesignVolumeMapper.xml
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesCrusherMapper.xml
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesDiggingMapper.xml
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesDrillingMapper.xml
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesTruckMapper.xml
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TSafeTroubleImgMapper.xml
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TSafeTroubleMapper.xml
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TSampleLaboratorysheetMapper.xml
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TSampleListMapper.xml
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TWagesMapper.xml
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TWeightMapper.xml
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/BaseController.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/BaseResponse.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITAnnouncementService.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentAccountService.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentCheckService.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentMaintenanceCycleService.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentMaintenanceService.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentRepairService.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentRunService.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentTroubleService.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentUsagefeeService.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITMaterialEntryService.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITMaterialOutService.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITMineBasicService.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITMineRightService.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITMineScopeService.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITMineStopeService.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITPlanMonthService.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITPlanYearService.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesAuxiliaryService.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesBlastService.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesBlastdesignHoleService.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesBlastdesignVolumeService.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesCrusherService.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesDiggingService.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesDrillingService.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesTruckService.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSafeTroubleImgService.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSafeTroubleService.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSampleLaboratorysheetService.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSampleListService.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITWagesService.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITWeightService.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TAnnouncementServiceImpl.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentAccountServiceImpl.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentCheckServiceImpl.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentMaintenanceCycleServiceImpl.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentMaintenanceServiceImpl.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentRepairServiceImpl.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentRunServiceImpl.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentTroubleServiceImpl.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentUsagefeeServiceImpl.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMaterialEntryServiceImpl.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMaterialOutServiceImpl.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMineBasicServiceImpl.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMineRightServiceImpl.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMineScopeServiceImpl.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMineStopeServiceImpl.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TPlanMonthServiceImpl.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TPlanYearServiceImpl.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesAuxiliaryServiceImpl.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastServiceImpl.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastdesignHoleServiceImpl.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastdesignVolumeServiceImpl.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesCrusherServiceImpl.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesDiggingServiceImpl.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesDrillingServiceImpl.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesTruckServiceImpl.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSafeTroubleImgServiceImpl.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSafeTroubleServiceImpl.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSampleLaboratorysheetServiceImpl.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSampleListServiceImpl.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TWagesServiceImpl.java
delete mode 100644 acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TWeightServiceImpl.java
rename {acquisition-business/src/main/java/cn/wise/sc/acquisition/business => im-common/src/main/java/cn/wise/im/common}/exception/FdfsException.java (89%)
rename {acquisition-business/src/main/java/cn/wise/sc/acquisition/business => im-common/src/main/java/cn/wise/im/common}/exception/FdfsUnsupportStorePathException.java (86%)
rename {acquisition-business/src/main/java/cn/wise/sc/acquisition/business => im-common/src/main/java/cn/wise/im/common}/exception/RedisHandleException.java (86%)
diff --git a/acquisition-business/pom.xml b/acquisition-business/pom.xml
index 8beacd4..2fcdc30 100644
--- a/acquisition-business/pom.xml
+++ b/acquisition-business/pom.xml
@@ -206,8 +206,15 @@
<artifactId>sqljdbc4-chs</artifactId>
<version>4.0.2206.100</version>
</dependency>
-
-
+ <dependency>
+ <groupId>cn.wise.sc.acquisition</groupId>
+ <artifactId>im-common</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-validation</artifactId>
+ </dependency>
</dependencies>
<profiles>
<profile>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/config/GlobalDefaultExceptionHandler.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/config/GlobalDefaultExceptionHandler.java
deleted file mode 100644
index 7fb6071..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/config/GlobalDefaultExceptionHandler.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package cn.wise.sc.acquisition.business.config;
-
-import cn.wise.sc.acquisition.business.exception.BusinessOldException;
-import cn.wise.sc.acquisition.business.wrapper.WrapMapper;
-import cn.wise.sc.acquisition.business.wrapper.Wrapper;
-import org.springframework.boot.autoconfigure.web.servlet.error.AbstractErrorController;
-import org.springframework.boot.web.servlet.error.ErrorAttributes;
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.context.request.ServletWebRequest;
-import org.springframework.web.context.request.WebRequest;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Map;
-
-@ControllerAdvice
-@RestController
-public class GlobalDefaultExceptionHandler extends AbstractErrorController {
-
- @ExceptionHandler(value = RuntimeException.class)
- @ResponseBody
- public Wrapper defaultErrorHandler(HttpServletResponse response, BusinessOldException e) {
- response.setStatus(e.getStatusCode().value());
- return WrapMapper.error(e.getMessage());
- }
-
- public GlobalDefaultExceptionHandler(ErrorAttributes errorAttributes) {
- super(errorAttributes);
- }
-
- private static final String ERROR_PATH = "/error";
-
- @Override
- public String getErrorPath() {
- return ERROR_PATH;
- }
-
- @RequestMapping(value = ERROR_PATH)
- public Wrapper error(HttpServletRequest request) {
- WebRequest webRequest = new ServletWebRequest(request);
- Throwable e = getError(webRequest);
- if (e == null) {
- Map<String, Object> attributes = getErrorAttributes(request, false);
- Object timestamp = attributes.get("timestamp");
- Object status = attributes.get("status");
- String error = attributes.get("error").toString();
- String message = attributes.get("message").toString();
- Object path = attributes.get("path");
- //todo 上线åŽæ›´æ”¹ä¸ºerror
- return WrapMapper.wrap(Integer.parseInt(status.toString()), message);
- } else {
- return WrapMapper.error(e.getMessage());
- }
- }
-
- private Throwable getError(WebRequest webRequest) {
- return (Throwable) this.getAttribute(webRequest, "javax.servlet.error.exception");
- }
-
- private Object getAttribute(RequestAttributes requestAttributes, String name) {
- return requestAttributes.getAttribute(name, 0);
- }
-}
\ No newline at end of file
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/constant/Rcode.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/constant/Rcode.java
new file mode 100644
index 0000000..1a2d104
--- /dev/null
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/constant/Rcode.java
@@ -0,0 +1,34 @@
+package cn.wise.sc.acquisition.business.constant;
+
+import cn.wise.im.common.exception.assertion.BusinessExceptionAssert;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * <p>返回结果</p>
+ */
+@Getter
+@AllArgsConstructor
+public enum Rcode implements BusinessExceptionAssert {
+
+
+ /**
+ * 用统一状æ€ç
+ */
+ NOT_LOGIN(401, "用户未登录"),
+ NOT_PARAM(402, "å‚数错误"),
+ NOT_SQL(403, "SQL错误"),
+ NOT_FOUND(404, "未找到相应信æ¯"),
+ NOT_REDIS(405, "未找到相应信æ¯"),
+
+ ;
+
+ /**
+ * 返回ç
+ */
+ private int code;
+ /**
+ * 返回消æ¯
+ */
+ private String message;
+}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/LoginController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/LoginController.java
index 48ce91b..f962d6a 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/LoginController.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/LoginController.java
@@ -1,13 +1,12 @@
package cn.wise.sc.acquisition.business.controller;
+import cn.wise.im.common.http.R;
+import cn.wise.sc.acquisition.business.constant.Rcode;
import cn.wise.sc.acquisition.business.entity.TSysUser;
-import cn.wise.sc.acquisition.business.model.BaseResponse;
import cn.wise.sc.acquisition.business.service.ITSysUserService;
import cn.wise.sc.acquisition.business.service.impl.LoginService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,53 +16,48 @@ import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/login")
public class LoginController {
-//
- private static final Logger log = LoggerFactory.getLogger("LoginController");
@Autowired
private LoginService loginService;
@Autowired
private ITSysUserService userService;
+
@ApiOperation(value = "登录")
@GetMapping("/getToken")
- public BaseResponse getToken(String userName, String password) {
- try {
- //测试æœåŠ¡å™¨
- return loginService.login(userName, password);
- } catch (Exception e) {
- log.debug("获å–登录token{}", e);
- }
- return BaseResponse.errorMsg("失败!");
+ public R getToken(String userName, String password) {
+ return loginService.login(userName, password);
}
@ApiOperation(value = "当å‰ç™»å½•ç”¨æˆ·")
@GetMapping("/getLoginUser")
- public BaseResponse getLoginUser() {
- try {
- return loginService.getLoginUser();
- } catch (Exception e) {
- log.debug("当å‰ç™»å½•ç”¨æˆ·{}", e);
- }
- return BaseResponse.errorMsg("失败!");
+ public R getLoginUser() {
+ return userService.getLoginUser();
}
+
+// @Autowired
+// private ITEquipmentAccountService equipmentAccountService;
+
@ApiOperation(value = "测试接å£")
@GetMapping("/testSave")
- public BaseResponse testSave() {
- try {
- TSysUser user = new TSysUser();
- user.setName("å¼ ä¸‰").setLoginID("zhangsan").setPassword("123456").setDeptID("1").setRoleID(1);
- userService.save(user);
- return BaseResponse.okMsg("æˆåŠŸ");
- } catch (Exception e) {
- log.debug("测试接å£{}", e);
- }
- return BaseResponse.errorMsg("失败!");
+ public R testSave() {
+ //用户
+ TSysUser user = new TSysUser();
+ user.setName("竹天å«").setLoginID("zhutianwei").setPassword("123456").setDeptID("1").setRoleID(1);
+ Boolean ref = userService.save(user);
+ Rcode.NOT_SQL.assertIsFalse(!ref);
+ //设备å°è´¦
+ /* TEquipmentAccount tEquipmentAccount = new TEquipmentAccount();
+ tEquipmentAccount.setEquipmentName("aa").setProcessesName("aa").setEquipmentType("租èµ").setEquManager("å¼ ä¸‰")
+ .setGgxh("a").setScnl("a");
+ equipmentAccountService.save(tEquipmentAccount);*/
+ return R.ok(user);
}
+
}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TAnnouncementController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TAnnouncementController.java
deleted file mode 100644
index 7b36e48..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TAnnouncementController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wise.sc.acquisition.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * å‰ç«¯æŽ§åˆ¶å™¨
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@RestController
-@RequestMapping("/business/t-announcement")
-public class TAnnouncementController {
-
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentAccountController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentAccountController.java
deleted file mode 100644
index 9b2a47b..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentAccountController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wise.sc.acquisition.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * å‰ç«¯æŽ§åˆ¶å™¨
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@RestController
-@RequestMapping("/business/t-equipment-account")
-public class TEquipmentAccountController {
-
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentCheckController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentCheckController.java
deleted file mode 100644
index e66fd6f..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentCheckController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wise.sc.acquisition.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * å‰ç«¯æŽ§åˆ¶å™¨
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@RestController
-@RequestMapping("/business/t-equipment-check")
-public class TEquipmentCheckController {
-
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentMaintenanceController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentMaintenanceController.java
deleted file mode 100644
index 9184dc9..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentMaintenanceController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wise.sc.acquisition.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * å‰ç«¯æŽ§åˆ¶å™¨
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@RestController
-@RequestMapping("/business/t-equipment-maintenance")
-public class TEquipmentMaintenanceController {
-
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentMaintenanceCycleController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentMaintenanceCycleController.java
deleted file mode 100644
index df907e2..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentMaintenanceCycleController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wise.sc.acquisition.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * å‰ç«¯æŽ§åˆ¶å™¨
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@RestController
-@RequestMapping("/business/t-equipment-maintenance-cycle")
-public class TEquipmentMaintenanceCycleController {
-
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentRepairController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentRepairController.java
deleted file mode 100644
index ea6f554..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentRepairController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wise.sc.acquisition.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * å‰ç«¯æŽ§åˆ¶å™¨
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@RestController
-@RequestMapping("/business/t-equipment-repair")
-public class TEquipmentRepairController {
-
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentRunController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentRunController.java
deleted file mode 100644
index 25e6cde..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentRunController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wise.sc.acquisition.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * å‰ç«¯æŽ§åˆ¶å™¨
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@RestController
-@RequestMapping("/business/t-equipment-run")
-public class TEquipmentRunController {
-
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentTroubleController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentTroubleController.java
deleted file mode 100644
index f59e144..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentTroubleController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wise.sc.acquisition.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * å‰ç«¯æŽ§åˆ¶å™¨
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@RestController
-@RequestMapping("/business/t-equipment-trouble")
-public class TEquipmentTroubleController {
-
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentUsagefeeController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentUsagefeeController.java
deleted file mode 100644
index dba284c..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TEquipmentUsagefeeController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wise.sc.acquisition.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * å‰ç«¯æŽ§åˆ¶å™¨
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@RestController
-@RequestMapping("/business/t-equipment-usagefee")
-public class TEquipmentUsagefeeController {
-
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TMaterialEntryController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TMaterialEntryController.java
deleted file mode 100644
index 6c1d53d..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TMaterialEntryController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wise.sc.acquisition.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * å‰ç«¯æŽ§åˆ¶å™¨
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@RestController
-@RequestMapping("/business/t-material-entry")
-public class TMaterialEntryController {
-
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TMaterialOutController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TMaterialOutController.java
deleted file mode 100644
index 0a15c59..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TMaterialOutController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wise.sc.acquisition.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * å‰ç«¯æŽ§åˆ¶å™¨
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@RestController
-@RequestMapping("/business/t-material-out")
-public class TMaterialOutController {
-
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TMineBasicController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TMineBasicController.java
deleted file mode 100644
index c081ded..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TMineBasicController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wise.sc.acquisition.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * å‰ç«¯æŽ§åˆ¶å™¨
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@RestController
-@RequestMapping("/business/t-mine-basic")
-public class TMineBasicController {
-
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TMineRightController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TMineRightController.java
deleted file mode 100644
index 01f65c0..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TMineRightController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wise.sc.acquisition.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * å‰ç«¯æŽ§åˆ¶å™¨
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@RestController
-@RequestMapping("/business/t-mine-right")
-public class TMineRightController {
-
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TMineScopeController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TMineScopeController.java
deleted file mode 100644
index 96d8bed..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TMineScopeController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wise.sc.acquisition.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * å‰ç«¯æŽ§åˆ¶å™¨
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@RestController
-@RequestMapping("/business/t-mine-scope")
-public class TMineScopeController {
-
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TMineStopeController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TMineStopeController.java
deleted file mode 100644
index dabcee0..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TMineStopeController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wise.sc.acquisition.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * å‰ç«¯æŽ§åˆ¶å™¨
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@RestController
-@RequestMapping("/business/t-mine-stope")
-public class TMineStopeController {
-
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TPlanMonthController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TPlanMonthController.java
deleted file mode 100644
index de00216..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TPlanMonthController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wise.sc.acquisition.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * å‰ç«¯æŽ§åˆ¶å™¨
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@RestController
-@RequestMapping("/business/t-plan-month")
-public class TPlanMonthController {
-
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TPlanYearController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TPlanYearController.java
deleted file mode 100644
index c4d5261..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TPlanYearController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wise.sc.acquisition.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * å‰ç«¯æŽ§åˆ¶å™¨
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@RestController
-@RequestMapping("/business/t-plan-year")
-public class TPlanYearController {
-
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesAuxiliaryController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesAuxiliaryController.java
deleted file mode 100644
index 781242c..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesAuxiliaryController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wise.sc.acquisition.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * å‰ç«¯æŽ§åˆ¶å™¨
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@RestController
-@RequestMapping("/business/t-processes-auxiliary")
-public class TProcessesAuxiliaryController {
-
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesBlastController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesBlastController.java
deleted file mode 100644
index 98c2d66..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesBlastController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wise.sc.acquisition.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * å‰ç«¯æŽ§åˆ¶å™¨
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@RestController
-@RequestMapping("/business/t-processes-blast")
-public class TProcessesBlastController {
-
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesBlastdesignHoleController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesBlastdesignHoleController.java
deleted file mode 100644
index 339c590..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesBlastdesignHoleController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wise.sc.acquisition.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * å‰ç«¯æŽ§åˆ¶å™¨
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@RestController
-@RequestMapping("/business/t-processes-blastdesign-hole")
-public class TProcessesBlastdesignHoleController {
-
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesBlastdesignVolumeController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesBlastdesignVolumeController.java
deleted file mode 100644
index 85fe2e6..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesBlastdesignVolumeController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wise.sc.acquisition.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * å‰ç«¯æŽ§åˆ¶å™¨
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@RestController
-@RequestMapping("/business/t-processes-blastdesign-volume")
-public class TProcessesBlastdesignVolumeController {
-
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesCrusherController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesCrusherController.java
deleted file mode 100644
index c1ddc1f..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesCrusherController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wise.sc.acquisition.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * å‰ç«¯æŽ§åˆ¶å™¨
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@RestController
-@RequestMapping("/business/t-processes-crusher")
-public class TProcessesCrusherController {
-
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesDiggingController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesDiggingController.java
deleted file mode 100644
index 0e81431..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesDiggingController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wise.sc.acquisition.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * å‰ç«¯æŽ§åˆ¶å™¨
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@RestController
-@RequestMapping("/business/t-processes-digging")
-public class TProcessesDiggingController {
-
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesDrillingController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesDrillingController.java
deleted file mode 100644
index 6de9872..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesDrillingController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wise.sc.acquisition.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * å‰ç«¯æŽ§åˆ¶å™¨
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@RestController
-@RequestMapping("/business/t-processes-drilling")
-public class TProcessesDrillingController {
-
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesTruckController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesTruckController.java
deleted file mode 100644
index 2e313e3..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TProcessesTruckController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wise.sc.acquisition.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * å‰ç«¯æŽ§åˆ¶å™¨
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@RestController
-@RequestMapping("/business/t-processes-truck")
-public class TProcessesTruckController {
-
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSafeTroubleController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSafeTroubleController.java
deleted file mode 100644
index bd88b5c..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSafeTroubleController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wise.sc.acquisition.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * å‰ç«¯æŽ§åˆ¶å™¨
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@RestController
-@RequestMapping("/business/t-safe-trouble")
-public class TSafeTroubleController {
-
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSafeTroubleImgController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSafeTroubleImgController.java
deleted file mode 100644
index 9f8331d..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSafeTroubleImgController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wise.sc.acquisition.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * å‰ç«¯æŽ§åˆ¶å™¨
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@RestController
-@RequestMapping("/business/t-safe-trouble-img")
-public class TSafeTroubleImgController {
-
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSampleLaboratorysheetController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSampleLaboratorysheetController.java
deleted file mode 100644
index d383ce0..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSampleLaboratorysheetController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wise.sc.acquisition.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * å‰ç«¯æŽ§åˆ¶å™¨
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@RestController
-@RequestMapping("/business/t-sample-laboratorysheet")
-public class TSampleLaboratorysheetController {
-
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSampleListController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSampleListController.java
deleted file mode 100644
index 07e8f54..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSampleListController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wise.sc.acquisition.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * å‰ç«¯æŽ§åˆ¶å™¨
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@RestController
-@RequestMapping("/business/t-sample-list")
-public class TSampleListController {
-
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSysDeptController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSysDeptController.java
index 45c5de1..497e769 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSysDeptController.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSysDeptController.java
@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
* </p>
*
* @author ztw
- * @since 2021-04-22
+ * @since 2021-04-23
*/
@RestController
@RequestMapping("/business/t-sys-dept")
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSysDictController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSysDictController.java
index 1af9cfb..084abd9 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSysDictController.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSysDictController.java
@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
* </p>
*
* @author ztw
- * @since 2021-04-22
+ * @since 2021-04-23
*/
@RestController
@RequestMapping("/business/t-sys-dict")
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSysPowerController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSysPowerController.java
index 48da510..41a74a7 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSysPowerController.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSysPowerController.java
@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
* </p>
*
* @author ztw
- * @since 2021-04-22
+ * @since 2021-04-23
*/
@RestController
@RequestMapping("/business/t-sys-power")
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSysRoleController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSysRoleController.java
index c585cd9..9dea9f8 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSysRoleController.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSysRoleController.java
@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
* </p>
*
* @author ztw
- * @since 2021-04-22
+ * @since 2021-04-23
*/
@RestController
@RequestMapping("/business/t-sys-role")
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSysRolepowerController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSysRolepowerController.java
index 251e013..d09a9c0 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSysRolepowerController.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSysRolepowerController.java
@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
* </p>
*
* @author ztw
- * @since 2021-04-22
+ * @since 2021-04-23
*/
@RestController
@RequestMapping("/business/t-sys-rolepower")
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSysUserController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSysUserController.java
index 0f1a26a..a98e761 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSysUserController.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSysUserController.java
@@ -11,11 +11,15 @@ import org.springframework.web.bind.annotation.RestController;
* </p>
*
* @author ztw
- * @since 2021-04-22
+ * @since 2021-04-23
*/
@RestController
@RequestMapping("/business/t-sys-user")
public class TSysUserController {
+
+
+
+
}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSysUserLoginController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSysUserLoginController.java
index a024cea..6a4bfa3 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSysUserLoginController.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TSysUserLoginController.java
@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController;
* </p>
*
* @author ztw
- * @since 2021-04-22
+ * @since 2021-04-23
*/
@RestController
@RequestMapping("/business/t-sys-user-login")
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TWagesController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TWagesController.java
deleted file mode 100644
index 034c07c..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TWagesController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wise.sc.acquisition.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * å‰ç«¯æŽ§åˆ¶å™¨
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@RestController
-@RequestMapping("/business/t-wages")
-public class TWagesController {
-
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TWeightController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TWeightController.java
deleted file mode 100644
index 1184579..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/controller/TWeightController.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package cn.wise.sc.acquisition.business.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * å‰ç«¯æŽ§åˆ¶å™¨
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@RestController
-@RequestMapping("/business/t-weight")
-public class TWeightController {
-
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TAnnouncement.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TAnnouncement.java
deleted file mode 100644
index 0905250..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TAnnouncement.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package cn.wise.sc.acquisition.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("T_Announcement")
-public class TAnnouncement implements Serializable {
-
- private static final long serialVersionUID=1L;
-
- @TableId(value = "ID", type = IdType.AUTO)
- private Integer id;
-
- /**
- * æ ‡é¢˜
- */
- @TableField("Title")
- private String Title;
-
- /**
- * 通知内容
- */
- @TableField("Tznr")
- private String Tznr;
-
- /**
- * 通知录入时间
- */
- @TableField("Tzsj")
- private LocalDateTime Tzsj;
-
- /**
- * 通知录入人
- */
- @TableField("Tztxr")
- private String Tztxr;
-
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentAccount.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentAccount.java
deleted file mode 100644
index 4ccb92e..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentAccount.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package cn.wise.sc.acquisition.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("T_Equipment_Account")
-public class TEquipmentAccount implements Serializable {
-
- private static final long serialVersionUID=1L;
-
- /**
- * 设备编ç
- */
- @TableId("EquipmentID")
- private String EquipmentID;
-
- /**
- * 设备å称
- */
- @TableField("EquipmentName")
- private String EquipmentName;
-
- /**
- * 所属工åº
- */
- @TableField("ProcessesName")
- private String ProcessesName;
-
- /**
- * 设备类型，包括租èµå’Œè‡ªæœ‰
- */
- @TableField("EquipmentType")
- private String EquipmentType;
-
- /**
- * 机长
- */
- @TableField("EquManager")
- private String EquManager;
-
- /**
- * è§„æ ¼åž‹å·
- */
- @TableField("Ggxh")
- private String Ggxh;
-
- /**
- * 生产能力
- */
- @TableField("Scnl")
- private String Scnl;
-
- /**
- * 装机容é‡
- */
- @TableField("Zjrl")
- private String Zjrl;
-
- /**
- * 生产厂家
- */
- @TableField("Sccj")
- private String Sccj;
-
- /**
- * 出厂日期
- */
- @TableField("Ccrq")
- private LocalDateTime Ccrq;
-
- /**
- * 出厂编å·
- */
- @TableField("Ccbh")
- private String Ccbh;
-
- /**
- * è€ç”¨å¹´é™
- */
- @TableField("Nynx")
- private String Nynx;
-
- /**
- * 资产编ç
- */
- @TableField("Zcbm")
- private String Zcbm;
-
- /**
- * 设备原值
- */
- @TableField("Yz")
- private Float Yz;
-
- /**
- * å¯ç”¨æ—¥æœŸ
- */
- @TableField("Qyrq")
- private LocalDateTime Qyrq;
-
- /**
- * 燃料类别
- */
- @TableField("Rllb")
- private String Rllb;
-
- /**
- * 转速
- */
- @TableField("Zs")
- private String Zs;
-
- /**
- * 状æ€,分为在用1和报废0
- */
- @TableField("IsUsing")
- private Boolean IsUsing;
-
- /**
- * 备注
- */
- @TableField("Bz")
- private String Bz;
-
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentCheck.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentCheck.java
deleted file mode 100644
index 110101a..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentCheck.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package cn.wise.sc.acquisition.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("T_Equipment_Check")
-public class TEquipmentCheck implements Serializable {
-
- private static final long serialVersionUID=1L;
-
- @TableId("ID")
- private Integer id;
-
- @TableField("EquipmentID")
- private String EquipmentID;
-
- @TableField("EquipmentName")
- private String EquipmentName;
-
- /**
- * 点检部ä½
- */
- @TableField("Djbw")
- private String Djbw;
-
- /**
- * 点检内容
- */
- @TableField("Djnr")
- private String Djnr;
-
- /**
- * ç‚¹æ£€æ ‡å‡†
- */
- @TableField("Djbz")
- private String Djbz;
-
- /**
- * 点检周期
- */
- @TableField("Djzq")
- private Integer Djzq;
-
- /**
- * 周期类型,天ã€æœˆç‰
- */
- @TableField("Zqlx")
- private String Zqlx;
-
- /**
- * 点检结果，æ£å¸¸ã€å¼‚常
- */
- @TableField("Djjg")
- private String Djjg;
-
- /**
- * 异常记录
- */
- @TableField("Ycjl")
- private String Ycjl;
-
- /**
- * 点检人
- */
- @TableField("Djr")
- private String Djr;
-
- /**
- * 点检日期
- */
- @TableField("Djrq")
- private LocalDateTime Djrq;
-
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentMaintenance.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentMaintenance.java
deleted file mode 100644
index 82f3694..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentMaintenance.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package cn.wise.sc.acquisition.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("T_Equipment_Maintenance")
-public class TEquipmentMaintenance implements Serializable {
-
- private static final long serialVersionUID=1L;
-
- /**
- * IDå·
- */
- @TableId(value = "ID", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 设备编ç
- */
- @TableField("EquipmentID")
- private String EquipmentID;
-
- /**
- * 设备å称
- */
- @TableField("EquipmentName")
- private String EquipmentName;
-
- /**
- * ä¿å…»å†…容
- */
- @TableField("Bynr")
- private String Bynr;
-
- /**
- * ææ–™é…件费用
- */
- @TableField("ClpjFee")
- private Float ClpjFee;
-
- /**
- * ä¿å…»å·¥æ—¶è´¹ï¼Œè¯·å¤–人ä¿å…»æ‰æœ‰å·¥æ—¶è´¹
- */
- @TableField("GsFee")
- private Float GsFee;
-
- /**
- * ä¿å…»è´¹ç”¨=ClpjFee+GsFee
- */
- @TableField("Cost")
- private Float Cost;
-
- /**
- * ä¿å…»æ—¥æœŸ
- */
- @TableField("Byrq")
- private LocalDateTime Byrq;
-
- /**
- * ä¿å…»å•ä½
- */
- @TableField("Bydw")
- private String Bydw;
-
- /**
- * ä¿å…»çŠ¶æ€ï¼šå·²ä¿å…»å’Œæœªä¿å…»
- */
- @TableField("Byzt")
- private String Byzt;
-
- /**
- * æ—¥æœŸæ ‡è®°,如:2021å¹´03月
- */
- @TableField("Tag")
- private String Tag;
-
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentMaintenanceCycle.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentMaintenanceCycle.java
deleted file mode 100644
index de3724d..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentMaintenanceCycle.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package cn.wise.sc.acquisition.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("T_Equipment_Maintenance_Cycle")
-public class TEquipmentMaintenanceCycle implements Serializable {
-
- private static final long serialVersionUID=1L;
-
- /**
- * 设备编ç
- */
- @TableId("EquipmentID")
- private String EquipmentID;
-
- /**
- * 设备å称
- */
- @TableField("EquipmentName")
- private String EquipmentName;
-
- /**
- * ä¿å…»å‘¨æœŸ(天)
- */
- @TableField("Cycle")
- private Integer Cycle;
-
- /**
- * æå‰é€šçŸ¥å¤©æ•°
- */
- @TableField("Days")
- private Integer Days;
-
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentRepair.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentRepair.java
deleted file mode 100644
index 9bc8381..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentRepair.java
+++ /dev/null
@@ -1,102 +0,0 @@
-package cn.wise.sc.acquisition.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("T_Equipment_Repair")
-public class TEquipmentRepair implements Serializable {
-
- private static final long serialVersionUID=1L;
-
- /**
- * IDå·
- */
- @TableId(value = "ID", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 设备编ç
- */
- @TableField("EquipmentID")
- private String EquipmentID;
-
- /**
- * 设备å称
- */
- @TableField("EquipmentName")
- private String EquipmentName;
-
- /**
- * 维修项目
- */
- @TableField("Wxxm")
- private String Wxxm;
-
- /**
- * 维修类型：计划性检修ã€ä¸´æ—¶æ€§æ£€ä¿®ã€è®¾å¤‡å¤§ä¿®
- */
- @TableField("WxType")
- private String WxType;
-
- /**
- * ç»´ä¿®ææ–™é…件费用
- */
- @TableField("ClpjFee")
- private Float ClpjFee;
-
- /**
- * 维修工时费，请外人维修æ‰æœ‰å·¥æ—¶è´¹
- */
- @TableField("GsFee")
- private Float GsFee;
-
- /**
- * 维修费用=ClpjFee+GsFee
- */
- @TableField("Cost")
- private Float Cost;
-
- /**
- * 维修日期
- */
- @TableField("Wxrq")
- private LocalDateTime Wxrq;
-
- /**
- * ç»´ä¿®å•ä½
- */
- @TableField("Wxdw")
- private String Wxdw;
-
- /**
- * 是å¦å·²ä¿®å¥½ï¼š1是，0å¦
- */
- @TableField("Wxzt")
- private Boolean Wxzt;
-
- /**
- * æ—¥æœŸæ ‡è®°,如:2021å¹´04月
- */
- @TableField("Tag")
- private String Tag;
-
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentRun.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentRun.java
deleted file mode 100644
index e40b8f8..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentRun.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package cn.wise.sc.acquisition.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("T_Equipment_Run")
-public class TEquipmentRun implements Serializable {
-
- private static final long serialVersionUID=1L;
-
- @TableId(value = "ID", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 设备编ç
- */
- @TableField("EquipmentID")
- private String EquipmentID;
-
- /**
- * 设备å称
- */
- @TableField("EquipmentName")
- private String EquipmentName;
-
- /**
- * è¿è¡Œæ—¥æœŸ
- */
- @TableField("RunDate")
- private LocalDateTime RunDate;
-
- /**
- * 当天è¿è¡Œæ—¶é—´h
- */
- @TableField("RunHour")
- private Float RunHour;
-
- /**
- * 当天åœæœºæ—¶é—´
- */
- @TableField("StopHour")
- private Float StopHour;
-
- /**
- * åœæœºåŽŸå› :æ•…éšœ/ç»´ä¿®/ä¿å…»
- */
- @TableField("StopType")
- private String StopType;
-
- /**
- * 驾驶员/æ“作人员
- */
- @TableField("Driver")
- private String Driver;
-
- /**
- * 填写人
- */
- @TableField("Txr")
- private String Txr;
-
- /**
- * æ—¥æœŸæ ‡è®°,如:2021å¹´01月
- */
- @TableField("Tag")
- private String Tag;
-
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentTrouble.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentTrouble.java
deleted file mode 100644
index 1717ffc..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentTrouble.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package cn.wise.sc.acquisition.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("T_Equipment_Trouble")
-public class TEquipmentTrouble implements Serializable {
-
- private static final long serialVersionUID=1L;
-
- /**
- * IDå·
- */
- @TableId(value = "ID", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 设备编ç
- */
- @TableField("EquipmentID")
- private String EquipmentID;
-
- /**
- * 设备å称
- */
- @TableField("EquipmentName")
- private String EquipmentName;
-
- /**
- * éšæ‚£å‘现人
- */
- @TableField("Fxr")
- private String Fxr;
-
- /**
- * éšæ‚£å‘现日期
- */
- @TableField("Fxrq")
- private LocalDateTime Fxrq;
-
- /**
- * éšæ‚£æè¿°
- */
- @TableField("Yhms")
- private String Yhms;
-
- /**
- * éšæ‚£å¤„ç†æŽªæ–½
- */
- @TableField("Clcs")
- private String Clcs;
-
- /**
- * éšæ‚£å¤„ç†æ—¥æœŸ
- */
- @TableField("Clrq")
- private LocalDateTime Clrq;
-
- /**
- * 是å¦å·²ä¿®å¥½ï¼š1是，0å¦
- */
- private String clr;
-
- /**
- * 填报人
- */
- @TableField("Txr")
- private String Txr;
-
- /**
- * 填报日期
- */
- @TableField("Txrq")
- private LocalDateTime Txrq;
-
- /**
- * éšæ‚£å¤„ç†çŠ¶æ€ï¼šå·²å¤„ç†å’Œæœªå¤„ç†
- */
- @TableField("Clzt")
- private String Clzt;
-
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentUsagefee.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentUsagefee.java
deleted file mode 100644
index f25eccf..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TEquipmentUsagefee.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package cn.wise.sc.acquisition.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("T_Equipment_UsageFee")
-public class TEquipmentUsagefee implements Serializable {
-
- private static final long serialVersionUID=1L;
-
- /**
- * IDå·
- */
- @TableId(value = "ID", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 设备编ç
- */
- @TableField("EquipmentID")
- private String EquipmentID;
-
- /**
- * 设备å称
- */
- @TableField("EquipmentName")
- private String EquipmentName;
-
- /**
- * 设备类型，包括租èµå’Œè‡ªæœ‰
- */
- @TableField("EquipmentType")
- private String EquipmentType;
-
- /**
- * 所属工åº
- */
- @TableField("ProcessesName")
- private String ProcessesName;
-
- /**
- * 费用
- */
- @TableField("Cost")
- private Float Cost;
-
- /**
- * 填报人
- */
- @TableField("Txr")
- private String Txr;
-
- /**
- * æ—¥æœŸæ ‡è®°,如:2021å¹´01月
- */
- @TableField("Tag")
- private String Tag;
-
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TMaterialEntry.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TMaterialEntry.java
deleted file mode 100644
index cfafb52..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TMaterialEntry.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package cn.wise.sc.acquisition.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("T_Material_Entry")
-public class TMaterialEntry implements Serializable {
-
- private static final long serialVersionUID=1L;
-
- @TableId("ID")
- private Integer id;
-
- /**
- * æ料类型，包括燃料åŠåŠ¨åŠ›ã€æ¶¦æ»‘察试ã€é…件ã€å·¥å…·ã€ç«å·¥ææ–™ã€ç”µåŠ›å’Œå…¶å®ƒç‰
- */
- @TableField("Type")
- private String Type;
-
- /**
- * 本期è´å…¥çš„æ料的å“å
- */
- @TableField("Name")
- private String Name;
-
- /**
- * 本期è´å…¥çš„æ•°é‡
- */
- @TableField("Amount")
- private Float Amount;
-
- /**
- * 本期è´å…¥çš„å•ä»·
- */
- @TableField("Price")
- private Float Price;
-
- /**
- * 本期è´å…¥çš„金é¢ï¼šAmounMt*PriceM
- */
- @TableField("Total")
- private Float Total;
-
- /**
- * æ料入库日期
- */
- @TableField("InDate")
- private LocalDateTime InDate;
-
- /**
- * æ料入库人
- */
- @TableField("InPeopleName")
- private String InPeopleName;
-
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TMaterialOut.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TMaterialOut.java
deleted file mode 100644
index 7b3c670..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TMaterialOut.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package cn.wise.sc.acquisition.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("T_Material_Out")
-public class TMaterialOut implements Serializable {
-
- private static final long serialVersionUID=1L;
-
- /**
- * IDå·
- */
- @TableId(value = "ID", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 设备编ç
- */
- @TableField("EquipmentID")
- private String EquipmentID;
-
- /**
- * 设备å称
- */
- @TableField("EquipmentName")
- private String EquipmentName;
-
- /**
- * å·¥åºå称
- */
- @TableField("ProcessesName")
- private String ProcessesName;
-
- /**
- * æ料消耗的类型，包括燃料åŠåŠ¨åŠ›ã€æ¶¦æ»‘察试ã€é…件ã€å·¥å…·ã€ç«å·¥ææ–™ã€ç”µåŠ›å’Œå…¶å®ƒç‰
- */
- @TableField("ConsumeType")
- private String ConsumeType;
-
- /**
- * æ料消耗日期
- */
- @TableField("ConsumeDate")
- private LocalDateTime ConsumeDate;
-
- /**
- * 消耗æ料的å“å
- */
- @TableField("Name")
- private String Name;
-
- /**
- * 消耗æ料的数é‡
- */
- @TableField("Amount")
- private Float Amount;
-
- /**
- * 消耗æ料的å•ä»·
- */
- @TableField("Price")
- private Float Price;
-
- /**
- * 花费的金é¢ï¼šAmount*Price
- */
- @TableField("Total")
- private Float Total;
-
- /**
- * 用途:生产，ä¿å…»ã€ç»´ä¿®
- */
- @TableField("Purpose")
- private String Purpose;
-
- /**
- * ææ–™å‘放人
- */
- @TableField("Clffr")
- private String Clffr;
-
- /**
- * æ料领用人
- */
- @TableField("Cllyr")
- private String Cllyr;
-
- /**
- * 备注
- */
- @TableField("Bz")
- private String Bz;
-
- /**
- * æ—¥æœŸæ ‡è®°,如:2021å¹´01月
- */
- @TableField("Tag")
- private String Tag;
-
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TMineBasic.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TMineBasic.java
deleted file mode 100644
index 9b85e40..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TMineBasic.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package cn.wise.sc.acquisition.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("T_Mine_Basic")
-public class TMineBasic implements Serializable {
-
- private static final long serialVersionUID=1L;
-
- /**
- * IDå·
- */
- @TableId(value = "ID", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 矿山å称
- */
- @TableField("Name")
- private String Name;
-
- /**
- * 建矿时间
- */
- @TableField("JkDate")
- private LocalDateTime JkDate;
-
- /**
- * 投产时间
- */
- @TableField("TcDate")
- private LocalDateTime TcDate;
-
- /**
- * 生产能力
- */
- @TableField("Scnl")
- private Double Scnl;
-
- /**
- * é¢ç§¯
- */
- @TableField("Area")
- private Double Area;
-
- /**
- * 生产状æ€
- */
- @TableField("Sczt")
- private String Sczt;
-
- /**
- * æœåŠ¡å¹´é™
- */
- private String fwnx;
-
- /**
- * 法人代表
- */
- private String frdb;
-
- /**
- * 法人代表è”系方å¼
- */
- private String frlxfs;
-
- /**
- * 资æºå‚¨é‡
- */
- private Double zycl;
-
- /**
- * 从业人数
- */
- private Integer cyrs;
-
- /**
- * 技术人员数
- */
- private Integer jsrys;
-
- /**
- * 备注
- */
- @TableField("Bz")
- private String Bz;
-
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TMineRight.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TMineRight.java
deleted file mode 100644
index c262f44..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TMineRight.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package cn.wise.sc.acquisition.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("T_Mine_Right")
-public class TMineRight implements Serializable {
-
- private static final long serialVersionUID=1L;
-
- /**
- * IDå·
- */
- @TableId(value = "ID", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 矿山å称
- */
- @TableField("Name")
- private String Name;
-
- /**
- * 矿æƒå称
- */
- @TableField("KqName")
- private String KqName;
-
- /**
- * 矿æƒäºº
- */
- @TableField("Kqr")
- private String Kqr;
-
- /**
- * æƒè¯å·
- */
- @TableField("Kzh")
- private String Kzh;
-
- /**
- * 地å€
- */
- @TableField("Address")
- private String Address;
-
- /**
- * æƒè¯ä¿å˜å•ä½
- */
- @TableField("Kzbbcdw")
- private String Kzbbcdw;
-
- /**
- * 矿æƒæœ‰æ•ˆæœŸé™
- */
- @TableField("Yxqx")
- private String Yxqx;
-
- /**
- * 有效起始日期
- */
- @TableField("YxStartDate")
- private LocalDateTime YxStartDate;
-
- /**
- * 有效结æŸæ—¥æœŸ
- */
- @TableField("YxEndDate")
- private LocalDateTime YxEndDate;
-
- /**
- * 获å–æ–¹å¼
- */
- @TableField("Hqfs")
- private String Hqfs;
-
- /**
- * 获å–时间
- */
- @TableField("HqDate")
- private LocalDateTime HqDate;
-
- /**
- * 开采矿ç§
- */
- @TableField("Kckz")
- private String Kckz;
-
- /**
- * 开采方å¼
- */
- @TableField("Kcfs")
- private String Kcfs;
-
- /**
- * 生产规模（万å¨/年）
- */
- @TableField("Scgm")
- private Integer Scgm;
-
- /**
- * å‘è¯å•ä½
- */
- @TableField("Fzdw")
- private String Fzdw;
-
- /**
- * å‘è¯å•ä½è”系方å¼
- */
- @TableField("FzdwLxfs")
- private String FzdwLxfs;
-
- /**
- * 备注
- */
- @TableField("Bz")
- private String Bz;
-
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TMineScope.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TMineScope.java
deleted file mode 100644
index 0a2faa0..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TMineScope.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package cn.wise.sc.acquisition.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("T_Mine_Scope")
-public class TMineScope implements Serializable {
-
- private static final long serialVersionUID=1L;
-
- /**
- * 采矿æƒè¡¨ä¸çš„IDå·
- */
- @TableField("MineRightID")
- private Integer MineRightID;
-
- /**
- * 点å·
- */
- @TableField("Dh")
- private Integer Dh;
-
- @TableField("X")
- private Double x;
-
- @TableField("Y")
- private Double y;
-
- /**
- * åæ ‡ç³»
- */
- @TableField("Zbx")
- private String Zbx;
-
- /**
- * æ‹ç‚¹åæ ‡æ‰€å±žéƒ¨åˆ†ï¼ŒæŽ’åºç”¨çš„
- */
- @TableField("Ssbf")
- private Integer Ssbf;
-
- @TableField("Bz")
- private String Bz;
-
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TMineStope.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TMineStope.java
deleted file mode 100644
index 63576aa..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TMineStope.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package cn.wise.sc.acquisition.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("T_Mine_Stope")
-public class TMineStope implements Serializable {
-
- private static final long serialVersionUID=1L;
-
- /**
- * IDå·
- */
- @TableId(value = "ID", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 采区å称
- */
- @TableField("StopeName")
- private String StopeName;
-
- /**
- * å¹³å°å称
- */
- @TableField("StepName")
- private String StepName;
-
- /**
- * 爆区å称
- */
- @TableField("BlastAreaName")
- private String BlastAreaName;
-
- /**
- * 是å¦ä½¿ç”¨
- */
- @TableField("IsUsing")
- private Boolean IsUsing;
-
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TPlanMonth.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TPlanMonth.java
deleted file mode 100644
index c3448e4..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TPlanMonth.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package cn.wise.sc.acquisition.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("T_Plan_Month")
-public class TPlanMonth implements Serializable {
-
- private static final long serialVersionUID=1L;
-
- /**
- * IDå·
- */
- @TableId(value = "ID", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 采区å称
- */
- @TableField("StopeName")
- private String StopeName;
-
- /**
- * å¹³å°å称
- */
- @TableField("StepName")
- private String StepName;
-
- /**
- * 爆区å称
- */
- @TableField("BlastAreaName")
- private String BlastAreaName;
-
- /**
- * 矿石é‡(å¨)
- */
- @TableField("Ksl")
- private Double Ksl;
-
- /**
- * 岩石é‡(å¨)
- */
- @TableField("Ysl")
- private Double Ysl;
-
- /**
- * 氧化钙
- */
- @TableField("Cao")
- private Float Cao;
-
- /**
- * 氧化é•
- */
- @TableField("MgO")
- private Float MgO;
-
- /**
- * 三氧化二é“
- */
- @TableField("Al2O3")
- private Float Al2O3;
-
- /**
- * 二氧化硅
- */
- @TableField("SiO2")
- private Float SiO2;
-
- /**
- * 三氧化二é“
- */
- @TableField("Fe2O3")
- private Float Fe2O3;
-
- /**
- * 氧化钾
- */
- @TableField("K2O")
- private Float k2o;
-
- /**
- * 氧化é’
- */
- @TableField("Na2O")
- private Float Na2O;
-
- /**
- * 三氧化硫
- */
- @TableField("SO3")
- private Float so3;
-
- /**
- * 氯离å
- */
- @TableField("Cl")
- private Float Cl;
-
- /**
- * 剥采比
- */
- @TableField("Bcb")
- private Float Bcb;
-
- @TableField("Bz")
- private String Bz;
-
- /**
- * æ—¥æœŸæ ‡è®°,如:2021å¹´01月
- */
- @TableField("Tag")
- private String Tag;
-
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TPlanYear.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TPlanYear.java
deleted file mode 100644
index ce0646d..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TPlanYear.java
+++ /dev/null
@@ -1,128 +0,0 @@
-package cn.wise.sc.acquisition.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("T_Plan_Year")
-public class TPlanYear implements Serializable {
-
- private static final long serialVersionUID=1L;
-
- /**
- * IDå·
- */
- @TableId(value = "ID", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 采区å称
- */
- @TableField("StopeName")
- private String StopeName;
-
- /**
- * å¹³å°å称
- */
- @TableField("StepName")
- private String StepName;
-
- /**
- * 矿石é‡(å¨)
- */
- @TableField("Ksl")
- private Double Ksl;
-
- /**
- * 岩石é‡(å¨)
- */
- @TableField("Ysl")
- private Double Ysl;
-
- /**
- * 氧化钙
- */
- @TableField("Cao")
- private Float Cao;
-
- /**
- * 氧化é•
- */
- @TableField("MgO")
- private Float MgO;
-
- /**
- * 三氧化二é“
- */
- @TableField("Al2O3")
- private Float Al2O3;
-
- /**
- * 二氧化硅
- */
- @TableField("SiO2")
- private Float SiO2;
-
- /**
- * 三氧化二é“
- */
- @TableField("Fe2O3")
- private Float Fe2O3;
-
- /**
- * 氧化钾
- */
- @TableField("K2O")
- private Float k2o;
-
- /**
- * 氧化é’
- */
- @TableField("Na2O")
- private Float Na2O;
-
- /**
- * 三氧化硫
- */
- @TableField("SO3")
- private Float so3;
-
- /**
- * 氯离å
- */
- @TableField("Cl")
- private Float Cl;
-
- /**
- * 剥采比
- */
- @TableField("Bcb")
- private Float Bcb;
-
- @TableField("Bz")
- private String Bz;
-
- /**
- * æ—¥æœŸæ ‡è®°,如:2021å¹´
- */
- @TableField("Tag")
- private String Tag;
-
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesAuxiliary.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesAuxiliary.java
deleted file mode 100644
index f79d5fd..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesAuxiliary.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package cn.wise.sc.acquisition.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("T_Processes_Auxiliary")
-public class TProcessesAuxiliary implements Serializable {
-
- private static final long serialVersionUID=1L;
-
- /**
- * IDå·
- */
- @TableId(value = "ID", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 设备编å·
- */
- @TableField("EquipmentID")
- private String EquipmentID;
-
- /**
- * 设备å称
- */
- @TableField("EquipmentName")
- private String EquipmentName;
-
- /**
- * 项目ç»ç†
- */
- @TableField("Manager")
- private String Manager;
-
- /**
- * 主管项目领导
- */
- @TableField("Supervisor")
- private String Supervisor;
-
- /**
- * 生产技术部
- */
- @TableField("TechDepart")
- private String TechDepart;
-
- /**
- * 制表人
- */
- @TableField("Tabulator")
- private String Tabulator;
-
- /**
- * 当月累计油é‡
- */
- @TableField("Ljyl")
- private Float Ljyl;
-
- /**
- * 总价(元)
- */
- @TableField("Zj")
- private Float Zj;
-
- /**
- * 当月累计产é‡
- */
- @TableField("Dyljcl")
- private Float Dyljcl;
-
- /**
- * å•è€—=当月累计油é‡/当月产é‡
- */
- @TableField("Dh")
- private Double Dh;
-
- /**
- * 备注
- */
- @TableField("Bz")
- private String Bz;
-
- /**
- * æ—¥æœŸæ ‡è®°,如:2021å¹´01月
- */
- @TableField("Tag")
- private String Tag;
-
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesBlast.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesBlast.java
deleted file mode 100644
index a465f04..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesBlast.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package cn.wise.sc.acquisition.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("T_Processes_Blast")
-public class TProcessesBlast implements Serializable {
-
- private static final long serialVersionUID=1L;
-
- /**
- * IDå·
- */
- @TableId(value = "ID", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 采区å称
- */
- @TableField("StopeName")
- private String StopeName;
-
- /**
- * å¹³å°å称
- */
- @TableField("StepName")
- private String StepName;
-
- /**
- * 爆区å称
- */
- @TableField("BlastAreaName")
- private String BlastAreaName;
-
- /**
- * ç‚®å”ç¼–å·
- */
- @TableField("HoleID")
- private String HoleID;
-
- /**
- * çˆ†ç ´æ—¥æœŸ
- */
- @TableField("BlastDate")
- private LocalDateTime BlastDate;
-
- /**
- * çˆ†ç ´äººå‘˜
- */
- @TableField("BlastPeople")
- private String BlastPeople;
-
- /**
- * 验å”日期
- */
- @TableField("CheckHoleDate")
- private LocalDateTime CheckHoleDate;
-
- /**
- * 验å”人员
- */
- @TableField("CheckHolePeople")
- private String CheckHolePeople;
-
- /**
- * 项目ç»ç†
- */
- @TableField("Manager")
- private String Manager;
-
- /**
- * 主管项目领导
- */
- @TableField("Supervisor")
- private String Supervisor;
-
- /**
- * 生产技术部
- */
- @TableField("TechDepart")
- private String TechDepart;
-
- /**
- * 制表人
- */
- @TableField("Tabulator")
- private String Tabulator;
-
- /**
- * 实测å”深（m）
- */
- @TableField("Depth")
- private Double Depth;
-
- @TableField("Bz")
- private String Bz;
-
- /**
- * æ—¥æœŸæ ‡è®°,如:2020å¹´11月
- */
- @TableField("Tag")
- private String Tag;
-
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesBlastdesignHole.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesBlastdesignHole.java
deleted file mode 100644
index b6a1156..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesBlastdesignHole.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package cn.wise.sc.acquisition.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("T_Processes_BlastDesign_Hole")
-public class TProcessesBlastdesignHole implements Serializable {
-
- private static final long serialVersionUID=1L;
-
- /**
- * IDå·
- */
- @TableId(value = "ID", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 采区å称
- */
- @TableField("StopeName")
- private String StopeName;
-
- /**
- * å¹³å°å称
- */
- @TableField("StepName")
- private String StepName;
-
- /**
- * 爆区å称
- */
- @TableField("BlastAreaName")
- private String BlastAreaName;
-
- /**
- * ç‚®å”ç¼–å·
- */
- @TableField("BlastHoleID")
- private String BlastHoleID;
-
- /**
- * å”深（m）
- */
- @TableField("Depth")
- private Double Depth;
-
- /**
- * 排è·ï¼ˆm）
- */
- @TableField("RowSpace")
- private Double RowSpace;
-
- /**
- * å”è·ï¼ˆm）
- */
- @TableField("HoleSpace")
- private Double HoleSpace;
-
- /**
- * æ–¹ä½è§’
- */
- @TableField("Azimuth")
- private Double Azimuth;
-
- /**
- * 倾角
- */
- @TableField("Inclination")
- private Double Inclination;
-
- /**
- * å”径(m)
- */
- @TableField("Aperture")
- private Double Aperture;
-
- /**
- * å¼€å”åæ ‡X
- */
- @TableField("X")
- private Double x;
-
- /**
- * å¼€å”åæ ‡Y
- */
- @TableField("Y")
- private Double y;
-
- /**
- * å¼€å”åæ ‡Z
- */
- @TableField("Z")
- private Double z;
-
- /**
- * å°é˜¶é«˜åº¦
- */
- @TableField("StepHeight")
- private Double StepHeight;
-
- /**
- * å•å”çˆ†ç ´é‡(m3)=å”è·*排è·*å°é˜¶é«˜åº¦
- */
- @TableField("HoleBlastVolume")
- private Double HoleBlastVolume;
-
- /**
- * ç©¿å”日期
- */
- @TableField("DrillingDate")
- private LocalDateTime DrillingDate;
-
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesBlastdesignVolume.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesBlastdesignVolume.java
deleted file mode 100644
index ea47945..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesBlastdesignVolume.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package cn.wise.sc.acquisition.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("T_Processes_BlastDesign_Volume")
-public class TProcessesBlastdesignVolume implements Serializable {
-
- private static final long serialVersionUID=1L;
-
- /**
- * 采区å称
- */
- @TableId("StopeName")
- private String StopeName;
-
- /**
- * å¹³å°å称
- */
- @TableField("StepName")
- private String StepName;
-
- /**
- * 爆区å称
- */
- @TableField("BlastAreaName")
- private String BlastAreaName;
-
- /**
- * è®¾è®¡çˆ†åŒºçˆ†ç ´é‡(m3)
- */
- @TableField("BlastVolume")
- private Double BlastVolume;
-
- /**
- * 设计日期
- */
- @TableField("DesignDate")
- private LocalDateTime DesignDate;
-
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesCrusher.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesCrusher.java
deleted file mode 100644
index 0655087..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesCrusher.java
+++ /dev/null
@@ -1,120 +0,0 @@
-package cn.wise.sc.acquisition.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("T_Processes_Crusher")
-public class TProcessesCrusher implements Serializable {
-
- private static final long serialVersionUID=1L;
-
- /**
- * IDå·
- */
- @TableId(value = "ID", type = IdType.AUTO)
- private Integer id;
-
- /**
- * ç ´ç¢Žç«™ç¼–å·
- */
- @TableField("CrusherStationID")
- private String CrusherStationID;
-
- /**
- * ç ´ç¢Žæ—¥æœŸ
- */
- @TableField("CrushDate")
- private LocalDateTime CrushDate;
-
- /**
- * 项目ç»ç†
- */
- @TableField("Manager")
- private String Manager;
-
- /**
- * 主管项目领导
- */
- @TableField("Supervisor")
- private String Supervisor;
-
- /**
- * 生产技术部
- */
- @TableField("TechDepart")
- private String TechDepart;
-
- /**
- * 制表人
- */
- @TableField("Tabulator")
- private String Tabulator;
-
- /**
- * 设备编å·
- */
- @TableField("EquipmentID")
- private String EquipmentID;
-
- /**
- * 工作内容
- */
- @TableField("WorkType")
- private String WorkType;
-
- /**
- * 工作时间（H）
- */
- @TableField("WorkTime")
- private Float WorkTime;
-
- /**
- * 完æˆå¨ä½
- */
- @TableField("Wcdw")
- private Double Wcdw;
-
- /**
- * åˆåŒå•ä»·
- */
- @TableField("Price")
- private Float Price;
-
- /**
- * 结算金é¢=Wcdw*Price
- */
- @TableField("TotalMoney")
- private Float TotalMoney;
-
- /**
- * 备注
- */
- @TableField("Bz")
- private String Bz;
-
- /**
- * æ—¥æœŸæ ‡è®°,如:2021å¹´01月
- */
- @TableField("Tag")
- private String Tag;
-
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesDigging.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesDigging.java
deleted file mode 100644
index a8b2e57..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesDigging.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package cn.wise.sc.acquisition.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("T_Processes_Digging")
-public class TProcessesDigging implements Serializable {
-
- private static final long serialVersionUID=1L;
-
- /**
- * IDå·
- */
- @TableId(value = "ID", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 采区å称
- */
- @TableField("StopeName")
- private String StopeName;
-
- /**
- * å¹³å°å称
- */
- @TableField("StepName")
- private String StepName;
-
- /**
- * 爆区å称
- */
- @TableField("BlastAreaName")
- private String BlastAreaName;
-
- /**
- * 装车日期
- */
- @TableField("DigDate")
- private LocalDateTime DigDate;
-
- /**
- * 项目ç»ç†
- */
- @TableField("Manager")
- private String Manager;
-
- /**
- * 主管项目领导
- */
- @TableField("Supervisor")
- private String Supervisor;
-
- /**
- * 生产技术部
- */
- @TableField("TechDepart")
- private String TechDepart;
-
- /**
- * 制表人
- */
- @TableField("Tabulator")
- private String Tabulator;
-
- /**
- * 挖机编å·
- */
- @TableField("EquipmentID")
- private String EquipmentID;
-
- /**
- * å¸æœº
- */
- @TableField("Driver")
- private String Driver;
-
- /**
- * 工作内容
- */
- @TableField("WorkType")
- private String WorkType;
-
- /**
- * 挖机开始读数（H）
- */
- @TableField("StartTime")
- private Float StartTime;
-
- /**
- * 挖机结æŸè¯»æ•°ï¼ˆH）
- */
- @TableField("EndTime")
- private Float EndTime;
-
- /**
- * 挖机工作时间（H）
- */
- @TableField("WorkTime")
- private Float WorkTime;
-
- /**
- * 完æˆå¨ä½
- */
- @TableField("Workload")
- private Double Workload;
-
- /**
- * 备注
- */
- @TableField("Bz")
- private String Bz;
-
- /**
- * æ—¥æœŸæ ‡è®°,如:2021å¹´01月
- */
- @TableField("Tag")
- private String Tag;
-
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesDrilling.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesDrilling.java
deleted file mode 100644
index ddddad9..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesDrilling.java
+++ /dev/null
@@ -1,210 +0,0 @@
-package cn.wise.sc.acquisition.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("T_Processes_Drilling")
-public class TProcessesDrilling implements Serializable {
-
- private static final long serialVersionUID=1L;
-
- /**
- * IDå·
- */
- @TableId(value = "ID", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 采区å称
- */
- @TableField("StopeName")
- private String StopeName;
-
- /**
- * å¹³å°å称
- */
- @TableField("StepName")
- private String StepName;
-
- /**
- * 爆区å称
- */
- @TableField("BlastAreaName")
- private String BlastAreaName;
-
- /**
- * ç‚®å”ç¼–å·
- */
- @TableField("HoleID")
- private String HoleID;
-
- /**
- * ç©¿å”日期
- */
- @TableField("DrillingDate")
- private LocalDateTime DrillingDate;
-
- /**
- * 项目ç»ç†
- */
- @TableField("Manager")
- private String Manager;
-
- /**
- * 主管项目领导
- */
- @TableField("Supervisor")
- private String Supervisor;
-
- /**
- * 生产技术部
- */
- @TableField("TechDepart")
- private String TechDepart;
-
- /**
- * 制表人
- */
- @TableField("Tabulator")
- private String Tabulator;
-
- /**
- * 钻机编å·
- */
- @TableField("EquipmentID")
- private String EquipmentID;
-
- /**
- * å¸æœº
- */
- @TableField("Driver")
- private String Driver;
-
- /**
- * 钻机开始读数（H）
- */
- @TableField("StartTime")
- private Float StartTime;
-
- /**
- * 钻机结æŸè¯»æ•°ï¼ˆH）
- */
- @TableField("EndTime")
- private Float EndTime;
-
- /**
- * 钻机工作时间（H）
- */
- @TableField("WorkTime")
- private Float WorkTime;
-
- /**
- * å”深（m）
- */
- @TableField("Depth")
- private Double Depth;
-
- /**
- * 排è·ï¼ˆm）
- */
- @TableField("RowSpace")
- private Double RowSpace;
-
- /**
- * å”è·ï¼ˆm）
- */
- @TableField("HoleSpace")
- private Double HoleSpace;
-
- /**
- * æ–¹ä½è§’
- */
- @TableField("Azimuth")
- private Double Azimuth;
-
- /**
- * 倾角
- */
- @TableField("Inclination")
- private Double Inclination;
-
- /**
- * å”径(m)
- */
- @TableField("Aperture")
- private Double Aperture;
-
- /**
- * å¼€å”åæ ‡X
- */
- @TableField("X")
- private Double x;
-
- /**
- * å¼€å”åæ ‡Y
- */
- @TableField("Y")
- private Double y;
-
- /**
- * å¼€å”åæ ‡Z
- */
- @TableField("Z")
- private Double z;
-
- /**
- * å•å”çˆ†ç ´é‡(m3)
- */
- @TableField("HoleBlastVolume")
- private Double HoleBlastVolume;
-
- /**
- * çˆ†ç ´æ—¥æœŸ
- */
- @TableField("BlastDate")
- private LocalDateTime BlastDate;
-
- /**
- * ç©¿å”作业人
- */
- @TableField("Operator")
- private String Operator;
-
- /**
- * 测é‡éªŒæ”¶äºº
- */
- @TableField("Accepter")
- private String Accepter;
-
- /**
- * 备注
- */
- @TableField("Bz")
- private String Bz;
-
- /**
- * æ—¥æœŸæ ‡è®°,如:2021å¹´01月
- */
- @TableField("Tag")
- private String Tag;
-
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesTruck.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesTruck.java
deleted file mode 100644
index 89bfb9f..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TProcessesTruck.java
+++ /dev/null
@@ -1,162 +0,0 @@
-package cn.wise.sc.acquisition.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("T_Processes_Truck")
-public class TProcessesTruck implements Serializable {
-
- private static final long serialVersionUID=1L;
-
- /**
- * IDå·
- */
- @TableId(value = "ID", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 采区å称
- */
- @TableField("StopeName")
- private String StopeName;
-
- /**
- * å¹³å°å称
- */
- @TableField("StepName")
- private String StepName;
-
- /**
- * 爆区å称
- */
- @TableField("BlastAreaName")
- private String BlastAreaName;
-
- /**
- * è¿è¾“日期
- */
- @TableField("DeliveryDate")
- private LocalDateTime DeliveryDate;
-
- /**
- * 项目ç»ç†
- */
- @TableField("Manager")
- private String Manager;
-
- /**
- * 主管项目领导
- */
- @TableField("Supervisor")
- private String Supervisor;
-
- /**
- * 生产技术部
- */
- @TableField("TechDepart")
- private String TechDepart;
-
- /**
- * 制表人
- */
- @TableField("Tabulator")
- private String Tabulator;
-
- /**
- * 矿车编å·
- */
- @TableField("TruckID")
- private String TruckID;
-
- /**
- * 矿车å¸æœº
- */
- @TableField("Driver")
- private String Driver;
-
- /**
- * 挖机编å·
- */
- @TableField("ExcavatorID")
- private String ExcavatorID;
-
- /**
- * è¿è·
- */
- @TableField("Distance")
- private Float Distance;
-
- /**
- * 装车内容
- */
- @TableField("WorkType")
- private String WorkType;
-
- /**
- * 矿车开始读数（H）
- */
- @TableField("StartTime")
- private Float StartTime;
-
- /**
- * 矿车结æŸè¯»æ•°ï¼ˆH）
- */
- @TableField("EndTime")
- private Float EndTime;
-
- /**
- * 矿车工作时间（H）
- */
- @TableField("WorkTime")
- private Float WorkTime;
-
- /**
- * 车数åˆè®¡
- */
- @TableField("Cshj")
- private Integer Cshj;
-
- /**
- * å¨ä½åˆè®¡
- */
- @TableField("Dwhj")
- private Double Dwhj;
-
- /**
- * å¨å…¬é‡Œåˆè®¡
- */
- @TableField("Dglhj")
- private Double Dglhj;
-
- /**
- * 备注
- */
- @TableField("Bz")
- private String Bz;
-
- /**
- * æ—¥æœŸæ ‡è®°,如:2021å¹´01月
- */
- @TableField("Tag")
- private String Tag;
-
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSafeTrouble.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSafeTrouble.java
deleted file mode 100644
index d651eb2..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSafeTrouble.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package cn.wise.sc.acquisition.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("T_Safe_Trouble")
-public class TSafeTrouble implements Serializable {
-
- private static final long serialVersionUID=1L;
-
- /**
- * IDå·
- */
- @TableId(value = "ID", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 检查人
- */
- @TableField("Jcr")
- private String Jcr;
-
- /**
- * å‘现日期
- */
- @TableField("Fxrq")
- private LocalDateTime Fxrq;
-
- /**
- * éšæ‚£ä½ç½®
- */
- @TableField("Yhwz")
- private String Yhwz;
-
- /**
- * éšæ‚£æè¿°
- */
- @TableField("Yhms")
- private String Yhms;
-
- /**
- * éšæ‚£çº§åˆ«
- */
- @TableField("Yhjb")
- private String Yhjb;
-
- /**
- * 整改措施
- */
- @TableField("Zgcs")
- private String Zgcs;
-
- /**
- * 整改è¦æ±‚
- */
- @TableField("Zgyq")
- private String Zgyq;
-
- /**
- * 整改负责人
- */
- @TableField("Zgfzr")
- private String Zgfzr;
-
- /**
- * å¤æŸ¥äºº
- */
- @TableField("Fcr")
- private String Fcr;
-
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSafeTroubleImg.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSafeTroubleImg.java
deleted file mode 100644
index 70b832a..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSafeTroubleImg.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package cn.wise.sc.acquisition.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("T_Safe_Trouble_Img")
-public class TSafeTroubleImg implements Serializable {
-
- private static final long serialVersionUID=1L;
-
- /**
- * T_Safe_Troubleä¸çš„ID
- */
- @TableField("TroubleID")
- private Integer TroubleID;
-
- /**
- * 照片
- */
- @TableField("Img")
- private byte[] Img;
-
- /**
- * 照片类型,分为éšæ‚£ç…§ç‰‡å’Œæ•´æ”¹åŽç…§ç‰‡ä¸¤ç±»
- */
- @TableField("ImgType")
- private String ImgType;
-
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSampleLaboratorysheet.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSampleLaboratorysheet.java
deleted file mode 100644
index 3e923b0..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSampleLaboratorysheet.java
+++ /dev/null
@@ -1,131 +0,0 @@
-package cn.wise.sc.acquisition.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("T_Sample_LaboratorySheet")
-public class TSampleLaboratorysheet implements Serializable {
-
- private static final long serialVersionUID=1L;
-
- /**
- * æ ·å·
- */
- @TableId("Yh")
- private String Yh;
-
- /**
- * 二维ç
- */
- @TableField("QRCode")
- private byte[] QRCode;
-
- /**
- * 化验室编å·
- */
- @TableField("LaboratoryID")
- private String LaboratoryID;
-
- /**
- * 副å“å˜æ”¾ä½ç½®
- */
- @TableField("Fpcfwz")
- private String Fpcfwz;
-
- /**
- * 氧化钙
- */
- @TableField("Cao")
- private Float Cao;
-
- /**
- * 氧化é•
- */
- @TableField("MgO")
- private Float MgO;
-
- /**
- * 三氧化二é“
- */
- @TableField("Al2O3")
- private Float Al2O3;
-
- /**
- * 二氧化硅
- */
- @TableField("SiO2")
- private Float SiO2;
-
- /**
- * 三氧化二é“
- */
- @TableField("Fe2O3")
- private Float Fe2O3;
-
- /**
- * 氧化钾
- */
- @TableField("K2O")
- private Float k2o;
-
- /**
- * 氧化é’
- */
- @TableField("Na2O")
- private Float Na2O;
-
- /**
- * 三氧化硫
- */
- @TableField("SO3")
- private Float so3;
-
- /**
- * 氯离å
- */
- @TableField("Cl")
- private Float Cl;
-
- /**
- * 烧失é‡
- */
- @TableField("Ssl")
- private Float Ssl;
-
- /**
- * æ”¶æ ·æ—¶é—´
- */
- @TableField("Sysj")
- private LocalDateTime Sysj;
-
- /**
- * 化验人
- */
- @TableField("Hyr")
- private String Hyr;
-
- /**
- * 化验时间
- */
- @TableField("Hysj")
- private LocalDateTime Hysj;
-
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSampleList.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSampleList.java
deleted file mode 100644
index 716b001..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSampleList.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package cn.wise.sc.acquisition.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("T_Sample_List")
-public class TSampleList implements Serializable {
-
- private static final long serialVersionUID=1L;
-
- /**
- * æ ·å·
- */
- @TableId("Yh")
- private String Yh;
-
- /**
- * 二维ç
- */
- @TableField("QRCode")
- private byte[] QRCode;
-
- /**
- * 采区å称
- */
- @TableField("StopeName")
- private String StopeName;
-
- /**
- * å¹³å°å称
- */
- @TableField("StepName")
- private String StepName;
-
- /**
- * 爆区å称
- */
- @TableField("BlastAreaName")
- private String BlastAreaName;
-
- /**
- * ç‚®å”ç¼–å·
- */
- @TableField("HolesID")
- private String HolesID;
-
- /**
- * 从
- */
- @TableField("Start")
- private String Start;
-
- /**
- * 至
- */
- @TableField("EndTo")
- private String EndTo;
-
- /**
- * é€æ ·äºº
- */
- @TableField("Syr")
- private String Syr;
-
- /**
- * é€æ ·æ—¶é—´
- */
- @TableField("Syrq")
- private LocalDateTime Syrq;
-
- /**
- * 备注
- */
- @TableField("Bz")
- private String Bz;
-
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSysDept.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSysDept.java
index 7817a79..090a05e 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSysDept.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSysDept.java
@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
* </p>
*
* @author ztw
- * @since 2021-04-22
+ * @since 2021-04-23
*/
@Data
@EqualsAndHashCode(callSuper = false)
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSysDict.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSysDict.java
index ed3d6bc..7ab4a58 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSysDict.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSysDict.java
@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
* </p>
*
* @author ztw
- * @since 2021-04-22
+ * @since 2021-04-23
*/
@Data
@EqualsAndHashCode(callSuper = false)
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSysPower.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSysPower.java
index d5ec741..fd26e16 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSysPower.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSysPower.java
@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
* </p>
*
* @author ztw
- * @since 2021-04-22
+ * @since 2021-04-23
*/
@Data
@EqualsAndHashCode(callSuper = false)
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSysRole.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSysRole.java
index ba69b45..aea206f 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSysRole.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSysRole.java
@@ -15,7 +15,7 @@ import lombok.experimental.Accessors;
* </p>
*
* @author ztw
- * @since 2021-04-22
+ * @since 2021-04-23
*/
@Data
@EqualsAndHashCode(callSuper = false)
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSysRolepower.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSysRolepower.java
index 28e668a..f0c10f7 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSysRolepower.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSysRolepower.java
@@ -13,7 +13,7 @@ import lombok.experimental.Accessors;
* </p>
*
* @author ztw
- * @since 2021-04-22
+ * @since 2021-04-23
*/
@Data
@EqualsAndHashCode(callSuper = false)
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSysUser.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSysUser.java
index 7a36517..2120cf7 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSysUser.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSysUser.java
@@ -4,22 +4,18 @@ import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
-
import java.io.Serializable;
-
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
-import javax.annotation.Generated;
-
/**
* <p>
- *
+ *
* </p>
*
* @author ztw
- * @since 2021-04-22
+ * @since 2021-04-23
*/
@Data
@EqualsAndHashCode(callSuper = false)
@@ -27,48 +23,49 @@ import javax.annotation.Generated;
@TableName("T_Sys_User")
public class TSysUser implements Serializable {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID=1L;
+
+ /**
+ * IDå·
+ */
+ @TableId(value = "ID", type = IdType.AUTO)
+ private Integer id;
- /**
- * IDå·
- */
- @TableId(value = "ID", type = IdType.AUTO)
- private Integer id;
+ /**
+ * 人员姓å
+ */
+ @TableField("Name")
+ private String Name;
- /**
- * 人员姓å
- */
- @TableField("Name")
- private String Name;
+ /**
+ * 登录ID
+ */
+ @TableField("LoginID")
+ private String LoginID;
- /**
- * 登录ID
- */
- @TableField("LoginID")
- private String LoginID;
+ /**
+ * 登录密ç
+ */
+ @TableField("Password")
+ private String Password;
- /**
- * 登录密ç
- */
- @TableField("Password")
- private String Password;
+ /**
+ * 角色ID
+ */
+ @TableField("RoleID")
+ private Integer RoleID;
- /**
- * 角色ID
- */
- @TableField("RoleID")
- private Integer RoleID;
+ /**
+ * 部门ID
+ */
+ @TableField("DeptID")
+ private String DeptID;
- /**
- * 部门ID
- */
- @TableField("DeptID")
- private String DeptID;
+ /**
+ * æè¿°ä¿¡æ¯
+ */
+ @TableField("Description")
+ private String Description;
- /**
- * æè¿°ä¿¡æ¯
- */
- @TableField("Description")
- private String Description;
}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSysUserLogin.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSysUserLogin.java
index 83278e9..6f6ed2b 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSysUserLogin.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TSysUserLogin.java
@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
* </p>
*
* @author ztw
- * @since 2021-04-22
+ * @since 2021-04-23
*/
@Data
@EqualsAndHashCode(callSuper = false)
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TWages.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TWages.java
deleted file mode 100644
index 82529e0..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TWages.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package cn.wise.sc.acquisition.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("T_Wages")
-public class TWages implements Serializable {
-
- private static final long serialVersionUID=1L;
-
- /**
- * IDå·
- */
- @TableId(value = "ID", type = IdType.AUTO)
- private Integer id;
-
- /**
- * å•ä½
- */
- @TableField("CompanyName")
- private String CompanyName;
-
- /**
- * 人员姓å
- */
- @TableField("Name")
- private String Name;
-
- /**
- * 所属工åº
- */
- @TableField("ProcessesName")
- private String ProcessesName;
-
- /**
- * 工资
- */
- @TableField("Wage")
- private Float Wage;
-
- /**
- * æ—¥æœŸæ ‡è®°,如:2021å¹´01月
- */
- @TableField("Tag")
- private String Tag;
-
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TWeight.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TWeight.java
deleted file mode 100644
index bbef47d..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/entity/TWeight.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package cn.wise.sc.acquisition.business.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("T_Weight")
-public class TWeight implements Serializable {
-
- private static final long serialVersionUID=1L;
-
- /**
- * IDå·
- */
- @TableId(value = "ID", type = IdType.AUTO)
- private Integer id;
-
- /**
- * 日期
- */
- @TableField("Rq")
- private String Rq;
-
- /**
- * 时间
- */
- @TableField("Sj")
- private String Sj;
-
- /**
- * 矿车编å·
- */
- @TableField("TruckID")
- private String TruckID;
-
- /**
- * 总毛é‡
- */
- @TableField("Mz")
- private Float Mz;
-
- /**
- * 总皮é‡
- */
- @TableField("Pz")
- private Float Pz;
-
- /**
- * 总净é‡
- */
- @TableField("Jz")
- private Float Jz;
-
- /**
- * æ—¥æœŸæ ‡è®°,如:2021å¹´01月
- */
- @TableField("Tag")
- private String Tag;
-
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/Assert.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/Assert.java
deleted file mode 100644
index e0d71c3..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/Assert.java
+++ /dev/null
@@ -1,112 +0,0 @@
-package cn.wise.sc.acquisition.business.exception;
-
-import cn.hutool.core.util.StrUtil;
-
-import java.util.Collection;
-
-/**
- * @description: æ–è¨€æŽ¥å£ å…¬å…±æ–言方法放这里
- * @author: qh
- * @create: 2020-05-15 15:32
- **/
-public interface Assert {
-
- /**
- * 创建异常
- *
- * @param args
- * @return
- */
- BaseException newException(Object... args);
-
- /**
- * 创建异常
- *
- * @param t
- * @param args
- * @return
- */
- BaseException newException(Throwable t, Object... args);
-
- /**
- * æ–言对象 obj éžç©ºã€‚如果对象 obj 为空，则抛出异常
- *
- * @param obj 待判æ–对象
- */
- default void assertNotNull(Object obj) {
- if (obj == null) {
- throw newException(obj);
- }
- }
-
- default void assertNotEmpty(String str) {
- if (StrUtil.isEmpty(str)) {
- throw newException(str);
- }
- }
-
- /**
- * æ–言对象objéžç©ºã€‚如果对象为空，则抛出异常
- * 异常信æ¯message支æŒä¼ 递å‚æ•°æ–¹å¼ï¼Œé¿å…在判æ–之å‰è¿›è¡Œå—符串拼接æ“作
- *
- * @param obj 待判æ–对象
- * @param args messageå ä½ç¬¦å¯¹åº”çš„å‚数列表
- */
- default void assertNotNull(Object obj, Object... args) {
- if (obj == null) {
- throw newException(args);
- }
- }
-
- /**
- * æ–言是个异常 直接抛出这个异常
- *
- * @param e
- */
- default void assertIsException(Throwable e) {
- if (e != null) {
- throw newException(e, null);
- }
- }
-
- /**
- * æ–言 å—符串å‚æ•°ä¸èƒ½ä¸ºç©º
- *
- * @param params å—符串å‚æ•°
- */
- default void assertNotEmpty(String... params) {
- for (String str : params) {
- if (StrUtil.isEmpty(str)) {
- throw newException(params);
- }
- }
- }
-
- /**
- * æ–言 集åˆä¸ä¸ºç©ºå’Œé•¿åº¦ä¸ä¸º0
- *
- * @param list
- */
- default void assertCollectionNotILLEGAL(Collection list) {
- if (list == null || list.size() == 0) {
- throw newException(list);
- }
- }
-
- /**
- * æ–言数值å‚æ•° ä¸ä¸º0和空
- *
- * @param obj 待判æ–çš„å‚æ•°
- */
- default void assertNotDefaultOrNull(Object obj) {
- double tmp;
- try {
- tmp = (double) obj;
- } catch (ClassCastException e) {
- throw newException(obj);
- }
- if ((obj == null) || (tmp == 0D)) {
- throw newException(obj);
- }
- }
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/BaseException.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/BaseException.java
deleted file mode 100644
index 7229099..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/BaseException.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package cn.wise.sc.acquisition.business.exception;
-
-/**
- * @description: 基础异常
- * @author: qh
- * @create: 2020-05-15 15:27
- **/
-public class BaseException extends RuntimeException {
-
- protected static final long serialVersionUID = 1L;
-
- private int code;
-
- private String message;
-
- private Object[] args;
-
- public BaseException(IResponseEnum responseEnum, Object[] args, String message) {
- super(responseEnum.getMessage());
- this.code = responseEnum.getCode();
- this.message = message;
- this.args = args;
- }
-
- public BaseException(IResponseEnum responseEnum, Object[] args, String message, Throwable cause) {
- super(message, cause);
- this.code = responseEnum.getCode();
- this.message = message;
- this.args = args;
- }
-
- public int getCode() {
- return code;
- }
-
- public void setCode(int code) {
- this.code = code;
- }
-
- @Override
- public String getMessage() {
- return message;
- }
-
- public void setMessage(String message) {
- this.message = message;
- }
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/BusinessException.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/BusinessException.java
deleted file mode 100644
index 642ec12..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/BusinessException.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.exception;
-
-/**
- * @description: 业务方é¢çš„异常
- * @author: qh
- * @create: 2020-05-15 15:28
- **/
-public class BusinessException extends BaseException {
-
- private static final long serialVersionUID = 1L;
-
- public BusinessException(IResponseEnum responseEnum, Object[] args, String message) {
- super(responseEnum, args, message);
- }
-
- public BusinessException(IResponseEnum responseEnum, Object[] args, String message, Throwable cause) {
- super(responseEnum, args, message, cause);
- }
-}
-
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/BusinessExceptionAssert.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/BusinessExceptionAssert.java
deleted file mode 100644
index 234f16b..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/BusinessExceptionAssert.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package cn.wise.sc.acquisition.business.exception;
-
-import java.text.MessageFormat;
-import java.util.Date;
-
-/**
- * @description: 业务异常与æ–言结åˆçš„æŽ¥å£ é€‚é…器
- * @author: qh
- * @create: 2020-05-15 15:36
- **/
-public interface BusinessExceptionAssert extends IResponseEnum, Assert {
-
- @Override
- default BaseException newException(Object... args) {
- String msg = MessageFormat.format(this.getMessage(), args);
- return new BusinessException(this, args, msg);
- }
-
- @Override
- default BaseException newException(Throwable t, Object... args) {
- String msg = MessageFormat.format(this.getMessage(), args);
- return new BusinessException(this, args, msg, t);
- }
-
- /**
- * æ–言对象 时间段åˆæ³•
- *
- * @param start 开始时间
- * @param end 结æŸæ—¶é—´
- */
- default void assertTimeVail(Long start, Long end) {
- if (end == null || start == null) {
- throw newException(start, end);
- }
- if (end == 0 && start == 0) {
- throw newException(start, end);
- }
- if (start > end) {
- throw newException(start, end);
- }
- if (start < 0 || end < 0) {
- throw newException(start, end);
- }
- }
-
- /**
- * æ–言对象 时间段åˆæ³•
- *
- * @param startDate 开始时间
- * @param endDate 结æŸæ—¶é—´
- */
- default void assertTimeVail(Date startDate, Date endDate) {
- Long start = startDate.getTime();
- Long end = endDate.getTime();
- assertTimeVail(start, end);
- }
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/BusinessExceptionEnum.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/BusinessExceptionEnum.java
deleted file mode 100644
index ae905bf..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/BusinessExceptionEnum.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package cn.wise.sc.acquisition.business.exception;
-
-import lombok.Getter;
-
-/**
- * @description: 最终业务异常实现
- * @author: qh
- * @create: 2020-05-15 15:37
- */
-@Getter
-public enum BusinessExceptionEnum implements BusinessExceptionAssert {
-
- /**
- * Bad licence type
- */
- BAD_LICENCE_TYPE(7001, "å—段ä¸èƒ½ä¸ºç©º!"),
-
- /**
- * Licence not found
- */
- LICENCE_NOT_FOUND(7002, "Licence not found."),
-
- /**
- * æˆåŠŸ
- */
- SUCCESS(200, "Success."),
-
- BAD_TIME(400, "æ—¶é—´æ®µæ— æ•ˆ! 开始时间>结æŸæ—¶é—´&&ä¸èƒ½ä¸ºNUll"),
-
- COLLECTION_NOT_ILLEGAL(400, "å‚数集åˆæ— 效!"),
-
- CACHE_NOT_FOUND(7002, "缓å˜æœªæ‰¾åˆ°!"),
-
- OPEN_TS_DB_CONNECTION_ERROR(7003, "请求OpenTSDB失败"),
-
- /**
- * 业务异常
- */
- BUSINESS_ERROR(400, "Business not pass."),
-
- /**
- * 用户未登录
- */
- NO_LOGIN(401, "Please login.");
-
-
- BusinessExceptionEnum(int code, String message) {
- this.code = code;
- this.message = message;
- }
-
- /**
- * 返回ç
- */
- private int code;
- /**
- * 返回消æ¯
- */
- private String message;
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/BusinessOldException.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/BusinessOldException.java
deleted file mode 100644
index 521f0ed..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/BusinessOldException.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package cn.wise.sc.acquisition.business.exception;
-
-import org.springframework.http.HttpStatus;
-
-/**
- * @author shulidong
- * @since 2019/2/19/0019 16:48
- **/
-public abstract class BusinessOldException extends RuntimeException {
- protected HttpStatus statusCode = HttpStatus.INTERNAL_SERVER_ERROR;
-
- private String errorCode;
-
- public HttpStatus getStatusCode() {
- return statusCode;
- }
-
- public void setStatusCode(HttpStatus statusCode) {
- this.statusCode = statusCode;
- }
-
- public BusinessOldException(String errorCode, String message) {
- super(message);
- this.errorCode = errorCode;
- }
-
- public BusinessOldException(String message, Throwable e) {
- super(message, e);
- }
-
- public BusinessOldException(String message) {
- super(message);
- }
-
- public String getErrorCode() {
- return errorCode;
- }
-
- public void setErrorCode(String errorCode) {
- this.errorCode = errorCode;
- }
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/CodeException.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/CodeException.java
deleted file mode 100644
index 0b1de6c..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/CodeException.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package cn.wise.sc.acquisition.business.exception;
-
-/**
- * @description: 代ç 错误
- * @author: qh
- * @create: 2020-07-09 16:07
- **/
-public class CodeException extends BaseException {
-
- private static final long serialVersionUID = 1L;
-
- public CodeException(IResponseEnum responseEnum, Object[] args, String message) {
- super(responseEnum, args, message);
- }
-
- public CodeException(IResponseEnum responseEnum, Object[] args, String message, Throwable cause) {
- super(responseEnum, args, message, cause);
- }
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/CodeExceptionAssert.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/CodeExceptionAssert.java
deleted file mode 100644
index 9092e7c..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/CodeExceptionAssert.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package cn.wise.sc.acquisition.business.exception;
-
-import java.text.MessageFormat;
-
-/**
- * @description: 代ç 逻辑错误æ–言接å£
- * @author: qh
- * @create: 2020-07-09 16:05
- **/
-public interface CodeExceptionAssert extends Assert, IResponseEnum {
-
- @Override
- default BaseException newException(Object... args) {
-
- String msg = MessageFormat.format(this.getMessage(), args);
-
- return new BusinessException(this, args, msg);
- }
-
- @Override
- default BaseException newException(Throwable t, Object... args) {
- String msg = MessageFormat.format(this.getMessage(), args);
-
- return new BusinessException(this, args, msg, t);
- }
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/CodeExceptionEnum.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/CodeExceptionEnum.java
deleted file mode 100644
index 7ddea4e..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/CodeExceptionEnum.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package cn.wise.sc.acquisition.business.exception;
-
-import lombok.Getter;
-
-/**
- * @description: 代ç 逻辑错误枚举
- * @author: qh
- * @create: 2020-07-09 16:09
- **/
-@Getter
-public enum CodeExceptionEnum implements CodeExceptionAssert {
-
- OBJECT_NOT_EMPTY(6001, "{0} is NULL!"),
- STRING_NOT_EMPTY(6001, "{0} is Empty!");
-
- CodeExceptionEnum(int code, String message) {
- this.code = code;
- this.message = message;
- }
-
- /**
- * 返回ç
- */
- private int code;
- /**
- * 返回消æ¯
- */
- private String message;
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/IResponseEnum.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/IResponseEnum.java
deleted file mode 100644
index b791b5a..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/IResponseEnum.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package cn.wise.sc.acquisition.business.exception;
-
-/**
- * @description: å…¬å…±å±žæ€§æŽ¥å£ æ供公共属性
- * @author: qh
- * @create: 2020-05-15 15:28
- **/
-public interface IResponseEnum {
- int getCode();
-
- String getMessage();
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/filter/TokenFilter.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/filter/TokenFilter.java
index 46af22d..fa4fb40 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/filter/TokenFilter.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/filter/TokenFilter.java
@@ -9,7 +9,6 @@ import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import cn.wise.sc.acquisition.business.exception.BusinessException;
import cn.wise.sc.acquisition.business.util.JwtUtil;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TAnnouncementMapper.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TAnnouncementMapper.java
deleted file mode 100644
index a4f294e..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TAnnouncementMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.mapper;
-
-import cn.wise.sc.acquisition.business.entity.TAnnouncement;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接å£
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface TAnnouncementMapper extends BaseMapper<TAnnouncement> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentAccountMapper.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentAccountMapper.java
deleted file mode 100644
index 3bbcea3..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentAccountMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.mapper;
-
-import cn.wise.sc.acquisition.business.entity.TEquipmentAccount;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接å£
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface TEquipmentAccountMapper extends BaseMapper<TEquipmentAccount> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentCheckMapper.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentCheckMapper.java
deleted file mode 100644
index 294e99c..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentCheckMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.mapper;
-
-import cn.wise.sc.acquisition.business.entity.TEquipmentCheck;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接å£
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface TEquipmentCheckMapper extends BaseMapper<TEquipmentCheck> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentMaintenanceCycleMapper.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentMaintenanceCycleMapper.java
deleted file mode 100644
index 7bca8ad..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentMaintenanceCycleMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.mapper;
-
-import cn.wise.sc.acquisition.business.entity.TEquipmentMaintenanceCycle;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接å£
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface TEquipmentMaintenanceCycleMapper extends BaseMapper<TEquipmentMaintenanceCycle> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentMaintenanceMapper.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentMaintenanceMapper.java
deleted file mode 100644
index 7ef6b03..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentMaintenanceMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.mapper;
-
-import cn.wise.sc.acquisition.business.entity.TEquipmentMaintenance;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接å£
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface TEquipmentMaintenanceMapper extends BaseMapper<TEquipmentMaintenance> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentRepairMapper.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentRepairMapper.java
deleted file mode 100644
index a192a61..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentRepairMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.mapper;
-
-import cn.wise.sc.acquisition.business.entity.TEquipmentRepair;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接å£
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface TEquipmentRepairMapper extends BaseMapper<TEquipmentRepair> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentRunMapper.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentRunMapper.java
deleted file mode 100644
index b1fe49b..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentRunMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.mapper;
-
-import cn.wise.sc.acquisition.business.entity.TEquipmentRun;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接å£
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface TEquipmentRunMapper extends BaseMapper<TEquipmentRun> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentTroubleMapper.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentTroubleMapper.java
deleted file mode 100644
index 8a749db..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentTroubleMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.mapper;
-
-import cn.wise.sc.acquisition.business.entity.TEquipmentTrouble;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接å£
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface TEquipmentTroubleMapper extends BaseMapper<TEquipmentTrouble> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentUsagefeeMapper.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentUsagefeeMapper.java
deleted file mode 100644
index 35c3a51..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TEquipmentUsagefeeMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.mapper;
-
-import cn.wise.sc.acquisition.business.entity.TEquipmentUsagefee;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接å£
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface TEquipmentUsagefeeMapper extends BaseMapper<TEquipmentUsagefee> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TMaterialEntryMapper.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TMaterialEntryMapper.java
deleted file mode 100644
index 891ef2f..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TMaterialEntryMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.mapper;
-
-import cn.wise.sc.acquisition.business.entity.TMaterialEntry;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接å£
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface TMaterialEntryMapper extends BaseMapper<TMaterialEntry> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TMaterialOutMapper.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TMaterialOutMapper.java
deleted file mode 100644
index 467976d..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TMaterialOutMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.mapper;
-
-import cn.wise.sc.acquisition.business.entity.TMaterialOut;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接å£
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface TMaterialOutMapper extends BaseMapper<TMaterialOut> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TMineBasicMapper.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TMineBasicMapper.java
deleted file mode 100644
index 3a2d56a..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TMineBasicMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.mapper;
-
-import cn.wise.sc.acquisition.business.entity.TMineBasic;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接å£
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface TMineBasicMapper extends BaseMapper<TMineBasic> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TMineRightMapper.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TMineRightMapper.java
deleted file mode 100644
index 432b007..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TMineRightMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.mapper;
-
-import cn.wise.sc.acquisition.business.entity.TMineRight;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接å£
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface TMineRightMapper extends BaseMapper<TMineRight> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TMineScopeMapper.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TMineScopeMapper.java
deleted file mode 100644
index 3c897d9..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TMineScopeMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.mapper;
-
-import cn.wise.sc.acquisition.business.entity.TMineScope;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接å£
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface TMineScopeMapper extends BaseMapper<TMineScope> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TMineStopeMapper.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TMineStopeMapper.java
deleted file mode 100644
index 36f4491..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TMineStopeMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.mapper;
-
-import cn.wise.sc.acquisition.business.entity.TMineStope;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接å£
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface TMineStopeMapper extends BaseMapper<TMineStope> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TPlanMonthMapper.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TPlanMonthMapper.java
deleted file mode 100644
index ae9aa68..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TPlanMonthMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.mapper;
-
-import cn.wise.sc.acquisition.business.entity.TPlanMonth;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接å£
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface TPlanMonthMapper extends BaseMapper<TPlanMonth> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TPlanYearMapper.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TPlanYearMapper.java
deleted file mode 100644
index 078b358..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TPlanYearMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.mapper;
-
-import cn.wise.sc.acquisition.business.entity.TPlanYear;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接å£
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface TPlanYearMapper extends BaseMapper<TPlanYear> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesAuxiliaryMapper.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesAuxiliaryMapper.java
deleted file mode 100644
index 148ebe8..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesAuxiliaryMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.mapper;
-
-import cn.wise.sc.acquisition.business.entity.TProcessesAuxiliary;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接å£
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface TProcessesAuxiliaryMapper extends BaseMapper<TProcessesAuxiliary> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesBlastMapper.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesBlastMapper.java
deleted file mode 100644
index fc57056..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesBlastMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.mapper;
-
-import cn.wise.sc.acquisition.business.entity.TProcessesBlast;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接å£
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface TProcessesBlastMapper extends BaseMapper<TProcessesBlast> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesBlastdesignHoleMapper.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesBlastdesignHoleMapper.java
deleted file mode 100644
index 80635cb..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesBlastdesignHoleMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.mapper;
-
-import cn.wise.sc.acquisition.business.entity.TProcessesBlastdesignHole;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接å£
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface TProcessesBlastdesignHoleMapper extends BaseMapper<TProcessesBlastdesignHole> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesBlastdesignVolumeMapper.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesBlastdesignVolumeMapper.java
deleted file mode 100644
index 28fe140..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesBlastdesignVolumeMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.mapper;
-
-import cn.wise.sc.acquisition.business.entity.TProcessesBlastdesignVolume;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接å£
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface TProcessesBlastdesignVolumeMapper extends BaseMapper<TProcessesBlastdesignVolume> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesCrusherMapper.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesCrusherMapper.java
deleted file mode 100644
index b4100c1..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesCrusherMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.mapper;
-
-import cn.wise.sc.acquisition.business.entity.TProcessesCrusher;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接å£
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface TProcessesCrusherMapper extends BaseMapper<TProcessesCrusher> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesDiggingMapper.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesDiggingMapper.java
deleted file mode 100644
index 0b6e4f1..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesDiggingMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.mapper;
-
-import cn.wise.sc.acquisition.business.entity.TProcessesDigging;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接å£
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface TProcessesDiggingMapper extends BaseMapper<TProcessesDigging> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesDrillingMapper.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesDrillingMapper.java
deleted file mode 100644
index f4a2aef..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesDrillingMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.mapper;
-
-import cn.wise.sc.acquisition.business.entity.TProcessesDrilling;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接å£
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface TProcessesDrillingMapper extends BaseMapper<TProcessesDrilling> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesTruckMapper.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesTruckMapper.java
deleted file mode 100644
index 9368ad9..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TProcessesTruckMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.mapper;
-
-import cn.wise.sc.acquisition.business.entity.TProcessesTruck;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接å£
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface TProcessesTruckMapper extends BaseMapper<TProcessesTruck> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TSafeTroubleImgMapper.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TSafeTroubleImgMapper.java
deleted file mode 100644
index 72bd9ad..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TSafeTroubleImgMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.mapper;
-
-import cn.wise.sc.acquisition.business.entity.TSafeTroubleImg;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接å£
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface TSafeTroubleImgMapper extends BaseMapper<TSafeTroubleImg> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TSafeTroubleMapper.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TSafeTroubleMapper.java
deleted file mode 100644
index 54151a6..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TSafeTroubleMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.mapper;
-
-import cn.wise.sc.acquisition.business.entity.TSafeTrouble;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接å£
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface TSafeTroubleMapper extends BaseMapper<TSafeTrouble> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TSampleLaboratorysheetMapper.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TSampleLaboratorysheetMapper.java
deleted file mode 100644
index c22121b..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TSampleLaboratorysheetMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.mapper;
-
-import cn.wise.sc.acquisition.business.entity.TSampleLaboratorysheet;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接å£
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface TSampleLaboratorysheetMapper extends BaseMapper<TSampleLaboratorysheet> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TSampleListMapper.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TSampleListMapper.java
deleted file mode 100644
index 8812e82..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TSampleListMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.mapper;
-
-import cn.wise.sc.acquisition.business.entity.TSampleList;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接å£
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface TSampleListMapper extends BaseMapper<TSampleList> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TWagesMapper.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TWagesMapper.java
deleted file mode 100644
index 8a2ff1d..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TWagesMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.mapper;
-
-import cn.wise.sc.acquisition.business.entity.TWages;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接å£
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface TWagesMapper extends BaseMapper<TWages> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TWeightMapper.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TWeightMapper.java
deleted file mode 100644
index 7b52502..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/TWeightMapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.mapper;
-
-import cn.wise.sc.acquisition.business.entity.TWeight;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * Mapper 接å£
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface TWeightMapper extends BaseMapper<TWeight> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TAnnouncementMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TAnnouncementMapper.xml
deleted file mode 100644
index 9f9cb7e..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TAnnouncementMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wise.sc.acquisition.business.mapper.TAnnouncementMapper">
-
-</mapper>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentAccountMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentAccountMapper.xml
deleted file mode 100644
index 51fff31..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentAccountMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wise.sc.acquisition.business.mapper.TEquipmentAccountMapper">
-
-</mapper>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentCheckMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentCheckMapper.xml
deleted file mode 100644
index ebb25da..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentCheckMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wise.sc.acquisition.business.mapper.TEquipmentCheckMapper">
-
-</mapper>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentMaintenanceCycleMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentMaintenanceCycleMapper.xml
deleted file mode 100644
index 53edf20..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentMaintenanceCycleMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wise.sc.acquisition.business.mapper.TEquipmentMaintenanceCycleMapper">
-
-</mapper>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentMaintenanceMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentMaintenanceMapper.xml
deleted file mode 100644
index 3ce5388..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentMaintenanceMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wise.sc.acquisition.business.mapper.TEquipmentMaintenanceMapper">
-
-</mapper>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentRepairMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentRepairMapper.xml
deleted file mode 100644
index 5f9557f..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentRepairMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wise.sc.acquisition.business.mapper.TEquipmentRepairMapper">
-
-</mapper>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentRunMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentRunMapper.xml
deleted file mode 100644
index 93900d6..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentRunMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wise.sc.acquisition.business.mapper.TEquipmentRunMapper">
-
-</mapper>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentTroubleMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentTroubleMapper.xml
deleted file mode 100644
index 9295521..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentTroubleMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wise.sc.acquisition.business.mapper.TEquipmentTroubleMapper">
-
-</mapper>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentUsagefeeMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentUsagefeeMapper.xml
deleted file mode 100644
index ea51d36..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TEquipmentUsagefeeMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wise.sc.acquisition.business.mapper.TEquipmentUsagefeeMapper">
-
-</mapper>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TMaterialEntryMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TMaterialEntryMapper.xml
deleted file mode 100644
index 2f9ad6b..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TMaterialEntryMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wise.sc.acquisition.business.mapper.TMaterialEntryMapper">
-
-</mapper>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TMaterialOutMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TMaterialOutMapper.xml
deleted file mode 100644
index 22ac2b8..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TMaterialOutMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wise.sc.acquisition.business.mapper.TMaterialOutMapper">
-
-</mapper>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TMineBasicMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TMineBasicMapper.xml
deleted file mode 100644
index 27f501d..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TMineBasicMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wise.sc.acquisition.business.mapper.TMineBasicMapper">
-
-</mapper>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TMineRightMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TMineRightMapper.xml
deleted file mode 100644
index 3ff02aa..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TMineRightMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wise.sc.acquisition.business.mapper.TMineRightMapper">
-
-</mapper>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TMineScopeMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TMineScopeMapper.xml
deleted file mode 100644
index 3bdab58..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TMineScopeMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wise.sc.acquisition.business.mapper.TMineScopeMapper">
-
-</mapper>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TMineStopeMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TMineStopeMapper.xml
deleted file mode 100644
index ed2b8e2..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TMineStopeMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wise.sc.acquisition.business.mapper.TMineStopeMapper">
-
-</mapper>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TPlanMonthMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TPlanMonthMapper.xml
deleted file mode 100644
index 116279b..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TPlanMonthMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wise.sc.acquisition.business.mapper.TPlanMonthMapper">
-
-</mapper>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TPlanYearMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TPlanYearMapper.xml
deleted file mode 100644
index fab7941..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TPlanYearMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wise.sc.acquisition.business.mapper.TPlanYearMapper">
-
-</mapper>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesAuxiliaryMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesAuxiliaryMapper.xml
deleted file mode 100644
index 52d2c2e..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesAuxiliaryMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wise.sc.acquisition.business.mapper.TProcessesAuxiliaryMapper">
-
-</mapper>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesBlastMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesBlastMapper.xml
deleted file mode 100644
index f0e6af9..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesBlastMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wise.sc.acquisition.business.mapper.TProcessesBlastMapper">
-
-</mapper>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesBlastdesignHoleMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesBlastdesignHoleMapper.xml
deleted file mode 100644
index 93459e4..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesBlastdesignHoleMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wise.sc.acquisition.business.mapper.TProcessesBlastdesignHoleMapper">
-
-</mapper>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesBlastdesignVolumeMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesBlastdesignVolumeMapper.xml
deleted file mode 100644
index 3887b01..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesBlastdesignVolumeMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wise.sc.acquisition.business.mapper.TProcessesBlastdesignVolumeMapper">
-
-</mapper>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesCrusherMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesCrusherMapper.xml
deleted file mode 100644
index 2706c6a..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesCrusherMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wise.sc.acquisition.business.mapper.TProcessesCrusherMapper">
-
-</mapper>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesDiggingMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesDiggingMapper.xml
deleted file mode 100644
index f171cba..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesDiggingMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wise.sc.acquisition.business.mapper.TProcessesDiggingMapper">
-
-</mapper>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesDrillingMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesDrillingMapper.xml
deleted file mode 100644
index 7c5bd8d..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesDrillingMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wise.sc.acquisition.business.mapper.TProcessesDrillingMapper">
-
-</mapper>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesTruckMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesTruckMapper.xml
deleted file mode 100644
index 68ef301..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TProcessesTruckMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wise.sc.acquisition.business.mapper.TProcessesTruckMapper">
-
-</mapper>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TSafeTroubleImgMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TSafeTroubleImgMapper.xml
deleted file mode 100644
index 20e94fe..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TSafeTroubleImgMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wise.sc.acquisition.business.mapper.TSafeTroubleImgMapper">
-
-</mapper>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TSafeTroubleMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TSafeTroubleMapper.xml
deleted file mode 100644
index 4d4e5de..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TSafeTroubleMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wise.sc.acquisition.business.mapper.TSafeTroubleMapper">
-
-</mapper>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TSampleLaboratorysheetMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TSampleLaboratorysheetMapper.xml
deleted file mode 100644
index 3b818fd..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TSampleLaboratorysheetMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wise.sc.acquisition.business.mapper.TSampleLaboratorysheetMapper">
-
-</mapper>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TSampleListMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TSampleListMapper.xml
deleted file mode 100644
index d9f3729..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TSampleListMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wise.sc.acquisition.business.mapper.TSampleListMapper">
-
-</mapper>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TWagesMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TWagesMapper.xml
deleted file mode 100644
index 3cbb499..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TWagesMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wise.sc.acquisition.business.mapper.TWagesMapper">
-
-</mapper>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TWeightMapper.xml b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TWeightMapper.xml
deleted file mode 100644
index e4d5e39..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/mapper/xml/TWeightMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="cn.wise.sc.acquisition.business.mapper.TWeightMapper">
-
-</mapper>
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/BaseController.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/BaseController.java
deleted file mode 100644
index 98bc787..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/BaseController.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package cn.wise.sc.acquisition.business.model;
-
-import cn.wise.sc.acquisition.business.model.vo.BaseVo;
-import cn.wise.sc.acquisition.business.model.vo.BaseVo;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.IService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * å°è£…公共的接å£
- *
- * @param <T> service对象
- * @param <M> 实体对象
- * @author 秦虎
- */
-@Slf4j
-public class BaseController<T extends IService<M>, M extends BaseEntity> {
-
- T iService;
-
- public BaseController(T iService) {
- this.iService = iService;
- }
-
- @PostMapping("/list")
- public BaseResponse<List<M>> list(@RequestBody WrapperQuery wrapperQuery) {
- QueryWrapper queryWrapper = PageWrapperQueryMyBatisResolver.getQueryWrapper(wrapperQuery);
- try {
- List<M> list = iService.list(queryWrapper);
- return BaseResponse.okData(list);
- } catch (Exception ex) {
- log.error("查询æ“作失败 ===== " + iService.toString() + ".list() ====== 异常: {}", ex.getMessage());
- return BaseResponse.errorMsg("查询失败");
- }
- }
-
- @PostMapping("/page")
- public BaseResponse<IPage<M>> page(@RequestBody WrapperQuery pageQuery) {
-
- QueryWrapper queryWrapper = PageWrapperQueryMyBatisResolver.getQueryWrapper(pageQuery);
- IPage<M> page = new Page(pageQuery.getPageQuery().getPageNo(), pageQuery.getPageQuery().getPageSize());
- try {
- page = iService.page(page, queryWrapper);
- return BaseResponse.okData(page);
- } catch (Exception ex) {
- log.error("查询æ“作失败 ===== " + iService.toString() + ".page() ====== 异常: {}", ex.getMessage());
- return BaseResponse.errorMsg("分页查询失败");
- }
- }
-
- @GetMapping("/{id}")
- public BaseResponse<BaseVo> getById(@PathVariable("id") long id) {
- try {
- M model = iService.getById(id);
- return BaseResponse.okData(model.toVo());
- } catch (Exception ex) {
- log.error("查询æ“作失败 ===== " + iService.toString() + ".create() ====== 异常: {}", ex.getMessage());
- return BaseResponse.errorMsg("获å–详情信æ¯å¤±è´¥");
- }
- }
-
- @PostMapping
- public BaseResponse<BaseVo> create(@RequestBody M model) {
- try {
- iService.save(model);
- return BaseResponse.okData(model.toVo());
- } catch (Exception ex) {
- log.error("查询æ“作失败 ===== " + iService.toString() + ".create() ====== 异常: {}", ex.getMessage());
- return BaseResponse.errorMsg("æ·»åŠ å¤±è´¥");
- }
- }
-
- @PutMapping
- public BaseResponse<Boolean> update(@RequestBody M model) {
- try {
- boolean update = iService.updateById(model);
- return BaseResponse.okData(update);
- } catch (Exception ex) {
- log.error("查询æ“作失败 ===== " + iService.toString() + ".create() ====== 异常: {}", ex.getMessage());
- return BaseResponse.errorMsg("更新记录失败");
- }
- }
-
- @DeleteMapping("/{id}")
- public BaseResponse<Boolean> delById(@PathVariable("id") long id) {
- try {
- boolean removeById = iService.removeById(id);
- return BaseResponse.okData(removeById);
- } catch (Exception ex) {
- log.error("查询æ“作失败 ===== " + iService.toString() + ".create() ====== 异常: {}", ex.getMessage());
- return BaseResponse.errorMsg("获å–详情信æ¯å¤±è´¥");
- }
- }
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/BaseResponse.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/BaseResponse.java
deleted file mode 100644
index 9ff3580..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/model/BaseResponse.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package cn.wise.sc.acquisition.business.model;
-
-import cn.wise.sc.acquisition.business.exception.BusinessExceptionEnum;
-import cn.wise.sc.acquisition.business.exception.BusinessExceptionEnum;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
-/**
- * @description: 统一返回å‚数实体
- * @author: qh
- * @create: 2020-05-18 10:49
- **/
-@Data
-@AllArgsConstructor
-public class BaseResponse<T> {
-
- /**
- * å“应状æ€ç
- */
- private int code;
-
- /**
- * å“应数æ®
- */
- private T data;
-
- /**
- * å“应æ示信æ¯
- */
- private String msg;
-
- BaseResponse() {
-
- }
-
- /**
- * 200,带æ示信æ¯
- *
- * @param msg æ示信æ¯
- * @param <T> å“应数æ®
- * @return BaseResponse
- */
- public static <T> BaseResponse<T> okMsg(String msg) {
- BaseResponse<T> baseResponse = new BaseResponse<>();
- baseResponse.setMsg(msg);
- baseResponse.setCode(BusinessExceptionEnum.SUCCESS.getCode());
- baseResponse.setData(null);
- return baseResponse;
- }
-
- /**
- * 200,带默认æ示信æ¯
- *
- * @param <T> å“应数æ®
- * @return BaseResponse
- */
- public static <T> BaseResponse<T> okData(T t) {
- BaseResponse<T> baseResponse = new BaseResponse<>();
- baseResponse.setMsg("æ“作æˆåŠŸ!");
- baseResponse.setCode(BusinessExceptionEnum.SUCCESS.getCode());
- baseResponse.setData(t);
- return baseResponse;
- }
-
- /**
- * 200,带默认æ示信æ¯å’Œå“应数æ®
- *
- * @param t å“应数æ®
- * @param msg æ示信æ¯
- * @param <T> å“应数æ®ç±»åž‹
- * @return BaseResponse
- */
- public static <T> BaseResponse<T> okDataMsg(T t, String msg) {
- BaseResponse<T> baseResponse = new BaseResponse<>();
- baseResponse.setMsg(msg);
- baseResponse.setCode(BusinessExceptionEnum.SUCCESS.getCode());
- baseResponse.setData(t);
- return baseResponse;
- }
-
- /**
- * 400,带æ示信æ¯
- *
- * @param msg æ示信æ¯
- * @param <T> å“应数æ®ç±»åž‹
- * @return BaseResponse
- */
- public static <T> BaseResponse<T> errorMsg(String msg) {
- BaseResponse<T> baseResponse = new BaseResponse<>();
- baseResponse.setMsg(msg);
- baseResponse.setCode(BusinessExceptionEnum.BUSINESS_ERROR.getCode());
- baseResponse.setData(null);
- return baseResponse;
- }
-
- /**
- * 401,用户未登录
- *
- * @param msg æ示信æ¯
- * @param <T> å“应数æ®ç±»åž‹
- * @return BaseResponse
- */
- public static <T> BaseResponse<T> noLogin(String msg) {
- BaseResponse<T> baseResponse = new BaseResponse<>();
- baseResponse.setMsg(msg);
- baseResponse.setCode(BusinessExceptionEnum.NO_LOGIN.getCode());
- baseResponse.setData(null);
- return baseResponse;
- }
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITAnnouncementService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITAnnouncementService.java
deleted file mode 100644
index 5f82033..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITAnnouncementService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.service;
-
-import cn.wise.sc.acquisition.business.entity.TAnnouncement;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * æœåŠ¡ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface ITAnnouncementService extends IService<TAnnouncement> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentAccountService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentAccountService.java
deleted file mode 100644
index f4cf9f7..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentAccountService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.service;
-
-import cn.wise.sc.acquisition.business.entity.TEquipmentAccount;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * æœåŠ¡ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface ITEquipmentAccountService extends IService<TEquipmentAccount> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentCheckService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentCheckService.java
deleted file mode 100644
index bebfa45..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentCheckService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.service;
-
-import cn.wise.sc.acquisition.business.entity.TEquipmentCheck;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * æœåŠ¡ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface ITEquipmentCheckService extends IService<TEquipmentCheck> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentMaintenanceCycleService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentMaintenanceCycleService.java
deleted file mode 100644
index 439a5de..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentMaintenanceCycleService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.service;
-
-import cn.wise.sc.acquisition.business.entity.TEquipmentMaintenanceCycle;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * æœåŠ¡ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface ITEquipmentMaintenanceCycleService extends IService<TEquipmentMaintenanceCycle> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentMaintenanceService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentMaintenanceService.java
deleted file mode 100644
index 31148b4..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentMaintenanceService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.service;
-
-import cn.wise.sc.acquisition.business.entity.TEquipmentMaintenance;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * æœåŠ¡ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface ITEquipmentMaintenanceService extends IService<TEquipmentMaintenance> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentRepairService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentRepairService.java
deleted file mode 100644
index 4e541ef..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentRepairService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.service;
-
-import cn.wise.sc.acquisition.business.entity.TEquipmentRepair;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * æœåŠ¡ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface ITEquipmentRepairService extends IService<TEquipmentRepair> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentRunService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentRunService.java
deleted file mode 100644
index 9b530dc..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentRunService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.service;
-
-import cn.wise.sc.acquisition.business.entity.TEquipmentRun;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * æœåŠ¡ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface ITEquipmentRunService extends IService<TEquipmentRun> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentTroubleService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentTroubleService.java
deleted file mode 100644
index 50fae2d..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentTroubleService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.service;
-
-import cn.wise.sc.acquisition.business.entity.TEquipmentTrouble;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * æœåŠ¡ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface ITEquipmentTroubleService extends IService<TEquipmentTrouble> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentUsagefeeService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentUsagefeeService.java
deleted file mode 100644
index 412be50..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITEquipmentUsagefeeService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.service;
-
-import cn.wise.sc.acquisition.business.entity.TEquipmentUsagefee;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * æœåŠ¡ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface ITEquipmentUsagefeeService extends IService<TEquipmentUsagefee> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITMaterialEntryService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITMaterialEntryService.java
deleted file mode 100644
index 6fa9dd7..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITMaterialEntryService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.service;
-
-import cn.wise.sc.acquisition.business.entity.TMaterialEntry;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * æœåŠ¡ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface ITMaterialEntryService extends IService<TMaterialEntry> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITMaterialOutService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITMaterialOutService.java
deleted file mode 100644
index b88ddd0..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITMaterialOutService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.service;
-
-import cn.wise.sc.acquisition.business.entity.TMaterialOut;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * æœåŠ¡ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface ITMaterialOutService extends IService<TMaterialOut> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITMineBasicService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITMineBasicService.java
deleted file mode 100644
index 66010fa..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITMineBasicService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.service;
-
-import cn.wise.sc.acquisition.business.entity.TMineBasic;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * æœåŠ¡ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface ITMineBasicService extends IService<TMineBasic> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITMineRightService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITMineRightService.java
deleted file mode 100644
index 6920ea2..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITMineRightService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.service;
-
-import cn.wise.sc.acquisition.business.entity.TMineRight;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * æœåŠ¡ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface ITMineRightService extends IService<TMineRight> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITMineScopeService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITMineScopeService.java
deleted file mode 100644
index 313bca3..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITMineScopeService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.service;
-
-import cn.wise.sc.acquisition.business.entity.TMineScope;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * æœåŠ¡ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface ITMineScopeService extends IService<TMineScope> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITMineStopeService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITMineStopeService.java
deleted file mode 100644
index 84131c6..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITMineStopeService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.service;
-
-import cn.wise.sc.acquisition.business.entity.TMineStope;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * æœåŠ¡ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface ITMineStopeService extends IService<TMineStope> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITPlanMonthService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITPlanMonthService.java
deleted file mode 100644
index f18c762..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITPlanMonthService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.service;
-
-import cn.wise.sc.acquisition.business.entity.TPlanMonth;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * æœåŠ¡ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface ITPlanMonthService extends IService<TPlanMonth> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITPlanYearService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITPlanYearService.java
deleted file mode 100644
index b691972..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITPlanYearService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.service;
-
-import cn.wise.sc.acquisition.business.entity.TPlanYear;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * æœåŠ¡ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface ITPlanYearService extends IService<TPlanYear> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesAuxiliaryService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesAuxiliaryService.java
deleted file mode 100644
index 78f2546..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesAuxiliaryService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.service;
-
-import cn.wise.sc.acquisition.business.entity.TProcessesAuxiliary;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * æœåŠ¡ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface ITProcessesAuxiliaryService extends IService<TProcessesAuxiliary> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesBlastService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesBlastService.java
deleted file mode 100644
index ff35e48..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesBlastService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.service;
-
-import cn.wise.sc.acquisition.business.entity.TProcessesBlast;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * æœåŠ¡ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface ITProcessesBlastService extends IService<TProcessesBlast> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesBlastdesignHoleService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesBlastdesignHoleService.java
deleted file mode 100644
index ce17001..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesBlastdesignHoleService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.service;
-
-import cn.wise.sc.acquisition.business.entity.TProcessesBlastdesignHole;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * æœåŠ¡ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface ITProcessesBlastdesignHoleService extends IService<TProcessesBlastdesignHole> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesBlastdesignVolumeService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesBlastdesignVolumeService.java
deleted file mode 100644
index 7a9d7e2..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesBlastdesignVolumeService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.service;
-
-import cn.wise.sc.acquisition.business.entity.TProcessesBlastdesignVolume;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * æœåŠ¡ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface ITProcessesBlastdesignVolumeService extends IService<TProcessesBlastdesignVolume> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesCrusherService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesCrusherService.java
deleted file mode 100644
index 908a8c2..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesCrusherService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.service;
-
-import cn.wise.sc.acquisition.business.entity.TProcessesCrusher;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * æœåŠ¡ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface ITProcessesCrusherService extends IService<TProcessesCrusher> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesDiggingService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesDiggingService.java
deleted file mode 100644
index 88e12de..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesDiggingService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.service;
-
-import cn.wise.sc.acquisition.business.entity.TProcessesDigging;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * æœåŠ¡ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface ITProcessesDiggingService extends IService<TProcessesDigging> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesDrillingService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesDrillingService.java
deleted file mode 100644
index 9a983ce..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesDrillingService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.service;
-
-import cn.wise.sc.acquisition.business.entity.TProcessesDrilling;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * æœåŠ¡ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface ITProcessesDrillingService extends IService<TProcessesDrilling> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesTruckService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesTruckService.java
deleted file mode 100644
index 9bc3cb6..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITProcessesTruckService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.service;
-
-import cn.wise.sc.acquisition.business.entity.TProcessesTruck;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * æœåŠ¡ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface ITProcessesTruckService extends IService<TProcessesTruck> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSafeTroubleImgService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSafeTroubleImgService.java
deleted file mode 100644
index 452d0a5..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSafeTroubleImgService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.service;
-
-import cn.wise.sc.acquisition.business.entity.TSafeTroubleImg;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * æœåŠ¡ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface ITSafeTroubleImgService extends IService<TSafeTroubleImg> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSafeTroubleService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSafeTroubleService.java
deleted file mode 100644
index 67a17d5..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSafeTroubleService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.service;
-
-import cn.wise.sc.acquisition.business.entity.TSafeTrouble;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * æœåŠ¡ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface ITSafeTroubleService extends IService<TSafeTrouble> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSampleLaboratorysheetService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSampleLaboratorysheetService.java
deleted file mode 100644
index 9809d8a..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSampleLaboratorysheetService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.service;
-
-import cn.wise.sc.acquisition.business.entity.TSampleLaboratorysheet;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * æœåŠ¡ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface ITSampleLaboratorysheetService extends IService<TSampleLaboratorysheet> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSampleListService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSampleListService.java
deleted file mode 100644
index 60a0295..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSampleListService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.service;
-
-import cn.wise.sc.acquisition.business.entity.TSampleList;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * æœåŠ¡ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface ITSampleListService extends IService<TSampleList> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSysDeptService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSysDeptService.java
index 4617abe..73c1d92 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSysDeptService.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSysDeptService.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* </p>
*
* @author ztw
- * @since 2021-04-22
+ * @since 2021-04-23
*/
public interface ITSysDeptService extends IService<TSysDept> {
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSysDictService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSysDictService.java
index 96e0346..6816c6f 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSysDictService.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSysDictService.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* </p>
*
* @author ztw
- * @since 2021-04-22
+ * @since 2021-04-23
*/
public interface ITSysDictService extends IService<TSysDict> {
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSysPowerService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSysPowerService.java
index d7b02ce..1a55c7f 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSysPowerService.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSysPowerService.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* </p>
*
* @author ztw
- * @since 2021-04-22
+ * @since 2021-04-23
*/
public interface ITSysPowerService extends IService<TSysPower> {
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSysRoleService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSysRoleService.java
index cb947ff..e01673f 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSysRoleService.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSysRoleService.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* </p>
*
* @author ztw
- * @since 2021-04-22
+ * @since 2021-04-23
*/
public interface ITSysRoleService extends IService<TSysRole> {
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSysRolepowerService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSysRolepowerService.java
index c2a691d..8f36949 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSysRolepowerService.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSysRolepowerService.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* </p>
*
* @author ztw
- * @since 2021-04-22
+ * @since 2021-04-23
*/
public interface ITSysRolepowerService extends IService<TSysRolepower> {
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSysUserLoginService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSysUserLoginService.java
index 3cff9cc..b2e5bb4 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSysUserLoginService.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSysUserLoginService.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
* </p>
*
* @author ztw
- * @since 2021-04-22
+ * @since 2021-04-23
*/
public interface ITSysUserLoginService extends IService<TSysUserLogin> {
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSysUserService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSysUserService.java
index ddca5c1..a4008c7 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSysUserService.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITSysUserService.java
@@ -1,5 +1,6 @@
package cn.wise.sc.acquisition.business.service;
+import cn.wise.im.common.http.R;
import cn.wise.sc.acquisition.business.entity.TSysUser;
import cn.wise.sc.acquisition.business.model.LoginUser;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -10,10 +11,10 @@ import com.baomidou.mybatisplus.extension.service.IService;
* </p>
*
* @author ztw
- * @since 2021-04-22
+ * @since 2021-04-23
*/
public interface ITSysUserService extends IService<TSysUser> {
- LoginUser getLoginUser();
+ R getLoginUser();
}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITWagesService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITWagesService.java
deleted file mode 100644
index 8642a54..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITWagesService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.service;
-
-import cn.wise.sc.acquisition.business.entity.TWages;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * æœåŠ¡ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface ITWagesService extends IService<TWages> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITWeightService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITWeightService.java
deleted file mode 100644
index e7ad460..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/ITWeightService.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package cn.wise.sc.acquisition.business.service;
-
-import cn.wise.sc.acquisition.business.entity.TWeight;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * æœåŠ¡ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-public interface ITWeightService extends IService<TWeight> {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/LoginService.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/LoginService.java
index 85d778c..5c59225 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/LoginService.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/LoginService.java
@@ -1,9 +1,8 @@
package cn.wise.sc.acquisition.business.service.impl;
-import cn.hutool.core.util.StrUtil;
+import cn.wise.im.common.http.R;
+import cn.wise.sc.acquisition.business.constant.Rcode;
import cn.wise.sc.acquisition.business.entity.TSysUser;
-import cn.wise.sc.acquisition.business.model.BaseResponse;
-import cn.wise.sc.acquisition.business.model.LoginUser;
import cn.wise.sc.acquisition.business.service.ITSysUserService;
import cn.wise.sc.acquisition.business.util.JwtUtil;
import cn.wise.sc.acquisition.business.util.MD5Util;
@@ -12,8 +11,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-
@Service
public class LoginService {
@@ -29,57 +26,29 @@ public class LoginService {
* @param Password
* @return
*/
- public BaseResponse<String> login(String LoginID, String Password) {
- if (StrUtil.isEmpty(LoginID)) {
- return BaseResponse.errorMsg("用户å为必填项!");
- }
- if (StrUtil.isEmpty(Password)) {
- return BaseResponse.errorMsg("密ç 为必填项!");
+ public R login(String LoginID, String Password) {
+ Rcode.NOT_PARAM.assertNotNull(LoginID);
+ Rcode.NOT_PARAM.assertNotNull(Password);
+ QueryWrapper<TSysUser> wrapper = new QueryWrapper<>();
+ wrapper.eq("LoginID", LoginID);
+ TSysUser sysUser = userService.getOne(wrapper);
+ Rcode.NOT_FOUND.assertNotNull(sysUser);
+ if (!sysUser.getPassword().equals(Password)) {
+ return R.fail(401,"密ç 错误");
}
- System.out.println("=========LoginID==========Password=========");
- System.out.println(LoginID + "\n" + Password);
- try {
- QueryWrapper<TSysUser> wrapper = new QueryWrapper<>();
- wrapper.eq("LoginID", LoginID);
- TSysUser sysUser = userService.getOne(wrapper);
- if (sysUser == null) {
- return BaseResponse.errorMsg("éžç³»ç»Ÿç”¨æˆ·ä¸å…许登录!");
- }
-// String loginPassWd = MD5Util.MD5Encode(Password,"UTF-8");
- if (!sysUser.getPassword().equals(Password)) {
- return BaseResponse.errorMsg("密ç 错误");
- }
+ //生æˆtoken,å˜å…¥redis
+ String token = JwtUtil.createToken(sysUser.getId(),
+ sysUser.getName(),sysUser.getLoginID());
+ System.out.println(token);
+ redisUtil.setString(sysUser.getId().toString(), token, 3600);
+ return R.ok(token);
- //生æˆtoken,å˜å…¥redis
- String token = JwtUtil.createToken(sysUser.getId(),
- sysUser.getName(),sysUser.getLoginID());
- System.out.println(token);
- redisUtil.setString(sysUser.getId().toString(), token, 3600);
- return BaseResponse.okData(token);
- } catch (Exception e) {
- return BaseResponse.errorMsg(e.getMessage());
- }
}
-
- public static void main(String args[]){
+ //测试密ç -MD5
+ private static void main(String args[]){
String loginPassWd = MD5Util.MD5Encode("123456","UTF-8");
System.out.println(loginPassWd);
}
-
-
- /**
- * 当å‰ç™»å½•ç”¨æˆ·
- * @return
- */
- public BaseResponse<LoginUser> getLoginUser() {
- LoginUser loginUser = userService.getLoginUser();
- return BaseResponse.okData(loginUser);
- }
-
-
-
-
-
}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TAnnouncementServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TAnnouncementServiceImpl.java
deleted file mode 100644
index eec003d..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TAnnouncementServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.service.impl;
-
-import cn.wise.sc.acquisition.business.entity.TAnnouncement;
-import cn.wise.sc.acquisition.business.mapper.TAnnouncementMapper;
-import cn.wise.sc.acquisition.business.service.ITAnnouncementService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * æœåŠ¡å®žçŽ°ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Service
-public class TAnnouncementServiceImpl extends ServiceImpl<TAnnouncementMapper, TAnnouncement> implements ITAnnouncementService {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentAccountServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentAccountServiceImpl.java
deleted file mode 100644
index 0627f2b..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentAccountServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.service.impl;
-
-import cn.wise.sc.acquisition.business.entity.TEquipmentAccount;
-import cn.wise.sc.acquisition.business.mapper.TEquipmentAccountMapper;
-import cn.wise.sc.acquisition.business.service.ITEquipmentAccountService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * æœåŠ¡å®žçŽ°ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Service
-public class TEquipmentAccountServiceImpl extends ServiceImpl<TEquipmentAccountMapper, TEquipmentAccount> implements ITEquipmentAccountService {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentCheckServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentCheckServiceImpl.java
deleted file mode 100644
index 24c8038..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentCheckServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.service.impl;
-
-import cn.wise.sc.acquisition.business.entity.TEquipmentCheck;
-import cn.wise.sc.acquisition.business.mapper.TEquipmentCheckMapper;
-import cn.wise.sc.acquisition.business.service.ITEquipmentCheckService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * æœåŠ¡å®žçŽ°ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Service
-public class TEquipmentCheckServiceImpl extends ServiceImpl<TEquipmentCheckMapper, TEquipmentCheck> implements ITEquipmentCheckService {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentMaintenanceCycleServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentMaintenanceCycleServiceImpl.java
deleted file mode 100644
index db7503f..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentMaintenanceCycleServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.service.impl;
-
-import cn.wise.sc.acquisition.business.entity.TEquipmentMaintenanceCycle;
-import cn.wise.sc.acquisition.business.mapper.TEquipmentMaintenanceCycleMapper;
-import cn.wise.sc.acquisition.business.service.ITEquipmentMaintenanceCycleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * æœåŠ¡å®žçŽ°ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Service
-public class TEquipmentMaintenanceCycleServiceImpl extends ServiceImpl<TEquipmentMaintenanceCycleMapper, TEquipmentMaintenanceCycle> implements ITEquipmentMaintenanceCycleService {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentMaintenanceServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentMaintenanceServiceImpl.java
deleted file mode 100644
index 387d0ce..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentMaintenanceServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.service.impl;
-
-import cn.wise.sc.acquisition.business.entity.TEquipmentMaintenance;
-import cn.wise.sc.acquisition.business.mapper.TEquipmentMaintenanceMapper;
-import cn.wise.sc.acquisition.business.service.ITEquipmentMaintenanceService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * æœåŠ¡å®žçŽ°ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Service
-public class TEquipmentMaintenanceServiceImpl extends ServiceImpl<TEquipmentMaintenanceMapper, TEquipmentMaintenance> implements ITEquipmentMaintenanceService {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentRepairServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentRepairServiceImpl.java
deleted file mode 100644
index 295b1b1..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentRepairServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.service.impl;
-
-import cn.wise.sc.acquisition.business.entity.TEquipmentRepair;
-import cn.wise.sc.acquisition.business.mapper.TEquipmentRepairMapper;
-import cn.wise.sc.acquisition.business.service.ITEquipmentRepairService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * æœåŠ¡å®žçŽ°ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Service
-public class TEquipmentRepairServiceImpl extends ServiceImpl<TEquipmentRepairMapper, TEquipmentRepair> implements ITEquipmentRepairService {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentRunServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentRunServiceImpl.java
deleted file mode 100644
index 79c1d59..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentRunServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.service.impl;
-
-import cn.wise.sc.acquisition.business.entity.TEquipmentRun;
-import cn.wise.sc.acquisition.business.mapper.TEquipmentRunMapper;
-import cn.wise.sc.acquisition.business.service.ITEquipmentRunService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * æœåŠ¡å®žçŽ°ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Service
-public class TEquipmentRunServiceImpl extends ServiceImpl<TEquipmentRunMapper, TEquipmentRun> implements ITEquipmentRunService {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentTroubleServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentTroubleServiceImpl.java
deleted file mode 100644
index 0fb51c6..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentTroubleServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.service.impl;
-
-import cn.wise.sc.acquisition.business.entity.TEquipmentTrouble;
-import cn.wise.sc.acquisition.business.mapper.TEquipmentTroubleMapper;
-import cn.wise.sc.acquisition.business.service.ITEquipmentTroubleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * æœåŠ¡å®žçŽ°ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Service
-public class TEquipmentTroubleServiceImpl extends ServiceImpl<TEquipmentTroubleMapper, TEquipmentTrouble> implements ITEquipmentTroubleService {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentUsagefeeServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentUsagefeeServiceImpl.java
deleted file mode 100644
index ecef80d..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TEquipmentUsagefeeServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.service.impl;
-
-import cn.wise.sc.acquisition.business.entity.TEquipmentUsagefee;
-import cn.wise.sc.acquisition.business.mapper.TEquipmentUsagefeeMapper;
-import cn.wise.sc.acquisition.business.service.ITEquipmentUsagefeeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * æœåŠ¡å®žçŽ°ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Service
-public class TEquipmentUsagefeeServiceImpl extends ServiceImpl<TEquipmentUsagefeeMapper, TEquipmentUsagefee> implements ITEquipmentUsagefeeService {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMaterialEntryServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMaterialEntryServiceImpl.java
deleted file mode 100644
index 2d93a4f..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMaterialEntryServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.service.impl;
-
-import cn.wise.sc.acquisition.business.entity.TMaterialEntry;
-import cn.wise.sc.acquisition.business.mapper.TMaterialEntryMapper;
-import cn.wise.sc.acquisition.business.service.ITMaterialEntryService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * æœåŠ¡å®žçŽ°ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Service
-public class TMaterialEntryServiceImpl extends ServiceImpl<TMaterialEntryMapper, TMaterialEntry> implements ITMaterialEntryService {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMaterialOutServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMaterialOutServiceImpl.java
deleted file mode 100644
index 7a0bb44..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMaterialOutServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.service.impl;
-
-import cn.wise.sc.acquisition.business.entity.TMaterialOut;
-import cn.wise.sc.acquisition.business.mapper.TMaterialOutMapper;
-import cn.wise.sc.acquisition.business.service.ITMaterialOutService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * æœåŠ¡å®žçŽ°ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Service
-public class TMaterialOutServiceImpl extends ServiceImpl<TMaterialOutMapper, TMaterialOut> implements ITMaterialOutService {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMineBasicServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMineBasicServiceImpl.java
deleted file mode 100644
index 3fbdd64..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMineBasicServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.service.impl;
-
-import cn.wise.sc.acquisition.business.entity.TMineBasic;
-import cn.wise.sc.acquisition.business.mapper.TMineBasicMapper;
-import cn.wise.sc.acquisition.business.service.ITMineBasicService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * æœåŠ¡å®žçŽ°ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Service
-public class TMineBasicServiceImpl extends ServiceImpl<TMineBasicMapper, TMineBasic> implements ITMineBasicService {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMineRightServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMineRightServiceImpl.java
deleted file mode 100644
index 9b4ca7e..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMineRightServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.service.impl;
-
-import cn.wise.sc.acquisition.business.entity.TMineRight;
-import cn.wise.sc.acquisition.business.mapper.TMineRightMapper;
-import cn.wise.sc.acquisition.business.service.ITMineRightService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * æœåŠ¡å®žçŽ°ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Service
-public class TMineRightServiceImpl extends ServiceImpl<TMineRightMapper, TMineRight> implements ITMineRightService {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMineScopeServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMineScopeServiceImpl.java
deleted file mode 100644
index 3080b36..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMineScopeServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.service.impl;
-
-import cn.wise.sc.acquisition.business.entity.TMineScope;
-import cn.wise.sc.acquisition.business.mapper.TMineScopeMapper;
-import cn.wise.sc.acquisition.business.service.ITMineScopeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * æœåŠ¡å®žçŽ°ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Service
-public class TMineScopeServiceImpl extends ServiceImpl<TMineScopeMapper, TMineScope> implements ITMineScopeService {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMineStopeServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMineStopeServiceImpl.java
deleted file mode 100644
index bdc2322..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TMineStopeServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.service.impl;
-
-import cn.wise.sc.acquisition.business.entity.TMineStope;
-import cn.wise.sc.acquisition.business.mapper.TMineStopeMapper;
-import cn.wise.sc.acquisition.business.service.ITMineStopeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * æœåŠ¡å®žçŽ°ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Service
-public class TMineStopeServiceImpl extends ServiceImpl<TMineStopeMapper, TMineStope> implements ITMineStopeService {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TPlanMonthServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TPlanMonthServiceImpl.java
deleted file mode 100644
index c0e0da6..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TPlanMonthServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.service.impl;
-
-import cn.wise.sc.acquisition.business.entity.TPlanMonth;
-import cn.wise.sc.acquisition.business.mapper.TPlanMonthMapper;
-import cn.wise.sc.acquisition.business.service.ITPlanMonthService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * æœåŠ¡å®žçŽ°ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Service
-public class TPlanMonthServiceImpl extends ServiceImpl<TPlanMonthMapper, TPlanMonth> implements ITPlanMonthService {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TPlanYearServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TPlanYearServiceImpl.java
deleted file mode 100644
index 9b7d56b..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TPlanYearServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.service.impl;
-
-import cn.wise.sc.acquisition.business.entity.TPlanYear;
-import cn.wise.sc.acquisition.business.mapper.TPlanYearMapper;
-import cn.wise.sc.acquisition.business.service.ITPlanYearService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * æœåŠ¡å®žçŽ°ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Service
-public class TPlanYearServiceImpl extends ServiceImpl<TPlanYearMapper, TPlanYear> implements ITPlanYearService {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesAuxiliaryServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesAuxiliaryServiceImpl.java
deleted file mode 100644
index e7a6a53..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesAuxiliaryServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.service.impl;
-
-import cn.wise.sc.acquisition.business.entity.TProcessesAuxiliary;
-import cn.wise.sc.acquisition.business.mapper.TProcessesAuxiliaryMapper;
-import cn.wise.sc.acquisition.business.service.ITProcessesAuxiliaryService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * æœåŠ¡å®žçŽ°ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Service
-public class TProcessesAuxiliaryServiceImpl extends ServiceImpl<TProcessesAuxiliaryMapper, TProcessesAuxiliary> implements ITProcessesAuxiliaryService {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastServiceImpl.java
deleted file mode 100644
index b9bcade..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.service.impl;
-
-import cn.wise.sc.acquisition.business.entity.TProcessesBlast;
-import cn.wise.sc.acquisition.business.mapper.TProcessesBlastMapper;
-import cn.wise.sc.acquisition.business.service.ITProcessesBlastService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * æœåŠ¡å®žçŽ°ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Service
-public class TProcessesBlastServiceImpl extends ServiceImpl<TProcessesBlastMapper, TProcessesBlast> implements ITProcessesBlastService {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastdesignHoleServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastdesignHoleServiceImpl.java
deleted file mode 100644
index aa63f31..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastdesignHoleServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.service.impl;
-
-import cn.wise.sc.acquisition.business.entity.TProcessesBlastdesignHole;
-import cn.wise.sc.acquisition.business.mapper.TProcessesBlastdesignHoleMapper;
-import cn.wise.sc.acquisition.business.service.ITProcessesBlastdesignHoleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * æœåŠ¡å®žçŽ°ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Service
-public class TProcessesBlastdesignHoleServiceImpl extends ServiceImpl<TProcessesBlastdesignHoleMapper, TProcessesBlastdesignHole> implements ITProcessesBlastdesignHoleService {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastdesignVolumeServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastdesignVolumeServiceImpl.java
deleted file mode 100644
index 69e28ba..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesBlastdesignVolumeServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.service.impl;
-
-import cn.wise.sc.acquisition.business.entity.TProcessesBlastdesignVolume;
-import cn.wise.sc.acquisition.business.mapper.TProcessesBlastdesignVolumeMapper;
-import cn.wise.sc.acquisition.business.service.ITProcessesBlastdesignVolumeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * æœåŠ¡å®žçŽ°ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Service
-public class TProcessesBlastdesignVolumeServiceImpl extends ServiceImpl<TProcessesBlastdesignVolumeMapper, TProcessesBlastdesignVolume> implements ITProcessesBlastdesignVolumeService {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesCrusherServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesCrusherServiceImpl.java
deleted file mode 100644
index e0b47f9..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesCrusherServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.service.impl;
-
-import cn.wise.sc.acquisition.business.entity.TProcessesCrusher;
-import cn.wise.sc.acquisition.business.mapper.TProcessesCrusherMapper;
-import cn.wise.sc.acquisition.business.service.ITProcessesCrusherService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * æœåŠ¡å®žçŽ°ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Service
-public class TProcessesCrusherServiceImpl extends ServiceImpl<TProcessesCrusherMapper, TProcessesCrusher> implements ITProcessesCrusherService {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesDiggingServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesDiggingServiceImpl.java
deleted file mode 100644
index ebc69ed..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesDiggingServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.service.impl;
-
-import cn.wise.sc.acquisition.business.entity.TProcessesDigging;
-import cn.wise.sc.acquisition.business.mapper.TProcessesDiggingMapper;
-import cn.wise.sc.acquisition.business.service.ITProcessesDiggingService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * æœåŠ¡å®žçŽ°ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Service
-public class TProcessesDiggingServiceImpl extends ServiceImpl<TProcessesDiggingMapper, TProcessesDigging> implements ITProcessesDiggingService {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesDrillingServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesDrillingServiceImpl.java
deleted file mode 100644
index 15e0d49..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesDrillingServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.service.impl;
-
-import cn.wise.sc.acquisition.business.entity.TProcessesDrilling;
-import cn.wise.sc.acquisition.business.mapper.TProcessesDrillingMapper;
-import cn.wise.sc.acquisition.business.service.ITProcessesDrillingService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * æœåŠ¡å®žçŽ°ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Service
-public class TProcessesDrillingServiceImpl extends ServiceImpl<TProcessesDrillingMapper, TProcessesDrilling> implements ITProcessesDrillingService {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesTruckServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesTruckServiceImpl.java
deleted file mode 100644
index f43e5db..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TProcessesTruckServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.service.impl;
-
-import cn.wise.sc.acquisition.business.entity.TProcessesTruck;
-import cn.wise.sc.acquisition.business.mapper.TProcessesTruckMapper;
-import cn.wise.sc.acquisition.business.service.ITProcessesTruckService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * æœåŠ¡å®žçŽ°ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Service
-public class TProcessesTruckServiceImpl extends ServiceImpl<TProcessesTruckMapper, TProcessesTruck> implements ITProcessesTruckService {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSafeTroubleImgServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSafeTroubleImgServiceImpl.java
deleted file mode 100644
index 4c4d924..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSafeTroubleImgServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.service.impl;
-
-import cn.wise.sc.acquisition.business.entity.TSafeTroubleImg;
-import cn.wise.sc.acquisition.business.mapper.TSafeTroubleImgMapper;
-import cn.wise.sc.acquisition.business.service.ITSafeTroubleImgService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * æœåŠ¡å®žçŽ°ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Service
-public class TSafeTroubleImgServiceImpl extends ServiceImpl<TSafeTroubleImgMapper, TSafeTroubleImg> implements ITSafeTroubleImgService {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSafeTroubleServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSafeTroubleServiceImpl.java
deleted file mode 100644
index faa6d1f..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSafeTroubleServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.service.impl;
-
-import cn.wise.sc.acquisition.business.entity.TSafeTrouble;
-import cn.wise.sc.acquisition.business.mapper.TSafeTroubleMapper;
-import cn.wise.sc.acquisition.business.service.ITSafeTroubleService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * æœåŠ¡å®žçŽ°ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Service
-public class TSafeTroubleServiceImpl extends ServiceImpl<TSafeTroubleMapper, TSafeTrouble> implements ITSafeTroubleService {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSampleLaboratorysheetServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSampleLaboratorysheetServiceImpl.java
deleted file mode 100644
index 83a5450..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSampleLaboratorysheetServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.service.impl;
-
-import cn.wise.sc.acquisition.business.entity.TSampleLaboratorysheet;
-import cn.wise.sc.acquisition.business.mapper.TSampleLaboratorysheetMapper;
-import cn.wise.sc.acquisition.business.service.ITSampleLaboratorysheetService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * æœåŠ¡å®žçŽ°ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Service
-public class TSampleLaboratorysheetServiceImpl extends ServiceImpl<TSampleLaboratorysheetMapper, TSampleLaboratorysheet> implements ITSampleLaboratorysheetService {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSampleListServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSampleListServiceImpl.java
deleted file mode 100644
index 42d11e3..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSampleListServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.service.impl;
-
-import cn.wise.sc.acquisition.business.entity.TSampleList;
-import cn.wise.sc.acquisition.business.mapper.TSampleListMapper;
-import cn.wise.sc.acquisition.business.service.ITSampleListService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * æœåŠ¡å®žçŽ°ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Service
-public class TSampleListServiceImpl extends ServiceImpl<TSampleListMapper, TSampleList> implements ITSampleListService {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysDeptServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysDeptServiceImpl.java
index 19b2bc3..51382a7 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysDeptServiceImpl.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysDeptServiceImpl.java
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
* </p>
*
* @author ztw
- * @since 2021-04-22
+ * @since 2021-04-23
*/
@Service
public class TSysDeptServiceImpl extends ServiceImpl<TSysDeptMapper, TSysDept> implements ITSysDeptService {
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysDictServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysDictServiceImpl.java
index 025bbc1..2b58408 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysDictServiceImpl.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysDictServiceImpl.java
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
* </p>
*
* @author ztw
- * @since 2021-04-22
+ * @since 2021-04-23
*/
@Service
public class TSysDictServiceImpl extends ServiceImpl<TSysDictMapper, TSysDict> implements ITSysDictService {
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysPowerServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysPowerServiceImpl.java
index aeaebd2..45635c9 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysPowerServiceImpl.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysPowerServiceImpl.java
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
* </p>
*
* @author ztw
- * @since 2021-04-22
+ * @since 2021-04-23
*/
@Service
public class TSysPowerServiceImpl extends ServiceImpl<TSysPowerMapper, TSysPower> implements ITSysPowerService {
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysRoleServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysRoleServiceImpl.java
index 1254bd1..1c6ea28 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysRoleServiceImpl.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysRoleServiceImpl.java
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
* </p>
*
* @author ztw
- * @since 2021-04-22
+ * @since 2021-04-23
*/
@Service
public class TSysRoleServiceImpl extends ServiceImpl<TSysRoleMapper, TSysRole> implements ITSysRoleService {
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysRolepowerServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysRolepowerServiceImpl.java
index 248b09c..0f07eb2 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysRolepowerServiceImpl.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysRolepowerServiceImpl.java
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
* </p>
*
* @author ztw
- * @since 2021-04-22
+ * @since 2021-04-23
*/
@Service
public class TSysRolepowerServiceImpl extends ServiceImpl<TSysRolepowerMapper, TSysRolepower> implements ITSysRolepowerService {
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysUserLoginServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysUserLoginServiceImpl.java
index 2411e63..468b603 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysUserLoginServiceImpl.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysUserLoginServiceImpl.java
@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
* </p>
*
* @author ztw
- * @since 2021-04-22
+ * @since 2021-04-23
*/
@Service
public class TSysUserLoginServiceImpl extends ServiceImpl<TSysUserLoginMapper, TSysUserLogin> implements ITSysUserLoginService {
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysUserServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysUserServiceImpl.java
index 234b6f0..370376b 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysUserServiceImpl.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TSysUserServiceImpl.java
@@ -1,7 +1,8 @@
package cn.wise.sc.acquisition.business.service.impl;
+import cn.wise.im.common.http.R;
+import cn.wise.sc.acquisition.business.constant.Rcode;
import cn.wise.sc.acquisition.business.entity.TSysUser;
-import cn.wise.sc.acquisition.business.exception.BusinessExceptionEnum;
import cn.wise.sc.acquisition.business.mapper.TSysUserMapper;
import cn.wise.sc.acquisition.business.model.LoginUser;
import cn.wise.sc.acquisition.business.service.ITSysUserService;
@@ -33,11 +34,6 @@ public class TSysUserServiceImpl extends ServiceImpl<TSysUserMapper, TSysUser> i
private HttpServletRequest request;
@Autowired
RedisUtil redisUtil;
- /*@Resource
- private SysPermissionMapper permissionMapper;
- @Resource
- private SysRoleMapper roleMapper;*/
-
/**
* 当å‰ç™»å½•ç”¨æˆ·
@@ -45,21 +41,23 @@ public class TSysUserServiceImpl extends ServiceImpl<TSysUserMapper, TSysUser> i
* @return
*/
@Override
- public LoginUser getLoginUser() {
+ public R getLoginUser() {
+ String token = request.getHeader("Authorization");
+ System.out.println("==================当å‰ç™»å½•ç”¨æˆ·çš„Authorization===================");
+ System.out.println(token);
+ Map map = null;
try {
- String token = request.getHeader("Authorization");
- System.out.println("==================当å‰ç™»å½•ç”¨æˆ·çš„Authorization===================");
- System.out.println(token);
- Map map = JwtUtil.parserToken(token);
- Object obj = redisUtil.getString(map.get("id").toString());
- BusinessExceptionEnum.CACHE_NOT_FOUND.assertNotNull(obj);
- TSysUser sysUser = userMapper.selectById(Integer.valueOf(map.get("id").toString()));
- LoginUser loginUser = new LoginUser();
- BeanUtils.copyProperties(sysUser, loginUser);
- return loginUser;
+ map = JwtUtil.parserToken(token);
} catch (Exception e) {
- return null;
+ e.printStackTrace();
}
+ Object obj = redisUtil.getString(map.get("id").toString());
+ Rcode.NOT_REDIS.assertNotNull(obj);
+ TSysUser sysUser = userMapper.selectById(Integer.valueOf(map.get("id").toString()));
+ LoginUser loginUser = new LoginUser();
+ BeanUtils.copyProperties(sysUser, loginUser);
+ return R.ok(loginUser);
+
}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TWagesServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TWagesServiceImpl.java
deleted file mode 100644
index 65e558b..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TWagesServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.service.impl;
-
-import cn.wise.sc.acquisition.business.entity.TWages;
-import cn.wise.sc.acquisition.business.mapper.TWagesMapper;
-import cn.wise.sc.acquisition.business.service.ITWagesService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * æœåŠ¡å®žçŽ°ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Service
-public class TWagesServiceImpl extends ServiceImpl<TWagesMapper, TWages> implements ITWagesService {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TWeightServiceImpl.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TWeightServiceImpl.java
deleted file mode 100644
index 6cd1091..0000000
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/service/impl/TWeightServiceImpl.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package cn.wise.sc.acquisition.business.service.impl;
-
-import cn.wise.sc.acquisition.business.entity.TWeight;
-import cn.wise.sc.acquisition.business.mapper.TWeightMapper;
-import cn.wise.sc.acquisition.business.service.ITWeightService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * æœåŠ¡å®žçŽ°ç±»
- * </p>
- *
- * @author ztw
- * @since 2021-04-22
- */
-@Service
-public class TWeightServiceImpl extends ServiceImpl<TWeightMapper, TWeight> implements ITWeightService {
-
-}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/util/RedisUtil.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/util/RedisUtil.java
index 176d864..602118b 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/util/RedisUtil.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/util/RedisUtil.java
@@ -1,7 +1,7 @@
package cn.wise.sc.acquisition.business.util;
-import cn.wise.sc.acquisition.business.exception.RedisHandleException;
-import cn.wise.sc.acquisition.business.exception.RedisHandleException;
+import cn.wise.im.common.exception.RedisHandleException;
+import cn.wise.sc.acquisition.business.constant.Rcode;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.connection.DataType;
import org.springframework.data.redis.core.RedisTemplate;
@@ -32,6 +32,7 @@ public class RedisUtil {
if (time > 0) {
redisTemplate.expire(key, time, TimeUnit.SECONDS);
} else {
+ Rcode.NOT_REDIS.assertIsTrue(time>0);
throw new RedisHandleException("设置的时间ä¸èƒ½ä¸º0或者å°äºŽ0ï¼ï¼");
}
}
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/util/dfs/StorePath.java b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/util/dfs/StorePath.java
index 93fc8e7..2e2a154 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/util/dfs/StorePath.java
+++ b/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/util/dfs/StorePath.java
@@ -1,7 +1,6 @@
package cn.wise.sc.acquisition.business.util.dfs;
-import cn.wise.sc.acquisition.business.exception.FdfsUnsupportStorePathException;
-import cn.wise.sc.acquisition.business.exception.FdfsUnsupportStorePathException;
+import cn.wise.im.common.exception.FdfsUnsupportStorePathException;
import org.apache.commons.lang3.Validate;
/**
diff --git a/acquisition-business/src/main/resources/application-dev.yml b/acquisition-business/src/main/resources/application-dev.yml
index e6b6e1c..58c1376 100644
--- a/acquisition-business/src/main/resources/application-dev.yml
+++ b/acquisition-business/src/main/resources/application-dev.yml
@@ -7,7 +7,7 @@ spring:
profiles:
active: dev
datasource:
- # 192.168.110.85 fpsn
+ # 192.168.110.85 fpsn CementMine
url: jdbc:sqlserver://192.168.110.85:1433;DatabaseName=fpsn
username: sa
password: admin!@#123
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/FdfsException.java b/im-common/src/main/java/cn/wise/im/common/exception/FdfsException.java
similarity index 89%
rename from acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/FdfsException.java
rename to im-common/src/main/java/cn/wise/im/common/exception/FdfsException.java
index f7e6a10..af5b672 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/FdfsException.java
+++ b/im-common/src/main/java/cn/wise/im/common/exception/FdfsException.java
@@ -1,4 +1,4 @@
-package cn.wise.sc.acquisition.business.exception;
+package cn.wise.im.common.exception;
/**
* å°è£…fastdfs的异常，使用è¿è¡Œæ—¶å¼‚常
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/FdfsUnsupportStorePathException.java b/im-common/src/main/java/cn/wise/im/common/exception/FdfsUnsupportStorePathException.java
similarity index 86%
rename from acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/FdfsUnsupportStorePathException.java
rename to im-common/src/main/java/cn/wise/im/common/exception/FdfsUnsupportStorePathException.java
index 5e9c277..a79077a 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/FdfsUnsupportStorePathException.java
+++ b/im-common/src/main/java/cn/wise/im/common/exception/FdfsUnsupportStorePathException.java
@@ -1,4 +1,4 @@
-package cn.wise.sc.acquisition.business.exception;
+package cn.wise.im.common.exception;
/**
* 从Url解æžStorePath文件路径对象错误
diff --git a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/RedisHandleException.java b/im-common/src/main/java/cn/wise/im/common/exception/RedisHandleException.java
similarity index 86%
rename from acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/RedisHandleException.java
rename to im-common/src/main/java/cn/wise/im/common/exception/RedisHandleException.java
index d3a24e8..f4a4f4b 100644
--- a/acquisition-business/src/main/java/cn/wise/sc/acquisition/business/exception/RedisHandleException.java
+++ b/im-common/src/main/java/cn/wise/im/common/exception/RedisHandleException.java
@@ -1,4 +1,4 @@
-package cn.wise.sc.acquisition.business.exception;
+package cn.wise.im.common.exception;
/**
* redis æ“作异常
diff --git a/pom.xml b/pom.xml
index 2feeb94..9994714 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,6 +12,7 @@
<module>acquisition-common</module>
<module>acquisition-business</module>
<module>mybatis-generator</module>
+ <module>im-common</module>
</modules>
<parent>
@@ -20,6 +21,19 @@
<version>2.0.6.RELEASE</version>
</parent>
+ <dependencies>
+ <dependency>
+
+ <groupId>org.projectlombok</groupId>
+
+ <artifactId>lombok</artifactId>
+
+ <optional>true</optional>
+
+ </dependency>
+ </dependencies>
+
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -34,11 +48,11 @@
<version>2.0.6.RELEASE</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.artofsolving/jodconverter -->
- <!-- <dependency>
- <groupId>com.artofsolving</groupId>
- <artifactId>jodconverter</artifactId>
- <version>2.2.1</version>
- </dependency>-->
+ <!-- <dependency>
+ <groupId>com.artofsolving</groupId>
+ <artifactId>jodconverter</artifactId>
+ <version>2.2.1</version>
+ </dependency>-->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
--
2.18.1