From fe4aff2c714700c9e0663c909576a3ee832ff144 Mon Sep 17 00:00:00 2001 From: wany <13995595726@qq.com> Date: Mon, 8 Jul 2024 10:05:02 +0800 Subject: [PATCH] init --- pom.xml | 79 +- .../java/com/gunshi/project/xyt/Main.java | 10 +- .../project/xyt/config/OpenApiConfig.java | 27 - .../project/xyt/config/RcvOpenApiConfig.java | 28 - .../AbstractCommonFileController.java | 100 +++ .../xyt/controller/BasicDataController.java | 346 --------- .../controller/BzCameraAIImgRController.java | 60 -- .../controller/BzProtocolInfoController.java | 99 --- .../BzServiceResourceController.java | 140 ---- .../EngineeringDrainageController.java | 274 ------- .../xyt/controller/GateController.java | 58 -- .../GateRepairRecordController.java | 69 -- .../xyt/controller/HomePageController.java | 149 ---- .../ICommonDeleteByIdWithAttach.java | 33 + .../xyt/controller/ICommonFileController.java | 29 + .../controller/ICommonInsertWithAttach.java | 34 + .../xyt/controller/ICommonQueryAttach.java | 41 + .../ICommonUpdateByIdWithAttach.java | 34 + .../xyt/controller/PingController.java | 33 - .../xyt/controller/RcvLogUpRController.java | 59 -- .../controller/RescueGoodsBController.java | 108 +++ .../xyt/controller/StFlowRController.java | 60 -- .../xyt/controller/StImgRController.java | 60 -- .../xyt/controller/StPptnRController.java | 63 -- .../xyt/controller/StRcvRealController.java | 58 -- .../xyt/controller/StRsvrRController.java | 63 -- .../xyt/controller/StVoltageRController.java | 63 -- .../controller/WaterQualityController.java | 97 --- .../entity/basedata/CheckStringSearch.java | 21 - .../xyt/entity/basedata/GeneralSearch.java | 40 - .../xyt/entity/basedata/StAddvcdTreeVo.java | 25 - .../entity/basedata/StCameraAreaTreeVo.java | 28 - .../xyt/entity/basedata/StCameraAreaVo.java | 24 - .../xyt/entity/basedata/StCameraSearch.java | 26 - .../xyt/entity/basedata/StCameraVo.java | 24 - .../xyt/entity/basedata/StSpgPztbVo.java | 25 - .../xyt/entity/basedata/StSpgSpprmpVo.java | 26 - .../xyt/entity/basedata/StStbprpVo.java | 23 - .../xyt/entity/basedata/StcdSearch.java | 21 - .../xyt/entity/basedata/SysDictVo.java | 26 - .../project/xyt/entity/dto/StDamDto.java | 34 - .../project/xyt/entity/dto/StEqptDto.java | 56 -- .../project/xyt/entity/dto/StGateDto.java | 41 - .../xyt/entity/dto/StGateRepairRecordDto.java | 25 - .../project/xyt/entity/dto/StResDto.java | 114 --- .../xyt/entity/dto/StResFileRefDto.java | 37 - .../xyt/entity/dto/StResPersonRefDto.java | 35 - .../xyt/entity/dto/StResStcdRefDto.java | 35 - .../project/xyt/entity/dto/StRvDto.java | 34 - .../project/xyt/entity/dto/StStchBDto.java | 22 - .../project/xyt/entity/dto/StZvarlDto.java | 38 - .../xyt/entity/so/RescueGoodsPageSo.java | 39 + .../xyt/entity/vo/GateHistoryInfoVo.java | 24 - .../project/xyt/entity/vo/GateInfoVo.java | 35 - .../xyt/entity/vo/GateRepairDetailVo.java | 25 - .../xyt/entity/vo/GateRepairRecordVo.java | 22 - .../xyt/entity/vo/ReservoirLevelVo.java | 33 - .../project/xyt/entity/vo/StFlowRVo.java | 37 - .../project/xyt/entity/vo/StPptnVo.java | 30 - .../gunshi/project/xyt/entity/vo/StResVo.java | 26 - .../gunshi/project/xyt/enums/RcvDataType.java | 37 - .../xyt/mapper/BzProtocolInfoChartMapper.java | 25 - .../BzServiceResourceMonitorRMapper.java | 36 - .../project/xyt/mapper/RcvLogUpRMapper.java | 42 -- .../project/xyt/mapper/RescueGoodsMapper.java | 56 ++ .../project/xyt/mapper/StAddvcdDMapper.java | 18 - .../xyt/mapper/StCameraAreaBMapper.java | 20 - .../project/xyt/mapper/StCameraBMapper.java | 39 - .../project/xyt/mapper/StDamBMapper.java | 12 - .../project/xyt/mapper/StEqptBMapper.java | 12 - .../project/xyt/mapper/StGateBFileMapper.java | 12 - .../project/xyt/mapper/StGateBMapper.java | 24 - .../xyt/mapper/StGateRepairRecordMapper.java | 19 - .../project/xyt/mapper/StMoncrBMapper.java | 18 - .../project/xyt/mapper/StPptnRMapper.java | 72 -- .../project/xyt/mapper/StRcvRealMapper.java | 48 -- .../project/xyt/mapper/StResBMapper.java | 12 - .../xyt/mapper/StResFileRefMapper.java | 12 - .../xyt/mapper/StResPersonRefMapper.java | 12 - .../xyt/mapper/StResStcdRefMapper.java | 70 -- .../project/xyt/mapper/StRvBMapper.java | 12 - .../project/xyt/mapper/StSpgPztbMapper.java | 27 - .../project/xyt/mapper/StSpgSpprmpMapper.java | 27 - .../project/xyt/mapper/StStbprpBMapper.java | 32 - .../project/xyt/mapper/StStchBMapper.java | 37 - .../project/xyt/mapper/StZvarlBMapper.java | 12 - .../project/xyt/mapper/SysDictBMapper.java | 39 - .../xyt/mapper/WaterQualityMapper.java | 16 - .../project/xyt/model/BzCameraAIImgR.java | 40 - .../project/xyt/model/BzProtocolInfo.java | 68 -- .../project/xyt/model/BzServiceResource.java | 102 --- .../xyt/model/BzServiceResourceMonitorR.java | 64 -- .../xyt/model/BzServiceResourceType.java | 39 - .../gunshi/project/xyt/model/RcvLogDownR.java | 51 -- .../gunshi/project/xyt/model/RcvLogUpR.java | 72 -- .../xyt/model/RelProtocolStMapping.java | 25 - .../project/xyt/model/RescueGoodsB.java | 150 ++++ .../project/xyt/model/RescueGoodsFile.java | 69 ++ .../gunshi/project/xyt/model/StAddvcdD.java | 93 --- .../project/xyt/model/StCameraAreaB.java | 101 --- .../gunshi/project/xyt/model/StCameraB.java | 176 ----- .../com/gunshi/project/xyt/model/StDamB.java | 274 ------- .../com/gunshi/project/xyt/model/StEqptB.java | 272 ------- .../com/gunshi/project/xyt/model/StFlowR.java | 41 - .../gunshi/project/xyt/model/StFlowRReal.java | 55 -- .../com/gunshi/project/xyt/model/StGateB.java | 153 ---- .../gunshi/project/xyt/model/StGateBFile.java | 61 -- .../project/xyt/model/StGateBHistory.java | 64 -- .../gunshi/project/xyt/model/StGateBReal.java | 55 -- .../project/xyt/model/StGateRepairDetail.java | 109 --- .../project/xyt/model/StGateRepairRecord.java | 78 -- .../com/gunshi/project/xyt/model/StImgR.java | 40 - .../gunshi/project/xyt/model/StMoncrB.java | 109 --- .../com/gunshi/project/xyt/model/StPptnR.java | 42 -- .../gunshi/project/xyt/model/StRcvReal.java | 51 -- .../com/gunshi/project/xyt/model/StResB.java | 630 ---------------- .../project/xyt/model/StResFileRef.java | 80 -- .../project/xyt/model/StResPersonRef.java | 106 --- .../project/xyt/model/StResStcdRef.java | 51 -- .../com/gunshi/project/xyt/model/StRsvrR.java | 42 -- .../com/gunshi/project/xyt/model/StRvB.java | 253 ------- .../gunshi/project/xyt/model/StSpgPztb.java | 543 -------------- .../gunshi/project/xyt/model/StSpgSpprmp.java | 491 ------------ .../gunshi/project/xyt/model/StStbprpB.java | 392 ---------- .../com/gunshi/project/xyt/model/StStchB.java | 145 ---- .../gunshi/project/xyt/model/StVoltageR.java | 35 - .../project/xyt/model/StWaterQualityR.java | 280 ------- .../gunshi/project/xyt/model/StZvarlB.java | 97 --- .../gunshi/project/xyt/model/SysDictB.java | 112 --- .../xyt/scheduled/RcvLogUpMockJob.java | 40 - .../AbstractModelWithAttachService.java | 81 ++ .../project/xyt/service/BasicInfoService.java | 38 - .../BzServiceResourceMonitorRService.java | 64 -- .../service/EngineeringDrainageService.java | 701 ------------------ .../xyt/service/GateRepairRecordService.java | 52 -- .../project/xyt/service/GateService.java | 38 - .../MonitorEquipmentHealthService.java | 62 -- .../xyt/service/ProtocolInfoService.java | 60 -- .../xyt/service/RainMonitoringService.java | 243 ------ .../xyt/service/RescueGoodsService.java | 88 +++ .../xyt/service/ReservoirLevelService.java | 135 ---- .../project/xyt/service/StAdcdService.java | 133 ---- .../xyt/service/StCameraAreaService.java | 167 ----- .../project/xyt/service/StCameraService.java | 107 --- .../project/xyt/service/StMoncrService.java | 113 --- .../xyt/service/StResPersonRefService.java | 41 - .../project/xyt/service/StSpgPztbService.java | 114 --- .../xyt/service/StSpgSpprmpService.java | 115 --- .../project/xyt/service/StStbprpService.java | 108 --- .../project/xyt/service/StStchBService.java | 101 --- .../project/xyt/service/SysDictService.java | 152 ---- .../xyt/service/WarningInfoService.java | 45 -- .../xyt/service/WaterQualityService.java | 34 - .../impl/GateRepairRecordServiceImpl.java | 136 ---- .../xyt/service/impl/GateServiceImpl.java | 64 -- .../service/impl/WaterQualityServiceImpl.java | 197 ----- .../project/xyt/so/BzProtocolInfoSo.java | 46 -- .../project/xyt/so/BzServiceResourceSo.java | 29 - .../xyt/so/BzServiceResourceTypeSo.java | 28 - .../project/xyt/so/GateHistoryPageSo.java | 32 - .../xyt/so/GateRepairRecordPageSo.java | 34 - .../gunshi/project/xyt/so/RcvLogUpRSo.java | 23 - .../com/gunshi/project/xyt/so/RtuDataSo.java | 33 - .../gunshi/project/xyt/so/StDamPageSo.java | 39 - .../gunshi/project/xyt/so/StEqptPageSo.java | 37 - .../gunshi/project/xyt/so/StGatePageSo.java | 37 - .../gunshi/project/xyt/so/StRcvRealSo.java | 33 - .../gunshi/project/xyt/so/StResFileRefSo.java | 22 - .../gunshi/project/xyt/so/StResPageSo.java | 42 -- .../project/xyt/so/StResPersonRefSo.java | 22 - .../com/gunshi/project/xyt/so/StRvPageSo.java | 42 -- .../com/gunshi/project/xyt/so/StStchBSo.java | 28 - .../com/gunshi/project/xyt/so/StZvarlSo.java | 25 - .../project/xyt/so/WaterQualityPageSo.java | 28 - .../xyt/vo/BzProtocolInfoChart1Vo.java | 18 - .../xyt/vo/BzServiceResourceMonitorVo.java | 63 -- .../gunshi/project/xyt/vo/RcvLogUpRVo.java | 26 - src/main/resources/application-dev.yml | 5 + src/main/resources/application-gs.yml | 5 + src/main/resources/application.yml | 68 +- src/main/resources/config-common.yml | 27 + src/main/resources/config-dev.yml | 17 + src/main/resources/config-gs.yml | 12 + src/main/resources/config-prod.yml | 12 + src/main/resources/mapper/StAddvcdDMapper.xml | 41 - .../resources/mapper/StCameraAreaBMapper.xml | 50 -- src/main/resources/mapper/StCameraBMapper.xml | 108 --- src/main/resources/mapper/StDamBMapper.xml | 63 -- src/main/resources/mapper/StEqptBMapper.xml | 62 -- .../resources/mapper/StGateBFileMapper.xml | 26 - src/main/resources/mapper/StGateBMapper.xml | 63 -- .../resources/mapper/StGateRecordMapper.xml | 24 - src/main/resources/mapper/StMoncrBMapper.xml | 43 -- src/main/resources/mapper/StResBMapper.xml | 124 ---- .../resources/mapper/StResFileRefMapper.xml | 29 - .../resources/mapper/StResPersonRefMapper.xml | 33 - .../resources/mapper/StResStcdRefMapper.xml | 25 - src/main/resources/mapper/StRvBMapper.xml | 60 -- src/main/resources/mapper/StSpgPztbMapper.xml | 149 ---- .../resources/mapper/StSpgSpprmpMapper.xml | 227 ------ src/main/resources/mapper/StStbprpBMapper.xml | 160 ---- src/main/resources/mapper/StStchBMapper.xml | 5 - src/main/resources/mapper/StZvarlBMapper.xml | 31 - src/main/resources/mapper/SysDictBMapper.xml | 98 --- .../resources/mapper/WaterQualityMapper.xml | 5 - src/main/resources/sql/OSMOMETER_DATA.sql | 26 - src/main/resources/sql/OSMOMETER_STATION.sql | 124 ---- src/main/resources/sql/SEEPAGE_DATA.sql | 24 - src/main/resources/sql/SEEPAGE_STATION.sql | 96 --- src/main/resources/sql/ST_FLOW_R.sql | 25 - src/main/resources/sql/ST_IMG_R.sql | 19 - src/main/resources/sql/ST_PPTN_R.sql | 25 - src/main/resources/sql/ST_RIVER_R.sql | 33 - src/main/resources/sql/ST_RSVR_R.sql | 31 - src/main/resources/sql/ST_STCH_B.sql | 31 - src/main/resources/sql/ST_WATER_QUALITY_R.sql | 134 ---- src/main/resources/sql/ServiceResource.sql | 168 ----- .../java/com/gunshi/project/xyt/TestMain.java | 16 - .../xyt/controller/TestController.java | 23 - .../xyt/service/StAdcdServiceTest.java | 40 - .../xyt/service/StCameraAreaServiceTest.java | 71 -- .../xyt/service/StCameraServiceTest.java | 83 --- .../xyt/service/SysDictServiceTest.java | 51 -- src/test/resources/application.yml | 64 -- src/test/resources/logback.xml | 96 --- 225 files changed, 995 insertions(+), 15507 deletions(-) delete mode 100644 src/main/java/com/gunshi/project/xyt/config/OpenApiConfig.java delete mode 100644 src/main/java/com/gunshi/project/xyt/config/RcvOpenApiConfig.java create mode 100644 src/main/java/com/gunshi/project/xyt/controller/AbstractCommonFileController.java delete mode 100644 src/main/java/com/gunshi/project/xyt/controller/BasicDataController.java delete mode 100644 src/main/java/com/gunshi/project/xyt/controller/BzCameraAIImgRController.java delete mode 100644 src/main/java/com/gunshi/project/xyt/controller/BzProtocolInfoController.java delete mode 100644 src/main/java/com/gunshi/project/xyt/controller/BzServiceResourceController.java delete mode 100644 src/main/java/com/gunshi/project/xyt/controller/EngineeringDrainageController.java delete mode 100644 src/main/java/com/gunshi/project/xyt/controller/GateController.java delete mode 100644 src/main/java/com/gunshi/project/xyt/controller/GateRepairRecordController.java delete mode 100644 src/main/java/com/gunshi/project/xyt/controller/HomePageController.java create mode 100644 src/main/java/com/gunshi/project/xyt/controller/ICommonDeleteByIdWithAttach.java create mode 100644 src/main/java/com/gunshi/project/xyt/controller/ICommonFileController.java create mode 100644 src/main/java/com/gunshi/project/xyt/controller/ICommonInsertWithAttach.java create mode 100644 src/main/java/com/gunshi/project/xyt/controller/ICommonQueryAttach.java create mode 100644 src/main/java/com/gunshi/project/xyt/controller/ICommonUpdateByIdWithAttach.java delete mode 100644 src/main/java/com/gunshi/project/xyt/controller/PingController.java delete mode 100644 src/main/java/com/gunshi/project/xyt/controller/RcvLogUpRController.java create mode 100644 src/main/java/com/gunshi/project/xyt/controller/RescueGoodsBController.java delete mode 100644 src/main/java/com/gunshi/project/xyt/controller/StFlowRController.java delete mode 100644 src/main/java/com/gunshi/project/xyt/controller/StImgRController.java delete mode 100644 src/main/java/com/gunshi/project/xyt/controller/StPptnRController.java delete mode 100644 src/main/java/com/gunshi/project/xyt/controller/StRcvRealController.java delete mode 100644 src/main/java/com/gunshi/project/xyt/controller/StRsvrRController.java delete mode 100644 src/main/java/com/gunshi/project/xyt/controller/StVoltageRController.java delete mode 100644 src/main/java/com/gunshi/project/xyt/controller/WaterQualityController.java delete mode 100644 src/main/java/com/gunshi/project/xyt/entity/basedata/CheckStringSearch.java delete mode 100644 src/main/java/com/gunshi/project/xyt/entity/basedata/GeneralSearch.java delete mode 100644 src/main/java/com/gunshi/project/xyt/entity/basedata/StAddvcdTreeVo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/entity/basedata/StCameraAreaTreeVo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/entity/basedata/StCameraAreaVo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/entity/basedata/StCameraSearch.java delete mode 100644 src/main/java/com/gunshi/project/xyt/entity/basedata/StCameraVo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/entity/basedata/StSpgPztbVo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/entity/basedata/StSpgSpprmpVo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/entity/basedata/StStbprpVo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/entity/basedata/StcdSearch.java delete mode 100644 src/main/java/com/gunshi/project/xyt/entity/basedata/SysDictVo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/entity/dto/StDamDto.java delete mode 100644 src/main/java/com/gunshi/project/xyt/entity/dto/StEqptDto.java delete mode 100644 src/main/java/com/gunshi/project/xyt/entity/dto/StGateDto.java delete mode 100644 src/main/java/com/gunshi/project/xyt/entity/dto/StGateRepairRecordDto.java delete mode 100644 src/main/java/com/gunshi/project/xyt/entity/dto/StResDto.java delete mode 100644 src/main/java/com/gunshi/project/xyt/entity/dto/StResFileRefDto.java delete mode 100644 src/main/java/com/gunshi/project/xyt/entity/dto/StResPersonRefDto.java delete mode 100644 src/main/java/com/gunshi/project/xyt/entity/dto/StResStcdRefDto.java delete mode 100644 src/main/java/com/gunshi/project/xyt/entity/dto/StRvDto.java delete mode 100644 src/main/java/com/gunshi/project/xyt/entity/dto/StStchBDto.java delete mode 100644 src/main/java/com/gunshi/project/xyt/entity/dto/StZvarlDto.java create mode 100644 src/main/java/com/gunshi/project/xyt/entity/so/RescueGoodsPageSo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/entity/vo/GateHistoryInfoVo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/entity/vo/GateInfoVo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/entity/vo/GateRepairDetailVo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/entity/vo/GateRepairRecordVo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/entity/vo/ReservoirLevelVo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/entity/vo/StFlowRVo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/entity/vo/StPptnVo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/entity/vo/StResVo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/enums/RcvDataType.java delete mode 100644 src/main/java/com/gunshi/project/xyt/mapper/BzProtocolInfoChartMapper.java delete mode 100644 src/main/java/com/gunshi/project/xyt/mapper/BzServiceResourceMonitorRMapper.java delete mode 100644 src/main/java/com/gunshi/project/xyt/mapper/RcvLogUpRMapper.java create mode 100644 src/main/java/com/gunshi/project/xyt/mapper/RescueGoodsMapper.java delete mode 100644 src/main/java/com/gunshi/project/xyt/mapper/StAddvcdDMapper.java delete mode 100644 src/main/java/com/gunshi/project/xyt/mapper/StCameraAreaBMapper.java delete mode 100644 src/main/java/com/gunshi/project/xyt/mapper/StCameraBMapper.java delete mode 100644 src/main/java/com/gunshi/project/xyt/mapper/StDamBMapper.java delete mode 100644 src/main/java/com/gunshi/project/xyt/mapper/StEqptBMapper.java delete mode 100644 src/main/java/com/gunshi/project/xyt/mapper/StGateBFileMapper.java delete mode 100644 src/main/java/com/gunshi/project/xyt/mapper/StGateBMapper.java delete mode 100644 src/main/java/com/gunshi/project/xyt/mapper/StGateRepairRecordMapper.java delete mode 100644 src/main/java/com/gunshi/project/xyt/mapper/StMoncrBMapper.java delete mode 100644 src/main/java/com/gunshi/project/xyt/mapper/StPptnRMapper.java delete mode 100644 src/main/java/com/gunshi/project/xyt/mapper/StRcvRealMapper.java delete mode 100644 src/main/java/com/gunshi/project/xyt/mapper/StResBMapper.java delete mode 100644 src/main/java/com/gunshi/project/xyt/mapper/StResFileRefMapper.java delete mode 100644 src/main/java/com/gunshi/project/xyt/mapper/StResPersonRefMapper.java delete mode 100644 src/main/java/com/gunshi/project/xyt/mapper/StResStcdRefMapper.java delete mode 100644 src/main/java/com/gunshi/project/xyt/mapper/StRvBMapper.java delete mode 100644 src/main/java/com/gunshi/project/xyt/mapper/StSpgPztbMapper.java delete mode 100644 src/main/java/com/gunshi/project/xyt/mapper/StSpgSpprmpMapper.java delete mode 100644 src/main/java/com/gunshi/project/xyt/mapper/StStbprpBMapper.java delete mode 100644 src/main/java/com/gunshi/project/xyt/mapper/StStchBMapper.java delete mode 100644 src/main/java/com/gunshi/project/xyt/mapper/StZvarlBMapper.java delete mode 100644 src/main/java/com/gunshi/project/xyt/mapper/SysDictBMapper.java delete mode 100644 src/main/java/com/gunshi/project/xyt/mapper/WaterQualityMapper.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/BzCameraAIImgR.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/BzProtocolInfo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/BzServiceResource.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/BzServiceResourceMonitorR.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/BzServiceResourceType.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/RcvLogDownR.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/RcvLogUpR.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/RelProtocolStMapping.java create mode 100644 src/main/java/com/gunshi/project/xyt/model/RescueGoodsB.java create mode 100644 src/main/java/com/gunshi/project/xyt/model/RescueGoodsFile.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/StAddvcdD.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/StCameraAreaB.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/StCameraB.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/StDamB.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/StEqptB.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/StFlowR.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/StFlowRReal.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/StGateB.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/StGateBFile.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/StGateBHistory.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/StGateBReal.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/StGateRepairDetail.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/StGateRepairRecord.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/StImgR.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/StMoncrB.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/StPptnR.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/StRcvReal.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/StResB.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/StResFileRef.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/StResPersonRef.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/StResStcdRef.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/StRsvrR.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/StRvB.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/StSpgPztb.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/StSpgSpprmp.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/StStbprpB.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/StStchB.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/StVoltageR.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/StWaterQualityR.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/StZvarlB.java delete mode 100644 src/main/java/com/gunshi/project/xyt/model/SysDictB.java delete mode 100644 src/main/java/com/gunshi/project/xyt/scheduled/RcvLogUpMockJob.java create mode 100644 src/main/java/com/gunshi/project/xyt/service/AbstractModelWithAttachService.java delete mode 100644 src/main/java/com/gunshi/project/xyt/service/BasicInfoService.java delete mode 100644 src/main/java/com/gunshi/project/xyt/service/BzServiceResourceMonitorRService.java delete mode 100644 src/main/java/com/gunshi/project/xyt/service/EngineeringDrainageService.java delete mode 100644 src/main/java/com/gunshi/project/xyt/service/GateRepairRecordService.java delete mode 100644 src/main/java/com/gunshi/project/xyt/service/GateService.java delete mode 100644 src/main/java/com/gunshi/project/xyt/service/MonitorEquipmentHealthService.java delete mode 100644 src/main/java/com/gunshi/project/xyt/service/ProtocolInfoService.java delete mode 100644 src/main/java/com/gunshi/project/xyt/service/RainMonitoringService.java create mode 100644 src/main/java/com/gunshi/project/xyt/service/RescueGoodsService.java delete mode 100644 src/main/java/com/gunshi/project/xyt/service/ReservoirLevelService.java delete mode 100644 src/main/java/com/gunshi/project/xyt/service/StAdcdService.java delete mode 100644 src/main/java/com/gunshi/project/xyt/service/StCameraAreaService.java delete mode 100644 src/main/java/com/gunshi/project/xyt/service/StCameraService.java delete mode 100644 src/main/java/com/gunshi/project/xyt/service/StMoncrService.java delete mode 100644 src/main/java/com/gunshi/project/xyt/service/StResPersonRefService.java delete mode 100644 src/main/java/com/gunshi/project/xyt/service/StSpgPztbService.java delete mode 100644 src/main/java/com/gunshi/project/xyt/service/StSpgSpprmpService.java delete mode 100644 src/main/java/com/gunshi/project/xyt/service/StStbprpService.java delete mode 100644 src/main/java/com/gunshi/project/xyt/service/StStchBService.java delete mode 100644 src/main/java/com/gunshi/project/xyt/service/SysDictService.java delete mode 100644 src/main/java/com/gunshi/project/xyt/service/WarningInfoService.java delete mode 100644 src/main/java/com/gunshi/project/xyt/service/WaterQualityService.java delete mode 100644 src/main/java/com/gunshi/project/xyt/service/impl/GateRepairRecordServiceImpl.java delete mode 100644 src/main/java/com/gunshi/project/xyt/service/impl/GateServiceImpl.java delete mode 100644 src/main/java/com/gunshi/project/xyt/service/impl/WaterQualityServiceImpl.java delete mode 100644 src/main/java/com/gunshi/project/xyt/so/BzProtocolInfoSo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/so/BzServiceResourceSo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/so/BzServiceResourceTypeSo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/so/GateHistoryPageSo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/so/GateRepairRecordPageSo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/so/RcvLogUpRSo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/so/RtuDataSo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/so/StDamPageSo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/so/StEqptPageSo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/so/StGatePageSo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/so/StRcvRealSo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/so/StResFileRefSo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/so/StResPageSo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/so/StResPersonRefSo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/so/StRvPageSo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/so/StStchBSo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/so/StZvarlSo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/so/WaterQualityPageSo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/vo/BzProtocolInfoChart1Vo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/vo/BzServiceResourceMonitorVo.java delete mode 100644 src/main/java/com/gunshi/project/xyt/vo/RcvLogUpRVo.java create mode 100644 src/main/resources/application-dev.yml create mode 100644 src/main/resources/application-gs.yml create mode 100644 src/main/resources/config-common.yml create mode 100644 src/main/resources/config-dev.yml create mode 100644 src/main/resources/config-gs.yml create mode 100644 src/main/resources/config-prod.yml delete mode 100644 src/main/resources/mapper/StAddvcdDMapper.xml delete mode 100644 src/main/resources/mapper/StCameraAreaBMapper.xml delete mode 100644 src/main/resources/mapper/StCameraBMapper.xml delete mode 100644 src/main/resources/mapper/StDamBMapper.xml delete mode 100644 src/main/resources/mapper/StEqptBMapper.xml delete mode 100644 src/main/resources/mapper/StGateBFileMapper.xml delete mode 100644 src/main/resources/mapper/StGateBMapper.xml delete mode 100644 src/main/resources/mapper/StGateRecordMapper.xml delete mode 100644 src/main/resources/mapper/StMoncrBMapper.xml delete mode 100644 src/main/resources/mapper/StResBMapper.xml delete mode 100644 src/main/resources/mapper/StResFileRefMapper.xml delete mode 100644 src/main/resources/mapper/StResPersonRefMapper.xml delete mode 100644 src/main/resources/mapper/StResStcdRefMapper.xml delete mode 100644 src/main/resources/mapper/StRvBMapper.xml delete mode 100644 src/main/resources/mapper/StSpgPztbMapper.xml delete mode 100644 src/main/resources/mapper/StSpgSpprmpMapper.xml delete mode 100644 src/main/resources/mapper/StStbprpBMapper.xml delete mode 100644 src/main/resources/mapper/StStchBMapper.xml delete mode 100644 src/main/resources/mapper/StZvarlBMapper.xml delete mode 100644 src/main/resources/mapper/SysDictBMapper.xml delete mode 100644 src/main/resources/mapper/WaterQualityMapper.xml delete mode 100644 src/main/resources/sql/OSMOMETER_DATA.sql delete mode 100644 src/main/resources/sql/OSMOMETER_STATION.sql delete mode 100644 src/main/resources/sql/SEEPAGE_DATA.sql delete mode 100644 src/main/resources/sql/SEEPAGE_STATION.sql delete mode 100644 src/main/resources/sql/ST_FLOW_R.sql delete mode 100644 src/main/resources/sql/ST_IMG_R.sql delete mode 100644 src/main/resources/sql/ST_PPTN_R.sql delete mode 100644 src/main/resources/sql/ST_RIVER_R.sql delete mode 100644 src/main/resources/sql/ST_RSVR_R.sql delete mode 100644 src/main/resources/sql/ST_STCH_B.sql delete mode 100644 src/main/resources/sql/ST_WATER_QUALITY_R.sql delete mode 100644 src/main/resources/sql/ServiceResource.sql delete mode 100644 src/test/java/com/gunshi/project/xyt/TestMain.java delete mode 100644 src/test/java/com/gunshi/project/xyt/controller/TestController.java delete mode 100644 src/test/java/com/gunshi/project/xyt/service/StAdcdServiceTest.java delete mode 100644 src/test/java/com/gunshi/project/xyt/service/StCameraAreaServiceTest.java delete mode 100644 src/test/java/com/gunshi/project/xyt/service/StCameraServiceTest.java delete mode 100644 src/test/java/com/gunshi/project/xyt/service/SysDictServiceTest.java delete mode 100644 src/test/resources/application.yml delete mode 100644 src/test/resources/logback.xml diff --git a/pom.xml b/pom.xml index ee7d83b..a67747a 100644 --- a/pom.xml +++ b/pom.xml @@ -12,30 +12,26 @@ gunshi-project-xyt 1.0-SNAPSHOT - + + 麻城小玉潭水库系统 + 21 21 true UTF-8 - - 3.3.2 - com.gunshi - gunshi-modules-all - 1.0-SNAPSHOT + org.postgresql + postgresql - - com.alibaba - easyexcel - ${alibaba.easyexcel.version} + com.gunshi + gunshi-modules-file + 1.0-SNAPSHOT @@ -51,9 +47,34 @@ org.springframework spring-test - 6.1.1 test + + + com.hikvision.ga + artemis-http-client + 1.1.3 + + + commons-net + commons-net + 3.3 + + + + org.springframework.boot + spring-boot-starter-data-elasticsearch + + + org.springframework.data + spring-data-elasticsearch + 5.2.3 + + + org.locationtech.jts + jts-core + 1.18.1 + @@ -61,19 +82,19 @@ org.apache.maven.plugins maven-dependency-plugin - - - copy-lib - - copy-dependencies - - - false - false - runtime - - - + + + + + + + + + + + + + org.apache.maven.plugins @@ -89,7 +110,7 @@ nexus Nexus public - https://local.gunshiiot.com:8082/repository/maven-public/ + http://local.gunshiiot.com:8081/repository/maven-public/ @@ -97,12 +118,12 @@ nexus-releases Nexus Releases - https://local.gunshiiot.com:8082/repository/maven-releases + http://local.gunshiiot.com:8081/repository/maven-releases nexus-snapshots Nexus Snapshot - https://local.gunshiiot.com:8082/repository/maven-snapshots/ + http://local.gunshiiot.com:8081/repository/maven-snapshots/ \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/Main.java b/src/main/java/com/gunshi/project/xyt/Main.java index 7f72911..56863a5 100644 --- a/src/main/java/com/gunshi/project/xyt/Main.java +++ b/src/main/java/com/gunshi/project/xyt/Main.java @@ -7,19 +7,11 @@ import io.swagger.v3.oas.annotations.servers.Server; import lombok.extern.slf4j.Slf4j; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; -import org.springframework.web.servlet.config.annotation.EnableWebMvc; -/** - * 类描述 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-19 - */ @OpenAPIDefinition( servers = { @Server( - url = "http://localhost:24101/gunshiApp/xyt", + url = "http://localhost:24105/gunshiApp/xyt", description = "本地测试环境" ), @Server( diff --git a/src/main/java/com/gunshi/project/xyt/config/OpenApiConfig.java b/src/main/java/com/gunshi/project/xyt/config/OpenApiConfig.java deleted file mode 100644 index 21be9df..0000000 --- a/src/main/java/com/gunshi/project/xyt/config/OpenApiConfig.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.gunshi.project.xyt.config; - -import org.springdoc.core.models.GroupedOpenApi; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * 类描述 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-18 - */ -@Configuration -public class OpenApiConfig { - - @Bean - public GroupedOpenApi XytOpenApi() { - String[] packagesToScan = { - "com.gunshi.project.xyt.controller", - }; - return GroupedOpenApi.builder() - .group("xyt") - .packagesToScan(packagesToScan) - .build(); - } -} diff --git a/src/main/java/com/gunshi/project/xyt/config/RcvOpenApiConfig.java b/src/main/java/com/gunshi/project/xyt/config/RcvOpenApiConfig.java deleted file mode 100644 index c3f3137..0000000 --- a/src/main/java/com/gunshi/project/xyt/config/RcvOpenApiConfig.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.gunshi.project.xyt.config; - -import org.springdoc.core.models.GroupedOpenApi; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -/** - * 监测类接口文档分组 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-29 - */ -@Configuration -public class RcvOpenApiConfig { - @Bean - public GroupedOpenApi XytRcvOpenApi() { - String[] packagesToScan = { - "com.gunshi.project.xyt.controller", - }; - return GroupedOpenApi.builder() - .group("xyt-rcv") - .displayName("监测数据类接口") - .pathsToMatch("/rcv/**") - .packagesToScan(packagesToScan) - .build(); - } -} diff --git a/src/main/java/com/gunshi/project/xyt/controller/AbstractCommonFileController.java b/src/main/java/com/gunshi/project/xyt/controller/AbstractCommonFileController.java new file mode 100644 index 0000000..da00a71 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/controller/AbstractCommonFileController.java @@ -0,0 +1,100 @@ +package com.gunshi.project.xyt.controller; + +import com.gunshi.core.GunShiCoreProperties; +import com.gunshi.core.result.R; +import com.gunshi.core.session.entity.SessionUser; +import com.gunshi.file.model.FileDescriptor; +import com.gunshi.file.service.IFileService; +import com.gunshi.file.service.LoginFileService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RequestPart; +import org.springframework.web.multipart.MultipartFile; + +/** + * 类描述 + * + * @author lyf + * @version 1.0.0 + * @since 2024-03-12 + */ +public abstract class AbstractCommonFileController implements ICommonFileController { + + @Override + public R uploadSingle(MultipartFile file, String groupId, String businessType, Long userId, HttpServletRequest request) throws Exception { + return ICommonFileController.super.uploadSingle(file, getGroupId(), getBusinessType(), userId, request); + } + + /** + * 单个文件上传 + * + * @param file 文件 + * @param userId 上传者userId + */ + @Operation(summary = "单个文件上传，不需要groupId和businessType") + @PostMapping(path = "/file/upload/singleSimple", consumes = "multipart/form-data") + @Override + public R uploadSingle( + @Parameter(description = "文件") @RequestPart("file") MultipartFile file, + @Parameter(description = "上传者用户id", hidden = true) @RequestParam(value = "userId", required = false) Long userId, + @Parameter(hidden = true) HttpServletRequest request) throws Exception { + + if (userId == null) { + SessionUser sessionUser = checkLogin(request); + if (sessionUser == null) { + return R.error(400, "未登录", null); + } + userId = sessionUser.getUserId(); + } + + FileDescriptor fd = new FileDescriptor(); + fd.setBusinessType(getBusinessType()); + fd.setGroupId(getGroupId()); + fd.setUserId(userId); + fd.setAccessGroup(getService().getAccessGroup()); + fd.setFilePath(generateFilePath(getProperty().getAppCode(), getBusinessType(), userId, getGroupId(), file.getOriginalFilename())); + fd.setFileName(file.getOriginalFilename()); + fd.setFileLength(file.getSize()); + + getService().upload(fd, file.getInputStream()); + + return R.ok(fd); + } + + @Override + public String getBusinessType() { + return "common"; + } + + @Autowired + private LoginFileService service; + + @Autowired + private GunShiCoreProperties properties; + +// @Autowired +// private BaseSessionService sessionService; + + @Override + public IFileService getService() { + return service; + } + + @Override + public SessionUser checkLogin(HttpServletRequest request) { +// String token = sessionService.getToken(request); +// return sessionService.getSessionUser(token); + SessionUser user = new SessionUser(); + user.setUserId(1L); + return user; + } + + @Override + public GunShiCoreProperties getProperty() { + return properties; + } +} diff --git a/src/main/java/com/gunshi/project/xyt/controller/BasicDataController.java b/src/main/java/com/gunshi/project/xyt/controller/BasicDataController.java deleted file mode 100644 index 925b419..0000000 --- a/src/main/java/com/gunshi/project/xyt/controller/BasicDataController.java +++ /dev/null @@ -1,346 +0,0 @@ -package com.gunshi.project.xyt.controller; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.core.annotation.Get; -import com.gunshi.core.annotation.Post; -import com.gunshi.core.result.R; -import com.gunshi.project.xyt.entity.basedata.*; -import com.gunshi.project.xyt.model.*; -import com.gunshi.project.xyt.service.*; -import com.gunshi.project.xyt.so.StStchBSo; -import com.gunshi.project.xyt.validate.markers.Update; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.enums.ParameterIn; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; -import java.util.Objects; - -/** - * @author Sun Lejun - * @version 1.0 - * @date 2024/1/26 - */ - -@RestController -@Slf4j -@Tag(name = "基础数据接口-controller", description = "基础数据接口") -@Data -@RequestMapping("/database/") -public class BasicDataController { - private final SysDictService sysDictService; - private final StAdcdService stAdcdService; - private final StCameraAreaService stCameraAreaService; - private final StCameraService stCameraService; - private final StStbprpService stStbprpService; - - // 测站采集项 - private final StStchBService stStchBService; - - private final StMoncrService stMoncrService; - //渗压设备 - private final StSpgPztbService stSpgPztbService; - //渗流设备 - private final StSpgSpprmpService stSpgSpprmpService; - - - @Post(path = "/dict/search/query", summary = "查询字典接口") - public R> queryDictList(@Validated @RequestBody GeneralSearch search) { - return R.ok(sysDictService.queryBySearch(search)); - } - - @Get(path = "/dict/search/queryByPid", summary = "根据父ID查询字典接口 返回树结构") - public R> queryDictList( - @RequestParam(required = false, name="pid") - @Parameter(in = ParameterIn.QUERY, name="pid",description = "根据父ID查询字典，如果不传则查询所有") - Long pid - ) { - return R.ok(sysDictService.queryByPid(pid)); - } - - - @Post(path = "/dict/manage/insert", summary = "新增字典接口") - public R insertDictParent(@Validated @RequestBody SysDictB sysDictB) { - sysDictService.insert(sysDictB); - return R.ok(true); - } - - @Post(path = "/dict/manage/update", summary = "更新字典接口") - public R updateDict(@Validated({Update.class}) @RequestBody SysDictB sysDictB) { - sysDictService.updateById(sysDictB); - return R.ok(true); - } - - @Post(path = "/dict/search/check", summary = "检查字典编码和名称接口") - public R checkDictCode(@RequestBody @Validated CheckStringSearch checkStringSearch) { - try { - String keyword = checkStringSearch.getKeyword(); - SysDictB sysDictB = new SysDictB(); - sysDictB.setDictNm(keyword); - sysDictB.setDictCd(keyword); - if (Objects.nonNull(checkStringSearch.getId())) { - sysDictB.setId(checkStringSearch.getId()); - } - sysDictService.checkExistCodeAndName(sysDictB); - } catch (IllegalArgumentException e) { - return R.error(417, e.getMessage()); - } - return R.ok(); - } - - - - @Post(path = "/adcd/search/query", summary = "查询行政区划列表接口") - public R> queryAddvcdList(@Validated @RequestBody GeneralSearch search) { - return R.ok(stAdcdService.queryBySearch(search)); - } - - @Get(path = "/adcd/search/query", summary = "查询单个行政区划接口") - public R queryAddvcdById( - @RequestParam(name="adcd") - @Parameter(in = ParameterIn.QUERY, name="adcd",description = "完整行政区划编码") - String adcd - ){ - return R.ok(stAdcdService.queryByAddvcd(adcd)); - } - - @Get(path = "/adcd/search/tree", summary = "查询行政区划树接口") - public R> queryAddvcdTree( - @RequestParam(required = false, name="adcd") - @Parameter(in = ParameterIn.QUERY, name="adcd",description = "行政区划编码 为空查询全部，不为空查询下级树,比如4205查4205开头的所有返回树型结构") - String adcd) { - return R.ok(stAdcdService.queryTree(adcd)); - } - - @Post(path = "/adcd/manage/insert", summary = "新增行政区划列表接口") - public R insertAddvcd(@Validated @RequestBody StAddvcdD stAddvcdD) { - stAdcdService.insert(stAddvcdD); - return R.ok(true); - } - - @Post(path = "/adcd/manage/update", summary = "更新行政区划列表接口") - public R updateAddvcd(@Validated @RequestBody StAddvcdD stAddvcdD) { - stAdcdService.updateById(stAddvcdD); - return R.ok(true); - } - - @Post(path = "/camera/area/search/list", summary = "查询视频区域列表接口") - public R> queryCameraAreaList(@Validated @RequestBody GeneralSearch search) { - return R.ok(stCameraAreaService.queryListBySearch(search)); - } - - @Post(path = "/camera/area/search/tree", summary = "查询视频区域树接口") - public R> queryCameraAreaTree() { - return R.ok(stCameraAreaService.queryTree()); - } - - @Post(path = "/camera/area/manage/insert", summary = "新增视频区域接口") - public R insertCameraArea(@Validated @RequestBody StCameraAreaB stCameraAreaB) { - stCameraAreaService.insert(stCameraAreaB); - return R.ok(true); - } - - @Post(path = "/camera/area/manage/update", summary = "更新视频区域接口") - public R updateCameraArea(@Validated({Update.class}) @RequestBody StCameraAreaB stCameraAreaB) { - stCameraAreaService.update(stCameraAreaB); - return R.ok(true); - } - - @Post(path = "/camera/area/search/check", summary = "检查视频区域名称是否存在接口") - public R checkCameraAreaName(@RequestBody @Validated CheckStringSearch checkStringSearch) { - try { - stCameraAreaService.checkAreaName(checkStringSearch); - } catch (IllegalArgumentException e) { - return R.error(417, e.getMessage()); - } - return R.ok(); - } - - @Post(path = "/camera/search/query", summary = "查询视频列表接口") - public R> queryCameraList(@Validated @RequestBody StCameraSearch search) { - return R.ok(stCameraService.queryBySearch(search)); - } - - @Post(path = "/camera/manage/insert", summary = "新增视频接口") - public R insertCamera(@Validated @RequestBody StCameraB obj) { - stCameraService.insert(obj); - return R.ok(true); - } - - @Post(path = "/camera/manage/update", summary = "更新视频接口") - public R updateCamera(@Validated({Update.class}) @RequestBody StCameraB obj) { - stCameraService.update(obj); - return R.ok(true); - } - - - @Post(path = "/stcd/search/query", summary = "测站列表查询接口-结果集带分页信息") - public R> queryStcdList(@Validated @RequestBody StcdSearch search) { - return R.ok(stStbprpService.queryBySearch(search)); - } - - @Get(path = "/stcd/search/query", summary = "单个测站查询接口") - public R queryStcdById( - @RequestParam(name="stcd") - @Parameter(in = ParameterIn.QUERY, name="stcd",description = "测站编码") - String stcd - ) { - return R.ok(stStbprpService.queryByStcd(stcd)); - } - - @Post(path = "/stcd/search/querySelect", summary = "测站列表查询接口-下拉菜单查询使用，不带分页信息") - public R> queryStcdSelect(@Validated @RequestBody StcdSearch search) { - return R.ok(stStbprpService.queryListBySearch(search)); - } - - @Post(path = "/stcd/search/check", summary = "检查测站编码是否存在接口") - public R checkStcdExist(@RequestBody @Validated CheckStringSearch checkStringSearch) { - try { - stStbprpService.checkExist(checkStringSearch); - } catch (IllegalArgumentException e) { - return R.error(417, e.getMessage()); - } - return R.ok(); - } - - @Post(path = "/stcd/manage/insert", summary = "新增测站接口") - public R insertStcd(@Validated @RequestBody StStbprpB obj) { - return stStbprpService.insert(obj); - } - - @Post(path = "/stcd/manage/update", summary = "更新测站接口") - public R updateStcd(@Validated @RequestBody StStbprpB obj) { - return stStbprpService.update(obj); - } - - @Get(path = "/stcd/manage/delete/{stcd}", summary = "删除测站接口") - public R deleteStcd(@Schema(description="测站编码") @PathVariable("stcd") String stcd) { - return stStbprpService.delete(stcd); - } - - - @Post(path ="/stch/manage/insert", summary = "测站采集项新增") - public R insertStch(@RequestBody @Validated StStchB stStchB) { - return R.ok(stStchBService.insert(stStchB)); - } - - @Get(path ="/stch/manage/del/{id}", summary = "测站采集项删除") - public R delStch(@Schema(description="测站采集项id") @PathVariable("id") Integer id) { - return R.ok(stStchBService.removeById(id)); - } - - @Post(path ="/stch/manage/update", summary = "测站采集项修改") - public R updateStch(@RequestBody @Validated(Update.class) StStchB bean) { - return R.ok(stStchBService.update(bean)); - } - - @Post(path = "/stch/manage/page", summary = "测站采集项分页查询") - public R> PageStch(@RequestBody StStchBSo findDto) { - return R.ok(stStchBService.page(findDto)); - } - - - @Post(path = "/monct/manage/insert", summary = "新增监测断面接口") - public R insertMonCr(@Validated @RequestBody StMoncrB obj) { - stMoncrService.insert(obj); - return R.ok(true); - } - - @Post(path = "/monct/manage/check", summary = "检查监测断面编码是否存在接口") - public R checkMonCrCode(@Validated @RequestBody CheckStringSearch obj) { - stMoncrService.checkCode(obj); - return R.ok(true); - } - - @Post(path = "/monct/manage/update", summary = "更新监测断面接口") - public R updateMonCr(@Validated @RequestBody StMoncrB obj) { - stMoncrService.update(obj); - return R.ok(true); - } - - @Get(path = "/monct/manage/delete/{crId}", summary = "删除监测断面接口") - public R deleteMonCr(@Validated @RequestBody Long crId) { - stMoncrService.delete(crId); - return R.ok(true); - } - - @Post(path = "/monct/search/query", summary = "查询监测断面列表接口") - public R> queryMonCrList(@Validated @RequestBody GeneralSearch search) { - return R.ok(stMoncrService.queryBySearch(search)); - } - - //渗压设备 - @Post(path = "/pztb/search/query", summary = "查询渗压设备列表接口") - public R> queryStSpgPztbList(@Validated @RequestBody GeneralSearch search) { - return R.ok(stSpgPztbService.queryBySearch(search)); - } - - @Post(path = "/pztb/search/check", summary = "检查渗压设备编码是否存在接口") - public R checkStSpgPztbList(@Validated @RequestBody CheckStringSearch search) { - try { - stSpgPztbService.checkCode(search); - } catch (IllegalArgumentException e) { - return R.error(417, e.getMessage()); - } - return R.ok(); - } - - @Post(path = "/pztb/manage/insert", summary = "新增渗压设备接口") - public R insertStSpgPztb(@Validated @RequestBody StSpgPztb obj) { - stSpgPztbService.insert(obj); - return R.ok(true); - } - - @Post(path = "/pztb/manage/update", summary = "更新渗压设备接口") - public R updateStSpgPztb(@Validated(Update.class) @RequestBody StSpgPztb obj) { - stSpgPztbService.update(obj); - return R.ok(true); - } - - @Post(path = "/pztb/manage/delete/{id}",summary = "删除渗压设备接口") - public R deleteStSpgPztb(@Schema(description = "渗压设备ID") @PathVariable("id")String id){ - stSpgPztbService.delete(id); - return R.ok(true); - } - - //渗流 - @Post(path = "/spprmp/search/query", summary = "查询渗流设备列表接口") - public R> queryStSpgSpprmpList(@Validated @RequestBody GeneralSearch search) { - return R.ok(stSpgSpprmpService.queryBySearch(search)); - } - - @Post(path = "/spprmp/search/check", summary = "检查渗流设备编码是否存在接口") - public R checkStSpgSpprmp(@Validated @RequestBody CheckStringSearch search) { - try { - stSpgSpprmpService.checkCode(search); - } catch (IllegalArgumentException e) { - return R.error(417, e.getMessage()); - } - return R.ok(); - } - - @Post(path = "/spprmp/manage/insert", summary = "新增渗流设备接口") - public R insertStSpgSpprmp(@Validated @RequestBody StSpgSpprmp obj) { - stSpgSpprmpService.insert(obj); - return R.ok(true); - } - - @Post(path = "/spprmp/manage/update", summary = "更新渗流设备接口") - public R updateStSpgSpprmp(@Validated(Update.class) @RequestBody StSpgSpprmp obj) { - stSpgSpprmpService.update(obj); - return R.ok(true); - } - - @Get(path = "/spprmp/manage/delete/{id}",summary = "删除渗流设备接口") - public R deleteStSpgSpprmp(@Schema(description = "渗流设备ID") @PathVariable("id") String id){ - stSpgSpprmpService.delete(id); - return R.ok(true); - } - -} diff --git a/src/main/java/com/gunshi/project/xyt/controller/BzCameraAIImgRController.java b/src/main/java/com/gunshi/project/xyt/controller/BzCameraAIImgRController.java deleted file mode 100644 index 25ae282..0000000 --- a/src/main/java/com/gunshi/project/xyt/controller/BzCameraAIImgRController.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.gunshi.project.xyt.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.core.result.R; -import com.gunshi.project.xyt.model.BzCameraAIImgR; -import com.gunshi.project.xyt.model.BzCameraAIImgRAutoDao; -import com.gunshi.project.xyt.model.StStbprpB; -import com.gunshi.project.xyt.model.StStbprpBAutoMapper; -import com.gunshi.project.xyt.so.RtuDataSo; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.ArrayList; -import java.util.List; - -/** - * 视频监控-AI告警接口 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-26 - */ -@RestController -@RequestMapping("/camera/aiimg") -@Tag(name = "视频监控-AI告警") -public class BzCameraAIImgRController { - - @Autowired - private BzCameraAIImgRAutoDao dao; - - @Autowired - private StStbprpBAutoMapper stbprpDao; - - @Operation(summary = "分页查询") - @PostMapping("/page/{chid}") - public R> page(@RequestBody RtuDataSo so, @PathVariable("chid") String chid) { - List stcds = new ArrayList<>(); - if (StringUtils.isNotEmpty(so.getStcd())) { - stcds.add(so.getStcd()); - } else if (StringUtils.isNotEmpty(so.getStnm())) { - stcds.addAll(stbprpDao.selectList( - new LambdaQueryWrapper().like(StStbprpB::getStnm, so.getStnm()) - ).stream().map(StStbprpB::getStcd).toList()); - } - - Page page; - if (!stcds.isEmpty()) { - LambdaQueryWrapper query = new LambdaQueryWrapper().in(BzCameraAIImgR::getStcd, stcds).eq(BzCameraAIImgR::getChid, chid); - page = dao.page(so.getPageSo().toPage(), query); - } else { - page = dao.page(so.getPageSo().toPage()); - } - - return R.ok(page); - } -} diff --git a/src/main/java/com/gunshi/project/xyt/controller/BzProtocolInfoController.java b/src/main/java/com/gunshi/project/xyt/controller/BzProtocolInfoController.java deleted file mode 100644 index 334ce85..0000000 --- a/src/main/java/com/gunshi/project/xyt/controller/BzProtocolInfoController.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.gunshi.project.xyt.controller; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.core.result.R; -import com.gunshi.project.xyt.mapper.BzProtocolInfoChartMapper; -import com.gunshi.project.xyt.model.BzProtocolInfo; -import com.gunshi.project.xyt.model.BzProtocolInfoAutoDao; -import com.gunshi.project.xyt.service.ProtocolInfoService; -import com.gunshi.project.xyt.so.BzProtocolInfoSo; -import com.gunshi.project.xyt.validate.markers.Insert; -import com.gunshi.project.xyt.validate.markers.Update; -import com.gunshi.project.xyt.vo.BzProtocolInfoChart1Vo; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -/** - * 协议信息控制器接口类 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-23 - */ -@RestController -@RequestMapping("/protocolInfo") -@Tag(name = "系统管理-统一接收-协议管理") -public class BzProtocolInfoController { - @Autowired - private BzProtocolInfoAutoDao dao; - - @Autowired - private ProtocolInfoService service; - - @Autowired - private BzProtocolInfoChartMapper chartMapper; - - @Operation(summary = "新增协议信息") - @PostMapping("/save") - public R save(@Validated({Insert.class}) @RequestBody BzProtocolInfo entity) { - // todo 无论是数据库设置默认值为GETDATE()还是使用注解fill = FieldFill.INSERT都不能自动插入当前时间 - entity.setCreateTm(new Date()); - entity.setEnable(1); - return R.ok(dao.save(entity)); - } - - @Operation(summary = "更新协议信息") - @PostMapping("/update") - public R update(@Validated({Update.class}) @RequestBody BzProtocolInfo entity) { - return R.ok(dao.updateById(entity)); - } - - @Operation(summary = "删除协议信息") - @GetMapping("/delete/{id}") - public R delete(@PathVariable("id") String id) { - return R.ok(dao.removeById(id)); - } - - @Operation(summary = "按id查询接口") - @GetMapping("/get/{id}") - public R getById(@PathVariable("id") String id) { - return R.ok(dao.getById(id)); - } - - @Operation(summary = "分页查询接口") - @PostMapping("/page") - public R> page(@Validated @RequestBody BzProtocolInfoSo so) { - return R.ok(service.page(so)); - } - - @Operation(summary = "归属协议分布") - @GetMapping("/chart1") - public R chart1() { - List vos = chartMapper.chart1(); - - Map protocolCountMap = vos.stream() - .collect(Collectors.groupingBy(BzProtocolInfoChart1Vo::getProtocolName, Collectors.counting())); - - return R.ok(protocolCountMap); - } - - @Operation(summary = "测站类型分布") - @GetMapping("/chart2") - public R chart2() { - return null; - } - - @Operation(summary = "测站在线情况") - @GetMapping("/chart3") - public R chart3() { - return null; - } -} diff --git a/src/main/java/com/gunshi/project/xyt/controller/BzServiceResourceController.java b/src/main/java/com/gunshi/project/xyt/controller/BzServiceResourceController.java deleted file mode 100644 index 75d77e0..0000000 --- a/src/main/java/com/gunshi/project/xyt/controller/BzServiceResourceController.java +++ /dev/null @@ -1,140 +0,0 @@ -package com.gunshi.project.xyt.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.IdWorker; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.core.result.R; -import com.gunshi.project.xyt.model.BzServiceResource; -import com.gunshi.project.xyt.model.BzServiceResourceAutoDao; -import com.gunshi.project.xyt.model.BzServiceResourceType; -import com.gunshi.project.xyt.model.BzServiceResourceTypeAutoDao; -import com.gunshi.project.xyt.service.BzServiceResourceMonitorRService; -import com.gunshi.project.xyt.so.BzServiceResourceSo; -import com.gunshi.project.xyt.so.BzServiceResourceTypeSo; -import com.gunshi.project.xyt.validate.markers.Insert; -import com.gunshi.project.xyt.validate.markers.QueryPage; -import com.gunshi.project.xyt.validate.markers.QueryTimeRange; -import com.gunshi.project.xyt.validate.markers.Update; -import com.gunshi.project.xyt.vo.BzServiceResourceMonitorVo; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.Date; - -/** - * 服务资源及监控控制器接口类 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-24 - */ -@RestController -@RequestMapping("/serviceResource") -@Tag(name = "系统管理-数据共享服务-服务资源及监控") -public class BzServiceResourceController { - - @Autowired - private BzServiceResourceAutoDao serviceResourceDao; - - @Autowired - private BzServiceResourceMonitorRService serviceMonitorService; - - @Autowired - private BzServiceResourceTypeAutoDao serviceTypeDao; - - @Operation(summary = "新增服务资源") - @PostMapping("/save") - public R save(@Validated(Insert.class) @RequestBody BzServiceResource entity) { - entity.setId(IdWorker.getIdStr()); - entity.setRegisterDate(new Date()); - entity.setEnable(1); - return R.ok(serviceResourceDao.save(entity)); - } - - @Operation(summary = "更新服务资源") - @PostMapping("/update") - public R update(@Validated(Update.class) @RequestBody BzServiceResource entity) { - BzServiceResource byId = serviceResourceDao.getById(entity.getId()); - if (byId == null) { - return R.error(400, "数据不存在", false); - } - - entity.setRegisterDate(byId.getRegisterDate()); - return R.ok(serviceResourceDao.updateById(entity)); - } - - @Operation(summary = "删除服务资源") - @GetMapping("/delete/{id}") - public R delete(@PathVariable("id") String id) { - return R.ok(serviceMonitorService.removeById(id)); - } - - @Operation(summary = "分页查询服务资源") - @PostMapping("/page") - public R> page( - @Validated({QueryPage.class, QueryTimeRange.class}) @RequestBody BzServiceResourceSo so - ) { - LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(so.getName())) { - query.like(BzServiceResource::getName, so.getName()); - } - - if (so.getDateTimeRangeSo() != null) { - query.le(BzServiceResource::getRegisterDate, so.getDateTimeRangeSo().getEnd()); - query.ge(BzServiceResource::getRegisterDate, so.getDateTimeRangeSo().getStart()); - } - query.orderByDesc(BzServiceResource::getRegisterDate); - - Page page = serviceResourceDao.page(so.getPageSo().toPage(), query); - return R.ok(page); - } - - @Operation(summary = "分页查询服务资源监控") - @PostMapping("/monitor/page") - public R> pageMonitorR( - @Validated({QueryPage.class, QueryTimeRange.class}) @RequestBody BzServiceResourceSo so - ) { - Page page = serviceMonitorService.page(so.getPageSo().toPage(), so); - return R.ok(page); - } - - @Operation(summary = "新增服务资源类型") - @PostMapping("/type/save") - public R saveType(@Validated(Insert.class) @RequestBody BzServiceResourceType entity) { - entity.setId(IdWorker.getIdStr()); - return R.ok(serviceTypeDao.save(entity)); - } - - @Operation(summary = "更新服务资源类型") - @PostMapping("/type/update") - public R updateType(@Validated(Update.class) @RequestBody BzServiceResourceType entity) { - return R.ok(serviceTypeDao.updateById(entity)); - } - - @Operation(summary = "删除服务资源类型") - @GetMapping("/type/delete/{id}") - public R deleteType(@PathVariable("id") String id) { - return R.ok(serviceTypeDao.removeById(id)); - } - - @Operation(summary = "分页查询服务资源类型") - @PostMapping("/type/page") - public R> pageType( - @Validated({QueryPage.class}) @RequestBody BzServiceResourceTypeSo so - ) { - LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(so.getName())) { - query.like(BzServiceResourceType::getName, so.getName()); - } - if (StringUtils.isNotEmpty(so.getType())) { - query.like(BzServiceResourceType::getType, so.getType()); - } - - Page page = serviceTypeDao.page(so.getPageSo().toPage(), query); - return R.ok(page); - } -} diff --git a/src/main/java/com/gunshi/project/xyt/controller/EngineeringDrainageController.java b/src/main/java/com/gunshi/project/xyt/controller/EngineeringDrainageController.java deleted file mode 100644 index 8231d83..0000000 --- a/src/main/java/com/gunshi/project/xyt/controller/EngineeringDrainageController.java +++ /dev/null @@ -1,274 +0,0 @@ -package com.gunshi.project.xyt.controller; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.core.result.R; -import com.gunshi.project.xyt.entity.dto.*; -import com.gunshi.project.xyt.model.*; -import com.gunshi.project.xyt.service.EngineeringDrainageService; -import com.gunshi.project.xyt.so.*; -import com.gunshi.project.xyt.validate.markers.Insert; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - - -/** - * TODO - * - * @ClassName EngineeringDrainageController - * @Author Huang Qianxiang - * @Date 2024/1/25 11:50 - */ -@Slf4j -@Tag(name = "工程及水系接口", description = "水库、河流、大坝、闸阀、量水堰基础信息") -@RestController -@RequestMapping("/EngineeringDrainage") -public class EngineeringDrainageController { - - @Resource - private EngineeringDrainageService engineeringDrainageService; - - @Operation(summary = "新增水库基础信息") - @PostMapping("/StRes/insert") - public R insertRes(@RequestBody @Validated StResDto stResDto){ - engineeringDrainageService.insertStRes(stResDto); - return R.ok(); - } - - @Operation(summary = "更新水库的基础信息") - @PostMapping("/StRes/update") - public R updateStRes(@Validated(Insert.class) @RequestBody StResB stResB){ - engineeringDrainageService.updateStRes(stResB); - return R.ok(); - } - - @Operation(summary = "根据水库ID删除水库基本信息") - @GetMapping("/StRes/delete") - public R deleteStRes(@Parameter(description = "水库ID") @RequestParam("resId") String resId){ - engineeringDrainageService.deleteStRes(resId); - return R.ok(); - } - - @Operation(summary = "分页查询水库的基础信息") - @PostMapping("/StRes/page") - public R> pageStRes(@RequestBody @Validated StResPageSo stResPageSo){ - return R.ok(engineeringDrainageService.pageStRes(stResPageSo)); - } - - @Operation(summary = "新增水库测站关系") - @PostMapping("/StResStcdRef/insert") - public R insertStResStcdRef(@RequestBody @Validated StResStcdRefDto stResStcdRefDto){ - engineeringDrainageService.insertStResStcdRef(stResStcdRefDto); - return R.ok(); - } - - @Operation(summary = "更新水库测站关系") - @PostMapping("/StResStcdRef/update") - public R updateStResStcdRef(@RequestBody @Validated StResStcdRef stResStcdRef){ - engineeringDrainageService.updateStResStcdRef(stResStcdRef); - return R.ok(); - } - - @Operation(summary = "删除水库测站关系") - @GetMapping("/StResStcdRef/delete") - public R deleteStResStcdRef(@Parameter(description = "水库ID") @RequestParam("resId") String resId){ - engineeringDrainageService.deleteStResStcdRef(resId); - return R.ok(); - } - - @Operation(summary = "根据水库ID查询水库测站关系") - @GetMapping("/StResStcdRef/queryByResId") - public R queryStResStcdRefByResId(@Parameter(description = "水库ID") @RequestParam("resId")String resId){ - return R.ok(engineeringDrainageService.queryStResStcdRefByResId(resId)); - } - - @Operation(summary = "新增库容曲线信息") - @PostMapping("/StZvarl/insert") - public R insertStZvarl(@RequestBody @Validated StZvarlDto stZvarlDto){ - engineeringDrainageService.insertStZvarl(stZvarlDto); - return R.ok(); - } - - @Operation(summary = "更新库容曲线信息") - @PostMapping("/StZvarl/update") - public R updateStZvarl(@RequestBody @Validated StZvarlB stZvarlB){ - engineeringDrainageService.updateStZvarl(stZvarlB); - return R.ok(); - } - - @Operation(summary = "删除库容曲线信息") - @GetMapping("/StZvarl/delete") - public R deleteStZvarl( - @Parameter(description = "水库ID") @RequestParam("resId") String resId, - @Parameter(description = "序号") @RequestParam("ptno") String ptno){ - engineeringDrainageService.deleteStZvarl(resId,ptno); - return R.ok(); - } - - @Operation(summary = "分页查询库容曲线信息") - @PostMapping("/StZvarl/page") - public R> pageStZvarl(@RequestBody @Validated StZvarlSo stZvarlSo){ - return R.ok(engineeringDrainageService.pageStZvarl(stZvarlSo)); - } - - @Operation(summary = "新增水库责任人信息") - @PostMapping("/StResPersonRef/insert") - public R insertStResPersonRef(@RequestBody @Validated StResPersonRefDto stResPersonRefDto){ - engineeringDrainageService.insertStResPersonRef(stResPersonRefDto); - return R.ok(); - } - - @Operation(summary = "更新水库责任人关系") - @PostMapping("/StResPersonRef/update") - public R updateStResPersonRef(@RequestBody @Validated StResPersonRef stResPersonRef){ - engineeringDrainageService.updateStResPersonRef(stResPersonRef); - return R.ok(); - } - - @Operation(summary = "删除水库责任人信息") - @GetMapping("/StResPersonRef/delete") - public R deleteStResPersonRef(@Parameter(description = "水库责任人关系ID") @RequestParam("id") String id){ - engineeringDrainageService.deleteStResPersonRef(id); - return R.ok(); - } - - @Operation(summary = "分页查询水库责任人信息") - @PostMapping("/StResPersonRef/page") - public R> pageStResPersonRef(@RequestBody @Validated StResPersonRefSo stResPersonRefSo){ - return R.ok(engineeringDrainageService.pageStResPersonRef(stResPersonRefSo)); - } - - @Operation(summary = "新增水库附件信息") - @PostMapping("/StResFileRef/insert") - public R insertStResFileRef(@RequestBody @Validated StResFileRefDto stResFileRefDto){ - engineeringDrainageService.insertStResFileRef(stResFileRefDto); - return R.ok(); - } - - @Operation(summary = "根据水库附件关系ID删除水库附件信息") - @GetMapping("/StResFileRef/delete") - public R deleteStResFileRef(@Parameter(description = "水库附件关系ID") @RequestParam("id") String id){ - engineeringDrainageService.deleteStResFileRef(id); - return R.ok(); - } - - @Operation(summary = "分页查询水库附件") - @PostMapping("/StResFileRef/page") - public R> pageStResFileRef(@RequestBody @Validated StResFileRefSo stResFileRefSo){ - return R.ok(engineeringDrainageService.pageStResFileRef(stResFileRefSo)); - } - - @Operation(summary = "新增河流基础信息") - @PostMapping("/StRv/insert") - public R insertStRv(@RequestBody @Validated StRvDto stRvDto){ - engineeringDrainageService.insertStRv(stRvDto); - return R.ok(); - } - - @Operation(summary = "更新河流的基础信息") - @PostMapping("/StRv/update") - public R updateStRv(@RequestBody @Validated StRvB stRvB){ - engineeringDrainageService.updateStRv(stRvB); - return R.ok(); - } - - @Operation(summary = "根据河流ID删除河流信息") - @GetMapping("/StRv/delete") - public R deleteStRv(@Parameter(description = "河流ID") @RequestParam("rvId") String rvId){ - engineeringDrainageService.deleteStRv(rvId); - return R.ok(); - } - - @Operation(summary = "分页查询河流基础信息") - @PostMapping("/StRv/page") - public R> pageStRv(@RequestBody StRvPageSo stRvPageSo){ - return R.ok(engineeringDrainageService.pageStRv(stRvPageSo)); - } - - @Operation(summary = "新增大坝基础信息") - @PostMapping("/StDam/insert") - public R insertStDam(@RequestBody @Validated StDamDto stDamDto){ - engineeringDrainageService.insertStDam(stDamDto); - return R.ok(); - } - - @Operation(summary = "更新大坝基础信息") - @PostMapping("/StDam/update") - public R updateStDam(@RequestBody StDamB stDamB){ - engineeringDrainageService.updateStDam(stDamB); - return R.ok(); - } - - @Operation(summary = "根据大坝ID删除大坝基础信息") - @GetMapping("/StDam/delete") - public R deleteStDam(@Parameter(description = "大坝ID") @RequestParam("damId") String damId){ - engineeringDrainageService.deleteStDam(damId); - return R.ok(); - } - - @Operation(summary = "分页查询大坝信息") - @PostMapping("/StDam/query") - public R> PageStDam(@RequestBody @Validated StDamPageSo stDamPageSo){ - return R.ok(engineeringDrainageService.pageStDam(stDamPageSo)); - } - - @Operation(summary = "新增闸阀基础信息") - @PostMapping("/StGate/insert") - public R insertStGate(@RequestBody @Validated StGateDto stGateDto){ - engineeringDrainageService.insertStGate(stGateDto); - return R.ok(); - } - - @Operation(summary = "更新闸阀基础信息") - @PostMapping("/StGate/update") - public R updateStGate(@RequestBody @Validated StGateB stGateB){ - engineeringDrainageService.updateStGate(stGateB); - return R.ok(); - } - - @Operation(summary = "根据闸阀ID删除闸阀基础信息") - @GetMapping("/StGate/delete") - public R deleteStGate(@Parameter(description = "闸阀ID") @RequestParam("gateId") String gateId){ - engineeringDrainageService.deleteStGate(gateId); - return R.ok(); - } - - @Operation(summary = "分页查询闸阀基础信息") - @PostMapping("/StGate/page") - public R> pageStGate(@RequestBody @Validated StGatePageSo stGatePageSo){ - return R.ok(engineeringDrainageService.pageStGate(stGatePageSo)); - } - - - @Operation(summary = "新增量水堰基础信息") - @PostMapping("/StEqpt/insert") - public R insertStEqpt(@RequestBody @Validated StEqptDto stEqptDto){ - engineeringDrainageService.insertStEqpt(stEqptDto); - return R.ok(); - } - - @Operation(summary = "更新量水堰基础信息") - @PostMapping("/StEqpt/update") - public R updateStEqpt(@RequestBody StEqptB stEqptB){ - engineeringDrainageService.updateStEqpt(stEqptB); - return R.ok(); - } - - @Operation(summary = "删除量水堰基础信息") - @GetMapping("/StEqpt/delete") - public R deleteStEqpt(@Parameter(description = "量水设施ID") @RequestParam("wmeqId") String wmeqId){ - engineeringDrainageService.deleteStEqpt(wmeqId); - return R.ok(); - } - - @Operation(summary = "分页查询量水堰信息") - @PostMapping("/StEqpt/page") - public R> pageStEqpt(@RequestBody @Validated StEqptPageSo stEqptPageSo){ - return R.ok(engineeringDrainageService.pageStEqpt(stEqptPageSo)); - } - -} diff --git a/src/main/java/com/gunshi/project/xyt/controller/GateController.java b/src/main/java/com/gunshi/project/xyt/controller/GateController.java deleted file mode 100644 index 3fb019a..0000000 --- a/src/main/java/com/gunshi/project/xyt/controller/GateController.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.gunshi.project.xyt.controller; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.core.result.R; -import com.gunshi.project.xyt.entity.vo.GateHistoryInfoVo; -import com.gunshi.project.xyt.entity.vo.GateInfoVo; -import com.gunshi.project.xyt.entity.vo.StFlowRVo; -import com.gunshi.project.xyt.service.GateService; -import com.gunshi.project.xyt.so.GateHistoryPageSo; -import com.gunshi.project.xyt.validate.markers.QueryPage; -import com.gunshi.project.xyt.validate.markers.QueryTimeRange; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * 闸阀接口 - * Created by wanyan on 2024/1/26 - * - * @author wanyan - * @version 1.0 - */ -@RestController -@Slf4j -@Tag(name = "闸阀接口-controller", description = "闸阀接口") -@Data -@RequestMapping("/gate") -public class GateController { - - @Resource - private GateService gateService; - - @Operation(summary = "闸阀列表") - @GetMapping("/list") - public R> list() { - return R.ok(gateService.queryGateList()); - } - - @Operation(summary = "闸阀开关历史分页查询") - @PostMapping("/page") - public R> page(@Validated({QueryPage.class, QueryTimeRange.class}) @RequestBody(required = true) - GateHistoryPageSo gateHistoryPageSo) { - return R.ok(gateService.page(gateHistoryPageSo)); - } - - @Operation(summary = "流量计列表") - @GetMapping("/flow/list") - public R> flowList() { - return R.ok(gateService.queryFlowList()); - } - -} diff --git a/src/main/java/com/gunshi/project/xyt/controller/GateRepairRecordController.java b/src/main/java/com/gunshi/project/xyt/controller/GateRepairRecordController.java deleted file mode 100644 index 9654d1d..0000000 --- a/src/main/java/com/gunshi/project/xyt/controller/GateRepairRecordController.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.gunshi.project.xyt.controller; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.core.result.R; -import com.gunshi.project.xyt.entity.dto.StGateRepairRecordDto; -import com.gunshi.project.xyt.entity.vo.GateRepairDetailVo; -import com.gunshi.project.xyt.entity.vo.GateRepairRecordVo; -import com.gunshi.project.xyt.service.GateRepairRecordService; -import com.gunshi.project.xyt.so.GateRepairRecordPageSo; -import com.gunshi.project.xyt.validate.markers.Insert; -import com.gunshi.project.xyt.validate.markers.Update; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -/** - * 闸阀检修接口 - * Created by wanyan on 2024/1/26 - * - * @author wanyan - * @version 1.0 - */ -@RestController -@Slf4j -@Tag(name = "闸阀检修接口-controller", description = "闸阀检修接口") -@Data -@RequestMapping("/gate/repair") -public class GateRepairRecordController { - - @Resource - private GateRepairRecordService gateRepairRecordService; - - @Operation(summary = "新增检修记录") - @PostMapping("/add") - public R add(@Validated(Insert.class) @RequestBody StGateRepairRecordDto stGateRepairRecordDto) { - return R.ok(gateRepairRecordService.addRecord(stGateRepairRecordDto)); - } - - @Operation(summary = "更新检修记录") - @PostMapping("/update") - public R update(@RequestBody @Validated(Update.class) StGateRepairRecordDto stGateRepairRecordDto) { - return R.ok(gateRepairRecordService.updateRecord(stGateRepairRecordDto)); - } - - @Operation(summary = "检修记录详情") - @GetMapping("/detail") - public R detail(@RequestParam("recordId") Long recordId) { - return R.ok(gateRepairRecordService.detail(recordId)); - } - - @Operation(summary = "根据recordId删除检修记录") - @Parameter(name = "recordId", description = "检修记录id") - @GetMapping("/delete") - public R delete(@RequestParam("recordId") Long recordId){ - return R.ok(gateRepairRecordService.deleteRecord(recordId)); - } - - @Operation(summary = "分页查询") - @PostMapping("/page") - public R> page(@RequestBody @Validated GateRepairRecordPageSo gateRepairRecordPageSo) { - return R.ok(gateRepairRecordService.page(gateRepairRecordPageSo)); - } - -} diff --git a/src/main/java/com/gunshi/project/xyt/controller/HomePageController.java b/src/main/java/com/gunshi/project/xyt/controller/HomePageController.java deleted file mode 100644 index ec2b0ce..0000000 --- a/src/main/java/com/gunshi/project/xyt/controller/HomePageController.java +++ /dev/null @@ -1,149 +0,0 @@ -package com.gunshi.project.xyt.controller; - -import com.gunshi.core.annotation.Get; -import com.gunshi.core.result.R; -import com.gunshi.project.xyt.entity.vo.ReservoirLevelVo; -import com.gunshi.project.xyt.entity.vo.StPptnVo; -import com.gunshi.project.xyt.model.StRcvReal; -import com.gunshi.project.xyt.model.StResB; -import com.gunshi.project.xyt.model.StResPersonRef; -import com.gunshi.project.xyt.service.*; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import java.math.BigDecimal; -import java.util.List; - -/** - * TODO - * - * @ClassName HomePageController - * @Author Huang Qianxiang - * @Date 2024/2/1 15:34 - */ - -@Slf4j -@Tag(name = "首页接口") -@RestController -@RequestMapping("/homePage") -public class HomePageController { - - @Resource - private ReservoirLevelService reservoirLevelService; - @Resource - private RainMonitoringService rainMonitoringService; - @Resource - private BasicInfoService basicInfoService; - @Resource - private StResPersonRefService stResPersonRefService; - @Resource - private WarningInfoService warningInfoService; - @Resource - private MonitorEquipmentHealthService monitorEquipmentHealthService; - - @Get(path = "/reservoirLevel/queryChfllv",summary = "根据水库ID查询校核洪水位") - public R queryChfllvByResId(@Parameter(description = "水库ID") @RequestParam("resId") String resId){ - return R.ok(reservoirLevelService.queryChfllvByResId(resId)); - } - - @Get(path = "/reservoirLevel/queryFlLowLimLev",summary = "根据水库ID查询汛限水位") - public R queryFlLowLimLevByResId(@Parameter(description = "水库ID") @RequestParam("resId") String resId){ - return R.ok(reservoirLevelService.queryFlLowLimLevByResId(resId)); - } - - @Get(path = "/reservoirLevel/queryTotCap",summary = "根据水库ID查询总库容") - public R queryTotCapByResId(@Parameter(description = "水库ID") @RequestParam("resId") String resId){ - return R.ok(reservoirLevelService.queryTotCapByResId(resId)); - } - - @Get(path = "/reservoirLevel/queryDeadLev",summary = "根据水库ID查询死水位") - public R queryDeadLevByResId(@Parameter(description = "水库ID") @RequestParam("resId") String resId){ - return R.ok(reservoirLevelService.queryDeadLevByResId(resId)); - } - - @Get(path = "/reservoirLevel/queryRz",summary = "根据水库ID查询实时水位") - public R queryRzByResId(@Parameter(description = "水库ID") @RequestParam("resId") String resId){ - return R.ok(reservoirLevelService.queryRzByResId(resId)); - } - - @Get(path = "/reservoirLevel/queryRzSevenDay",summary = "根据水库ID查询七日内每小时平均水库水位") - public R> queryRzSevenDayByResId(@Parameter(description = "水库ID") @RequestParam("resId") String resId){ - return R.ok(reservoirLevelService.queryRzSevenDayByResId(resId)); - } - - @Get(path = "/reservoirLevel/queryRzMonth",summary = "根据水库ID查询一个月内每天八点水库水位") - public R> queryRzMonthByResId(@Parameter(description = "水库ID") @RequestParam("resId") String resId){ - return R.ok(reservoirLevelService.queryRzMonthByResId(resId)); - } - - @Get(path = "/reservoirLevel/queryRzHalfYear",summary = "根据水库ID查询半年每天八点水库水位") - public R> queryRzHalfYearByResId(@Parameter(description = "水库ID") @RequestParam("resId") String resId){ - return R.ok(reservoirLevelService.queryRzHalfYearByResId(resId)); - } - - @Get(path = "/rainMonitoring/queryTodayDrp",summary = "根据水库ID查询今天降雨量") - public R> queryTodayDrpByResId(@Parameter(description = "水库ID") @RequestParam("resId") String resId){ - return R.ok(rainMonitoringService.queryTodayDrpByResId(resId)); - } - - @Get(path = "/rainMonitoring/queryYesterdayDrp",summary = "根据水库ID查询昨天降雨量") - public R> queryYesterdayDrpByResId(@Parameter(description = "水库ID") @RequestParam("resId") String resId){ - return R.ok(rainMonitoringService.queryYesterdayDrpByResId(resId)); - } - - @Get(path = "/rainMonitoring/query24HourDrp",summary = "根据水库ID查询24小时内的降雨量") - public R> query24HourDrpByResId(@Parameter(description = "水库ID") @RequestParam("resId") String resId){ - return R.ok(rainMonitoringService.query24HourDrpByResId(resId)); - } - - @Get(path = "/rainMonitoring/query72HourDrp",summary = "根据水库ID查询72小时内的降雨量") - public R> query72HourDrpByResId(@Parameter(description = "水库ID") @RequestParam("resId") String resId){ - return R.ok(rainMonitoringService.query72HourDrpByResId(resId)); - } - - @Get(path = "/rainMonitoring/querySevenDayDrp",summary = "根据水库ID查询七日的降雨量") - public R> querySevenDayDrpByResId(@Parameter(description = "水库ID") @RequestParam("resId") String resId){ - return R.ok(rainMonitoringService.querySevenDayDrpByResId(resId)); - } - - @Get(path = "/basicInfo/queryStResBasicInfo",summary = "根据水库ID查询水库基础信息") - public R queryStResBasicInfoByResId(@Parameter(description = "水库ID") @RequestParam("resId") String resId){ - return R.ok(basicInfoService.queryStResBasicInfoByResId(resId)); - } - - @Get(path = "/personInCharge/queryStResPersonRef",summary = "根据水库ID查询责任人信息") - public R> queryStResPersonRefByResId(@Parameter(description = "水库ID") @RequestParam("resId") String resId){ - return R.ok(stResPersonRefService.queryStResPersonRefByResId(resId)); - } - - @Get(path = "/warningInfo/reservoirExceededLimit",summary = "判断水库超汛限是否正常") - public R ReservoirExceededLimit(@Parameter(description = "水库ID") @RequestParam("resId") String resId){ - return R.ok(warningInfoService.ReservoirExceededLimit(resId)); - } - - @Get(path = "/monitorEquipmentHealth/queryAllStcdCount",summary = "查看监测设备总数") - public R queryAllStcdCount(){ - return R.ok(monitorEquipmentHealthService.queryAllStcdCount()); - } - - @Get(path = "/monitorEquipmentHealth/queryOnlineStcdCount",summary = "查看近一个小时检测设备在线数量") - public R queryOnlineStcdCount(){ - return R.ok(monitorEquipmentHealthService.queryOnlineStcdCount()); - } - - @Get(path = "/monitorEquipmentHealth/queryOffLineStcd",summary = "查看离线设备清单") - public R> queryOffLineStcd(){ - return R.ok(monitorEquipmentHealthService.queryOffLineStcd()); - } - - @Get(path = "/monitorEquipmentHealth/queryOnLineStcd",summary = "查看在线设备清单") - public R> queryOnLineStcd(){ - return R.ok(monitorEquipmentHealthService.queryOnLineStcd()); - } - -} diff --git a/src/main/java/com/gunshi/project/xyt/controller/ICommonDeleteByIdWithAttach.java b/src/main/java/com/gunshi/project/xyt/controller/ICommonDeleteByIdWithAttach.java new file mode 100644 index 0000000..1002749 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/controller/ICommonDeleteByIdWithAttach.java @@ -0,0 +1,33 @@ +package com.gunshi.project.xyt.controller; + +import com.gunshi.core.result.R; +import com.gunshi.db.dao.BaseDao; +import com.gunshi.db.dao.IMapper; +import com.gunshi.project.xyt.service.AbstractModelWithAttachService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Schema; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; + +import java.io.Serializable; + +/** + * 通用按id删除 + * + * @author lyf + * @version 1.0.0 + * @since 2024-01-31 + */ +public interface ICommonDeleteByIdWithAttach, AutoDao extends BaseDao, + AttachModel, AttachModelAutoMapper extends IMapper, AttachModelAutoDao extends BaseDao> { + + AbstractModelWithAttachService getModelService(); + + Serializable getId(Serializable id); + + @Operation(summary = "按id删除") + @GetMapping("/deleteById/{id}") + default R commonDeleteById(@Schema(name = "id") @PathVariable("id") Serializable id) { + return R.ok(getModelService().removeById(getId(id))); + } +} diff --git a/src/main/java/com/gunshi/project/xyt/controller/ICommonFileController.java b/src/main/java/com/gunshi/project/xyt/controller/ICommonFileController.java new file mode 100644 index 0000000..e67b4cb --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/controller/ICommonFileController.java @@ -0,0 +1,29 @@ +package com.gunshi.project.xyt.controller; + +import com.gunshi.core.result.R; +import com.gunshi.file.controller.IFileController; +import com.gunshi.file.model.FileDescriptor; +import io.swagger.v3.oas.annotations.Parameter; +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RequestPart; +import org.springframework.web.multipart.MultipartFile; + +/** + * 类描述 + * + * @author lyf + * @version 1.0.0 + * @since 2024-03-12 + */ +public interface ICommonFileController extends IFileController { + + String getGroupId(); + + String getBusinessType(); + + R uploadSingle( + @Parameter(description = "文件") @RequestPart("file") MultipartFile file, + @Parameter(description = "上传者用户id", hidden = true) @RequestParam(value = "userId", required = false) Long userId, + @Parameter(hidden = true) HttpServletRequest request) throws Exception; +} diff --git a/src/main/java/com/gunshi/project/xyt/controller/ICommonInsertWithAttach.java b/src/main/java/com/gunshi/project/xyt/controller/ICommonInsertWithAttach.java new file mode 100644 index 0000000..2aae795 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/controller/ICommonInsertWithAttach.java @@ -0,0 +1,34 @@ +package com.gunshi.project.xyt.controller; + +import com.gunshi.core.result.R; +import com.gunshi.db.dao.BaseDao; +import com.gunshi.db.dao.IMapper; +import com.gunshi.project.xyt.service.AbstractModelWithAttachService; +import com.gunshi.project.xyt.validate.markers.Insert; +import io.swagger.v3.oas.annotations.Operation; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * 类描述 + * + * @author lyf + * @version 1.0.0 + * @since 2024-03-19 + */ +public interface ICommonInsertWithAttach, AutoDao extends BaseDao, + AttachModel, AttachModelAutoMapper extends IMapper, AttachModelAutoDao extends BaseDao> { + AbstractModelWithAttachService getModelService(); + + void customSetFieldForInsert(Model model); + + @Operation(summary = "实体类新增") + @PostMapping("/insert") + default R commonInsert(@Validated(Insert.class) @RequestBody Model model) { + customSetFieldForInsert(model); + boolean result = getModelService().save(model); + return R.ok(result ? model : null); + } + +} diff --git a/src/main/java/com/gunshi/project/xyt/controller/ICommonQueryAttach.java b/src/main/java/com/gunshi/project/xyt/controller/ICommonQueryAttach.java new file mode 100644 index 0000000..03e32c1 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/controller/ICommonQueryAttach.java @@ -0,0 +1,41 @@ +package com.gunshi.project.xyt.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.gunshi.core.result.R; +import com.gunshi.db.dao.BaseDao; +import com.gunshi.db.dao.IMapper; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Schema; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; + +import java.io.Serializable; +import java.util.List; + +/** + * 类描述 + * + * @author lyf + * @version 1.0.0 + * @since 2024-03-19 + */ +public interface ICommonQueryAttach, AutoDao extends BaseDao> { + AutoDao getAttachAutoDao(); + + String getAttachBzIdName(); + + IdType getId(Serializable id); + + @Operation(summary = "按id查询") + @GetMapping("/attach/getById/{id}") + default R commonGetAttachById(@Schema(name = "id") @PathVariable("id") Serializable id) { + return R.ok(getAttachAutoDao().getById(id)); + } + + @Operation(summary = "按bzId查询") + @GetMapping("/attach/getByBzId/{bzId}") + default R> commonGetAttachByBzId(@Schema(name = "bzId") @PathVariable("bzId") Serializable bzId) { + return R.ok(getAttachAutoDao().list(new QueryWrapper().eq(getAttachBzIdName(), getId(bzId)))); + } +} + diff --git a/src/main/java/com/gunshi/project/xyt/controller/ICommonUpdateByIdWithAttach.java b/src/main/java/com/gunshi/project/xyt/controller/ICommonUpdateByIdWithAttach.java new file mode 100644 index 0000000..0240975 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/controller/ICommonUpdateByIdWithAttach.java @@ -0,0 +1,34 @@ +package com.gunshi.project.xyt.controller; + +import com.gunshi.core.result.R; +import com.gunshi.db.dao.BaseDao; +import com.gunshi.db.dao.IMapper; +import com.gunshi.project.xyt.service.AbstractModelWithAttachService; +import com.gunshi.project.xyt.validate.markers.Update; +import io.swagger.v3.oas.annotations.Operation; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +/** + * 通用实体类新增 + * + * @author lyf + * @version 1.0.0 + * @since 2024-02-19 + */ +public interface ICommonUpdateByIdWithAttach, AutoDao extends BaseDao, + AttachModel, AttachModelAutoMapper extends IMapper, AttachModelAutoDao extends BaseDao> { + + AbstractModelWithAttachService getModelService(); + + void customSetFieldForUpdate(Model model); + + @Operation(summary = "实体类修改") + @PostMapping("/update") + default R commonUpdateById(@Validated(Update.class) @RequestBody Model model) { + customSetFieldForUpdate(model); + boolean result = getModelService().updateById(model); + return R.ok(result ? model : null); + } +} diff --git a/src/main/java/com/gunshi/project/xyt/controller/PingController.java b/src/main/java/com/gunshi/project/xyt/controller/PingController.java deleted file mode 100644 index 40d0e9b..0000000 --- a/src/main/java/com/gunshi/project/xyt/controller/PingController.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.gunshi.project.xyt.controller; - -import com.gunshi.core.GunShiCoreProperties; -import com.gunshi.file.controller.BaseLoginFileController; -import com.gunshi.logging.access.annotation.LoginLogging; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 类描述 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-18 - */ -@RestController -@Tag(name = "Ping") -@RequestMapping("/ping") -public class PingController extends BaseLoginFileController { - @Autowired - private GunShiCoreProperties properties; - - @Operation(summary = "测试接口") - @LoginLogging - @GetMapping("") - public String ping() { - return "pong"; - } -} diff --git a/src/main/java/com/gunshi/project/xyt/controller/RcvLogUpRController.java b/src/main/java/com/gunshi/project/xyt/controller/RcvLogUpRController.java deleted file mode 100644 index 0200759..0000000 --- a/src/main/java/com/gunshi/project/xyt/controller/RcvLogUpRController.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.gunshi.project.xyt.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.core.result.R; -import com.gunshi.project.xyt.mapper.RcvLogUpRMapper; -import com.gunshi.project.xyt.model.*; -import com.gunshi.project.xyt.model.RcvLogUpRAutoDao; -import com.gunshi.project.xyt.model.StStbprpBAutoMapper; -import com.gunshi.project.xyt.so.RcvLogUpRSo; -import com.gunshi.project.xyt.so.RtuDataSo; -import com.gunshi.project.xyt.vo.RcvLogUpRVo; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.ArrayList; -import java.util.List; - -/** - * 报文日志数据接口 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-26 - */ -@RestController -@RequestMapping("/rcv/log") -@Tag(name = "统一接收-报文日志") -public class RcvLogUpRController { - - @Autowired - private RcvLogUpRMapper mapper; - - @Autowired - private StStbprpBAutoMapper stbprpDao; - - @Operation(summary = "分页查询") - @PostMapping("/up/page") - public R> page(@RequestBody RcvLogUpRSo so) { - List stcds = new ArrayList<>(); - if (StringUtils.isNotEmpty(so.getStcd())) { - stcds.add(so.getStcd()); - } else if (StringUtils.isNotEmpty(so.getStnm())) { - stcds.addAll(stbprpDao.selectList( - new LambdaQueryWrapper().like(StStbprpB::getStnm, so.getStnm()) - ).stream().map(StStbprpB::getStcd).toList()); - } - - Page page = mapper.page(so.getPageSo().toPage(), so); - - return R.ok(page); - } -} diff --git a/src/main/java/com/gunshi/project/xyt/controller/RescueGoodsBController.java b/src/main/java/com/gunshi/project/xyt/controller/RescueGoodsBController.java new file mode 100644 index 0000000..cd59e70 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/controller/RescueGoodsBController.java @@ -0,0 +1,108 @@ +package com.gunshi.project.xyt.controller; + +import com.baomidou.mybatisplus.core.toolkit.IdWorker; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.gunshi.core.annotation.Get; +import com.gunshi.core.annotation.Post; +import com.gunshi.core.result.R; +import com.gunshi.file.model.FileDescriptor; +import com.gunshi.project.xyt.entity.so.RescueGoodsPageSo; +import com.gunshi.project.xyt.model.RescueGoodsB; +import com.gunshi.project.xyt.model.RescueGoodsFile; +import com.gunshi.project.xyt.model.RescueGoodsFileAutoDao; +import com.gunshi.project.xyt.model.RescueGoodsFileAutoMapper; +import com.gunshi.project.xyt.service.AbstractModelWithAttachService; +import com.gunshi.project.xyt.service.RescueGoodsService; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * Description: + * Created by wanyan on 2024/3/18 + * + * @author wanyan + * @version 1.0 + */ +@Tag(name = "抢险物资") +@RestController +@RequestMapping("/rescue/goods") +public class RescueGoodsBController extends AbstractCommonFileController implements + ICommonInsertWithAttach, + ICommonUpdateByIdWithAttach, + ICommonDeleteByIdWithAttach, + ICommonQueryAttach +{ + + + @Autowired + private RescueGoodsFileAutoDao fileAutoDao; + + @Autowired + private RescueGoodsService rescueGoodsService; + + + @Override + public void customSetFieldForUpdate(RescueGoodsB model) { + model.setTm(new Date()); + } + + @Override + public RescueGoodsFileAutoDao getAttachAutoDao() { + return fileAutoDao; + } + + @Override + public String getAttachBzIdName() { + return "goods_id"; + } + + @Override + public Long getId(Serializable id) { + return Long.valueOf(id.toString()); + } + + @Override + public AbstractModelWithAttachService getModelService() { + return rescueGoodsService; + } + + @Override + public void customSetFieldForInsert(RescueGoodsB model) { + long id = IdWorker.getId(); + model.setGoodsId(id); + model.setTm(new Date()); + } + + @Override + public String getGroupId() { + return "RescueGoodsB"; + } + + + /** + * 分页查询 + */ + @Post(path = "/page/query", summary = "分页查询") + public R> pageQuery(@RequestBody @Validated RescueGoodsPageSo RescueGoodsPageSo) { + return R.ok(rescueGoodsService.pageQuery(RescueGoodsPageSo)); + } + + /** + * 详情 + */ + @Get(path = "/detail", summary = "详情") + public R> detail(@Schema(name = "goodsId",description = "物资id") @RequestParam(name = "goodsId") Long goodsId) { + return R.ok(rescueGoodsService.detail(goodsId)); + } + +} diff --git a/src/main/java/com/gunshi/project/xyt/controller/StFlowRController.java b/src/main/java/com/gunshi/project/xyt/controller/StFlowRController.java deleted file mode 100644 index 0ff4d4a..0000000 --- a/src/main/java/com/gunshi/project/xyt/controller/StFlowRController.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.gunshi.project.xyt.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.core.result.R; -import com.gunshi.project.xyt.model.StFlowR; -import com.gunshi.project.xyt.model.StFlowRAutoDao; -import com.gunshi.project.xyt.model.StStbprpB; -import com.gunshi.project.xyt.model.StStbprpBAutoMapper; -import com.gunshi.project.xyt.so.RtuDataSo; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.ArrayList; -import java.util.List; - -/** - * 流量数据接口 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-26 - */ -@RestController -@RequestMapping("/rcv/flowr") -@Tag(name = "统一接收-流量数据") -public class StFlowRController { - - @Autowired - private StFlowRAutoDao dao; - - @Autowired - private StStbprpBAutoMapper stbprpDao; - - @Operation(summary = "分页查询") - @PostMapping("/page/{chid}") - public R> page(@RequestBody RtuDataSo so, @PathVariable("chid") String chid) { - List stcds = new ArrayList<>(); - if (StringUtils.isNotEmpty(so.getStcd())) { - stcds.add(so.getStcd()); - } else if (StringUtils.isNotEmpty(so.getStnm())) { - stcds.addAll(stbprpDao.selectList( - new LambdaQueryWrapper().like(StStbprpB::getStnm, so.getStnm()) - ).stream().map(StStbprpB::getStcd).toList()); - } - - Page page; - if (!stcds.isEmpty()) { - LambdaQueryWrapper query = new LambdaQueryWrapper().in(StFlowR::getStcd, stcds).eq(StFlowR::getChid, chid); - page = dao.page(so.getPageSo().toPage(), query); - } else { - page = dao.page(so.getPageSo().toPage()); - } - - return R.ok(page); - } -} diff --git a/src/main/java/com/gunshi/project/xyt/controller/StImgRController.java b/src/main/java/com/gunshi/project/xyt/controller/StImgRController.java deleted file mode 100644 index 774c493..0000000 --- a/src/main/java/com/gunshi/project/xyt/controller/StImgRController.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.gunshi.project.xyt.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.core.result.R; -import com.gunshi.project.xyt.model.StImgR; -import com.gunshi.project.xyt.model.StImgRAutoDao; -import com.gunshi.project.xyt.model.StStbprpB; -import com.gunshi.project.xyt.model.StStbprpBAutoMapper; -import com.gunshi.project.xyt.so.RtuDataSo; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.ArrayList; -import java.util.List; - -/** - * 图像数据接口 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-26 - */ -@RestController -@RequestMapping("/rcv/imgr") -@Tag(name = "统一接收-图像数据") -public class StImgRController { - - @Autowired - private StImgRAutoDao dao; - - @Autowired - private StStbprpBAutoMapper stbprpDao; - - @Operation(summary = "分页查询") - @PostMapping("/page/{chid}") - public R> page(@RequestBody RtuDataSo so, @PathVariable("chid") String chid) { - List stcds = new ArrayList<>(); - if (StringUtils.isNotEmpty(so.getStcd())) { - stcds.add(so.getStcd()); - } else if (StringUtils.isNotEmpty(so.getStnm())) { - stcds.addAll(stbprpDao.selectList( - new LambdaQueryWrapper().like(StStbprpB::getStnm, so.getStnm()) - ).stream().map(StStbprpB::getStcd).toList()); - } - - Page page; - if (!stcds.isEmpty()) { - LambdaQueryWrapper query = new LambdaQueryWrapper().in(StImgR::getStcd, stcds).eq(StImgR::getChid, chid); - page = dao.page(so.getPageSo().toPage(), query); - } else { - page = dao.page(so.getPageSo().toPage()); - } - - return R.ok(page); - } -} diff --git a/src/main/java/com/gunshi/project/xyt/controller/StPptnRController.java b/src/main/java/com/gunshi/project/xyt/controller/StPptnRController.java deleted file mode 100644 index 32b7a91..0000000 --- a/src/main/java/com/gunshi/project/xyt/controller/StPptnRController.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.gunshi.project.xyt.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.core.result.R; -import com.gunshi.project.xyt.model.StPptnR; -import com.gunshi.project.xyt.model.StPptnRAutoDao; -import com.gunshi.project.xyt.model.StStbprpB; -import com.gunshi.project.xyt.model.StStbprpBAutoMapper; -import com.gunshi.project.xyt.so.RtuDataSo; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.ArrayList; -import java.util.List; - -/** - * 雨量数据接口 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-26 - */ -@RestController -@RequestMapping("/rcv/pptnr") -@Tag(name = "统一接收-雨量数据") -public class StPptnRController { - - @Autowired - private StPptnRAutoDao dao; - - @Autowired - private StStbprpBAutoMapper stbprpDao; - - @Operation(summary = "分页查询") - @PostMapping("/page") - public R> page(@RequestBody RtuDataSo so) { - List stcds = new ArrayList<>(); - if (StringUtils.isNotEmpty(so.getStcd())) { - stcds.add(so.getStcd()); - } else if (StringUtils.isNotEmpty(so.getStnm())) { - stcds.addAll(stbprpDao.selectList( - new LambdaQueryWrapper().like(StStbprpB::getStnm, so.getStnm()) - ).stream().map(StStbprpB::getStcd).toList()); - } - - Page page; - if (!stcds.isEmpty()) { - LambdaQueryWrapper query = new LambdaQueryWrapper().in(StPptnR::getStcd, stcds); - page = dao.page(so.getPageSo().toPage(), query); - } else { - page = dao.page(so.getPageSo().toPage()); - } - - return R.ok(page); - } -} diff --git a/src/main/java/com/gunshi/project/xyt/controller/StRcvRealController.java b/src/main/java/com/gunshi/project/xyt/controller/StRcvRealController.java deleted file mode 100644 index 6fb0900..0000000 --- a/src/main/java/com/gunshi/project/xyt/controller/StRcvRealController.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.gunshi.project.xyt.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.core.result.R; -import com.gunshi.project.xyt.model.StRcvReal; -import com.gunshi.project.xyt.model.StRcvRealAutoDao; -import com.gunshi.project.xyt.so.StRcvRealSo; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * 监测类数据实时表 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-29 - */ -@RestController -@Tag(name = "统一接收-监测类数据实时表") -@RequestMapping("/rcv/real") -public class StRcvRealController { - - @Autowired - private StRcvRealAutoDao dao; - - @PostMapping("/page") - @Operation(summary = "分页查询") - public R> page(@RequestBody StRcvRealSo so) { - if (StringUtils.isNotEmpty(so.getStcd())) { - StRcvReal entity = dao.getById(so.getStcd()); - List list = List.of(entity); - return R.ok(new Page(1, 1, 1).setRecords(list)); - } - - LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(so.getStnm())) { - query.like(StRcvReal::getStnm, so.getStnm()); - } - if (StringUtils.isNotEmpty(so.getSttp())) { - query.eq(StRcvReal::getSttp, so.getSttp()); - } - if (StringUtils.isNotEmpty(so.getProtocolId())) { - query.eq(StRcvReal::getProtocolId, so.getProtocolId()); - } - query.orderByDesc(StRcvReal::getTm); - - return R.ok(dao.page(so.getPageSo().toPage(), query)); - } -} diff --git a/src/main/java/com/gunshi/project/xyt/controller/StRsvrRController.java b/src/main/java/com/gunshi/project/xyt/controller/StRsvrRController.java deleted file mode 100644 index c98a990..0000000 --- a/src/main/java/com/gunshi/project/xyt/controller/StRsvrRController.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.gunshi.project.xyt.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.core.result.R; -import com.gunshi.project.xyt.model.StRsvrR; -import com.gunshi.project.xyt.model.StRsvrRAutoDao; -import com.gunshi.project.xyt.model.StStbprpB; -import com.gunshi.project.xyt.model.StStbprpBAutoMapper; -import com.gunshi.project.xyt.so.RtuDataSo; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.ArrayList; -import java.util.List; - -/** - * 水位数据接口 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-26 - */ -@RestController -@RequestMapping("/rcv/rsvrr") -@Tag(name = "统一接收-水位数据") -public class StRsvrRController { - - @Autowired - private StRsvrRAutoDao dao; - - @Autowired - private StStbprpBAutoMapper stbprpDao; - - @Operation(summary = "分页查询") - @PostMapping("/page") - public R> page(@RequestBody RtuDataSo so) { - List stcds = new ArrayList<>(); - if (StringUtils.isNotEmpty(so.getStcd())) { - stcds.add(so.getStcd()); - } else if (StringUtils.isNotEmpty(so.getStnm())) { - stcds.addAll(stbprpDao.selectList( - new LambdaQueryWrapper().like(StStbprpB::getStnm, so.getStnm()) - ).stream().map(StStbprpB::getStcd).toList()); - } - - Page page; - if (!stcds.isEmpty()) { - LambdaQueryWrapper query = new LambdaQueryWrapper().in(StRsvrR::getStcd, stcds); - page = dao.page(so.getPageSo().toPage(), query); - } else { - page = dao.page(so.getPageSo().toPage()); - } - - return R.ok(page); - } -} diff --git a/src/main/java/com/gunshi/project/xyt/controller/StVoltageRController.java b/src/main/java/com/gunshi/project/xyt/controller/StVoltageRController.java deleted file mode 100644 index 60531a8..0000000 --- a/src/main/java/com/gunshi/project/xyt/controller/StVoltageRController.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.gunshi.project.xyt.controller; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.core.result.R; -import com.gunshi.project.xyt.model.StStbprpB; -import com.gunshi.project.xyt.model.StStbprpBAutoMapper; -import com.gunshi.project.xyt.model.StVoltageR; -import com.gunshi.project.xyt.model.StVoltageRAutoDao; -import com.gunshi.project.xyt.so.RtuDataSo; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.ArrayList; -import java.util.List; - -/** - * 电压数据接口 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-26 - */ -@RestController -@RequestMapping("/rcv/voltager") -@Tag(name = "统一接收-电压数据") -public class StVoltageRController { - - @Autowired - private StVoltageRAutoDao dao; - - @Autowired - private StStbprpBAutoMapper stbprpDao; - - @Operation(summary = "分页查询") - @PostMapping("/page") - public R> page(@RequestBody RtuDataSo so) { - List stcds = new ArrayList<>(); - if (StringUtils.isNotEmpty(so.getStcd())) { - stcds.add(so.getStcd()); - } else if (StringUtils.isNotEmpty(so.getStnm())) { - stcds.addAll(stbprpDao.selectList( - new LambdaQueryWrapper().like(StStbprpB::getStnm, so.getStnm()) - ).stream().map(StStbprpB::getStcd).toList()); - } - - Page page; - if (!stcds.isEmpty()) { - LambdaQueryWrapper query = new LambdaQueryWrapper().in(StVoltageR::getStcd, stcds); - page = dao.page(so.getPageSo().toPage(), query); - } else { - page = dao.page(so.getPageSo().toPage()); - } - - return R.ok(page); - } -} diff --git a/src/main/java/com/gunshi/project/xyt/controller/WaterQualityController.java b/src/main/java/com/gunshi/project/xyt/controller/WaterQualityController.java deleted file mode 100644 index 916c25a..0000000 --- a/src/main/java/com/gunshi/project/xyt/controller/WaterQualityController.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.gunshi.project.xyt.controller; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.core.result.R; -import com.gunshi.project.xyt.model.StWaterQualityR; -import com.gunshi.project.xyt.service.WaterQualityService; -import com.gunshi.project.xyt.so.WaterQualityPageSo; -import com.gunshi.project.xyt.validate.markers.QueryPage; -import com.gunshi.project.xyt.validate.markers.QueryTimeRange; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.servlet.http.HttpServletResponse; -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; - -import java.io.IOException; - -/** - * Description: - * Created by xusan on 2024/1/23 - * - * @author xusan - * @version 1.0 - */ -@RestController -@Slf4j -@Tag(name = "水质整编接口-controller", description = "水质整编接口") -@Data -@RequestMapping("/waterQuality") -public class WaterQualityController { - - private final WaterQualityService waterqualityService; - -// @Operation(summary = "新增水质监测数据") -// @ApiResponses(value = { -// @ApiResponse(responseCode = "200",description = "成功") -// }) -// @PostMapping("/add") -// public R add(@RequestBody @Validated StWaterQualityR organization){ -// return R.ok(waterqualityService.add(organization)); -// } -// -// @Operation(summary = "更新水质监测数据") -// @ApiResponses(value = { -// @ApiResponse(responseCode = "200",description = "成功") -// }) -// @PostMapping("/update") -// public R update(@RequestBody @Validated StWaterQualityR organization){ -// return R.ok(waterqualityService.update(organization)); -// } -// -// @Operation(summary = "根据id删除水质监测数据") -// @Parameter(name = "id", description = "水质监测数据id") -// @DeleteMapping("/delete") -// public R delete(@RequestParam("id") String orgCode){ -// return R.ok(waterqualityService.delete(orgCode)); -// } - - @Operation(summary = "水质监测数据分页查询") - @PostMapping("/page") - public R> page( - @Validated({QueryPage.class, QueryTimeRange.class}) @RequestBody - WaterQualityPageSo waterQualityPageSo - ) { - return R.ok(waterqualityService.page(waterQualityPageSo)); - } - - @Operation(summary = "水质监测数据导出") - @PostMapping("/export") - public void export( - @Validated({QueryPage.class, QueryTimeRange.class}) @RequestBody - WaterQualityPageSo waterQualityPageSo, HttpServletResponse response) { - waterqualityService.export(waterQualityPageSo, response); - } - - @Operation(summary = "水质监测数据导入") - @PostMapping("/import") - public R importExcel(@RequestParam("file") MultipartFile file) { - if (file.isEmpty()) { - return R.error(400, "请选择上传文件",false); - } - - try { - - return R.ok( waterqualityService.importExcel(file)); - - } catch (IOException e) { - - return R.error(500, "文件上传失败: " + e.getMessage(),false); - - } - } - -} diff --git a/src/main/java/com/gunshi/project/xyt/entity/basedata/CheckStringSearch.java b/src/main/java/com/gunshi/project/xyt/entity/basedata/CheckStringSearch.java deleted file mode 100644 index 7e5beaf..0000000 --- a/src/main/java/com/gunshi/project/xyt/entity/basedata/CheckStringSearch.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.gunshi.project.xyt.entity.basedata; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import lombok.Data; - -/** - * @author Sun Lejun - * @version 1.0 - * @date 2024/1/26 - */ - -@Data -@Schema(description = "表单参数校验对象") -public class CheckStringSearch { - @Schema(description="编码/名称/关键词") - @NotBlank(message = "关键词不能为空") - private String keyword; - @Schema(description="修改时候传入当前对象id，用来排除自己 数值类型") - private Long id; -} diff --git a/src/main/java/com/gunshi/project/xyt/entity/basedata/GeneralSearch.java b/src/main/java/com/gunshi/project/xyt/entity/basedata/GeneralSearch.java deleted file mode 100644 index a292fb9..0000000 --- a/src/main/java/com/gunshi/project/xyt/entity/basedata/GeneralSearch.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.gunshi.project.xyt.entity.basedata; - -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.gunshi.db.dto.PageSo; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -/** - * @author Sun Lejun - * @version 1.0 - * @date 2024/1/25 - */ - -@Data -@Schema(description="通用关键词分页查询对象") -public class GeneralSearch { - @Schema(description="关键词：名称,编码", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - private String keyword; - - @NotNull(message = "分页参数不能为空") - @Schema(description = "分页参数") - private PageSo pageSo; - - @JsonIgnore - public void setPage(int page){ - if (pageSo == null){ - pageSo = new PageSo(); - } - pageSo.setPageNumber(page); - } - - @JsonIgnore - public void setPageSize(int pageSize){ - if (pageSo == null){ - pageSo = new PageSo(); - } - pageSo.setPageSize(pageSize); - } -} diff --git a/src/main/java/com/gunshi/project/xyt/entity/basedata/StAddvcdTreeVo.java b/src/main/java/com/gunshi/project/xyt/entity/basedata/StAddvcdTreeVo.java deleted file mode 100644 index 0478233..0000000 --- a/src/main/java/com/gunshi/project/xyt/entity/basedata/StAddvcdTreeVo.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.gunshi.project.xyt.entity.basedata; - -import com.google.common.collect.Lists; -import com.gunshi.project.xyt.model.StAddvcdD; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -import java.util.List; - -/** - * @author Sun Lejun - * @version 1.0 - * @date 2024/1/25 - */ - -@EqualsAndHashCode(callSuper = true) -@Data -@ToString(callSuper = true) -@Schema(description = "行政区划树信息") -public class StAddvcdTreeVo extends StAddvcdD { - private String parentCode; - private List children = Lists.newArrayList(); -} diff --git a/src/main/java/com/gunshi/project/xyt/entity/basedata/StCameraAreaTreeVo.java b/src/main/java/com/gunshi/project/xyt/entity/basedata/StCameraAreaTreeVo.java deleted file mode 100644 index d42d75e..0000000 --- a/src/main/java/com/gunshi/project/xyt/entity/basedata/StCameraAreaTreeVo.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.gunshi.project.xyt.entity.basedata; - -import com.google.common.collect.Lists; -import com.gunshi.project.xyt.model.StCameraAreaB; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -import java.io.Serializable; -import java.util.List; - -/** - * @author Sun Lejun - * @version 1.0 - * @date 2024/1/24 - */ - -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Schema(description="视频点树信息") -public class StCameraAreaTreeVo extends StCameraAreaB implements Serializable { - @Schema(description="子区域对象") - private List children = Lists.newArrayList(); - @Schema(description="监控点列表") - private List cameraList = Lists.newArrayList(); -} diff --git a/src/main/java/com/gunshi/project/xyt/entity/basedata/StCameraAreaVo.java b/src/main/java/com/gunshi/project/xyt/entity/basedata/StCameraAreaVo.java deleted file mode 100644 index bf263b0..0000000 --- a/src/main/java/com/gunshi/project/xyt/entity/basedata/StCameraAreaVo.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.gunshi.project.xyt.entity.basedata; - -import com.gunshi.project.xyt.model.StCameraAreaB; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -import java.io.Serializable; - -/** - * @author Sun Lejun - * @version 1.0 - * @date 2024/1/24 - */ - -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -@Data -@Schema(description="视频点树信息") -public class StCameraAreaVo extends StCameraAreaB implements Serializable { - @Schema(description="上级区域名称") - private String pidName; -} diff --git a/src/main/java/com/gunshi/project/xyt/entity/basedata/StCameraSearch.java b/src/main/java/com/gunshi/project/xyt/entity/basedata/StCameraSearch.java deleted file mode 100644 index c3b779b..0000000 --- a/src/main/java/com/gunshi/project/xyt/entity/basedata/StCameraSearch.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.gunshi.project.xyt.entity.basedata; - -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -/** - * @author Sun Lejun - * @version 1.0 - * @date 2024/1/25 - */ - - -@EqualsAndHashCode(callSuper = true) -@Data -@ToString(callSuper = true) -@Schema(description = "视频点查询对象") -public class StCameraSearch extends GeneralSearch { - @Schema(description="监控点类型 传枚举ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long camType; - -} diff --git a/src/main/java/com/gunshi/project/xyt/entity/basedata/StCameraVo.java b/src/main/java/com/gunshi/project/xyt/entity/basedata/StCameraVo.java deleted file mode 100644 index 5b91dd1..0000000 --- a/src/main/java/com/gunshi/project/xyt/entity/basedata/StCameraVo.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.gunshi.project.xyt.entity.basedata; - -import com.gunshi.project.xyt.model.StCameraB; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -/** - * @author Sun Lejun - * @version 1.0 - * @date 2024/1/25 - */ - -@EqualsAndHashCode(callSuper = true) -@Data -@ToString(callSuper = true) -@Schema(description = "视频点信息返回值") -public class StCameraVo extends StCameraB { - @Schema(description = "视频区域名称") - private String camArNm; - @Schema(description = "视频类型名称") - private String camTypeNm; -} diff --git a/src/main/java/com/gunshi/project/xyt/entity/basedata/StSpgPztbVo.java b/src/main/java/com/gunshi/project/xyt/entity/basedata/StSpgPztbVo.java deleted file mode 100644 index b8dcc06..0000000 --- a/src/main/java/com/gunshi/project/xyt/entity/basedata/StSpgPztbVo.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.gunshi.project.xyt.entity.basedata; - -import com.gunshi.project.xyt.model.StSpgPztb; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -/** - * @author Sun Lejun - * @version 1.0 - * @date 2024/1/26 - */ - -@EqualsAndHashCode(callSuper = true) -@Data -@ToString(callSuper = true) -@Schema(description="渗压设备信息表") -public class StSpgPztbVo extends StSpgPztb { - @Schema(description="所在断面名称") - private String crNm; - @Schema(description="所在断面编码") - private String crCd; - -} diff --git a/src/main/java/com/gunshi/project/xyt/entity/basedata/StSpgSpprmpVo.java b/src/main/java/com/gunshi/project/xyt/entity/basedata/StSpgSpprmpVo.java deleted file mode 100644 index 12be1fb..0000000 --- a/src/main/java/com/gunshi/project/xyt/entity/basedata/StSpgSpprmpVo.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.gunshi.project.xyt.entity.basedata; - -import com.gunshi.project.xyt.model.StSpgSpprmp; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -/** - * @author Sun Lejun - * @version 1.0 - * @date 2024/1/26 - */ - -@EqualsAndHashCode(callSuper = true) -@Data -@ToString(callSuper = true) -@Schema(description="渗流设备信息表") -public class StSpgSpprmpVo extends StSpgSpprmp { - @Schema(description="所在断面名称") - private String crNm; - @Schema(description="所在断面编码") - private String crCd; - @Schema(description="公式名称") - private String formulaName; -} diff --git a/src/main/java/com/gunshi/project/xyt/entity/basedata/StStbprpVo.java b/src/main/java/com/gunshi/project/xyt/entity/basedata/StStbprpVo.java deleted file mode 100644 index 2193958..0000000 --- a/src/main/java/com/gunshi/project/xyt/entity/basedata/StStbprpVo.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.gunshi.project.xyt.entity.basedata; - -import com.gunshi.project.xyt.model.StStbprpB; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -import java.io.Serializable; - -/** - * @author Sun Lejun - * @version 1.0 - * @date 2024/1/26 - */ - -@Data -@EqualsAndHashCode(callSuper = true) -@ToString(callSuper = true) -public class StStbprpVo extends StStbprpB implements Serializable { - @Schema(description="归属协议名称") - private String protocolName; -} diff --git a/src/main/java/com/gunshi/project/xyt/entity/basedata/StcdSearch.java b/src/main/java/com/gunshi/project/xyt/entity/basedata/StcdSearch.java deleted file mode 100644 index a9e2916..0000000 --- a/src/main/java/com/gunshi/project/xyt/entity/basedata/StcdSearch.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.gunshi.project.xyt.entity.basedata; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -/** - * @author Sun Lejun - * @version 1.0 - * @date 2024/1/26 - */ - -@EqualsAndHashCode(callSuper = true) -@Data -@ToString(callSuper = true) -@Schema(description = "监测站点查询对象") -public class StcdSearch extends GeneralSearch { - @Schema(description="归属协议") - private Long protocols; -} diff --git a/src/main/java/com/gunshi/project/xyt/entity/basedata/SysDictVo.java b/src/main/java/com/gunshi/project/xyt/entity/basedata/SysDictVo.java deleted file mode 100644 index 2e191ca..0000000 --- a/src/main/java/com/gunshi/project/xyt/entity/basedata/SysDictVo.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.gunshi.project.xyt.entity.basedata; - -import com.google.common.collect.Lists; -import com.gunshi.project.xyt.model.SysDictB; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -import java.io.Serializable; -import java.util.List; - -/** - * @author Sun Lejun - * @version 1.0 - * @date 2024/1/25 - */ - -@EqualsAndHashCode(callSuper = true) -@Data -@ToString(callSuper = true) -@Schema(description="系统字典表") -public class SysDictVo extends SysDictB implements Serializable { - @Schema(description="子类") - private List children = Lists.newArrayList(); -} diff --git a/src/main/java/com/gunshi/project/xyt/entity/dto/StDamDto.java b/src/main/java/com/gunshi/project/xyt/entity/dto/StDamDto.java deleted file mode 100644 index 0a1da74..0000000 --- a/src/main/java/com/gunshi/project/xyt/entity/dto/StDamDto.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.gunshi.project.xyt.entity.dto; - -import com.gunshi.project.xyt.model.StDamB; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * TODO - * - * @ClassName StDamDto - * @Author Huang Qianxiang - * @Date 2024/1/25 11:08 - */ -@EqualsAndHashCode(callSuper = true) -@Schema(description="大坝基础信息DTO") -@Data -public class StDamDto extends StDamB { - - /** - * 大坝代码 - */ - @Schema(description="大坝代码") - @NotNull(message = "大坝代码不能为空") - private String damCode; - - /** - * 大坝名称 - */ - @Schema(description="大坝名称") - @NotNull(message = "大坝名称不能为空") - private String damName; -} diff --git a/src/main/java/com/gunshi/project/xyt/entity/dto/StEqptDto.java b/src/main/java/com/gunshi/project/xyt/entity/dto/StEqptDto.java deleted file mode 100644 index f7a128e..0000000 --- a/src/main/java/com/gunshi/project/xyt/entity/dto/StEqptDto.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.gunshi.project.xyt.entity.dto; - -import com.gunshi.project.xyt.model.StEqptB; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; - -/** - * TODO - * - * @ClassName StEqptDto - * @Author Huang Qianxiang - * @Date 2024/1/26 9:47 - */ -@EqualsAndHashCode(callSuper = true) -@Schema(description="量水堰基础信息DTO") -@Data -public class StEqptDto extends StEqptB { - /** - * 量水设施代码 - */ - @Schema(description="量水设施代码") - @NotNull(message = "量水设施代码不能为空") - private String wmeqCode; - - /** - * 量水设施名称 - */ - @Schema(description="量水设施名称") - @NotNull(message = "量水设施名称不能为空") - private String wmeqName; - - /** - * 所属行政区划代码 - */ - @Schema(description="所属行政区划代码") - @NotNull(message = "所属行政区划代码不能为空") - private String addvcd; - - /** - * 经度 - */ - @Schema(description="经度") - @NotNull(message = "经度不能为空") - private BigDecimal lgtd; - - /** - * 纬度 - */ - @Schema(description="纬度") - @NotNull(message = "维度不能为空") - private BigDecimal lttd; -} diff --git a/src/main/java/com/gunshi/project/xyt/entity/dto/StGateDto.java b/src/main/java/com/gunshi/project/xyt/entity/dto/StGateDto.java deleted file mode 100644 index fd4da5c..0000000 --- a/src/main/java/com/gunshi/project/xyt/entity/dto/StGateDto.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.gunshi.project.xyt.entity.dto; - -import com.gunshi.project.xyt.model.StGateB; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * TODO - * - * @ClassName StGateDto - * @Author Huang Qianxiang - * @Date 2024/1/26 9:35 - */ - -@EqualsAndHashCode(callSuper = true) -@Schema(description="闸阀基础信息DTO") -@Data -public class StGateDto extends StGateB { - /** - * 闸阀编码 - */ - @Schema(description="闸阀编码") - @NotNull(message = "闸阀编码不能为空") - private String gateCd; - - /** - * 闸阀名称 - */ - @Schema(description="闸阀名称") - @NotNull(message = "闸阀名称不能为空") - private String gateNm; - - /** - * 所在位置 - */ - @Schema(description="所在位置") - @NotNull(message = "所在位置不能为空") - private String gtlc; -} diff --git a/src/main/java/com/gunshi/project/xyt/entity/dto/StGateRepairRecordDto.java b/src/main/java/com/gunshi/project/xyt/entity/dto/StGateRepairRecordDto.java deleted file mode 100644 index e373aa1..0000000 --- a/src/main/java/com/gunshi/project/xyt/entity/dto/StGateRepairRecordDto.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.gunshi.project.xyt.entity.dto; - -import com.gunshi.project.xyt.model.StGateRepairDetail; -import com.gunshi.project.xyt.model.StGateRepairRecord; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.List; - -/** - * Description: - * Created by wanyan on 2024/1/26 - * - * @author wanyan - * @version 1.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class StGateRepairRecordDto extends StGateRepairRecord { - - @Schema(description="维修情况") - private List repairDetails; - -} diff --git a/src/main/java/com/gunshi/project/xyt/entity/dto/StResDto.java b/src/main/java/com/gunshi/project/xyt/entity/dto/StResDto.java deleted file mode 100644 index 5a74d3c..0000000 --- a/src/main/java/com/gunshi/project/xyt/entity/dto/StResDto.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.gunshi.project.xyt.entity.dto; - -import com.gunshi.project.xyt.model.StResB; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; - -/** - * TODO - * - * @ClassName ResDto - * @Author Huang Qianxiang - * @Date 2024/1/24 14:43 - */ -@EqualsAndHashCode(callSuper = true) -@Schema(description = "水库的基础信息DTO") -@Data -public class StResDto extends StResB { - - /** - * 水库名称 - */ - @Schema(description = "水库名称") - @NotNull(message = "水库名称不能为空") - private String resName; - - /** - * 水库代码 - */ - @Schema(description = "水库代码") - @NotNull(message = "水库代码不能为空") - private String resCode; - - /** - * 行政区划编码 - */ - @Schema(description = "行政区划编码") - @NotNull(message = "行政区化编码不能为空") - private String addvcd; - - /** - * 经度 - */ - @Schema(description = "经度") - @NotNull(message = "经度不能为空") - private BigDecimal lgtd; - - /** - * 纬度 - */ - @Schema(description = "纬度") - @NotNull(message = "维度不能为空") - private BigDecimal lttd; - - /** - * 设计洪水位 - */ - @Schema(description = "设计洪水位") - @NotNull(message = "设计洪水位不能为空") - private BigDecimal dsfllv; - - /** - * 校核洪水位 - */ - @Schema(description = "校核洪水位") - @NotNull(message = "校核洪水位不能为空") - private BigDecimal chfllv; - - /** - * 正常蓄水位 - */ - @Schema(description = "正常蓄水位") - @NotNull(message = "正常蓄水位不能为空") - private BigDecimal normWatLev; - - /** - * 死水位 - */ - @Schema(description = "死水位") - @NotNull(message = "死水位不能为空") - private BigDecimal deadLev; - - /** - * 总库容 - */ - @Schema(description = "总库容") - @NotNull(message = "总库容不能为空") - private BigDecimal totCap; - - /** - * 汛限水位 - */ - @Schema(description = "汛限水位") - @NotNull(message = "汛限水位不能为空") - private BigDecimal flLowLimLev; - - /** - * 集雨面积 - */ - @Schema(description = "集雨面积") - @NotNull(message = "集雨面积不能为空") - private BigDecimal watShedArea; - - /** - * 水库规模 dict_id - */ - @Schema(description = "水库规模 dict_id") - @NotNull(message = "水库规模不能为空") - private Long engScal; - -} diff --git a/src/main/java/com/gunshi/project/xyt/entity/dto/StResFileRefDto.java b/src/main/java/com/gunshi/project/xyt/entity/dto/StResFileRefDto.java deleted file mode 100644 index 2dc490c..0000000 --- a/src/main/java/com/gunshi/project/xyt/entity/dto/StResFileRefDto.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gunshi.project.xyt.entity.dto; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.gunshi.project.xyt.model.StResFileRef; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * TODO - * - * @ClassName StResFileRefDto - * @Author Huang Qianxiang - * @Date 2024/1/29 11:47 - */ -@EqualsAndHashCode(callSuper = true) -@Schema(description="水库附件信息DTO") -@Data -public class StResFileRefDto extends StResFileRef { - - /** - * 水库ID - */ - @Schema(description="水库ID") - @NotNull(message = "水库ID不能为空") - private Long resId; - - /** - * 序号 - */ - @Schema(description="序号") - @NotNull(message = "需要不能为空") - private Integer sortOn; -} diff --git a/src/main/java/com/gunshi/project/xyt/entity/dto/StResPersonRefDto.java b/src/main/java/com/gunshi/project/xyt/entity/dto/StResPersonRefDto.java deleted file mode 100644 index 0e82dac..0000000 --- a/src/main/java/com/gunshi/project/xyt/entity/dto/StResPersonRefDto.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.gunshi.project.xyt.entity.dto; - -import com.gunshi.project.xyt.model.StResPersonRef; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * TODO - * - * @ClassName StResPersonRefDto - * @Author Huang Qianxiang - * @Date 2024/1/29 11:20 - */ -@EqualsAndHashCode(callSuper = true) -@Schema(description="水库责任人信息DTO") -@Data -public class StResPersonRefDto extends StResPersonRef { - /** - * 水库ID - */ - @Schema(description="水库ID") - @NotNull(message = "水库ID不能为空") - private Long resId; - - /** - * 序号 - */ - @Schema(description="序号") - @NotNull(message = "需要不能为空") - private Integer sortOn; - - -} diff --git a/src/main/java/com/gunshi/project/xyt/entity/dto/StResStcdRefDto.java b/src/main/java/com/gunshi/project/xyt/entity/dto/StResStcdRefDto.java deleted file mode 100644 index 561c8fe..0000000 --- a/src/main/java/com/gunshi/project/xyt/entity/dto/StResStcdRefDto.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.gunshi.project.xyt.entity.dto; - -import com.gunshi.project.xyt.model.StResStcdRef; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * TODO - * - * @ClassName StResStcdRefDto - * @Author Huang Qianxiang - * @Date 2024/1/29 14:24 - */ -@EqualsAndHashCode(callSuper = true) -@Schema(description="水库测站关系信息DTO") -@Data -public class StResStcdRefDto extends StResStcdRef { - - /** - * 水库ID - */ - @Schema(description="水库ID") - @NotNull(message = "水库ID不能为空") - private Long resId; - - /** - * 测站编码 - */ - @Schema(description="测站编码") - @NotNull(message = "测站编码不能为空") - private String stcd; - -} diff --git a/src/main/java/com/gunshi/project/xyt/entity/dto/StRvDto.java b/src/main/java/com/gunshi/project/xyt/entity/dto/StRvDto.java deleted file mode 100644 index 10ff230..0000000 --- a/src/main/java/com/gunshi/project/xyt/entity/dto/StRvDto.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.gunshi.project.xyt.entity.dto; - -import com.gunshi.project.xyt.model.StRvB; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * TODO - * - * @ClassName StRvDto - * @Author Huang Qianxiang - * @Date 2024/1/25 9:28 - */ -@EqualsAndHashCode(callSuper = true) -@Schema(description="河流的基础信息DTO") -@Data -public class StRvDto extends StRvB { - /** - * 河流代码 - */ - @Schema(description="河流代码") - @NotNull(message = "河流代码不能为空") - private String rvCode; - - /** - * 河流名称 - */ - @Schema(description="河流名称") - @NotNull(message = "河流名称不能为空") - private String rvName; - -} diff --git a/src/main/java/com/gunshi/project/xyt/entity/dto/StStchBDto.java b/src/main/java/com/gunshi/project/xyt/entity/dto/StStchBDto.java deleted file mode 100644 index d9a1c85..0000000 --- a/src/main/java/com/gunshi/project/xyt/entity/dto/StStchBDto.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.gunshi.project.xyt.entity.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -import java.util.List; - -/** - * @author 李赛 - * @date 2022-06-26 15:27 - */ -@Data -public class StStchBDto { - - @Schema(description="站点编码") - @NotNull(message = "站点编码不能为空") - private String stcd; - - @Schema(description="采集项编码数组") - private List chcds; -} diff --git a/src/main/java/com/gunshi/project/xyt/entity/dto/StZvarlDto.java b/src/main/java/com/gunshi/project/xyt/entity/dto/StZvarlDto.java deleted file mode 100644 index 79ac559..0000000 --- a/src/main/java/com/gunshi/project/xyt/entity/dto/StZvarlDto.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.gunshi.project.xyt.entity.dto; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.gunshi.project.xyt.model.StZvarlB; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * TODO - * - * @ClassName StZvarlDto - * @Author Huang Qianxiang - * @Date 2024/1/29 10:47 - */ - -@EqualsAndHashCode(callSuper = true) -@Schema(description="库容曲线信息DTO") -@Data -public class StZvarlDto extends StZvarlB { - /** - * 水库ID - */ - @Schema(description="水库ID") - @NotNull(message = "水库ID不能为空") - private Long resId; - - /** - * 点序号 - */ - @Schema(description="点序号") - @NotNull(message = "点序号不能为空") - private Integer ptno; - -} diff --git a/src/main/java/com/gunshi/project/xyt/entity/so/RescueGoodsPageSo.java b/src/main/java/com/gunshi/project/xyt/entity/so/RescueGoodsPageSo.java new file mode 100644 index 0000000..41c4f5c --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/entity/so/RescueGoodsPageSo.java @@ -0,0 +1,39 @@ +package com.gunshi.project.xyt.entity.so; + +import com.gunshi.db.dto.PageSo; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +/** + * Description: + * Created by wanyan on 2024/3/19 + * + * @author wanyan + * @version 1.0 + */ +@Data +@Schema(description = "抢险物资分页查询对象") +public class RescueGoodsPageSo { + + @NotNull(message = "分页参数不能为空") + @Schema(description = "分页参数") + private PageSo pageSo; + + @Schema(description="政区/工程（ 1 政区 2 工程）") + @NotNull(message = "type不能为空") + private Integer type; + + @Schema(description="编码") + private String code; + + @Schema(description="物资名称") + private String goodsName; + + @Schema(description = "防汛仓库") + private Long warehouseId; + + @Schema(description = "排序字段") + private String sortField; + +} diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/GateHistoryInfoVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/GateHistoryInfoVo.java deleted file mode 100644 index 1aa0a92..0000000 --- a/src/main/java/com/gunshi/project/xyt/entity/vo/GateHistoryInfoVo.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.gunshi.project.xyt.entity.vo; - -import com.gunshi.project.xyt.model.StGateBHistory; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - - -/** - * 闸门开关历史信息 - * Created by wanyan on 2024/1/26 - * - * @author wanyan - * @version 1.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class GateHistoryInfoVo extends StGateBHistory { - - - @Schema(description = "闸阀名称") - private String gateNm; - -} diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/GateInfoVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/GateInfoVo.java deleted file mode 100644 index ad98e0e..0000000 --- a/src/main/java/com/gunshi/project/xyt/entity/vo/GateInfoVo.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.gunshi.project.xyt.entity.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.util.Date; - -/** - * 闸门详细信息 - * Created by wanyan on 2024/1/26 - * - * @author wanyan - * @version 1.0 - */ -@Data -public class GateInfoVo { - - @Schema(description = "闸阀ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long gateId; - - @Schema(description = "闸阀名称") - private String gateNm; - - @Schema(description = "开关状态 1：全开 2：50%开 3：关") - private Integer status; - - @Schema(description="数据采集时间") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date tm; - -} diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/GateRepairDetailVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/GateRepairDetailVo.java deleted file mode 100644 index 1e33aad..0000000 --- a/src/main/java/com/gunshi/project/xyt/entity/vo/GateRepairDetailVo.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.gunshi.project.xyt.entity.vo; - -import com.gunshi.project.xyt.model.StGateRepairDetail; -import com.gunshi.project.xyt.model.StGateRepairRecord; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.List; - -/** - * 闸门检修详细信息 - * Created by wanyan on 2024/1/26 - * - * @author wanyan - * @version 1.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class GateRepairDetailVo extends StGateRepairRecord { - - @Schema(description = "详细信息") - private List details; - -} diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/GateRepairRecordVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/GateRepairRecordVo.java deleted file mode 100644 index 8448861..0000000 --- a/src/main/java/com/gunshi/project/xyt/entity/vo/GateRepairRecordVo.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.gunshi.project.xyt.entity.vo; - -import com.gunshi.project.xyt.model.StGateRepairRecord; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 闸门详细信息 - * Created by wanyan on 2024/1/26 - * - * @author wanyan - * @version 1.0 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class GateRepairRecordVo extends StGateRepairRecord { - - @Schema(description = "闸阀名称") - private String gateNm; - -} diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/ReservoirLevelVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/ReservoirLevelVo.java deleted file mode 100644 index 3877af5..0000000 --- a/src/main/java/com/gunshi/project/xyt/entity/vo/ReservoirLevelVo.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.gunshi.project.xyt.entity.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.gunshi.core.dateformat.DateFormatString; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * TODO - * - * @ClassName ReservoirLevelVo - * @Author Huang Qianxiang - * @Date 2024/2/5 11:38 - */ - -@Data -public class ReservoirLevelVo { - - /** - * 水库水位实时水位采集时间 - */ - @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") - private Date time; - - /** - * 时间段内平均水库水位 - */ - private BigDecimal avgRZ; - -} diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/StFlowRVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/StFlowRVo.java deleted file mode 100644 index 57ceaac..0000000 --- a/src/main/java/com/gunshi/project/xyt/entity/vo/StFlowRVo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gunshi.project.xyt.entity.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.gunshi.core.dateformat.DateFormatString; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 闸门详细信息 - * Created by wanyan on 2024/1/26 - * - * @author wanyan - * @version 1.0 - */ -@Data -public class StFlowRVo { - - @Schema(description = "测站编码") - private String stcd; - - @Schema(description="测站名称") - private String stnm; - - @Schema(description = "采集时间") - @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") - private Date tm; - - @Schema(description = "通道") - private String chid; - - @Schema(description = "小时流量") - private BigDecimal hq; - -} diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/StPptnVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/StPptnVo.java deleted file mode 100644 index 5545aab..0000000 --- a/src/main/java/com/gunshi/project/xyt/entity/vo/StPptnVo.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.gunshi.project.xyt.entity.vo; - -import com.fasterxml.jackson.annotation.JsonFormat; -import com.gunshi.core.dateformat.DateFormatString; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * TODO - * - * @ClassName StPptnVo - * @Author Huang Qianxiang - * @Date 2024/2/6 10:48 - */ -@Data -public class StPptnVo { - - /** - * 采集时间 - */ - @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") - private Date time; - - /** - * 时间段内平均水库水位 - */ - private BigDecimal sumDrp; -} diff --git a/src/main/java/com/gunshi/project/xyt/entity/vo/StResVo.java b/src/main/java/com/gunshi/project/xyt/entity/vo/StResVo.java deleted file mode 100644 index c9428b9..0000000 --- a/src/main/java/com/gunshi/project/xyt/entity/vo/StResVo.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.gunshi.project.xyt.entity.vo; - -import com.gunshi.db.dto.PageSo; -import com.gunshi.project.xyt.model.StResB; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * TODO - * - * @ClassName StResPageSo - * @Author Huang Qianxiang - * @Date 2024/1/24 16:25 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class StResVo extends StResB { - - /** - * 测站编码 - */ - @Schema(description = "测站编码") - private String STCD; - -} diff --git a/src/main/java/com/gunshi/project/xyt/enums/RcvDataType.java b/src/main/java/com/gunshi/project/xyt/enums/RcvDataType.java deleted file mode 100644 index 388ebd4..0000000 --- a/src/main/java/com/gunshi/project/xyt/enums/RcvDataType.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gunshi.project.xyt.enums; - -/** - * 类描述 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-25 - */ -public enum RcvDataType { - /** - * 雨量数据 - */ - PPTN("PPTN"), - /** - * 水位数据 - */ - RSVR("RSVR"), - /** - * 流量数据 - */ - FLOW("FLOW"), - /** - * 图像数据 - */ - IMG("IMG"); - - private final String value; - - RcvDataType(String value) { - this.value = value; - } - - public String getValue() { - return value; - } -} diff --git a/src/main/java/com/gunshi/project/xyt/mapper/BzProtocolInfoChartMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/BzProtocolInfoChartMapper.java deleted file mode 100644 index b36fcb9..0000000 --- a/src/main/java/com/gunshi/project/xyt/mapper/BzProtocolInfoChartMapper.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.gunshi.project.xyt.mapper; - -import com.gunshi.project.xyt.vo.BzProtocolInfoChart1Vo; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Select; - -import java.util.List; - -/** - * 类描述 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-30 - */ -@Mapper -public interface BzProtocolInfoChartMapper { - - @Select(""" - SELECT p.id protocolId,p.name protocolName,b.STCD,b.STNM FROM REL_PROTOCOL_ST_MAPPING ps - LEFT JOIN BZ_PROTOCOL_INFO p ON ps.PROTOCOL_ID=p.ID - LEFT JOIN ST_STBPRP_B b ON ps.STCD=b.STCD - """) - List chart1(); -} diff --git a/src/main/java/com/gunshi/project/xyt/mapper/BzServiceResourceMonitorRMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/BzServiceResourceMonitorRMapper.java deleted file mode 100644 index 5173a19..0000000 --- a/src/main/java/com/gunshi/project/xyt/mapper/BzServiceResourceMonitorRMapper.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.gunshi.project.xyt.mapper; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.project.xyt.so.BzServiceResourceSo; -import com.gunshi.project.xyt.vo.BzServiceResourceMonitorVo; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -/** - * 服务资源及监控联合查询Mapper - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-24 - */ -@Mapper -public interface BzServiceResourceMonitorRMapper { - @Select(""" - - """) - Page page(@Param("page") Page page, @Param("so") BzServiceResourceSo so); -} diff --git a/src/main/java/com/gunshi/project/xyt/mapper/RcvLogUpRMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/RcvLogUpRMapper.java deleted file mode 100644 index 0de5b3d..0000000 --- a/src/main/java/com/gunshi/project/xyt/mapper/RcvLogUpRMapper.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gunshi.project.xyt.mapper; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.project.xyt.so.RcvLogUpRSo; -import com.gunshi.project.xyt.vo.RcvLogUpRVo; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -/** - * 类描述 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-30 - */ -@Mapper -public interface RcvLogUpRMapper { - - @Select(""" - - """) - Page page(@Param("page") Page page, @Param("so") RcvLogUpRSo so); -} diff --git a/src/main/java/com/gunshi/project/xyt/mapper/RescueGoodsMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/RescueGoodsMapper.java new file mode 100644 index 0000000..3984584 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/mapper/RescueGoodsMapper.java @@ -0,0 +1,56 @@ +package com.gunshi.project.xyt.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.gunshi.file.model.FileDescriptor; +import com.gunshi.project.xyt.entity.so.RescueGoodsPageSo; +import com.gunshi.project.xyt.model.RescueGoodsB; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +@Mapper +public interface RescueGoodsMapper extends BaseMapper { + + + @Select(""" + + """) + Page pageQuery(@Param("page") Page page,@Param("obj") RescueGoodsPageSo RescueGoodsPageSo); + + @Select(""" + + """) + List detail(@Param("goodsId") Long goodsId); + +} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StAddvcdDMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StAddvcdDMapper.java deleted file mode 100644 index 026e197..0000000 --- a/src/main/java/com/gunshi/project/xyt/mapper/StAddvcdDMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.gunshi.project.xyt.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.gunshi.db.dao.IMapper; -import com.gunshi.project.xyt.entity.basedata.StAddvcdTreeVo; -import com.gunshi.project.xyt.model.StAddvcdD; - -import java.util.List; - -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -@Mapper -public interface StAddvcdDMapper extends IMapper { - int batchInsert(@Param("list") List list); - - List queryTree(@Param("addvcd") String addvcd); -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StCameraAreaBMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StCameraAreaBMapper.java deleted file mode 100644 index 2ed5d9b..0000000 --- a/src/main/java/com/gunshi/project/xyt/mapper/StCameraAreaBMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.gunshi.project.xyt.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.project.xyt.entity.basedata.StCameraAreaTreeVo; -import com.gunshi.project.xyt.entity.basedata.StCameraAreaVo; -import com.gunshi.project.xyt.model.StCameraAreaB; -import java.util.List; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -@Mapper -public interface StCameraAreaBMapper extends BaseMapper { - int batchInsert(@Param("list") List list); - - Page queryStCameraAreaBList(Page page, @Param("name") String name); - - List queryStCameraAreaBList(@Param("name") String name); - List queryStCameraAreaBTree(); -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StCameraBMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StCameraBMapper.java deleted file mode 100644 index 9182d54..0000000 --- a/src/main/java/com/gunshi/project/xyt/mapper/StCameraBMapper.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.gunshi.project.xyt.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.project.xyt.entity.basedata.StCameraSearch; -import com.gunshi.project.xyt.entity.basedata.StCameraVo; -import com.gunshi.project.xyt.model.StCameraB; - -import java.util.List; - -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -@Mapper -public interface StCameraBMapper extends BaseMapper { - int batchInsert(@Param("list") List list); - - /** - * 检查视频序列化和名称是否存在 - * @param stCameraB 视频信息 - * @return true 存在 false 不存在 - */ - boolean chechExists(@Param("obj") StCameraB stCameraB); - - /** - * 按查询条件查询视频列表 - * @param page 分页信息 - * @param obj 查询条件 - * @return 视频列表 - */ - Page queryBySearch(Page page, @Param("obj") StCameraSearch obj); - - /** - * 查询所有视频 - * @return 视频列表 - */ - List getAll(); - -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StDamBMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StDamBMapper.java deleted file mode 100644 index 6c5358c..0000000 --- a/src/main/java/com/gunshi/project/xyt/mapper/StDamBMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.gunshi.project.xyt.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.gunshi.project.xyt.model.StDamB; -import java.util.List; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -@Mapper -public interface StDamBMapper extends BaseMapper { - int batchInsert(@Param("list") List list); -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StEqptBMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StEqptBMapper.java deleted file mode 100644 index 997f4b6..0000000 --- a/src/main/java/com/gunshi/project/xyt/mapper/StEqptBMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.gunshi.project.xyt.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.gunshi.project.xyt.model.StEqptB; -import java.util.List; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -@Mapper -public interface StEqptBMapper extends BaseMapper { - int batchInsert(@Param("list") List list); -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StGateBFileMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StGateBFileMapper.java deleted file mode 100644 index dfbc791..0000000 --- a/src/main/java/com/gunshi/project/xyt/mapper/StGateBFileMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.gunshi.project.xyt.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.gunshi.project.xyt.model.StGateBFile; -import java.util.List; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -@Mapper -public interface StGateBFileMapper extends BaseMapper { - int batchInsert(@Param("list") List list); -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StGateBMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StGateBMapper.java deleted file mode 100644 index 47839be..0000000 --- a/src/main/java/com/gunshi/project/xyt/mapper/StGateBMapper.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.gunshi.project.xyt.mapper; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.db.dao.IMapper; -import com.gunshi.project.xyt.entity.vo.GateHistoryInfoVo; -import com.gunshi.project.xyt.entity.vo.GateInfoVo; -import com.gunshi.project.xyt.entity.vo.StFlowRVo; -import com.gunshi.project.xyt.model.StGateB; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface StGateBMapper extends IMapper { - int batchInsert(@Param("list") List list); - - - List queryGateList(); - - Page gateHistory(Page page,@Param("gateId") Long gateId,@Param("startTime") String startTime,@Param("endTime") String endTime); - - List queryFlowList(); -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StGateRepairRecordMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StGateRepairRecordMapper.java deleted file mode 100644 index 921cd60..0000000 --- a/src/main/java/com/gunshi/project/xyt/mapper/StGateRepairRecordMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.gunshi.project.xyt.mapper; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.db.dao.IMapper; -import com.gunshi.project.xyt.entity.vo.GateHistoryInfoVo; -import com.gunshi.project.xyt.entity.vo.GateInfoVo; -import com.gunshi.project.xyt.entity.vo.GateRepairRecordVo; -import com.gunshi.project.xyt.model.StGateB; -import com.gunshi.project.xyt.model.StGateRepairRecord; -import com.gunshi.project.xyt.so.GateRepairRecordPageSo; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface StGateRepairRecordMapper extends IMapper { - Page page(Page page,@Param("param") GateRepairRecordPageSo gateRepairRecordPageSo,@Param("startTime") String startTime,@Param("endTime") String endTime); -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StMoncrBMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StMoncrBMapper.java deleted file mode 100644 index e85a14d..0000000 --- a/src/main/java/com/gunshi/project/xyt/mapper/StMoncrBMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.gunshi.project.xyt.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.project.xyt.entity.basedata.GeneralSearch; -import com.gunshi.project.xyt.model.StMoncrB; - -import java.util.List; - -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -@Mapper -public interface StMoncrBMapper extends BaseMapper { - int batchInsert(@Param("list") List list); - - Page queryBySearch(Page page, @Param("obj") GeneralSearch search); -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StPptnRMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StPptnRMapper.java deleted file mode 100644 index e974997..0000000 --- a/src/main/java/com/gunshi/project/xyt/mapper/StPptnRMapper.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.gunshi.project.xyt.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.gunshi.project.xyt.entity.vo.StPptnVo; -import com.gunshi.project.xyt.model.StPptnR; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -import java.util.Date; -import java.util.List; - -@Mapper -public interface StPptnRMapper extends BaseMapper { - - @Select(""" - - """) - List queryHourTimeQuantumDrpByResId(@Param("resId") String resId, @Param("startTime") Date startTime, @Param("endTime") Date endTime); - - @Select(""" - - """) - List queryDayTimeQuantumDrpByResId(@Param("resId") String resId, @Param("startTime") Date startTime, @Param("endTime") Date endTime); - - @Select(""" - - """) - List query24HourDrpByResId(@Param("resId") String resId); - - @Select(""" - - """) - List query72HourDrpByResId(@Param("resId") String resId); - -} diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StRcvRealMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StRcvRealMapper.java deleted file mode 100644 index b4707bf..0000000 --- a/src/main/java/com/gunshi/project/xyt/mapper/StRcvRealMapper.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.gunshi.project.xyt.mapper; - -import com.gunshi.project.xyt.model.StRcvReal; -import org.apache.ibatis.annotations.Select; - -import java.util.List; - -public interface StRcvRealMapper { - - @Select(""" - - """) - Long queryOnlineStcdCount(); - - @Select(""" - - """) - List queryOffLineStcd(); - - @Select(""" - - """) - List queryOnLineStcd(); - -} diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StResBMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StResBMapper.java deleted file mode 100644 index e60ee43..0000000 --- a/src/main/java/com/gunshi/project/xyt/mapper/StResBMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.gunshi.project.xyt.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.gunshi.project.xyt.model.StResB; -import java.util.List; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -@Mapper -public interface StResBMapper extends BaseMapper { - int batchInsert(@Param("list") List list); -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StResFileRefMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StResFileRefMapper.java deleted file mode 100644 index 4b78f2a..0000000 --- a/src/main/java/com/gunshi/project/xyt/mapper/StResFileRefMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.gunshi.project.xyt.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.gunshi.project.xyt.model.StResFileRef; -import java.util.List; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -@Mapper -public interface StResFileRefMapper extends BaseMapper { - int batchInsert(@Param("list") List list); -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StResPersonRefMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StResPersonRefMapper.java deleted file mode 100644 index 6efd1b0..0000000 --- a/src/main/java/com/gunshi/project/xyt/mapper/StResPersonRefMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.gunshi.project.xyt.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.gunshi.project.xyt.model.StResPersonRef; -import java.util.List; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -@Mapper -public interface StResPersonRefMapper extends BaseMapper { - int batchInsert(@Param("list") List list); -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StResStcdRefMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StResStcdRefMapper.java deleted file mode 100644 index 5cd04e3..0000000 --- a/src/main/java/com/gunshi/project/xyt/mapper/StResStcdRefMapper.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.gunshi.project.xyt.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.gunshi.project.xyt.entity.vo.ReservoirLevelVo; -import com.gunshi.project.xyt.model.StResStcdRef; - -import java.math.BigDecimal; -import java.util.List; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -@Mapper -public interface StResStcdRefMapper extends BaseMapper { - - int batchInsert(@Param("list") List list); - - @Select(""" - - """) - BigDecimal queryRzByResId(@Param("resId") String resId); - - @Select(""" - - """) - List queryRzSevenDayByResId(@Param("resId") String resId); - - @Select(""" - - """) - List queryRzMonthByResId(@Param("resId") String resId); - - - @Select(""" - - """) - List queryRzHalfYearByResId(@Param("resId") String resId); - -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StRvBMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StRvBMapper.java deleted file mode 100644 index 53bd898..0000000 --- a/src/main/java/com/gunshi/project/xyt/mapper/StRvBMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.gunshi.project.xyt.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.gunshi.project.xyt.model.StRvB; -import java.util.List; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -@Mapper -public interface StRvBMapper extends BaseMapper { - int batchInsert(@Param("list") List list); -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StSpgPztbMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StSpgPztbMapper.java deleted file mode 100644 index c11b384..0000000 --- a/src/main/java/com/gunshi/project/xyt/mapper/StSpgPztbMapper.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.gunshi.project.xyt.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.project.xyt.entity.basedata.CheckStringSearch; -import com.gunshi.project.xyt.entity.basedata.GeneralSearch; -import com.gunshi.project.xyt.entity.basedata.StSpgPztbVo; -import com.gunshi.project.xyt.model.StSpgPztb; - -import java.util.List; - -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -@Mapper -public interface StSpgPztbMapper extends BaseMapper { - int batchInsert(@Param("list") List list); - - /** - * 校验编码是否存在 - * @param obj 校验对象 - * @return 是否存在 - */ - boolean checkCode(@Param("obj") CheckStringSearch obj); - - Page queryBySearch(Page page, @Param("obj") GeneralSearch search); -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StSpgSpprmpMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StSpgSpprmpMapper.java deleted file mode 100644 index 73cfab9..0000000 --- a/src/main/java/com/gunshi/project/xyt/mapper/StSpgSpprmpMapper.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.gunshi.project.xyt.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.project.xyt.entity.basedata.CheckStringSearch; -import com.gunshi.project.xyt.entity.basedata.GeneralSearch; -import com.gunshi.project.xyt.entity.basedata.StSpgSpprmpVo; -import com.gunshi.project.xyt.model.StSpgSpprmp; - -import java.util.List; - -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -@Mapper -public interface StSpgSpprmpMapper extends BaseMapper { - int batchInsert(@Param("list") List list); - - /** - * 校验编码是否存在 - * @param obj 校验对象 - * @return 是否存在 - */ - boolean checkCode(@Param("obj")CheckStringSearch obj); - - Page queryBySearch(Page page, @Param("obj") GeneralSearch search); -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StStbprpBMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StStbprpBMapper.java deleted file mode 100644 index 7ff6b75..0000000 --- a/src/main/java/com/gunshi/project/xyt/mapper/StStbprpBMapper.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.gunshi.project.xyt.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.project.xyt.entity.basedata.StStbprpVo; -import com.gunshi.project.xyt.entity.basedata.StcdSearch; -import com.gunshi.project.xyt.model.StStbprpB; - -import java.util.List; - -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -@Mapper -public interface StStbprpBMapper extends BaseMapper { - int batchInsert(@Param("list") List list); - - /** - * 根据站点编码/名称查询站点 - * @param page 分页对象 - * @param search 查询对象 - * @return 站点集合 - */ - Page queryBySearch(Page page, @Param("obj") StcdSearch search); - - /** - * 根据站点编码/名称查询站点 - * @param search 查询对象 - * @return 站点集合 - */ - List queryBySearch(@Param("obj") StcdSearch search); -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StStchBMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StStchBMapper.java deleted file mode 100644 index 9e90ce1..0000000 --- a/src/main/java/com/gunshi/project/xyt/mapper/StStchBMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gunshi.project.xyt.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.gunshi.db.dao.IMapper; -import com.gunshi.project.xyt.entity.dto.StStchBDto; -import com.gunshi.project.xyt.model.StStchB; -import com.gunshi.project.xyt.so.StStchBSo; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * Description: - * Created by XuSan on 2024/1/30. - * - * @author XuSan - * @version 1.0 - */ -public interface StStchBMapper extends BaseMapper, IMapper { - /** - * 返回所有 - * - * @return - */ - List queryBySearch(@Param("obj") StStchBDto findDto); - - /** - * 分页查询 - * - * @param page - * @param findDto - * @return - */ - IPage queryBySearch(@Param("page") IPage page, @Param("obj") StStchBSo findDto); - -} diff --git a/src/main/java/com/gunshi/project/xyt/mapper/StZvarlBMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/StZvarlBMapper.java deleted file mode 100644 index 0390cf5..0000000 --- a/src/main/java/com/gunshi/project/xyt/mapper/StZvarlBMapper.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.gunshi.project.xyt.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.gunshi.project.xyt.model.StZvarlB; -import java.util.List; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -@Mapper -public interface StZvarlBMapper extends BaseMapper { - int batchInsert(@Param("list") List list); -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/mapper/SysDictBMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/SysDictBMapper.java deleted file mode 100644 index f619146..0000000 --- a/src/main/java/com/gunshi/project/xyt/mapper/SysDictBMapper.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.gunshi.project.xyt.mapper; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.db.dao.IMapper; -import com.gunshi.project.xyt.entity.basedata.GeneralSearch; -import com.gunshi.project.xyt.entity.basedata.SysDictVo; -import com.gunshi.project.xyt.model.SysDictB; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -@Mapper -public interface SysDictBMapper extends IMapper { - int batchInsert(@Param("list") List list); - - /** - * 检查顶层的字典，编码和名称是否存在 - * @param sysDictB 字典信息 - * @return true存在 false不存在 - */ - boolean checkExistCodeAndName(@Param("obj") SysDictB sysDictB); - - /** - * 根据名称和编码查询PID和ID - * @param search 查询条件 - * @return PID和ID - */ - Page queryPidBySearch(Page page, @Param("obj") GeneralSearch search); - - /** - * 根据PID和ID查询字典记录 - * @param id 字典ID or PID - * @return 字典 - */ - List queryByPidOrIds(@Param("obj") List id); - - List getAll(); -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/mapper/WaterQualityMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/WaterQualityMapper.java deleted file mode 100644 index 26cc3a0..0000000 --- a/src/main/java/com/gunshi/project/xyt/mapper/WaterQualityMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.gunshi.project.xyt.mapper; - -import com.gunshi.db.dao.IMapper; -import com.gunshi.project.xyt.model.StWaterQualityR; -import org.apache.ibatis.annotations.Mapper; - -/** - * Description: - * Created by XuSan on 2024/1/23. - * - * @author XuSan - * @version 1.0 - */ -@Mapper -public interface WaterQualityMapper extends IMapper { -} diff --git a/src/main/java/com/gunshi/project/xyt/model/BzCameraAIImgR.java b/src/main/java/com/gunshi/project/xyt/model/BzCameraAIImgR.java deleted file mode 100644 index 6979bae..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/BzCameraAIImgR.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.github.jeffreyning.mybatisplus.anno.MppMultiId; -import com.gunshi.core.dateformat.DateFormatString; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.util.Date; - -/** - * 视频AI告警数据 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-29 - */ -@Data -@TableName("BZ_CAMERA_AI_IMG") -@Schema(description = "视频AI告警数据") -public class BzCameraAIImgR { - @MppMultiId("STCD") - @Schema(description = "测站编码") - private String stcd; - - @MppMultiId("TM") - @Schema(description = "采集时间") - @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") - private Date tm; - - @MppMultiId("CHID") - @Schema(description = "通道") - private String chid; - - @TableField("IMG_PATH") - @Schema(description = "图片文件存储路径") - private String imgPath; -} diff --git a/src/main/java/com/gunshi/project/xyt/model/BzProtocolInfo.java b/src/main/java/com/gunshi/project/xyt/model/BzProtocolInfo.java deleted file mode 100644 index fb4fbc0..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/BzProtocolInfo.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.gunshi.core.dateformat.DateFormatString; -import com.gunshi.project.xyt.validate.markers.Insert; -import com.gunshi.project.xyt.validate.markers.Update; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import lombok.Data; -import lombok.ToString; - -import java.util.Date; - -/** - * 接收协议 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-23 - */ -@Data -@ToString -@Schema(description = "接收协议") -@TableName("BZ_PROTOCOL_INFO") -public class BzProtocolInfo { - - @NotEmpty(message = "协议编码不能为空", groups = {Insert.class, Update.class}) - @Schema(description = "协议编码") - @TableId("ID") - private String id; - - @NotEmpty(message = "协议名称不能为空", groups = {Insert.class}) - @Schema(description = "协议名称") - @TableField("NAME") - private String name; - - @NotEmpty(message = "IP地址不能为空", groups = {Insert.class}) - @Schema(description = "IP地址") - @TableField("IP") - private String ip; - - @NotNull(message = "监听端口不能为空", groups = {Insert.class}) - @Schema(description = "监听端口") - @TableField("PORT") - private Integer port; - - @NotEmpty(message = "协议标准不能为空", groups = {Insert.class}) - @Schema(description = "协议标准") - @TableField("STD") - private String std; - - @Schema(description = "传输协议，TCP或UDP") - @TableField("TRANS") - private String trans; - - @Schema(description = "是否启用", $comment = "1启用，0不启用，默认1") - @TableField(value = "ENABLE") - private Integer enable; - - @Schema(description = "创建时间") - @TableField(value = "CREATE_TM") - @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") - private Date createTm; -} diff --git a/src/main/java/com/gunshi/project/xyt/model/BzServiceResource.java b/src/main/java/com/gunshi/project/xyt/model/BzServiceResource.java deleted file mode 100644 index 123f821..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/BzServiceResource.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.gunshi.core.dateformat.DateFormatString; -import com.gunshi.project.xyt.validate.markers.Insert; -import com.gunshi.project.xyt.validate.markers.Update; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotEmpty; -import lombok.Data; -import lombok.ToString; - -import java.util.Date; - -/** - * 数据共享服务公共资源属性 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-24 - */ -@Data -@ToString -@Schema(description = "服务资源") -@TableName("BZ_SERVICE_RESOURCE") -public class BzServiceResource { - - @Schema(description = "id") - @TableId("ID") - @NotEmpty(message = "服务ID不能为空", groups = {Update.class}) - private String id; - - @Schema(description = "服务名称") - @TableField("NAME") - @NotEmpty(message = "服务名称不能为空", groups = {Insert.class}) - private String name; - - @Schema(description = "服务描述") - @TableField("DESCRIPTION") - private String description; - - @Schema(description = "服务类型") - @TableField("SERVICE_TYPE") - private String serviceType; - - @Schema(description = "服务地址") - @TableField("URL") - private String url; - - @Schema(description = "服务端口") - @TableField("PORT") - private Integer port; - - @Schema(description = "服务提供者") - @TableField("PROVIDER") - private String provider; - - @Schema(description = "目标表") - @TableField("TARGET_TABLE") - private String targetTable; - - @Schema(description = "目标时间依据字段") - @TableField("TARGET_TM_FIELD") - private String targetTmField; - - @Schema(description = "路由") - @TableField("ROUTE") - private String route; - - @Schema(description = "联系人") - @TableField("CONTACT") - private String contact; - - @Schema(description = "联系电话") - @TableField("PHONE") - private String phone; - - @Schema(description = "注册日期") - @JsonFormat(pattern = DateFormatString.YYYY_MM_DD, timezone = "GMT+8") - @TableField("REGISTER_DATE") - private Date registerDate; - - @Schema(description = "修改日期") - @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") - @TableField("UPDATE_TM") - private Date updateTm; - - @Schema(description = "是否启用，0-停用，1-启用") - @TableField("ENABLE") - private Integer enable; - - @Schema(description = "状态，0-不在线/异常，1-在线/正常") - @TableField("STATUS") - private Integer status; - - @Schema(description = "最近数据时间") - @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") - @TableField("LAST_DATA_TM") - private Date lastChangeTm; -} diff --git a/src/main/java/com/gunshi/project/xyt/model/BzServiceResourceMonitorR.java b/src/main/java/com/gunshi/project/xyt/model/BzServiceResourceMonitorR.java deleted file mode 100644 index 3b62076..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/BzServiceResourceMonitorR.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.gunshi.core.dateformat.DateFormatString; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.ToString; - -import java.util.Date; - -/** - * 服务资源监控记录 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-24 - */ -@Data -@ToString -@Schema(description = "服务资源监控记录") -@TableName("BZ_SERVICE_RESOURCE_MONITOR_R") -public class BzServiceResourceMonitorR { - - @Schema(description = "id") - @TableId("ID") - private Long id; - - @Schema(description = "服务资源id") - @TableField("SR_ID") - private String srId; - - @Schema(description = "最近数据时间") - @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") - @TableField("LAST_CHANGE_TM") - private Date lastChangeTm; - - @Schema(description = "共享数据(条)") - @TableField("RECORD_COUNT") - private Long recordCount; - - @Schema(description = "共享站点数量") - @TableField("ST_COUNT") - private Integer stCount; - - @Schema(description = "今日共享数据(条)") - @TableField("TODAY_COUNT") - private Long todayCount; - - @Schema(description = "本周共享数据(条)") - @TableField("WEEKLY_COUNT") - private Long weeklyCount; - - @Schema(description = "本月共享数据(条)") - @TableField("MONTHLY_COUNT") - private Long monthlyCount; - - @Schema(description = "本年共享数据(条)") - @TableField("YEARLY_COUNT") - private Long yearlyCount; - -} diff --git a/src/main/java/com/gunshi/project/xyt/model/BzServiceResourceType.java b/src/main/java/com/gunshi/project/xyt/model/BzServiceResourceType.java deleted file mode 100644 index 3dcfe7f..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/BzServiceResourceType.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.gunshi.project.xyt.validate.markers.Insert; -import com.gunshi.project.xyt.validate.markers.Update; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotEmpty; -import lombok.Data; -import lombok.ToString; - -/** - * 服务类型 - * 纯字典，无意义，无关联，应标 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-23 - */ -@Data -@ToString -@Schema(description = "服务类型") -@TableName("BZ_SERVICE_RESOURCE_TYPE") -public class BzServiceResourceType { - @Schema(description = "id") - @TableId("ID") - private String id; - - @Schema(description = "服务类型") - @TableField("TYPE") - @NotEmpty(message = "服务类型不能为空", groups = {Insert.class, Update.class}) - private String type; - - @Schema(description = "服务名称") - @TableField("NAME") - @NotEmpty(message = "服务类型不能为空", groups = {Insert.class, Update.class}) - private String name; -} diff --git a/src/main/java/com/gunshi/project/xyt/model/RcvLogDownR.java b/src/main/java/com/gunshi/project/xyt/model/RcvLogDownR.java deleted file mode 100644 index dfdbb84..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/RcvLogDownR.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.util.Date; - -/** - * 报文日志 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-25 - */ -@Data -@TableName("RCV_LOG_UP_R") -public class RcvLogDownR { - @TableId("ID") - private Long id; - - @TableField("PROTOCOL_ID") - @Schema(description = "协议ID") - private Long protocolId; - - @TableField("MSG") - @Schema(description = "报文") - private String msg; - - @TableField("SEND_TM") - @Schema(description = "发送时间") - private Date sendTm; - - @TableField("ENCODED") - @Schema(description = "编码报文") - private String encoded; - - @TableField("STCD") - @Schema(description = "测站编码") - private String stcd; - - @TableField("FUNCODE") - @Schema(description = "功能码") - private String funcode; - - @TableField("ARK_ID") - @Schema(description = "应答ID") - private Long arkId; -} diff --git a/src/main/java/com/gunshi/project/xyt/model/RcvLogUpR.java b/src/main/java/com/gunshi/project/xyt/model/RcvLogUpR.java deleted file mode 100644 index 4ecca60..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/RcvLogUpR.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.gunshi.core.dateformat.DateFormatString; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.util.Date; - -/** - * 报文日志 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-25 - */ -@Data -@TableName("RCV_LOG_UP_R") -public class RcvLogUpR { - @TableId("ID") - private Long id; - - @TableField("PROTOCOL_ID") - @Schema(description = "协议ID") - private String protocolId; - - @TableField("ORIGINAL_MSG") - @Schema(description = "原始报文") - private String originalMsg; - - @TableField("RECEIVE_TM") - @Schema(description = "接收时间") - @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") - private Date receiveTm; - - @TableField("DECODED") - @Schema(description = "解码报文") - private String decoded; - - @TableField("DECODED_TM") - @Schema(description = "解码时间") - @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") - private Date decodedTm; - - @TableField("STCD") - @Schema(description = "测站编码") - private String stcd; - - @TableField("FUNCODE") - @Schema(description = "功能码") - private String funcode; - - @TableField("OBSERVE_TM") - @Schema(description = "采集时间") - @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") - private Date observeTm; - - @TableField("PARTIAL_SIZE") - @Schema(description = "分包数量") - private Integer partialSize; - - @TableField("PARTIAL_INDEX") - @Schema(description = "分包索引") - private Integer partialIndex; - - @TableField("ARK_ID") - @Schema(description = "应答ID") - private Long arkId; -} diff --git a/src/main/java/com/gunshi/project/xyt/model/RelProtocolStMapping.java b/src/main/java/com/gunshi/project/xyt/model/RelProtocolStMapping.java deleted file mode 100644 index a9d1169..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/RelProtocolStMapping.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.github.jeffreyning.mybatisplus.anno.MppMultiId; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -/** - * 类描述 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-30 - */ -@Data -@TableName("REL_PROTOCOL_ST_MAPPING") -public class RelProtocolStMapping { - @MppMultiId("PROTOCOL_ID") - @Schema(description = "协议ID") - private String protocolId; - - @MppMultiId("STCD") - @Schema(description = "测站编码") - private String stcd; -} diff --git a/src/main/java/com/gunshi/project/xyt/model/RescueGoodsB.java b/src/main/java/com/gunshi/project/xyt/model/RescueGoodsB.java new file mode 100644 index 0000000..c2cfe63 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/model/RescueGoodsB.java @@ -0,0 +1,150 @@ +package com.gunshi.project.xyt.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import com.gunshi.project.xyt.service.AbstractModelWithAttachService; +import com.gunshi.project.xyt.validate.markers.Insert; +import com.gunshi.project.xyt.validate.markers.Update; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * 抢险物资 + */ +@Schema(description="抢险物资") +@Data +@TableName(value = "public.rescue_goods_b") +public class RescueGoodsB implements Serializable, AbstractModelWithAttachService.GetFileIds { + /** + * 主键 + */ + @TableId(value = "goods_id", type = IdType.INPUT) + @Schema(description="主键") + @NotNull(message = "主键不能为空", groups = {Update.class}) + @JsonSerialize(using = ToStringSerializer.class) + private Long goodsId; + + /** + * 行政区划id/水库编码/水电站编码 + */ + @MppMultiId + @TableField(value = "code") + @Schema(description="行政区划id/水库编码/水电站编码") + @NotEmpty(message = "行政区划id/水库编码/水电站编码不能为空", groups = {Insert.class, Update.class}) + private String code; + + /** + * 类型 1政区 2工程 + */ + @TableField(value = "type") + @Schema(description="类型 1政区 2工程") + @NotNull(message = "类型不能为空", groups = {Insert.class, Update.class}) + private Integer type; + + /** + * 物资名称 + */ + @TableField(value = "goods_name") + @Schema(description="物资名称") + @Size(max = 100,message = "物资名称最大长度要小于 100") + @NotEmpty(message = "物资名称不能为空", groups = {Insert.class, Update.class}) + private String goodsName; + + /** + * 物资类型(1抢险物资 2救生器材) + */ + @TableField(value = "goods_type") + @Schema(description="物资类型(1抢险物资 2救生器材)") + @NotNull(message = "物资类型不能为空", groups = {Insert.class, Update.class}) + private Integer goodsType; + + /** + * 规格 + */ + @TableField(value = "specs") + @Schema(description="规格") + private String specs; + + /** + * 单位(1个 2件 3米 4把 5台 6套 7副 8箱 9卷 10立方米 11平方米) + */ + @TableField(value = "unit") + @Schema(description="单位(1个 2件 3米 4把 5台 6套 7副 8箱 9卷 10立方米 11平方米)") + private Integer unit; + + /** + * 库存数量 + */ + @TableField(value = "store_quantity") + @Schema(description="库存数量") + @NotNull(message = "库存数量不能为空", groups = {Insert.class, Update.class}) + private BigDecimal storeQuantity; + + /** + * 存放仓库 + */ + @TableField(value = "warehouse_id") + @Schema(description="存放仓库") + @JsonSerialize(using = ToStringSerializer.class) + private Long warehouseId; + + /** + * 存放地点 + */ + @TableField(value = "store_location") + @Schema(description="存放地点") + private String storeLocation; + + /** + * 联系人 + */ + @TableField(value = "contact_person") + @Schema(description="联系人") + @Size(max = 150,message = "联系人最大长度要小于 150", groups = {Insert.class, Update.class}) + private String contactPerson; + + /** + * 联系电话 + */ + @TableField(value = "phone") + @Schema(description="联系电话") + @Size(max = 20,message = "联系电话最大长度要小于 20", groups = {Insert.class, Update.class}) + private String phone; + + + /** + * 时间戳 + */ + @TableField(value = "tm") + @Schema(description="时间戳") + @NotNull(message = "时间戳不能为空") + private Date tm; + + @TableField(exist = false) + @Schema(description = "文件id集合") + private List fileIds; + + /** + * 仓库名称 + */ + @Schema(description="仓库名称") + @TableField(exist = false) + private String warehouseName; + + + private static final long serialVersionUID = 1L; + +} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/RescueGoodsFile.java b/src/main/java/com/gunshi/project/xyt/model/RescueGoodsFile.java new file mode 100644 index 0000000..cbbb1b7 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/model/RescueGoodsFile.java @@ -0,0 +1,69 @@ +package com.gunshi.project.xyt.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 抢险物资-附件 + */ +@Schema(description="抢险物资-附件") +@Data +@TableName(value = "public.rescue_goods_file") +public class RescueGoodsFile implements Serializable { + /** + * 主键 + */ + @TableId(value = "id", type = IdType.INPUT) + @Schema(description="主键") + @NotNull(message = "主键不能为空") + private Long id; + + /** + * 抢险物资id + */ + @TableField(value = "goods_id") + @Schema(description="抢险物资id") + private Long goodsId; + + /** + * 文件id + */ + @TableField(value = "file_id") + @Schema(description="文件id") + private Long fileId; + + /** + * 序号 + */ + @TableField(value = "sort_on") + @Schema(description="序号") + private Integer sortOn; + + /** + * 时间戳 + */ + @TableField(value = "tm") + @Schema(description="时间戳") + @NotNull(message = "时间戳不能为空") + private Date tm; + + private static final long serialVersionUID = 1L; + + public static final String COL_ID = "id"; + + public static final String COL_GOODS_ID = "goods_id"; + + public static final String COL_FILE_ID = "file_id"; + + public static final String COL_SORT_ON = "sort_on"; + + public static final String COL_TM = "tm"; +} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/StAddvcdD.java b/src/main/java/com/gunshi/project/xyt/model/StAddvcdD.java deleted file mode 100644 index 5a8d951..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/StAddvcdD.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.v3.oas.annotations.media.Schema; -import java.math.BigDecimal; -import java.util.Date; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; -import lombok.Data; - -/** - * 行政区划表 - */ -@Schema(description = "行政区划表") -@Data -@TableName(value = "dbo.ST_ADDVCD_D") -public class StAddvcdD { - /** - * 行政区划编码 15位到村组 - */ - @TableId(value = "ADDVCD", type = IdType.INPUT) - @Schema(description = "行政区划编码 15位到村组") - @Size(max = 15, min = 15, message = "行政区划编码长度必须为15位") - @NotBlank(message = "行政区划编码不能为空") - private String addvcd; - - /** - * 行政区划名称 - */ - @TableField(value = "ADDVNM") - @Schema(description = "行政区划名称") - @Size(max = 100, message = "行政区划名称长度不能超过100") - @NotBlank(message = "行政区划名称不能为空") - private String addvnm; - - /** - * 经度 - */ - @TableField(value = "LGTD") - @Schema(description = "经度", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - private BigDecimal lgtd; - - /** - * 纬度 - */ - @TableField(value = "LTTD") - @Schema(description = "纬度", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - private BigDecimal lttd; - - /** - * 新建时间 - */ - @TableField(value = "CREATE_TM") - @Schema(description = "新建时间", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date createTm; - - /** - * 修改时间 - */ - @TableField(value = "TM") - @Schema(description = "修改时间", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date tm; - - /** - * 排序字段 - */ - @TableField(value = "SORT_ON") - @Schema(description = "排序字段") - @NotNull(message = "排序字段不能为空") - private Integer sortOn; - - public static final String COL_ADDVCD = "ADDVCD"; - - public static final String COL_ADDVNM = "ADDVNM"; - - public static final String COL_LGTD = "LGTD"; - - public static final String COL_LTTD = "LTTD"; - - public static final String COL_CREATE_TM = "CREATE_TM"; - - public static final String COL_TM = "TM"; - - public static final String COL_SORT_ON = "SORT_ON"; -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/StCameraAreaB.java b/src/main/java/com/gunshi/project/xyt/model/StCameraAreaB.java deleted file mode 100644 index fbc6da1..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/StCameraAreaB.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.FieldStrategy; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.gunshi.project.xyt.validate.markers.Update; -import io.swagger.v3.oas.annotations.media.Schema; - -import java.io.Serializable; -import java.util.Date; - -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; -import lombok.Data; - -/** - * 视频点信息 - */ -@Schema(description="视频点信息") -@Data -@TableName(value = "dbo.ST_CAMERA_AREA_B") -public class StCameraAreaB implements Serializable { - /** - * 视频区域ID - */ - @TableId(value = "CAM_AR_ID", type = IdType.INPUT) - @Schema(description="视频区域ID, 新增时候不需要，修改时候需要") - @JsonSerialize(using = ToStringSerializer.class) - @NotNull(groups = {Update.class}, message = "视频区域ID不能为空") - private Long camArId; - - @TableField(value = "CAM_AR_NM") - @Schema(description="视频区域名称") - @NotEmpty(message = "视频区域名称不能为空") - @Size(max = 200, message = "视频区域名称长度不能超过200") - private String camArNm; - - @TableField(value = "PID") - @Schema(description="父ID, 顶层传0") - @NotNull(message = "父ID不能为空") - @JsonSerialize(using = ToStringSerializer.class) - private Long pid; - - @TableField(value = "SORT_ON") - @Schema(description="排序字段", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - private Integer sortOn; - - /** - * 状态 1：启用 0：禁用 - */ - @TableField(value = "[STATUS]") - @Schema(description="状态 1：启用 0：禁用") - @NotNull(message = "状态不能为空") - private Integer status; - - /** - * 备注 - */ - @TableField(value = "COMMENTS", updateStrategy= FieldStrategy.ALWAYS) - @Schema(description="备注", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @Size(max = 200, message = "备注长度不能超过200") - private String comments; - - /** - * 新增时间 - */ - @TableField(value = "CREATE_TM") - @Schema(description=" 新增时间", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date createTm; - - /** - * 修改时间 - */ - @TableField(value = "TM") - @Schema(description="修改时间", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date tm; - - public static final String COL_CAM_AR_ID = "CAM_AR_ID"; - - public static final String COL_CAM_AR_NM = "CAM_AR_NM"; - - public static final String COL_PID = "PID"; - - public static final String COL_SORT_ON = "SORT_ON"; - - public static final String COL_STATUS = "STATUS"; - - public static final String COL_COMMENTS = "COMMENTS"; - - public static final String COL_CREATE_TM = "CREATE_TM"; - - public static final String COL_TM = "TM"; -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/StCameraB.java b/src/main/java/com/gunshi/project/xyt/model/StCameraB.java deleted file mode 100644 index c1c937b..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/StCameraB.java +++ /dev/null @@ -1,176 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.FieldStrategy; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.gunshi.project.xyt.validate.markers.Update; -import io.swagger.v3.oas.annotations.media.Schema; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import jakarta.validation.constraints.Max; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; -import lombok.Data; - -/** - * 视频点信息 - */ -@Schema(description = "视频点信息") -@Data -@TableName(value = "dbo.ST_CAMERA_B") -public class StCameraB implements Serializable { - /** - * 视频点id - */ - @TableId(value = "CAM_ID", type = IdType.INPUT) - @Schema(description="视频点id") - @JsonSerialize(using = ToStringSerializer.class) - @NotNull(message = "视频点id不能为空", groups = {Update.class}) - private Long camId; - - /** - * 视频点名称 - */ - @TableField(value = "CAM_NM") - @Schema(description="视频点名称") - @NotBlank(message = "视频点名称不能为空") - @Size(max = 200, message = "视频点名称长度不能超过200") - private String camNm; - - /** - * 监控点类型 - */ - @TableField(value = "CAM_TYPE") - @Schema(description="监控点类型 传字典类的ID") - @NotNull(message = "监控点类型不能为空") - @JsonSerialize(using = ToStringSerializer.class) - private Long camType; - - /** - * 通道号 - */ - @TableField(value = "CAM_CH", updateStrategy= FieldStrategy.ALWAYS) - @Schema(description="通道号") - @Max(20000) - private Integer camCh; - - /** - * 所在区域 - */ - @TableField(value = "CAM_AR_ID") - @Schema(description="所在区域 传视频区域ID") - @NotNull(message = "所在区域不能为空") - @JsonSerialize(using = ToStringSerializer.class) - private Long camArId; - - /** - * 摄像头连接地址 IP和端口 - */ - @TableField(value = "CAM_URL") - @Schema(description="摄像头连接地址 IP和端口") - @NotNull(message = "摄像头连接地址不能为空") - @Size(max = 200, message = "摄像头连接地址长度不能超过200") - private String camUrl; - - /** - * 视频序列号 - */ - @TableField(value = "CAM_SN") - @Schema(description="视频序列号") - @NotBlank(message = "视频序列号不能为空") - @Size(max = 200, message = "视频序列号长度不能超过200") - private String camSn; - - /** - * 经度 - */ - @TableField(value = "LGTD") - @Schema(description="经度") - @NotNull(message = "经度不能为空") - private BigDecimal lgtd; - - /** - * 纬度 - */ - @TableField(value = "LTTD") - @Schema(description="纬度") - @NotNull(message = "纬度不能为空") - private BigDecimal lttd; - - /** - * 备注 - */ - @TableField(value = "COMMENTS", updateStrategy= FieldStrategy.ALWAYS) - @Schema(description="备注") - @Size(max = 200, message = "备注长度不能超过200") - private String comments; - - /** - * 新建时间 - */ - @TableField(value = "CREATE_TM") - @Schema(description="新建时间", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date createTm; - - /** - * 修改时间 - */ - @TableField(value = "TM") - @Schema(description="修改时间", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date tm; - - /** - * 状态 1：启用 0：禁用 - */ - @TableField(value = "[STATUS]") - @Schema(description="状态 1：启用 0：禁用") - @NotNull(message = "状态不能为空") - private Integer status; - - /** - * 首页默认显示 1：显示 0：不显示 - */ - @TableField(value = "DEFAULT_SHOW") - @Schema(description = "首页默认显示 1：显示 0：不显示") - @NotNull(message = "首页默认显示不能为空") - private Integer defaultShow; - - public static final String COL_CAM_ID = "CAM_ID"; - - public static final String COL_CAM_NM = "CAM_NM"; - - public static final String COL_CAM_TYPE = "CAM_TYPE"; - - public static final String COL_CAM_CH = "CAM_CH"; - - public static final String COL_CAM_AR_ID = "CAM_AR_ID"; - - public static final String COL_CAM_URL = "CAM_URL"; - - public static final String COL_CAM_SN = "CAM_SN"; - - public static final String COL_LGTD = "LGTD"; - - public static final String COL_LTTD = "LTTD"; - - public static final String COL_COMMENTS = "COMMENTS"; - - public static final String COL_CREATE_TM = "CREATE_TM"; - - public static final String COL_TM = "TM"; - - public static final String COL_STATUS = "STATUS"; - - public static final String COL_DEFAULT_SHOW = "DEFAULT_SHOW"; -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/StDamB.java b/src/main/java/com/gunshi/project/xyt/model/StDamB.java deleted file mode 100644 index 5433af5..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/StDamB.java +++ /dev/null @@ -1,274 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.v3.oas.annotations.media.Schema; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import lombok.Data; - -/** - * 大坝基础信息表 - */ -@Schema(description="大坝基础信息表") -@Data -@TableName(value = "dbo.ST_DAM_B") -public class StDamB implements Serializable { - /** - * 大坝ID - */ - @TableId(value = "DAM_ID", type = IdType.INPUT) - @Schema(description="大坝ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long damId; - - /** - * 大坝代码 - */ - @TableField(value = "DAM_CODE") - @Schema(description="大坝代码") - private String damCode; - - /** - * 大坝名称 - */ - @TableField(value = "DAM_NAME") - @Schema(description="大坝名称") - private String damName; - - /** - * 起点经度 - */ - @TableField(value = "START_LONG") - @Schema(description="起点经度") - private BigDecimal startLong; - - /** - * 起点纬度 - */ - @TableField(value = "START_LAT") - @Schema(description="起点纬度") - private BigDecimal startLat; - - /** - * 终点经度 - */ - @TableField(value = "END_LONG") - @Schema(description="终点经度") - private BigDecimal endLong; - - /** - * 终点纬度 - */ - @TableField(value = "END_LAT") - @Schema(description="终点纬度") - private BigDecimal endLat; - - /** - * 大坝所在位置 - */ - @TableField(value = "DAM_LOC") - @Schema(description="大坝所在位置") - private String damLoc; - - /** - * 是否主坝 - */ - @TableField(value = "IF_MAIN_DAM") - @Schema(description="是否主坝") - private String ifMainDam; - - /** - * 大坝级别 - */ - @TableField(value = "DAM_GRAD") - @Schema(description="大坝级别") - private String damGrad; - - /** - * 大坝最大坝高 - */ - @TableField(value = "DAM_MAX_HEIG") - @Schema(description="大坝最大坝高") - private BigDecimal damMaxHeig; - - /** - * 大坝坝顶长度 - */ - @TableField(value = "DAM_TOP_LEN") - @Schema(description="大坝坝顶长度") - private BigDecimal damTopLen; - - /** - * 大坝坝顶宽度 - */ - @TableField(value = "DAM_TOP_WID") - @Schema(description="大坝坝顶宽度") - private BigDecimal damTopWid; - - /** - * 大坝材料类型 DICT_ID - */ - @TableField(value = "DAM_TYPE_MAT") - @Schema(description="大坝材料类型 DICT_ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long damTypeMat; - - /** - * 大坝结构类型 DICT_ID - */ - @TableField(value = "DAM_TYPE_STR") - @Schema(description="大坝结构类型 DICT_ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long damTypeStr; - - /** - * 工程建设情况 - */ - @TableField(value = "ENG_STAT") - @Schema(description="工程建设情况") - private String engStat; - - /** - * 运行状况 - */ - @TableField(value = "RUN_STAT") - @Schema(description="运行状况") - private String runStat; - - /** - * 开工时间 - */ - @TableField(value = "START_DATE") - @Schema(description="开工时间") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date startDate; - - /** - * 建成时间 - */ - @TableField(value = "COMP_DATE") - @Schema(description="建成时间") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date compDate; - - /** - * 备注 - */ - @TableField(value = "NOTE") - @Schema(description="备注") - private String note; - - /** - * 状态 1：启用 0：禁用 - */ - @TableField(value = "[STATUS]") - @Schema(description="状态 1：启用 0：禁用") - private Integer status; - - /** - * 坝顶高程 - */ - @TableField(value = "DAM_TOP_HEIG") - @Schema(description="坝顶高程") - private BigDecimal damTopHeig; - - /** - * 放浪墙顶高程 - */ - @TableField(value = "LFW_TOP_HEIG") - @Schema(description="放浪墙顶高程") - private BigDecimal lfwTopHeig; - - /** - * 抗震设计烈度 dict_id - */ - @TableField(value = "SDI") - @Schema(description="抗震设计烈度 dict_id") - @JsonSerialize(using = ToStringSerializer.class) - private Long sdi; - - /** - * 是否兼做坝顶公路 1：可以 0：不可以 - */ - @TableField(value = "TOP_ROAD") - @Schema(description="是否兼做坝顶公路 1：可以 0：不可以") - private String topRoad; - - /** - * 修改时间 - */ - @TableField(value = "TM") - @Schema(description="修改时间") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date tm; - - /** - * 下闸蓄水时间 - */ - @TableField(value = "LOW_GATE_TIME") - @Schema(description="下闸蓄水时间") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date lowGateTime; - - public static final String COL_DAM_ID = "DAM_ID"; - - public static final String COL_DAM_CODE = "DAM_CODE"; - - public static final String COL_DAM_NAME = "DAM_NAME"; - - public static final String COL_START_LONG = "START_LONG"; - - public static final String COL_START_LAT = "START_LAT"; - - public static final String COL_END_LONG = "END_LONG"; - - public static final String COL_END_LAT = "END_LAT"; - - public static final String COL_DAM_LOC = "DAM_LOC"; - - public static final String COL_IF_MAIN_DAM = "IF_MAIN_DAM"; - - public static final String COL_DAM_GRAD = "DAM_GRAD"; - - public static final String COL_DAM_MAX_HEIG = "DAM_MAX_HEIG"; - - public static final String COL_DAM_TOP_LEN = "DAM_TOP_LEN"; - - public static final String COL_DAM_TOP_WID = "DAM_TOP_WID"; - - public static final String COL_DAM_TYPE_MAT = "DAM_TYPE_MAT"; - - public static final String COL_DAM_TYPE_STR = "DAM_TYPE_STR"; - - public static final String COL_ENG_STAT = "ENG_STAT"; - - public static final String COL_RUN_STAT = "RUN_STAT"; - - public static final String COL_START_DATE = "START_DATE"; - - public static final String COL_COMP_DATE = "COMP_DATE"; - - public static final String COL_NOTE = "NOTE"; - - public static final String COL_STATUS = "STATUS"; - - public static final String COL_DAM_TOP_HEIG = "DAM_TOP_HEIG"; - - public static final String COL_LFW_TOP_HEIG = "LFW_TOP_HEIG"; - - public static final String COL_SDI = "SDI"; - - public static final String COL_TOP_ROAD = "TOP_ROAD"; - - public static final String COL_TM = "TM"; - - public static final String COL_LOW_GATE_TIME = "LOW_GATE_TIME"; -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/StEqptB.java b/src/main/java/com/gunshi/project/xyt/model/StEqptB.java deleted file mode 100644 index c1fcfd5..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/StEqptB.java +++ /dev/null @@ -1,272 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.v3.oas.annotations.media.Schema; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import lombok.Data; - -/** - * 量水堰信息表 - */ -@Schema(description="量水堰信息表") -@Data -@TableName(value = "dbo.ST_EQPT_B") -public class StEqptB implements Serializable { - /** - * 量水设施ID - */ - @TableId(value = "WMEQ_ID", type = IdType.INPUT) - @Schema(description="量水设施ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long wmeqId; - - /** - * 量水设施代码 - */ - @TableField(value = "WMEQ_CODE") - @Schema(description="量水设施代码") - private String wmeqCode; - - /** - * 量水设施名称 - */ - @TableField(value = "WMEQ_NAME") - @Schema(description="量水设施名称") - private String wmeqName; - - /** - * 管理单位代码 - */ - @TableField(value = "ENG_MAN_CODE") - @Schema(description="管理单位代码") - private String engManCode; - - /** - * 所属行政区划代码 - */ - @TableField(value = "ADDVCD") - @Schema(description="所属行政区划代码") - private String addvcd; - - /** - * 所在渠道代码 - */ - @TableField(value = "CHAN_CODE") - @Schema(description="所在渠道代码") - private String chanCode; - - /** - * 设施类别 字典id - */ - @TableField(value = "MEASURE") - @Schema(description="设施类别 字典id") - @JsonSerialize(using = ToStringSerializer.class) - private Long measure; - - /** - * 量水设施所在位置 - */ - @TableField(value = "[POSITION]") - @Schema(description="量水设施所在位置") - private String position; - - /** - * 经度 - */ - @TableField(value = "LGTD") - @Schema(description="经度") - private BigDecimal lgtd; - - /** - * 纬度 - */ - @TableField(value = "LTTD") - @Schema(description="纬度") - private BigDecimal lttd; - - /** - * 桩号 - */ - @TableField(value = "BNCH") - @Schema(description="桩号") - private String bnch; - - /** - * 结构形式 - */ - @TableField(value = "STRCTS_TP") - @Schema(description="结构形式") - private String strctsTp; - - /** - * 喉道尺寸 - */ - @TableField(value = "THROAT_SIZE") - @Schema(description="喉道尺寸") - private String throatSize; - - /** - * 设计流量 - */ - @TableField(value = "DSFL") - @Schema(description="设计流量") - private BigDecimal dsfl; - - /** - * 实达流量 - */ - @TableField(value = "STFL") - @Schema(description="实达流量") - private BigDecimal stfl; - - /** - * 建成时间 - */ - @TableField(value = "COMP_DATE") - @Schema(description="建成时间") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date compDate; - - /** - * 更新或维修时间 - */ - @TableField(value = "UPDSER_DATE") - @Schema(description="更新或维修时间") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date updserDate; - - /** - * 更新或维修原因 - */ - @TableField(value = "UPDSER_RSN") - @Schema(description="更新或维修原因") - private String updserRsn; - - /** - * 更新或维修投资 - */ - @TableField(value = "UPDSER_INVST") - @Schema(description="更新或维修投资") - private String updserInvst; - - /** - * 工程等别 - */ - @TableField(value = "ENG_GRAD") - @Schema(description="工程等别") - private String engGrad; - - /** - * 使用情况 - */ - @TableField(value = "SER_COD") - @Schema(description="使用情况") - private String serCod; - - /** - * 备注 - */ - @TableField(value = "NOTE") - @Schema(description="备注") - private String note; - - /** - * 所在灌区 - */ - @TableField(value = "IRR_CODE") - @Schema(description="所在灌区") - private String irrCode; - - /** - * 属性采集时间 - */ - @TableField(value = "COLL_DATE") - @Schema(description="属性采集时间") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date collDate; - - /** - * 属性更新时间 - */ - @TableField(value = "UPD_DATE") - @Schema(description="属性更新时间") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date updDate; - - /** - * 河流代码 - */ - @TableField(value = "RV_CODE") - @Schema(description="河流代码") - private String rvCode; - - /** - * 状态 1:启用 0:禁用 - */ - @TableField(value = "[STATUS]") - @Schema(description="状态 1:启用 0:禁用") - private Integer status; - - public static final String COL_WMEQ_ID = "WMEQ_ID"; - - public static final String COL_WMEQ_CODE = "WMEQ_CODE"; - - public static final String COL_WMEQ_NAME = "WMEQ_NAME"; - - public static final String COL_ENG_MAN_CODE = "ENG_MAN_CODE"; - - public static final String COL_ADDVCD = "ADDVCD"; - - public static final String COL_CHAN_CODE = "CHAN_CODE"; - - public static final String COL_MEASURE = "MEASURE"; - - public static final String COL_POSITION = "POSITION"; - - public static final String COL_LGTD = "LGTD"; - - public static final String COL_LTTD = "LTTD"; - - public static final String COL_BNCH = "BNCH"; - - public static final String COL_STRCTS_TP = "STRCTS_TP"; - - public static final String COL_THROAT_SIZE = "THROAT_SIZE"; - - public static final String COL_DSFL = "DSFL"; - - public static final String COL_STFL = "STFL"; - - public static final String COL_COMP_DATE = "COMP_DATE"; - - public static final String COL_UPDSER_DATE = "UPDSER_DATE"; - - public static final String COL_UPDSER_RSN = "UPDSER_RSN"; - - public static final String COL_UPDSER_INVST = "UPDSER_INVST"; - - public static final String COL_ENG_GRAD = "ENG_GRAD"; - - public static final String COL_SER_COD = "SER_COD"; - - public static final String COL_NOTE = "NOTE"; - - public static final String COL_IRR_CODE = "IRR_CODE"; - - public static final String COL_COLL_DATE = "COLL_DATE"; - - public static final String COL_UPD_DATE = "UPD_DATE"; - - public static final String COL_RV_CODE = "RV_CODE"; - - public static final String COL_STATUS = "STATUS"; -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/StFlowR.java b/src/main/java/com/gunshi/project/xyt/model/StFlowR.java deleted file mode 100644 index affb8f9..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/StFlowR.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.github.jeffreyning.mybatisplus.anno.MppMultiId; -import com.gunshi.core.dateformat.DateFormatString; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 流量数据 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-25 - */ -@Data -@TableName("ST_FLOW_R") -@Schema(description = "流量数据") -public class StFlowR { - @MppMultiId("STCD") - @Schema(description = "测站编码") - private String stcd; - - @MppMultiId("TM") - @Schema(description = "采集时间") - @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") - private Date tm; - - @MppMultiId("CHID") - @Schema(description = "通道") - private String chid; - - @TableField("HQ") - @Schema(description = "小时流量") - private BigDecimal hq; -} diff --git a/src/main/java/com/gunshi/project/xyt/model/StFlowRReal.java b/src/main/java/com/gunshi/project/xyt/model/StFlowRReal.java deleted file mode 100644 index 1680dfa..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/StFlowRReal.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.gunshi.project.xyt.model; - -/** - * 流量数据 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-25 - */ - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * 流量数据表 - */ -@Schema(description="流量数据表") -@Data -@TableName(value = "dbo.ST_FLOW_R_REAL") -public class StFlowRReal implements Serializable { - - /** - * 流量计ID - */ - @TableId(value = "FLOW_ID", type = IdType.INPUT) - @Schema(description="流量计ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long flowId; - - /** - * 实时流量 - */ - @TableField(value = "REAL_DATA") - @Schema(description="实时流量") - private Float realData; - - /** - * 数据采集时间 - */ - @TableField(value = "TM") - @Schema(description="数据采集时间") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date tm; - -} diff --git a/src/main/java/com/gunshi/project/xyt/model/StGateB.java b/src/main/java/com/gunshi/project/xyt/model/StGateB.java deleted file mode 100644 index 88b0fd3..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/StGateB.java +++ /dev/null @@ -1,153 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.v3.oas.annotations.media.Schema; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import lombok.Data; - -/** - * 闸阀基本信息表 - */ -@Schema(description="闸阀基本信息表") -@Data -@TableName(value = "dbo.ST_GATE_B") -public class StGateB implements Serializable { - /** - * 闸阀ID - */ - @TableId(value = "GATE_ID", type = IdType.INPUT) - @Schema(description="闸阀ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long gateId; - - /** - * 闸阀编码 - */ - @TableField(value = "GATE_CD") - @Schema(description="闸阀编码") - private String gateCd; - - /** - * 闸阀名称 - */ - @TableField(value = "GATE_NM") - @Schema(description="闸阀名称") - private String gateNm; - - /** - * 所在位置 - */ - @TableField(value = "GTLC") - @Schema(description="所在位置") - private String gtlc; - - /** - * 经度 - */ - @TableField(value = "LGTD") - @Schema(description="经度") - private BigDecimal lgtd; - - /** - * 纬度 - */ - @TableField(value = "LTTD") - @Schema(description="纬度") - private BigDecimal lttd; - - /** - * 产品类型 dict_id - */ - @TableField(value = "GATE_TP") - @Schema(description="产品类型 dict_id") - @JsonSerialize(using = ToStringSerializer.class) - private Long gateTp; - - /** - * 产品型号 - */ - @TableField(value = "GATE_MD") - @Schema(description="产品型号") - private String gateMd; - - /** - * 产品规格 - */ - @TableField(value = "GATE_SPE") - @Schema(description="产品规格") - private String gateSpe; - - /** - * 结构长度 - */ - @TableField(value = "GATE_LH") - @Schema(description="结构长度") - private String gateLh; - - /** - * 建成日期 - */ - @TableField(value = "GATE_TM") - @Schema(description="建成日期") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date gateTm; - - /** - * 备注 - */ - @TableField(value = "REMARK") - @Schema(description="备注") - private String remark; - - /** - * 状态 1：启用 0：禁用 - */ - @TableField(value = "[STATUS]") - @Schema(description="状态 1：启用 0：禁用") - private Integer status; - - /** - * 修改时间 - */ - @TableField(value = "TM") - @Schema(description="修改时间") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date tm; - - public static final String COL_GATE_ID = "GATE_ID"; - - public static final String COL_GATE_CD = "GATE_CD"; - - public static final String COL_GATE_NM = "GATE_NM"; - - public static final String COL_GTLC = "GTLC"; - - public static final String COL_LGTD = "LGTD"; - - public static final String COL_LTTD = "LTTD"; - - public static final String COL_GATE_TP = "GATE_TP"; - - public static final String COL_GATE_MD = "GATE_MD"; - - public static final String COL_GATE_SPE = "GATE_SPE"; - - public static final String COL_GATE_LH = "GATE_LH"; - - public static final String COL_GATE_TM = "GATE_TM"; - - public static final String COL_REMARK = "REMARK"; - - public static final String COL_STATUS = "STATUS"; - - public static final String COL_TM = "TM"; -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/StGateBFile.java b/src/main/java/com/gunshi/project/xyt/model/StGateBFile.java deleted file mode 100644 index e8722a8..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/StGateBFile.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.v3.oas.annotations.media.Schema; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - -/** - * 闸阀基本信息- 附件表 - */ -@Schema(description="闸阀基本信息- 附件表") -@Data -@TableName(value = "dbo.ST_GATE_B_FILE") -public class StGateBFile implements Serializable { - /** - * 闸阀ID - */ - @TableField(value = "GATE_ID") - @Schema(description="闸阀ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long gateId; - - /** - * 文件ID - */ - @TableField(value = "FILE_ID") - @Schema(description="文件ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long fileId; - - /** - * 时间戳 - */ - @TableField(value = "TM") - @Schema(description="时间戳") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date tm; - - /** - * 排序字段 - */ - @TableField(value = "SORT_ON") - @Schema(description="排序字段") - private Integer sortOn; - - public static final String COL_GATE_ID = "GATE_ID"; - - public static final String COL_FILE_ID = "FILE_ID"; - - public static final String COL_TM = "TM"; - - public static final String COL_SORT_ON = "SORT_ON"; -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/StGateBHistory.java b/src/main/java/com/gunshi/project/xyt/model/StGateBHistory.java deleted file mode 100644 index 86b54ab..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/StGateBHistory.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * 闸阀开关历史表 - */ -@Schema(description="闸阀开关历史表") -@Data -@TableName(value = "dbo.ST_GATE_B_HISTORY") -public class StGateBHistory implements Serializable { - - /** - * 历史ID - */ - @TableId(value = "HISTORY_ID", type = IdType.INPUT) - @Schema(description="历史ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long historyId; - - - /** - * 闸阀ID - */ - @TableField(value = "GATE_ID") - @Schema(description="闸阀ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long gateId; - - - /** - * 开关状态 1：全开 2：50%开 3：关 - */ - @TableField(value = "[STATUS]") - @Schema(description="开关状态 1：全开 2：50%开 3：关") - private Integer status; - - /** - * 数据采集时间时间 - */ - @TableField(value = "TM") - @Schema(description="数据采集时间") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date tm; - - public static final String COL_HISTORY_ID = "HISTORY_ID"; - - public static final String COL_GATE_ID = "GATE_ID"; - - public static final String COL_STATUS = "STATUS"; - - public static final String COL_TM = "TM"; -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/StGateBReal.java b/src/main/java/com/gunshi/project/xyt/model/StGateBReal.java deleted file mode 100644 index 16e2e9a..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/StGateBReal.java +++ /dev/null @@ -1,55 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * 闸阀数据信息表 - */ -@Schema(description="闸阀数据信息表") -@Data -@TableName(value = "dbo.ST_GATE_B_REAL") -public class StGateBReal implements Serializable { - - - /** - * 闸阀ID - */ - @TableId(value = "GATE_ID", type = IdType.INPUT) - @Schema(description="闸阀ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long gateId; - - - /** - * 开关状态 1：全开 2：50%开 3：关 - */ - @TableField(value = "[STATUS]") - @Schema(description="开关状态 1：全开 2：50%开 3：关") - private Integer status; - - /** - * 数据采集时间时间 - */ - @TableField(value = "TM") - @Schema(description="数据采集时间") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date tm; - - public static final String COL_GATE_ID = "GATE_ID"; - - public static final String COL_STATUS = "STATUS"; - - public static final String COL_TM = "TM"; -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/StGateRepairDetail.java b/src/main/java/com/gunshi/project/xyt/model/StGateRepairDetail.java deleted file mode 100644 index cda3231..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/StGateRepairDetail.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * 闸阀维修详情表 - */ -@Schema(description="闸阀维修详情表") -@Data -@TableName(value = "dbo.ST_GATE_REPAIR_DETAIL") -public class StGateRepairDetail implements Serializable { - - /** - * 维修详情ID - */ - @TableId(value = "DETAIL_ID", type = IdType.INPUT) - @Schema(description="维修详情ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long detailId; - - /** - * 维修记录ID - */ - @TableField(value = "RECORD_ID") - @Schema(description="维修记录ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long recordId; - - /** - * 闸阀ID - */ - @TableField(value = "GATE_ID") - @Schema(description="闸阀ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long gateId; - - /** - * 闸阀名称 - */ - @TableField(value = "GATE_NM") - @Schema(description="闸阀名称") - private String gateNm; - - /** - * 检修内容 - */ - @TableField(value = "REPAIR_CONTENT") - @Schema(description="检修内容") - private String repairContent; - - /** - * 存在的问题 - */ - @TableField(value = "PROBLEM") - @Schema(description="存在的问题") - private String problem; - - /** - * 原因及意见 - */ - @TableField(value = "REASON_AND_SUGGESTION") - @Schema(description="原因及意见") - private String reasonAndSuggestion; - - /** - * 处理结果 - */ - @TableField(value = "DEAL_RESULT") - @Schema(description="处理结果") - private String dealResult; - - /** - * 下一次检修时间 - */ - @TableField(value = "NEXT_REPAIR_TM") - @Schema(description="下一次检修时间") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date nextRepairTm; - - public static final String COL_DETAIL_ID = "DETAIL_ID"; - - public static final String COL_RECORD_ID = "RECORD_ID"; - - public static final String COL_GATE_ID = "GATE_ID"; - - public static final String COL_GATE_NM = "GATE_NM"; - - public static final String COL_REPAIR_CONTENT = "REPAIR_CONTENT"; - - public static final String COL_PROBLEM = "PROBLEM"; - - public static final String COL_REASON_AND_SUGGESTION = "REASON_AND_SUGGESTION"; - - public static final String COL_DEAL_RESULT = "DEAL_RESULT"; - - public static final String COL_NEXT_REPAIR_TM = "NEXT_REPAIR_TM"; - -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/StGateRepairRecord.java b/src/main/java/com/gunshi/project/xyt/model/StGateRepairRecord.java deleted file mode 100644 index 6dd2a0d..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/StGateRepairRecord.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.gunshi.project.xyt.validate.markers.Insert; -import com.gunshi.project.xyt.validate.markers.Update; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - -/** - * 闸阀基本信息表 - */ -@Schema(description="闸阀维修记录表") -@Data -@TableName(value = "dbo.ST_GATE_REPAIR_RECORD") -public class StGateRepairRecord implements Serializable { - /** - * 维修记录ID - */ - @TableId(value = "RECORD_ID", type = IdType.INPUT) - @Schema(description="维修记录ID") - @JsonSerialize(using = ToStringSerializer.class) - @NotNull(message = "维修记录ID不能为空", groups = {Update.class}) - private Long recordId; - - /** - * 维修类型，0维修1养护 - */ - @TableField(value = "REPAIR_TYPE") - @Schema(description="维修类型，0维修1养护") - @NotNull(message = "维修类型不能为空", groups = {Insert.class,Update.class}) - private Integer repairType; - - /** - * 记录人ID - */ - @TableField(value = "RECORD_USER_ID") - @Schema(description="记录人ID") - private Long recordUserId; - - /** - * 记录人 - */ - @TableField(value = "RECORD_USER_NAME") - @Schema(description="记录人") - @NotEmpty(message = "记录人不能为空", groups = {Insert.class,Update.class}) - private String recordUserName; - - /** - * 检修时间 - */ - @TableField(value = "REPAIR_TM") - @Schema(description="检修时间") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - @NotNull(message = "检修时间不能为空", groups = {Insert.class,Update.class}) - private Date repairTm; - - public static final String COL_RECORD_ID = "RECORD_ID"; - - public static final String COL_REPAIR_TYPE = "REPAIR_TYPE"; - - public static final String COL_RECORD_USER_ID = "RECORD_USER_ID"; - - public static final String COL_RECORD_USER_NAME = "RECORD_USER_NAME"; - - public static final String COL_REPAIR_TM = "REPAIR_TM"; - -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/StImgR.java b/src/main/java/com/gunshi/project/xyt/model/StImgR.java deleted file mode 100644 index f34897f..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/StImgR.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.github.jeffreyning.mybatisplus.anno.MppMultiId; -import com.gunshi.core.dateformat.DateFormatString; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.util.Date; - -/** - * 图像数据 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-25 - */ -@Data -@TableName("ST_IMG_R") -@Schema(description = "图像数据") -public class StImgR { - @MppMultiId("STCD") - @Schema(description = "测站编码") - private String stcd; - - @MppMultiId("TM") - @Schema(description = "采集时间") - @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") - private Date tm; - - @MppMultiId("CHID") - @Schema(description = "通道") - private String chid; - - @TableField("IMG_PATH") - @Schema(description = "图片文件存储路径") - private String imgPath; -} diff --git a/src/main/java/com/gunshi/project/xyt/model/StMoncrB.java b/src/main/java/com/gunshi/project/xyt/model/StMoncrB.java deleted file mode 100644 index f5d7ffe..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/StMoncrB.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.gunshi.project.xyt.validate.markers.Update; -import io.swagger.v3.oas.annotations.media.Schema; - -import java.io.Serializable; -import java.util.Date; - -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; -import lombok.Data; - -/** - * 监测断面信息表 - */ -@Schema(description="监测断面信息表") -@Data -@TableName(value = "dbo.ST_MONCR_B") -public class StMoncrB implements Serializable { - /** - * 断面ID - */ - @TableId(value = "CR_ID", type = IdType.INPUT) - @Schema(description="断面ID") - @JsonSerialize(using = ToStringSerializer.class) - @NotNull(message = "断面ID不能为空", groups = {Update.class}) - private Long crId; - - /** - * 断面编号 - */ - @TableField(value = "CR_CD") - @Schema(description="断面编号") - @Size(max = 50,message = "断面编号长度不能超过50") - @NotNull - private String crCd; - - /** - * 断面名称 - */ - @TableField(value = "CR_NM") - @Schema(description="断面名称") - @Size(max = 200,message = "断面名称长度不能超过200") - @NotNull - private String crNm; - - /** - * 断面平面图 文件ID - */ - @TableField(value = "CR_IMG_ID") - @Schema(description="断面平面图 文件ID") - @JsonSerialize(using = ToStringSerializer.class) - @NotNull - private Long crImgId; - - /** - * 排序字段 - */ - @TableField(value = "SORT_ON") - @Schema(description="排序字段") - private Integer sortOn; - - /** - * 状态 1:启用 0：禁用 - */ - @TableField(value = "[STATUS]") - @Schema(description="状态 1:启用 0：禁用") - @NotNull - private Integer status; - - /** - * 时间戳 - */ - @TableField(value = "TM") - @Schema(description="时间戳") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date tm; - - /** - * 备注/描述 - */ - @TableField(value = "COMMENTS") - @Schema(description = "备注/描述") - @Size(max = 200,message = "备注/描述长度不能超过200") - private String comments; - - public static final String COL_CR_ID = "CR_ID"; - - public static final String COL_CR_CD = "CR_CD"; - - public static final String COL_CR_NM = "CR_NM"; - - public static final String COL_CR_IMG_ID = "CR_IMG_ID"; - - public static final String COL_SORT_ON = "SORT_ON"; - - public static final String COL_STATUS = "STATUS"; - - public static final String COL_TM = "TM"; - - public static final String COL_COMMENTS = "COMMENTS"; -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/StPptnR.java b/src/main/java/com/gunshi/project/xyt/model/StPptnR.java deleted file mode 100644 index 7ee1ed2..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/StPptnR.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.github.jeffreyning.mybatisplus.anno.MppMultiId; -import com.gunshi.core.dateformat.DateFormatString; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 雨量数据 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-25 - */ -@Data -@TableName("ST_PPTN_R") -@Schema(description = "雨量数据") -public class StPptnR { - @MppMultiId("STCD") - @Schema(description = "测站编码") - private String stcd; - - @MppMultiId("TM") - @Schema(description = "采集时间") - @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") - private Date tm; - - @Schema(description = "时段降水量") - @TableField("DRP") - private BigDecimal drp; - - @Schema(description = "累计降水量") - @TableField("ACCDRP") - private BigDecimal accdrp; -} diff --git a/src/main/java/com/gunshi/project/xyt/model/StRcvReal.java b/src/main/java/com/gunshi/project/xyt/model/StRcvReal.java deleted file mode 100644 index b96a3ea..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/StRcvReal.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.gunshi.core.dateformat.DateFormatString; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.util.Date; - -/** - * 监测类数据实时表对象 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-29 - */ -@Data -@TableName("ST_RCV_REAL") -public class StRcvReal { - @TableId("STCD") - @Schema(description = "测站编码") - private String stcd; - - @TableField("TM") - @Schema(description = "采集时间") - @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") - private Date tm; - - @TableField("STNM") - @Schema(description = "测站名称") - private String stnm; - - @TableField("STTP") - @Schema(description = "测站类别") - private String sttp; - - @TableField("DATA") - @Schema(description = "最近数据") - private String data; - - @TableField("PROTOCOL_ID") - @Schema(description = "协议ID") - private String protocolId; - - @TableField("PROTOCOL_NAME") - @Schema(description = "协议名称") - private String protocolName; -} diff --git a/src/main/java/com/gunshi/project/xyt/model/StResB.java b/src/main/java/com/gunshi/project/xyt/model/StResB.java deleted file mode 100644 index 8c3e3db..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/StResB.java +++ /dev/null @@ -1,630 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.gunshi.project.xyt.validate.markers.Insert; -import io.swagger.v3.oas.annotations.media.Schema; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -/** - * 水库的基础信息 - */ -@Schema(description="水库的基础信息") -@Data -@TableName(value = "dbo.ST_RES_B") -public class StResB implements Serializable { - /** - * 水库id - */ - @TableId(value = "RES_ID", type = IdType.INPUT) - @Schema(description="水库id") - @JsonSerialize(using = ToStringSerializer.class) - @NotNull(groups = Insert.class) - private Long resId; - - /** - * 水库代码 - */ - @TableField(value = "RES_CODE") - @Schema(description="水库代码") - private String resCode; - - /** - * 水库名称 - */ - @TableField(value = "RES_NAME") - @Schema(description="水库名称") - private String resName; - - /** - * 行政区划编码 - */ - @TableField(value = "ADDVCD") - @Schema(description="行政区划编码") - private String addvcd; - - /** - * 经度 - */ - @TableField(value = "LGTD") - @Schema(description="经度") - private BigDecimal lgtd; - - /** - * 纬度 - */ - @TableField(value = "LTTD") - @Schema(description="纬度") - private BigDecimal lttd; - - /** - * 堰顶高程 - */ - @TableField(value = "WCRSTEL") - @Schema(description="堰顶高程") - private BigDecimal wcrstel; - - /** - * 堰顶宽度 - */ - @TableField(value = "WCRESTWD") - @Schema(description="堰顶宽度") - private BigDecimal wcrestwd; - - /** - * 坝顶高程 - */ - @TableField(value = "DMTPEL") - @Schema(description="坝顶高程") - private BigDecimal dmtpel; - - /** - * 最大坝高 - */ - @TableField(value = "DMHT") - @Schema(description="最大坝高") - private BigDecimal dmht; - - /** - * 坝顶长度 - */ - @TableField(value = "DMTPLEN") - @Schema(description="坝顶长度") - private BigDecimal dmtplen; - - /** - * 坝顶宽度 - */ - @TableField(value = "DATPWD") - @Schema(description="坝顶宽度") - private BigDecimal datpwd; - - /** - * 设计洪水位 - */ - @TableField(value = "DSFLLV") - @Schema(description="设计洪水位") - private BigDecimal dsfllv; - - /** - * 校核洪水位 - */ - @TableField(value = "CHFLLV") - @Schema(description="校核洪水位") - private BigDecimal chfllv; - - /** - * 正常蓄水位 - */ - @TableField(value = "NORM_WAT_LEV") - @Schema(description="正常蓄水位") - private BigDecimal normWatLev; - - /** - * 死水位 - */ - @TableField(value = "DEAD_LEV") - @Schema(description="死水位") - private BigDecimal deadLev; - - /** - * 总库容 - */ - @TableField(value = "TOT_CAP") - @Schema(description="总库容") - private BigDecimal totCap; - - /** - * 防洪库容 - */ - @TableField(value = "FLCO_CAP") - @Schema(description="防洪库容") - private BigDecimal flcoCap; - - /** - * 兴利库容 - */ - @TableField(value = "BEN_RES_CAP") - @Schema(description="兴利库容") - private BigDecimal benResCap; - - /** - * 已淤积库容 - */ - @TableField(value = "SDMNT_CAP") - @Schema(description="已淤积库容") - private BigDecimal sdmntCap; - - /** - * 死库容 - */ - @TableField(value = "DEAD_CAP") - @Schema(description="死库容") - private BigDecimal deadCap; - - /** - * 汛限水位 - */ - @TableField(value = "FL_LOW_LIM_LEV") - @Schema(description="汛限水位") - private BigDecimal flLowLimLev; - - /** - * 多年平均降水量 - */ - @TableField(value = "AVANPR") - @Schema(description="多年平均降水量") - private BigDecimal avanpr; - - /** - * 多年平均径流量 - */ - @TableField(value = "DAAD_MUL_AVER_RUOF") - @Schema(description="多年平均径流量") - private BigDecimal daadMulAverRuof; - - /** - * 集雨面积 - */ - @TableField(value = "WAT_SHED_AREA") - @Schema(description="集雨面积") - private BigDecimal watShedArea; - - /** - * 开工日期 - */ - @TableField(value = "START_DATE") - @Schema(description="开工日期") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date startDate; - - /** - * 竣工日期 - */ - @TableField(value = "COMP_DATE") - @Schema(description="竣工日期") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date compDate; - - /** - * 归口管理部门 - */ - @TableField(value = "ADM_DEP") - @Schema(description="归口管理部门") - private String admDep; - - /** - * 所在河流（水系）名称 - */ - @TableField(value = "HNNM") - @Schema(description="所在河流（水系）名称") - private String hnnm; - - /** - * 历史最高水位 - */ - @TableField(value = "HSHGWTLV") - @Schema(description="历史最高水位") - private BigDecimal hshgwtlv; - - /** - * 调节性能 - */ - @TableField(value = "AJST_PRFR") - @Schema(description="调节性能") - private String ajstPrfr; - - /** - * 溢洪道进口底高程 - */ - @TableField(value = "YHDMEL") - @Schema(description="溢洪道进口底高程") - private BigDecimal yhdmel; - - /** - * 溢洪道设计泄量 - */ - @TableField(value = "YHDDSFL") - @Schema(description="溢洪道设计泄量") - private BigDecimal yhddsfl; - - /** - * 水库规模 dict_id - */ - @TableField(value = "ENG_SCAL") - @Schema(description="水库规模 dict_id") - @JsonSerialize(using = ToStringSerializer.class) - private Long engScal; - - /** - * 备注 - */ - @TableField(value = "NOTE") - @Schema(description="备注") - private String note; - - /** - * 水库所在位置 - */ - @TableField(value = "RES_LOC") - @Schema(description="水库所在位置") - private String resLoc; - - /** - * 工程等别 dict_id - */ - @TableField(value = "ENG_GRAD") - @Schema(description="工程等别 dict_id") - @JsonSerialize(using = ToStringSerializer.class) - private Long engGrad; - - /** - * 承雨面积 - */ - @TableField(value = "BEAR_RAIN_AREA") - @Schema(description="承雨面积") - private BigDecimal bearRainArea; - - /** - * 正常蓄水位相应水面面积 - */ - @TableField(value = "NORM_POOL_STAG_AREA") - @Schema(description="正常蓄水位相应水面面积") - private BigDecimal normPoolStagArea; - - /** - * 正常高水位 - */ - @TableField(value = "NORMZ") - @Schema(description="正常高水位") - private BigDecimal normz; - - /** - * 设计灌溉面积 - */ - @TableField(value = "DES_IRR_A") - @Schema(description="设计灌溉面积") - private BigDecimal desIrrA; - - /** - * 实际灌溉面积 - */ - @TableField(value = "ACT_IRR_A") - @Schema(description="实际灌溉面积") - private BigDecimal actIrrA; - - /** - * 受益人口 - */ - @TableField(value = "BEN_PP") - @Schema(description="受益人口") - private Integer benPp; - - /** - * 引供水能力 - */ - @TableField(value = "CITE_WAT_SUP_PROP") - @Schema(description="引供水能力") - private BigDecimal citeWatSupProp; - - /** - * 城镇供水量 - */ - @TableField(value = "CITY_TOWN_SUP_WAT") - @Schema(description="城镇供水量") - private BigDecimal cityTownSupWat; - - /** - * 灌溉水量 - */ - @TableField(value = "IRR_WAT") - @Schema(description="灌溉水量") - private BigDecimal irrWat; - - /** - * 泄洪能力 - */ - @TableField(value = "FLD_CRY_PROP") - @Schema(description="泄洪能力") - private BigDecimal fldCryProp; - - /** - * 多年平均日蓄水量 - */ - @TableField(value = "MYYRVW") - @Schema(description="多年平均日蓄水量") - private BigDecimal myyrvw; - - /** - * 各月蓄水量 - */ - @TableField(value = "MONVW") - @Schema(description="各月蓄水量") - private BigDecimal monvw; - - /** - * 水库类型 dict_id - */ - @TableField(value = "RES_TYPE") - @Schema(description="水库类型 dict_id") - @JsonSerialize(using = ToStringSerializer.class) - private Long resType; - - /** - * 防洪高水位 - */ - @TableField(value = "UPP_LEV_FLCO") - @Schema(description="防洪高水位") - private BigDecimal uppLevFlco; - - /** - * 正常蓄水位相应库容 - */ - @TableField(value = "NORM_POOL_STAG_CAP") - @Schema(description="正常蓄水位相应库容") - private BigDecimal normPoolStagCap; - - /** - * 防洪限制水位库容 - */ - @TableField(value = "FL_LOW_LIM_LEV_CAP") - @Schema(description="防洪限制水位库容") - private BigDecimal flLowLimLevCap; - - /** - * 调洪库容 - */ - @TableField(value = "STOR_FL_CAP") - @Schema(description="调洪库容") - private BigDecimal storFlCap; - - /** - * 工程建设情况 - */ - @TableField(value = "ENG_STAT") - @Schema(description="工程建设情况") - private String engStat; - - /** - * 运行状况 - */ - @TableField(value = "RUN_STAT") - @Schema(description="运行状况") - private String runStat; - - /** - * 管理单位代码 - */ - @TableField(value = "ENG_MAN_CODE") - @Schema(description="管理单位代码") - private String engManCode; - - /** - * 河流代码 - */ - @TableField(value = "RV_CODE") - @Schema(description="河流代码") - private String rvCode; - - /** - * 状态 1：启用 0：禁用 - */ - @TableField(value = "[STATUS]") - @Schema(description=" 状态 1：启用 0：禁用") - private Integer status; - - /** - * 修改时间 - */ - @TableField(value = "TM") - @Schema(description="修改时间") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date tm; - - /** - * 设计洪水标准 - */ - @TableField(value = "DSFLST") - @Schema(description="设计洪水标准") - private String dsflst; - - /** - * 校核洪水标准 - */ - @TableField(value = "CHFLST") - @Schema(description="校核洪水标准") - private String chflst; - - /** - * 设计洪水流量 - */ - @TableField(value = "DSFLFL") - @Schema(description="设计洪水流量") - private BigDecimal dsflfl; - - /** - * 校核洪水流量 - */ - @TableField(value = "CHFLFL") - @Schema(description="校核洪水流量") - private BigDecimal chflfl; - - /** - * 水准基面 - */ - @TableField(value = "LVBSLV") - @Schema(description="水准基面") - @JsonSerialize(using = ToStringSerializer.class) - private Long lvbslv; - - /** - * 假定水准基面位置 - */ - @TableField(value = "DLBLP") - @Schema(description="假定水准基面位置") - private String dlblp; - - public static final String COL_RES_ID = "RES_ID"; - - public static final String COL_RES_CODE = "RES_CODE"; - - public static final String COL_RES_NAME = "RES_NAME"; - - public static final String COL_ADDVCD = "ADDVCD"; - - public static final String COL_LGTD = "LGTD"; - - public static final String COL_LTTD = "LTTD"; - - public static final String COL_WCRSTEL = "WCRSTEL"; - - public static final String COL_WCRESTWD = "WCRESTWD"; - - public static final String COL_DMTPEL = "DMTPEL"; - - public static final String COL_DMHT = "DMHT"; - - public static final String COL_DMTPLEN = "DMTPLEN"; - - public static final String COL_DATPWD = "DATPWD"; - - public static final String COL_DSFLLV = "DSFLLV"; - - public static final String COL_CHFLLV = "CHFLLV"; - - public static final String COL_NORM_WAT_LEV = "NORM_WAT_LEV"; - - public static final String COL_DEAD_LEV = "DEAD_LEV"; - - public static final String COL_TOT_CAP = "TOT_CAP"; - - public static final String COL_FLCO_CAP = "FLCO_CAP"; - - public static final String COL_BEN_RES_CAP = "BEN_RES_CAP"; - - public static final String COL_SDMNT_CAP = "SDMNT_CAP"; - - public static final String COL_DEAD_CAP = "DEAD_CAP"; - - public static final String COL_FL_LOW_LIM_LEV = "FL_LOW_LIM_LEV"; - - public static final String COL_AVANPR = "AVANPR"; - - public static final String COL_DAAD_MUL_AVER_RUOF = "DAAD_MUL_AVER_RUOF"; - - public static final String COL_WAT_SHED_AREA = "WAT_SHED_AREA"; - - public static final String COL_START_DATE = "START_DATE"; - - public static final String COL_COMP_DATE = "COMP_DATE"; - - public static final String COL_ADM_DEP = "ADM_DEP"; - - public static final String COL_HNNM = "HNNM"; - - public static final String COL_HSHGWTLV = "HSHGWTLV"; - - public static final String COL_AJST_PRFR = "AJST_PRFR"; - - public static final String COL_YHDMEL = "YHDMEL"; - - public static final String COL_YHDDSFL = "YHDDSFL"; - - public static final String COL_ENG_SCAL = "ENG_SCAL"; - - public static final String COL_NOTE = "NOTE"; - - public static final String COL_RES_LOC = "RES_LOC"; - - public static final String COL_ENG_GRAD = "ENG_GRAD"; - - public static final String COL_BEAR_RAIN_AREA = "BEAR_RAIN_AREA"; - - public static final String COL_NORM_POOL_STAG_AREA = "NORM_POOL_STAG_AREA"; - - public static final String COL_NORMZ = "NORMZ"; - - public static final String COL_DES_IRR_A = "DES_IRR_A"; - - public static final String COL_ACT_IRR_A = "ACT_IRR_A"; - - public static final String COL_BEN_PP = "BEN_PP"; - - public static final String COL_CITE_WAT_SUP_PROP = "CITE_WAT_SUP_PROP"; - - public static final String COL_CITY_TOWN_SUP_WAT = "CITY_TOWN_SUP_WAT"; - - public static final String COL_IRR_WAT = "IRR_WAT"; - - public static final String COL_FLD_CRY_PROP = "FLD_CRY_PROP"; - - public static final String COL_MYYRVW = "MYYRVW"; - - public static final String COL_MONVW = "MONVW"; - - public static final String COL_RES_TYPE = "RES_TYPE"; - - public static final String COL_UPP_LEV_FLCO = "UPP_LEV_FLCO"; - - public static final String COL_NORM_POOL_STAG_CAP = "NORM_POOL_STAG_CAP"; - - public static final String COL_FL_LOW_LIM_LEV_CAP = "FL_LOW_LIM_LEV_CAP"; - - public static final String COL_STOR_FL_CAP = "STOR_FL_CAP"; - - public static final String COL_ENG_STAT = "ENG_STAT"; - - public static final String COL_RUN_STAT = "RUN_STAT"; - - public static final String COL_ENG_MAN_CODE = "ENG_MAN_CODE"; - - public static final String COL_RV_CODE = "RV_CODE"; - - public static final String COL_STATUS = "STATUS"; - - public static final String COL_TM = "TM"; - - public static final String COL_DSFLST = "DSFLST"; - - public static final String COL_CHFLST = "CHFLST"; - - public static final String COL_DSFLFL = "DSFLFL"; - - public static final String COL_CHFLFL = "CHFLFL"; - - public static final String COL_LVBSLV = "LVBSLV"; - - public static final String COL_DLBLP = "DLBLP"; -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/StResFileRef.java b/src/main/java/com/gunshi/project/xyt/model/StResFileRef.java deleted file mode 100644 index 44d37a7..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/StResFileRef.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.v3.oas.annotations.media.Schema; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - -/** - * 水库附件表 - */ -@Schema(description="水库附件表") -@Data -@TableName(value = "dbo.ST_RES_FILE_REF") -public class StResFileRef implements Serializable { - /** - * id - */ - @TableId(value = "ID", type = IdType.INPUT) - @Schema(description="id") - @JsonSerialize(using = ToStringSerializer.class) - private Long id; - - /** - * 水库ID - */ - @TableField(value = "RES_ID") - @Schema(description="水库ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long resId; - - /** - * 文件类型 - */ - @TableField(value = "RF_TP") - @Schema(description="文件类型") - private String rfTp; - - /** - * 文件ID - */ - @TableField(value = "FILE_ID") - @Schema(description="文件ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long fileId; - - /** - * 序号 - */ - @TableField(value = "SORT_ON") - @Schema(description="序号") - private Integer sortOn; - - /** - * 时间戳 - */ - @TableField(value = "TM") - @Schema(description="时间戳") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date tm; - - public static final String COL_ID = "ID"; - - public static final String COL_RES_ID = "RES_ID"; - - public static final String COL_RF_TP = "RF_TP"; - - public static final String COL_FILE_ID = "FILE_ID"; - - public static final String COL_SORT_ON = "SORT_ON"; - - public static final String COL_TM = "TM"; -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/StResPersonRef.java b/src/main/java/com/gunshi/project/xyt/model/StResPersonRef.java deleted file mode 100644 index b028965..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/StResPersonRef.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.v3.oas.annotations.media.Schema; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - -/** - * 水库责任人表 - */ -@Schema(description="水库责任人表") -@Data -@TableName(value = "dbo.ST_RES_PERSON_REF") -public class StResPersonRef implements Serializable { - /** - * id - */ - @TableId(value = "ID", type = IdType.INPUT) - @Schema(description="id") - @JsonSerialize(using = ToStringSerializer.class) - private Long id; - - /** - * 水库ID - */ - @TableField(value = "RES_ID") - @Schema(description="水库ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long resId; - - /** - * 责任人类型 - */ - @TableField(value = "RP_TP") - @Schema(description="责任人类型") - private String rpTp; - - /** - * 姓名 - */ - @TableField(value = "RP_NM") - @Schema(description="姓名") - private String rpNm; - - /** - * 单位 - */ - @TableField(value = "RP_ORG") - @Schema(description="单位") - private String rpOrg; - - /** - * 职务 - */ - @TableField(value = "RP_DS") - @Schema(description="职务") - private String rpDs; - - /** - * 联系方式 - */ - @TableField(value = "RP_TEL") - @Schema(description="联系方式") - private String rpTel; - - /** - * 序号 - */ - @TableField(value = "SORT_ON") - @Schema(description="序号") - private Integer sortOn; - - /** - * 时间戳 - */ - @TableField(value = "TM") - @Schema(description="时间戳") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date tm; - - public static final String COL_ID = "ID"; - - public static final String COL_RES_ID = "RES_ID"; - - public static final String COL_RP_TP = "RP_TP"; - - public static final String COL_RP_NM = "RP_NM"; - - public static final String COL_RP_ORG = "RP_ORG"; - - public static final String COL_RP_DS = "RP_DS"; - - public static final String COL_RP_TEL = "RP_TEL"; - - public static final String COL_SORT_ON = "SORT_ON"; - - public static final String COL_TM = "TM"; -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/StResStcdRef.java b/src/main/java/com/gunshi/project/xyt/model/StResStcdRef.java deleted file mode 100644 index 5ebbd6e..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/StResStcdRef.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.v3.oas.annotations.media.Schema; - -import java.io.Serializable; -import java.util.Date; -import lombok.Data; - -/** - * 水库测站关系表 - */ -@Schema(description="水库测站关系表") -@Data -@TableName(value = "dbo.ST_RES_STCD_REF") -public class StResStcdRef implements Serializable { - /** - * 水库ID - */ - @TableId(value = "RES_ID", type = IdType.INPUT) - @Schema(description="水库ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long resId; - - /** - * 测站编码 - */ - @TableField(value = "STCD") - @Schema(description="测站编码") - private String stcd; - - /** - * 时间戳 - */ - @TableField(value = "TM") - @Schema(description="时间戳") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date tm; - - public static final String COL_RES_ID = "RES_ID"; - - public static final String COL_STCD = "STCD"; - - public static final String COL_TM = "TM"; -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/StRsvrR.java b/src/main/java/com/gunshi/project/xyt/model/StRsvrR.java deleted file mode 100644 index af3a8b1..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/StRsvrR.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.github.jeffreyning.mybatisplus.anno.MppMultiId; -import com.gunshi.core.dateformat.DateFormatString; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 水位数据 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-25 - */ -@Data -@TableName("ST_RSVR_R") -@Schema(description = "水位数据") -public class StRsvrR { - - @MppMultiId("STCD") - @Schema(description = "测站编码") - private String stcd; - - @MppMultiId("TM") - @Schema(description = "采集时间") - @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") - private Date tm; - - @Schema(description = "库上水位") - @TableField("RZ") - private BigDecimal rz; - - @Schema(description = "库水水势，4=落，5=涨，6=平") - @TableField("RWPTN") - private String rwptn; -} diff --git a/src/main/java/com/gunshi/project/xyt/model/StRvB.java b/src/main/java/com/gunshi/project/xyt/model/StRvB.java deleted file mode 100644 index 3010e61..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/StRvB.java +++ /dev/null @@ -1,253 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.v3.oas.annotations.media.Schema; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; -import lombok.Data; - -/** - * 河流基础信息 - */ -@Schema(description="河流基础信息") -@Data -@TableName(value = "dbo.ST_RV_B") -public class StRvB implements Serializable { - /** - * 河流ID - */ - @TableId(value = "RV_ID", type = IdType.INPUT) - @Schema(description="河流ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long rvId; - - /** - * 河流代码 - */ - @TableField(value = "RV_CODE") - @Schema(description="河流代码") - private String rvCode; - - /** - * 河流名称 - */ - @TableField(value = "RV_NAME") - @Schema(description="河流名称") - private String rvName; - - /** - * 河源经度 - */ - @TableField(value = "RV_SOUR_LONG") - @Schema(description="河源经度") - private BigDecimal rvSourLong; - - /** - * 河源纬度 - */ - @TableField(value = "RV_SOUR_LAT") - @Schema(description="河源纬度") - private BigDecimal rvSourLat; - - /** - * 河口经度 - */ - @TableField(value = "RV_MOU_LONG") - @Schema(description="河口经度") - private BigDecimal rvMouLong; - - /** - * 河口纬度 - */ - @TableField(value = "RV_MOU_LAT") - @Schema(description="河口纬度") - private BigDecimal rvMouLat; - - /** - * 河源所在位置 - */ - @TableField(value = "RV_SOUR_LOC") - @Schema(description="河源所在位置") - private String rvSourLoc; - - /** - * 河口所在位置 - */ - @TableField(value = "RV_MOU_LOC") - @Schema(description="河口所在位置") - private String rvMouLoc; - - /** - * 流经地区 - */ - @TableField(value = "FLOW_AREA") - @Schema(description="流经地区") - private String flowArea; - - /** - * 河流类型 dict_id - */ - @TableField(value = "RV_TYPE") - @Schema(description="河流类型 dict_id") - @JsonSerialize(using = ToStringSerializer.class) - private Long rvType; - - /** - * 河流级别 dict_id - */ - @TableField(value = "RV_GRAD") - @Schema(description="河流级别 dict_id") - @JsonSerialize(using = ToStringSerializer.class) - private Long rvGrad; - - /** - * 岸别 dict_id - */ - @TableField(value = "BANK") - @Schema(description="岸别 dict_id") - @JsonSerialize(using = ToStringSerializer.class) - private Long bank; - - /** - * 河流长度 km - */ - @TableField(value = "RV_LEN") - @Schema(description="河流长度 km") - private BigDecimal rvLen; - - /** - * 河流流域面积 km2 - */ - @TableField(value = "RV_BAS_AREA") - @Schema(description="河流流域面积 km2") - private BigDecimal rvBasArea; - - /** - * 跨界类型 - */ - @TableField(value = "CR_OVER_TYPE") - @Schema(description="跨界类型") - private String crOverType; - - /** - * 多年平均流量 m2/s - */ - @TableField(value = "LON_AVER_ANN_FLOW") - @Schema(description="多年平均流量 m2/s") - private BigDecimal lonAverAnnFlow; - - /** - * 多年平均径流量 - */ - @TableField(value = "MEA_ANN_RUOF") - @Schema(description="多年平均径流量") - private BigDecimal meaAnnRuof; - - /** - * 平均比降 - */ - @TableField(value = "AVER_SLOP") - @Schema(description="平均比降") - private String averSlop; - - /** - * 备注 - */ - @TableField(value = "NOTE") - @Schema(description="备注") - private String note; - - /** - * 承雨面积 km2 - */ - @TableField(value = "BEAR_RAIN_AREA") - @Schema(description="承雨面积 km2") - private BigDecimal bearRainArea; - - /** - * 多年平均降雨量 mm - */ - @TableField(value = "LON_AVER_ANN_RAIN") - @Schema(description="多年平均降雨量 mm") - private BigDecimal lonAverAnnRain; - - /** - * 状态 1：启用 0：禁用 - */ - @TableField(value = "[STATUS]") - @Schema(description="状态 1：启用 0：禁用") - private Integer status; - - /** - * 最大水深 m - */ - @TableField(value = "MAX_DP") - @Schema(description="最大水深 m") - private BigDecimal maxDp; - - /** - * 时间戳 - */ - @TableField(value = "TM") - @Schema(description="时间戳") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date tm; - - public static final String COL_RV_ID = "RV_ID"; - - public static final String COL_RV_CODE = "RV_CODE"; - - public static final String COL_RV_NAME = "RV_NAME"; - - public static final String COL_RV_SOUR_LONG = "RV_SOUR_LONG"; - - public static final String COL_RV_SOUR_LAT = "RV_SOUR_LAT"; - - public static final String COL_RV_MOU_LONG = "RV_MOU_LONG"; - - public static final String COL_RV_MOU_LAT = "RV_MOU_LAT"; - - public static final String COL_RV_SOUR_LOC = "RV_SOUR_LOC"; - - public static final String COL_RV_MOU_LOC = "RV_MOU_LOC"; - - public static final String COL_FLOW_AREA = "FLOW_AREA"; - - public static final String COL_RV_TYPE = "RV_TYPE"; - - public static final String COL_RV_GRAD = "RV_GRAD"; - - public static final String COL_BANK = "BANK"; - - public static final String COL_RV_LEN = "RV_LEN"; - - public static final String COL_RV_BAS_AREA = "RV_BAS_AREA"; - - public static final String COL_CR_OVER_TYPE = "CR_OVER_TYPE"; - - public static final String COL_LON_AVER_ANN_FLOW = "LON_AVER_ANN_FLOW"; - - public static final String COL_MEA_ANN_RUOF = "MEA_ANN_RUOF"; - - public static final String COL_AVER_SLOP = "AVER_SLOP"; - - public static final String COL_NOTE = "NOTE"; - - public static final String COL_BEAR_RAIN_AREA = "BEAR_RAIN_AREA"; - - public static final String COL_LON_AVER_ANN_RAIN = "LON_AVER_ANN_RAIN"; - - public static final String COL_STATUS = "STATUS"; - - public static final String COL_MAX_DP = "MAX_DP"; - - public static final String COL_TM = "TM"; -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/StSpgPztb.java b/src/main/java/com/gunshi/project/xyt/model/StSpgPztb.java deleted file mode 100644 index 007e2b0..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/StSpgPztb.java +++ /dev/null @@ -1,543 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.gunshi.project.xyt.validate.markers.Update; -import io.swagger.v3.oas.annotations.media.Schema; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; -import lombok.Data; - -/** - * 渗压设备信息表 - */ -@Schema(description="渗压设备信息表") -@Data -@TableName(value = "dbo.ST_SPG_PZTB") -public class StSpgPztb implements Serializable { - /** - * id - */ - @TableId(value = "ID", type = IdType.INPUT) - @Schema(description="id") - @JsonSerialize(using = ToStringSerializer.class) - @NotNull(message = "id不能为空", groups = {Update.class}) - private Long id; - - /** - * 测站编码（MCU） - */ - @TableField(value = "DEVICE_ID") - @Schema(description="测站编码（MCU）") - @NotNull(message = "测站编码（MCU）不能为空") - @Size(max = 30,message = "测站编码（MCU）长度不能超过30") - private String deviceId; - - /** - * 测点编号 - */ - @TableField(value = "STATION_CODE") - @Schema(description="测点编号") - @NotNull(message = "测点编号不能为空") - @Size(max = 50,message = "测点编号长度不能超过30") - private String stationCode; - - /** - * 通道号 - */ - @TableField(value = "CHANNEL_NUM") - @Schema(description="通道号") - @NotNull - private Integer channelNum; - - /** - * 安装经度 - */ - @TableField(value = "INSTALLATION_POSITION_X") - @Schema(description="安装经度") - - private BigDecimal installationPositionX; - - /** - * 安装纬度 - */ - @TableField(value = "INSTALLATION_POSITION_Y") - @Schema(description="安装纬度") - private BigDecimal installationPositionY; - - /** - * 安装高程 - */ - @TableField(value = "INSTALLATION_POSITION_Z") - @Schema(description="安装高程") - private BigDecimal installationPositionZ; - - /** - * 所在大坝 - */ - @TableField(value = "DAM") - @Schema(description="所在大坝") - private String dam; - - /** - * 所在断面 - */ - @TableField(value = "CROSS_SECTION") - @Schema(description="所在断面") - private String crossSection; - - /** - * 最后数据同步时间 - */ - @TableField(value = "LATEST_REPORTING_TIME") - @Schema(description="最后数据同步时间") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date latestReportingTime; - - /** - * 初始读数 - */ - @TableField(value = "INITIAL_READING") - @Schema(description="初始读数") - @NotNull(message = "初始读数不能为空") - private BigDecimal initialReading; - - /** - * 率定系数 - */ - @TableField(value = "CALIBRATION_COEFFICIENT") - @Schema(description="率定系数") - @NotNull(message = "率定系数不能为空") - private BigDecimal calibrationCoefficient; - - /** - * 初始温度读数 - */ - @TableField(value = "START_TEMPERATURE") - @Schema(description="初始温度读数") - @NotNull(message = "初始温度读数不能为空") - private BigDecimal startTemperature; - - /** - * 温度率定系数 - */ - @TableField(value = "TEMPERATURE_K") - @Schema(description="温度率定系数") - @NotNull(message = "温度率定系数不能为空") - private BigDecimal temperatureK; - - /** - * 坝（堰）顶高程 - */ - @TableField(value = "DAM_HEIGHT") - @Schema(description="坝（堰）顶高程") - @NotNull(message = "坝（堰）顶高程不能为空") - private BigDecimal damHeight; - - /** - * 渗压计到孔底距离 - */ - @TableField(value = "DIST_FROM_OSMOSIS_METER_TO_BOTTOM") - @Schema(description="渗压计到孔底距离") - @NotNull(message = "渗压计到孔底距离不能为空") - private BigDecimal distFromOsmosisMeterToBottom; - - /** - * 钻孔编号 - */ - @TableField(value = "DRILLING_NO") - @Schema(description="钻孔编号") - private String drillingNo; - - /** - * 钻孔直径 mm - */ - @TableField(value = "DRILLING_SIZE") - @Schema(description="钻孔直径 mm") - private Integer drillingSize; - - /** - * 初见水位 - */ - @TableField(value = "INITIAL_WATER_LEVEL") - @Schema(description="初见水位") - private BigDecimal initialWaterLevel; - - /** - * 稳定水位 - */ - @TableField(value = "STEADY_WATER_LEVEL") - @Schema(description="稳定水位") - private BigDecimal steadyWaterLevel; - - /** - * 测头编号 - */ - @TableField(value = "MEASURING_PROBE_NO") - @Schema(description="测头编号") - private String measuringProbeNo; - - /** - * 生产厂家 - */ - @TableField(value = "MANUFACTURER") - @Schema(description="生产厂家") - private String manufacturer; - - /** - * 传感器系数 - */ - @TableField(value = "SENSOR_COEFFICIENT") - @Schema(description="传感器系数") - private BigDecimal sensorCoefficient; - - /** - * 量程 - */ - @TableField(value = "[RANGE]") - @Schema(description="量程") - private BigDecimal range; - - /** - * 测头内阻 - */ - @TableField(value = "RESISTANCE") - @Schema(description="测头内阻") - private BigDecimal resistance; - - /** - * 电缆长度 - */ - @TableField(value = "CABLE_LENGTH") - @Schema(description="电缆长度") - private BigDecimal cableLength; - - /** - * 电缆长度标记 - */ - @TableField(value = "CABLE_LENGTH_MARK") - @Schema(description="电缆长度标记") - private String cableLengthMark; - - /** - * 埋设高程 - */ - @TableField(value = "EMBEDDING_ELEVATION") - @Schema(description="埋设高程") - @NotNull - private BigDecimal embeddingElevation; - - /** - * 桩号 - */ - @TableField(value = "COLUMN_NO") - @Schema(description="桩号") - private String columnNo; - - /** - * 大坝轴距 - */ - @TableField(value = "DAM_WHEELBASE") - @Schema(description="大坝轴距") - private BigDecimal damWheelbase; - - /** - * 现场室内读数 - */ - @TableField(value = "READINGS") - @Schema(description="现场室内读数") - private BigDecimal readings; - - /** - * 孔内水深 - */ - @TableField(value = "DRAFT") - @Schema(description="孔内水深") - private BigDecimal draft; - - /** - * 入孔前读数 - */ - @TableField(value = "START_READINGS") - @Schema(description="入孔前读数") - private BigDecimal startReadings; - - /** - * 就位后读数 - */ - @TableField(value = "END_READINGS") - @Schema(description="就位后读数") - private BigDecimal endReadings; - - /** - * 零压读数 - */ - @TableField(value = "ZERO_PRESSURE_READINGS") - @Schema(description="零压读数") - private BigDecimal zeroPressureReadings; - - /** - * 埋设完毕读数 - */ - @TableField(value = "EMBEDDING_FINISH_READING") - @Schema(description="埋设完毕读数") - private BigDecimal embeddingFinishReading; - - /** - * 埋设日期 - */ - @TableField(value = "EMBEDDING_DATE") - @Schema(description="埋设日期") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date embeddingDate; - - /** - * 气温 - */ - @TableField(value = "AIR_TEMPERATURE") - @Schema(description="气温") - private BigDecimal airTemperature; - - /** - * 气压 - */ - @TableField(value = "AIR_PRESSURE") - @Schema(description="气压") - private BigDecimal airPressure; - - /** - * 天气 - */ - @TableField(value = "WEATHER") - @Schema(description="天气") - private String weather; - - /** - * 上游水位 - */ - @TableField(value = "HEADWATER_LEVEL") - @Schema(description="上游水位") - private BigDecimal headwaterLevel; - - /** - * 下游水位 - */ - @TableField(value = "TAILWATER_LEVEL") - @Schema(description="下游水位") - private BigDecimal tailwaterLevel; - - /** - * 技术负责人 - */ - @TableField(value = "TECHNICAL_DIRECTOR") - @Schema(description="技术负责人") - private String technicalDirector; - - /** - * 校核人 - */ - @TableField(value = "CHECK_PERSONNEL") - @Schema(description="校核人") - private String checkPersonnel; - - /** - * 埋设及填表人 - */ - @TableField(value = "BURIED_PERSONNEL") - @Schema(description="埋设及填表人") - private String buriedPersonnel; - - /** - * 埋设示意图 文件ID - */ - @TableField(value = "SKETCH_MAP") - @Schema(description="埋设示意图 文件ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long sketchMap; - - /** - * 状态 1：启用 0：禁用 - */ - @TableField(value = "[STATUS]") - @Schema(description="状态 1：启用 0：禁用") - private Integer status; - - /** - * 修改时间 - */ - @TableField(value = "MODIFICATION_TIME") - @Schema(description="修改时间") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date modificationTime; - - /** - * 创建时间 日期 - */ - @TableField(value = "CREATION_TIME") - @Schema(description="创建时间 日期") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date creationTime; - - /** - * 监理工程师 - */ - @TableField(value = "SUPERVISOR") - @Schema(description="监理工程师") - private String supervisor; - - /** - * 备注 - */ - @TableField(value = "REMARK") - @Schema(description="备注") - private String remark; - - /** - * 项目名称 - */ - @TableField(value = "PROJECT_NAME") - @Schema(description="项目名称") - private String projectName; - - /** - * 管口高程 - */ - @TableField(value = "PIPE_TOP_HEIGHT") - @Schema(description="管口高程") - private BigDecimal pipeTopHeight; - - /** - * 管低高程 - */ - @TableField(value = "PIPE_BOTTOM_HEIGHT") - @Schema(description="管低高程") - private BigDecimal pipeBottomHeight; - - /** - * 所在断面 - */ - @TableField(value = "CR_ID") - @Schema(description = "所在断面") - @NotNull - private Long crId; - - public static final String COL_ID = "ID"; - - public static final String COL_DEVICE_ID = "DEVICE_ID"; - - public static final String COL_STATION_CODE = "STATION_CODE"; - - public static final String COL_CHANNEL_NUM = "CHANNEL_NUM"; - - public static final String COL_INSTALLATION_POSITION_X = "INSTALLATION_POSITION_X"; - - public static final String COL_INSTALLATION_POSITION_Y = "INSTALLATION_POSITION_Y"; - - public static final String COL_INSTALLATION_POSITION_Z = "INSTALLATION_POSITION_Z"; - - public static final String COL_DAM = "DAM"; - - public static final String COL_CROSS_SECTION = "CROSS_SECTION"; - - public static final String COL_LATEST_REPORTING_TIME = "LATEST_REPORTING_TIME"; - - public static final String COL_INITIAL_READING = "INITIAL_READING"; - - public static final String COL_CALIBRATION_COEFFICIENT = "CALIBRATION_COEFFICIENT"; - - public static final String COL_START_TEMPERATURE = "START_TEMPERATURE"; - - public static final String COL_TEMPERATURE_K = "TEMPERATURE_K"; - - public static final String COL_DAM_HEIGHT = "DAM_HEIGHT"; - - public static final String COL_DIST_FROM_OSMOSIS_METER_TO_BOTTOM = "DIST_FROM_OSMOSIS_METER_TO_BOTTOM"; - - public static final String COL_DRILLING_NO = "DRILLING_NO"; - - public static final String COL_DRILLING_SIZE = "DRILLING_SIZE"; - - public static final String COL_INITIAL_WATER_LEVEL = "INITIAL_WATER_LEVEL"; - - public static final String COL_STEADY_WATER_LEVEL = "STEADY_WATER_LEVEL"; - - public static final String COL_MEASURING_PROBE_NO = "MEASURING_PROBE_NO"; - - public static final String COL_MANUFACTURER = "MANUFACTURER"; - - public static final String COL_SENSOR_COEFFICIENT = "SENSOR_COEFFICIENT"; - - public static final String COL_RANGE = "RANGE"; - - public static final String COL_RESISTANCE = "RESISTANCE"; - - public static final String COL_CABLE_LENGTH = "CABLE_LENGTH"; - - public static final String COL_CABLE_LENGTH_MARK = "CABLE_LENGTH_MARK"; - - public static final String COL_EMBEDDING_ELEVATION = "EMBEDDING_ELEVATION"; - - public static final String COL_COLUMN_NO = "COLUMN_NO"; - - public static final String COL_DAM_WHEELBASE = "DAM_WHEELBASE"; - - public static final String COL_READINGS = "READINGS"; - - public static final String COL_DRAFT = "DRAFT"; - - public static final String COL_START_READINGS = "START_READINGS"; - - public static final String COL_END_READINGS = "END_READINGS"; - - public static final String COL_ZERO_PRESSURE_READINGS = "ZERO_PRESSURE_READINGS"; - - public static final String COL_EMBEDDING_FINISH_READING = "EMBEDDING_FINISH_READING"; - - public static final String COL_EMBEDDING_DATE = "EMBEDDING_DATE"; - - public static final String COL_AIR_TEMPERATURE = "AIR_TEMPERATURE"; - - public static final String COL_AIR_PRESSURE = "AIR_PRESSURE"; - - public static final String COL_WEATHER = "WEATHER"; - - public static final String COL_HEADWATER_LEVEL = "HEADWATER_LEVEL"; - - public static final String COL_TAILWATER_LEVEL = "TAILWATER_LEVEL"; - - public static final String COL_TECHNICAL_DIRECTOR = "TECHNICAL_DIRECTOR"; - - public static final String COL_CHECK_PERSONNEL = "CHECK_PERSONNEL"; - - public static final String COL_BURIED_PERSONNEL = "BURIED_PERSONNEL"; - - public static final String COL_SKETCH_MAP = "SKETCH_MAP"; - - public static final String COL_STATUS = "STATUS"; - - public static final String COL_MODIFICATION_TIME = "MODIFICATION_TIME"; - - public static final String COL_CREATION_TIME = "CREATION_TIME"; - - public static final String COL_SUPERVISOR = "SUPERVISOR"; - - public static final String COL_REMARK = "REMARK"; - - public static final String COL_PROJECT_NAME = "PROJECT_NAME"; - - public static final String COL_PIPE_TOP_HEIGHT = "PIPE_TOP_HEIGHT"; - - public static final String COL_PIPE_BOTTOM_HEIGHT = "PIPE_BOTTOM_HEIGHT"; - - public static final String COL_CR_ID = "CR_ID"; -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/StSpgSpprmp.java b/src/main/java/com/gunshi/project/xyt/model/StSpgSpprmp.java deleted file mode 100644 index 7956818..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/StSpgSpprmp.java +++ /dev/null @@ -1,491 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.gunshi.project.xyt.validate.markers.Update; -import io.swagger.v3.oas.annotations.media.Schema; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; -import lombok.Data; - -/** - * 渗流设备信息表 - */ -@Schema(description="渗流设备信息表") -@Data -@TableName(value = "dbo.ST_SPG_SPPRMP") -public class StSpgSpprmp implements Serializable { - /** - * 主键 - */ - @TableId(value = "ID", type = IdType.INPUT) - @Schema(description="主键") - @JsonSerialize(using = ToStringSerializer.class) - @NotNull(message = "主键不能为空", groups = {Update.class}) - private Long id; - - /** - * 测站编码（MCU） - */ - @TableField(value = "DEVICE_ID") - @Schema(description="测站编码（MCU）") - @NotNull(message = "测站编码（MCU）不能为空") - @Size(max = 30,message = "测站编码（MCU）长度不能超过30") - private String deviceId; - - /** - * 测点编号 - */ - @TableField(value = "STATION_CODE") - @Schema(description="测点编号") - @NotNull(message = "测点编号不能为空") - @Size(max = 50,message = "测点编号长度不能超过50") - private String stationCode; - - /** - * 通道号 - */ - @TableField(value = "CHANNEL_NUM") - @Schema(description="通道号") - @NotNull(message = "通道号不能为空") - private Integer channelNum; - - /** - * 仪器编号 - */ - @TableField(value = "PROBE_SERIAL") - @Schema(description="仪器编号") - @NotNull(message = "仪器编号不能为空") - @Size(max = 30,message = "仪器编号长度不能超过30") - private String probeSerial; - - /** - * 零位读数 - */ - @TableField(value = "READING0") - @Schema(description="零位读数") - @NotNull(message = "零位读数不能为空") - private BigDecimal reading0; - - /** - * 安装时温度 - */ - @TableField(value = "TEMPERATURE0") - @Schema(description="安装时温度") - private BigDecimal temperature0; - - /** - * 温度 - */ - @TableField(value = "TEMPERATURE1") - @Schema(description="温度") - private BigDecimal temperature1; - - /** - * 仪器测值 - */ - @TableField(value = "DEVICE_MEASURE") - @Schema(description="仪器测值") - private BigDecimal deviceMeasure; - - /** - * 埋设后测值 - */ - @TableField(value = "DEVICE_MEASURE_AFTER") - @Schema(description="埋设后测值") - private BigDecimal deviceMeasureAfter; - - /** - * 工程部位 - */ - @TableField(value = "PROJECT_LOCATION") - @Schema(description="工程部位") - private String projectLocation; - - /** - * 工程或项目名称 - */ - @TableField(value = "PROJECT_NAME") - @Schema(description="工程或项目名称") - private String projectName; - - /** - * 生产厂家 - */ - @TableField(value = "MANUFACTURER") - @Schema(description="生产厂家") - private String manufacturer; - - /** - * 站型 - */ - @TableField(value = "STATION_TYPE") - @Schema(description="站型") - private String stationType; - - /** - * 堰型 - */ - @TableField(value = "STANK_TYPE") - @Schema(description="堰型") - private String stankType; - - /** - * 堰板材料 - */ - @TableField(value = "STANK_MATERIAL") - @Schema(description="堰板材料") - private String stankMaterial; - - /** - * 堰口至堰槽底距离 mm - */ - @TableField(value = "STANK_TOP_TO_BOTTOM_DISTANCE") - @Schema(description="堰口至堰槽底距离 mm") - private Integer stankTopToBottomDistance; - - /** - * 堰槽尺寸 mm*mm*mm - */ - @TableField(value = "STANK_SIZE") - @Schema(description="堰槽尺寸 mm*mm*mm") - private String stankSize; - - /** - * 水尺(传感器)形式 - */ - @TableField(value = "RULER_TYPE") - @Schema(description="水尺(传感器)形式") - private String rulerType; - - /** - * 水尺(测针)位置 - */ - @TableField(value = "RULER_POSITION") - @Schema(description="水尺(测针)位置") - private String rulerPosition; - - /** - * 零点高度 - */ - @TableField(value = "ZERO_POINT_HEIGHT") - @Schema(description="零点高度") - @NotNull(message = "零点高度不能为空") - private BigDecimal zeroPointHeight; - - /** - * 温度系数 - */ - @TableField(value = "TEMPERATURE_MOD") - @Schema(description="温度系数") - private BigDecimal temperatureMod; - - /** - * 量测 - */ - @TableField(value = "MEASURE") - @Schema(description="量测") - private BigDecimal measure; - - /** - * 埋设示意图 文件ID - */ - @TableField(value = "SKETCH_MAP") - @Schema(description="埋设示意图 文件ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long sketchMap; - - /** - * 技术负责人 - */ - @TableField(value = "DIRECTOR") - @Schema(description="技术负责人") - private String director; - - /** - * 校验人 - */ - @TableField(value = "VERIFIER") - @Schema(description="校验人") - private String verifier; - - /** - * 埋设及填表人 - */ - @TableField(value = "[OPERATOR]") - @Schema(description="埋设及填表人") - private String operator; - - /** - * 监理工程师 - */ - @TableField(value = "SUPERVISOR") - @Schema(description="监理工程师") - private String supervisor; - - /** - * 安装日期 日期 - */ - @TableField(value = "INSTALL_DATE") - @Schema(description="安装日期 日期") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date installDate; - - /** - * 备注 - */ - @TableField(value = "REMARK") - @Schema(description="备注") - private String remark; - - /** - * 修改时间 - */ - @TableField(value = "MODIFICATION_TIME") - @Schema(description="修改时间") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date modificationTime; - - /** - * 最后上报时间 - */ - @TableField(value = "LATEST_REPORTING_TIME") - @Schema(description="最后上报时间") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date latestReportingTime; - - /** - * 公式 - */ - @TableField(value = "FORMULA") - @Schema(description="公式") - @NotNull(message = "公式不能为空") - private Long formula; - - /** - * 创建时间 - */ - @TableField(value = "CREATE_TIME") - @Schema(description="创建时间") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date createTime; - - /** - * 状态 1：启用 0：禁用 - */ - @TableField(value = "[STATUS]") - @Schema(description="状态 1：启用 0：禁用") - private Integer status; - - /** - * 最大堰上水头 m - */ - @TableField(value = "MAX_H") - @Schema(description="最大堰上水头 m") - @NotNull(message = "最大堰上水头 不能为空") - private BigDecimal maxH; - - /** - * 安装经度 - */ - @TableField(value = "INSTALLATION_POSITION_X") - @Schema(description="安装经度") - private BigDecimal installationPositionX; - - /** - * 安装纬度 - */ - @TableField(value = "INSTALLATION_POSITION_Y") - @Schema(description="安装纬度") - private BigDecimal installationPositionY; - - /** - * 安装高程 - */ - @TableField(value = "INSTALLATION_POSITION_Z") - @Schema(description="安装高程") - private BigDecimal installationPositionZ; - - /** - * 上游水位 - */ - @TableField(value = "HEADWATER_LEVEL") - @Schema(description="上游水位") - private BigDecimal headwaterLevel; - - /** - * 下游水位 - */ - @TableField(value = "TAILWATER_LEVEL") - @Schema(description="下游水位") - private BigDecimal tailwaterLevel; - - /** - * 气温 - */ - @TableField(value = "AIR_TEMPERATURE") - @Schema(description="气温") - private BigDecimal airTemperature; - - /** - * 气压 - */ - @TableField(value = "AIR_PRESSURE") - @Schema(description="气压") - private BigDecimal airPressure; - - /** - * 天气 - */ - @TableField(value = "WEATHER") - @Schema(description="天气") - private String weather; - - /** - * 直线系数G - */ - @TableField(value = "LINEAR_COEFFICIENTG") - @Schema(description="直线系数G") - @NotNull(message = "直线系数G不能为空") - private BigDecimal linearCoefficientg; - - /** - * 多项式系数A - */ - @TableField(value = "POLYNOMIAL_COEFFICIENTA") - @Schema(description="多项式系数A") - @NotNull(message = "多项式系数A不能为空") - private BigDecimal polynomialCoefficienta; - - /** - * 多项式系数B - */ - @TableField(value = "POLYNOMIAL_COEFFICIENTB") - @Schema(description="多项式系数B") - @NotNull(message = "多项式系数B不能为空") - private BigDecimal polynomialCoefficientb; - - /** - * 多项式系数C - */ - @TableField(value = "POLYNOMIAL_COEFFICIENTC") - @Schema(description="多项式系数C") - @NotNull(message = "多项式系数C不能为空") - private BigDecimal polynomialCoefficientc; - - /** - * 所在断面 - */ - @TableField(value = "CR_ID") - @Schema(description = "所在断面") - @NotNull(message = "所在断面不能为空") - private Long crId; - - public static final String COL_ID = "ID"; - - public static final String COL_DEVICE_ID = "DEVICE_ID"; - - public static final String COL_STATION_CODE = "STATION_CODE"; - - public static final String COL_CHANNEL_NUM = "CHANNEL_NUM"; - - public static final String COL_PROBE_SERIAL = "PROBE_SERIAL"; - - public static final String COL_READING0 = "READING0"; - - public static final String COL_TEMPERATURE0 = "TEMPERATURE0"; - - public static final String COL_TEMPERATURE1 = "TEMPERATURE1"; - - public static final String COL_DEVICE_MEASURE = "DEVICE_MEASURE"; - - public static final String COL_DEVICE_MEASURE_AFTER = "DEVICE_MEASURE_AFTER"; - - public static final String COL_PROJECT_LOCATION = "PROJECT_LOCATION"; - - public static final String COL_PROJECT_NAME = "PROJECT_NAME"; - - public static final String COL_MANUFACTURER = "MANUFACTURER"; - - public static final String COL_STATION_TYPE = "STATION_TYPE"; - - public static final String COL_STANK_TYPE = "STANK_TYPE"; - - public static final String COL_STANK_MATERIAL = "STANK_MATERIAL"; - - public static final String COL_STANK_TOP_TO_BOTTOM_DISTANCE = "STANK_TOP_TO_BOTTOM_DISTANCE"; - - public static final String COL_STANK_SIZE = "STANK_SIZE"; - - public static final String COL_RULER_TYPE = "RULER_TYPE"; - - public static final String COL_RULER_POSITION = "RULER_POSITION"; - - public static final String COL_ZERO_POINT_HEIGHT = "ZERO_POINT_HEIGHT"; - - public static final String COL_TEMPERATURE_MOD = "TEMPERATURE_MOD"; - - public static final String COL_MEASURE = "MEASURE"; - - public static final String COL_SKETCH_MAP = "SKETCH_MAP"; - - public static final String COL_DIRECTOR = "DIRECTOR"; - - public static final String COL_VERIFIER = "VERIFIER"; - - public static final String COL_OPERATOR = "OPERATOR"; - - public static final String COL_SUPERVISOR = "SUPERVISOR"; - - public static final String COL_INSTALL_DATE = "INSTALL_DATE"; - - public static final String COL_REMARK = "REMARK"; - - public static final String COL_MODIFICATION_TIME = "MODIFICATION_TIME"; - - public static final String COL_LATEST_REPORTING_TIME = "LATEST_REPORTING_TIME"; - - public static final String COL_FORMULA = "FORMULA"; - - public static final String COL_CREATE_TIME = "CREATE_TIME"; - - public static final String COL_STATUS = "STATUS"; - - public static final String COL_MAX_H = "MAX_H"; - - public static final String COL_INSTALLATION_POSITION_X = "INSTALLATION_POSITION_X"; - - public static final String COL_INSTALLATION_POSITION_Y = "INSTALLATION_POSITION_Y"; - - public static final String COL_INSTALLATION_POSITION_Z = "INSTALLATION_POSITION_Z"; - - public static final String COL_HEADWATER_LEVEL = "HEADWATER_LEVEL"; - - public static final String COL_TAILWATER_LEVEL = "TAILWATER_LEVEL"; - - public static final String COL_AIR_TEMPERATURE = "AIR_TEMPERATURE"; - - public static final String COL_AIR_PRESSURE = "AIR_PRESSURE"; - - public static final String COL_WEATHER = "WEATHER"; - - public static final String COL_LINEAR_COEFFICIENTG = "LINEAR_COEFFICIENTG"; - - public static final String COL_POLYNOMIAL_COEFFICIENTA = "POLYNOMIAL_COEFFICIENTA"; - - public static final String COL_POLYNOMIAL_COEFFICIENTB = "POLYNOMIAL_COEFFICIENTB"; - - public static final String COL_POLYNOMIAL_COEFFICIENTC = "POLYNOMIAL_COEFFICIENTC"; - - public static final String COL_CR_ID = "CR_ID"; -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/StStbprpB.java b/src/main/java/com/gunshi/project/xyt/model/StStbprpB.java deleted file mode 100644 index 118b2e2..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/StStbprpB.java +++ /dev/null @@ -1,392 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * 监测点基本信息 - */ -@Schema(description=" 监测点基本信息") -@Data -@TableName(value = "dbo.ST_STBPRP_B") -public class StStbprpB implements Serializable { - /** - * 测站编码 - */ - @TableId(value = "STCD", type = IdType.INPUT) - @Schema(description="测站编码") - @NotNull(message = "测站编码不能为空") - private String stcd; - - /** - * 测站名称 - */ - @TableField(value = "STNM") - @Schema(description="测站名称") - @NotNull(message = "测站名称不能为空") - @Size(max = 200,message = "测站名称长度不能超过200") - private String stnm; - - /** - * 河流名称 - */ - @TableField(value = "RVNM") - @Schema(description="河流名称", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - private String rvnm; - - /** - * 水系名称 - */ - @TableField(value = "HNNM") - @Schema(description="水系名称", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - private String hnnm; - - /** - * 流域名称 - */ - @TableField(value = "BSNM") - @Schema(description="流域名称", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - private String bsnm; - - /** - * 经度 - */ - @TableField(value = "LGTD") - @Schema(description="经度") - @NotNull(message = "经度不能为空") - private BigDecimal lgtd; - - /** - * 纬度 - */ - @TableField(value = "LTTD") - @Schema(description="纬度") - @NotNull(message = "纬度不能为空") - private BigDecimal lttd; - - /** - * 站址 - */ - @TableField(value = "STLC") - @Schema(description="站址", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @Size(max = 200,message = "站址长度不能超过200") - private String stlc; - - /** - * 行政区划码 - */ - @TableField(value = "ADDVCD") - @Schema(description="行政区划码", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - private String addvcd; - - /** - * 基面名称 - */ - @TableField(value = "DTMNM") - @Schema(description="基面名称") - @Size(max = 200,message = "基面名称长度不能超过200") - private String dtmnm; - - /** - * 基面高程 - */ - @TableField(value = "DTMEL") - @Schema(description="基面高程") - private BigDecimal dtmel; - - /** - * 基面修正值 - */ - @TableField(value = "DTPR") - @Schema(description="基面修正值") - private BigDecimal dtpr; - - /** - * 站类 - */ - @TableField(value = "STTP") - @Schema(description=""" - 站类 气象站MM 蒸发站BB 堰闸水文站DD - 潮位站TT 泵站DP 墒情站SS - 雨量站PP 河道水文站ZQ 河道水位站ZZ - 水库水文站RR 地下水站ZG 分洪水位站ZB - """) - @NotNull(message = "站类不能为空") - @Size(max = 2,message = "站类长度不能超过2") - private String sttp; - - /** - * 报汛等级 - */ - @TableField(value = "FRGRD") - @Schema(description="报汛等级") - private String frgrd; - - /** - * 建站年月 - */ - @TableField(value = "ESSTYM") - @Schema(description="建站年月 格式yyyyMMdd") - @Size(max = 6,message = "建站年月长度不能超过6") - private String esstym; - - /** - * 始报年月 - */ - @TableField(value = "BGFRYM") - @Schema(description="始报年月 格式yyyyMMdd") - @Size(max = 6,message = "始报年月长度不能超过6") - private String bgfrym; - - /** - * 隶属行业单位 - */ - @TableField(value = "ATCUNIT") - @Schema(description="隶属行业单位") - @Size(max = 200,message = "隶属行业单位长度不能超过200") - private String atcunit; - - /** - * 信息管理单位 - */ - @TableField(value = "ADMAUTH") - @Schema(description="信息管理单位") - @Size(max = 200,message = "信息管理单位长度不能超过200") - private String admauth; - - /** - * 交换管理单位 - */ - @TableField(value = "LOCALITY") - @Schema(description="交换管理单位") - @Size(max = 200,message = "交换管理单位长度不能超过200") - private String locality; - - /** - * 测站岸别 - */ - @TableField(value = "STBK") - @Schema(description="测站岸别") - @Size(max = 1,message = "测站岸别长度不能超过1") - private String stbk; - - /** - * 测站方位 - */ - @TableField(value = "STAZT") - @Schema(description="测站方位") - private Short stazt; - - /** - * 至河口距离 - */ - @TableField(value = "DSTRVM") - @Schema(description="至河口距离") - private BigDecimal dstrvm; - - /** - * 集水面积 - */ - @TableField(value = "DRNA") - @Schema(description="集水面积") - private Integer drna; - - /** - * 拼音码 - */ - @TableField(value = "PHCD") - @Schema(description="拼音码") - private String phcd; - - /** - * 启用标志 - */ - @TableField(value = "USFL") - @Schema(description="启用标志") - private String usfl; - - /** - * 备注 - */ - @TableField(value = "COMMENTS") - @Schema(description="备注") - @Size(max = 200,message = "备注长度不能超过200") - private String comments; - - /** - * 时间戳 - */ - @TableField(value = "MODITIME") - @Schema(description="时间戳") - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date moditime; - - /** - * 站点来源 - */ - @TableField(value = "SRC") - @Schema(description="站点来源") - @NotNull - @Size(max = 3,message = "站点来源长度不能超过3") - private String src; - - /** - * 所在灌区 - */ - @TableField(value = "IRR_CODE") - @Schema(description="所在灌区") - private String irrCode; - - /** - * 管理单位代码 - */ - @TableField(value = "ENG_MAN_CODE") - @Schema(description="管理单位代码") - private String engManCode; - - /** - * 区域类型 - */ - @TableField(value = "[TYPE]") - @Schema(description="区域类型") - private String type; - - /** - * 所在渠道代码 - */ - @TableField(value = "CHAN_CODE") - @Schema(description="所在渠道代码") - private String chanCode; - - /** - * 河流代码 - */ - @TableField(value = "RV_CODE") - @Schema(description="河流代码") - private String rvCode; - - /** - * 桩号 - */ - @TableField(value = "BNCH") - @Schema(description="桩号") - private String bnch; - - /** - * SIM - */ - @TableField(value = "SIM") - @Schema(description="SIM") - @Size(max = 20,message = "SIM长度不能超过20") - private String sim; - - /** - * 归属协议 - */ - @TableField(value = "PROTOCOLS") - @Schema(description="归属协议") - @JsonSerialize(using = ToStringSerializer.class) - @NotNull(message = "归属协议不能为空") - private Long protocols; - - /** - * 北斗卡号 - */ - @TableField(value = "BDNUM") - @Schema(description = "北斗卡号") - private String bdnum; - - /** - * 删除标记 0:未删除, 1: 删除 - */ - @TableField(value = "DEL") - @Schema(description = "删除标记 0:未删除, 1: 删除") - private String del; - - public static final String COL_STCD = "STCD"; - - public static final String COL_STNM = "STNM"; - - public static final String COL_RVNM = "RVNM"; - - public static final String COL_HNNM = "HNNM"; - - public static final String COL_BSNM = "BSNM"; - - public static final String COL_LGTD = "LGTD"; - - public static final String COL_LTTD = "LTTD"; - - public static final String COL_STLC = "STLC"; - - public static final String COL_ADDVCD = "ADDVCD"; - - public static final String COL_DTMNM = "DTMNM"; - - public static final String COL_DTMEL = "DTMEL"; - - public static final String COL_DTPR = "DTPR"; - - public static final String COL_STTP = "STTP"; - - public static final String COL_FRGRD = "FRGRD"; - - public static final String COL_ESSTYM = "ESSTYM"; - - public static final String COL_BGFRYM = "BGFRYM"; - - public static final String COL_ATCUNIT = "ATCUNIT"; - - public static final String COL_ADMAUTH = "ADMAUTH"; - - public static final String COL_LOCALITY = "LOCALITY"; - - public static final String COL_STBK = "STBK"; - - public static final String COL_STAZT = "STAZT"; - - public static final String COL_DSTRVM = "DSTRVM"; - - public static final String COL_DRNA = "DRNA"; - - public static final String COL_PHCD = "PHCD"; - - public static final String COL_USFL = "USFL"; - - public static final String COL_COMMENTS = "COMMENTS"; - - public static final String COL_MODITIME = "MODITIME"; - - public static final String COL_SRC = "SRC"; - - public static final String COL_IRR_CODE = "IRR_CODE"; - - public static final String COL_ENG_MAN_CODE = "ENG_MAN_CODE"; - - public static final String COL_TYPE = "TYPE"; - - public static final String COL_CHAN_CODE = "CHAN_CODE"; - - public static final String COL_RV_CODE = "RV_CODE"; - - public static final String COL_BNCH = "BNCH"; - - public static final String COL_SIM = "SIM"; - - public static final String COL_PROTOCOLS = "PROTOCOLS"; - - public static final String COL_BDNUM="BDNUM"; -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/StStchB.java b/src/main/java/com/gunshi/project/xyt/model/StStchB.java deleted file mode 100644 index 0429dc5..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/StStchB.java +++ /dev/null @@ -1,145 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.alibaba.excel.annotation.ExcelProperty; -import com.baomidou.mybatisplus.annotation.*; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.gunshi.project.xyt.validate.markers.Update; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; -import lombok.Data; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - * Description: - * Created by XuSan on 2024/1/30. - * - * @author XuSan - * @version 1.0 - */ -/** - * 水质自动监测数据表 - */ -@Data -@TableName("ST_STCH_B") -@Accessors(chain = true) // chain = true 实现链式调用 -@JsonInclude(JsonInclude.Include.NON_NULL) // 表示序列化非null属性 -@Schema(description = "站点采集项基础信息") -public class StStchB implements Serializable { - private static final long serialVersionUID = 1L; - - /** - * id编号 - */ - @TableId(value = "ID", type = IdType.AUTO) - @Schema(description = "主键id") - @ExcelProperty("编号") - @NotNull(message = "断面ID不能为空", groups = {Update.class}) - private Integer id; - - /** - * 选择公式计算时，x 的取值采集项 id - */ - @ExcelProperty("选择公式计算时，x 的取值采集项 id") - @Schema(description = "选择公式计算时，x 的取值采集项 id") - @TableField(value = "XID", updateStrategy = FieldStrategy.IGNORED) - private Integer xid; - - /** - * 公式参数c - */ - @ExcelProperty("公式参数c") - @Schema(description = "公式参数c") - @TableField(value = "C", updateStrategy = FieldStrategy.IGNORED) - private Double c; - - /** - * 公式参数b - */ - @ExcelProperty("公式参数b") - @Schema(description = "公式参数b") - @TableField(value = "B", updateStrategy = FieldStrategy.IGNORED) - private Double b; - - /** - * 公式参数a - */ - @ExcelProperty("公式参数a") - @Schema(description = "公式参数a") - @TableField(value = "A", updateStrategy = FieldStrategy.IGNORED) - private Double a; - - /** - * 计算公式 1, 5分钟时段值，2, 1小时时段，3, 一元一次方程 y = a * x + b , 4, 一元二次方程 y = a * x² + b * x + c - */ - @ExcelProperty("计算公式 1, 5分钟时段值，2, 1小时时段，3, 一元一次方程 y = a * x + b , 4, 一元二次方程 y = a * x² + b * x + c") - @Schema(description = "计算公式 1, 5分钟时段值，2, 1小时时段，3, 一元一次方程 y = a * x + b , 4, 一元二次方程 y = a * x² + b * x + c") - @TableField(value = "FORMULA", updateStrategy = FieldStrategy.IGNORED) - private Integer formula; - - /** - * 是否计算量，0 否，1 是（例如一元二次方程计算流量），2 修正（例如水位加高程。例如 y = a * x + b） - */ - @ExcelProperty("是否计算量，0 否，1 是（例如一元二次方程计算流量），2 修正（例如水位加高程。例如 y = a * x + b）") - @Schema(description = "是否计算量，0 否，1 是（例如一元二次方程计算流量），2 修正（例如水位加高程。例如 y = a * x + b）") - @TableField("CALC") - private Integer calc; - - /** - * 是否默认采集项 - */ - @ExcelProperty("是否默认采集项") - @Schema(description = "是否默认采集项") - @TableField("DEF") - private Integer def; - - /** - * 采集项编号，0/1/2/3/4/5/6等 - */ - @ExcelProperty("采集项编号，0/1/2/3/4/5/6等") - @Schema(description = "采集项编号，0/1/2/3/4/5/6等") - @TableField("CHID") - @NotNull(message = "采集项编号不能为空") - @Size(max = 50,message = "采集项编号长度不能超过50") - private String chid; - - /** - * 采集项编码，DRP/Z/Q/VT/W等 - */ - @ExcelProperty("采集项编码，DRP/Z/Q/VT/W等") - @Schema(description = "采集项编码，DRP/Z/Q/VT/W等") - @TableField("CHCD") - @NotNull(message = "采集项编码不能为空") - @Size(max = 50,message = "采集项编码长度不能超过50") - private String chcd; - - /** - * 采集项名称 - */ - @ExcelProperty("采集项名称") - @Schema(description = "采集项名称") - @TableField("CHNM") - @Size(max = 50,message = "采集项名称长度不能超过50") - private String chnm; - - /** - * 测站编码 - */ - @ExcelProperty("测站编码") - @Schema(description = "测站编码") - @TableField("STCD") - @NotNull(message = "测站编码不能为空") - @Size(max = 50,message = "采集项编码长度不能超过50") - private String stcd; - - /** - * 删除标记 0:未删除, 1: 删除 - */ - @TableField(value = "DEL") - @Schema(description = "删除标记 1:启用 0：禁用") - private Integer del; - - -} diff --git a/src/main/java/com/gunshi/project/xyt/model/StVoltageR.java b/src/main/java/com/gunshi/project/xyt/model/StVoltageR.java deleted file mode 100644 index 55790c2..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/StVoltageR.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.github.jeffreyning.mybatisplus.anno.MppMultiId; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.math.BigDecimal; -import java.util.Date; - -/** - * 电压数据 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-29 - */ -@Data -@TableName("ST_VOLTAGE_R") -@Schema(description = "电压数据") -public class StVoltageR { - @MppMultiId("STCD") - @Schema(description = "测站编码") - private String stcd; - - @MppMultiId("TM") - @Schema(description = "采集时间") - private Date tm; - - @TableField("VT") - @Schema(description = "电压值") - private BigDecimal vt; -} diff --git a/src/main/java/com/gunshi/project/xyt/model/StWaterQualityR.java b/src/main/java/com/gunshi/project/xyt/model/StWaterQualityR.java deleted file mode 100644 index 1f5a67e..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/StWaterQualityR.java +++ /dev/null @@ -1,280 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.alibaba.excel.annotation.ExcelProperty; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.math.BigDecimal; -import java.time.LocalDateTime; - -/** - * Description: - * Created by XuSan on 2024/1/23. - * - * @author XuSan - * @version 1.0 - */ -/** - * 水质自动监测数据表 - */ -@Data -@TableName(value = "ST_WATER_QUALITY_R") -@Schema(description = "水质自动监测数据表") -public class StWaterQualityR { - - /** - * 主键id - */ - @TableId(value = "ID", type = IdType.AUTO) - @Schema(description = "主键id") - @ExcelProperty("编号") - private Integer id; - - /** - * 站码 - */ - @TableField(value = "STCD") - @Schema(description = "站码") - @ExcelProperty("站码") - private String stcd; - - /** - * 采样时间 - */ - @TableField(value = "SPT") - @Schema(description = "采样时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") - @ExcelProperty("采样时间") - private LocalDateTime spt; - - /** - * 水温 - */ - @TableField(value = "WIMP") - @Schema(description = "水温") - @ExcelProperty("水温") - private BigDecimal wimp; - - /** - * PH值 - */ - @TableField(value = "PH") - @Schema(description = "PH值") - @ExcelProperty("PH值") - private BigDecimal ph; - - /** - * 电导率 - */ - @TableField(value = "COND") - @Schema(description = "电导率") - @ExcelProperty("电导率") - private BigDecimal cond; - - /** - * 浑浊度 - */ - @TableField(value = "TURB") - @Schema(description = "浑浊度") - @ExcelProperty("浑浊度") - private BigDecimal turb; - - /** - * 溶解氧 - */ - @TableField(value = "DOX") - @Schema(description = "溶解氧") - @ExcelProperty("溶解氧") - private BigDecimal dox; - - /** - * 高锰酸钾指数 - */ - @TableField(value = "CODMN") - @Schema(description = "高锰酸钾指数") - @ExcelProperty("高锰酸钾指数") - private BigDecimal codmn; - - /** - * 化学需氧量 - */ - @TableField(value = "CODCR") - @Schema(description = "化学需氧量") - @ExcelProperty("化学需氧量") - private BigDecimal codcr; - - /** - * 总氮 - */ - @TableField(value = "TN") - @Schema(description = "总氮") - @ExcelProperty("总氮") - private BigDecimal tn; - - /** - * 氨氮 - */ - @TableField(value = "NH3N") - @Schema(description = "氨氮") - @ExcelProperty("氨氮") - private BigDecimal nh3N; - - /** - * 亚硝酸盐氮 - */ - @TableField(value = "NO2") - @Schema(description = "亚硝酸盐氮") - @ExcelProperty("亚硝酸盐氮") - private BigDecimal no2; - - /** - * 硝酸盐氮 - */ - @TableField(value = "NO3") - @Schema(description = "硝酸盐氮") - @ExcelProperty("硝酸盐氮") - private BigDecimal no3; - - /** - * 总磷 - */ - @TableField(value = "TP") - @Schema(description = "总磷") - @ExcelProperty("总磷") - private BigDecimal tp; - - /** - * 总有机碳 - */ - @TableField(value = "TOC") - @Schema(description = "总有机碳") - @ExcelProperty("总有机碳") - private BigDecimal toc; - - /** - * 挥发酚 - */ - @TableField(value = "VLPH") - @Schema(description = "挥发酚") - @ExcelProperty("挥发酚") - private BigDecimal vlph; - - /** - * 叶绿素a - */ - @TableField(value = "CHLA") - @Schema(description = "叶绿素a") - @ExcelProperty("叶绿素a") - private BigDecimal chla; - - /** - * 氟化物 - */ - @TableField(value = "F") - @Schema(description = "氟化物") - @ExcelProperty("氟化物") - private BigDecimal f; - - /** - * 砷 - */ - @TableField(value = "ARS") - @Schema(description = "砷") - @ExcelProperty("砷") - private BigDecimal ars; - - /** - * 汞 - */ - @TableField(value = "HG") - @Schema(description = "汞") - @ExcelProperty("汞") - private BigDecimal hg; - - /** - * 铬(六价) - */ - @TableField(value = "CR6") - @Schema(description = "铬(六价)") - @ExcelProperty("铬(六价)") - private BigDecimal cr6; - - /** - * 铜 - */ - @TableField(value = "CU") - @Schema(description = "铜") - @ExcelProperty("铜") - private BigDecimal cu; - - /** - * 铅 - */ - @TableField(value = "PB") - @Schema(description = "铅") - @ExcelProperty("铅") - private BigDecimal pb; - - /** - * 镉 - */ - @TableField(value = "CD") - @Schema(description = "镉") - @ExcelProperty("镉") - private BigDecimal cd; - - /** - * 锌 - */ - @TableField(value = "ZN") - @Schema(description = "锌") - @ExcelProperty("锌") - private BigDecimal zn; - - /** - * 锑 - */ - @TableField(value = "SB") - @Schema(description = "锑") - @ExcelProperty("锑") - private BigDecimal sb; - - /** - * 湿度 - */ - @TableField(value = "HUMIDITY") - @Schema(description = "湿度") - @ExcelProperty("湿度") - private BigDecimal humidity; - - /** - * 室温 - */ - @TableField(value = "ROOMTMP") - @Schema(description = "室温") - @ExcelProperty("室温") - private BigDecimal roomtmp; - - /** - * 水质类别 - */ - @TableField(value = "CATEGORY") - @Schema(description = "水质类别") - @ExcelProperty("水质类别") - private BigDecimal category; - - /** - * 污染物 - */ - @TableField(value = "POLLUTER") - @Schema(description = "污染物") - @ExcelProperty("污染物") - private BigDecimal polluter; - - -} diff --git a/src/main/java/com/gunshi/project/xyt/model/StZvarlB.java b/src/main/java/com/gunshi/project/xyt/model/StZvarlB.java deleted file mode 100644 index 97a40d8..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/StZvarlB.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Date; - -/** - * 库(湖)容曲线表 - */ -@Schema(description = "库(湖)容曲线表") -@Data -@TableName(value = "dbo.ST_ZVARL_B") -public class StZvarlB implements Serializable { - /** - * 水库ID - */ - @TableId(value = "RES_ID") - @Schema(description = "水库ID") - @JsonSerialize(using = ToStringSerializer.class) - private Long resId; - - /** - * 点序号 - */ - @TableField(value = "PTNO") - @Schema(description = "点序号") - private Integer ptno; - - /** - * 测站编码 - */ - @TableField(value = "STCD") - @Schema(description = "测站编码") - private String stcd; - - /** - * 施测时间 - */ - @TableField(value = "MSTM") - @Schema(description = "施测时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date mstm; - - /** - * 库水位 - */ - @TableField(value = "RZ") - @Schema(description = "库水位") - private BigDecimal rz; - - /** - * 蓄水量 - */ - @TableField(value = "W") - @Schema(description = "蓄水量") - private BigDecimal w; - - /** - * 水面面积 - */ - @TableField(value = "WSFA") - @Schema(description = "水面面积") - private Integer wsfa; - - /** - * 时间戳 - */ - @TableField(value = "MODITIME") - @Schema(description = "时间戳") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date moditime; - - public static final String COL_RES_ID = "RES_ID"; - - public static final String COL_PTNO = "PTNO"; - - public static final String COL_STCD = "STCD"; - - public static final String COL_MSTM = "MSTM"; - - public static final String COL_RZ = "RZ"; - - public static final String COL_W = "W"; - - public static final String COL_WSFA = "WSFA"; - - public static final String COL_MODITIME = "MODITIME"; -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/SysDictB.java b/src/main/java/com/gunshi/project/xyt/model/SysDictB.java deleted file mode 100644 index 51f1ba0..0000000 --- a/src/main/java/com/gunshi/project/xyt/model/SysDictB.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.gunshi.project.xyt.model; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.gunshi.project.xyt.validate.markers.Insert; -import com.gunshi.project.xyt.validate.markers.Update; -import io.swagger.v3.oas.annotations.media.Schema; - -import java.io.Serializable; -import java.util.Date; - -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; -import lombok.Data; - -/** - * 系统字典表 - */ -@Schema(description="系统字典表") -@Data -@TableName(value = "dbo.SYS_DICT_B") -public class SysDictB implements Serializable { - /** - * ID - */ - @TableId(value = "ID", type = IdType.INPUT) - @Schema(description="ID 更新字典时候需要传入") - @JsonSerialize(using = ToStringSerializer.class) - @NotNull(message = "ID不能为空", groups = {Update.class}) - private Long id; - - /** - * 字典名称 - */ - @TableField(value = "DICT_NM") - @Schema(description="字典名称") - @NotBlank(message = "字典名称不能为空") - @Size(max = 200, message = "字典名称长度不能超过200") - private String dictNm; - - /** - * 字典编码 - */ - @TableField(value = "DICT_CD") - @Schema(description="字典编码") - @NotBlank(message = "字典编码不能为空") - @Size(max = 100, message = "字典编码长度不能超过100") - private String dictCd; - - /** - * 父id - */ - @TableField(value = "PID") - @Schema(description="父id, 如果是顶层字典，则为0") - @NotNull(message = "父id不能为空") - @JsonSerialize(using = ToStringSerializer.class) - private Long pid; - - /** - * 排序字段 - */ - @TableField(value = "SORT_ON") - @Schema(description="排序字段") - @NotNull(message = "排序字段不能为空") - private Integer sortOn; - - /** - * 创建时间 - */ - @TableField(value = "CREATE_TM") - @Schema(description="创建时间", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date createTm; - - /** - * 修改时间 - */ - @TableField(value = "TM") - @Schema(description="修改时间", requiredMode = Schema.RequiredMode.NOT_REQUIRED) - @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone="GMT+8") - private Date tm; - - /** - * 状态 1：启用 0：禁用 - */ - @TableField(value = "[STATUS]") - @Schema(description="状态 1：启用 0：禁用") - @NotNull(message = "状态不能为空 删除时候传0 其他1") - private Integer status; - - public static final String COL_ID = "ID"; - - public static final String COL_DICT_NM = "DICT_NM"; - - public static final String COL_DICT_CD = "DICT_CD"; - - public static final String COL_PID = "PID"; - - public static final String COL_SORT_ON = "SORT_ON"; - - public static final String COL_CREATE_TM = "CREATE_TM"; - - public static final String COL_TM = "TM"; - - public static final String COL_STATUS = "STATUS"; -} \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/scheduled/RcvLogUpMockJob.java b/src/main/java/com/gunshi/project/xyt/scheduled/RcvLogUpMockJob.java deleted file mode 100644 index 39ffc17..0000000 --- a/src/main/java/com/gunshi/project/xyt/scheduled/RcvLogUpMockJob.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.gunshi.project.xyt.scheduled; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.core.toolkit.IdWorker; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.project.xyt.model.RcvLogUpR; -import com.gunshi.project.xyt.model.RcvLogUpRAutoDao; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; - -import java.util.Date; - -/** - * 类描述 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-30 - */ -@Component -@Slf4j -public class RcvLogUpMockJob { - - @Autowired - private RcvLogUpRAutoDao dao; - - @Scheduled(cron = "0 */5 * * * ?") - public void mock() { - RcvLogUpR one = dao.page(new Page(1,1,1).addOrder(OrderItem.desc("RECEIVE_TM"))).getRecords().getFirst(); - one.setId(IdWorker.getId()); - one.setReceiveTm(new Date()); - one.setDecodedTm(new Date()); - one.setObserveTm(new Date()); - dao.save(one); - log.info("{}", one); - } -} diff --git a/src/main/java/com/gunshi/project/xyt/service/AbstractModelWithAttachService.java b/src/main/java/com/gunshi/project/xyt/service/AbstractModelWithAttachService.java new file mode 100644 index 0000000..7056f4d --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/service/AbstractModelWithAttachService.java @@ -0,0 +1,81 @@ +package com.gunshi.project.xyt.service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.gunshi.db.dao.BaseDao; +import com.gunshi.db.dao.IMapper; +import org.springframework.transaction.annotation.Transactional; + +import java.io.Serializable; +import java.util.List; + +/** + * 类描述 + * + * @author lyf + * @version 1.0.0 + * @since 2024-03-19 + */ +public abstract class AbstractModelWithAttachService, AutoDao extends BaseDao, + AttachModel, AttachModelAutoMapper extends IMapper, AttachModelAutoDao extends BaseDao> { + abstract AutoDao getAutoDao(); + + abstract AttachModelAutoDao getAttachFileAutoDao(); + + abstract List createAttachList(Model model); + + + abstract Object getModelId(Model model); + + public abstract String getAttachBzIdName(); + + @Transactional + public boolean save(Model model) { + List attachList = createAttachList(model); + if (attachList != null) { + getAttachFileAutoDao().saveBatch(attachList); + } + + return getAutoDao().save(model); + } + + @Transactional + public boolean updateById(Model model) { + List attachList = getAttachFileAutoDao().list(new QueryWrapper().eq(getAttachBzIdName(), getModelId(model))); + getAttachFileAutoDao().removeByIds(attachList); + + attachList = createAttachList(model); + getAttachFileAutoDao().saveBatch(attachList); + + return getAutoDao().updateById(model); + } + + @Transactional + public boolean removeById(Serializable id) { + List attachList = getAttachFileAutoDao().list(new QueryWrapper().eq(getAttachBzIdName(), id)); + getAttachFileAutoDao().removeByIds(attachList); + + return getAutoDao().removeById(id); + } + + public Model getById(Serializable id) { + return getAutoDao().getById(id); + } + + public Page getPage(Page page) { + return getAutoDao().page(page); + } + + public AttachModel getAttachByAttachId(Serializable attachId) { + return getAttachFileAutoDao().getById(attachId); + } + + public List getAttachListByModelId(Serializable modelId) { + return getAttachFileAutoDao().list(new QueryWrapper().eq(getAttachBzIdName(), modelId)); + } + + + public interface GetFileIds { + List getFileIds(); + } +} diff --git a/src/main/java/com/gunshi/project/xyt/service/BasicInfoService.java b/src/main/java/com/gunshi/project/xyt/service/BasicInfoService.java deleted file mode 100644 index 32e260f..0000000 --- a/src/main/java/com/gunshi/project/xyt/service/BasicInfoService.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.gunshi.project.xyt.service; - -import com.gunshi.project.xyt.model.StResB; -import com.gunshi.project.xyt.model.StResBAutoDao; -import jakarta.annotation.Resource; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -/** - * TODO - * - * @ClassName BasicInfoService - * @Author Huang Qianxiang - * @Date 2024/2/7 9:44 - */ -@Service -@Slf4j -public class BasicInfoService { - - @Resource - private StResBAutoDao stResBAutoDao; - - /** - * 根据水库ID查询水库基础信息 - * @param resId 水库ID - * @return - */ - public StResB queryStResBasicInfoByResId(String resId){ - StResB stResB = stResBAutoDao.getById(resId); - if (stResB == null){ - throw new IllegalArgumentException("该水库ID不存在"); - } - return stResBAutoDao.getById(resId); - } - - - -} diff --git a/src/main/java/com/gunshi/project/xyt/service/BzServiceResourceMonitorRService.java b/src/main/java/com/gunshi/project/xyt/service/BzServiceResourceMonitorRService.java deleted file mode 100644 index 473b190..0000000 --- a/src/main/java/com/gunshi/project/xyt/service/BzServiceResourceMonitorRService.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.gunshi.project.xyt.service; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.project.xyt.mapper.BzServiceResourceMonitorRMapper; -import com.gunshi.project.xyt.model.BzServiceResource; -import com.gunshi.project.xyt.model.BzServiceResourceAutoDao; -import com.gunshi.project.xyt.model.BzServiceResourceMonitorR; -import com.gunshi.project.xyt.model.BzServiceResourceMonitorRAutoDao; -import com.gunshi.project.xyt.so.BzServiceResourceSo; -import com.gunshi.project.xyt.vo.BzServiceResourceMonitorVo; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -/** - * 类描述 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-24 - */ -@Service -public class BzServiceResourceMonitorRService { - @Autowired - private BzServiceResourceAutoDao serviceResourceDao; - - @Autowired - private BzServiceResourceMonitorRAutoDao serviceMonitorDao; - - @Autowired - private BzServiceResourceMonitorRMapper serviceMonitorMapper; - - public Page page(Page page, BzServiceResourceSo so) { - return serviceMonitorMapper.page(page, so); - } - - @Transactional - public Boolean removeById(String id) { - BzServiceResource byId = serviceResourceDao.getById(id); - if (byId == null) { - return false; - } - - return serviceResourceDao.removeById(id) && - serviceMonitorDao.remove( - new LambdaQueryWrapper() - .eq(BzServiceResourceMonitorR::getSrId, id) - ); - } - - public void scanByTm() { - List serviceResources = serviceResourceDao.list(); - for (BzServiceResource serviceResource : serviceResources) { - if (StringUtils.isNotEmpty(serviceResource.getTargetTable()) && - StringUtils.isNotEmpty(serviceResource.getTargetTmField())) { -// Db.getMap(new QueryWrapper<>().orderByDesc(serviceResource.getTargetTmField()).last("limit 1"), serviceResource.getTargetTable()); - } - } - } -} diff --git a/src/main/java/com/gunshi/project/xyt/service/EngineeringDrainageService.java b/src/main/java/com/gunshi/project/xyt/service/EngineeringDrainageService.java deleted file mode 100644 index 255fe8e..0000000 --- a/src/main/java/com/gunshi/project/xyt/service/EngineeringDrainageService.java +++ /dev/null @@ -1,701 +0,0 @@ -package com.gunshi.project.xyt.service; - -import cn.hutool.core.bean.BeanUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.IdWorker; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.project.xyt.entity.dto.*; -import com.gunshi.project.xyt.model.*; -import com.gunshi.project.xyt.model.StDamBAutoDao; -import com.gunshi.project.xyt.model.StEqptBAutoDao; -import com.gunshi.project.xyt.model.StGateBAutoDao; -import com.gunshi.project.xyt.model.StResBAutoDao; -import com.gunshi.project.xyt.model.StResFileRefAutoDao; -import com.gunshi.project.xyt.model.StResPersonRefAutoDao; -import com.gunshi.project.xyt.model.StResStcdRefAutoDao; -import com.gunshi.project.xyt.model.StRvBAutoDao; -import com.gunshi.project.xyt.model.StZvarlBAutoDao; -import com.gunshi.project.xyt.so.*; -import jakarta.annotation.Resource; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; -import java.util.List; - -/** - * TODO - * - * @ClassName EngineeringDrainageServiceImpl - * @Author Huang Qianxiang - * @Date 2024/1/24 14:38 - */ -@Service -@Slf4j -@Transactional(rollbackFor = Exception.class) -public class EngineeringDrainageService { - - @Resource - private StResBAutoDao stResBAutoDao; - @Resource - private StResStcdRefAutoDao stResStcdRefAutoDao; - @Resource - private StZvarlBAutoDao stZvarlBAutoDao; - @Resource - private StResPersonRefAutoDao stResPersonRefAutoDao; - @Resource - private StResFileRefAutoDao stResFileRefAutoDao; - @Resource - private StRvBAutoDao stRvBAutoDao; - @Resource - private StDamBAutoDao stDamBAutoDao; - @Resource - private StGateBAutoDao stGateBAutoDao; - @Resource - private StEqptBAutoDao stEqptBAutoDao; - - - - /** - * 新增水库基础信息 - * @param stResDto 水库的基础信息 - */ - public void insertStRes(StResDto stResDto) { - StResB stResB = new StResB(); - BeanUtil.copyProperties(stResDto,stResB); - Long resId = IdWorker.getId(); - stResB.setResId(resId); - stResB.setStatus(1); - Date date = new Date(); - stResB.setTm(date); - - //判断水库代码是否唯一 - if (queryByResCode(stResDto.getResCode()) != null){ - throw new IllegalArgumentException("水库代码必须唯一"); - } - - //保存水库基本信息 - stResBAutoDao.save(stResB); - } - - /** - * 更新水库的基础信息 - * @param stResB 水库的基础信息 - */ - public void updateStRes(StResB stResB) { - Long resId = stResB.getResId(); - StResB byId = stResBAutoDao.getById(resId); - if (byId == null) { - throw new IllegalArgumentException("resId:" + resId + "不存在"); - } - - Date date = new Date(); - stResB.setTm(date); - //更新水库基本信息 - stResBAutoDao.updateById(stResB); - } - - /** - * 根据水库ID删除水库基本信息 - * @param resId 水库ID - */ - public void deleteStRes(String resId) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(StResB.COL_RES_ID,resId) - .eq(StResB.COL_STATUS,1); - StResB byId = stResBAutoDao.getOne(queryWrapper); - if (byId == null) { - throw new IllegalArgumentException("resId:" + resId + "不存在"); - } - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - //水库状态更新为禁用 - updateWrapper.eq(StResB.COL_RES_ID,resId) - .set(StResB.COL_STATUS,0); - stResBAutoDao.update(updateWrapper); - } - - - /** - * 分页查询水库基本信息 - * @param stResPageSo 水库基本信息查询参数 - * @return - */ - public Page pageStRes(StResPageSo stResPageSo){ - if (StringUtils.isNotEmpty(stResPageSo.getResId())){ - StResB stResB = stResBAutoDao.getById(stResPageSo.getResId()); - if (stResB == null){ - return null; - } - List resBList = List.of(stResB); - return new Page(1,1,1).setRecords(resBList); - } - - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(stResPageSo.getResName())){ - lambdaQueryWrapper.like(StringUtils.isNotEmpty(stResPageSo.getResName()),StResB::getResName,stResPageSo.getResName()); - } - if (StringUtils.isNotEmpty(stResPageSo.getResCode())){ - lambdaQueryWrapper.like(StringUtils.isNotEmpty(stResPageSo.getResCode()),StResB::getResCode,stResPageSo.getResCode()); - } - if (StringUtils.isNotEmpty(stResPageSo.getEngScal())){ - lambdaQueryWrapper.eq(StringUtils.isNotEmpty(stResPageSo.getEngScal()),StResB::getEngScal,stResPageSo.getEngScal()); - } - if (stResPageSo.getStatus() != null){ - lambdaQueryWrapper.eq(StResB::getStatus,stResPageSo.getStatus()); - } - return stResBAutoDao.page(stResPageSo.getPageSo().toPage(),lambdaQueryWrapper); - } - - /** - * 根据水库代码查询水库的基础信息 - * @param resCode 水库代码 - * @return 水库的基础信息 - */ - public StResB queryByResCode(String resCode) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(StResB.COL_RES_CODE,resCode); - return stResBAutoDao.getOne(queryWrapper); - } - - /** - * 新增水库测站关系 - * @param stResStcdRefDto 水库测站关系信息DTO - */ - public void insertStResStcdRef(StResStcdRefDto stResStcdRefDto){ - StResStcdRef stResStcdRef = new StResStcdRef(); - BeanUtil.copyProperties(stResStcdRefDto,stResStcdRef); - stResStcdRef.setTm(new Date()); - stResStcdRefAutoDao.save(stResStcdRef); - } - - /** - * 更新水库测站关系 - * @param stResStcdRef 水库测站关系信息 - */ - public void updateStResStcdRef(StResStcdRef stResStcdRef){ - Long resId = stResStcdRef.getResId(); - String stcd = stResStcdRef.getStcd(); - if (stResStcdRefAutoDao.getById(resId) == null){ - throw new IllegalArgumentException("水库ID : " + resId + "不存在测站关系"); - } - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq(StResStcdRef.COL_RES_ID,resId) - .set(StResStcdRef.COL_STCD,stcd) - .set(StResStcdRef.COL_TM,new Date()); - stResStcdRefAutoDao.update(updateWrapper); - } - - /** - * 删除水库测站关系 - * @param resId 水库ID - */ - public void deleteStResStcdRef(String resId){ - if (stResStcdRefAutoDao.getById(resId) == null){ - throw new IllegalArgumentException("该水库ID不存在测站关系"); - } - stResStcdRefAutoDao.removeById(resId); - } - - /** - * 根据水库ID查询水库测站关系 - * @param resId 水库ID - * @return - */ - public StResStcdRef queryStResStcdRefByResId(String resId){ - StResStcdRef stResStcdRef = stResStcdRefAutoDao.getById(resId); - if (stResStcdRef == null){ - throw new IllegalArgumentException("该水库ID不存在水库测站关系"); - } - return stResStcdRef; - } - - /** - * 新增库容曲线信息 - * @param stZvarlDto 库容曲线信息DTO - */ - public void insertStZvarl(StZvarlDto stZvarlDto){ - StZvarlB stZvarlB = new StZvarlB(); - BeanUtil.copyProperties(stZvarlDto,stZvarlB); - stZvarlB.setModitime(new Date()); - stZvarlBAutoDao.save(stZvarlB); - } - - /** - * 更新库容曲线信息 - * @param stZvarlB 库容曲线信息 - */ - public void updateStZvarl(StZvarlB stZvarlB){ - StZvarlB byId = stZvarlBAutoDao.getById(stZvarlB.getResId()); - if (byId == null){ - throw new IllegalArgumentException("该水库ID对应的库容曲线不存在"); - } - stZvarlB.setModitime(new Date()); - stZvarlBAutoDao.updateById(stZvarlB); - } - - /** - * 删除库容曲线信息 - * @param resId 水库ID - * @param ptno 序号 - */ - public void deleteStZvarl(String resId,String ptno){ - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(StZvarlB.COL_RES_ID,resId) - .eq(StZvarlB.COL_PTNO,ptno); - StZvarlB stZvarlB = stZvarlBAutoDao.getOne(queryWrapper); - if (stZvarlB == null) { - throw new IllegalArgumentException("要删除的水库ID或点序号不存在"); - } - stZvarlBAutoDao.remove(queryWrapper); - } - - /** - * 分页查询库容曲线信息 - * @param stZvarlSo 库容曲线信息查询参数 - * @return - */ - public Page pageStZvarl(StZvarlSo stZvarlSo){ - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.orderByAsc(StZvarlB.COL_PTNO); - return stZvarlBAutoDao.page(stZvarlSo.getPageSo().toPage(),queryWrapper); - } - - /** - * 新增水库责任人信息 - * @param stResPersonRefDto 水库责任人信息DTO - */ - public void insertStResPersonRef(StResPersonRefDto stResPersonRefDto){ - StResPersonRef stResPersonRef = new StResPersonRef(); - BeanUtil.copyProperties(stResPersonRefDto,stResPersonRef); - long id = IdWorker.getId(); - stResPersonRef.setId(id); - stResPersonRef.setTm(new Date()); - stResPersonRefAutoDao.save(stResPersonRef); - } - - /** - * 更新水库责任人关系 - * @param stResPersonRef 水库责任人关系信息 - */ - public void updateStResPersonRef(StResPersonRef stResPersonRef){ - Long id = stResPersonRef.getId(); - if (stResPersonRefAutoDao.getById(id) == null ){ - throw new IllegalArgumentException("要更新的水库责任人关系不存在"); - } - stResPersonRef.setTm(new Date()); - stResPersonRefAutoDao.updateById(stResPersonRef); - } - - /** - * 删除水库责任人信息 - * @param id 水库责任人关系ID - */ - public void deleteStResPersonRef(String id){ - StResPersonRef byId = stResPersonRefAutoDao.getById(id); - if (byId == null){ - throw new IllegalArgumentException("该水库责任人关系ID不存在"); - } - stResPersonRefAutoDao.removeById(id); - } - - /** - * 分页查询水库责任人信息 - * @param stResPersonRefSo 水库责任人关系信息查询参数 - * @return - */ - public Page pageStResPersonRef(StResPersonRefSo stResPersonRefSo){ - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.orderByAsc(StResPersonRef.COL_SORT_ON); - return stResPersonRefAutoDao.page(stResPersonRefSo.getPageSo().toPage(),queryWrapper); - } - - /** - * 新增水库附件信息 - * @param stResFileRefDto 水库附件信息DTO - */ - public void insertStResFileRef(StResFileRefDto stResFileRefDto){ - StResFileRef stResFileRef = new StResFileRef(); - BeanUtil.copyProperties(stResFileRefDto,stResFileRef); - long id = IdWorker.getId(); - stResFileRef.setId(id); - stResFileRef.setTm(new Date()); - stResFileRefAutoDao.save(stResFileRef); - } - - /** - * 根据水库附件关系ID删除水库附件信息 - * @param id 水库附件关系ID - */ - public void deleteStResFileRef(String id){ - StResFileRef byId = stResFileRefAutoDao.getById(id); - if (byId == null){ - throw new IllegalArgumentException("该水库附件关系ID不存在"); - } - stResFileRefAutoDao.removeById(id); - } - - /** - * 分页查询水库附件 - * @param stResFileRefSo 水库附件关系信息查询参数 - */ - public Page pageStResFileRef(StResFileRefSo stResFileRefSo){ - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.orderByAsc(StResPersonRef.COL_SORT_ON); - return stResFileRefAutoDao.page(stResFileRefSo.getPageSo().toPage(),queryWrapper); - } - - - /** - * 新增河流基础信息 - * @param stRvDto 河流的基础信息DTO - */ - public void insertStRv(StRvDto stRvDto) { - if (queryByRvCode(stRvDto.getRvCode()) != null){ - throw new IllegalArgumentException("河流代码必须唯一"); - } - StRvB stRvB = new StRvB(); - BeanUtil.copyProperties(stRvDto,stRvB); - Long rvId = IdWorker.getId(); - stRvB.setRvId(rvId); - stRvB.setStatus(1); - stRvB.setTm(new Date()); - stRvBAutoDao.save(stRvB); - } - - /** - * 更新河流的基础信息 - * @param stRvB 河流的基础信息 - */ - public void updateStRv(StRvB stRvB) { - Long rvId = stRvB.getRvId(); - StRvB byId = stRvBAutoDao.getById(rvId); - if (byId == null){ - throw new IllegalArgumentException("河流ID: " + rvId + "不存在"); - } - stRvB.setTm(new Date()); - stRvBAutoDao.updateById(stRvB); - } - - /** - * 根据河流ID删除河流信息 - * @param rvId 河流ID - */ - public void deleteStRv(String rvId) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(StRvB.COL_RV_ID,rvId) - .eq(StRvB.COL_STATUS,1); - StRvB byId = stRvBAutoDao.getOne(queryWrapper); - if (byId == null){ - throw new IllegalArgumentException("河流ID: " + rvId + "不存在, 或河流ID: " + rvId + "已被禁用"); - } - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq(StRvB.COL_RV_ID,rvId) - .set(StRvB.COL_STATUS,0); - stRvBAutoDao.update(updateWrapper); - } - - /** - * 分页查询河流基础信息 - * @param stRvPageSo 河流基本信息查询参数 - */ - public Page pageStRv(StRvPageSo stRvPageSo){ - if (StringUtils.isNotEmpty(stRvPageSo.getRvId())){ - StRvB stRvB = stRvBAutoDao.getById(stRvPageSo.getRvId()); - if (stRvB == null){ - return null; - } - List rvBList = List.of(stRvB); - return new Page(1,1,1).setRecords(rvBList); - } - - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(stRvPageSo.getRvName())){ - lambdaQueryWrapper.like(StringUtils.isNotEmpty(stRvPageSo.getRvName()),StRvB::getRvCode,stRvPageSo.getRvName()); - } - if (StringUtils.isNotEmpty(stRvPageSo.getRvCode())){ - lambdaQueryWrapper.like(StringUtils.isNotEmpty(stRvPageSo.getRvCode()),StRvB::getRvCode,stRvPageSo.getRvCode()); - } - if (stRvPageSo.getStatus() != null){ - lambdaQueryWrapper.eq(StRvB::getStatus,stRvPageSo.getStatus()); - } - return stRvBAutoDao.page(stRvPageSo.getPageSo().toPage(),lambdaQueryWrapper); - } - - /** - * 根据河流代码查询河流的基础信息 - * @param rvCode 河流代码 - * @return 河流的基础信息 - */ - public StRvB queryByRvCode(String rvCode) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(StRvB.COL_RV_CODE,rvCode) - .eq(StRvB.COL_STATUS,1); - return stRvBAutoDao.getOne(queryWrapper); - } - - - /** - * 新增大坝基础信息 - * @param stDamDto 大坝基础信息DTO - */ - public void insertStDam(StDamDto stDamDto) { - if (queryByDamCode(stDamDto.getDamCode()) != null){ - throw new IllegalArgumentException("大坝代码必须唯一"); - } - StDamB stDamB = new StDamB(); - BeanUtil.copyProperties(stDamDto,stDamB); - Long damId = IdWorker.getId(); - stDamB.setDamId(damId); - stDamB.setStatus(1); - stDamB.setTm(new Date()); - stDamBAutoDao.save(stDamB); - } - - /** - * 更新大坝基础信息 - * @param stDamB 大坝基础信息 - */ - public void updateStDam(StDamB stDamB) { - Long damId = stDamB.getDamId(); - StDamB byId = stDamBAutoDao.getById(damId); - if (byId == null){ - throw new IllegalArgumentException("大坝ID: " + damId + "不存在"); - } - stDamB.setTm(new Date()); - stDamBAutoDao.updateById(stDamB); - } - - /** - * 根据大坝ID删除大坝基础信息 - * @param damId 大坝ID - */ - public void deleteStDam(String damId) { - StDamB byId = stDamBAutoDao.getById(damId); - if (byId == null){ - throw new IllegalArgumentException("大坝ID: " + damId + "不存在"); - } - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq(StDamB.COL_DAM_ID,damId) - .set(StDamB.COL_STATUS,0); - stDamBAutoDao.update(updateWrapper); - } - - /** - * 分页查询大坝基础信息 - * @param stDamPageSo 大坝基本信息查询参数 - * @return - */ - public Page pageStDam(StDamPageSo stDamPageSo){ - if (StringUtils.isNotEmpty(stDamPageSo.getDamId())){ - StDamB stDamB = stDamBAutoDao.getById(stDamPageSo.getDamId()); - if (stDamB == null){ - return null; - } - List damBList = List.of(stDamB); - return new Page(1,1,1).setRecords(damBList); - } - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(stDamPageSo.getDamName())){ - lambdaQueryWrapper.like(StringUtils.isNotEmpty(stDamPageSo.getDamName()),StDamB::getDamName,stDamPageSo.getDamName()); - } - if (StringUtils.isNotEmpty(stDamPageSo.getDamCode())){ - lambdaQueryWrapper.like(StringUtils.isNotEmpty(stDamPageSo.getDamCode()),StDamB::getDamCode,stDamPageSo.getDamCode()); - } - if (stDamPageSo.getStatus() != null){ - lambdaQueryWrapper.eq(StDamB::getStatus,stDamPageSo.getStatus()); - } - return stDamBAutoDao.page(stDamPageSo.getPageSo().toPage(),lambdaQueryWrapper); - - } - - /** - * 根据大坝代码查询大坝信息 - * @param damCode 大坝代码 - * @return 大坝基础信息 - */ - public StDamB queryByDamCode(String damCode) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(StDamB.COL_DAM_CODE,damCode) - .eq(StDamB.COL_STATUS,1); - return stDamBAutoDao.getOne(queryWrapper); - } - - /** - * 新增闸阀基础信息 - * @param stGateDto 闸阀基础信息DTO - */ - public void insertStGate(StGateDto stGateDto){ - if (queryByGateCode(stGateDto.getGateCd()) != null){ - throw new IllegalArgumentException("闸阀编码必须唯一"); - } - StGateB stGateB = new StGateB(); - BeanUtil.copyProperties(stGateDto,stGateB); - long gateId = IdWorker.getId(); - stGateB.setGateId(gateId); - stGateB.setTm(new Date()); - stGateBAutoDao.save(stGateB); - } - - /** - * 更新闸阀基础信息 - * @param stGateB 闸阀基础信息 - */ - public void updateStGate(StGateB stGateB){ - Long gateId = stGateB.getGateId(); - StGateB byId = stGateBAutoDao.getById(gateId); - if (byId == null){ - throw new IllegalArgumentException("闸阀ID : " + gateId + "不存在"); - } - stGateB.setTm(new Date()); - stGateBAutoDao.updateById(stGateB); - } - - /** - * 根据闸阀ID删除闸阀基础信息 - * @param gateId 闸阀ID - */ - public void deleteStGate(String gateId){ - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(StGateB.COL_GATE_ID,gateId) - .eq(StGateB.COL_STATUS,1); - StGateB stGateB = stGateBAutoDao.getById(gateId); - if (stGateB == null){ - throw new IllegalArgumentException("闸阀ID : " + gateId + "不存在或闸阀ID : " + gateId + "已被禁用"); - } - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq(StGateB.COL_GATE_ID,gateId) - .set(StGateB.COL_STATUS,0); - stGateBAutoDao.update(updateWrapper); - } - - /** - * 根据闸阀编码查询闸阀基础信息 - * @param gateCd 闸阀编码 - * @return 闸阀基础信息 - */ - public StGateB queryByGateCode(String gateCd){ - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(StGateB.COL_GATE_CD,gateCd) - .eq(StGateB.COL_STATUS,1); - return stGateBAutoDao.getOne(queryWrapper); - } - - /** - * 分页查询闸阀基础信息 - * @param stGatePageSo 闸阀基本信息查询参数 - * @return - */ - public Page pageStGate(StGatePageSo stGatePageSo){ - if (StringUtils.isNotEmpty(stGatePageSo.getGateId())){ - StGateB stGateB = stGateBAutoDao.getById(stGatePageSo.getGateId()); - if (stGateB == null){ - return null; - } - List gateBList = List.of(stGateB); - return new Page(1,1,1).setRecords(gateBList); - } - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(stGatePageSo.getGateNm())){ - lambdaQueryWrapper.like(StringUtils.isNotEmpty(stGatePageSo.getGateNm()),StGateB::getGateNm,stGatePageSo.getGateNm()); - } - if (StringUtils.isNotEmpty(stGatePageSo.getGateCd())){ - lambdaQueryWrapper.like(StringUtils.isNotEmpty(stGatePageSo.getGateCd()),StGateB::getGateCd,stGatePageSo.getGateCd()); - } - if (stGatePageSo.getStatus() != null){ - lambdaQueryWrapper.eq(StGateB::getStatus,stGatePageSo.getStatus()); - } - return stGateBAutoDao.page(stGatePageSo.getPageSo().toPage(),lambdaQueryWrapper); - } - - /** - * 新增量水堰基础信息 - * @param stEqptDto 量水堰基础信息DTO - */ - public void insertStEqpt(StEqptDto stEqptDto){ - if (queryByWmegCode(stEqptDto.getWmeqCode()) != null){ - throw new IllegalArgumentException("量水设施代码不能为空"); - } - StEqptB stEqptB = new StEqptB(); - BeanUtil.copyProperties(stEqptDto,stEqptB); - long id = IdWorker.getId(); - stEqptB.setWmeqId(id); - stEqptB.setStatus(1); - stEqptBAutoDao.save(stEqptB); - } - - /** - * 更新量水堰基础信息 - * @param stEqptB 量水堰基础信息 - */ - public void updateStEqpt(StEqptB stEqptB){ - Long wmeqId = stEqptB.getWmeqId(); - StEqptB stEqptB1 = stEqptBAutoDao.getById(wmeqId); - if (stEqptB1 == null){ - throw new IllegalArgumentException("量水设施ID: " + wmeqId + "不存在"); - } - stEqptBAutoDao.updateById(stEqptB); - } - - /** - * 删除量水堰基础信息 - * @param wmeqId 量水设施ID - */ - public void deleteStEqpt(String wmeqId){ - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(StEqptB.COL_WMEQ_ID,wmeqId) - .eq(StEqptB.COL_STATUS,1); - StEqptB stEqptB1 = stEqptBAutoDao.getOne(queryWrapper); - if (stEqptB1 == null){ - throw new IllegalArgumentException("量水设施ID: " + wmeqId + "不存在或量水设施ID: " + wmeqId + "被禁用"); - } - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq(StEqptB.COL_WMEQ_ID,wmeqId) - .set(StEqptB.COL_STATUS,0); - stEqptBAutoDao.update(updateWrapper); - } - - /** - * 分页查询量水堰基础信息 - * @param stEqptPageSo 量水堰基本信息查询参数 - * @return - */ - public Page pageStEqpt(StEqptPageSo stEqptPageSo){ - if (StringUtils.isNotEmpty(stEqptPageSo.getWmeqId())){ - StEqptB stEqptB = stEqptBAutoDao.getById(stEqptPageSo.getWmeqId()); - if (stEqptB == null){ - return null; - } - List eqptBList = List.of(stEqptB); - return new Page(1,1,1).setRecords(eqptBList); - } - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(stEqptPageSo.getWmeqName())){ - lambdaQueryWrapper.like(StringUtils.isNotEmpty(stEqptPageSo.getWmeqName()),StEqptB::getWmeqName,stEqptPageSo.getWmeqName()); - } - if (StringUtils.isNotEmpty(stEqptPageSo.getWmeqCode())){ - lambdaQueryWrapper.like(StringUtils.isNotEmpty(stEqptPageSo.getWmeqCode()),StEqptB::getWmeqCode,stEqptPageSo.getWmeqCode()); - } - if (stEqptPageSo.getStatus() != null){ - lambdaQueryWrapper.eq(StEqptB::getStatus,stEqptPageSo.getStatus()); - } - return stEqptBAutoDao.page(stEqptPageSo.getPageSo().toPage(),lambdaQueryWrapper); - } - - /** - * 根据量水堰代码查询量水堰基础信息 - * @param wmeqCode 量水堰代码 - * @return 量水堰基础信息 - */ - public StEqptB queryByWmegCode(String wmeqCode){ - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(StEqptB.COL_WMEQ_CODE,wmeqCode) - .eq(StEqptB.COL_STATUS,1); - StEqptB stEqptB = stEqptBAutoDao.getOne(queryWrapper); - return stEqptB; - } - -} diff --git a/src/main/java/com/gunshi/project/xyt/service/GateRepairRecordService.java b/src/main/java/com/gunshi/project/xyt/service/GateRepairRecordService.java deleted file mode 100644 index 02e3778..0000000 --- a/src/main/java/com/gunshi/project/xyt/service/GateRepairRecordService.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.gunshi.project.xyt.service; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.project.xyt.entity.dto.StGateRepairRecordDto; -import com.gunshi.project.xyt.entity.vo.GateRepairDetailVo; -import com.gunshi.project.xyt.entity.vo.GateRepairRecordVo; -import com.gunshi.project.xyt.so.GateRepairRecordPageSo; - -/** - * Description: - * Created by wanyan on 2024/1/26 - * - * @author wanyan - * @version 1.0 - */ -public interface GateRepairRecordService { - - /** - * 新增检修记录 - * @param stGateRepairRecordDto - * @return - */ - String addRecord(StGateRepairRecordDto stGateRepairRecordDto); - - /** - * 更新检修记录 - * @param stGateRepairRecordDto - * @return - */ - String updateRecord(StGateRepairRecordDto stGateRepairRecordDto); - - /** - * 根据recordId删除检修记录 - * @param recordId 检修记录id - * @return - */ - String deleteRecord(Long recordId); - - /** - * 分页查询 - * @param gateRepairRecordPageSo - * @return - */ - Page page(GateRepairRecordPageSo gateRepairRecordPageSo); - - /** - * 检修记录详情 - * @param recordId 检修记录id - * @return - */ - GateRepairDetailVo detail(Long recordId); -} diff --git a/src/main/java/com/gunshi/project/xyt/service/GateService.java b/src/main/java/com/gunshi/project/xyt/service/GateService.java deleted file mode 100644 index b4d5921..0000000 --- a/src/main/java/com/gunshi/project/xyt/service/GateService.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.gunshi.project.xyt.service; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.project.xyt.entity.vo.GateHistoryInfoVo; -import com.gunshi.project.xyt.entity.vo.GateInfoVo; -import com.gunshi.project.xyt.entity.vo.StFlowRVo; -import com.gunshi.project.xyt.so.GateHistoryPageSo; - -import java.util.List; - -/** - * Description: - * Created by wanyan on 2024/1/26 - * - * @author wanyan - * @version 1.0 - */ -public interface GateService { - - /** - * 闸阀列表 - * @return - */ - List queryGateList(); - - /** - * 闸阀开关历史分页查询 - * @param gateHistoryPageSo 查询参数 - * @return - */ - Page page(GateHistoryPageSo gateHistoryPageSo); - - /** - * 流量计列表查询 - * @return - */ - List queryFlowList(); -} diff --git a/src/main/java/com/gunshi/project/xyt/service/MonitorEquipmentHealthService.java b/src/main/java/com/gunshi/project/xyt/service/MonitorEquipmentHealthService.java deleted file mode 100644 index 7f89ca2..0000000 --- a/src/main/java/com/gunshi/project/xyt/service/MonitorEquipmentHealthService.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.gunshi.project.xyt.service; - -import com.gunshi.project.xyt.mapper.StRcvRealMapper; -import com.gunshi.project.xyt.model.StRcvReal; -import com.gunshi.project.xyt.model.StStbprpBAutoDao; -import jakarta.annotation.Resource; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * TODO - * - * @ClassName MonitorEquipmentHealthService - * @Author Huang Qianxiang - * @Date 2024/2/2 11:27 - */ -@Service -@Slf4j -public class MonitorEquipmentHealthService { - - @Resource - private StStbprpBAutoDao stStbprpBAutoDao; - @Resource - private StRcvRealMapper stRcvRealMapper; - - /** - * 查看监测设备总数 - * @retur - */ - public Long queryAllStcdCount(){ - return stStbprpBAutoDao.count(); - } - - /** - * 查看近一个小时检测设备在线数量 - * @return - */ - public Long queryOnlineStcdCount(){ - return stRcvRealMapper.queryOnlineStcdCount(); - } - - /** - * 查看离线设备清单 - * @return - */ - public List queryOffLineStcd(){ - return stRcvRealMapper.queryOffLineStcd(); - } - - /** - * 查看在线设备清单 - * @return - */ - public List queryOnLineStcd(){ - return stRcvRealMapper.queryOnLineStcd(); - } - - - -} diff --git a/src/main/java/com/gunshi/project/xyt/service/ProtocolInfoService.java b/src/main/java/com/gunshi/project/xyt/service/ProtocolInfoService.java deleted file mode 100644 index 7d5aef2..0000000 --- a/src/main/java/com/gunshi/project/xyt/service/ProtocolInfoService.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.gunshi.project.xyt.service; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.project.xyt.model.BzProtocolInfo; -import com.gunshi.project.xyt.model.BzProtocolInfoAutoDao; -import com.gunshi.project.xyt.so.BzProtocolInfoSo; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * 类描述 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-23 - */ -@Service -public class ProtocolInfoService { - @Autowired - private BzProtocolInfoAutoDao dao; - - - public Page page(BzProtocolInfoSo so) { - if (StringUtils.isNotEmpty(so.getId())) { - BzProtocolInfo entity = dao.getById(so.getId()); - if (entity == null) { - return null; - } - List records = List.of(entity); - return new Page(1, 1, 1).setRecords(records); - } - - LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(so.getName())) { - query.like(BzProtocolInfo::getName, so.getName()); - } - if (StringUtils.isNotEmpty(so.getIp())) { - query.like(BzProtocolInfo::getIp, so.getIp()); - } - if (so.getPort() != null) { - query.eq(BzProtocolInfo::getPort, so.getPort()); - } - if (StringUtils.isNotEmpty(so.getStd())) { - query.like(BzProtocolInfo::getStd, so.getStd()); - } - if (StringUtils.isNotEmpty(so.getTrans())) { - query.like(BzProtocolInfo::getTrans, so.getTrans()); - } - if (so.getEnable() != null) { - query.eq(BzProtocolInfo::getEnable, so.getEnable()); - } - query.orderByDesc(BzProtocolInfo::getCreateTm); - - return dao.page(so.getPageSo().toPage(), query); - } -} diff --git a/src/main/java/com/gunshi/project/xyt/service/RainMonitoringService.java b/src/main/java/com/gunshi/project/xyt/service/RainMonitoringService.java deleted file mode 100644 index 7e86925..0000000 --- a/src/main/java/com/gunshi/project/xyt/service/RainMonitoringService.java +++ /dev/null @@ -1,243 +0,0 @@ -package com.gunshi.project.xyt.service; - -import com.gunshi.project.xyt.entity.vo.StPptnVo; -import com.gunshi.project.xyt.mapper.StPptnRMapper; -import com.gunshi.project.xyt.model.StResB; -import com.gunshi.project.xyt.model.StResBAutoDao; -import jakarta.annotation.Resource; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * TODO - * - * @ClassName RainMonitoringService - * @Author Huang Qianxiang - * @Date 2024/2/6 10:44 - */ -@Service -@Slf4j -public class RainMonitoringService { - - @Resource - private StResBAutoDao stResBAutoDao; - @Resource - private StPptnRMapper stPptnRMapper; - - /** - * 根据水库ID查询今天降雨量 - * @param resId 水库ID - * @return - */ - public List queryTodayDrpByResId(String resId){ - StResB stResB = stResBAutoDao.getById(resId); - if (stResB == null){ - throw new IllegalArgumentException("该水库ID不存在"); - } - LocalDateTime now = LocalDateTime.now(); - LocalDateTime startTime = null; - LocalDateTime endTime = null; - if (now.getHour() < 8){ - LocalDateTime time = now.minusDays(1); - //当前时间未到 8:00 - startTime = LocalDateTime.of( - time.getYear(), - time.getMonth(), - time.getDayOfMonth(), - 8, - 0, - 0 - ); - }else { - startTime = LocalDateTime.of( - now.getYear(), - now.getMonth(), - now.getDayOfMonth(), - 8, - 0, - 0 - ); - } - endTime = now; - - return stPptnRMapper.queryHourTimeQuantumDrpByResId( - resId, - Date.from(startTime.atZone(ZoneId.systemDefault()).toInstant()), - Date.from(endTime.atZone(ZoneId.systemDefault()).toInstant()) - ); - } - - - /** - * 根据水库ID查询昨天降雨量 - * @param resId 水库ID - * @return - */ - public List queryYesterdayDrpByResId(String resId){ - StResB stResB = stResBAutoDao.getById(resId); - if (stResB == null){ - throw new IllegalArgumentException("该水库ID不存在"); - } - LocalDateTime now = LocalDateTime.now(); - LocalDateTime startTime = null; - LocalDateTime endTime = null; - if (now.getHour() < 8){ - LocalDateTime time1 = now.minusDays(2); - //当前时间未到 8:00 - startTime = LocalDateTime.of( - time1.getYear(), - time1.getMonth(), - time1.getDayOfMonth(), - 8, - 0, - 0 - ); - LocalDateTime time2 = now.minusDays(1); - endTime = LocalDateTime.of( - time2.getYear(), - time2.getMonth(), - time2.getDayOfMonth(), - 8, - 0, - 0 - ); - }else { - LocalDateTime time = now.minusDays(1); - startTime = LocalDateTime.of( - time.getYear(), - time.getMonth(), - time.getDayOfMonth(), - 8, - 0, - 0 - ); - endTime = LocalDateTime.of( - now.getYear(), - now.getMonth(), - now.getDayOfMonth(), - 8, - 0, - 0 - ); - } - return stPptnRMapper.queryHourTimeQuantumDrpByResId( - resId, - Date.from(startTime.atZone(ZoneId.systemDefault()).toInstant()), - Date.from(endTime.atZone(ZoneId.systemDefault()).toInstant()) - ); - } - - /** - * 根据水库ID查询24小时内的降雨量 - * @param resId 水库ID - * @return - */ - public List query24HourDrpByResId(String resId){ - StResB stResB = stResBAutoDao.getById(resId); - if (stResB == null){ - throw new IllegalArgumentException("该水库ID不存在"); - } - return stPptnRMapper.query24HourDrpByResId(resId); - } - - - /** - * 根据水库ID查询72小时内的降雨量 - * @param resId 水库ID - * @return - */ - public List query72HourDrpByResId(String resId){ - StResB stResB = stResBAutoDao.getById(resId); - if (stResB == null){ - throw new IllegalArgumentException("该水库ID不存在"); - } - return stPptnRMapper.query72HourDrpByResId(resId); - } - - /** - * 根据水库ID查询七日的降雨量 - * @param resId 水库ID - * @return - */ - public List querySevenDayDrpByResId(String resId){ - - StResB stResB = stResBAutoDao.getById(resId); - if (stResB == null){ - throw new IllegalArgumentException("该水库ID不存在"); - } - LocalDateTime now = LocalDateTime.now(); - - LocalDateTime startTime = null; - LocalDateTime endTime = null; - List stPptnVoList = new ArrayList(); - - if (now.getHour() < 8){ - now = now.minusDays(1); - } - - for (int i = 0; i < 7; i++) { - //获取每一天累计降水量 - if (i == 0){ - startTime = LocalDateTime.of( - now.getYear(), - now.getMonth(), - now.getDayOfMonth(), - 8, - 0, - 0 - ); - endTime = now; - }else { - startTime = LocalDateTime.of( - now.getYear(), - now.getMonth(), - now.getDayOfMonth(), - 8, - 0, - 0 - ); - LocalDateTime time = now.plusDays(1); - endTime = LocalDateTime.of( - time.getYear(), - time.getMonth(), - time.getDayOfMonth(), - 8, - 0, - 0 - ); - } - - List stPptnVoList1 = stPptnRMapper.queryDayTimeQuantumDrpByResId( - resId, - Date.from(startTime.atZone(ZoneId.systemDefault()).toInstant()), - Date.from(endTime.atZone(ZoneId.systemDefault()).toInstant()) - ); - - //对结果进行处理 - BigDecimal sumDrp = BigDecimal.valueOf(0); - for (StPptnVo stPptnVo : stPptnVoList1) { - sumDrp = sumDrp.add(stPptnVo.getSumDrp()); - } - - StPptnVo stPptnVo = new StPptnVo(); - stPptnVo.setTime(Date.from( - LocalDateTime.of(now.getYear(),now.getMonth(),now.getDayOfMonth(),0,0,0) - .atZone(ZoneId.systemDefault()) - .toInstant()) - ); - stPptnVo.setSumDrp(sumDrp); - stPptnVoList.add(stPptnVo); - - now = now.minusDays(1); - } - return stPptnVoList; - } - -} diff --git a/src/main/java/com/gunshi/project/xyt/service/RescueGoodsService.java b/src/main/java/com/gunshi/project/xyt/service/RescueGoodsService.java new file mode 100644 index 0000000..4bd4774 --- /dev/null +++ b/src/main/java/com/gunshi/project/xyt/service/RescueGoodsService.java @@ -0,0 +1,88 @@ +package com.gunshi.project.xyt.service; + +import com.baomidou.mybatisplus.core.toolkit.IdWorker; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.gunshi.file.model.FileDescriptor; +import com.gunshi.project.xyt.entity.so.RescueGoodsPageSo; +import com.gunshi.project.xyt.mapper.RescueGoodsMapper; +import com.gunshi.project.xyt.model.RescueGoodsB; +import com.gunshi.project.xyt.model.RescueGoodsBAutoDao; +import com.gunshi.project.xyt.model.RescueGoodsBAutoMapper; +import com.gunshi.project.xyt.model.RescueGoodsFile; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * Description: + * Created by wanyan on 2024/3/20 + * + * @author wanyan + * @version 1.0 + */ +@Service +@Slf4j +@Transactional(rollbackFor = Exception.class) +public class RescueGoodsService extends AbstractModelWithAttachService{ + + @Autowired + private RescueGoodsBAutoDao autoDao; + + @Autowired + private com.gunshi.project.xyt.model.RescueGoodsFileAutoDao attachFileAutoDao; + + @Resource + private RescueGoodsMapper rescueGoodsMapper; + + + public Page pageQuery(RescueGoodsPageSo RescueGoodsPageSo) { + return rescueGoodsMapper.pageQuery(RescueGoodsPageSo.getPageSo().toPage(),RescueGoodsPageSo); + } + + + @Override + RescueGoodsBAutoDao getAutoDao() { + return autoDao; + } + + @Override + com.gunshi.project.xyt.model.RescueGoodsFileAutoDao getAttachFileAutoDao() { + return attachFileAutoDao; + } + + @Override + List createAttachList(RescueGoodsB RescueGoodsB) { + List fileIds = RescueGoodsB.getFileIds(); + if (fileIds == null) return null; + List attachList = new ArrayList<>(); + for (String fileId : fileIds) { + RescueGoodsFile attach = new RescueGoodsFile(); + attach.setFileId(Long.valueOf(fileId)); + attach.setGoodsId(RescueGoodsB.getGoodsId()); + attach.setTm(new Date()); + attach.setId(IdWorker.getId()); + attachList.add(attach); + } + return attachList; + } + + @Override + Object getModelId(RescueGoodsB RescueGoodsB) { + return RescueGoodsB.getGoodsId(); + } + + @Override + public String getAttachBzIdName() { + return "goods_id"; + } + + public List detail(Long goodsId) { + return rescueGoodsMapper.detail(goodsId); + } +} diff --git a/src/main/java/com/gunshi/project/xyt/service/ReservoirLevelService.java b/src/main/java/com/gunshi/project/xyt/service/ReservoirLevelService.java deleted file mode 100644 index a02c82c..0000000 --- a/src/main/java/com/gunshi/project/xyt/service/ReservoirLevelService.java +++ /dev/null @@ -1,135 +0,0 @@ -package com.gunshi.project.xyt.service; - -import com.gunshi.project.xyt.entity.vo.ReservoirLevelVo; -import com.gunshi.project.xyt.mapper.StResStcdRefMapper; -import com.gunshi.project.xyt.model.StResB; -import com.gunshi.project.xyt.model.StResBAutoDao; -import jakarta.annotation.Resource; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.util.List; - -/** - * TODO - * - * @ClassName ReservoirLevelService - * @Author Huang Qianxiang - * @Date 2024/2/1 15:37 - */ -@Service -@Slf4j -public class ReservoirLevelService { - - @Resource - private StResBAutoDao stResBAutoDao; - @Resource - private StResStcdRefMapper stResStcdRefMapper; - - /** - * 根据水库ID查询校核洪水位 - * @param resId 水库ID - * @return 校核洪水位 - */ - public BigDecimal queryChfllvByResId(String resId){ - StResB stResB = stResBAutoDao.getById(resId); - if (stResB == null){ - throw new IllegalArgumentException("该水库ID不存在"); - } - return stResB.getChfllv(); - } - - /** - * 根据水库ID查询汛限水位 - * @param resId 水库ID - * @return 汛限水位 - */ - public BigDecimal queryFlLowLimLevByResId(String resId){ - StResB stResB = stResBAutoDao.getById(resId); - if (stResB == null){ - throw new IllegalArgumentException("该水库ID不存在"); - } - return stResB.getFlLowLimLev(); - } - - /** - * 根据水库ID查询总库容 - * @param resId 水库ID - * @return 总库容 - */ - public BigDecimal queryTotCapByResId(String resId){ - StResB stResB = stResBAutoDao.getById(resId); - if (stResB == null){ - throw new IllegalArgumentException("该水库ID不存在"); - } - return stResB.getTotCap(); - } - - /** - * 根据水库ID查询死水位 - * @param resId 水库ID - * @return 死水位 - */ - public BigDecimal queryDeadLevByResId(String resId){ - StResB stResB = stResBAutoDao.getById(resId); - if (stResB == null){ - throw new IllegalArgumentException("该水库ID不存在"); - } - return stResB.getDeadLev(); - } - - /** - * 根据水库ID查询实时水位 - * @param resId 水库ID - * @return 实时水位 - */ - public BigDecimal queryRzByResId(String resId){ - StResB stResB = stResBAutoDao.getById(resId); - if (stResB == null){ - throw new IllegalArgumentException("该水库ID不存在"); - } - return stResStcdRefMapper.queryRzByResId(resId); - } - - /** - * 根据水库ID查询七日内每小时平均水库水位 - * @param resId 水库ID - * @return - */ - public List queryRzSevenDayByResId(String resId){ - StResB stResB = stResBAutoDao.getById(resId); - if (stResB == null){ - throw new IllegalArgumentException("该水库ID不存在"); - } - return stResStcdRefMapper.queryRzSevenDayByResId(resId); - } - - /** - * 根据水库ID查询一个月内每天八点水库水位 - * @param resId 水库ID - * @return - */ - public List queryRzMonthByResId(String resId){ - StResB stResB = stResBAutoDao.getById(resId); - if (stResB == null){ - throw new IllegalArgumentException("该水库ID不存在"); - } - return stResStcdRefMapper.queryRzMonthByResId(resId); - } - - - /** - * 根据水库ID查询半年每天八点水库水位 - * @param resId 水库ID - * @return - */ - public List queryRzHalfYearByResId(String resId){ - StResB stResB = stResBAutoDao.getById(resId); - if (stResB == null){ - throw new IllegalArgumentException("该水库ID不存在"); - } - return stResStcdRefMapper.queryRzHalfYearByResId(resId); - } - -} diff --git a/src/main/java/com/gunshi/project/xyt/service/StAdcdService.java b/src/main/java/com/gunshi/project/xyt/service/StAdcdService.java deleted file mode 100644 index 963cb9e..0000000 --- a/src/main/java/com/gunshi/project/xyt/service/StAdcdService.java +++ /dev/null @@ -1,133 +0,0 @@ -package com.gunshi.project.xyt.service; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.google.common.collect.Lists; -import com.gunshi.db.dao.BaseOrderDao; -import com.gunshi.project.xyt.entity.basedata.GeneralSearch; -import com.gunshi.project.xyt.entity.basedata.StAddvcdTreeVo; -import com.gunshi.project.xyt.mapper.StAddvcdDMapper; -import com.gunshi.project.xyt.model.StAddvcdD; -import com.gunshi.util.common.tree.TreeUtil; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.stereotype.Service; - -import java.util.Date; -import java.util.List; - -/** - * @author Sun Lejun - * @version 1.0 - * @date 2024/1/25 - */ - -@Service -public class StAdcdService extends BaseOrderDao { - //省行政区划 13位0 - private static final String ADDVCD_SH = "0000000000000"; - //市行政区划 11位0 - private static final String ADDVCD_SI = "00000000000"; - //区行政区划 9位0 - private static final String ADDVCD_QU = "000000000"; - //乡行政区划 6位0 - private static final String ADDVCD_XI = "000000"; - //镇行政区划 3位0 - private static final String ADDVCD_ZN = "000"; - - /** - * 根据编码查询区划 - * @param addcd 区划编码 - * @return 区划 - */ - public StAddvcdD queryByAddvcd(String addcd) { - return this.getBaseMapper().selectById(addcd); - } - - public Page queryBySearch(GeneralSearch search) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.like(StAddvcdD.COL_ADDVCD, search.getKeyword()); - queryWrapper.or(); - queryWrapper.like(StAddvcdD.COL_ADDVNM, search.getKeyword()); - queryWrapper.orderByAsc(StAddvcdD.COL_SORT_ON); - return super.page(search.getPageSo().toPage(), queryWrapper); - } - - /** - * 查询行政区划下级（包含本级）树 - * @param addvcd 只匹配前面的位数 比如42就查询42开始的 - * @return 行政区划下级（包含本级）树 - */ - public List queryTree(String addvcd){ - List stAddvcdTreeVos = this.getBaseMapper().queryTree(addvcd); - if(CollectionUtils.isEmpty(stAddvcdTreeVos)){ - return Lists.newArrayList(); - } - stAddvcdTreeVos.forEach(t -> t.setParentCode(getParentAddvcd(t.getAddvcd()))); - String parentKey; - if (addvcd.length() >= 15) { - return stAddvcdTreeVos; - } else { - parentKey = getParentAddvcd(String.format("%1$-15s", addvcd).replace(' ', '0')); - } - - return TreeUtil.list2ListTree( - stAddvcdTreeVos, parentKey, - StAddvcdTreeVo::getAddvcd, StAddvcdTreeVo::getParentCode, StAddvcdTreeVo::setChildren, null); - } - - /** - * 新增行政区划 - * @param stAddvcdD 行政区划信息 - */ - public void insert(StAddvcdD stAddvcdD) { - stAddvcdD.setTm(new Date()); - stAddvcdD.setCreateTm(new Date()); - super.save(stAddvcdD); - resort(stAddvcdD); - } - - /** - * 更新行政区划 - * @param stAddvcdD 行政区划信息 - */ - public void update(StAddvcdD stAddvcdD) { - stAddvcdD.setTm(new Date()); - super.updateById(stAddvcdD); - resort(stAddvcdD); - } - - /** - * 重新排序 - * @param stAddvcdD 区划信息 - */ - private void resort(StAddvcdD stAddvcdD){ - QueryWrapper queryWrapper = new QueryWrapper<>(); - super.updateOrder(queryWrapper, StAddvcdD::getSortOn, StAddvcdD::setSortOn, stAddvcdD, StAddvcdD::getAddvcd, t -> t.setTm(new Date())); - } - - public String getParentAddvcd(String addvcd){ - //省 - if(addvcd.endsWith(ADDVCD_SH)){ - return "/"; - } - //市 - if(addvcd.endsWith(ADDVCD_SI)){ - return addvcd.substring(0,2)+ADDVCD_SH; - } - //区 - if(addvcd.endsWith(ADDVCD_QU)){ - return addvcd.substring(0,4)+ADDVCD_SI; - } - //乡 - if(addvcd.endsWith(ADDVCD_XI)){ - return addvcd.substring(0,6)+ADDVCD_QU; - } - //镇 - if(addvcd.endsWith(ADDVCD_ZN)){ - return addvcd.substring(0,9)+ADDVCD_XI; - } - return addvcd.substring(0,12)+ADDVCD_ZN; - } - - -} diff --git a/src/main/java/com/gunshi/project/xyt/service/StCameraAreaService.java b/src/main/java/com/gunshi/project/xyt/service/StCameraAreaService.java deleted file mode 100644 index 21c9b86..0000000 --- a/src/main/java/com/gunshi/project/xyt/service/StCameraAreaService.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.gunshi.project.xyt.service; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.IdWorker; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.project.xyt.entity.basedata.CheckStringSearch; -import com.gunshi.project.xyt.entity.basedata.GeneralSearch; -import com.gunshi.project.xyt.entity.basedata.StCameraAreaTreeVo; -import com.gunshi.project.xyt.entity.basedata.StCameraAreaVo; -import com.gunshi.project.xyt.entity.basedata.StCameraVo; -import com.gunshi.project.xyt.mapper.StCameraAreaBMapper; -import com.gunshi.project.xyt.mapper.StCameraBMapper; -import com.gunshi.project.xyt.model.StCameraAreaB; -import com.gunshi.util.common.tree.TreeUtil; -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; -import java.util.List; -import java.util.Objects; - -/** - * @author Sun Lejun - * @version 1.0 - * @date 2024/1/24 - */ - -@Service -@Slf4j -@Transactional(rollbackFor = Exception.class) -@Data -public class StCameraAreaService { - private final StCameraAreaBMapper stCameraAreaBMapper; - private final StCameraBMapper stCameraBMapper; - - /** - * 根据视频区域ID查询视频区域 - * @param camArId 视频区域ID - * @return 视频区域 - */ - public StCameraAreaB queryById(Long camArId) { - return stCameraAreaBMapper.selectById(camArId); - } - - public List queryTree() { - List list = stCameraAreaBMapper.queryStCameraAreaBTree(); - List all = stCameraBMapper.getAll(); - list.forEach(t -> { - List cameraList = t.getCameraList(); - all.forEach(a -> { - if (Objects.equals(a.getCamArId(), t.getCamArId())) { - cameraList.add(a); - } - }); - }); - - return TreeUtil.list2ListTree(list, 0L, - StCameraAreaTreeVo::getCamArId, StCameraAreaTreeVo::getPid, - StCameraAreaTreeVo::setChildren, null); - } - - - /** - * 查询视频区域列表 - * @return 视频区域列表 - */ - public Page queryListBySearch(GeneralSearch search) { - Page page = search.getPageSo().toPage(); - return stCameraAreaBMapper.queryStCameraAreaBList(page, search.getKeyword()); - } - - public List queryListByName(String name) { - return stCameraAreaBMapper.queryStCameraAreaBList(name); - } - - /** - * 新增视频区域 - * - * @param stCameraAreaB 视频区域 - */ - public void insert(StCameraAreaB stCameraAreaB) { - checkStCameraAreaB(stCameraAreaB); - - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(StCameraAreaB.COL_PID, stCameraAreaB.getPid()); - queryWrapper.eq(StCameraAreaB.COL_STATUS, 1); - queryWrapper.orderByDesc(StCameraAreaB.COL_SORT_ON); - StCameraAreaB first = stCameraAreaBMapper.selectOne(queryWrapper, false); - if (Objects.isNull(first)) { - stCameraAreaB.setSortOn(1); - } else { - stCameraAreaB.setSortOn(first.getSortOn() + 1); - } - - long id = IdWorker.getId(); - stCameraAreaB.setCamArId(id); - stCameraAreaB.setStatus(1); - stCameraAreaB.setCreateTm(new Date()); - stCameraAreaB.setTm(new Date()); - stCameraAreaBMapper.insert(stCameraAreaB); - } - - /** - * 修改视频区域 - * - * @param stCameraAreaB 视频区域 - */ - public void update(StCameraAreaB stCameraAreaB) { - Long camArId = stCameraAreaB.getCamArId(); - QueryWrapper queryWrapper2 = new QueryWrapper<>(); - queryWrapper2.eq(StCameraAreaB.COL_CAM_AR_ID, camArId); - boolean exists = stCameraAreaBMapper.exists(queryWrapper2); - if (!exists) { - throw new IllegalArgumentException("ID不存在"); - } - - checkStCameraAreaB(stCameraAreaB); - stCameraAreaB.setTm(new Date()); - stCameraAreaBMapper.updateById(stCameraAreaB); - } - - - /** - * 检查参数是否合法 - * @param stCameraAreaB 视频区域 - */ - private void checkStCameraAreaB(StCameraAreaB stCameraAreaB) { - Long pid = stCameraAreaB.getPid(); - if (pid != 0) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(StCameraAreaB.COL_CAM_AR_ID, pid); - queryWrapper.eq(StCameraAreaB.COL_STATUS, 1); - boolean exists = stCameraAreaBMapper.exists(queryWrapper); - if (!exists) { - throw new IllegalArgumentException("父节点不存在"); - } - queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(StCameraAreaB.COL_CAM_AR_NM, stCameraAreaB.getCamArNm()); - queryWrapper.eq(StCameraAreaB.COL_STATUS, 1); - exists = stCameraAreaBMapper.exists(queryWrapper); - if (exists) { - throw new IllegalArgumentException("视频区域名称已存在"); - } - } - } - - /** - * 检查视频区域名称是否存在 - * @param search 检查参数 - */ - public void checkAreaName(CheckStringSearch search){ - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(StCameraAreaB.COL_STATUS, 1); - queryWrapper.eq(StCameraAreaB.COL_CAM_AR_NM, search.getKeyword()); - if(Objects.nonNull(search.getId())){ - queryWrapper.not(t -> t.eq(StCameraAreaB.COL_CAM_AR_ID, search.getId())); - } - boolean exists = stCameraAreaBMapper.exists(queryWrapper); - if(exists){ - throw new IllegalArgumentException("视频区域名称已存在"); - } - } - - -} diff --git a/src/main/java/com/gunshi/project/xyt/service/StCameraService.java b/src/main/java/com/gunshi/project/xyt/service/StCameraService.java deleted file mode 100644 index ca01139..0000000 --- a/src/main/java/com/gunshi/project/xyt/service/StCameraService.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.gunshi.project.xyt.service; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.IdWorker; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.project.xyt.entity.basedata.StCameraSearch; -import com.gunshi.project.xyt.entity.basedata.StCameraVo; -import com.gunshi.project.xyt.mapper.StCameraAreaBMapper; -import com.gunshi.project.xyt.mapper.StCameraBMapper; -import com.gunshi.project.xyt.model.StCameraAreaB; -import com.gunshi.project.xyt.model.StCameraB; -import jakarta.validation.Valid; -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; - -/** - * @author Sun Lejun - * @version 1.0 - * @date 2024/1/25 - */ - -@Service -@Slf4j -@Transactional(rollbackFor = Exception.class) -@Data -public class StCameraService { - private final StCameraBMapper stCameraBMapper; - private final StCameraAreaBMapper stCameraAreaBMapper; - - public StCameraB queryById(Long camId) { - return stCameraBMapper.selectById(camId); - } - - public Page queryBySearch(StCameraSearch stCameraSearch){ - Page page = stCameraSearch.getPageSo().toPage(); - return stCameraBMapper.queryBySearch(page, stCameraSearch); - } - - - - /** - * 新增视频 - * @param stCameraB 视频信息 - */ - public void insert(@Valid StCameraB stCameraB) { - checkUnique(stCameraB); - checkAreaExist(stCameraB); - stCameraB.setCamId(IdWorker.getId()); - stCameraB.setCreateTm(new Date()); - stCameraB.setTm(new Date()); - stCameraBMapper.insert(stCameraB); - } - - /** - * 修改视频 - * @param stCameraB 视频信息 - */ - public void update(@Valid StCameraB stCameraB) { - checkExist(stCameraB); - checkUnique(stCameraB); - checkAreaExist(stCameraB); - stCameraB.setTm(new Date()); - stCameraBMapper.updateById(stCameraB); - } - - /** - * 检查视频参数唯一性 - * @param stCameraB 视频信息 - */ - private void checkUnique(StCameraB stCameraB){ - boolean exists = stCameraBMapper.chechExists(stCameraB); - if (exists){ - throw new IllegalArgumentException("视频名称或序列号已存在"); - } - } - - /** - * 检查视频ID是否存在 - * @param stCameraB 视频信息 - */ - private void checkExist(StCameraB stCameraB){ - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(StCameraB.COL_CAM_ID, stCameraB.getCamId()); - boolean exists = stCameraBMapper.exists(queryWrapper); - if (!exists){ - throw new IllegalArgumentException("视频ID不存在"); - } - } - - /** - * 检查视频区域ID是否存在 - * @param stCameraB 视频信息 - */ - private void checkAreaExist(StCameraB stCameraB){ - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(StCameraAreaB.COL_CAM_AR_ID, stCameraB.getCamArId()); - boolean exists = stCameraAreaBMapper.exists(queryWrapper); - if (!exists){ - throw new IllegalArgumentException("视频区域ID不存在"); - } - } - -} diff --git a/src/main/java/com/gunshi/project/xyt/service/StMoncrService.java b/src/main/java/com/gunshi/project/xyt/service/StMoncrService.java deleted file mode 100644 index f8b4286..0000000 --- a/src/main/java/com/gunshi/project/xyt/service/StMoncrService.java +++ /dev/null @@ -1,113 +0,0 @@ -package com.gunshi.project.xyt.service; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.IdWorker; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.project.xyt.entity.basedata.CheckStringSearch; -import com.gunshi.project.xyt.entity.basedata.GeneralSearch; -import com.gunshi.project.xyt.mapper.StMoncrBMapper; -import com.gunshi.project.xyt.model.StMoncrB; -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; -import java.util.Objects; - -/** - * @author Sun Lejun - * @version 1.0 - * @date 2024/1/26 - */ - -@Service -@Slf4j -@Transactional(rollbackFor = Exception.class) -@Data -public class StMoncrService { - private final StMoncrBMapper stMoncrBMapper; - - - public Page queryBySearch(GeneralSearch search){ - Page page = search.getPageSo().toPage(); - return stMoncrBMapper.queryBySearch(page, search); - } - - /** - * 新增监测断面 - * @param stMoncrB 监测断面对象 - */ - public void insert(StMoncrB stMoncrB) { - CheckStringSearch checkStringSearch = new CheckStringSearch(); - checkStringSearch.setKeyword(stMoncrB.getCrCd()); - checkCode(checkStringSearch); - stMoncrB.setCrId(IdWorker.getId()); - stMoncrB.setSortOn(getMaxSortOn()); - stMoncrB.setTm(new Date()); - stMoncrBMapper.insert(stMoncrB); - } - - /** - * 更新监测断面 - * @param stMoncrB 监测断面对象 - */ - public void update(StMoncrB stMoncrB) { - CheckStringSearch checkStringSearch = new CheckStringSearch(); - checkStringSearch.setKeyword(stMoncrB.getCrCd()); - checkStringSearch.setId(stMoncrB.getCrId()); - checkCode(checkStringSearch); - stMoncrB.setTm(new Date()); - stMoncrBMapper.updateById(stMoncrB); - } - - - /** - * 删除监测断面 - * @param crId 监测断面id - */ - public void delete(Long crId) { - LambdaQueryWrapper query = Wrappers.lambdaQuery(); - query.eq(StMoncrB::getStatus, 1); - query.eq(StMoncrB::getCrId, crId); - - StMoncrB obj = stMoncrBMapper.selectOne(query, false); - if (Objects.isNull(obj)) { - throw new IllegalArgumentException("未找到相关记录"); - } - - obj.setStatus(0); - stMoncrBMapper.updateById(obj); - } - - public int getMaxSortOn(){ - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(StMoncrB.COL_STATUS, 1); - queryWrapper.orderByDesc(StMoncrB.COL_SORT_ON); - StMoncrB stMoncrB = stMoncrBMapper.selectOne(queryWrapper, false); - if(stMoncrB == null){ - return 1; - }else { - return stMoncrB.getSortOn() + 1; - } - } - - /** - * 检查断面编码是否存在 - * @param search 查询对象 - */ - public void checkCode(CheckStringSearch search){ - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(StMoncrB.COL_STATUS, 1); - queryWrapper.eq(StMoncrB.COL_CR_CD, search.getKeyword()); - if(search.getId() != null){ - queryWrapper.ne(StMoncrB.COL_CR_ID, search.getId()); - } - StMoncrB stMoncrB = stMoncrBMapper.selectOne(queryWrapper, false); - if(stMoncrB != null){ - throw new IllegalArgumentException("断面编码已存在"); - } - } -} diff --git a/src/main/java/com/gunshi/project/xyt/service/StResPersonRefService.java b/src/main/java/com/gunshi/project/xyt/service/StResPersonRefService.java deleted file mode 100644 index f0175bd..0000000 --- a/src/main/java/com/gunshi/project/xyt/service/StResPersonRefService.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.gunshi.project.xyt.service; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.gunshi.project.xyt.model.StResPersonRef; -import com.gunshi.project.xyt.model.StResPersonRefAutoDao; -import jakarta.annotation.Resource; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * TODO - * - * @ClassName StResPersonRefService - * @Author Huang Qianxiang - * @Date 2024/2/2 9:28 - */ -@Service -@Slf4j -public class StResPersonRefService { - - @Resource - private StResPersonRefAutoDao stResPersonRefAutoDao; - - /** - * 根据水库ID查询责任人信息 - * @param resId 水库ID - * @return 责任人信息 - */ - public List queryStResPersonRefByResId(String resId){ - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(StResPersonRef.COL_RES_ID,resId); - List resPersonRefList = stResPersonRefAutoDao.list(queryWrapper); - if (resPersonRefList == null){ - throw new IllegalArgumentException("未查到该水库相关责任人信息"); - } - return resPersonRefList; - } - -} diff --git a/src/main/java/com/gunshi/project/xyt/service/StSpgPztbService.java b/src/main/java/com/gunshi/project/xyt/service/StSpgPztbService.java deleted file mode 100644 index 96e5cb8..0000000 --- a/src/main/java/com/gunshi/project/xyt/service/StSpgPztbService.java +++ /dev/null @@ -1,114 +0,0 @@ -package com.gunshi.project.xyt.service; - -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.IdWorker; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.project.xyt.entity.basedata.CheckStringSearch; -import com.gunshi.project.xyt.entity.basedata.GeneralSearch; -import com.gunshi.project.xyt.entity.basedata.StSpgPztbVo; -import com.gunshi.project.xyt.mapper.StSpgPztbMapper; -import com.gunshi.project.xyt.model.StSpgPztb; -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; - -/** - * 渗压设备Service - * @author Sun Lejun - * @version 1.0 - * @date 2024/1/26 - */ - -@Service -@Slf4j -@Transactional(rollbackFor = Exception.class) -@Data -public class StSpgPztbService { - private final StSpgPztbMapper stSpgPztbMapper; - - /** - * 按查询条件查询渗压设备信息表 - * @param search 查询条件 - * @return 渗压设备信息表列表 - */ - public Page queryBySearch(GeneralSearch search) { - Page page = search.getPageSo().toPage(); - return stSpgPztbMapper.queryBySearch(page, search); - } - - /** - * 新增渗压设备信息 - * @param stSpgPztb 渗压设备信息 - */ - public void insert(StSpgPztb stSpgPztb) { - - // 校验编码是否存在 - String deviceId = stSpgPztb.getDeviceId(); - CheckStringSearch checkStringSearch = new CheckStringSearch(); - checkStringSearch.setKeyword(deviceId); - checkCode(checkStringSearch); - String stationCode = stSpgPztb.getStationCode(); - checkStringSearch.setKeyword(stationCode); - checkCode(checkStringSearch); - - // 保存 - stSpgPztb.setId(IdWorker.getId()); - stSpgPztb.setModificationTime(new Date()); - stSpgPztb.setCreationTime(new Date()); - stSpgPztbMapper.insert(stSpgPztb); - } - - /** - * 修改渗压设备信息 - * @param stSpgPztb 渗压设备信息 - */ - public void update(StSpgPztb stSpgPztb) { - // 校验编码是否存在 - Long id = stSpgPztb.getId(); - String deviceId = stSpgPztb.getDeviceId(); - CheckStringSearch checkStringSearch = new CheckStringSearch(); - checkStringSearch.setKeyword(deviceId); - checkStringSearch.setId(id); - checkCode(checkStringSearch); - String stationCode = stSpgPztb.getStationCode(); - checkStringSearch.setKeyword(stationCode); - checkCode(checkStringSearch); - - // 更新 - stSpgPztb.setModificationTime(new Date()); - stSpgPztbMapper.updateById(stSpgPztb); - } - - /** - * 删除渗压设备信息 - * @param id 渗压设备ID - */ - public void delete(String id){ - StSpgPztb stSpgPztb = stSpgPztbMapper.selectById(id); - if (stSpgPztb == null){ - throw new IllegalArgumentException("该渗压设备ID不存在"); - } - if (stSpgPztb.getStatus() == 0){ - throw new IllegalArgumentException("该渗压设备已被禁用"); - } - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq(StSpgPztb.COL_ID,id) - .set(StSpgPztb.COL_STATUS,0); - stSpgPztbMapper.update(updateWrapper); - } - - - /** - * 检查编码是否存在 - * @param checkStringSearch 检查对象 - */ - public void checkCode(CheckStringSearch checkStringSearch) { - boolean b = stSpgPztbMapper.checkCode(checkStringSearch); - if (b) { - throw new IllegalArgumentException("编码已存在"); - } - } -} diff --git a/src/main/java/com/gunshi/project/xyt/service/StSpgSpprmpService.java b/src/main/java/com/gunshi/project/xyt/service/StSpgSpprmpService.java deleted file mode 100644 index b531c56..0000000 --- a/src/main/java/com/gunshi/project/xyt/service/StSpgSpprmpService.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.gunshi.project.xyt.service; - -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.baomidou.mybatisplus.core.toolkit.IdWorker; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.project.xyt.entity.basedata.CheckStringSearch; -import com.gunshi.project.xyt.entity.basedata.GeneralSearch; -import com.gunshi.project.xyt.entity.basedata.StSpgSpprmpVo; -import com.gunshi.project.xyt.mapper.StSpgSpprmpMapper; -import com.gunshi.project.xyt.model.StSpgSpprmp; -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; - -/** - * 渗流设备 - * @author Sun Lejun - * @version 1.0 - * @date 2024/1/26 - */ - -@Service -@Slf4j -@Transactional(rollbackFor = Exception.class) -@Data -public class StSpgSpprmpService { - private final StSpgSpprmpMapper stSpgSpprmpMapper; - - /** - * 按查询条件查询渗流设备信息表 - * @param search 查询条件 - * @return 渗流设备信息表列表 - */ - public Page queryBySearch(GeneralSearch search) { - Page page = search.getPageSo().toPage(); - return stSpgSpprmpMapper.queryBySearch(page, search); - } - - /** - * 新增渗流设备信息 - * @param stSpgSpprmp 渗流设备信息 - */ - public void insert(StSpgSpprmp stSpgSpprmp) { - - // 校验编码是否存在 - String deviceId = stSpgSpprmp.getDeviceId(); - CheckStringSearch checkStringSearch = new CheckStringSearch(); - checkStringSearch.setKeyword(deviceId); - checkCode(checkStringSearch); - String stationCode = stSpgSpprmp.getStationCode(); - checkStringSearch.setKeyword(stationCode); - checkCode(checkStringSearch); - - // 保存 - stSpgSpprmp.setId(IdWorker.getId()); - stSpgSpprmp.setModificationTime(new Date()); - stSpgSpprmp.setCreateTime(new Date()); - stSpgSpprmpMapper.insert(stSpgSpprmp); - } - - /** - * 修改渗流设备信息 - * @param stSpgSpprmp 渗流设备信息 - */ - public void update(StSpgSpprmp stSpgSpprmp) { - // 校验编码是否存在 - Long id = stSpgSpprmp.getId(); - String deviceId = stSpgSpprmp.getDeviceId(); - CheckStringSearch checkStringSearch = new CheckStringSearch(); - checkStringSearch.setKeyword(deviceId); - checkStringSearch.setId(id); - checkCode(checkStringSearch); - String stationCode = stSpgSpprmp.getStationCode(); - checkStringSearch.setKeyword(stationCode); - checkCode(checkStringSearch); - - // 更新 - stSpgSpprmp.setModificationTime(new Date()); - stSpgSpprmpMapper.updateById(stSpgSpprmp); - } - - /** - * 删除渗流设备信息 - * @param id 渗流设备ID - */ - public void delete(String id){ - StSpgSpprmp stSpgSpprmp = stSpgSpprmpMapper.selectById(id); - if (stSpgSpprmp == null){ - throw new IllegalArgumentException("该渗流设备ID不存在"); - } - if (stSpgSpprmp.getStatus() == 0){ - throw new IllegalArgumentException("该渗流设备已被禁用"); - } - - UpdateWrapper updateWrapper = new UpdateWrapper<>(); - updateWrapper.eq(StSpgSpprmp.COL_ID,id) - .set(StSpgSpprmp.COL_STATUS,0); - stSpgSpprmpMapper.update(updateWrapper); - } - - - /** - * 检查编码是否存在 - * @param checkStringSearch 检查对象 - */ - public void checkCode(CheckStringSearch checkStringSearch) { - boolean b = stSpgSpprmpMapper.checkCode(checkStringSearch); - if (b) { - throw new IllegalArgumentException("编码已存在"); - } - } -} diff --git a/src/main/java/com/gunshi/project/xyt/service/StStbprpService.java b/src/main/java/com/gunshi/project/xyt/service/StStbprpService.java deleted file mode 100644 index 2dd4ca1..0000000 --- a/src/main/java/com/gunshi/project/xyt/service/StStbprpService.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.gunshi.project.xyt.service; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.core.result.R; -import com.gunshi.project.xyt.entity.basedata.CheckStringSearch; -import com.gunshi.project.xyt.entity.basedata.StStbprpVo; -import com.gunshi.project.xyt.entity.basedata.StcdSearch; -import com.gunshi.project.xyt.mapper.StStbprpBMapper; -import com.gunshi.project.xyt.model.StStbprpB; -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; -import java.util.List; -import java.util.Objects; - -/** - * @author Sun Lejun - * @version 1.0 - * @date 2024/1/26 - */ - -@Service -@Slf4j -@Transactional(rollbackFor = Exception.class) -@Data -public class StStbprpService { - private final StStbprpBMapper stStbprpBMapper; - - /** - * 根据站点编码查询站点信息 - * @param stcd 站点编码 - * @return 站点信息 - */ - public StStbprpB queryByStcd(String stcd) { - LambdaQueryWrapper query = Wrappers.lambdaQuery(); - - - query.eq(StStbprpB::getStcd,stcd) - - .eq(StStbprpB::getDel,0); - return stStbprpBMapper.selectOne(query); - -// return stStbprpBMapper.selectById(stcd); - } - - /** - * 根据站点编码查询站点信息 - * @param search 查询对象 - * @return 站点列表 - */ - public Page queryBySearch(StcdSearch search){ - Page page = search.getPageSo().toPage(); - return stStbprpBMapper.queryBySearch(page, search); - } - - /** - * 根据站点编码查询站点信息 - * @param search 查询对象 - * @return 站点列表 - */ - public List queryListBySearch(StcdSearch search){ - return stStbprpBMapper.queryBySearch(search); - } - - public R insert(StStbprpB stStbprpB) { - StStbprpB stStbprpBDb = stStbprpBMapper.selectById(stStbprpB.getStcd()); - if (Objects.nonNull(stStbprpBDb)){ - return R.error(200,"站点已存在",false); - } - stStbprpB.setModitime(new Date()); - stStbprpBMapper.insert(stStbprpB); - return R.ok(true); - } - - public R update(StStbprpB stStbprpB) { - StStbprpB stStbprpBDb = stStbprpBMapper.selectById(stStbprpB.getStcd()); - if (Objects.isNull(stStbprpBDb)){ - return R.error(200,"站点不存在",false); - } - stStbprpB.setModitime(new Date()); - stStbprpBMapper.updateById(stStbprpB); - return R.ok(true); - - } - - public R delete(String stcd) { - - StStbprpB stStbprpB = stStbprpBMapper.selectById(stcd); - if (Objects.isNull(stStbprpB)){ - return R.error(200,"站点不存在",false); - } - stStbprpB.setModitime(new Date()); - stStbprpB.setDel("1"); // 逻辑删除该标识 - stStbprpBMapper.updateById(stStbprpB); - return R.ok(true); - } - - public void checkExist(CheckStringSearch search) { - if (stStbprpBMapper.selectById(search.getKeyword()) != null) { - throw new IllegalArgumentException("站点编码已存在"); - } - } -} diff --git a/src/main/java/com/gunshi/project/xyt/service/StStchBService.java b/src/main/java/com/gunshi/project/xyt/service/StStchBService.java deleted file mode 100644 index ed7b815..0000000 --- a/src/main/java/com/gunshi/project/xyt/service/StStchBService.java +++ /dev/null @@ -1,101 +0,0 @@ -package com.gunshi.project.xyt.service; - - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.gunshi.db.dao.BaseOrderDao; -import com.gunshi.project.xyt.mapper.StStchBMapper; -import com.gunshi.project.xyt.model.StStchB; -import com.gunshi.project.xyt.so.StStchBSo; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Objects; - - -/** - * Description: - * Created by XuSan on 2024/1/30. - * - * @author XuSan - * @version 1.0 - */ -@Service -public class StStchBService extends BaseOrderDao { - - - @Transactional - public boolean insert(StStchB bean) { - - bean.setId(null); - - return super.save(bean); - } - - /** - * 根据id更新采集项 - * @param bean 更新对象 - * @return 执行状态 - */ - @Transactional - public boolean update(StStchB bean) { - if (Objects.isNull(this.selectById(bean.getId()))) { - throw new IllegalArgumentException("未找到相关记录"); - } - - return super.updateById(bean); - - } - - /** - * 根据id删除采集项 - * @param id 主键id - * @return 执行状态 - */ - @Transactional - public boolean removeById(Integer id) { - - StStchB obj = this.selectById(id); - - if (Objects.isNull(obj)) { - throw new IllegalArgumentException("未找到相关记录"); - } - - obj.setDel(0); - return update(obj); - } - - - /** - * 根据站点编码查询采集项信息 - * @param so 查询对象 - * @return 采集项列表 - */ - public IPage page(StStchBSo so) { - - LambdaQueryWrapper query = Wrappers.lambdaQuery(); - - String stcd = so.getStcd(); - if (stcd != null) { - query.eq(StStchB::getStcd, stcd); - } - - query.eq(StStchB::getDel, 1); - - return super.page(so.getPageSo().toPage(), query); - } - - /** - * 根据站点编码查询单个采集项信息 - * @param id 查询对象id - * @return 采集项 - */ - private StStchB selectById(Integer id){ - LambdaQueryWrapper query = Wrappers.lambdaQuery(); - query.eq(StStchB::getDel, 1); - query.eq(StStchB::getId, id); - return super.getOne(query); - } - -} diff --git a/src/main/java/com/gunshi/project/xyt/service/SysDictService.java b/src/main/java/com/gunshi/project/xyt/service/SysDictService.java deleted file mode 100644 index c8ab690..0000000 --- a/src/main/java/com/gunshi/project/xyt/service/SysDictService.java +++ /dev/null @@ -1,152 +0,0 @@ -package com.gunshi.project.xyt.service; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.IdWorker; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.google.common.collect.Lists; -import com.gunshi.db.dao.BaseOrderDao; -import com.gunshi.project.xyt.entity.basedata.GeneralSearch; -import com.gunshi.project.xyt.entity.basedata.SysDictVo; -import com.gunshi.project.xyt.mapper.SysDictBMapper; -import com.gunshi.project.xyt.model.SysDictB; -import com.gunshi.util.common.tree.TreeUtil; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Date; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; - -/** - * @author Sun Lejun - * @version 1.0 - * @date 2024/1/25 - */ - -@Service -@Slf4j -@Transactional(rollbackFor = Exception.class) -public class SysDictService extends BaseOrderDao { - - /** - * 根据ID查询字典 - * @param id 字典ID - * @return 字典 - */ - public SysDictB queryById(Long id) { - return this.getBaseMapper().selectById(id); - } - - public List queryByPid(Long pid){ - List sysDictVos; - if(Objects.isNull(pid)){ - sysDictVos = this.getBaseMapper().getAll(); - }else { - sysDictVos = this.getBaseMapper().queryByPidOrIds(Lists.newArrayList(pid)); - } - //转换成tree - return TreeUtil.list2ListTree(sysDictVos, 0L, SysDictVo::getId, SysDictVo::getPid, SysDictVo::setChildren, null); - } - - /** - * 根据名称或者编码查询字典 - * @param search 查询条件 - * @return 字典tree - */ - public Page queryBySearch(GeneralSearch search) { - - //构建分页对象 - Page page = search.getPageSo().toPage(); - //按PID和ID进行分页查询 - Page sysDictVoPage = this.getBaseMapper().queryPidBySearch(page, search); - long total = sysDictVoPage.getTotal(); - long current = sysDictVoPage.getCurrent(); - if(total == 0) { - return new Page<>(current, page.getSize()); - } - //拿出查询出来的PID和ID，获取完整的记录 - List records = sysDictVoPage.getRecords(); - List list = records.stream().map(SysDictB::getId).collect(Collectors.toList()); - List sysDictVos = this.getBaseMapper().queryByPidOrIds(list); - //转换成tree - List tree = TreeUtil.list2ListTree(sysDictVos, 0L, SysDictVo::getId, SysDictVo::getPid, SysDictVo::setChildren, null); - //构建返回对象 - Page result = new Page<>(page.getCurrent(), page.getSize()); - result.setCurrent(current); - result.setTotal(total); - result.setRecords(tree); - return result; - } - - /** - * 新增字典 - * @param sysDictB 字典信息 - */ - public void insert(SysDictB sysDictB) { - checkExistCodeAndName(sysDictB); - sysDictB.setId(IdWorker.getId()); - sysDictB.setStatus(1); - sysDictB.setCreateTm(new Date()); - sysDictB.setTm(new Date()); - this.getBaseMapper().insert(sysDictB); - resort(sysDictB); - } - - /** - * 更新字典 - * @param sysDictB 字典信息 - */ - public void update(SysDictB sysDictB) { - checkExistById(sysDictB); - checkExistCodeAndName(sysDictB); - sysDictB.setTm(new Date()); - - if(sysDictB.getStatus() == 0L){ - sysDictB.setSortOn(999); - } - this.getBaseMapper().updateById(sysDictB); - resort(sysDictB); - } - - /** - * 检查字典编码和名称是否存在 - * @param sysDictB 字典信息 - */ - public void checkExistCodeAndName(SysDictB sysDictB) { - if (sysDictB.getPid() != 0L) { - return; - } - boolean exist = this.getBaseMapper().checkExistCodeAndName(sysDictB); - if (exist) { - throw new IllegalArgumentException("顶层字典编码或名称已存在"); - } - } - - /** - * 检查字典是否存在 - * @param sysDictB 字典信息 - */ - public void checkExistById(SysDictB sysDictB) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq(SysDictB.COL_ID, sysDictB.getId()); - boolean exists = this.exists(queryWrapper); - if (!exists) { - throw new IllegalArgumentException("字典不存在"); - } - } - - /** - * 重新给字典排序 - * @param sysDictB 字典信息 - */ - private void resort(SysDictB sysDictB){ - Long pid = sysDictB.getPid(); - QueryWrapper queryWrapper2 = new QueryWrapper<>(); - queryWrapper2.eq(SysDictB.COL_PID, pid); - super.updateOrder(queryWrapper2, SysDictB::getSortOn, SysDictB::setSortOn, sysDictB, SysDictB::getId, t -> t.setTm(new Date())); - } - - -} diff --git a/src/main/java/com/gunshi/project/xyt/service/WarningInfoService.java b/src/main/java/com/gunshi/project/xyt/service/WarningInfoService.java deleted file mode 100644 index 552393b..0000000 --- a/src/main/java/com/gunshi/project/xyt/service/WarningInfoService.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.gunshi.project.xyt.service; - -import com.gunshi.project.xyt.mapper.StResStcdRefMapper; -import com.gunshi.project.xyt.model.StResB; -import com.gunshi.project.xyt.model.StResBAutoDao; -import jakarta.annotation.Resource; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; - -/** - * TODO - * - * @ClassName WarningInfoService - * @Author Huang Qianxiang - * @Date 2024/2/2 10:00 - */ -@Service -@Slf4j -public class WarningInfoService { - @Resource - private StResBAutoDao stResBAutoDao; - @Resource - private StResStcdRefMapper stResStcdRefMapper; - - - /** - * 判断水库超汛限是否正常 - * @param resId 水库ID - * @return - */ - public Boolean ReservoirExceededLimit(String resId){ - StResB stResB = stResBAutoDao.getById(resId); - if (stResB == null){ - throw new IllegalArgumentException("该水库ID不存在"); - } - //汛限水位 - BigDecimal flLowLimLev = stResB.getFlLowLimLev(); - //实时水位 - BigDecimal rz = stResStcdRefMapper.queryRzByResId(resId); - return flLowLimLev.compareTo(rz) >= 0; - - } -} diff --git a/src/main/java/com/gunshi/project/xyt/service/WaterQualityService.java b/src/main/java/com/gunshi/project/xyt/service/WaterQualityService.java deleted file mode 100644 index d725d6f..0000000 --- a/src/main/java/com/gunshi/project/xyt/service/WaterQualityService.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.gunshi.project.xyt.service; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.project.xyt.model.StWaterQualityR; -import com.gunshi.project.xyt.so.WaterQualityPageSo; -import jakarta.servlet.http.HttpServletResponse; -import org.springframework.web.multipart.MultipartFile; - -import java.io.IOException; -import java.util.List; - -/** - * Description: - * Created by xusan on 2024/1/23 - * - * @author xusan - * @version 1.0 - */ -public interface WaterQualityService { - - Page page(WaterQualityPageSo waterQualityPageSo); - - void export(WaterQualityPageSo waterQualityPageSo, HttpServletResponse response); - - Boolean importExcel(MultipartFile file) throws IOException; - - Boolean add(StWaterQualityR stWaterQualityR); - - Boolean addList(List stWaterQualityRList); - -// String update(StWaterQualityR StWaterQualityR); - -// String delete(String id); -} diff --git a/src/main/java/com/gunshi/project/xyt/service/impl/GateRepairRecordServiceImpl.java b/src/main/java/com/gunshi/project/xyt/service/impl/GateRepairRecordServiceImpl.java deleted file mode 100644 index d37a7d5..0000000 --- a/src/main/java/com/gunshi/project/xyt/service/impl/GateRepairRecordServiceImpl.java +++ /dev/null @@ -1,136 +0,0 @@ -package com.gunshi.project.xyt.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.IdWorker; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.toolkit.Db; -import com.gunshi.db.dao.BaseOrderDao; -import com.gunshi.db.dto.DateTimeRangeSo; -import com.gunshi.project.xyt.entity.dto.StGateRepairRecordDto; -import com.gunshi.project.xyt.entity.vo.GateRepairDetailVo; -import com.gunshi.project.xyt.entity.vo.GateRepairRecordVo; -import com.gunshi.project.xyt.mapper.StGateRepairRecordMapper; -import com.gunshi.project.xyt.model.StGateRepairDetail; -import com.gunshi.project.xyt.model.StGateRepairRecord; -import com.gunshi.project.xyt.service.GateRepairRecordService; -import com.gunshi.project.xyt.so.GateRepairRecordPageSo; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.beans.BeanUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; -import java.util.stream.Collectors; - -/** - * Description: - * Created by wanyan on 2024/1/26 - * - * @author wanyan - * @version 1.0 - */ -@EqualsAndHashCode(callSuper = true) -@Service -@Data -@Transactional(rollbackFor = Exception.class) -@Slf4j -public class GateRepairRecordServiceImpl extends BaseOrderDao implements GateRepairRecordService { - - private final static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - @Autowired - private StGateRepairRecordMapper stGateRepairRecordMapper; - - @Override - public String addRecord(StGateRepairRecordDto stGateRepairRecordDto) { - StGateRepairRecord repairRecord = new StGateRepairRecord(); - BeanUtils.copyProperties(stGateRepairRecordDto, repairRecord); - long id = IdWorker.getId(); - repairRecord.setRecordId(id); - List repairDetails = stGateRepairRecordDto.getRepairDetails(); - Boolean relFlag = insertRecordDetail(id,repairDetails); - Boolean flag = super.save(repairRecord); - if (flag && relFlag) { - return "添加成功"; - } - return "添加失败"; - } - - @Override - public String updateRecord(StGateRepairRecordDto stGateRepairRecordDto) { - Long recordId = stGateRepairRecordDto.getRecordId(); - StGateRepairRecord one = super.getById(recordId); - if (one == null) { - throw new IllegalArgumentException("不存在的检修记录"); - } - BeanUtils.copyProperties(stGateRepairRecordDto, one); - super.updateById(one); - //先删除检修记录详情 - deleteRecordDetail(recordId); - insertRecordDetail(recordId,stGateRepairRecordDto.getRepairDetails()); - return "更新成功"; - } - - @Override - public String deleteRecord(Long recordId) { - StGateRepairRecord one = super.getById(recordId); - if (one == null) { - throw new IllegalArgumentException("不存在的检修记录"); - } - deleteRecordDetail(recordId); - super.removeById(recordId); - return "删除成功"; - } - - @Override - public Page page(GateRepairRecordPageSo gateRepairRecordPageSo) { - DateTimeRangeSo timeSo = gateRepairRecordPageSo.getTimeSo(); - Date start = timeSo.getStart(); - Date end = timeSo.getEnd(); - String startTime = sdf.format(start); - String endTime = sdf.format(end); - return stGateRepairRecordMapper.page(gateRepairRecordPageSo.getPageSo().toPage(),gateRepairRecordPageSo,startTime,endTime); - } - - @Override - public GateRepairDetailVo detail(Long recordId) { - GateRepairDetailVo vo = new GateRepairDetailVo(); - StGateRepairRecord one = super.getById(recordId); - if (one == null) { - throw new IllegalArgumentException("不存在的检修记录"); - } - BeanUtils.copyProperties(one, vo); - vo.setDetails(queryRecordDetail(recordId)); - return vo; - } - - private List queryRecordDetail(Long recordId) { - LambdaQueryWrapper query = Wrappers.lambdaQuery(StGateRepairDetail.class) - .eq(StGateRepairDetail::getRecordId, recordId); - return Db.list(query); - } - - private void deleteRecordDetail(Long recordId) { - LambdaQueryWrapper query = Wrappers.lambdaQuery(StGateRepairDetail.class) - .eq(StGateRepairDetail::getRecordId, recordId); - Db.remove(query); - } - - private Boolean insertRecordDetail(long id,List repairDetails) { - if (CollectionUtils.isNotEmpty(repairDetails)) { - List details = repairDetails.stream().map(detail -> { - detail.setRecordId(id); - return detail; - }).collect(Collectors.toList()); - return Db.saveBatch(details); - } - return true; - } -} diff --git a/src/main/java/com/gunshi/project/xyt/service/impl/GateServiceImpl.java b/src/main/java/com/gunshi/project/xyt/service/impl/GateServiceImpl.java deleted file mode 100644 index 7d6649d..0000000 --- a/src/main/java/com/gunshi/project/xyt/service/impl/GateServiceImpl.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.gunshi.project.xyt.service.impl; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.db.dao.BaseOrderDao; -import com.gunshi.db.dto.DateTimeRangeSo; -import com.gunshi.project.xyt.entity.vo.GateHistoryInfoVo; -import com.gunshi.project.xyt.entity.vo.GateInfoVo; -import com.gunshi.project.xyt.entity.vo.StFlowRVo; -import com.gunshi.project.xyt.mapper.StGateBMapper; -import com.gunshi.project.xyt.model.StGateB; -import com.gunshi.project.xyt.service.GateService; -import com.gunshi.project.xyt.so.GateHistoryPageSo; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.List; - -/** - * Description: - * Created by wanyan on 2024/1/26 - * - * @author wanyan - * @version 1.0 - */ -@EqualsAndHashCode(callSuper = true) -@Service -@Data -@Transactional(rollbackFor = Exception.class) -@Slf4j -public class GateServiceImpl extends BaseOrderDao implements GateService { - - private final static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - @Autowired - private StGateBMapper stGateBMapper; - - @Override - public List queryGateList() { - return stGateBMapper.queryGateList(); - } - - @Override - public Page page(GateHistoryPageSo gateHistoryPageSo) { - - DateTimeRangeSo timeSo = gateHistoryPageSo.getTimeSo(); - Date start = timeSo.getStart(); - Date end = timeSo.getEnd(); - String startTime = sdf.format(start); - String endTime = sdf.format(end); - - return stGateBMapper.gateHistory(gateHistoryPageSo.getPageSo().toPage(),gateHistoryPageSo.getGateId(),startTime,endTime); - } - - @Override - public List queryFlowList() { - return stGateBMapper.queryFlowList(); - } -} diff --git a/src/main/java/com/gunshi/project/xyt/service/impl/WaterQualityServiceImpl.java b/src/main/java/com/gunshi/project/xyt/service/impl/WaterQualityServiceImpl.java deleted file mode 100644 index af7c931..0000000 --- a/src/main/java/com/gunshi/project/xyt/service/impl/WaterQualityServiceImpl.java +++ /dev/null @@ -1,197 +0,0 @@ -package com.gunshi.project.xyt.service.impl; - -import com.alibaba.excel.EasyExcel; -import com.alibaba.excel.read.listener.PageReadListener; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.core.dateformat.DateFormatString; -import com.gunshi.db.dao.BaseOrderDao; -import com.gunshi.db.dto.DateTimeRangeSo; -import com.gunshi.project.xyt.mapper.WaterQualityMapper; -import com.gunshi.project.xyt.model.StWaterQualityR; -import com.gunshi.project.xyt.service.WaterQualityService; -import com.gunshi.project.xyt.so.WaterQualityPageSo; -import jakarta.servlet.http.HttpServletResponse; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.time.DateFormatUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.multipart.MultipartFile; - -import java.io.IOException; -import java.io.OutputStream; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.List; - -/** - * Description: - * Created by xusan on 2023/1/23. - * - * @author xusan - * @version 1.0 - */ -@EqualsAndHashCode(callSuper = true) -@Service -@Data -@Transactional(rollbackFor = Exception.class) -@Slf4j -public class WaterQualityServiceImpl extends BaseOrderDao implements WaterQualityService { - - /** - * 水质列表分页查询 - * - * @param pageQueryCriteria 查询参数 - */ - @Override - public Page page(WaterQualityPageSo pageQueryCriteria) { - - LambdaQueryWrapper query = Wrappers.lambdaQuery(); - - DateTimeRangeSo timeSo = pageQueryCriteria.getTimeSo(); - - if (timeSo != null) { - if (timeSo.getStart() != null) { - query.ge(StWaterQualityR::getSpt, timeSo.getStart()); - } - if (timeSo.getEnd() != null) { - query.le(StWaterQualityR::getSpt, timeSo.getEnd()); - } - } - - - return super.page(pageQueryCriteria.getPageSo().toPage(), query); - - } - - /** - * 水质列表分页导出 - * - * @param so 水质列表分页 - */ - @Override - public void export(WaterQualityPageSo so , HttpServletResponse response) { - - // 获取基础数据 - Page page = page(so); - - // 生成文件名 - String fileName = "水质统计表 " - + DateFormatUtils.format(so.getTimeSo().getStart(), DateFormatString.YYYY_MM_DD_HH_MM_SS) - + "至" - + DateFormatUtils.format(so.getTimeSo().getStart(), DateFormatString.YYYY_MM_DD_HH_MM_SS) - + ".xlsx"; - -// String tempPath = System.getProperty("java.io.tmpdir") + IdUtil.fastSimpleUUID() + ".xlsx"; -// String tempPath = System.getProperty("java.io.tmpdir") + fileName + ".xlsx"; -// File file = new File(tempPath); -// -// // 指定模板文件 -// ExcelWriter excelWriter = EasyExcel.write(file, StWaterQualityR.class).build(); -// -// WriteSheet writeSheet = EasyExcel.writerSheet(1, "水质").build(); -// // 分页去数据库查询数据 这里可以去数据库查询每一页的数据 -// List data = page.getRecords(); -// excelWriter.write(data, writeSheet); -// -// // 千万别忘记finish 会帮忙关闭流 -// excelWriter.finish(); - - - - response.setContentType("application/vnd.ms-excel"); - response.setCharacterEncoding("utf-8"); - - // 这里URLEncoder.encode可以防止中文乱码 - response.setHeader("content-disposition", "attachment;filename=" + URLEncoder.encode(fileName, StandardCharsets.UTF_8)); - - // 数据输出 - try (OutputStream outputStream = response.getOutputStream()){ - EasyExcel.write(outputStream, StWaterQualityR.class).sheet("水质").doWrite(page.getRecords()); - } catch (IOException e) { - log.error("水质文件下载失败, " + e.getMessage(),e); - throw new RuntimeException(e); - } - - } - - @Override - public Boolean importExcel(MultipartFile file) throws IOException { - - // 创建一个用于存储数据的List - List data = new ArrayList<>(); - - EasyExcel.read(file.getInputStream(), StWaterQualityR.class, new PageReadListener(data::addAll)).sheet().doRead(); - - return this.addList(data); - - } - - - /** - * 新增水质 - * - * @param o 水质 - */ - @Override - public Boolean add(StWaterQualityR o) { - // 排除id - o.setId(null); - - // 判断 站码和时间是否重复 - final LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); - - queryWrapper.eq(StWaterQualityR::getStcd,o.getStcd()) - .eq(StWaterQualityR::getSpt,o.getSpt()); - - if (this.count(queryWrapper) > 0) { - - log.info("站码和采样时间重复 {}", String.format("%s", o)); - - throw new IllegalArgumentException("站码和采样时间必须唯一"); - - } - - return this.save(o); - - } - - @Override - public Boolean addList(List stWaterQualityRList) { - try { - for (StWaterQualityR o : stWaterQualityRList) { - this.add(o); - } - }catch (Exception e) { - return false; - } - return true; - -// return this.saveBatch(stWaterQualityRList) ? "成功":"失败"; - - } - -// /** -// * 修改水质 -// * -// * @param o 水质 -// */ -// @Override -// public String update(StWaterQualityR o) { -// return this.updateById(o) ? "成功":"失败"; -// } -// -// /** -// * 删除水质 -// * -// * @param id id -// */ -// @Override -// public String delete(String id) { -// return this.removeById(id) ? "成功":"失败"; -// } -} diff --git a/src/main/java/com/gunshi/project/xyt/so/BzProtocolInfoSo.java b/src/main/java/com/gunshi/project/xyt/so/BzProtocolInfoSo.java deleted file mode 100644 index a2f017d..0000000 --- a/src/main/java/com/gunshi/project/xyt/so/BzProtocolInfoSo.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.gunshi.project.xyt.so; - -import com.gunshi.db.dto.PageSo; -import com.gunshi.project.xyt.validate.markers.Query; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -/** - * 协议信息查询参数 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-23 - */ -@Data -@Schema(description = "协议信息查询参数") -public class BzProtocolInfoSo { - - @NotNull(message = "分页参数不能为空") - private PageSo pageSo; - - @Schema(description = "协议编码") - @NotEmpty(groups = {Query.class}) - private String id; - - @Schema(description = "协议名称") - private String name; - - @Schema(description = "IP地址") - private String ip; - - @Schema(description = "监听端口") - private Integer port; - - @Schema(description = "协议标准") - private String std; - - @Schema(description = "传输协议，TCP或UDP") - private String trans; - - @Schema(description = "是否启用， 1启用，0不启用，默认1") - private Integer enable; - -} diff --git a/src/main/java/com/gunshi/project/xyt/so/BzServiceResourceSo.java b/src/main/java/com/gunshi/project/xyt/so/BzServiceResourceSo.java deleted file mode 100644 index cd1b296..0000000 --- a/src/main/java/com/gunshi/project/xyt/so/BzServiceResourceSo.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.gunshi.project.xyt.so; - -import com.gunshi.db.dto.DateTimeRangeSo; -import com.gunshi.db.dto.PageSo; -import com.gunshi.project.xyt.validate.markers.QueryPage; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -/** - * 服务资源查询参数 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-24 - */ -@Data -@Schema(description = "服务资源查询参数") -public class BzServiceResourceSo { - - @NotNull(message = "分页参数不能为空", groups = {QueryPage.class}) - private PageSo pageSo; - - // @NotNull(message = "时间范围不能为空", groups = {QueryTimeRange.class}) - private DateTimeRangeSo dateTimeRangeSo; - - @Schema(description = "服务名称") - private String name; -} diff --git a/src/main/java/com/gunshi/project/xyt/so/BzServiceResourceTypeSo.java b/src/main/java/com/gunshi/project/xyt/so/BzServiceResourceTypeSo.java deleted file mode 100644 index a7552ce..0000000 --- a/src/main/java/com/gunshi/project/xyt/so/BzServiceResourceTypeSo.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.gunshi.project.xyt.so; - -import com.gunshi.db.dto.PageSo; -import com.gunshi.project.xyt.validate.markers.QueryPage; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -/** - * 服务资源查询参数 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-24 - */ -@Data -@Schema(description = "服务资源查询参数") -public class BzServiceResourceTypeSo { - - @NotNull(message = "分页参数不能为空", groups = {QueryPage.class}) - private PageSo pageSo; - - @Schema(description = "服务名称") - private String name; - - @Schema(description = "服务类型") - private String type; -} diff --git a/src/main/java/com/gunshi/project/xyt/so/GateHistoryPageSo.java b/src/main/java/com/gunshi/project/xyt/so/GateHistoryPageSo.java deleted file mode 100644 index e97951c..0000000 --- a/src/main/java/com/gunshi/project/xyt/so/GateHistoryPageSo.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.gunshi.project.xyt.so; - -import com.gunshi.db.dto.DateTimeRangeSo; -import com.gunshi.db.dto.PageSo; -import com.gunshi.project.xyt.validate.markers.QueryPage; -import com.gunshi.project.xyt.validate.markers.QueryTimeRange; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -/** - * 闸阀开关历史查询参数 - * Created by wanyan on 2024/1/26 - * - * @author wanyan - * @version 1.0 - */ -@Data -public class GateHistoryPageSo { - - @Schema(description = "闸阀ID") - @NotNull(message = "闸阀ID不能为空") - private Long gateId; - - @Schema(description = "分页参数") - @NotNull(message = "分页参数不能为空", groups = {QueryPage.class}) - private PageSo pageSo; - - @Schema(description = "时间范围") - @NotNull(message = "时间范围不能为空", groups = {QueryTimeRange.class}) - private DateTimeRangeSo timeSo; -} diff --git a/src/main/java/com/gunshi/project/xyt/so/GateRepairRecordPageSo.java b/src/main/java/com/gunshi/project/xyt/so/GateRepairRecordPageSo.java deleted file mode 100644 index 53d2a86..0000000 --- a/src/main/java/com/gunshi/project/xyt/so/GateRepairRecordPageSo.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.gunshi.project.xyt.so; - -import com.gunshi.db.dto.DateTimeRangeSo; -import com.gunshi.db.dto.PageSo; -import com.gunshi.project.xyt.validate.markers.QueryPage; -import com.gunshi.project.xyt.validate.markers.QueryTimeRange; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -/** - * 闸阀开关历史查询参数 - * Created by wanyan on 2024/1/26 - * - * @author wanyan - * @version 1.0 - */ -@Data -public class GateRepairRecordPageSo { - - @Schema(description = "分页参数") - @NotNull(message = "分页参数不能为空", groups = {QueryPage.class}) - private PageSo pageSo; - - @Schema(description = "闸阀名称") - private String gateNm; - - @Schema(description = "时间范围") - @NotNull(message = "时间范围不能为空", groups = {QueryTimeRange.class}) - private DateTimeRangeSo timeSo; - - @Schema(description="维修类型，0维修1养护") - private Integer repairType; -} diff --git a/src/main/java/com/gunshi/project/xyt/so/RcvLogUpRSo.java b/src/main/java/com/gunshi/project/xyt/so/RcvLogUpRSo.java deleted file mode 100644 index 246f88e..0000000 --- a/src/main/java/com/gunshi/project/xyt/so/RcvLogUpRSo.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.gunshi.project.xyt.so; - -import com.gunshi.db.dto.DateTimeRangeSo; -import com.gunshi.db.dto.PageSo; -import lombok.Data; - -import java.util.Date; - -/** - * 报文日志查询参数 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-30 - */ -@Data -public class RcvLogUpRSo { - private PageSo pageSo; - private DateTimeRangeSo dateTimeRangeSo; - private String protocolId; - private String stcd; - private String stnm; -} diff --git a/src/main/java/com/gunshi/project/xyt/so/RtuDataSo.java b/src/main/java/com/gunshi/project/xyt/so/RtuDataSo.java deleted file mode 100644 index e0c61b4..0000000 --- a/src/main/java/com/gunshi/project/xyt/so/RtuDataSo.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.gunshi.project.xyt.so; - -import com.gunshi.db.dto.DateTimeRangeSo; -import com.gunshi.db.dto.PageSo; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -/** - * rtu相关监测数据查询参数 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-26 - */ -@Data -@Schema(description = "rtu相关监测数据查询参数") -public class RtuDataSo { - - @Schema(description = "分页参数") - @NotNull(message = "分页参数不能为空") - private PageSo pageSo; - - @Schema(description = "时间范围") - @NotNull(message = "时间范围不能为空") - private DateTimeRangeSo dateTimeRangeSo; - - @Schema(description = "测站编码") - private String stcd; - - @Schema(description = "测站名称") - private String stnm; -} diff --git a/src/main/java/com/gunshi/project/xyt/so/StDamPageSo.java b/src/main/java/com/gunshi/project/xyt/so/StDamPageSo.java deleted file mode 100644 index 61372f3..0000000 --- a/src/main/java/com/gunshi/project/xyt/so/StDamPageSo.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.gunshi.project.xyt.so; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.gunshi.db.dto.PageSo; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -/** - * TODO - * - * @ClassName StDamPageSo - * @Author Huang Qianxiang - * @Date 2024/1/26 16:18 - */ - -@Data -@Schema(description = "大坝基本信息查询参数") -public class StDamPageSo { - - @NotNull(message = "分页参数不能为空") - private PageSo pageSo; - - @Schema(description="大坝ID") - private String damId; - - @Schema(description="大坝代码") - private String damCode; - - @Schema(description="大坝名称") - private String damName; - - @Schema(description="状态 1：启用 0：禁用") - private Integer status; -} diff --git a/src/main/java/com/gunshi/project/xyt/so/StEqptPageSo.java b/src/main/java/com/gunshi/project/xyt/so/StEqptPageSo.java deleted file mode 100644 index d5788b5..0000000 --- a/src/main/java/com/gunshi/project/xyt/so/StEqptPageSo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gunshi.project.xyt.so; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.gunshi.db.dto.PageSo; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -/** - * TODO - * - * @ClassName StEqptPageSo - * @Author Huang Qianxiang - * @Date 2024/1/26 16:28 - */ -@Data -@Schema(description = "量水堰基本信息查询参数") -public class StEqptPageSo { - - @NotNull(message = "分页参数不能为空") - private PageSo pageSo; - - @Schema(description="量水设施ID") - private String wmeqId; - - @Schema(description="量水设施代码") - private String wmeqCode; - - @Schema(description="量水设施名称") - private String wmeqName; - - @Schema(description="状态 1:启用 0:禁用") - private Integer status; - -} diff --git a/src/main/java/com/gunshi/project/xyt/so/StGatePageSo.java b/src/main/java/com/gunshi/project/xyt/so/StGatePageSo.java deleted file mode 100644 index aa09168..0000000 --- a/src/main/java/com/gunshi/project/xyt/so/StGatePageSo.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.gunshi.project.xyt.so; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.gunshi.db.dto.PageSo; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -/** - * TODO - * - * @ClassName StGatePageSo - * @Author Huang Qianxiang - * @Date 2024/1/26 17:06 - */ -@Data -@Schema(description = "闸阀基本信息查询参数") -public class StGatePageSo { - - @NotNull(message = "分页参数不能为空") - private PageSo pageSo; - - @Schema(description="闸阀ID") - private String gateId; - - @Schema(description="闸阀编码") - private String gateCd; - - @Schema(description="闸阀名称") - private String gateNm; - - @Schema(description="状态 1：启用 0：禁用") - private Integer status; - -} diff --git a/src/main/java/com/gunshi/project/xyt/so/StRcvRealSo.java b/src/main/java/com/gunshi/project/xyt/so/StRcvRealSo.java deleted file mode 100644 index 5d77177..0000000 --- a/src/main/java/com/gunshi/project/xyt/so/StRcvRealSo.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.gunshi.project.xyt.so; - -import com.gunshi.db.dto.PageSo; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -/** - * 监测类数据实时表查询对象 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-29 - */ -@Data -@Schema(description = "监测类数据实时表查询对象") -public class StRcvRealSo { - @Schema(description = "分页参数") - @NotNull - private PageSo pageSo; - - @Schema(description = "测站编码") - private String stcd; - - @Schema(description = "测站名称") - private String stnm; - - @Schema(description = "测站类别") - private String sttp; - - @Schema(description = "协议ID") - private String protocolId; -} diff --git a/src/main/java/com/gunshi/project/xyt/so/StResFileRefSo.java b/src/main/java/com/gunshi/project/xyt/so/StResFileRefSo.java deleted file mode 100644 index 39577ce..0000000 --- a/src/main/java/com/gunshi/project/xyt/so/StResFileRefSo.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.gunshi.project.xyt.so; - -import com.gunshi.db.dto.PageSo; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -/** - * TODO - * - * @ClassName StResFileRefSo - * @Author Huang Qianxiang - * @Date 2024/1/29 11:57 - */ -@Data -@Schema(description = "水库附件关系信息查询参数") -public class StResFileRefSo { - - @NotNull(message = "分页参数不能为空") - private PageSo pageSo; - -} diff --git a/src/main/java/com/gunshi/project/xyt/so/StResPageSo.java b/src/main/java/com/gunshi/project/xyt/so/StResPageSo.java deleted file mode 100644 index fca0348..0000000 --- a/src/main/java/com/gunshi/project/xyt/so/StResPageSo.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gunshi.project.xyt.so; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.gunshi.db.dto.PageSo; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -/** - * TODO - * - * @ClassName StResPageSo - * @Author Huang Qianxiang - * @Date 2024/1/26 15:38 - */ -@Data -@Schema(description = "水库基本信息查询参数") -public class StResPageSo { - - @NotNull(message = "分页参数不能为空") - private PageSo pageSo; - - @Schema(description="水库id") - private String resId; - - @Schema(description="水库代码") - private String resCode; - - @Schema(description="水库名称") - private String resName; - - @Schema(description="水库规模 dict_id") - private String engScal; - - @Schema(description=" 状态 1：启用 0：禁用") - private Integer status; - -} diff --git a/src/main/java/com/gunshi/project/xyt/so/StResPersonRefSo.java b/src/main/java/com/gunshi/project/xyt/so/StResPersonRefSo.java deleted file mode 100644 index 09ffa24..0000000 --- a/src/main/java/com/gunshi/project/xyt/so/StResPersonRefSo.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.gunshi.project.xyt.so; - -import com.gunshi.db.dto.PageSo; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -/** - * TODO - * - * @ClassName StResPersonRefSo - * @Author Huang Qianxiang - * @Date 2024/1/29 11:39 - */ -@Data -@Schema(description = "水库责任人关系信息查询参数") -public class StResPersonRefSo { - - @NotNull(message = "分页参数不能为空") - private PageSo pageSo; - -} diff --git a/src/main/java/com/gunshi/project/xyt/so/StRvPageSo.java b/src/main/java/com/gunshi/project/xyt/so/StRvPageSo.java deleted file mode 100644 index fc5f1b8..0000000 --- a/src/main/java/com/gunshi/project/xyt/so/StRvPageSo.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gunshi.project.xyt.so; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; -import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; -import com.gunshi.db.dto.PageSo; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -/** - * TODO - * - * @ClassName StRvPageSo - * @Author Huang Qianxiang - * @Date 2024/1/26 16:03 - */ - -@Data -@Schema(description = "河流基本信息查询参数") -public class StRvPageSo { - - @NotNull(message = "分页参数不能为空") - private PageSo pageSo; - - @Schema(description="河流ID") - private String rvId; - - @Schema(description="河流代码") - private String rvCode; - - @Schema(description="河流名称") - private String rvName; - - @TableField(value = "[STATUS]") - @Schema(description="状态 1：启用 0：禁用") - private Integer status; - - -} diff --git a/src/main/java/com/gunshi/project/xyt/so/StStchBSo.java b/src/main/java/com/gunshi/project/xyt/so/StStchBSo.java deleted file mode 100644 index c9e46ad..0000000 --- a/src/main/java/com/gunshi/project/xyt/so/StStchBSo.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.gunshi.project.xyt.so; - -import com.gunshi.db.dto.PageSo; -import com.gunshi.project.xyt.validate.markers.Query; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -/** - * Description: 测站采集项查询参数 - * Created by XuSan on 2024/1/30. - * - * @author XuSan - * @version 1.0 - */ -@Data -@Schema(description = "测站采集项查询参数") -public class StStchBSo { - - - @NotNull(message = "分页参数不能为空") - private PageSo pageSo; - - @Schema(description = "站点编码") - @NotEmpty(groups = {Query.class}) - private String stcd; -} diff --git a/src/main/java/com/gunshi/project/xyt/so/StZvarlSo.java b/src/main/java/com/gunshi/project/xyt/so/StZvarlSo.java deleted file mode 100644 index d7edf75..0000000 --- a/src/main/java/com/gunshi/project/xyt/so/StZvarlSo.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.gunshi.project.xyt.so; - -import com.gunshi.db.dto.PageSo; -import com.gunshi.project.xyt.model.StZvarlB; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * TODO - * - * @ClassName StZvarlDto - * @Author Huang Qianxiang - * @Date 2024/1/29 10:39 - */ - -@Data -@Schema(description = "库容曲线信息查询参数") -public class StZvarlSo{ - - @NotNull(message = "分页参数不能为空") - private PageSo pageSo; - -} diff --git a/src/main/java/com/gunshi/project/xyt/so/WaterQualityPageSo.java b/src/main/java/com/gunshi/project/xyt/so/WaterQualityPageSo.java deleted file mode 100644 index 9da03d1..0000000 --- a/src/main/java/com/gunshi/project/xyt/so/WaterQualityPageSo.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.gunshi.project.xyt.so; - -import com.gunshi.db.dto.DateTimeRangeSo; -import com.gunshi.db.dto.PageSo; -import com.gunshi.project.xyt.validate.markers.QueryPage; -import com.gunshi.project.xyt.validate.markers.QueryTimeRange; -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import lombok.Data; - -/** - * Description: - * Created by XuSan on 2024/1/23. - * - * @author XuSan - * @version 1.0 - */ -@Data -public class WaterQualityPageSo { - - @Schema(description = "分页参数") - @NotNull(message = "分页参数不能为空", groups = {QueryPage.class}) - private PageSo pageSo; - - @Schema(description = "时间范围") - @NotNull(message = "时间范围不能为空", groups = {QueryTimeRange.class}) - private DateTimeRangeSo timeSo; -} diff --git a/src/main/java/com/gunshi/project/xyt/vo/BzProtocolInfoChart1Vo.java b/src/main/java/com/gunshi/project/xyt/vo/BzProtocolInfoChart1Vo.java deleted file mode 100644 index 693d44f..0000000 --- a/src/main/java/com/gunshi/project/xyt/vo/BzProtocolInfoChart1Vo.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.gunshi.project.xyt.vo; - -import lombok.Data; - -/** - * 类描述 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-30 - */ -@Data -public class BzProtocolInfoChart1Vo { - private String protocolId; - private String protocolName; - private String stcd; - private String stnm; -} diff --git a/src/main/java/com/gunshi/project/xyt/vo/BzServiceResourceMonitorVo.java b/src/main/java/com/gunshi/project/xyt/vo/BzServiceResourceMonitorVo.java deleted file mode 100644 index 93944cd..0000000 --- a/src/main/java/com/gunshi/project/xyt/vo/BzServiceResourceMonitorVo.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.gunshi.project.xyt.vo; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.gunshi.core.dateformat.DateFormatString; -import io.swagger.v3.oas.annotations.media.Schema; - -import java.util.Date; - -/** - * 类描述 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-24 - */ -public class BzServiceResourceMonitorVo { - //region BzServiceResourceMonitorR - @Schema(description = "id") - @TableId("ID") - private Long id; - - @Schema(description = "服务资源id") - @TableField("SR_ID") - private String srId; - - @Schema(description = "最近数据时间") - @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") - @TableField("LAST_CHANGE_TM") - private Date lastChangeTm; - - @Schema(description = "共享数据(条)") - @TableField("RECORD_COUNT") - private Long recordCount; - - @Schema(description = "共享站点数量") - @TableField("ST_COUNT") - private Integer stCount; - - @Schema(description = "今日共享数据(条)") - @TableField("TODAY_COUNT") - private Long todayCount; - - @Schema(description = "本周共享数据(条)") - @TableField("WEEKLY_COUNT") - private Long weeklyCount; - - @Schema(description = "本月共享数据(条)") - @TableField("MONTHLY_COUNT") - private Long monthlyCount; - - @Schema(description = "本年共享数据(条)") - @TableField("YEARLY_COUNT") - private Long yearlyCount; - //endregion - - //region BzServiceResource - @Schema(description = "服务名称") - @TableField("NAME") - private String name; - //endregion -} diff --git a/src/main/java/com/gunshi/project/xyt/vo/RcvLogUpRVo.java b/src/main/java/com/gunshi/project/xyt/vo/RcvLogUpRVo.java deleted file mode 100644 index 92c13de..0000000 --- a/src/main/java/com/gunshi/project/xyt/vo/RcvLogUpRVo.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.gunshi.project.xyt.vo; - -import com.baomidou.mybatisplus.annotation.TableField; -import com.gunshi.project.xyt.model.RcvLogUpR; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * 类描述 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-30 - */ -@EqualsAndHashCode(callSuper = true) -@Data -public class RcvLogUpRVo extends RcvLogUpR { - @TableField("protocolName") - @Schema(description = "协议名称") - private String protocolName; - - @TableField("stnm") - @Schema(description = "测站名称") - private String stnm; -} diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml new file mode 100644 index 0000000..5c41aba --- /dev/null +++ b/src/main/resources/application-dev.yml @@ -0,0 +1,5 @@ +spring: + config: + import: + - config-common.yml + - config-dev.yml \ No newline at end of file diff --git a/src/main/resources/application-gs.yml b/src/main/resources/application-gs.yml new file mode 100644 index 0000000..ec3a139 --- /dev/null +++ b/src/main/resources/application-gs.yml @@ -0,0 +1,5 @@ +spring: + config: + import: + - config-common.yml + - config-gs.yml \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index d3525eb..5c41aba 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,65 +1,5 @@ -server: - port: 24101 - servlet: - context-path: /gunshiApp/xyt - spring: - datasource: - dynamic: - datasource: - master: - url: jdbc:sqlserver://10.0.41.115:1433;DatabaseName=xyt;trustServerCertificate=true - username: sa - password: Gunshi@2024 - driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - access-logging: - url: jdbc:sqlserver://10.0.41.115:1433;DatabaseName=xyt;trustServerCertificate=true - username: sa - password: Gunshi@2024 - driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - - data: - redis: - host: 10.0.41.112 - port: 6379 - password: 1234567a - database: 1 - -gunshi: - core: - appName: project-xyt - appCode: project-xyt - file: - key: test.by_lyf.tmp - secret: xPXPAb63FphkGkPU0ZZkNIXmDzjDVeF3PBH6ZEKw - endpoint: http://223.75.53.141:9102 - publicBucket: test.by-lyf.tmp - loginBucket: test.by-lyf.tmp - privateBucket: test.by-lyf.tmp - access: - logging: - enabled: true - login: - enabled: true - maxHistory: 200 - operation: - enabled: true - maxHistory: 200 - collection: operationLogging - exception: - enabled: true - maxHistory: 200 - collection: exceptionLogging - mongo: - enabled: true - uri: mongodb://10.0.41.112:27017 - database: gunshi-logging - username: gunshi_logger - password: 1234567a - -mybatis-plus: - configuration: - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - global-config: - db-config: - update-strategy: always \ No newline at end of file + config: + import: + - config-common.yml + - config-dev.yml \ No newline at end of file diff --git a/src/main/resources/config-common.yml b/src/main/resources/config-common.yml new file mode 100644 index 0000000..5daea55 --- /dev/null +++ b/src/main/resources/config-common.yml @@ -0,0 +1,27 @@ +server: + port: 24105 + servlet: + context-path: /api + +mybatis-plus: + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl + global-config: + db-config: + update-strategy: always + +spring: + servlet: + multipart: + max-file-size: 100MB + max-request-size: 100MB +gunshi: + core: + appName: project-xf-flood + file: + key: test.by_lyf.tmp + secret: xPXPAb63FphkGkPU0ZZkNIXmDzjDVeF3PBH6ZEKw + endpoint: http://223.75.53.141:9102 + publicBucket: test.by-lyf.tmp + loginBucket: test.by-lyf.tmp + privateBucket: test.by-lyf.tmp diff --git a/src/main/resources/config-dev.yml b/src/main/resources/config-dev.yml new file mode 100644 index 0000000..1317cc9 --- /dev/null +++ b/src/main/resources/config-dev.yml @@ -0,0 +1,17 @@ +spring: + profiles: + active: dev + datasource: + url: jdbc:postgresql://10.0.41.112:5432/xiaoyutan + username: gunshiiot + password: 1234567a + driver-class-name: org.postgresql.Driver + data: + redis: + host: 36.133.116.124 + port: 6379 + password: 1234567a + database: 4 +mybatis-plus: + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl \ No newline at end of file diff --git a/src/main/resources/config-gs.yml b/src/main/resources/config-gs.yml new file mode 100644 index 0000000..4590f11 --- /dev/null +++ b/src/main/resources/config-gs.yml @@ -0,0 +1,12 @@ +spring: + profiles: + active: gs + datasource: + url: jdbc:postgresql://10.0.41.112:5432/xintankou + username: gunshiiot + password: 1234567a + driver-class-name: org.postgresql.Driver + +mybatis-plus: + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl \ No newline at end of file diff --git a/src/main/resources/config-prod.yml b/src/main/resources/config-prod.yml new file mode 100644 index 0000000..a0b3eb7 --- /dev/null +++ b/src/main/resources/config-prod.yml @@ -0,0 +1,12 @@ +spring: + profiles: + active: prod + datasource: + url: jdbc:postgresql://127.0.0.1:15432/postgres + username: postgres + password: QWEasd123 + driver-class-name: org.postgresql.Driver + +mybatis-plus: + configuration: + log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl \ No newline at end of file diff --git a/src/main/resources/mapper/StAddvcdDMapper.xml b/src/main/resources/mapper/StAddvcdDMapper.xml deleted file mode 100644 index 564b415..0000000 --- a/src/main/resources/mapper/StAddvcdDMapper.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - ADDVCD, ADDVNM, LGTD, LTTD, CREATE_TM, TM, SORT_ON - - - - insert into dbo.ST_ADDVCD_D - (ADDVCD, ADDVNM, LGTD, LTTD, CREATE_TM, TM, SORT_ON) - values - - (#{item.addvcd,jdbcType=VARCHAR}, #{item.addvnm,jdbcType=VARCHAR}, #{item.lgtd,jdbcType=DECIMAL}, - #{item.lttd,jdbcType=DECIMAL}, #{item.createTm,jdbcType=TIMESTAMP}, #{item.tm,jdbcType=TIMESTAMP}, - #{item.sortOn,jdbcType=INTEGER}) - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/StCameraAreaBMapper.xml b/src/main/resources/mapper/StCameraAreaBMapper.xml deleted file mode 100644 index 4041718..0000000 --- a/src/main/resources/mapper/StCameraAreaBMapper.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - CAM_AR_ID, CAM_AR_NM, PID, SORT_ON, [STATUS], COMMENTS, CREATE_TM, TM - - - - insert into dbo.ST_CAMERA_AREA_B - (CAM_AR_ID, CAM_AR_NM, PID, SORT_ON, [STATUS], COMMENTS, CREATE_TM, TM) - values - - (#{item.camArId,jdbcType=BIGINT}, #{item.camArNm,jdbcType=VARCHAR}, #{item.pid,jdbcType=BIGINT}, - #{item.sortOn,jdbcType=INTEGER}, #{item.status,jdbcType=INTEGER}, #{item.comments,jdbcType=VARCHAR}, - #{item.createTm,jdbcType=TIMESTAMP}, #{item.tm,jdbcType=TIMESTAMP}) - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/StCameraBMapper.xml b/src/main/resources/mapper/StCameraBMapper.xml deleted file mode 100644 index 3b0c860..0000000 --- a/src/main/resources/mapper/StCameraBMapper.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - CAM_ID, CAM_NM, CAM_TYPE, CAM_CH, CAM_AR_ID, CAM_URL, CAM_SN, LGTD, LTTD, COMMENTS, - CREATE_TM, TM, [STATUS], DEFAULT_SHOW - - - - insert into dbo.ST_CAMERA_B - (CAM_ID, CAM_NM, CAM_TYPE, CAM_CH, CAM_AR_ID, CAM_URL, CAM_SN, LGTD, LTTD, COMMENTS, - CREATE_TM, TM, [STATUS], DEFAULT_SHOW) - values - - (#{item.camId,jdbcType=BIGINT}, #{item.camNm,jdbcType=VARCHAR}, #{item.camType,jdbcType=BIGINT}, - #{item.camCh,jdbcType=INTEGER}, #{item.camArId,jdbcType=BIGINT}, #{item.camUrl,jdbcType=VARCHAR}, - #{item.camSn,jdbcType=VARCHAR}, #{item.lgtd,jdbcType=DECIMAL}, #{item.lttd,jdbcType=DECIMAL}, - #{item.comments,jdbcType=VARCHAR}, #{item.createTm,jdbcType=TIMESTAMP}, #{item.tm,jdbcType=TIMESTAMP}, - #{item.status,jdbcType=INTEGER}, #{item.defaultShow,jdbcType=INTEGER}) - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/StDamBMapper.xml b/src/main/resources/mapper/StDamBMapper.xml deleted file mode 100644 index aaa1f76..0000000 --- a/src/main/resources/mapper/StDamBMapper.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DAM_ID, DAM_CODE, DAM_NAME, START_LONG, START_LAT, END_LONG, END_LAT, DAM_LOC, IF_MAIN_DAM, - DAM_GRAD, DAM_MAX_HEIG, DAM_TOP_LEN, DAM_TOP_WID, DAM_TYPE_MAT, DAM_TYPE_STR, ENG_STAT, - RUN_STAT, START_DATE, COMP_DATE, NOTE, [STATUS], DAM_TOP_HEIG, LFW_TOP_HEIG, SDI, - TOP_ROAD, TM, LOW_GATE_TIME - - - - insert into dbo.ST_DAM_B - (DAM_ID, DAM_CODE, DAM_NAME, START_LONG, START_LAT, END_LONG, END_LAT, DAM_LOC, IF_MAIN_DAM, - DAM_GRAD, DAM_MAX_HEIG, DAM_TOP_LEN, DAM_TOP_WID, DAM_TYPE_MAT, DAM_TYPE_STR, ENG_STAT, - RUN_STAT, START_DATE, COMP_DATE, NOTE, [STATUS], DAM_TOP_HEIG, LFW_TOP_HEIG, SDI, - TOP_ROAD, TM, LOW_GATE_TIME) - values - - (#{item.damId,jdbcType=BIGINT}, #{item.damCode,jdbcType=VARCHAR}, #{item.damName,jdbcType=VARCHAR}, - #{item.startLong,jdbcType=DECIMAL}, #{item.startLat,jdbcType=DECIMAL}, #{item.endLong,jdbcType=DECIMAL}, - #{item.endLat,jdbcType=DECIMAL}, #{item.damLoc,jdbcType=VARCHAR}, #{item.ifMainDam,jdbcType=VARCHAR}, - #{item.damGrad,jdbcType=VARCHAR}, #{item.damMaxHeig,jdbcType=DECIMAL}, #{item.damTopLen,jdbcType=DECIMAL}, - #{item.damTopWid,jdbcType=DECIMAL}, #{item.damTypeMat,jdbcType=BIGINT}, #{item.damTypeStr,jdbcType=BIGINT}, - #{item.engStat,jdbcType=VARCHAR}, #{item.runStat,jdbcType=VARCHAR}, #{item.startDate,jdbcType=TIMESTAMP}, - #{item.compDate,jdbcType=TIMESTAMP}, #{item.note,jdbcType=VARCHAR}, #{item.status,jdbcType=INTEGER}, - #{item.damTopHeig,jdbcType=DECIMAL}, #{item.lfwTopHeig,jdbcType=DECIMAL}, #{item.sdi,jdbcType=BIGINT}, - #{item.topRoad,jdbcType=VARCHAR}, #{item.tm,jdbcType=TIMESTAMP}, #{item.lowGateTime,jdbcType=TIMESTAMP} - ) - - - \ No newline at end of file diff --git a/src/main/resources/mapper/StEqptBMapper.xml b/src/main/resources/mapper/StEqptBMapper.xml deleted file mode 100644 index 774982e..0000000 --- a/src/main/resources/mapper/StEqptBMapper.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - WMEQ_ID, WMEQ_CODE, WMEQ_NAME, ENG_MAN_CODE, ADDVCD, CHAN_CODE, MEASURE, [POSITION], - LGTD, LTTD, BNCH, STRCTS_TP, THROAT_SIZE, DSFL, STFL, COMP_DATE, UPDSER_DATE, UPDSER_RSN, - UPDSER_INVST, ENG_GRAD, SER_COD, NOTE, IRR_CODE, COLL_DATE, UPD_DATE, RV_CODE, [STATUS] - - - - insert into dbo.ST_EQPT_B - (WMEQ_ID, WMEQ_CODE, WMEQ_NAME, ENG_MAN_CODE, ADDVCD, CHAN_CODE, MEASURE, [POSITION], - LGTD, LTTD, BNCH, STRCTS_TP, THROAT_SIZE, DSFL, STFL, COMP_DATE, UPDSER_DATE, UPDSER_RSN, - UPDSER_INVST, ENG_GRAD, SER_COD, NOTE, IRR_CODE, COLL_DATE, UPD_DATE, RV_CODE, - [STATUS]) - values - - (#{item.wmeqId,jdbcType=BIGINT}, #{item.wmeqCode,jdbcType=VARCHAR}, #{item.wmeqName,jdbcType=VARCHAR}, - #{item.engManCode,jdbcType=VARCHAR}, #{item.addvcd,jdbcType=VARCHAR}, #{item.chanCode,jdbcType=VARCHAR}, - #{item.measure,jdbcType=BIGINT}, #{item.position,jdbcType=VARCHAR}, #{item.lgtd,jdbcType=DECIMAL}, - #{item.lttd,jdbcType=DECIMAL}, #{item.bnch,jdbcType=VARCHAR}, #{item.strctsTp,jdbcType=VARCHAR}, - #{item.throatSize,jdbcType=VARCHAR}, #{item.dsfl,jdbcType=DECIMAL}, #{item.stfl,jdbcType=DECIMAL}, - #{item.compDate,jdbcType=TIMESTAMP}, #{item.updserDate,jdbcType=TIMESTAMP}, #{item.updserRsn,jdbcType=VARCHAR}, - #{item.updserInvst,jdbcType=VARCHAR}, #{item.engGrad,jdbcType=VARCHAR}, #{item.serCod,jdbcType=VARCHAR}, - #{item.note,jdbcType=VARCHAR}, #{item.irrCode,jdbcType=VARCHAR}, #{item.collDate,jdbcType=TIMESTAMP}, - #{item.updDate,jdbcType=TIMESTAMP}, #{item.rvCode,jdbcType=VARCHAR}, #{item.status,jdbcType=INTEGER} - ) - - - \ No newline at end of file diff --git a/src/main/resources/mapper/StGateBFileMapper.xml b/src/main/resources/mapper/StGateBFileMapper.xml deleted file mode 100644 index 42072ec..0000000 --- a/src/main/resources/mapper/StGateBFileMapper.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - GATE_ID, FILE_ID, TM, SORT_ON - - - - insert into dbo.ST_GATE_B_FILE - (GATE_ID, FILE_ID, TM, SORT_ON) - values - - (#{item.gateId,jdbcType=BIGINT}, #{item.fileId,jdbcType=BIGINT}, #{item.tm,jdbcType=TIMESTAMP}, - #{item.sortOn,jdbcType=INTEGER}) - - - \ No newline at end of file diff --git a/src/main/resources/mapper/StGateBMapper.xml b/src/main/resources/mapper/StGateBMapper.xml deleted file mode 100644 index f1e66d3..0000000 --- a/src/main/resources/mapper/StGateBMapper.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - GATE_ID, GATE_CD, GATE_NM, GTLC, LGTD, LTTD, GATE_TP, GATE_MD, GATE_SPE, GATE_LH, - GATE_TM, REMARK, [STATUS], TM - - - - insert into dbo.ST_GATE_B - (GATE_ID, GATE_CD, GATE_NM, GTLC, LGTD, LTTD, GATE_TP, GATE_MD, GATE_SPE, GATE_LH, - GATE_TM, REMARK, [STATUS], TM) - values - - (#{item.gateId,jdbcType=BIGINT}, #{item.gateCd,jdbcType=VARCHAR}, #{item.gateNm,jdbcType=VARCHAR}, - #{item.gtlc,jdbcType=VARCHAR}, #{item.lgtd,jdbcType=DECIMAL}, #{item.lttd,jdbcType=DECIMAL}, - #{item.gateTp,jdbcType=BIGINT}, #{item.gateMd,jdbcType=VARCHAR}, #{item.gateSpe,jdbcType=VARCHAR}, - #{item.gateLh,jdbcType=VARCHAR}, #{item.gateTm,jdbcType=TIMESTAMP}, #{item.remark,jdbcType=VARCHAR}, - #{item.status,jdbcType=INTEGER}, #{item.tm,jdbcType=TIMESTAMP}) - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/StGateRecordMapper.xml b/src/main/resources/mapper/StGateRecordMapper.xml deleted file mode 100644 index a252150..0000000 --- a/src/main/resources/mapper/StGateRecordMapper.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/StMoncrBMapper.xml b/src/main/resources/mapper/StMoncrBMapper.xml deleted file mode 100644 index ee02267..0000000 --- a/src/main/resources/mapper/StMoncrBMapper.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - CR_ID, CR_CD, CR_NM, CR_IMG_ID, SORT_ON, [STATUS], TM, COMMENTS - - - - insert into dbo.ST_MONCR_B - (CR_ID, CR_CD, CR_NM, CR_IMG_ID, SORT_ON, [STATUS], TM, COMMENTS) - values - - (#{item.crId,jdbcType=BIGINT}, #{item.crCd,jdbcType=VARCHAR}, #{item.crNm,jdbcType=VARCHAR}, - #{item.crImgId,jdbcType=BIGINT}, #{item.sortOn,jdbcType=INTEGER}, #{item.status,jdbcType=INTEGER}, - #{item.tm,jdbcType=TIMESTAMP}, #{item.comments,jdbcType=VARCHAR}) - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/StResBMapper.xml b/src/main/resources/mapper/StResBMapper.xml deleted file mode 100644 index 8f53954..0000000 --- a/src/main/resources/mapper/StResBMapper.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - RES_ID, RES_CODE, RES_NAME, ADDVCD, LGTD, LTTD, WCRSTEL, WCRESTWD, DMTPEL, DMHT, - DMTPLEN, DATPWD, DSFLLV, CHFLLV, NORM_WAT_LEV, DEAD_LEV, TOT_CAP, FLCO_CAP, BEN_RES_CAP, - SDMNT_CAP, DEAD_CAP, FL_LOW_LIM_LEV, AVANPR, DAAD_MUL_AVER_RUOF, WAT_SHED_AREA, START_DATE, - COMP_DATE, ADM_DEP, HNNM, HSHGWTLV, AJST_PRFR, YHDMEL, YHDDSFL, ENG_SCAL, NOTE, RES_LOC, - ENG_GRAD, BEAR_RAIN_AREA, NORM_POOL_STAG_AREA, NORMZ, DES_IRR_A, ACT_IRR_A, BEN_PP, - CITE_WAT_SUP_PROP, CITY_TOWN_SUP_WAT, IRR_WAT, FLD_CRY_PROP, MYYRVW, MONVW, RES_TYPE, - UPP_LEV_FLCO, NORM_POOL_STAG_CAP, FL_LOW_LIM_LEV_CAP, STOR_FL_CAP, ENG_STAT, RUN_STAT, - ENG_MAN_CODE, RV_CODE, [STATUS], TM, DSFLST, CHFLST, DSFLFL, CHFLFL, LVBSLV, DLBLP - - - - insert into dbo.ST_RES_B - (RES_ID, RES_CODE, RES_NAME, ADDVCD, LGTD, LTTD, WCRSTEL, WCRESTWD, DMTPEL, DMHT, - DMTPLEN, DATPWD, DSFLLV, CHFLLV, NORM_WAT_LEV, DEAD_LEV, TOT_CAP, FLCO_CAP, BEN_RES_CAP, - SDMNT_CAP, DEAD_CAP, FL_LOW_LIM_LEV, AVANPR, DAAD_MUL_AVER_RUOF, WAT_SHED_AREA, - START_DATE, COMP_DATE, ADM_DEP, HNNM, HSHGWTLV, AJST_PRFR, YHDMEL, YHDDSFL, ENG_SCAL, - NOTE, RES_LOC, ENG_GRAD, BEAR_RAIN_AREA, NORM_POOL_STAG_AREA, NORMZ, DES_IRR_A, - ACT_IRR_A, BEN_PP, CITE_WAT_SUP_PROP, CITY_TOWN_SUP_WAT, IRR_WAT, FLD_CRY_PROP, - MYYRVW, MONVW, RES_TYPE, UPP_LEV_FLCO, NORM_POOL_STAG_CAP, FL_LOW_LIM_LEV_CAP, - STOR_FL_CAP, ENG_STAT, RUN_STAT, ENG_MAN_CODE, RV_CODE, [STATUS], TM, DSFLST, CHFLST, - DSFLFL, CHFLFL, LVBSLV, DLBLP) - values - - (#{item.resId,jdbcType=BIGINT}, #{item.resCode,jdbcType=VARCHAR}, #{item.resName,jdbcType=VARCHAR}, - #{item.addvcd,jdbcType=VARCHAR}, #{item.lgtd,jdbcType=DECIMAL}, #{item.lttd,jdbcType=DECIMAL}, - #{item.wcrstel,jdbcType=DECIMAL}, #{item.wcrestwd,jdbcType=DECIMAL}, #{item.dmtpel,jdbcType=DECIMAL}, - #{item.dmht,jdbcType=DECIMAL}, #{item.dmtplen,jdbcType=DECIMAL}, #{item.datpwd,jdbcType=DECIMAL}, - #{item.dsfllv,jdbcType=DECIMAL}, #{item.chfllv,jdbcType=DECIMAL}, #{item.normWatLev,jdbcType=DECIMAL}, - #{item.deadLev,jdbcType=DECIMAL}, #{item.totCap,jdbcType=DECIMAL}, #{item.flcoCap,jdbcType=DECIMAL}, - #{item.benResCap,jdbcType=DECIMAL}, #{item.sdmntCap,jdbcType=DECIMAL}, #{item.deadCap,jdbcType=DECIMAL}, - #{item.flLowLimLev,jdbcType=DECIMAL}, #{item.avanpr,jdbcType=DECIMAL}, #{item.daadMulAverRuof,jdbcType=DECIMAL}, - #{item.watShedArea,jdbcType=DECIMAL}, #{item.startDate,jdbcType=TIMESTAMP}, #{item.compDate,jdbcType=TIMESTAMP}, - #{item.admDep,jdbcType=VARCHAR}, #{item.hnnm,jdbcType=VARCHAR}, #{item.hshgwtlv,jdbcType=DECIMAL}, - #{item.ajstPrfr,jdbcType=VARCHAR}, #{item.yhdmel,jdbcType=DECIMAL}, #{item.yhddsfl,jdbcType=DECIMAL}, - #{item.engScal,jdbcType=BIGINT}, #{item.note,jdbcType=VARCHAR}, #{item.resLoc,jdbcType=VARCHAR}, - #{item.engGrad,jdbcType=BIGINT}, #{item.bearRainArea,jdbcType=DECIMAL}, #{item.normPoolStagArea,jdbcType=DECIMAL}, - #{item.normz,jdbcType=DECIMAL}, #{item.desIrrA,jdbcType=DECIMAL}, #{item.actIrrA,jdbcType=DECIMAL}, - #{item.benPp,jdbcType=DECIMAL}, #{item.citeWatSupProp,jdbcType=DECIMAL}, #{item.cityTownSupWat,jdbcType=DECIMAL}, - #{item.irrWat,jdbcType=DECIMAL}, #{item.fldCryProp,jdbcType=DECIMAL}, #{item.myyrvw,jdbcType=DECIMAL}, - #{item.monvw,jdbcType=DECIMAL}, #{item.resType,jdbcType=BIGINT}, #{item.uppLevFlco,jdbcType=DECIMAL}, - #{item.normPoolStagCap,jdbcType=DECIMAL}, #{item.flLowLimLevCap,jdbcType=DECIMAL}, - #{item.storFlCap,jdbcType=DECIMAL}, #{item.engStat,jdbcType=VARCHAR}, #{item.runStat,jdbcType=VARCHAR}, - #{item.engManCode,jdbcType=VARCHAR}, #{item.rvCode,jdbcType=VARCHAR}, #{item.status,jdbcType=INTEGER}, - #{item.tm,jdbcType=TIMESTAMP}, #{item.dsflst,jdbcType=VARCHAR}, #{item.chflst,jdbcType=VARCHAR}, - #{item.dsflfl,jdbcType=DECIMAL}, #{item.chflfl,jdbcType=DECIMAL}, #{item.lvbslv,jdbcType=BIGINT}, - #{item.dlblp,jdbcType=VARCHAR}) - - - \ No newline at end of file diff --git a/src/main/resources/mapper/StResFileRefMapper.xml b/src/main/resources/mapper/StResFileRefMapper.xml deleted file mode 100644 index 0e3960b..0000000 --- a/src/main/resources/mapper/StResFileRefMapper.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - ID, RES_ID, RF_TP, FILE_ID, SORT_ON, TM - - - - insert into dbo.ST_RES_FILE_REF - (ID, RES_ID, RF_TP, FILE_ID, SORT_ON, TM) - values - - (#{item.id,jdbcType=BIGINT}, #{item.resId,jdbcType=BIGINT}, #{item.rfTp,jdbcType=VARCHAR}, - #{item.fileId,jdbcType=BIGINT}, #{item.sortOn,jdbcType=INTEGER}, #{item.tm,jdbcType=TIMESTAMP} - ) - - - \ No newline at end of file diff --git a/src/main/resources/mapper/StResPersonRefMapper.xml b/src/main/resources/mapper/StResPersonRefMapper.xml deleted file mode 100644 index 28219f8..0000000 --- a/src/main/resources/mapper/StResPersonRefMapper.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - ID, RES_ID, RP_TP, RP_NM, RP_ORG, RP_DS, RP_TEL, SORT_ON, TM - - - - insert into dbo.ST_RES_PERSON_REF - (ID, RES_ID, RP_TP, RP_NM, RP_ORG, RP_DS, RP_TEL, SORT_ON, TM) - values - - (#{item.id,jdbcType=BIGINT}, #{item.resId,jdbcType=BIGINT}, #{item.rpTp,jdbcType=VARCHAR}, - #{item.rpNm,jdbcType=VARCHAR}, #{item.rpOrg,jdbcType=VARCHAR}, #{item.rpDs,jdbcType=VARCHAR}, - #{item.rpTel,jdbcType=VARCHAR}, #{item.sortOn,jdbcType=INTEGER}, #{item.tm,jdbcType=TIMESTAMP} - ) - - - \ No newline at end of file diff --git a/src/main/resources/mapper/StResStcdRefMapper.xml b/src/main/resources/mapper/StResStcdRefMapper.xml deleted file mode 100644 index 9100a6e..0000000 --- a/src/main/resources/mapper/StResStcdRefMapper.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - RES_ID, STCD, TM - - - - insert into dbo.ST_RES_STCD_REF - (RES_ID, STCD, TM) - values - - (#{item.resId,jdbcType=BIGINT}, #{item.stcd,jdbcType=VARCHAR}, #{item.tm,jdbcType=TIMESTAMP} - ) - - - \ No newline at end of file diff --git a/src/main/resources/mapper/StRvBMapper.xml b/src/main/resources/mapper/StRvBMapper.xml deleted file mode 100644 index eb7b946..0000000 --- a/src/main/resources/mapper/StRvBMapper.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - RV_ID, RV_CODE, RV_NAME, RV_SOUR_LONG, RV_SOUR_LAT, RV_MOU_LONG, RV_MOU_LAT, RV_SOUR_LOC, - RV_MOU_LOC, FLOW_AREA, RV_TYPE, RV_GRAD, BANK, RV_LEN, RV_BAS_AREA, CR_OVER_TYPE, - LON_AVER_ANN_FLOW, MEA_ANN_RUOF, AVER_SLOP, NOTE, BEAR_RAIN_AREA, LON_AVER_ANN_RAIN, - [STATUS], MAX_DP, TM - - - - insert into dbo.ST_RV_B - (RV_ID, RV_CODE, RV_NAME, RV_SOUR_LONG, RV_SOUR_LAT, RV_MOU_LONG, RV_MOU_LAT, RV_SOUR_LOC, - RV_MOU_LOC, FLOW_AREA, RV_TYPE, RV_GRAD, BANK, RV_LEN, RV_BAS_AREA, CR_OVER_TYPE, - LON_AVER_ANN_FLOW, MEA_ANN_RUOF, AVER_SLOP, NOTE, BEAR_RAIN_AREA, LON_AVER_ANN_RAIN, - [STATUS], MAX_DP, TM) - values - - (#{item.rvId,jdbcType=BIGINT}, #{item.rvCode,jdbcType=VARCHAR}, #{item.rvName,jdbcType=VARCHAR}, - #{item.rvSourLong,jdbcType=DECIMAL}, #{item.rvSourLat,jdbcType=DECIMAL}, #{item.rvMouLong,jdbcType=DECIMAL}, - #{item.rvMouLat,jdbcType=DECIMAL}, #{item.rvSourLoc,jdbcType=VARCHAR}, #{item.rvMouLoc,jdbcType=VARCHAR}, - #{item.flowArea,jdbcType=VARCHAR}, #{item.rvType,jdbcType=BIGINT}, #{item.rvGrad,jdbcType=BIGINT}, - #{item.bank,jdbcType=BIGINT}, #{item.rvLen,jdbcType=DECIMAL}, #{item.rvBasArea,jdbcType=DECIMAL}, - #{item.crOverType,jdbcType=VARCHAR}, #{item.lonAverAnnFlow,jdbcType=DECIMAL}, #{item.meaAnnRuof,jdbcType=DECIMAL}, - #{item.averSlop,jdbcType=VARCHAR}, #{item.note,jdbcType=VARCHAR}, #{item.bearRainArea,jdbcType=DECIMAL}, - #{item.lonAverAnnRain,jdbcType=DECIMAL}, #{item.status,jdbcType=INTEGER}, #{item.maxDp,jdbcType=DECIMAL}, - #{item.tm,jdbcType=TIMESTAMP}) - - - \ No newline at end of file diff --git a/src/main/resources/mapper/StSpgPztbMapper.xml b/src/main/resources/mapper/StSpgPztbMapper.xml deleted file mode 100644 index 2e5df75..0000000 --- a/src/main/resources/mapper/StSpgPztbMapper.xml +++ /dev/null @@ -1,149 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ID, DEVICE_ID, STATION_CODE, CHANNEL_NUM, INSTALLATION_POSITION_X, INSTALLATION_POSITION_Y, - INSTALLATION_POSITION_Z, DAM, CROSS_SECTION, LATEST_REPORTING_TIME, INITIAL_READING, - CALIBRATION_COEFFICIENT, START_TEMPERATURE, TEMPERATURE_K, DAM_HEIGHT, DIST_FROM_OSMOSIS_METER_TO_BOTTOM, - DRILLING_NO, DRILLING_SIZE, INITIAL_WATER_LEVEL, STEADY_WATER_LEVEL, MEASURING_PROBE_NO, - MANUFACTURER, SENSOR_COEFFICIENT, [RANGE], RESISTANCE, CABLE_LENGTH, CABLE_LENGTH_MARK, - EMBEDDING_ELEVATION, COLUMN_NO, DAM_WHEELBASE, READINGS, DRAFT, START_READINGS, END_READINGS, - ZERO_PRESSURE_READINGS, EMBEDDING_FINISH_READING, EMBEDDING_DATE, AIR_TEMPERATURE, - AIR_PRESSURE, WEATHER, HEADWATER_LEVEL, TAILWATER_LEVEL, TECHNICAL_DIRECTOR, CHECK_PERSONNEL, - BURIED_PERSONNEL, SKETCH_MAP, [STATUS], MODIFICATION_TIME, CREATION_TIME, SUPERVISOR, - REMARK, PROJECT_NAME, PIPE_TOP_HEIGHT, PIPE_BOTTOM_HEIGHT, CR_ID - - - - insert into dbo.ST_SPG_PZTB - (ID, DEVICE_ID, STATION_CODE, CHANNEL_NUM, INSTALLATION_POSITION_X, INSTALLATION_POSITION_Y, - INSTALLATION_POSITION_Z, DAM, CROSS_SECTION, LATEST_REPORTING_TIME, INITIAL_READING, - CALIBRATION_COEFFICIENT, START_TEMPERATURE, TEMPERATURE_K, DAM_HEIGHT, DIST_FROM_OSMOSIS_METER_TO_BOTTOM, - DRILLING_NO, DRILLING_SIZE, INITIAL_WATER_LEVEL, STEADY_WATER_LEVEL, MEASURING_PROBE_NO, - MANUFACTURER, SENSOR_COEFFICIENT, [RANGE], RESISTANCE, CABLE_LENGTH, CABLE_LENGTH_MARK, - EMBEDDING_ELEVATION, COLUMN_NO, DAM_WHEELBASE, READINGS, DRAFT, START_READINGS, - END_READINGS, ZERO_PRESSURE_READINGS, EMBEDDING_FINISH_READING, EMBEDDING_DATE, - AIR_TEMPERATURE, AIR_PRESSURE, WEATHER, HEADWATER_LEVEL, TAILWATER_LEVEL, TECHNICAL_DIRECTOR, - CHECK_PERSONNEL, BURIED_PERSONNEL, SKETCH_MAP, [STATUS], MODIFICATION_TIME, CREATION_TIME, - SUPERVISOR, REMARK, PROJECT_NAME, PIPE_TOP_HEIGHT, PIPE_BOTTOM_HEIGHT, CR_ID) - values - - (#{item.id,jdbcType=BIGINT}, #{item.deviceId,jdbcType=VARCHAR}, #{item.stationCode,jdbcType=VARCHAR}, - #{item.channelNum,jdbcType=INTEGER}, #{item.installationPositionX,jdbcType=DECIMAL}, - #{item.installationPositionY,jdbcType=DECIMAL}, #{item.installationPositionZ,jdbcType=DECIMAL}, - #{item.dam,jdbcType=VARCHAR}, #{item.crossSection,jdbcType=VARCHAR}, #{item.latestReportingTime,jdbcType=TIMESTAMP}, - #{item.initialReading,jdbcType=DECIMAL}, #{item.calibrationCoefficient,jdbcType=DECIMAL}, - #{item.startTemperature,jdbcType=DECIMAL}, #{item.temperatureK,jdbcType=DECIMAL}, - #{item.damHeight,jdbcType=DECIMAL}, #{item.distFromOsmosisMeterToBottom,jdbcType=DECIMAL}, - #{item.drillingNo,jdbcType=VARCHAR}, #{item.drillingSize,jdbcType=DECIMAL}, #{item.initialWaterLevel,jdbcType=DECIMAL}, - #{item.steadyWaterLevel,jdbcType=DECIMAL}, #{item.measuringProbeNo,jdbcType=VARCHAR}, - #{item.manufacturer,jdbcType=VARCHAR}, #{item.sensorCoefficient,jdbcType=DECIMAL}, - #{item.range,jdbcType=DECIMAL}, #{item.resistance,jdbcType=DECIMAL}, #{item.cableLength,jdbcType=DECIMAL}, - #{item.cableLengthMark,jdbcType=VARCHAR}, #{item.embeddingElevation,jdbcType=DECIMAL}, - #{item.columnNo,jdbcType=VARCHAR}, #{item.damWheelbase,jdbcType=DECIMAL}, #{item.readings,jdbcType=DECIMAL}, - #{item.draft,jdbcType=DECIMAL}, #{item.startReadings,jdbcType=DECIMAL}, #{item.endReadings,jdbcType=DECIMAL}, - #{item.zeroPressureReadings,jdbcType=DECIMAL}, #{item.embeddingFinishReading,jdbcType=DECIMAL}, - #{item.embeddingDate,jdbcType=TIMESTAMP}, #{item.airTemperature,jdbcType=DECIMAL}, - #{item.airPressure,jdbcType=DECIMAL}, #{item.weather,jdbcType=VARCHAR}, #{item.headwaterLevel,jdbcType=DECIMAL}, - #{item.tailwaterLevel,jdbcType=DECIMAL}, #{item.technicalDirector,jdbcType=VARCHAR}, - #{item.checkPersonnel,jdbcType=VARCHAR}, #{item.buriedPersonnel,jdbcType=VARCHAR}, - #{item.sketchMap,jdbcType=BIGINT}, #{item.status,jdbcType=INTEGER}, #{item.modificationTime,jdbcType=TIMESTAMP}, - #{item.creationTime,jdbcType=TIMESTAMP}, #{item.supervisor,jdbcType=VARCHAR}, #{item.remark,jdbcType=VARCHAR}, - #{item.projectName,jdbcType=VARCHAR}, #{item.pipeTopHeight,jdbcType=DECIMAL}, #{item.pipeBottomHeight,jdbcType=DECIMAL}, - #{item.crId,jdbcType=BIGINT}) - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/StSpgSpprmpMapper.xml b/src/main/resources/mapper/StSpgSpprmpMapper.xml deleted file mode 100644 index f48079b..0000000 --- a/src/main/resources/mapper/StSpgSpprmpMapper.xml +++ /dev/null @@ -1,227 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ID, - DEVICE_ID, - STATION_CODE, - CHANNEL_NUM, - PROBE_SERIAL, - READING0, - TEMPERATURE0, - TEMPERATURE1, - DEVICE_MEASURE, - DEVICE_MEASURE_AFTER, - PROJECT_LOCATION, - PROJECT_NAME, - MANUFACTURER, - STATION_TYPE, - STANK_TYPE, - STANK_MATERIAL, - STANK_TOP_TO_BOTTOM_DISTANCE, - STANK_SIZE, - RULER_TYPE, - RULER_POSITION, - ZERO_POINT_HEIGHT, - TEMPERATURE_MOD, - MEASURE, - SKETCH_MAP, - DIRECTOR, - VERIFIER, - [OPERATOR], - SUPERVISOR, - INSTALL_DATE, - REMARK, - MODIFICATION_TIME, - LATEST_REPORTING_TIME, - FORMULA, - CREATE_TIME, - [STATUS], - MAX_H, - INSTALLATION_POSITION_X, - INSTALLATION_POSITION_Y, - INSTALLATION_POSITION_Z, - HEADWATER_LEVEL, - TAILWATER_LEVEL, - AIR_TEMPERATURE, - AIR_PRESSURE, - WEATHER, - LINEAR_COEFFICIENTG, - POLYNOMIAL_COEFFICIENTA, - POLYNOMIAL_COEFFICIENTB, - POLYNOMIAL_COEFFICIENTC, - CR_ID - - - - insert into dbo.ST_SPG_SPPRMP - (ID, DEVICE_ID, STATION_CODE, CHANNEL_NUM, PROBE_SERIAL, READING0, TEMPERATURE0, - TEMPERATURE1, DEVICE_MEASURE, DEVICE_MEASURE_AFTER, PROJECT_LOCATION, PROJECT_NAME, - MANUFACTURER, STATION_TYPE, STANK_TYPE, STANK_MATERIAL, STANK_TOP_TO_BOTTOM_DISTANCE, - STANK_SIZE, RULER_TYPE, RULER_POSITION, ZERO_POINT_HEIGHT, TEMPERATURE_MOD, MEASURE, - SKETCH_MAP, DIRECTOR, VERIFIER, [OPERATOR], SUPERVISOR, INSTALL_DATE, REMARK, MODIFICATION_TIME, - LATEST_REPORTING_TIME, FORMULA, CREATE_TIME, [STATUS], MAX_H, INSTALLATION_POSITION_X, - INSTALLATION_POSITION_Y, INSTALLATION_POSITION_Z, HEADWATER_LEVEL, TAILWATER_LEVEL, - AIR_TEMPERATURE, AIR_PRESSURE, WEATHER, LINEAR_COEFFICIENTG, POLYNOMIAL_COEFFICIENTA, - POLYNOMIAL_COEFFICIENTB, POLYNOMIAL_COEFFICIENTC, CR_ID) - values - - (#{item.id,jdbcType=BIGINT}, #{item.deviceId,jdbcType=VARCHAR}, #{item.stationCode,jdbcType=VARCHAR}, - #{item.channelNum,jdbcType=INTEGER}, #{item.probeSerial,jdbcType=VARCHAR}, - #{item.reading0,jdbcType=DECIMAL}, - #{item.temperature0,jdbcType=DECIMAL}, #{item.temperature1,jdbcType=DECIMAL}, - #{item.deviceMeasure,jdbcType=DECIMAL}, - #{item.deviceMeasureAfter,jdbcType=DECIMAL}, #{item.projectLocation,jdbcType=VARCHAR}, - #{item.projectName,jdbcType=VARCHAR}, #{item.manufacturer,jdbcType=VARCHAR}, - #{item.stationType,jdbcType=VARCHAR}, - #{item.stankType,jdbcType=VARCHAR}, #{item.stankMaterial,jdbcType=VARCHAR}, - #{item.stankTopToBottomDistance,jdbcType=DECIMAL}, - #{item.stankSize,jdbcType=VARCHAR}, #{item.rulerType,jdbcType=VARCHAR}, - #{item.rulerPosition,jdbcType=VARCHAR}, - #{item.zeroPointHeight,jdbcType=DECIMAL}, #{item.temperatureMod,jdbcType=DECIMAL}, - #{item.measure,jdbcType=DECIMAL}, #{item.sketchMap,jdbcType=BIGINT}, #{item.director,jdbcType=VARCHAR}, - #{item.verifier,jdbcType=VARCHAR}, #{item.operator,jdbcType=VARCHAR}, #{item.supervisor,jdbcType=VARCHAR}, - #{item.installDate,jdbcType=TIMESTAMP}, #{item.remark,jdbcType=VARCHAR}, - #{item.modificationTime,jdbcType=TIMESTAMP}, - #{item.latestReportingTime,jdbcType=TIMESTAMP}, #{item.formula,jdbcType=VARCHAR}, - #{item.createTime,jdbcType=TIMESTAMP}, #{item.status,jdbcType=INTEGER}, #{item.maxH,jdbcType=DECIMAL}, - #{item.installationPositionX,jdbcType=DECIMAL}, #{item.installationPositionY,jdbcType=DECIMAL}, - #{item.installationPositionZ,jdbcType=DECIMAL}, #{item.headwaterLevel,jdbcType=DECIMAL}, - #{item.tailwaterLevel,jdbcType=DECIMAL}, #{item.airTemperature,jdbcType=DECIMAL}, - #{item.airPressure,jdbcType=DECIMAL}, #{item.weather,jdbcType=VARCHAR}, - #{item.linearCoefficientg,jdbcType=DECIMAL}, - #{item.polynomialCoefficienta,jdbcType=DECIMAL}, #{item.polynomialCoefficientb,jdbcType=DECIMAL}, - #{item.polynomialCoefficientc,jdbcType=DECIMAL}, #{item.crId,jdbcType=BIGINT}) - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/StStbprpBMapper.xml b/src/main/resources/mapper/StStbprpBMapper.xml deleted file mode 100644 index d0071c5..0000000 --- a/src/main/resources/mapper/StStbprpBMapper.xml +++ /dev/null @@ -1,160 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - STCD, - STNM, - RVNM, - HNNM, - BSNM, - LGTD, - LTTD, - STLC, - ADDVCD, - DTMNM, - DTMEL, - DTPR, - STTP, - FRGRD, - ESSTYM, - BGFRYM, - ATCUNIT, - ADMAUTH, - LOCALITY, - STBK, - STAZT, - DSTRVM, - DRNA, - PHCD, - USFL, - COMMENTS, - MODITIME, - SRC, - IRR_CODE, - ENG_MAN_CODE, - [TYPE], - CHAN_CODE, - RV_CODE, - BNCH, - SIM, - PROTOCOLS, - BDNUM - - - - insert into dbo.ST_STBPRP_B - (STCD, STNM, RVNM, HNNM, BSNM, LGTD, LTTD, STLC, ADDVCD, DTMNM, DTMEL, DTPR, STTP, - FRGRD, ESSTYM, BGFRYM, ATCUNIT, ADMAUTH, LOCALITY, STBK, STAZT, DSTRVM, DRNA, PHCD, - USFL, COMMENTS, MODITIME, SRC, IRR_CODE, ENG_MAN_CODE, [TYPE], CHAN_CODE, RV_CODE, - BNCH, SIM, PROTOCOLS, BDNUM) - values - - (#{item.stcd,jdbcType=VARCHAR}, #{item.stnm,jdbcType=VARCHAR}, #{item.rvnm,jdbcType=VARCHAR}, - #{item.hnnm,jdbcType=VARCHAR}, #{item.bsnm,jdbcType=VARCHAR}, #{item.lgtd,jdbcType=DECIMAL}, - #{item.lttd,jdbcType=DECIMAL}, #{item.stlc,jdbcType=VARCHAR}, #{item.addvcd,jdbcType=VARCHAR}, - #{item.dtmnm,jdbcType=VARCHAR}, #{item.dtmel,jdbcType=DECIMAL}, #{item.dtpr,jdbcType=DECIMAL}, - #{item.sttp,jdbcType=VARCHAR}, #{item.frgrd,jdbcType=VARCHAR}, #{item.esstym,jdbcType=VARCHAR}, - #{item.bgfrym,jdbcType=VARCHAR}, #{item.atcunit,jdbcType=VARCHAR}, #{item.admauth,jdbcType=VARCHAR}, - #{item.locality,jdbcType=VARCHAR}, #{item.stbk,jdbcType=VARCHAR}, #{item.stazt,jdbcType=DECIMAL}, - #{item.dstrvm,jdbcType=DECIMAL}, #{item.drna,jdbcType=DECIMAL}, #{item.phcd,jdbcType=VARCHAR}, - #{item.usfl,jdbcType=VARCHAR}, #{item.comments,jdbcType=VARCHAR}, #{item.moditime,jdbcType=TIMESTAMP}, - #{item.src,jdbcType=VARCHAR}, #{item.irrCode,jdbcType=VARCHAR}, #{item.engManCode,jdbcType=VARCHAR}, - #{item.type,jdbcType=VARCHAR}, #{item.chanCode,jdbcType=VARCHAR}, #{item.rvCode,jdbcType=VARCHAR}, - #{item.bnch,jdbcType=VARCHAR}, #{item.sim,jdbcType=VARCHAR}, #{item.protocols,jdbcType=BIGINT}, - #{item.bdnum,jdbcType=VARCHAR}) - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/StStchBMapper.xml b/src/main/resources/mapper/StStchBMapper.xml deleted file mode 100644 index fa4473c..0000000 --- a/src/main/resources/mapper/StStchBMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/src/main/resources/mapper/StZvarlBMapper.xml b/src/main/resources/mapper/StZvarlBMapper.xml deleted file mode 100644 index 1676257..0000000 --- a/src/main/resources/mapper/StZvarlBMapper.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - RES_ID, PTNO, STCD, MSTM, RZ, W, WSFA, MODITIME - - - - insert into dbo.ST_ZVARL_B - (RES_ID, PTNO, STCD, MSTM, RZ, W, WSFA, MODITIME) - values - - (#{item.resId,jdbcType=BIGINT}, #{item.ptno,jdbcType=INTEGER}, #{item.stcd,jdbcType=VARCHAR}, - #{item.mstm,jdbcType=TIMESTAMP}, #{item.rz,jdbcType=DECIMAL}, #{item.w,jdbcType=DECIMAL}, - #{item.wsfa,jdbcType=DECIMAL}, #{item.moditime,jdbcType=TIMESTAMP}) - - - \ No newline at end of file diff --git a/src/main/resources/mapper/SysDictBMapper.xml b/src/main/resources/mapper/SysDictBMapper.xml deleted file mode 100644 index 001c85c..0000000 --- a/src/main/resources/mapper/SysDictBMapper.xml +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - ID, DICT_NM, DICT_CD, PID, SORT_ON, CREATE_TM, TM, [STATUS] - - - - insert into dbo.SYS_DICT_B - (ID, DICT_NM, DICT_CD, PID, SORT_ON, CREATE_TM, TM, [STATUS]) - values - - (#{item.id,jdbcType=BIGINT}, #{item.dictNm,jdbcType=VARCHAR}, #{item.dictCd,jdbcType=VARCHAR}, - #{item.pid,jdbcType=BIGINT}, #{item.sortOn,jdbcType=INTEGER}, #{item.createTm,jdbcType=TIMESTAMP}, - #{item.tm,jdbcType=TIMESTAMP}, #{item.status,jdbcType=INTEGER}) - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/WaterQualityMapper.xml b/src/main/resources/mapper/WaterQualityMapper.xml deleted file mode 100644 index 446a997..0000000 --- a/src/main/resources/mapper/WaterQualityMapper.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/main/resources/sql/OSMOMETER_DATA.sql b/src/main/resources/sql/OSMOMETER_DATA.sql deleted file mode 100644 index bebca51..0000000 --- a/src/main/resources/sql/OSMOMETER_DATA.sql +++ /dev/null @@ -1,26 +0,0 @@ -CREATE TABLE "DAM_SAFE"."DEVICE_DATA" -( -"ID" INT IDENTITY(1, 1) NOT NULL, -"DEVICE_ID" VARCHAR(30), -"TIMESTAMP" DATETIME(6), -"CHANNEL_NUM" TINYINT, -"DATA_A" DECIMAL(30,20), -"DATA_B" DECIMAL(30,20), -"DATA_C" DECIMAL(30,20), -"CREATETIME" DATETIME(6), -"CHANNEL_TYPE" CHAR(1) DEFAULT 5, -"OSMOMETER" DECIMAL(22,6), -"PIPE_Z" DECIMAL(22,6), -CLUSTER PRIMARY KEY("ID"), -CONSTRAINT "DEVICE_DATA_TM_CHANNEL" UNIQUE("DEVICE_ID", "TIMESTAMP", "CHANNEL_NUM")) STORAGE(ON "MAIN", CLUSTERBTR) ; - -COMMENT ON TABLE "DAM_SAFE"."DEVICE_DATA" IS '设备数据表'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_DATA"."CHANNEL_NUM" IS '通道号'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_DATA"."CHANNEL_TYPE" IS '通道类型。=5时， data_a 频率，data_b 温度'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_DATA"."CREATETIME" IS '入库时间'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_DATA"."DEVICE_ID" IS '测站编码（MCU）'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_DATA"."OSMOMETER" IS '渗压值'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_DATA"."PIPE_Z" IS '管内水位'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_DATA"."TIMESTAMP" IS '数据时间'; - - diff --git a/src/main/resources/sql/OSMOMETER_STATION.sql b/src/main/resources/sql/OSMOMETER_STATION.sql deleted file mode 100644 index c3bffbe..0000000 --- a/src/main/resources/sql/OSMOMETER_STATION.sql +++ /dev/null @@ -1,124 +0,0 @@ -CREATE TABLE "DAM_SAFE"."DEVICE_INFO" -( -"ID" INT IDENTITY(1, 1) NOT NULL, -"DEVICE_ID" VARCHAR(30), -"STATION_CODE" VARCHAR(50), -"INSTALLATION_POSITION_X" NUMERIC(12,9), -"INSTALLATION_POSITION_Y" NUMERIC(12,9), -"INSTALLATION_POSITION_Z" NUMERIC(10,5), -"MOUNTING_HEIGHT" VARCHAR(50), -"DAM" VARCHAR(100), -"CROSS_SECTION" VARCHAR(100), -"LATEST_REPORTING_TIME" DATETIME(6), -"INITIAL_READING" DECIMAL(22,6), -"CALIBRATION_COEFFICIENT" DECIMAL(30,20), -"RECENT_DATA" DECIMAL(10,2), -"PRESSURE" DECIMAL(10,2), -"START_TEMPERATURE" DECIMAL(22,6), -"TEMPERATURE_K" DECIMAL(30,20), -"DRILLING_NO" VARCHAR(50), -"DRILLING_SIZE" VARCHAR(50), -"INITIAL_WATER_LEVEL" NUMERIC(9,3), -"STEADY_WATER_LEVEL" NUMERIC(9,3), -"MEASURING_PROBE_NO" VARCHAR(50), -"MANUFACTURER" VARCHAR(100), -"SENSOR_COEFFICIENT" DECIMAL(30,20), -"RANGE" DECIMAL(22,6), -"RESISTANCE" VARCHAR(50), -"CABLE_LENGTH" DECIMAL(22,6), -"CABLE_LENGTH_MARK" VARCHAR(100), -"EMBEDDING_ELEVATION" DECIMAL(22,6) DEFAULT 0 NOT NULL, -"COLUMN_NO" VARCHAR(50), -"DAM_WHEELBASE" DECIMAL(22,6), -"READINGS" DECIMAL(22,6), -"DRAFT" DECIMAL(22,6), -"START_READINGS" VARCHAR(50), -"END_READINGS" DECIMAL(22,6), -"ZERO_PRESSURE_READINGS" DECIMAL(22,6), -"EMBEDDING_FINISH_READING" VARCHAR(50), -"EMBEDDING_DATE" DATETIME(6), -"AIR_TEMPERATURE" DECIMAL(9,3), -"AIR_PRESSURE" DECIMAL(22,6), -"WEATHER" VARCHAR(50), -"HEADWATER_LEVEL" NUMERIC(6,3), -"TAILWATER_LEVEL" NUMERIC(6,3), -"TECHNICAL_DIRECTOR" VARCHAR(50), -"CHECK_PERSONNEL" VARCHAR(50), -"BURIED_PERSONNEL" VARCHAR(50), -"CREATE_DATE" DATETIME(6), -"SKETCH_MAP" TEXT, -"DEL" TINYINT DEFAULT 0, -"MODIFICATION_TIME" DATETIME(6), -"CREATION_TIME" DATETIME(6), -"SUPERVISOR" VARCHAR(50), -"REMARK" VARCHAR(500), -"CHANNEL_NUM" TINYINT, -"PROJECT_NAME" VARCHAR(255), -"DIST_FROM_OSMOSIS_METER_TO_BOTTOM" NUMERIC(10,5) DEFAULT 0, -"PIPE_TOP_HEIGHT" NUMERIC(10,5), -"PIPE_BOTTOM_HEIGHT" NUMERIC(10,5), -"DAM_TOP" DECIMAL(22,6), -NOT CLUSTER PRIMARY KEY("ID"), -CONSTRAINT "DEVICE_INFO_UNIQ" UNIQUE("DEVICE_ID", "STATION_CODE", "CHANNEL_NUM")) STORAGE(ON "MAIN", CLUSTERBTR) ; - -COMMENT ON TABLE "DAM_SAFE"."DEVICE_INFO" IS '设备信息表'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."AIR_PRESSURE" IS '气压'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."AIR_TEMPERATURE" IS '气温'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."BURIED_PERSONNEL" IS '埋设及填表人'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."CABLE_LENGTH" IS '电缆长度'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."CABLE_LENGTH_MARK" IS '电缆长度标记'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."CALIBRATION_COEFFICIENT" IS '率定系数(G)'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."CHANNEL_NUM" IS '通道号'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."CHECK_PERSONNEL" IS '校验人'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."COLUMN_NO" IS '柱号'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."CREATE_DATE" IS '日期'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."CREATION_TIME" IS '创建时间'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."CROSS_SECTION" IS '所在断面'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."DAM" IS '所在大坝'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."DAM_TOP" IS '坝（堰）顶高程'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."DAM_WHEELBASE" IS '大坝轴距'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."DEL" IS '0:正常，1 已逻辑删除'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."DEVICE_ID" IS '测站编码（MCU）'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."DIST_FROM_OSMOSIS_METER_TO_BOTTOM" IS '渗压计到孔底距离'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."DRAFT" IS '孔内水深'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."DRILLING_NO" IS '钻孔编号'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."DRILLING_SIZE" IS '钻孔直径'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."EMBEDDING_DATE" IS '埋设日期'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."EMBEDDING_ELEVATION" IS '埋设高程'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."EMBEDDING_FINISH_READING" IS '埋设完毕读数'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."END_READINGS" IS '就位后读数'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."HEADWATER_LEVEL" IS '上游水位（m）'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."ID" IS '主键id'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."INITIAL_READING" IS '初始读数。单位是“模数”， 乘 1000 后开方得到频率值'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."INITIAL_WATER_LEVEL" IS '初见水位'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."INSTALLATION_POSITION_X" IS '安装经度'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."INSTALLATION_POSITION_Y" IS '安装纬度'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."INSTALLATION_POSITION_Z" IS '安装高程'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."LATEST_REPORTING_TIME" IS '最后数据同步时间'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."MANUFACTURER" IS '生产厂家'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."MEASURING_PROBE_NO" IS '测头编号'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."MODIFICATION_TIME" IS '修改时间'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."MOUNTING_HEIGHT" IS '作废字段，为了兼容前面的，暂时未删除'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."PIPE_BOTTOM_HEIGHT" IS '管低高程'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."PIPE_TOP_HEIGHT" IS '管口高程'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."PRESSURE" IS '作废字段，为了兼容前面的，暂时未删除'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."PROJECT_NAME" IS '项目名称'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."RANGE" IS '量程'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."READINGS" IS '现场室内读数'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."RECENT_DATA" IS '作废字段，为了兼容前面的，暂时未删除'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."REMARK" IS '备注'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."RESISTANCE" IS '测头内阻'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."SENSOR_COEFFICIENT" IS '传感器系数'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."SKETCH_MAP" IS '埋设示意图'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."START_READINGS" IS '入孔前读数'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."START_TEMPERATURE" IS '初始温度读数'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."STATION_CODE" IS '测头编码'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."STEADY_WATER_LEVEL" IS '稳定水位'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."SUPERVISOR" IS '监理工程师'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."TAILWATER_LEVEL" IS '下游水位（m）'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."TECHNICAL_DIRECTOR" IS '技术负责人'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."TEMPERATURE_K" IS '温度率定系娄(K)'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."WEATHER" IS '天气'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_INFO"."ZERO_PRESSURE_READINGS" IS '零压读数'; - - diff --git a/src/main/resources/sql/SEEPAGE_DATA.sql b/src/main/resources/sql/SEEPAGE_DATA.sql deleted file mode 100644 index 2130d14..0000000 --- a/src/main/resources/sql/SEEPAGE_DATA.sql +++ /dev/null @@ -1,24 +0,0 @@ -CREATE TABLE "DAM_SAFE"."DEVICE_SL_DATA" -( -"ID" INT IDENTITY(1, 1) NOT NULL, -"DEVICE_ID" VARCHAR(30), -"TIMESTAMP" DATETIME(6), -"CHANNEL_NUM" TINYINT, -"DATA_A" DECIMAL(30,20), -"DATA_B" DECIMAL(30,20), -"DATA_C" DECIMAL(30,20), -"CREATETIME" DATETIME(6), -"L" DECIMAL(22,6), -"Q" DECIMAL(22,6), -CLUSTER PRIMARY KEY("ID"), -CONSTRAINT "DEVICE_SL_DATA_TM_CHANNEL" UNIQUE("DEVICE_ID", "TIMESTAMP", "CHANNEL_NUM")) STORAGE(ON "MAIN", CLUSTERBTR) ; - -COMMENT ON TABLE "DAM_SAFE"."DEVICE_SL_DATA" IS '设备数据表'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_DATA"."CHANNEL_NUM" IS '通道号'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_DATA"."CREATETIME" IS '入库时间'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_DATA"."DEVICE_ID" IS '测站编码（MCU）'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_DATA"."L" IS '堰上水头'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_DATA"."Q" IS '渗流'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_DATA"."TIMESTAMP" IS '数据时间'; - - diff --git a/src/main/resources/sql/SEEPAGE_STATION.sql b/src/main/resources/sql/SEEPAGE_STATION.sql deleted file mode 100644 index 48204a7..0000000 --- a/src/main/resources/sql/SEEPAGE_STATION.sql +++ /dev/null @@ -1,96 +0,0 @@ -CREATE TABLE "DAM_SAFE"."DEVICE_SL_INFO" -( -"ID" INT IDENTITY(1, 1) NOT NULL, -"DEVICE_ID" VARCHAR(30), -"STATION_CODE" VARCHAR(50), -"CHANNEL_NUM" TINYINT, -"PROBE_SERIAL" VARCHAR(30), -"READING0" DECIMAL(22,6), -"TEMPERATURE0" DECIMAL(22,6), -"TEMPERATURE1" DECIMAL(22,6), -"DEVICE_MEASURE" DECIMAL(22,6), -"DEVICE_MEASURE_AFTER" DECIMAL(22,6), -"PROJECT_LOCATION" VARCHAR(50), -"PROJECT_NAME" VARCHAR(50), -"MANUFACTURER" VARCHAR(50), -"STATION_TYPE" VARCHAR(30), -"STANK_TYPE" VARCHAR(30), -"STANK_MATERIAL" VARCHAR(30), -"STANK_TOP_TO_BOTTOM_DISTANCE" VARCHAR(30), -"STANK_SIZE" VARCHAR(30), -"RULER_TYPE" VARCHAR(30), -"RULER_POSITION" VARCHAR(30), -"ZERO_POINT_HEIGHT" DECIMAL(22,6), -"TEMPERATURE_MOD" DECIMAL(22,6), -"MEASURE" DECIMAL(22,6), -"SKETCH_MAP" TEXT, -"DIRECTOR" VARCHAR(30), -"VERIFIER" VARCHAR(30), -"OPERATOR" VARCHAR(30), -"SUPERVISOR" VARCHAR(30), -"INSTALL_DATE" DATETIME(6), -"REMARK" VARCHAR(500), -"MODIFICATION_TIME" DATETIME(6), -"LATEST_REPORTING_TIME" DATETIME(6), -"FORMULA" VARCHAR(30), -"CREATE_TIME" DATETIME(6), -"DEL" TINYINT DEFAULT 0, -"MAX_H" DECIMAL(22,6) DEFAULT 0 NOT NULL, -"G" DECIMAL(22,15) DEFAULT 0 NOT NULL, -"A" DECIMAL(22,15) DEFAULT 0 NOT NULL, -"B" DECIMAL(22,15) DEFAULT 0 NOT NULL, -"C" DECIMAL(22,15) DEFAULT 0 NOT NULL, -"INSTALLATION_POSITION_Z" DECIMAL(22,6), -"INSTALLATION_POSITION_Y" DECIMAL(22,6), -"INSTALLATION_POSITION_X" DECIMAL(22,6), -"TAILWATER_LEVEL" DECIMAL(22,6), -"HEADWATER_LEVEL" DECIMAL(22,6), -"WEATHER" VARCHAR(50), -"AIR_TEMPERATURE" DECIMAL(22,6), -NOT CLUSTER PRIMARY KEY("ID"), -CONSTRAINT "DEVICE_SL_INFO_UNIQ" UNIQUE("DEVICE_ID", "STATION_CODE", "CHANNEL_NUM")) STORAGE(ON "MAIN", CLUSTERBTR) ; - -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."A" IS '多项式系数A'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."AIR_TEMPERATURE" IS '气温'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."B" IS '多项式系数B'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."C" IS '多项式系数C'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."CHANNEL_NUM" IS '通道号'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."DEVICE_ID" IS '测站编码（MCU）'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."DEVICE_MEASURE" IS '仪器测值'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."DEVICE_MEASURE_AFTER" IS '埋设后测值'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."DIRECTOR" IS '技术负责人'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."FORMULA" IS '公式'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."G" IS '直线系数G'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."HEADWATER_LEVEL" IS '上游水位'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."INSTALLATION_POSITION_X" IS '安装经度'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."INSTALLATION_POSITION_Y" IS '安装纬度'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."INSTALLATION_POSITION_Z" IS '安装高程'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."INSTALL_DATE" IS '安装日期'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."MANUFACTURER" IS '生产厂家'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."MAX_H" IS '最大堰上水头（m）'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."MEASURE" IS '量测（mm）'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."OPERATOR" IS '埋设及填表人'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."PROBE_SERIAL" IS '仪器编号'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."PROJECT_LOCATION" IS '工程部位'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."PROJECT_NAME" IS '工程或项目名称'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."READING0" IS '零位读数'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."REMARK" IS '备注'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."RULER_POSITION" IS '水尺（测针）位置'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."RULER_TYPE" IS '水尺（传感器）形式'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."SKETCH_MAP" IS '埋设示意图'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."STANK_MATERIAL" IS '堰板材料'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."STANK_SIZE" IS '堰槽尺寸（mm*mm*mm）'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."STANK_TOP_TO_BOTTOM_DISTANCE" IS '堰口至堰槽底距离（mm）'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."STANK_TYPE" IS '堰型'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."STATION_CODE" IS '测点编号'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."STATION_TYPE" IS '站型'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."SUPERVISOR" IS '监理工程师'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."TAILWATER_LEVEL" IS '下游水位'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."TEMPERATURE0" IS '安装时温度（℃）'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."TEMPERATURE1" IS '温度（℃）'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."TEMPERATURE_MOD" IS '温度系数（mm/℃）'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."VERIFIER" IS '校验人'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."WEATHER" IS '天气'; -COMMENT ON COLUMN "DAM_SAFE"."DEVICE_SL_INFO"."ZERO_POINT_HEIGHT" IS '零点高度（mm）'; - - diff --git a/src/main/resources/sql/ST_FLOW_R.sql b/src/main/resources/sql/ST_FLOW_R.sql deleted file mode 100644 index 07798fe..0000000 --- a/src/main/resources/sql/ST_FLOW_R.sql +++ /dev/null @@ -1,25 +0,0 @@ -CREATE TABLE "DB_ZHSK"."ST_FLOW_R" -( -"STCD" VARCHAR(12) NOT NULL, -"TM" DATETIME(6) NOT NULL, -"RZ" DEC(7,3), -"FR" DEC(5,3), -"HQ" DEC(9,3), -"ACCQ" DEC(12,3), -"CHAN" VARCHAR(10) NOT NULL, -"VOL" DECIMAL(22,6), -"REMARK" VARCHAR(100), -NOT CLUSTER PRIMARY KEY("STCD", "TM", "CHAN")) STORAGE(ON "MAIN", CLUSTERBTR) ; - -COMMENT ON TABLE "DB_ZHSK"."ST_FLOW_R" IS '流量站'; -COMMENT ON COLUMN "DB_ZHSK"."ST_FLOW_R"."ACCQ" IS '累计流量'; -COMMENT ON COLUMN "DB_ZHSK"."ST_FLOW_R"."CHAN" IS '通道'; -COMMENT ON COLUMN "DB_ZHSK"."ST_FLOW_R"."FR" IS '流速'; -COMMENT ON COLUMN "DB_ZHSK"."ST_FLOW_R"."HQ" IS '小时流量'; -COMMENT ON COLUMN "DB_ZHSK"."ST_FLOW_R"."REMARK" IS '备注'; -COMMENT ON COLUMN "DB_ZHSK"."ST_FLOW_R"."RZ" IS '水位'; -COMMENT ON COLUMN "DB_ZHSK"."ST_FLOW_R"."STCD" IS '测站编码'; -COMMENT ON COLUMN "DB_ZHSK"."ST_FLOW_R"."TM" IS '采集时间'; -COMMENT ON COLUMN "DB_ZHSK"."ST_FLOW_R"."VOL" IS '水量'; - - diff --git a/src/main/resources/sql/ST_IMG_R.sql b/src/main/resources/sql/ST_IMG_R.sql deleted file mode 100644 index 369b880..0000000 --- a/src/main/resources/sql/ST_IMG_R.sql +++ /dev/null @@ -1,19 +0,0 @@ -CREATE TABLE "DB_ZHSK"."ST_IMG_R" -( -"STCD" VARCHAR(10) NOT NULL, -"TM" DATETIME(6) NOT NULL, -"IMG_PATH" VARCHAR(256) NOT NULL, -"CHID" VARCHAR(10) DEFAULT 1 NOT NULL, -"REGION" VARCHAR(50) NOT NULL, -NOT CLUSTER PRIMARY KEY("STCD", "TM", "CHID", "REGION")) STORAGE(ON "MAIN", CLUSTERBTR) ; - -COMMENT ON TABLE "DB_ZHSK"."ST_IMG_R" IS '图像站数据表'; -COMMENT ON COLUMN "DB_ZHSK"."ST_IMG_R"."CHID" IS '通道ID'; -COMMENT ON COLUMN "DB_ZHSK"."ST_IMG_R"."IMG_PATH" IS '图片文件存储路径'; -COMMENT ON COLUMN "DB_ZHSK"."ST_IMG_R"."REGION" IS '来源'; -COMMENT ON COLUMN "DB_ZHSK"."ST_IMG_R"."STCD" IS '测站编码'; -COMMENT ON COLUMN "DB_ZHSK"."ST_IMG_R"."TM" IS '采集时间'; - - -CREATE INDEX "stcd_tm_img" ON "DB_ZHSK"."ST_IMG_R"("STCD" ASC,"TM" ASC) STORAGE(ON "MAIN", CLUSTERBTR) ; - diff --git a/src/main/resources/sql/ST_PPTN_R.sql b/src/main/resources/sql/ST_PPTN_R.sql deleted file mode 100644 index e02ccdb..0000000 --- a/src/main/resources/sql/ST_PPTN_R.sql +++ /dev/null @@ -1,25 +0,0 @@ -CREATE TABLE "DB_ZHSK"."ST_PPTN_R" -( -"STCD" VARCHAR(10) NOT NULL, -"TM" TIMESTAMP(6) NOT NULL, -"DRP" DEC(5,1), -"INTV" DEC(5,2), -"PDR" DEC(5,2), -"DYP" DEC(5,1), -"WTH" CHAR(1), -"ACCDRP" DEC(5,1), -NOT CLUSTER PRIMARY KEY("STCD", "TM")) STORAGE(ON "MAIN", CLUSTERBTR) ; - -COMMENT ON TABLE "DB_ZHSK"."ST_PPTN_R" IS '降水量表'; -COMMENT ON COLUMN "DB_ZHSK"."ST_PPTN_R"."ACCDRP" IS '累计降水量'; -COMMENT ON COLUMN "DB_ZHSK"."ST_PPTN_R"."DRP" IS '时段降水量'; -COMMENT ON COLUMN "DB_ZHSK"."ST_PPTN_R"."DYP" IS '日降水量'; -COMMENT ON COLUMN "DB_ZHSK"."ST_PPTN_R"."INTV" IS '时段长'; -COMMENT ON COLUMN "DB_ZHSK"."ST_PPTN_R"."PDR" IS '降水历时'; -COMMENT ON COLUMN "DB_ZHSK"."ST_PPTN_R"."STCD" IS '测站编码'; -COMMENT ON COLUMN "DB_ZHSK"."ST_PPTN_R"."TM" IS '时间'; -COMMENT ON COLUMN "DB_ZHSK"."ST_PPTN_R"."WTH" IS '天气状况'; - - -CREATE INDEX "stcd_tm_pptn" ON "DB_ZHSK"."ST_PPTN_R"("STCD" ASC,"TM" ASC) STORAGE(ON "MAIN", CLUSTERBTR) ; - diff --git a/src/main/resources/sql/ST_RIVER_R.sql b/src/main/resources/sql/ST_RIVER_R.sql deleted file mode 100644 index 94eec99..0000000 --- a/src/main/resources/sql/ST_RIVER_R.sql +++ /dev/null @@ -1,33 +0,0 @@ -CREATE TABLE "DB_ZHSK"."ST_RIVER_R" -( -"STCD" VARCHAR(10) NOT NULL, -"TM" DATETIME(6) NOT NULL, -"Z" DEC(7,3), -"Q" DEC(9,3), -"XSA" DEC(9,3), -"XSAVV" DEC(5,3), -"XSMXV" DEC(5,3), -"FLWCHRCD" CHAR(1), -"WPTN" CHAR(1), -"MSQMT" CHAR(1), -"MSAMT" CHAR(1), -"MSVMT" CHAR(1), -NOT CLUSTER PRIMARY KEY("STCD", "TM")) STORAGE(ON "MAIN", CLUSTERBTR) ; - -COMMENT ON TABLE "DB_ZHSK"."ST_RIVER_R" IS '河道水情表'; -COMMENT ON COLUMN "DB_ZHSK"."ST_RIVER_R"."FLWCHRCD" IS '河水特征码'; -COMMENT ON COLUMN "DB_ZHSK"."ST_RIVER_R"."MSAMT" IS '测积方法'; -COMMENT ON COLUMN "DB_ZHSK"."ST_RIVER_R"."MSQMT" IS '测流方法'; -COMMENT ON COLUMN "DB_ZHSK"."ST_RIVER_R"."MSVMT" IS '测速方法'; -COMMENT ON COLUMN "DB_ZHSK"."ST_RIVER_R"."Q" IS '流量'; -COMMENT ON COLUMN "DB_ZHSK"."ST_RIVER_R"."STCD" IS '测站编码'; -COMMENT ON COLUMN "DB_ZHSK"."ST_RIVER_R"."TM" IS '时间'; -COMMENT ON COLUMN "DB_ZHSK"."ST_RIVER_R"."WPTN" IS '水势'; -COMMENT ON COLUMN "DB_ZHSK"."ST_RIVER_R"."XSA" IS '断面过水面积'; -COMMENT ON COLUMN "DB_ZHSK"."ST_RIVER_R"."XSAVV" IS '断面平均流速'; -COMMENT ON COLUMN "DB_ZHSK"."ST_RIVER_R"."XSMXV" IS '断面最大流速'; -COMMENT ON COLUMN "DB_ZHSK"."ST_RIVER_R"."Z" IS '水位'; - - -CREATE INDEX "river_stcd_tm" ON "DB_ZHSK"."ST_RIVER_R"("STCD" ASC,"TM" ASC) STORAGE(ON "MAIN", CLUSTERBTR) ; - diff --git a/src/main/resources/sql/ST_RSVR_R.sql b/src/main/resources/sql/ST_RSVR_R.sql deleted file mode 100644 index ec3fcf8..0000000 --- a/src/main/resources/sql/ST_RSVR_R.sql +++ /dev/null @@ -1,31 +0,0 @@ -CREATE TABLE "DB_ZHSK"."ST_RSVR_R" -( -"STCD" VARCHAR(10) NOT NULL, -"TM" TIMESTAMP(6) NOT NULL, -"RZ" DEC(7,3), -"INQ" DEC(9,3), -"W" DEC(9,3), -"BLRZ" DEC(7,3), -"OTQ" DEC(9,3), -"RWCHRCD" CHAR(1), -"RWPTN" CHAR(1), -"INQDR" DEC(5,2), -"MSQMT" CHAR(1), -NOT CLUSTER PRIMARY KEY("STCD", "TM")) STORAGE(ON "MAIN", CLUSTERBTR) ; - -COMMENT ON TABLE "DB_ZHSK"."ST_RSVR_R" IS '水库水情表'; -COMMENT ON COLUMN "DB_ZHSK"."ST_RSVR_R"."BLRZ" IS '库下水位'; -COMMENT ON COLUMN "DB_ZHSK"."ST_RSVR_R"."INQ" IS '入库流量'; -COMMENT ON COLUMN "DB_ZHSK"."ST_RSVR_R"."INQDR" IS '入流时段长'; -COMMENT ON COLUMN "DB_ZHSK"."ST_RSVR_R"."MSQMT" IS '测流方法'; -COMMENT ON COLUMN "DB_ZHSK"."ST_RSVR_R"."OTQ" IS '出库流量'; -COMMENT ON COLUMN "DB_ZHSK"."ST_RSVR_R"."RWCHRCD" IS '库水特征码'; -COMMENT ON COLUMN "DB_ZHSK"."ST_RSVR_R"."RWPTN" IS '库水水势'; -COMMENT ON COLUMN "DB_ZHSK"."ST_RSVR_R"."RZ" IS '库上水位'; -COMMENT ON COLUMN "DB_ZHSK"."ST_RSVR_R"."STCD" IS '测站编码'; -COMMENT ON COLUMN "DB_ZHSK"."ST_RSVR_R"."TM" IS '时间'; -COMMENT ON COLUMN "DB_ZHSK"."ST_RSVR_R"."W" IS '蓄水量'; - - -CREATE INDEX "stcd_tm" ON "DB_ZHSK"."ST_RSVR_R"("STCD" ASC,"TM" ASC) STORAGE(ON "MAIN", CLUSTERBTR) ; - diff --git a/src/main/resources/sql/ST_STCH_B.sql b/src/main/resources/sql/ST_STCH_B.sql deleted file mode 100644 index a9f3370..0000000 --- a/src/main/resources/sql/ST_STCH_B.sql +++ /dev/null @@ -1,31 +0,0 @@ -CREATE TABLE ST_STCH_B -( - ID INT IDENTITY(1, 1) NOT NULL, - STCD VARCHAR(50), - CHNM VARCHAR(50), - CHCD VARCHAR(50) NOT NULL, - CHID VARCHAR(50), - DEF SMALLINT DEFAULT 0, - CALC TINYINT, - FORMULA TINYINT, - A DECIMAL(20,10), - B DECIMAL(20,10), - C DECIMAL(20,10), - XID INT, - PRIMARY KEY(ID), - CONSTRAINT ST_STCH_B_STID_CHID UNIQUE(STID, CHID, CHCD) -); - -EXEC sp_addextendedproperty 'MS_Description', '站点采集项(通道）信息', 'SCHEMA', 'dbo', 'TABLE', 'ST_STCH_B', NULL; - -EXEC sp_addextendedproperty 'MS_Description', '公式参数a', 'SCHEMA', 'dbo', 'TABLE', 'ST_STCH_B', 'COLUMN', 'A'; -EXEC sp_addextendedproperty 'MS_Description', '公式参数b', 'SCHEMA', 'dbo', 'TABLE', 'ST_STCH_B', 'COLUMN', 'B'; -EXEC sp_addextendedproperty 'MS_Description', '公式参数c', 'SCHEMA', 'dbo', 'TABLE', 'ST_STCH_B', 'COLUMN', 'C'; -EXEC sp_addextendedproperty 'MS_Description', '是否计算量，0 否，1 是（例如一元二次方程计算流量），2 修正（例如水位加高程。限定公式为 y = a * x + b）', 'SCHEMA', 'dbo', 'TABLE', 'ST_STCH_B', 'COLUMN', 'CALC'; -EXEC sp_addextendedproperty 'MS_Description', '采集项编码，DRP\Z\Q\VT\W等', 'SCHEMA', 'dbo', 'TABLE', 'ST_STCH_B', 'COLUMN', 'CHCD'; -EXEC sp_addextendedproperty 'MS_Description', '采集项编号，0\1\2\3\4\5\6等', 'SCHEMA', 'dbo', 'TABLE', 'ST_STCH_B', 'COLUMN', 'CHID'; -EXEC sp_addextendedproperty 'MS_Description', '采集项名称', 'SCHEMA', 'dbo', 'TABLE', 'ST_STCH_B', 'COLUMN', 'CHNM'; -EXEC sp_addextendedproperty 'MS_Description', '是否默认采集项', 'SCHEMA', 'dbo', 'TABLE', 'ST_STCH_B', 'COLUMN', 'DEF'; -EXEC sp_addextendedproperty 'MS_Description', '计算公式 1， 5分钟时段值，2 ，1小时时段，3 一元二次方程', 'SCHEMA', 'dbo', 'TABLE', 'ST_STCH_B', 'COLUMN', 'FORMULA'; -EXEC sp_addextendedproperty 'MS_Description', '测站编码', 'SCHEMA', 'dbo', 'TABLE', 'ST_STCH_B', 'COLUMN', 'STCD'; -EXEC sp_addextendedproperty 'MS_Description', '选择公式计算时，x 的取值采集项 id', 'SCHEMA', 'dbo', 'TABLE', 'ST_STCH_B', 'COLUMN', 'XID'; diff --git a/src/main/resources/sql/ST_WATER_QUALITY_R.sql b/src/main/resources/sql/ST_WATER_QUALITY_R.sql deleted file mode 100644 index d6e7896..0000000 --- a/src/main/resources/sql/ST_WATER_QUALITY_R.sql +++ /dev/null @@ -1,134 +0,0 @@ -# CREATE TABLE [xyt].[HYD_RI_WQAMD_W] -# ( -# [STCD] CHAR(14) NOT NULL, -# [SPT] DATETIME2(6) NOT NULL, -# [WIMP] DECIMAL(4,2), -# [PH] DECIMAL(4,2), -# [COND] DECIMAL(6,0), -# [TURB] DECIMAL(3,0), -# [DOX] DECIMAL(4,2), -# [CODMN] DECIMAL(6,1), -# [CODCR] DECIMAL(7,1), -# [TN] DECIMAL(6,3), -# [NH3N] DECIMAL(6,3), -# [NO2] DECIMAL(5,3), -# [NO3] DECIMAL(5,3), -# [TP] DECIMAL(8,3), -# [TOC] DECIMAL(4,1), -# [VLPH] DECIMAL(10,6), -# [CHLA] DECIMAL(6,4), -# [F] DECIMAL(5,2), -# [ARS] DECIMAL(8,6), -# [HG] DECIMAL(9,7), -# [CR6] DECIMAL(5,3), -# [CU] DECIMAL(7,5), -# [PB] DECIMAL(7,5), -# [CD] DECIMAL(7,5), -# [ZN] DECIMAL(6,4), -# [SB] DECIMAL(7,5), -# [HUMIDITY] DECIMAL(4,2), -# [ROOMTMP] DECIMAL(4,2), -# [ID] INT IDENTITY(1, 1) NOT NULL, -# CONSTRAINT [PK_HYD_RI_WQAMD_W] PRIMARY KEY CLUSTERED ([ID]), -# CONSTRAINT [UQ_HYD_RI_WQAMD_W_ID] UNIQUE ([ID]), -# CONSTRAINT [UQ_HYD_RI_WQAMD_W_STCD_SPT] UNIQUE ([STCD], [SPT]) -# ) ON [MAIN] WITH (DATA_COMPRESSION = CLUSTERED COLUMNSTORE); - -CREATE TABLE [HYD_RI_WQAMD_W] -( - [STCD] VARCHAR(14) NOT NULL, - [SPT] DATETIME2(6) NOT NULL, - [WIMP] DECIMAL(4,2), - [PH] DECIMAL(4,2), - [COND] DECIMAL(6,0), - [TURB] DECIMAL(3,0), - [DOX] DECIMAL(4,2), - [CODMN] DECIMAL(6,1), - [CODCR] DECIMAL(7,1), - [TN] DECIMAL(6,3), - [NH3N] DECIMAL(6,3), - [NO2] DECIMAL(5,3), - [NO3] DECIMAL(5,3), - [TP] DECIMAL(8,3), - [TOC] DECIMAL(4,1), - [VLPH] DECIMAL(10,6), - [CHLA] DECIMAL(6,4), - [F] DECIMAL(5,2), - [ARS] DECIMAL(8,6), - [HG] DECIMAL(9,7), - [CR6] DECIMAL(5,3), - [CU] DECIMAL(7,5), - [PB] DECIMAL(7,5), - [CD] DECIMAL(7,5), - [ZN] DECIMAL(6,4), - [SB] DECIMAL(7,5), - [HUMIDITY] DECIMAL(4,2), - [ROOMTMP] DECIMAL(4,2), - [ID] INT IDENTITY(1, 1) NOT NULL, - CONSTRAINT [PK_HYD_RI_WQAMD_W] PRIMARY KEY CLUSTERED ([ID]), - CONSTRAINT [UQ_HYD_RI_WQAMD_W_ID] UNIQUE ([ID]), - CONSTRAINT [UQ_HYD_RI_WQAMD_W_STCD_SPT] UNIQUE ([STCD], [SPT]) - ) - - EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'水质自动监测数据' , @level0type=N'SCHEMA',@level0name=N'xyt', @level1type=N'TABLE',@level1name=N'HYD_RI_WQAMD_W'; - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'砷' , @level0type=N'SCHEMA',@level0name=N'xyt', @level1type=N'TABLE',@level1name=N'HYD_RI_WQAMD_W', @level2type=N'COLUMN',@level2name=N'ARS'; - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'镉' , @level0type=N'SCHEMA',@level0name=N'xyt', @level1type=N'TABLE',@level1name=N'HYD_RI_WQAMD_W', @level2type=N'COLUMN',@level2name=N'CD'; - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'叶绿素a' , @level0type=N'SCHEMA',@level0name=N'xyt', @level1type=N'TABLE',@level1name=N'HYD_RI_WQAMD_W', @level2type=N'COLUMN',@level2name=N'CHLA'; - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'化学需氧量' , @level0type=N'SCHEMA',@level0name=N'xyt', @level1type=N'TABLE',@level1name=N'HYD_RI_WQAMD_W', @level2type=N'COLUMN',@level2name=N'CODCR'; - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'高锰酸钾指数' , @level0type=N'SCHEMA',@level0name=N'xyt', @level1type=N'TABLE',@level1name=N'HYD_RI_WQAMD_W', @level2type=N'COLUMN',@level2name=N'CODMN'; - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'电导率' , @level0type=N'SCHEMA',@level0name=N'xyt', @level1type=N'TABLE',@level1name=N'HYD_RI_WQAMD_W', @level2type=N'COLUMN',@level2name=N'COND'; - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'铬(六价)' , @level0type=N'SCHEMA',@level0name=N'xyt', @level1type=N'TABLE',@level1name=N'HYD_RI_WQAMD_W', @level2type=N'COLUMN',@level2name=N'CR6'; - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'铜' , @level0type=N'SCHEMA',@level0name=N'xyt', @level1type=N'TABLE',@level1name=N'HYD_RI_WQAMD_W', @level2type=N'COLUMN',@level2name=N'CU'; - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'溶解氧' , @level0type=N'SCHEMA',@level0name=N'xyt', @level1type=N'TABLE',@level1name=N'HYD_RI_WQAMD_W', @level2type=N'COLUMN',@level2name=N'DOX'; - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'氟化物' , @level0type=N'SCHEMA',@level0name=N'xyt', @level1type=N'TABLE',@level1name=N'HYD_RI_WQAMD_W', @level2type=N'COLUMN',@level2name=N'F'; - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'汞' , @level0type=N'SCHEMA',@level0name=N'xyt', @level1type=N'TABLE',@level1name=N'HYD_RI_WQAMD_W', @level2type=N'COLUMN',@level2name=N'HG'; - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'湿度' , @level0type=N'SCHEMA',@level0name=N'xyt', @level1type=N'TABLE',@level1name=N'HYD_RI_WQAMD_W', @level2type=N'COLUMN',@level2name=N'HUMIDITY'; - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'氨氮' , @level0type=N'SCHEMA',@level0name=N'xyt', @level1type=N'TABLE',@level1name=N'HYD_RI_WQAMD_W', @level2type=N'COLUMN',@level2name=N'NH3N'; - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'亚硝酸盐氮' , @level0type=N'SCHEMA',@level0name=N'xyt', @level1type=N'TABLE',@level1name=N'HYD_RI_WQAMD_W', @level2type=N'COLUMN',@level2name=N'NO2'; - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'硝酸盐氮' , @level0type=N'SCHEMA',@level0name=N'xyt', @level1type=N'TABLE',@level1name=N'HYD_RI_WQAMD_W', @level2type=N'COLUMN',@level2name=N'NO3'; - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'铅' , @level0type=N'SCHEMA',@level0name=N'xyt', @level1type=N'TABLE',@level1name=N'HYD_RI_WQAMD_W', @level2type=N'COLUMN',@level2name=N'PB'; - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'PH值' , @level0type=N'SCHEMA',@level0name=N'xyt', @level1type=N'TABLE',@level1name=N'HYD_RI_WQAMD_W', @level2type=N'COLUMN',@level2name=N'PH'; - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'室温' , @level0type=N'SCHEMA',@level0name=N'xyt', @level1type=N'TABLE',@level1name=N'HYD_RI_WQAMD_W', @level2type=N'COLUMN',@level2name=N'ROOMTMP'; - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'锑' , @level0type=N'SCHEMA',@level0name=N'xyt', @level1type=N'TABLE',@level1name=N'HYD_RI_WQAMD_W', @level2type=N'COLUMN',@level2name=N'SB'; - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'采样时间' , @level0type=N'SCHEMA',@level0name=N'xyt', @level1type=N'TABLE',@level1name=N'HYD_RI_WQAMD_W', @level2type=N'COLUMN',@level2name=N'SPT'; - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'站码' , @level0type=N'SCHEMA',@level0name=N'xyt', @level1type=N'TABLE',@level1name=N'HYD_RI_WQAMD_W', @level2type=N'COLUMN',@level2name=N'STCD'; - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'总氮' , @level0type=N'SCHEMA',@level0name=N'xyt', @level1type=N'TABLE',@level1name=N'HYD_RI_WQAMD_W', @level2type=N'COLUMN',@level2name=N'TN'; - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'总有机碳' , @level0type=N'SCHEMA',@level0name=N'xyt', @level1type=N'TABLE',@level1name=N'HYD_RI_WQAMD_W', @level2type=N'COLUMN',@level2name=N'TOC'; - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'总磷' , @level0type=N'SCHEMA',@level0name=N'xyt', @level1type=N'TABLE',@level1name=N'HYD_RI_WQAMD_W', @level2type=N'COLUMN',@level2name=N'TP'; - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'浑浊度' , @level0type=N'SCHEMA',@level0name=N'xyt', @level1type=N'TABLE',@level1name=N'HYD_RI_WQAMD_W', @level2type=N'COLUMN',@level2name=N'TURB'; - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'挥发酚' , @level0type=N'SCHEMA',@level0name=N'xyt', @level1type=N'TABLE',@level1name=N'HYD_RI_WQAMD_W', @level2type=N'COLUMN',@level2name=N'VLPH'; - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'水温' , @level0type=N'SCHEMA',@level0name=N'xyt', @level1type=N'TABLE',@level1name=N'HYD_RI_WQAMD_W', @level2type=N'COLUMN',@level2name=N'WIMP'; - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'锌' , @level0type=N'SCHEMA',@level0name=N'xyt', @level1type=N'TABLE',@level1name=N'HYD_RI_WQAMD_W', @level2type=N'COLUMN',@level2name=N'ZN'; - -CREATE INDEX [IX_HYD_RI_WQAMD_W_STCD_SPT] ON [xyt].[HYD_RI_WQAMD_W] ([STCD] ASC, [SPT] ASC) ON [MAIN] WITH (DATA_COMPRESSION = CLUSTERED COLUMNSTORE); - - -SET IDENTITY_INSERT ST_WATER_QUALITY_R ON; \ No newline at end of file diff --git a/src/main/resources/sql/ServiceResource.sql b/src/main/resources/sql/ServiceResource.sql deleted file mode 100644 index 167433a..0000000 --- a/src/main/resources/sql/ServiceResource.sql +++ /dev/null @@ -1,168 +0,0 @@ -/* - Navicat Premium Data Transfer - - Source Server : dev-mssql - Source Server Type : SQL Server - Source Server Version : 16001000 - Source Host : 10.0.41.115:1433 - Source Catalog : xyt - Source Schema : dbo - - Target Server Type : SQL Server - Target Server Version : 16001000 - File Encoding : 65001 - - Date: 24/01/2024 16:12:30 -*/ - - --- ---------------------------- --- Table structure for SERVICE_RESOURCE --- ---------------------------- -IF EXISTS (SELECT * FROM sys.all_objects WHERE object_id = OBJECT_ID(N'[dbo].[SERVICE_RESOURCE]') AND type IN ('U')) - DROP TABLE [dbo].[SERVICE_RESOURCE] -GO - -CREATE TABLE [dbo].[SERVICE_RESOURCE] ( - [ID] nvarchar(255) COLLATE Chinese_PRC_CI_AS NULL, - [NAME] nvarchar(255) COLLATE Chinese_PRC_CI_AS NULL, - [DESCRIPTION] nvarchar(255) COLLATE Chinese_PRC_CI_AS NULL, - [SERVICE_TYPE] nvarchar(255) COLLATE Chinese_PRC_CI_AS NULL, - [URL] nvarchar(255) COLLATE Chinese_PRC_CI_AS NULL, - [PORT] int NULL, - [PROVIDER] nvarchar(255) COLLATE Chinese_PRC_CI_AS NULL, - [TARGET_TABLE] nvarchar(255) COLLATE Chinese_PRC_CI_AS NULL, - [TARGET_TM_FIELD] nvarchar(255) COLLATE Chinese_PRC_CI_AS NULL, - [ROUTE] nvarchar(255) COLLATE Chinese_PRC_CI_AS NULL, - [CONTACT] nvarchar(255) COLLATE Chinese_PRC_CI_AS NULL, - [PHONE] nvarchar(255) COLLATE Chinese_PRC_CI_AS NULL, - [REGISTER_DATE] datetime NULL, - [UPDATE_TM] datetime NULL, - [ENABLE] int NULL, - [STATUS] int NULL, - [LAST_DATA_TM] datetime NULL -) -GO - -ALTER TABLE [dbo].[SERVICE_RESOURCE] SET (LOCK_ESCALATION = TABLE) -GO - -EXEC sp_addextendedproperty -'MS_Description', N'id', -'SCHEMA', N'dbo', -'TABLE', N'SERVICE_RESOURCE', -'COLUMN', N'ID' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'服务名称', -'SCHEMA', N'dbo', -'TABLE', N'SERVICE_RESOURCE', -'COLUMN', N'NAME' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'服务描述', -'SCHEMA', N'dbo', -'TABLE', N'SERVICE_RESOURCE', -'COLUMN', N'DESCRIPTION' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'服务类型', -'SCHEMA', N'dbo', -'TABLE', N'SERVICE_RESOURCE', -'COLUMN', N'SERVICE_TYPE' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'服务地址', -'SCHEMA', N'dbo', -'TABLE', N'SERVICE_RESOURCE', -'COLUMN', N'URL' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'服务端口', -'SCHEMA', N'dbo', -'TABLE', N'SERVICE_RESOURCE', -'COLUMN', N'PORT' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'服务提供者', -'SCHEMA', N'dbo', -'TABLE', N'SERVICE_RESOURCE', -'COLUMN', N'PROVIDER' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'目标表', -'SCHEMA', N'dbo', -'TABLE', N'SERVICE_RESOURCE', -'COLUMN', N'TARGET_TABLE' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'目标时间依据字段', -'SCHEMA', N'dbo', -'TABLE', N'SERVICE_RESOURCE', -'COLUMN', N'TARGET_TM_FIELD' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'路由', -'SCHEMA', N'dbo', -'TABLE', N'SERVICE_RESOURCE', -'COLUMN', N'ROUTE' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'联系人', -'SCHEMA', N'dbo', -'TABLE', N'SERVICE_RESOURCE', -'COLUMN', N'CONTACT' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'联系电话', -'SCHEMA', N'dbo', -'TABLE', N'SERVICE_RESOURCE', -'COLUMN', N'PHONE' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'注册日期', -'SCHEMA', N'dbo', -'TABLE', N'SERVICE_RESOURCE', -'COLUMN', N'REGISTER_DATE' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'修改日期', -'SCHEMA', N'dbo', -'TABLE', N'SERVICE_RESOURCE', -'COLUMN', N'UPDATE_TM' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'启用, 0-停用，1-启用', -'SCHEMA', N'dbo', -'TABLE', N'SERVICE_RESOURCE', -'COLUMN', N'ENABLE' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'状态, 0-不在线/异常，1-在线/正常', -'SCHEMA', N'dbo', -'TABLE', N'SERVICE_RESOURCE', -'COLUMN', N'STATUS' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'最近数据时间', -'SCHEMA', N'dbo', -'TABLE', N'SERVICE_RESOURCE', -'COLUMN', N'LAST_DATA_TM' -GO - diff --git a/src/test/java/com/gunshi/project/xyt/TestMain.java b/src/test/java/com/gunshi/project/xyt/TestMain.java deleted file mode 100644 index 8911183..0000000 --- a/src/test/java/com/gunshi/project/xyt/TestMain.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.gunshi.project.xyt; - -import com.gunshi.core.annotation.GunShiApplication; -import org.mybatis.spring.annotation.MapperScan; - -/** - * 类描述 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-23 - */ -@GunShiApplication -@MapperScan(basePackages = {"com.gunshi.**.mapper", "com.gunshi.**.model"}) -public class TestMain { -} diff --git a/src/test/java/com/gunshi/project/xyt/controller/TestController.java b/src/test/java/com/gunshi/project/xyt/controller/TestController.java deleted file mode 100644 index 7e14c48..0000000 --- a/src/test/java/com/gunshi/project/xyt/controller/TestController.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.gunshi.project.xyt.controller; - -import com.gunshi.logging.access.annotation.LoginLogging; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 类描述 - * - * @author lyf - * @version 1.0.0 - * @since 2024-01-23 - */ -@RestController -@RequestMapping("/test") -public class TestController { - @LoginLogging - @GetMapping("/ping") - public String pong() { - return "pong"; - } -} diff --git a/src/test/java/com/gunshi/project/xyt/service/StAdcdServiceTest.java b/src/test/java/com/gunshi/project/xyt/service/StAdcdServiceTest.java deleted file mode 100644 index b25ad12..0000000 --- a/src/test/java/com/gunshi/project/xyt/service/StAdcdServiceTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.gunshi.project.xyt.service; - -import com.gunshi.project.xyt.Main; -import com.gunshi.project.xyt.entity.basedata.GeneralSearch; -import lombok.extern.slf4j.Slf4j; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.ContextConfiguration; -import ru.olegcherednik.jackson_utils.JacksonUtils; - -@SpringBootTest -@ContextConfiguration(classes = Main.class) -@Slf4j -class StAdcdServiceTest { - @Autowired - private StAdcdService stAdcdService; - - @Test - void queryBySearch() { - GeneralSearch addvcdSearch = new GeneralSearch(); - addvcdSearch.setKeyword("麻城"); - log.info("{}", JacksonUtils.writeValue(stAdcdService.queryBySearch(addvcdSearch))); - } - - @Test - void test(){ - log.info("{}",stAdcdService.getParentAddvcd("420000000000000")); - log.info("{}",stAdcdService.getParentAddvcd("421100000000000")); - log.info("{}",stAdcdService.getParentAddvcd("421212000000000")); - log.info("{}",stAdcdService.getParentAddvcd("421312101000000")); - log.info("{}",stAdcdService.getParentAddvcd("421413102101000")); - log.info("{}",stAdcdService.getParentAddvcd("421514112201123")); - } - - @Test - void queryTree() { - log.info("{}", JacksonUtils.writeValue(stAdcdService.queryTree("420116001"))); - } -} \ No newline at end of file diff --git a/src/test/java/com/gunshi/project/xyt/service/StCameraAreaServiceTest.java b/src/test/java/com/gunshi/project/xyt/service/StCameraAreaServiceTest.java deleted file mode 100644 index 5cf9b82..0000000 --- a/src/test/java/com/gunshi/project/xyt/service/StCameraAreaServiceTest.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.gunshi.project.xyt.service; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gunshi.db.dto.PageSo; -import com.gunshi.project.xyt.Main; -import com.gunshi.project.xyt.entity.basedata.GeneralSearch; -import com.gunshi.project.xyt.entity.basedata.StCameraAreaTreeVo; -import com.gunshi.project.xyt.entity.basedata.StCameraAreaVo; -import com.gunshi.project.xyt.model.StCameraAreaB; -import lombok.extern.slf4j.Slf4j; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.ContextConfiguration; -import ru.olegcherednik.jackson_utils.JacksonUtils; - -import java.util.List; - -@SpringBootTest -@ContextConfiguration(classes = Main.class) -@Slf4j -class StCameraAreaServiceTest { - @Autowired - private StCameraAreaService stCameraAreaService; - - @Test - void queryStCameraAreaBList() { - List list1 = stCameraAreaService.queryListByName("公路"); - log.info("{}", list1); - List list2 = stCameraAreaService.queryListByName(""); - log.info("{}", list2); - GeneralSearch generalSearch = new GeneralSearch(); - generalSearch.setKeyword(""); - generalSearch.setPageSo(PageSo.of(1, 10)); - Page stCameraAreaVoPage = stCameraAreaService.queryListBySearch(generalSearch); - log.info("{}", JacksonUtils.writeValue(stCameraAreaVoPage)); - } - - @Test - void insertStCameraAreaB() { - StCameraAreaB stCameraAreaB = new StCameraAreaB(); - stCameraAreaB.setCamArNm("公路2"); - stCameraAreaB.setPid(0L); - stCameraAreaB.setStatus(1); - stCameraAreaB.setComments("备注2"); - stCameraAreaService.insert(stCameraAreaB); - } - - @Test - void insertStCameraAreaB2() { - StCameraAreaB stCameraAreaB = new StCameraAreaB(); - stCameraAreaB.setCamArNm("公路1-1"); - stCameraAreaB.setPid(1750075892207497218L); - stCameraAreaB.setStatus(1); - stCameraAreaB.setComments("备注"); - stCameraAreaService.insert(stCameraAreaB); - } - - @Test - void updateStCameraAreaB() { - StCameraAreaB stCameraAreaB = stCameraAreaService.queryById(1750077729811742721L); - stCameraAreaB.setComments(null); - stCameraAreaService.update(stCameraAreaB); - } - - @Test - void queryStCameraAreaBTree() { - List list = stCameraAreaService.queryTree(); - log.info("{}", JacksonUtils.writeValue(list)); - } -} \ No newline at end of file diff --git a/src/test/java/com/gunshi/project/xyt/service/StCameraServiceTest.java b/src/test/java/com/gunshi/project/xyt/service/StCameraServiceTest.java deleted file mode 100644 index 4751d97..0000000 --- a/src/test/java/com/gunshi/project/xyt/service/StCameraServiceTest.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.gunshi.project.xyt.service; - -import com.gunshi.project.xyt.Main; -import com.gunshi.project.xyt.entity.basedata.StCameraSearch; -import com.gunshi.project.xyt.model.StCameraB; -import lombok.extern.slf4j.Slf4j; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.ContextConfiguration; -import ru.olegcherednik.jackson_utils.JacksonUtils; - -import java.math.BigDecimal; - -import static org.junit.jupiter.api.Assertions.*; - - -@SpringBootTest -@ContextConfiguration(classes = Main.class) -@Slf4j -class StCameraServiceTest { - @Autowired - private StCameraService stCameraService; - - @Test - void insert() { - StCameraB stCameraB = new StCameraB(); - stCameraB.setCamNm("大坝1-1左1"); - stCameraB.setCamSn("12345678912"); - stCameraB.setCamArId(1001L); - stCameraB.setCamType(1L); - stCameraB.setStatus(1); - stCameraB.setCamUrl("rtsp://172.16.0.1:1080"); - stCameraB.setComments("备注"); - stCameraB.setDefaultShow(0); - stCameraB.setLgtd(BigDecimal.valueOf(101.1511d)); - stCameraB.setLttd(BigDecimal.valueOf(23.1511d)); - stCameraService.insert(stCameraB); - } - - @Test - void update() { - StCameraB stCameraB = stCameraService.queryById(1750353808199888897L); - stCameraB.setCamNm("大坝顶左1-1"); - stCameraB.setCamCh(1); - stCameraB.setComments(null); - stCameraService.update(stCameraB); - } - - @Test - void queryBySearch() { - StCameraSearch stCameraSearch = new StCameraSearch(); - stCameraSearch.setKeyword("1-1"); - - log.info("{}", JacksonUtils.writeValue(stCameraService.queryBySearch(stCameraSearch))); - - stCameraSearch = new StCameraSearch(); - stCameraSearch.setKeyword("1-1"); - stCameraSearch.setCamType(2L); - log.info("{}", JacksonUtils.writeValue(stCameraService.queryBySearch(stCameraSearch))); - - stCameraSearch = new StCameraSearch(); - stCameraSearch.setKeyword("1-1"); - stCameraSearch.setCamType(1L); - stCameraSearch.setPage(1); - stCameraSearch.setPageSize(10); - log.info("{}", JacksonUtils.writeValue(stCameraService.queryBySearch(stCameraSearch))); - - stCameraSearch = new StCameraSearch(); - stCameraSearch.setKeyword("1-1"); - stCameraSearch.setCamType(1L); - stCameraSearch.setPage(1); - stCameraSearch.setPageSize(1); - log.info("{}", JacksonUtils.writeValue(stCameraService.queryBySearch(stCameraSearch))); - - stCameraSearch = new StCameraSearch(); - stCameraSearch.setKeyword("1-1"); - stCameraSearch.setCamType(1L); - stCameraSearch.setPage(2); - stCameraSearch.setPageSize(10); - log.info("{}", JacksonUtils.writeValue(stCameraService.queryBySearch(stCameraSearch))); - } -} \ No newline at end of file diff --git a/src/test/java/com/gunshi/project/xyt/service/SysDictServiceTest.java b/src/test/java/com/gunshi/project/xyt/service/SysDictServiceTest.java deleted file mode 100644 index a5e09d6..0000000 --- a/src/test/java/com/gunshi/project/xyt/service/SysDictServiceTest.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.gunshi.project.xyt.service; - -import com.gunshi.project.xyt.Main; -import com.gunshi.project.xyt.entity.basedata.GeneralSearch; -import com.gunshi.project.xyt.model.SysDictB; -import lombok.extern.slf4j.Slf4j; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.ContextConfiguration; -import ru.olegcherednik.jackson_utils.JacksonUtils; - -@SpringBootTest -@ContextConfiguration(classes = Main.class) -@Slf4j -class SysDictServiceTest { - @Autowired - private SysDictService sysDictService; - @Test - void insert() { - SysDictB sysDictB = new SysDictB(); - sysDictB.setDictNm("测试类型"); - sysDictB.setDictCd("2"); - sysDictB.setPid(1750409373064220673L); - sysDictB.setSortOn(1); - sysDictB.setStatus(1); - sysDictService.insert(sysDictB); - } - - @Test - void update() { - SysDictB sysDictB = sysDictService.queryById(1750400498717966338L); - sysDictB.setSortOn(1); - sysDictService.update(sysDictB); - } - - @Test - void queryBySearch() { - GeneralSearch sysDictSearch = new GeneralSearch(); - sysDictSearch.setKeyword(""); - log.info("{}", JacksonUtils.writeValue(sysDictService.queryBySearch(sysDictSearch))); - - sysDictSearch = new GeneralSearch(); - sysDictSearch.setKeyword("类型"); - log.info("{}", JacksonUtils.writeValue(sysDictService.queryBySearch(sysDictSearch))); - - sysDictSearch = new GeneralSearch(); - sysDictSearch.setKeyword("类型"); - log.info("{}", JacksonUtils.writeValue(sysDictService.queryBySearch(sysDictSearch))); - } -} \ No newline at end of file diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml deleted file mode 100644 index 3bbdaa9..0000000 --- a/src/test/resources/application.yml +++ /dev/null @@ -1,64 +0,0 @@ -server: - port: 24101 - servlet: - context-path: /gunshiApp/xyt - -spring: - datasource: - dynamic: - datasource: - master: - url: jdbc:sqlserver://10.0.41.115:1433;DatabaseName=xyt;trustServerCertificate=true - username: sa - password: Gunshi@2024 - driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - access-logging: - url: jdbc:sqlserver://10.0.41.115:1433;DatabaseName=xyt;trustServerCertificate=true - username: sa - password: Gunshi@2024 - driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - - data: - redis: - host: 10.0.41.112 - port: 6379 - password: 1234567a - database: 1 - -gunshi: - core: - appName: project-xyt - file: - key: test.by_lyf.tmp - secret: xPXPAb63FphkGkPU0ZZkNIXmDzjDVeF3PBH6ZEKw - endpoint: http://223.75.53.141:9102 - publicBucket: test.by-lyf.tmp - loginBucket: test.by-lyf.tmp - privateBucket: test.by-lyf.tmp - access: - logging: - enabled: true - login: - enabled: true - maxHistory: 200 - operation: - enabled: true - maxHistory: 200 - collection: operationLogging - exception: - enabled: true - maxHistory: 200 - collection: exceptionLogging - mongo: - enabled: true - uri: mongodb://10.0.41.112:27017 - database: gunshi-logging - username: gunshi_logger - password: 1234567a - -mybatis-plus: - configuration: - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - global-config: - db-config: - update-strategy: always \ No newline at end of file diff --git a/src/test/resources/logback.xml b/src/test/resources/logback.xml deleted file mode 100644 index 8e23219..0000000 --- a/src/test/resources/logback.xml +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - %d{yyyy-MM-dd HH:mm:ss} [%level] - %m%n - - - - - - ./logs/project.log - - - %d{yyyy-MM-dd HH:mm:ss} [%class:%line] - %m%n - - - - - - ./logs/project-info.%d{yyyy-MM-dd}.log - - 7 - - - - - - ./logs/project-error.log - - - %d{yyyy-MM-dd HH:mm:ss} [%class:%line] - %m%n - - - - - ERROR - - ACCEPT - - DENY - - - - - ./logs/project-error.%d{yyyy-MM-dd}.log - - 7 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${CONSOLE_LOG_PATTERN} - utf8 - - - - \ No newline at end of file