From bd42f45bf08d8161e3d693b40ffdd9d07b0921f1 Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 14 Jun 2022 14:01:27 +0800 Subject: [PATCH 01/58] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=EF=BC=8C=E8=B0=83=E7=94=A8ruoyi=E6=8B=BF=E5=8F=96BaseGrid?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/task/GuardarDatosTask.java | 2 +- .../dto/constant/CaWghDataConstant.java | 8 +- .../epmet/opendata/dto/wgh/BasegridDTO.java | 64 ++++++ .../com/epmet/opendata/dto/wgh/BmGridDTO.java | 206 +++++++++++++++++ .../epmet/opendata/dto/wgh/CommunityDTO.java | 54 +++++ .../dto/wgh/SubdistrictOfficeDTO.java | 44 ++++ .../epmet/opendata/dto/wgh/WghDywgDTO.java | 74 ++++++ .../com/epmet/opendata/dto/wgh/WghJdbDTO.java | 54 +++++ .../com/epmet/opendata/dto/wgh/WghJqzDTO.java | 124 ++++++++++ .../epmet/opendata/dto/wgh/WghJxcsDTO.java | 119 ++++++++++ .../com/epmet/opendata/dto/wgh/WghJyzDTO.java | 124 ++++++++++ .../epmet/opendata/dto/wgh/WghSjxxbDTO.java | 94 ++++++++ .../epmet/opendata/dto/wgh/WghSqxxDTO.java | 139 ++++++++++++ .../epmet/opendata/dto/wgh/WghSzcgwghDTO.java | 49 ++++ .../epmet/opendata/dto/wgh/WghSzzrwgDTO.java | 49 ++++ .../epmet/opendata/dto/wgh/WghWhpdwDTO.java | 134 +++++++++++ .../epmet/opendata/dto/wgh/WghYjbmcsDTO.java | 84 +++++++ .../epmet/opendata/dto/wgh/WghYqhjzDTO.java | 124 ++++++++++ .../controller/BasegridController.java | 96 ++++++++ .../opendata/controller/BmGridController.java | 83 +++++++ .../controller/CommunityController.java | 83 +++++++ .../SubdistrictOfficeController.java | 83 +++++++ .../controller/WghDywgController.java | 83 +++++++ .../opendata/controller/WghJdbController.java | 83 +++++++ .../opendata/controller/WghJqzController.java | 83 +++++++ .../controller/WghJxcsController.java | 82 +++++++ .../opendata/controller/WghJyzController.java | 82 +++++++ .../controller/WghSjxxbController.java | 82 +++++++ .../controller/WghSqxxController.java | 82 +++++++ .../controller/WghSzcgwghController.java | 82 +++++++ .../controller/WghSzzrwgController.java | 82 +++++++ .../controller/WghWhpdwController.java | 82 +++++++ .../controller/WghYjbmcsController.java | 82 +++++++ .../controller/WghYqhjzController.java | 81 +++++++ .../com/epmet/opendata/dao/BasegridDao.java | 18 ++ .../com/epmet/opendata/dao/BmGridDao.java | 17 ++ .../com/epmet/opendata/dao/CommunityDao.java | 17 ++ .../opendata/dao/SubdistrictOfficeDao.java | 17 ++ .../com/epmet/opendata/dao/WghDywgDao.java | 17 ++ .../com/epmet/opendata/dao/WghJdbDao.java | 17 ++ .../com/epmet/opendata/dao/WghJqzDao.java | 16 ++ .../com/epmet/opendata/dao/WghJxcsDao.java | 16 ++ .../com/epmet/opendata/dao/WghJyzDao.java | 16 ++ .../com/epmet/opendata/dao/WghSjxxbDao.java | 16 ++ .../com/epmet/opendata/dao/WghSqxxDao.java | 17 ++ .../com/epmet/opendata/dao/WghSzcgwghDao.java | 17 ++ .../com/epmet/opendata/dao/WghSzzrwgDao.java | 16 ++ .../com/epmet/opendata/dao/WghWhpdwDao.java | 16 ++ .../com/epmet/opendata/dao/WghYjbmcsDao.java | 16 ++ .../com/epmet/opendata/dao/WghYqhjzDao.java | 16 ++ .../epmet/opendata/entity/BasegridEntity.java | 69 ++++++ .../epmet/opendata/entity/BmGridEntity.java | 211 ++++++++++++++++++ .../opendata/entity/CommunityEntity.java | 59 +++++ .../entity/SubdistrictOfficeEntity.java | 49 ++++ .../epmet/opendata/entity/WghDywgEntity.java | 79 +++++++ .../epmet/opendata/entity/WghJdbEntity.java | 59 +++++ .../epmet/opendata/entity/WghJqzEntity.java | 129 +++++++++++ .../epmet/opendata/entity/WghJxcsEntity.java | 119 ++++++++++ .../epmet/opendata/entity/WghJyzEntity.java | 129 +++++++++++ .../epmet/opendata/entity/WghSjxxbEntity.java | 99 ++++++++ .../epmet/opendata/entity/WghSqxxEntity.java | 144 ++++++++++++ .../opendata/entity/WghSzcgwghEntity.java | 49 ++++ .../opendata/entity/WghSzzrwgEntity.java | 54 +++++ .../epmet/opendata/entity/WghWhpdwEntity.java | 139 ++++++++++++ .../opendata/entity/WghYjbmcsEntity.java | 89 ++++++++ .../epmet/opendata/entity/WghYqhjzEntity.java | 129 +++++++++++ .../epmet/opendata/excel/BasegridExcel.java | 45 ++++ .../com/epmet/opendata/excel/BmGridExcel.java | 129 +++++++++++ .../epmet/opendata/excel/CommunityExcel.java | 39 ++++ .../excel/SubdistrictOfficeExcel.java | 33 +++ .../epmet/opendata/excel/WghDywgExcel.java | 51 +++++ .../com/epmet/opendata/excel/WghJdbExcel.java | 39 ++++ .../com/epmet/opendata/excel/WghJqzExcel.java | 81 +++++++ .../epmet/opendata/excel/WghJxcsExcel.java | 78 +++++++ .../com/epmet/opendata/excel/WghJyzExcel.java | 81 +++++++ .../epmet/opendata/excel/WghSjxxbExcel.java | 63 ++++++ .../epmet/opendata/excel/WghSqxxExcel.java | 90 ++++++++ .../epmet/opendata/excel/WghSzcgwghExcel.java | 36 +++ .../epmet/opendata/excel/WghSzzrwgExcel.java | 36 +++ .../epmet/opendata/excel/WghWhpdwExcel.java | 87 ++++++++ .../epmet/opendata/excel/WghYjbmcsExcel.java | 57 +++++ .../epmet/opendata/excel/WghYqhjzExcel.java | 81 +++++++ .../epmet/opendata/redis/BasegridRedis.java | 30 +++ .../com/epmet/opendata/redis/BmGridRedis.java | 30 +++ .../epmet/opendata/redis/CommunityRedis.java | 30 +++ .../redis/SubdistrictOfficeRedis.java | 30 +++ .../epmet/opendata/redis/WghDywgRedis.java | 30 +++ .../com/epmet/opendata/redis/WghJdbRedis.java | 30 +++ .../com/epmet/opendata/redis/WghJqzRedis.java | 30 +++ .../epmet/opendata/redis/WghJxcsRedis.java | 30 +++ .../com/epmet/opendata/redis/WghJyzRedis.java | 30 +++ .../epmet/opendata/redis/WghSjxxbRedis.java | 30 +++ .../epmet/opendata/redis/WghSqxxRedis.java | 30 +++ .../epmet/opendata/redis/WghSzcgwghRedis.java | 30 +++ .../epmet/opendata/redis/WghSzzrwgRedis.java | 30 +++ .../epmet/opendata/redis/WghWhpdwRedis.java | 30 +++ .../epmet/opendata/redis/WghYjbmcsRedis.java | 30 +++ .../epmet/opendata/redis/WghYqhjzRedis.java | 30 +++ .../opendata/service/BasegridService.java | 88 ++++++++ .../epmet/opendata/service/BmGridService.java | 82 +++++++ .../opendata/service/CommunityService.java | 79 +++++++ .../service/SubdistrictOfficeService.java | 79 +++++++ .../opendata/service/WghDywgService.java | 78 +++++++ .../epmet/opendata/service/WghJdbService.java | 79 +++++++ .../epmet/opendata/service/WghJqzService.java | 79 +++++++ .../opendata/service/WghJxcsService.java | 79 +++++++ .../epmet/opendata/service/WghJyzService.java | 78 +++++++ .../opendata/service/WghSjxxbService.java | 78 +++++++ .../opendata/service/WghSqxxService.java | 79 +++++++ .../opendata/service/WghSzcgwghService.java | 79 +++++++ .../opendata/service/WghSzzrwgService.java | 79 +++++++ .../opendata/service/WghWhpdwService.java | 79 +++++++ .../opendata/service/WghYjbmcsService.java | 79 +++++++ .../opendata/service/WghYqhjzService.java | 78 +++++++ .../service/impl/BasegridServiceImpl.java | 168 ++++++++++++++ .../service/impl/BmGridServiceImpl.java | 91 ++++++++ .../service/impl/CommunityServiceImpl.java | 87 ++++++++ .../impl/GuardarDatosTaskServiceImpl.java | 7 + .../impl/SubdistrictOfficeServiceImpl.java | 87 ++++++++ .../service/impl/WghDywgServiceImpl.java | 87 ++++++++ .../service/impl/WghJdbServiceImpl.java | 87 ++++++++ .../service/impl/WghJqzServiceImpl.java | 87 ++++++++ .../service/impl/WghJxcsServiceImpl.java | 87 ++++++++ .../service/impl/WghJyzServiceImpl.java | 87 ++++++++ .../service/impl/WghSjxxbServiceImpl.java | 87 ++++++++ .../service/impl/WghSqxxServiceImpl.java | 87 ++++++++ .../service/impl/WghSzcgwghServiceImpl.java | 87 ++++++++ .../service/impl/WghSzzrwgServiceImpl.java | 88 ++++++++ .../service/impl/WghWhpdwServiceImpl.java | 87 ++++++++ .../service/impl/WghYjbmcsServiceImpl.java | 87 ++++++++ .../service/impl/WghYqhjzServiceImpl.java | 87 ++++++++ .../src/main/resources/mapper/BasegridDao.xml | 22 ++ .../src/main/resources/mapper/BmGridDao.xml | 47 ++++ .../main/resources/mapper/CommunityDao.xml | 17 ++ .../resources/mapper/SubdistrictOfficeDao.xml | 15 ++ .../src/main/resources/mapper/WghDywgDao.xml | 21 ++ .../src/main/resources/mapper/WghJdbDao.xml | 17 ++ .../src/main/resources/mapper/WghJqzDao.xml | 31 +++ .../src/main/resources/mapper/WghJxcsDao.xml | 30 +++ .../src/main/resources/mapper/WghJyzDao.xml | 31 +++ .../src/main/resources/mapper/WghSjxxbDao.xml | 25 +++ .../src/main/resources/mapper/WghSqxxDao.xml | 34 +++ .../main/resources/mapper/WghSzcgwghDao.xml | 16 ++ .../main/resources/mapper/WghSzzrwgDao.xml | 16 ++ .../src/main/resources/mapper/WghWhpdwDao.xml | 33 +++ .../main/resources/mapper/WghYjbmcsDao.xml | 23 ++ .../src/main/resources/mapper/WghYqhjzDao.xml | 31 +++ 147 files changed, 9417 insertions(+), 3 deletions(-) create mode 100644 epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/BasegridDTO.java create mode 100644 epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/BmGridDTO.java create mode 100644 epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/CommunityDTO.java create mode 100644 epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/SubdistrictOfficeDTO.java create mode 100644 epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghDywgDTO.java create mode 100644 epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJdbDTO.java create mode 100644 epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJqzDTO.java create mode 100644 epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJxcsDTO.java create mode 100644 epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJyzDTO.java create mode 100644 epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSjxxbDTO.java create mode 100644 epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSqxxDTO.java create mode 100644 epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSzcgwghDTO.java create mode 100644 epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSzzrwgDTO.java create mode 100644 epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghWhpdwDTO.java create mode 100644 epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghYjbmcsDTO.java create mode 100644 epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghYqhjzDTO.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BasegridController.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BmGridController.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CommunityController.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/SubdistrictOfficeController.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghDywgController.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJdbController.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJqzController.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJxcsController.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJyzController.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxbController.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSqxxController.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSzcgwghController.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSzzrwgController.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghWhpdwController.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghYjbmcsController.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghYqhjzController.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/BasegridDao.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/BmGridDao.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CommunityDao.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/SubdistrictOfficeDao.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghDywgDao.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJdbDao.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJqzDao.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJxcsDao.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJyzDao.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxbDao.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSqxxDao.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSzcgwghDao.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSzzrwgDao.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghWhpdwDao.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghYjbmcsDao.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghYqhjzDao.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BasegridEntity.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BmGridEntity.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CommunityEntity.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/SubdistrictOfficeEntity.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghDywgEntity.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJdbEntity.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJqzEntity.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJxcsEntity.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJyzEntity.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSjxxbEntity.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSqxxEntity.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSzcgwghEntity.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSzzrwgEntity.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghWhpdwEntity.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghYjbmcsEntity.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghYqhjzEntity.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/BasegridExcel.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/BmGridExcel.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/CommunityExcel.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/SubdistrictOfficeExcel.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghDywgExcel.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghJdbExcel.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghJqzExcel.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghJxcsExcel.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghJyzExcel.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSjxxbExcel.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSqxxExcel.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSzcgwghExcel.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSzzrwgExcel.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghWhpdwExcel.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghYjbmcsExcel.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghYqhjzExcel.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/BasegridRedis.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/BmGridRedis.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/CommunityRedis.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/SubdistrictOfficeRedis.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghDywgRedis.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghJdbRedis.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghJqzRedis.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghJxcsRedis.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghJyzRedis.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghSjxxbRedis.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghSqxxRedis.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghSzcgwghRedis.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghSzzrwgRedis.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghWhpdwRedis.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghYjbmcsRedis.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghYqhjzRedis.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BasegridService.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BmGridService.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CommunityService.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/SubdistrictOfficeService.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghDywgService.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJdbService.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJqzService.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJxcsService.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJyzService.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxbService.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSqxxService.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSzcgwghService.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSzzrwgService.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghWhpdwService.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghYjbmcsService.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghYqhjzService.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BasegridServiceImpl.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BmGridServiceImpl.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CommunityServiceImpl.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/SubdistrictOfficeServiceImpl.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghDywgServiceImpl.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJdbServiceImpl.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJqzServiceImpl.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJxcsServiceImpl.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJyzServiceImpl.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxbServiceImpl.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSqxxServiceImpl.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSzcgwghServiceImpl.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSzzrwgServiceImpl.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghWhpdwServiceImpl.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghYjbmcsServiceImpl.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghYqhjzServiceImpl.java create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/BasegridDao.xml create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/BmGridDao.xml create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CommunityDao.xml create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/SubdistrictOfficeDao.xml create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghDywgDao.xml create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJdbDao.xml create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJqzDao.xml create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJxcsDao.xml create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJyzDao.xml create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxbDao.xml create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSqxxDao.xml create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSzcgwghDao.xml create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSzzrwgDao.xml create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghWhpdwDao.xml create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghYjbmcsDao.xml create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghYqhjzDao.xml diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GuardarDatosTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GuardarDatosTask.java index 4a1376a5fd..a4a2bf1028 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GuardarDatosTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/GuardarDatosTask.java @@ -11,7 +11,7 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; /** - * 获取流动人口的数据存入ca_开头的表 + * 获取ruoyi系统数据存入表内 * * @param * @author LZN diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java index 624c9ac5b4..208790880a 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java @@ -11,16 +11,20 @@ public interface CaWghDataConstant { String AESKEY = "hriajrutnbghajsd"; String TABLESCHEMA_UNICOM = "unicom"; - - String UNICOM_PINGFANG = "ca_pingfang"; + String TABLESCHEMA_SHARE = "share"; + String UNICOM_PINGFANG = "ca_pingfang"; String UNICOM_LOUDONG = "ca_loudong"; String UNICOM_RESIDENT = "ca_resident"; String UNICOM_ROTATORS = "ca_rotators"; String UNICOM_RENTAL = "ca_rental"; + String SHARE_BASE_GRID = "BaseGrid"; + String DATA_URL_UNICON = "http://120.221.72.83:9090/bridge/unicom/page"; + String DATA_URL_SHARE = "http://120.221.72.83:9090/bridge/share/sharePage"; String UNICOM_CONDITION = "unicomCondition"; + String SHARE_CONDITION = "shareCondition"; } diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/BasegridDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/BasegridDTO.java new file mode 100644 index 0000000000..1cc3585aa1 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/BasegridDTO.java @@ -0,0 +1,64 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class BasegridDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private String 坐标信息; + + /** + * + */ + private String 网格名称; + + /** + * + */ + private String 所属街道办; + + /** + * + */ + private String 所属社区; + + /** + * + */ + private String 街道编码; + + /** + * + */ + private String 网格编码; + + /** + * + */ + private String 社区编码; + + /** + * + */ + private String longitude; + + /** + * + */ + private String latitude; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/BmGridDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/BmGridDTO.java new file mode 100644 index 0000000000..4c5c9869b4 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/BmGridDTO.java @@ -0,0 +1,206 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class BmGridDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 网格ID + */ + private Long gridId; + + /** + * 网格编码。人工填写，编码规则业务规定，不允许重复。 + */ + private String gridCode; + + /** + * 网格名称 + */ + private String gridName; + + /** + * 行政区划的国标编码 + */ + private String gbCode; + + /** + * 上级网格ID + */ + private Long parentId; + + /** + * 上级网格编码 + */ + private String parentCode; + + /** + * 网格分类。1基础网格 2环保网格 3防火网格 4城管网格 5执法网格 6安监网格等 + */ + private String gridClassification; + + /** + * 网格层级。网格层级表的层级 +根据【网格层级表】的层级关系动态展示。 +查询【网格层级表】层级 条件：上层级=网格树返回的网格层级 + */ + private String gridLevel; + + /** + * 网格属性。01村庄、02小区、03企业、04学校（幼儿园）、05医院、06驻镇（街）单位、07其他 + */ + private String gridProperty; + + /** + * 是否最后一级:0否 1是 + */ + private String isEnd; + + /** + * 网格地址 + */ + private String gridAddress; + + /** + * 网格介绍 + */ + private String gridIntroduce; + + /** + * 宣传图片 + */ + private String gridPicture; + + /** + * 地图区域范围 + */ + private String reginScopeDesc; + + /** + * 展示顺序 + */ + private Integer gridSort; + + /** + * 标绘状态 + */ + private String pointStatus; + + /** + * 事件上报中心 + */ + private Long gridEmCenter; + + /** + * 初始日期 + */ + private Date gridBeginTime; + + /** + * 终止日期 + */ + private Date gridEndTime; + + /** + * 面积 + */ + private String gridArea; + + /** + * 是否有效 + */ + private String isValid; + + /** + * 创建人 + */ + private Long createBy; + + /** + * 创建时间 + */ + private Date createDate; + + /** + * + */ + private Long updateBy; + + /** + * + */ + private Date updateDate; + + /** + * 删除状态: 字典值：normal正常，删除deleted + */ + private String deleteFlag; + + /** + * 乐观锁 + */ + private Integer versions; + + /** + * 网格内人口规模 + */ + private String attribute1; + + /** + * 是否成立网格党支部或网格党小组 + */ + private String attribute2; + + /** + * 网格党组织类型 + */ + private String attribute3; + + /** + * 党组织编码 + */ + private String attribute4; + + /** + * 扩展字段 + */ + private String attribute5; + + /** + * 扩展字段 + */ + private Long attribute6; + + /** + * 扩展字段 + */ + private Long attribute7; + + /** + * 扩展字段 + */ + private Long attribute8; + + /** + * 扩展字段 + */ + private Date attribute9; + + /** + * 扩展字段 + */ + private Date attribute10; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/CommunityDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/CommunityDTO.java new file mode 100644 index 0000000000..b3314d2ef3 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/CommunityDTO.java @@ -0,0 +1,54 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class CommunityDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private String 坐标信息; + + /** + * + */ + private String 街道名称; + + /** + * + */ + private String 街道编码; + + /** + * + */ + private String 社区名称; + + /** + * + */ + private String 社区编码; + + /** + * + */ + private String longitude; + + /** + * + */ + private String latitude; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/SubdistrictOfficeDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/SubdistrictOfficeDTO.java new file mode 100644 index 0000000000..e3b7793ec9 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/SubdistrictOfficeDTO.java @@ -0,0 +1,44 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class SubdistrictOfficeDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private String 坐标信息; + + /** + * + */ + private String 街道名称; + + /** + * + */ + private String 街道代码; + + /** + * + */ + private String longitude; + + /** + * + */ + private String latitude; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghDywgDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghDywgDTO.java new file mode 100644 index 0000000000..b3dbfaad42 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghDywgDTO.java @@ -0,0 +1,74 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 单元网格 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghDywgDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * 网格名称 + */ + private String bgname; + + /** + * 所属街镇 + */ + private String street; + + /** + * 所属社区 + */ + private String community; + + /** + * 网格面积 + */ + private Double bgsqua; + + /** + * 初始时间 + */ + private Date ordate; + + /** + * 变更时间 + */ + private Date chdate; + + /** + * 备注 + */ + private String note; + + /** + * + */ + private String contacts; + + /** + * 联系电话 + */ + private String telphone; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJdbDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJdbDTO.java new file mode 100644 index 0000000000..ec29eb022f --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJdbDTO.java @@ -0,0 +1,54 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 街道办 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghJdbDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private String objectid1; + + /** + * + */ + private String objectid; + + /** + * 街道名称 + */ + private String mc; + + /** + * 责任人 + */ + private String 责任人; + + /** + * 联系电话 + */ + private String 联系电话; + + /** + * + */ + private Double shapeLeng; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJqzDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJqzDTO.java new file mode 100644 index 0000000000..c635e57281 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJqzDTO.java @@ -0,0 +1,124 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 加气站信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghJqzDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * 序号 + */ + private String xh; + + /** + * 单位名称 + */ + private String name; + + /** + * + */ + private Double area; + + /** + * 周边安全间距 + */ + private String space; + + /** + * 存在问题 + */ + private String problem; + + /** + * 危险源类型 + */ + private String type; + + /** + * 经营地址 + */ + private String location; + + /** + * 负责人 + */ + private String principal; + + /** + * 联系电话 + */ + private String phone; + + /** + * 企业类型 + */ + private String qtype; + + /** + * 危化品种类 + */ + private String wtype; + + /** + * 等级 + */ + private String 等级; + + /** + * 性质 + */ + private String 性质; + + /** + * 备注 + */ + private String 备注; + + /** + * + */ + private String dwmcjc; + + /** + * + */ + private String layer; + + /** + * + */ + private String ssjdb; + + /** + * 数量 + */ + private String amount; + + /** + * 应急措施 + */ + private String yjcs; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJxcsDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJxcsDTO.java new file mode 100644 index 0000000000..2c2b4e0584 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJxcsDTO.java @@ -0,0 +1,119 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 九小场所信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghJxcsDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private String objectid; + + /** + * + */ + private String jsonInfo; + + /** + * + */ + private String creatTime; + + /** + * 所属街道 + */ + private String ssjd; + + /** + * 所属社区 + */ + private String sssq; + + /** + * 道路名 + */ + private String dlm; + + /** + * 门牌号 + */ + private String mph; + + /** + * 名称 + */ + private String name; + + /** + * + */ + private String ztlx; + + /** + * 子类型 + */ + private String type; + + /** + * 统一社会信用代码 + */ + private String xydm; + + /** + * 联系人 + */ + private String lxr; + + /** + * 联系电话 + */ + private String lxdh; + + /** + * + */ + private String userName; + + /** + * 备注 + */ + private String bz; + + /** + * + */ + private String available; + + /** + * + */ + private String id; + + /** + * 编辑人ID + */ + private String userId; + + /** + * 编辑人姓名 + */ + private String updateTim; + + /** + * 插入日期 + */ + private String insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJyzDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJyzDTO.java new file mode 100644 index 0000000000..605d5685dd --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJyzDTO.java @@ -0,0 +1,124 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 加油站 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghJyzDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * 序号 + */ + private String xh; + + /** + * 单位名称 + */ + private String name; + + /** + * + */ + private Double area; + + /** + * 周边安全间距 + */ + private String space; + + /** + * 存在问题 + */ + private String problem; + + /** + * 危险源类型 + */ + private String type; + + /** + * 经营地址 + */ + private String location; + + /** + * 负责人 + */ + private String principal; + + /** + * 联系电话 + */ + private String phone; + + /** + * 企业类型 + */ + private String qtype; + + /** + * 危化品种类 + */ + private String wtype; + + /** + * 等级 + */ + private String 等级; + + /** + * 性质 + */ + private String 性质; + + /** + * 备注 + */ + private String 备注; + + /** + * + */ + private String dwmcjc; + + /** + * + */ + private String layer; + + /** + * + */ + private String ssjdb; + + /** + * 数量 + */ + private String amount; + + /** + * 应急措施 + */ + private String yjcs; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSjxxbDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSjxxbDTO.java new file mode 100644 index 0000000000..3ae1d2aa4e --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSjxxbDTO.java @@ -0,0 +1,94 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 事件信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghSjxxbDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid1; + + /** + * + */ + private Double objectid; + + /** + * 事件来源 + */ + private String infosourcename; + + /** + * 事件类别 + */ + private String infotypename; + + /** + * 社区名称 + */ + private String communityname; + + /** + * 事件描述 + */ + private String description; + + /** + * + */ + private String taskid; + + /** + * + */ + private String casesn; + + /** + * 事件地址 + */ + private String address; + + /** + * 事件状态 + */ + private String statusname; + + /** + * + */ + private String infobcname; + + /** + * + */ + private String infoscname; + + /** + * 街道名称 + */ + private String streetname; + + /** + * + */ + private Date discovertime; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSqxxDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSqxxDTO.java new file mode 100644 index 0000000000..3e08eccd72 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSqxxDTO.java @@ -0,0 +1,139 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghSqxxDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * + */ + private Double commuarea; + + /** + * + */ + private String belongto; + + /** + * + */ + private String contacts; + + /** + * + */ + private String telphone; + + /** + * + */ + private Double 网格数量; + + /** + * + */ + private String 街道编码; + + /** + * + */ + private String 社区编码; + + /** + * + */ + private String commname; + + /** + * + */ + private String jdcjgb; + + /** + * + */ + private String wgz; + + /** + * + */ + private String 交警姓名; + + /** + * + */ + private Double 交警电话; + + /** + * + */ + private String 交警单位; + + /** + * + */ + private String 民警姓名; + + /** + * + */ + private String 民警电话; + + /** + * + */ + private String 派出所; + + /** + * + */ + private String wgy; + + /** + * + */ + private String jdlxks; + + /** + * + */ + private String ddy; + + /** + * + */ + private String zhzfxm; + + /** + * + */ + private String zhzfdh; + + /** + * + */ + private String zhzfbm; + + /** + * + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSzcgwghDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSzcgwghDTO.java new file mode 100644 index 0000000000..54de99914c --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSzcgwghDTO.java @@ -0,0 +1,49 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 数字城管网格化信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghSzcgwghDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * 备注 + */ + private String note; + + /** + * + */ + private String sssq; + + /** + * + */ + private String ssjd; + + /** + * + */ + private String id; + + /** + * + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSzzrwgDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSzzrwgDTO.java new file mode 100644 index 0000000000..e83e9eae4a --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSzzrwgDTO.java @@ -0,0 +1,49 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 市政责任网格信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghSzzrwgDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * 备注 + */ + private String note; + + /** + * 责任单位 + */ + private String name; + + /** + * 监管人 + */ + private String principal; + + /** + * 联系方式 + */ + private String phone; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghWhpdwDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghWhpdwDTO.java new file mode 100644 index 0000000000..40c4c8b154 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghWhpdwDTO.java @@ -0,0 +1,134 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 危化品单位信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghWhpdwDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * 序号 + */ + private String xh; + + /** + * 单位名称 + */ + private String name; + + /** + * + */ + private Double area; + + /** + * 周边安全间距 + */ + private String space; + + /** + * 存在问题 + */ + private String problem; + + /** + * 危险源类型 + */ + private String type; + + /** + * 经营地址 + */ + private String location; + + /** + * 安全负责人 + */ + private String person; + + /** + * 联系电话 + */ + private String phone; + + /** + * 企业类型 + */ + private String qtype; + + /** + * 危化品种类 + */ + private String wtype; + + /** + * 数量 + */ + private String amount; + + /** + * 等级 + */ + private String grade; + + /** + * 性质 + */ + private String natrue; + + /** + * 应急措施 + */ + private String yjcs; + + /** + * 备注 + */ + private String note; + + /** + * + */ + private String dwmcjc; + + /** + * 主要负责人 + */ + private String principal; + + /** + * 用途 + */ + private String user; + + /** + * + */ + private String layer; + + /** + * + */ + private String ssjdb; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghYjbmcsDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghYjbmcsDTO.java new file mode 100644 index 0000000000..b217584fa9 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghYjbmcsDTO.java @@ -0,0 +1,84 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 应急避难场所信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghYjbmcsDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * + */ + private String grade; + + /** + * 地址 + */ + private String adress; + + /** + * 面积(㎡) + */ + private String area; + + /** + * 容纳人数 + */ + private String rnns; + + /** + * + */ + private String sfbsp; + + /** + * + */ + private String zysbcs; + + /** + * + */ + private String fzr; + + /** + * + */ + private String zgdw; + + /** + * + */ + private String name; + + /** + * + */ + private String fzrtel; + + /** + * + */ + private String ssjd; + + /** + * + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghYqhjzDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghYqhjzDTO.java new file mode 100644 index 0000000000..d070697218 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghYqhjzDTO.java @@ -0,0 +1,124 @@ +package com.epmet.opendata.dto.wgh; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 油气合建站信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghYqhjzDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * 序号 + */ + private String xh; + + /** + * 单位名称 + */ + private String name; + + /** + * + */ + private Double area; + + /** + * 周边安全间距 + */ + private String space; + + /** + * 危险源类型 + */ + private String type; + + /** + * 经营地址 + */ + private String location; + + /** + * 负责人 + */ + private String principal; + + /** + * 联系电话 + */ + private String phone; + + /** + * 企业类型 + */ + private String qtype; + + /** + * 危化品种类 + */ + private String wtype; + + /** + * 数量 + */ + private String amount; + + /** + * 等级 + */ + private String grade; + + /** + * 性质 + */ + private String natrue; + + /** + * 应急措施 + */ + private String yjcs; + + /** + * 备注 + */ + private String note; + + /** + * 简称 + */ + private String dwmcjc; + + /** + * 所在图层 + */ + private String layer; + + /** + * 所属街道办 + */ + private String ssjdb; + + /** + * 存在问题 + */ + private String problem; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BasegridController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BasegridController.java new file mode 100644 index 0000000000..f9acf3489a --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BasegridController.java @@ -0,0 +1,96 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.BasegridDTO; +import com.epmet.opendata.excel.BasegridExcel; +import com.epmet.opendata.service.BasegridService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("basegrid") +public class BasegridController { + + @Autowired + private BasegridService basegridService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = basegridService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + BasegridDTO data = basegridService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody BasegridDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + basegridService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody BasegridDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + basegridService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + basegridService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = basegridService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, BasegridExcel.class); + } + + /** + * 调用ruoyi存储基础网格的数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 13:40 + */ + @PostMapping("preserBaseGridVation") + public Result getPreserLouDongVation(@RequestBody PreserVationFormDTO dto) { + basegridService.preserBaseGridVation(dto); + return new Result(); + } + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BmGridController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BmGridController.java new file mode 100644 index 0000000000..c89a16bce1 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BmGridController.java @@ -0,0 +1,83 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.BmGridDTO; +import com.epmet.opendata.excel.BmGridExcel; +import com.epmet.opendata.service.BmGridService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("bmGrid") +public class BmGridController { + + @Autowired + private BmGridService bmGridService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = bmGridService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + BmGridDTO data = bmGridService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody BmGridDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + bmGridService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody BmGridDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + bmGridService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + bmGridService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = bmGridService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, BmGridExcel.class); + } + + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CommunityController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CommunityController.java new file mode 100644 index 0000000000..8e7b7f9528 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CommunityController.java @@ -0,0 +1,83 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; + +import com.epmet.opendata.dto.wgh.CommunityDTO; +import com.epmet.opendata.excel.CommunityExcel; +import com.epmet.opendata.service.CommunityService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("community") +public class CommunityController { + + @Autowired + private CommunityService communityService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = communityService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + CommunityDTO data = communityService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody CommunityDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + communityService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody CommunityDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + communityService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + communityService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = communityService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, CommunityExcel.class); + } + + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/SubdistrictOfficeController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/SubdistrictOfficeController.java new file mode 100644 index 0000000000..52b881b741 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/SubdistrictOfficeController.java @@ -0,0 +1,83 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; + +import com.epmet.opendata.dto.wgh.SubdistrictOfficeDTO; +import com.epmet.opendata.excel.SubdistrictOfficeExcel; +import com.epmet.opendata.service.SubdistrictOfficeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("subdistrictOffice") +public class SubdistrictOfficeController { + + @Autowired + private SubdistrictOfficeService subdistrictOfficeService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = subdistrictOfficeService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + SubdistrictOfficeDTO data = subdistrictOfficeService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody SubdistrictOfficeDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + subdistrictOfficeService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody SubdistrictOfficeDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + subdistrictOfficeService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + subdistrictOfficeService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = subdistrictOfficeService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, SubdistrictOfficeExcel.class); + } + + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghDywgController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghDywgController.java new file mode 100644 index 0000000000..d7e2123e75 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghDywgController.java @@ -0,0 +1,83 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; + +import com.epmet.opendata.dto.wgh.WghDywgDTO; +import com.epmet.opendata.excel.WghDywgExcel; +import com.epmet.opendata.service.WghDywgService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 单元网格 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("wghDywg") +public class WghDywgController { + + @Autowired + private WghDywgService wghDywgService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = wghDywgService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + WghDywgDTO data = wghDywgService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody WghDywgDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + wghDywgService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody WghDywgDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + wghDywgService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + wghDywgService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = wghDywgService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, WghDywgExcel.class); + } + + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJdbController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJdbController.java new file mode 100644 index 0000000000..9ccb44429d --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJdbController.java @@ -0,0 +1,83 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; + +import com.epmet.opendata.dto.wgh.WghJdbDTO; +import com.epmet.opendata.excel.WghJdbExcel; +import com.epmet.opendata.service.WghJdbService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 街道办 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("wghJdb") +public class WghJdbController { + + @Autowired + private WghJdbService wghJdbService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = wghJdbService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + WghJdbDTO data = wghJdbService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody WghJdbDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + wghJdbService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody WghJdbDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + wghJdbService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + wghJdbService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = wghJdbService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, WghJdbExcel.class); + } + + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJqzController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJqzController.java new file mode 100644 index 0000000000..57b51603ce --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJqzController.java @@ -0,0 +1,83 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; + +import com.epmet.opendata.dto.wgh.WghJqzDTO; +import com.epmet.opendata.excel.WghJqzExcel; +import com.epmet.opendata.service.WghJqzService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 加气站信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("wghJqz") +public class WghJqzController { + + @Autowired + private WghJqzService wghJqzService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = wghJqzService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + WghJqzDTO data = wghJqzService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody WghJqzDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + wghJqzService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody WghJqzDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + wghJqzService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + wghJqzService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = wghJqzService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, WghJqzExcel.class); + } + + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJxcsController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJxcsController.java new file mode 100644 index 0000000000..0f2d225327 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJxcsController.java @@ -0,0 +1,82 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.opendata.dto.wgh.WghJxcsDTO; +import com.epmet.opendata.excel.WghJxcsExcel; +import com.epmet.opendata.service.WghJxcsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 九小场所信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("wghJxcs") +public class WghJxcsController { + + @Autowired + private WghJxcsService wghJxcsService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = wghJxcsService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + WghJxcsDTO data = wghJxcsService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody WghJxcsDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + wghJxcsService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody WghJxcsDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + wghJxcsService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + wghJxcsService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = wghJxcsService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, WghJxcsExcel.class); + } + + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJyzController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJyzController.java new file mode 100644 index 0000000000..38b74659e0 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJyzController.java @@ -0,0 +1,82 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.opendata.dto.wgh.WghJyzDTO; +import com.epmet.opendata.excel.WghJyzExcel; +import com.epmet.opendata.service.WghJyzService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 加油站 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("wghJyz") +public class WghJyzController { + + @Autowired + private WghJyzService wghJyzService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = wghJyzService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + WghJyzDTO data = wghJyzService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody WghJyzDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + wghJyzService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody WghJyzDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + wghJyzService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + wghJyzService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = wghJyzService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, WghJyzExcel.class); + } + + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxbController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxbController.java new file mode 100644 index 0000000000..512d3f19d4 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxbController.java @@ -0,0 +1,82 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.opendata.dto.wgh.WghSjxxbDTO; +import com.epmet.opendata.excel.WghSjxxbExcel; +import com.epmet.opendata.service.WghSjxxbService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 事件信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("wghSjxxb") +public class WghSjxxbController { + + @Autowired + private WghSjxxbService wghSjxxbService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = wghSjxxbService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + WghSjxxbDTO data = wghSjxxbService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody WghSjxxbDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + wghSjxxbService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody WghSjxxbDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + wghSjxxbService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + wghSjxxbService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = wghSjxxbService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, WghSjxxbExcel.class); + } + + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSqxxController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSqxxController.java new file mode 100644 index 0000000000..8e5b513d15 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSqxxController.java @@ -0,0 +1,82 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.opendata.dto.wgh.WghSqxxDTO; +import com.epmet.opendata.excel.WghSqxxExcel; +import com.epmet.opendata.service.WghSqxxService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("wghSqxx") +public class WghSqxxController { + + @Autowired + private WghSqxxService wghSqxxService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = wghSqxxService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + WghSqxxDTO data = wghSqxxService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody WghSqxxDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + wghSqxxService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody WghSqxxDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + wghSqxxService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + wghSqxxService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = wghSqxxService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, WghSqxxExcel.class); + } + + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSzcgwghController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSzcgwghController.java new file mode 100644 index 0000000000..809db1330d --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSzcgwghController.java @@ -0,0 +1,82 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.opendata.dto.wgh.WghSzcgwghDTO; +import com.epmet.opendata.excel.WghSzcgwghExcel; +import com.epmet.opendata.service.WghSzcgwghService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 数字城管网格化信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("wghSzcgwgh") +public class WghSzcgwghController { + + @Autowired + private WghSzcgwghService wghSzcgwghService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = wghSzcgwghService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + WghSzcgwghDTO data = wghSzcgwghService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody WghSzcgwghDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + wghSzcgwghService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody WghSzcgwghDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + wghSzcgwghService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + wghSzcgwghService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = wghSzcgwghService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, WghSzcgwghExcel.class); + } + + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSzzrwgController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSzzrwgController.java new file mode 100644 index 0000000000..aa3142f80d --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSzzrwgController.java @@ -0,0 +1,82 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.opendata.dto.wgh.WghSzzrwgDTO; +import com.epmet.opendata.excel.WghSzzrwgExcel; +import com.epmet.opendata.service.WghSzzrwgService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 市政责任网格信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("wghSzzrwg") +public class WghSzzrwgController { + + @Autowired + private WghSzzrwgService wghSzzrwgService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = wghSzzrwgService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + WghSzzrwgDTO data = wghSzzrwgService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody WghSzzrwgDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + wghSzzrwgService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody WghSzzrwgDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + wghSzzrwgService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + wghSzzrwgService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = wghSzzrwgService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, WghSzzrwgExcel.class); + } + + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghWhpdwController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghWhpdwController.java new file mode 100644 index 0000000000..2a7a81f156 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghWhpdwController.java @@ -0,0 +1,82 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.opendata.dto.wgh.WghWhpdwDTO; +import com.epmet.opendata.excel.WghWhpdwExcel; +import com.epmet.opendata.service.WghWhpdwService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 危化品单位信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("wghWhpdw") +public class WghWhpdwController { + + @Autowired + private WghWhpdwService wghWhpdwService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = wghWhpdwService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + WghWhpdwDTO data = wghWhpdwService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody WghWhpdwDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + wghWhpdwService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody WghWhpdwDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + wghWhpdwService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + wghWhpdwService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = wghWhpdwService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, WghWhpdwExcel.class); + } + + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghYjbmcsController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghYjbmcsController.java new file mode 100644 index 0000000000..a76832bba8 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghYjbmcsController.java @@ -0,0 +1,82 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.opendata.dto.wgh.WghYjbmcsDTO; +import com.epmet.opendata.excel.WghYjbmcsExcel; +import com.epmet.opendata.service.WghYjbmcsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 应急避难场所信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("wghYjbmcs") +public class WghYjbmcsController { + + @Autowired + private WghYjbmcsService wghYjbmcsService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = wghYjbmcsService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + WghYjbmcsDTO data = wghYjbmcsService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody WghYjbmcsDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + wghYjbmcsService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody WghYjbmcsDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + wghYjbmcsService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + wghYjbmcsService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = wghYjbmcsService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, WghYjbmcsExcel.class); + } + + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghYqhjzController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghYqhjzController.java new file mode 100644 index 0000000000..9b91f4bc11 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghYqhjzController.java @@ -0,0 +1,81 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.opendata.service.WghYqhjzService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; +import com.epmet.opendata.dto.wgh.WghYqhjzDTO; +import javax.servlet.http.HttpServletResponse; +import com.epmet.opendata.excel.WghYqhjzExcel; +import java.util.List; +import java.util.Map; + + +/** + * 油气合建站信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("wghYqhjz") +public class WghYqhjzController { + + @Autowired + private WghYqhjzService wghYqhjzService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = wghYqhjzService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + WghYqhjzDTO data = wghYqhjzService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody WghYqhjzDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + wghYqhjzService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody WghYqhjzDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + wghYqhjzService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + wghYqhjzService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = wghYqhjzService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, WghYqhjzExcel.class); + } + + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/BasegridDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/BasegridDao.java new file mode 100644 index 0000000000..8cdc58af1c --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/BasegridDao.java @@ -0,0 +1,18 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; + +import com.epmet.opendata.entity.BasegridEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface BasegridDao extends BaseDao { + + int deleteAll(); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/BmGridDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/BmGridDao.java new file mode 100644 index 0000000000..257761fae9 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/BmGridDao.java @@ -0,0 +1,17 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; + +import com.epmet.opendata.entity.BmGridEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface BmGridDao extends BaseDao { + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CommunityDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CommunityDao.java new file mode 100644 index 0000000000..9dd874ef17 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CommunityDao.java @@ -0,0 +1,17 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; + +import com.epmet.opendata.entity.CommunityEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface CommunityDao extends BaseDao { + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/SubdistrictOfficeDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/SubdistrictOfficeDao.java new file mode 100644 index 0000000000..2300a96e5c --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/SubdistrictOfficeDao.java @@ -0,0 +1,17 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; + +import com.epmet.opendata.entity.SubdistrictOfficeEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface SubdistrictOfficeDao extends BaseDao { + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghDywgDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghDywgDao.java new file mode 100644 index 0000000000..488784b3d2 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghDywgDao.java @@ -0,0 +1,17 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; + +import com.epmet.opendata.entity.WghDywgEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 单元网格 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface WghDywgDao extends BaseDao { + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJdbDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJdbDao.java new file mode 100644 index 0000000000..51aa3e73c0 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJdbDao.java @@ -0,0 +1,17 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; + +import com.epmet.opendata.entity.WghJdbEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 街道办 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface WghJdbDao extends BaseDao { + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJqzDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJqzDao.java new file mode 100644 index 0000000000..4e38c5a9e1 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJqzDao.java @@ -0,0 +1,16 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.opendata.entity.WghJqzEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 加气站信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface WghJqzDao extends BaseDao { + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJxcsDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJxcsDao.java new file mode 100644 index 0000000000..cca15fbf4d --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJxcsDao.java @@ -0,0 +1,16 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.opendata.entity.WghJxcsEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 九小场所信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface WghJxcsDao extends BaseDao { + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJyzDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJyzDao.java new file mode 100644 index 0000000000..8e1234f7c6 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJyzDao.java @@ -0,0 +1,16 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.opendata.entity.WghJyzEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 加油站 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface WghJyzDao extends BaseDao { + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxbDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxbDao.java new file mode 100644 index 0000000000..8734113bd2 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxbDao.java @@ -0,0 +1,16 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.opendata.entity.WghSjxxbEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 事件信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface WghSjxxbDao extends BaseDao { + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSqxxDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSqxxDao.java new file mode 100644 index 0000000000..53b16dfb73 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSqxxDao.java @@ -0,0 +1,17 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; + +import com.epmet.opendata.entity.WghSqxxEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface WghSqxxDao extends BaseDao { + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSzcgwghDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSzcgwghDao.java new file mode 100644 index 0000000000..900503ff51 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSzcgwghDao.java @@ -0,0 +1,17 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; + +import com.epmet.opendata.entity.WghSzcgwghEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 数字城管网格化信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface WghSzcgwghDao extends BaseDao { + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSzzrwgDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSzzrwgDao.java new file mode 100644 index 0000000000..b1fe06ac53 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSzzrwgDao.java @@ -0,0 +1,16 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.opendata.entity.WghSzzrwgEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 市政责任网格信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface WghSzzrwgDao extends BaseDao { + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghWhpdwDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghWhpdwDao.java new file mode 100644 index 0000000000..98ab1ed32c --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghWhpdwDao.java @@ -0,0 +1,16 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.opendata.entity.WghWhpdwEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 危化品单位信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface WghWhpdwDao extends BaseDao { + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghYjbmcsDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghYjbmcsDao.java new file mode 100644 index 0000000000..effb876078 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghYjbmcsDao.java @@ -0,0 +1,16 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.opendata.entity.WghYjbmcsEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 应急避难场所信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface WghYjbmcsDao extends BaseDao { + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghYqhjzDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghYqhjzDao.java new file mode 100644 index 0000000000..661c60f9a4 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghYqhjzDao.java @@ -0,0 +1,16 @@ +package com.epmet.opendata.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.opendata.entity.WghYqhjzEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 油气合建站信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Mapper +public interface WghYqhjzDao extends BaseDao { + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BasegridEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BasegridEntity.java new file mode 100644 index 0000000000..3f97751b94 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BasegridEntity.java @@ -0,0 +1,69 @@ +package com.epmet.opendata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("basegrid") +public class BasegridEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private String coordinateInfo; + + /** + * + */ + private String gridName; + + /** + * + */ + private String subDistrictOffice; + + /** + * + */ + private String community; + + /** + * + */ + private String streetCode; + + /** + * + */ + private String gridCode; + + /** + * + */ + private String communityCode; + + /** + * + */ + private String longitude; + + /** + * + */ + private String latitude; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BmGridEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BmGridEntity.java new file mode 100644 index 0000000000..0df07d3dc4 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BmGridEntity.java @@ -0,0 +1,211 @@ +package com.epmet.opendata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("bm_grid") +public class BmGridEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 网格ID + */ + private Long gridId; + + /** + * 网格编码。人工填写，编码规则业务规定，不允许重复。 + */ + private String gridCode; + + /** + * 网格名称 + */ + private String gridName; + + /** + * 行政区划的国标编码 + */ + private String gbCode; + + /** + * 上级网格ID + */ + private Long parentId; + + /** + * 上级网格编码 + */ + private String parentCode; + + /** + * 网格分类。1基础网格 2环保网格 3防火网格 4城管网格 5执法网格 6安监网格等 + */ + private String gridClassification; + + /** + * 网格层级。网格层级表的层级 +根据【网格层级表】的层级关系动态展示。 +查询【网格层级表】层级 条件：上层级=网格树返回的网格层级 + */ + private String gridLevel; + + /** + * 网格属性。01村庄、02小区、03企业、04学校（幼儿园）、05医院、06驻镇（街）单位、07其他 + */ + private String gridProperty; + + /** + * 是否最后一级:0否 1是 + */ + private String isEnd; + + /** + * 网格地址 + */ + private String gridAddress; + + /** + * 网格介绍 + */ + private String gridIntroduce; + + /** + * 宣传图片 + */ + private String gridPicture; + + /** + * 地图区域范围 + */ + private String reginScopeDesc; + + /** + * 展示顺序 + */ + private Integer gridSort; + + /** + * 标绘状态 + */ + private String pointStatus; + + /** + * 事件上报中心 + */ + private Long gridEmCenter; + + /** + * 初始日期 + */ + private Date gridBeginTime; + + /** + * 终止日期 + */ + private Date gridEndTime; + + /** + * 面积 + */ + private String gridArea; + + /** + * 是否有效 + */ + private String isValid; + + /** + * 创建人 + */ + private Long createBy; + + /** + * 创建时间 + */ + private Date createDate; + + /** + * + */ + private Long updateBy; + + /** + * + */ + private Date updateDate; + + /** + * 删除状态: 字典值：normal正常，删除deleted + */ + private String deleteFlag; + + /** + * 乐观锁 + */ + private Integer versions; + + /** + * 网格内人口规模 + */ + private String attribute1; + + /** + * 是否成立网格党支部或网格党小组 + */ + private String attribute2; + + /** + * 网格党组织类型 + */ + private String attribute3; + + /** + * 党组织编码 + */ + private String attribute4; + + /** + * 扩展字段 + */ + private String attribute5; + + /** + * 扩展字段 + */ + private Long attribute6; + + /** + * 扩展字段 + */ + private Long attribute7; + + /** + * 扩展字段 + */ + private Long attribute8; + + /** + * 扩展字段 + */ + private Date attribute9; + + /** + * 扩展字段 + */ + private Date attribute10; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CommunityEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CommunityEntity.java new file mode 100644 index 0000000000..aba2fa7d1b --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CommunityEntity.java @@ -0,0 +1,59 @@ +package com.epmet.opendata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("community") +public class CommunityEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private String coordinateInfo; + + /** + * + */ + private String streetName; + + /** + * + */ + private String streetCode; + + /** + * + */ + private String communityName; + + /** + * + */ + private String communityCode; + + /** + * + */ + private String longitude; + + /** + * + */ + private String latitude; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/SubdistrictOfficeEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/SubdistrictOfficeEntity.java new file mode 100644 index 0000000000..bd3e3aaa6a --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/SubdistrictOfficeEntity.java @@ -0,0 +1,49 @@ +package com.epmet.opendata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("subdistrict_office") +public class SubdistrictOfficeEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private String coordinateInfo; + + /** + * + */ + private String streetName; + + /** + * + */ + private String streetCode; + + /** + * + */ + private String longitude; + + /** + * + */ + private String latitude; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghDywgEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghDywgEntity.java new file mode 100644 index 0000000000..c223b3edd0 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghDywgEntity.java @@ -0,0 +1,79 @@ +package com.epmet.opendata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 单元网格 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("wgh_dywg") +public class WghDywgEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * 网格名称 + */ + private String bgname; + + /** + * 所属街镇 + */ + private String street; + + /** + * 所属社区 + */ + private String community; + + /** + * 网格面积 + */ + private Double bgsqua; + + /** + * 初始时间 + */ + private Date ordate; + + /** + * 变更时间 + */ + private Date chdate; + + /** + * 备注 + */ + private String note; + + /** + * + */ + private String contacts; + + /** + * 联系电话 + */ + private String telphone; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJdbEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJdbEntity.java new file mode 100644 index 0000000000..26f9ca493c --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJdbEntity.java @@ -0,0 +1,59 @@ +package com.epmet.opendata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 街道办 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("wgh_jdb") +public class WghJdbEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private String objectid1; + + /** + * + */ + private String objectid; + + /** + * 街道名称 + */ + private String mc; + + /** + * 责任人 + */ + private String personInCharge; + + /** + * 联系电话 + */ + private String phone; + + /** + * + */ + private Double shapeLeng; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJqzEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJqzEntity.java new file mode 100644 index 0000000000..767ccacabe --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJqzEntity.java @@ -0,0 +1,129 @@ +package com.epmet.opendata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 加气站信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("wgh_jqz") +public class WghJqzEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * 序号 + */ + private String xh; + + /** + * 单位名称 + */ + private String name; + + /** + * + */ + private Double area; + + /** + * 周边安全间距 + */ + private String space; + + /** + * 存在问题 + */ + private String problem; + + /** + * 危险源类型 + */ + private String type; + + /** + * 经营地址 + */ + private String location; + + /** + * 负责人 + */ + private String principal; + + /** + * 联系电话 + */ + private String phone; + + /** + * 企业类型 + */ + private String qtype; + + /** + * 危化品种类 + */ + private String wtype; + + /** + * 等级 + */ + private String level; + + /** + * 性质 + */ + private String nature; + + /** + * 备注 + */ + private String remarks; + + /** + * + */ + private String dwmcjc; + + /** + * + */ + private String layer; + + /** + * + */ + private String ssjdb; + + /** + * 数量 + */ + private String amount; + + /** + * 应急措施 + */ + private String yjcs; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJxcsEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJxcsEntity.java new file mode 100644 index 0000000000..c2ae105195 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJxcsEntity.java @@ -0,0 +1,119 @@ +package com.epmet.opendata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 九小场所信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("wgh_jxcs") +public class WghJxcsEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private String objectid; + + /** + * + */ + private String jsonInfo; + + /** + * + */ + private String creatTime; + + /** + * 所属街道 + */ + private String ssjd; + + /** + * 所属社区 + */ + private String sssq; + + /** + * 道路名 + */ + private String dlm; + + /** + * 门牌号 + */ + private String mph; + + /** + * 名称 + */ + private String name; + + /** + * + */ + private String ztlx; + + /** + * 子类型 + */ + private String type; + + /** + * 统一社会信用代码 + */ + private String xydm; + + /** + * 联系人 + */ + private String lxr; + + /** + * 联系电话 + */ + private String lxdh; + + /** + * + */ + private String userName; + + /** + * 备注 + */ + private String bz; + + /** + * + */ + private String available; + + /** + * 编辑人ID + */ + private String userId; + + /** + * 编辑人姓名 + */ + private String updateTim; + + /** + * 插入日期 + */ + private String insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJyzEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJyzEntity.java new file mode 100644 index 0000000000..7f14adb663 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJyzEntity.java @@ -0,0 +1,129 @@ +package com.epmet.opendata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 加油站 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("wgh_jyz") +public class WghJyzEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * 序号 + */ + private String xh; + + /** + * 单位名称 + */ + private String name; + + /** + * + */ + private Double area; + + /** + * 周边安全间距 + */ + private String space; + + /** + * 存在问题 + */ + private String problem; + + /** + * 危险源类型 + */ + private String type; + + /** + * 经营地址 + */ + private String location; + + /** + * 负责人 + */ + private String principal; + + /** + * 联系电话 + */ + private String phone; + + /** + * 企业类型 + */ + private String qtype; + + /** + * 危化品种类 + */ + private String wtype; + + /** + * 等级 + */ + private String level; + + /** + * 性质 + */ + private String nature; + + /** + * 备注 + */ + private String remarks; + + /** + * + */ + private String dwmcjc; + + /** + * + */ + private String layer; + + /** + * + */ + private String ssjdb; + + /** + * 数量 + */ + private String amount; + + /** + * 应急措施 + */ + private String yjcs; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSjxxbEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSjxxbEntity.java new file mode 100644 index 0000000000..586a8a75db --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSjxxbEntity.java @@ -0,0 +1,99 @@ +package com.epmet.opendata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 事件信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("wgh_sjxxb") +public class WghSjxxbEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid1; + + /** + * + */ + private Double objectid; + + /** + * 事件来源 + */ + private String infosourcename; + + /** + * 事件类别 + */ + private String infotypename; + + /** + * 社区名称 + */ + private String communityname; + + /** + * 事件描述 + */ + private String description; + + /** + * + */ + private String taskid; + + /** + * + */ + private String casesn; + + /** + * 事件地址 + */ + private String address; + + /** + * 事件状态 + */ + private String statusname; + + /** + * + */ + private String infobcname; + + /** + * + */ + private String infoscname; + + /** + * 街道名称 + */ + private String streetname; + + /** + * + */ + private Date discovertime; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSqxxEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSqxxEntity.java new file mode 100644 index 0000000000..d1121e17d7 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSqxxEntity.java @@ -0,0 +1,144 @@ +package com.epmet.opendata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("wgh_sqxx") +public class WghSqxxEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * + */ + private Double commuarea; + + /** + * + */ + private String belongto; + + /** + * + */ + private String contacts; + + /** + * + */ + private String telphone; + + /** + * + */ + private Double numberOfGrid; + + /** + * + */ + private String streetCode; + + /** + * + */ + private String communityCode; + + /** + * + */ + private String commname; + + /** + * + */ + private String jdcjgb; + + /** + * + */ + private String wgz; + + /** + * + */ + private String policeName; + + /** + * + */ + private Double trafficPolicePhone; + + /** + * + */ + private String trafficPoliceCompany; + + /** + * + */ + private String peoPoliceName; + + /** + * + */ + private String peoPolicePhone; + + /** + * + */ + private String policeStation; + + /** + * + */ + private String wgy; + + /** + * + */ + private String jdlxks; + + /** + * + */ + private String ddy; + + /** + * + */ + private String zhzfxm; + + /** + * + */ + private String zhzfdh; + + /** + * + */ + private String zhzfbm; + + /** + * + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSzcgwghEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSzcgwghEntity.java new file mode 100644 index 0000000000..ae5b53f708 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSzcgwghEntity.java @@ -0,0 +1,49 @@ +package com.epmet.opendata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 数字城管网格化信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("wgh_szcgwgh") +public class WghSzcgwghEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * 备注 + */ + private String note; + + /** + * + */ + private String sssq; + + /** + * + */ + private String ssjd; + + /** + * + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSzzrwgEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSzzrwgEntity.java new file mode 100644 index 0000000000..6b2baae270 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSzzrwgEntity.java @@ -0,0 +1,54 @@ +package com.epmet.opendata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 市政责任网格信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("wgh_szzrwg") +public class WghSzzrwgEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * 备注 + */ + private String note; + + /** + * 责任单位 + */ + private String name; + + /** + * 监管人 + */ + private String principal; + + /** + * 联系方式 + */ + private String phone; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghWhpdwEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghWhpdwEntity.java new file mode 100644 index 0000000000..4c379db795 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghWhpdwEntity.java @@ -0,0 +1,139 @@ +package com.epmet.opendata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 危化品单位信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("wgh_whpdw") +public class WghWhpdwEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * 序号 + */ + private String xh; + + /** + * 单位名称 + */ + private String name; + + /** + * + */ + private Double area; + + /** + * 周边安全间距 + */ + private String space; + + /** + * 存在问题 + */ + private String problem; + + /** + * 危险源类型 + */ + private String type; + + /** + * 经营地址 + */ + private String location; + + /** + * 安全负责人 + */ + private String person; + + /** + * 联系电话 + */ + private String phone; + + /** + * 企业类型 + */ + private String qtype; + + /** + * 危化品种类 + */ + private String wtype; + + /** + * 数量 + */ + private String amount; + + /** + * 等级 + */ + private String grade; + + /** + * 性质 + */ + private String natrue; + + /** + * 应急措施 + */ + private String yjcs; + + /** + * 备注 + */ + private String note; + + /** + * + */ + private String dwmcjc; + + /** + * 主要负责人 + */ + private String principal; + + /** + * 用途 + */ + private String user; + + /** + * + */ + private String layer; + + /** + * + */ + private String ssjdb; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghYjbmcsEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghYjbmcsEntity.java new file mode 100644 index 0000000000..097baf6258 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghYjbmcsEntity.java @@ -0,0 +1,89 @@ +package com.epmet.opendata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 应急避难场所信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("wgh_yjbmcs") +public class WghYjbmcsEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * + */ + private String grade; + + /** + * 地址 + */ + private String adress; + + /** + * 面积(㎡) + */ + private String area; + + /** + * 容纳人数 + */ + private String rnns; + + /** + * + */ + private String sfbsp; + + /** + * + */ + private String zysbcs; + + /** + * + */ + private String fzr; + + /** + * + */ + private String zgdw; + + /** + * + */ + private String name; + + /** + * + */ + private String fzrtel; + + /** + * + */ + private String ssjd; + + /** + * + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghYqhjzEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghYqhjzEntity.java new file mode 100644 index 0000000000..39718863c5 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghYqhjzEntity.java @@ -0,0 +1,129 @@ +package com.epmet.opendata.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 油气合建站信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("wgh_yqhjz") +public class WghYqhjzEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private Integer objectid; + + /** + * 序号 + */ + private String xh; + + /** + * 单位名称 + */ + private String name; + + /** + * + */ + private Double area; + + /** + * 周边安全间距 + */ + private String space; + + /** + * 危险源类型 + */ + private String type; + + /** + * 经营地址 + */ + private String location; + + /** + * 负责人 + */ + private String principal; + + /** + * 联系电话 + */ + private String phone; + + /** + * 企业类型 + */ + private String qtype; + + /** + * 危化品种类 + */ + private String wtype; + + /** + * 数量 + */ + private String amount; + + /** + * 等级 + */ + private String grade; + + /** + * 性质 + */ + private String natrue; + + /** + * 应急措施 + */ + private String yjcs; + + /** + * 备注 + */ + private String note; + + /** + * 简称 + */ + private String dwmcjc; + + /** + * 所在图层 + */ + private String layer; + + /** + * 所属街道办 + */ + private String ssjdb; + + /** + * 存在问题 + */ + private String problem; + + /** + * 插入日期 + */ + private Date insertTime; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/BasegridExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/BasegridExcel.java new file mode 100644 index 0000000000..c78c090c22 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/BasegridExcel.java @@ -0,0 +1,45 @@ +package com.epmet.opendata.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class BasegridExcel { + + @Excel(name = "") + private String coordinateInfo; + + @Excel(name = "") + private String gridName; + + @Excel(name = "") + private String subDistrictOffice; + + @Excel(name = "") + private String community; + + @Excel(name = "") + private String streetCode; + + @Excel(name = "") + private String gridCode; + + @Excel(name = "") + private String communityCode; + + @Excel(name = "") + private String longitude; + + @Excel(name = "") + private String latitude; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/BmGridExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/BmGridExcel.java new file mode 100644 index 0000000000..351509c9dd --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/BmGridExcel.java @@ -0,0 +1,129 @@ +package com.epmet.opendata.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class BmGridExcel { + + @Excel(name = "网格ID") + private Long gridId; + + @Excel(name = "网格编码。人工填写，编码规则业务规定，不允许重复。") + private String gridCode; + + @Excel(name = "网格名称") + private String gridName; + + @Excel(name = "行政区划的国标编码") + private String gbCode; + + @Excel(name = "上级网格ID") + private Long parentId; + + @Excel(name = "上级网格编码") + private String parentCode; + + @Excel(name = "网格分类。1基础网格 2环保网格 3防火网格 4城管网格 5执法网格 6安监网格等") + private String gridClassification; + + @Excel(name = "网格层级。网格层级表的层级 根据【网格层级表】的层级关系动态展示。 查询【网格层级表】层级 条件：上层级=网格树返回的网格层级") + private String gridLevel; + + @Excel(name = "网格属性。01村庄、02小区、03企业、04学校（幼儿园）、05医院、06驻镇（街）单位、07其他") + private String gridProperty; + + @Excel(name = "是否最后一级:0否 1是") + private String isEnd; + + @Excel(name = "网格地址") + private String gridAddress; + + @Excel(name = "网格介绍") + private String gridIntroduce; + + @Excel(name = "宣传图片") + private String gridPicture; + + @Excel(name = "地图区域范围") + private String reginScopeDesc; + + @Excel(name = "展示顺序") + private Integer gridSort; + + @Excel(name = "标绘状态") + private String pointStatus; + + @Excel(name = "事件上报中心") + private Long gridEmCenter; + + @Excel(name = "初始日期") + private Date gridBeginTime; + + @Excel(name = "终止日期") + private Date gridEndTime; + + @Excel(name = "面积") + private String gridArea; + + @Excel(name = "是否有效") + private String isValid; + + @Excel(name = "创建人") + private Long createBy; + + @Excel(name = "创建时间") + private Date createDate; + + @Excel(name = "") + private Long updateBy; + + @Excel(name = "") + private Date updateDate; + + @Excel(name = "删除状态: 字典值：normal正常，删除deleted") + private String deleteFlag; + + @Excel(name = "乐观锁") + private Integer versions; + + @Excel(name = "网格内人口规模") + private String attribute1; + + @Excel(name = "是否成立网格党支部或网格党小组") + private String attribute2; + + @Excel(name = "网格党组织类型") + private String attribute3; + + @Excel(name = "党组织编码") + private String attribute4; + + @Excel(name = "扩展字段") + private String attribute5; + + @Excel(name = "扩展字段") + private Long attribute6; + + @Excel(name = "扩展字段") + private Long attribute7; + + @Excel(name = "扩展字段") + private Long attribute8; + + @Excel(name = "扩展字段") + private Date attribute9; + + @Excel(name = "扩展字段") + private Date attribute10; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/CommunityExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/CommunityExcel.java new file mode 100644 index 0000000000..cf4f22c20f --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/CommunityExcel.java @@ -0,0 +1,39 @@ +package com.epmet.opendata.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class CommunityExcel { + + @Excel(name = "") + private String coordinateInfo; + + @Excel(name = "") + private String streetName; + + @Excel(name = "") + private String streetCode; + + @Excel(name = "") + private String communityName; + + @Excel(name = "") + private String communityCode; + + @Excel(name = "") + private String longitude; + + @Excel(name = "") + private String latitude; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/SubdistrictOfficeExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/SubdistrictOfficeExcel.java new file mode 100644 index 0000000000..43af5c9c7a --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/SubdistrictOfficeExcel.java @@ -0,0 +1,33 @@ +package com.epmet.opendata.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class SubdistrictOfficeExcel { + + @Excel(name = "") + private String coordinateInfo; + + @Excel(name = "") + private String streetName; + + @Excel(name = "") + private String streetCode; + + @Excel(name = "") + private String longitude; + + @Excel(name = "") + private String latitude; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghDywgExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghDywgExcel.java new file mode 100644 index 0000000000..0c8300cdb0 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghDywgExcel.java @@ -0,0 +1,51 @@ +package com.epmet.opendata.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 单元网格 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghDywgExcel { + + @Excel(name = "") + private Integer objectid; + + @Excel(name = "网格名称") + private String bgname; + + @Excel(name = "所属街镇") + private String street; + + @Excel(name = "所属社区") + private String community; + + @Excel(name = "网格面积") + private Double bgsqua; + + @Excel(name = "初始时间") + private Date ordate; + + @Excel(name = "变更时间") + private Date chdate; + + @Excel(name = "备注") + private String note; + + @Excel(name = "") + private String contacts; + + @Excel(name = "联系电话") + private String telphone; + + @Excel(name = "插入日期") + private Date insertTime; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghJdbExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghJdbExcel.java new file mode 100644 index 0000000000..e2bc316ac2 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghJdbExcel.java @@ -0,0 +1,39 @@ +package com.epmet.opendata.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 街道办 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghJdbExcel { + + @Excel(name = "") + private String objectid1; + + @Excel(name = "") + private String objectid; + + @Excel(name = "街道名称") + private String mc; + + @Excel(name = "责任人") + private String personInCharge; + + @Excel(name = "联系电话") + private String 联系电话; + + @Excel(name = "") + private Double shapeLeng; + + @Excel(name = "插入日期") + private Date insertTime; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghJqzExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghJqzExcel.java new file mode 100644 index 0000000000..c8f469aaef --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghJqzExcel.java @@ -0,0 +1,81 @@ +package com.epmet.opendata.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 加气站信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghJqzExcel { + + @Excel(name = "") + private Integer objectid; + + @Excel(name = "序号") + private String xh; + + @Excel(name = "单位名称") + private String name; + + @Excel(name = "") + private Double area; + + @Excel(name = "周边安全间距") + private String space; + + @Excel(name = "存在问题") + private String problem; + + @Excel(name = "危险源类型") + private String type; + + @Excel(name = "经营地址") + private String location; + + @Excel(name = "负责人") + private String principal; + + @Excel(name = "联系电话") + private String phone; + + @Excel(name = "企业类型") + private String qtype; + + @Excel(name = "危化品种类") + private String wtype; + + @Excel(name = "等级") + private String level; + + @Excel(name = "性质") + private String nature; + + @Excel(name = "备注") + private String remarks; + + @Excel(name = "") + private String dwmcjc; + + @Excel(name = "") + private String layer; + + @Excel(name = "") + private String ssjdb; + + @Excel(name = "数量") + private String amount; + + @Excel(name = "应急措施") + private String yjcs; + + @Excel(name = "插入日期") + private Date insertTime; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghJxcsExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghJxcsExcel.java new file mode 100644 index 0000000000..0c2bd157cf --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghJxcsExcel.java @@ -0,0 +1,78 @@ +package com.epmet.opendata.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 九小场所信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghJxcsExcel { + + @Excel(name = "") + private String objectid; + + @Excel(name = "") + private String jsonInfo; + + @Excel(name = "") + private String creatTime; + + @Excel(name = "所属街道") + private String ssjd; + + @Excel(name = "所属社区") + private String sssq; + + @Excel(name = "道路名") + private String dlm; + + @Excel(name = "门牌号") + private String mph; + + @Excel(name = "名称") + private String name; + + @Excel(name = "") + private String ztlx; + + @Excel(name = "子类型") + private String type; + + @Excel(name = "统一社会信用代码") + private String xydm; + + @Excel(name = "联系人") + private String lxr; + + @Excel(name = "联系电话") + private String lxdh; + + @Excel(name = "") + private String userName; + + @Excel(name = "备注") + private String bz; + + @Excel(name = "") + private String available; + + @Excel(name = "") + private String id; + + @Excel(name = "编辑人ID") + private String userId; + + @Excel(name = "编辑人姓名") + private String updateTim; + + @Excel(name = "插入日期") + private String insertTime; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghJyzExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghJyzExcel.java new file mode 100644 index 0000000000..e8bdf9e000 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghJyzExcel.java @@ -0,0 +1,81 @@ +package com.epmet.opendata.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 加油站 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghJyzExcel { + + @Excel(name = "") + private Integer objectid; + + @Excel(name = "序号") + private String xh; + + @Excel(name = "单位名称") + private String name; + + @Excel(name = "") + private Double area; + + @Excel(name = "周边安全间距") + private String space; + + @Excel(name = "存在问题") + private String problem; + + @Excel(name = "危险源类型") + private String type; + + @Excel(name = "经营地址") + private String location; + + @Excel(name = "负责人") + private String principal; + + @Excel(name = "联系电话") + private String phone; + + @Excel(name = "企业类型") + private String qtype; + + @Excel(name = "危化品种类") + private String wtype; + + @Excel(name = "等级") + private String level; + + @Excel(name = "性质") + private String nature; + + @Excel(name = "备注") + private String remarks; + + @Excel(name = "") + private String dwmcjc; + + @Excel(name = "") + private String layer; + + @Excel(name = "") + private String ssjdb; + + @Excel(name = "数量") + private String amount; + + @Excel(name = "应急措施") + private String yjcs; + + @Excel(name = "插入日期") + private Date insertTime; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSjxxbExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSjxxbExcel.java new file mode 100644 index 0000000000..eb861aa4ae --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSjxxbExcel.java @@ -0,0 +1,63 @@ +package com.epmet.opendata.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 事件信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghSjxxbExcel { + + @Excel(name = "") + private Integer objectid1; + + @Excel(name = "") + private Double objectid; + + @Excel(name = "事件来源") + private String infosourcename; + + @Excel(name = "事件类别") + private String infotypename; + + @Excel(name = "社区名称") + private String communityname; + + @Excel(name = "事件描述") + private String description; + + @Excel(name = "") + private String taskid; + + @Excel(name = "") + private String casesn; + + @Excel(name = "事件地址") + private String address; + + @Excel(name = "事件状态") + private String statusname; + + @Excel(name = "") + private String infobcname; + + @Excel(name = "") + private String infoscname; + + @Excel(name = "街道名称") + private String streetname; + + @Excel(name = "") + private Date discovertime; + + @Excel(name = "插入日期") + private Date insertTime; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSqxxExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSqxxExcel.java new file mode 100644 index 0000000000..4d308f8d41 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSqxxExcel.java @@ -0,0 +1,90 @@ +package com.epmet.opendata.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghSqxxExcel { + + @Excel(name = "") + private Integer objectid; + + @Excel(name = "") + private Double commuarea; + + @Excel(name = "") + private String belongto; + + @Excel(name = "") + private String contacts; + + @Excel(name = "") + private String telphone; + + @Excel(name = "") + private Double numberOfGrid; + + @Excel(name = "") + private String streetCode; + + @Excel(name = "") + private String communityCode; + + @Excel(name = "") + private String commname; + + @Excel(name = "") + private String jdcjgb; + + @Excel(name = "") + private String wgz; + + @Excel(name = "") + private String policeName; + + @Excel(name = "") + private Double trafficPolicePhone; + + @Excel(name = "") + private String trafficPoliceCompany; + + @Excel(name = "") + private String peoPoliceName; + + @Excel(name = "") + private String peoPolicePhone; + + @Excel(name = "") + private String policeStation; + + @Excel(name = "") + private String wgy; + + @Excel(name = "") + private String jdlxks; + + @Excel(name = "") + private String ddy; + + @Excel(name = "") + private String zhzfxm; + + @Excel(name = "") + private String zhzfdh; + + @Excel(name = "") + private String zhzfbm; + + @Excel(name = "") + private Date insertTime; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSzcgwghExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSzcgwghExcel.java new file mode 100644 index 0000000000..e00b617c39 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSzcgwghExcel.java @@ -0,0 +1,36 @@ +package com.epmet.opendata.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 数字城管网格化信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghSzcgwghExcel { + + @Excel(name = "") + private Integer objectid; + + @Excel(name = "备注") + private String note; + + @Excel(name = "") + private String sssq; + + @Excel(name = "") + private String ssjd; + + @Excel(name = "") + private String id; + + @Excel(name = "") + private Date insertTime; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSzzrwgExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSzzrwgExcel.java new file mode 100644 index 0000000000..9b59f93a96 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSzzrwgExcel.java @@ -0,0 +1,36 @@ +package com.epmet.opendata.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 市政责任网格信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghSzzrwgExcel { + + @Excel(name = "") + private Integer objectid; + + @Excel(name = "备注") + private String note; + + @Excel(name = "责任单位") + private String name; + + @Excel(name = "监管人") + private String principal; + + @Excel(name = "联系方式") + private String phone; + + @Excel(name = "插入日期") + private Date insertTime; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghWhpdwExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghWhpdwExcel.java new file mode 100644 index 0000000000..94a9e37250 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghWhpdwExcel.java @@ -0,0 +1,87 @@ +package com.epmet.opendata.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 危化品单位信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghWhpdwExcel { + + @Excel(name = "") + private Integer objectid; + + @Excel(name = "序号") + private String xh; + + @Excel(name = "单位名称") + private String name; + + @Excel(name = "") + private Double area; + + @Excel(name = "周边安全间距") + private String space; + + @Excel(name = "存在问题") + private String problem; + + @Excel(name = "危险源类型") + private String type; + + @Excel(name = "经营地址") + private String location; + + @Excel(name = "安全负责人") + private String person; + + @Excel(name = "联系电话") + private String phone; + + @Excel(name = "企业类型") + private String qtype; + + @Excel(name = "危化品种类") + private String wtype; + + @Excel(name = "数量") + private String amount; + + @Excel(name = "等级") + private String grade; + + @Excel(name = "性质") + private String natrue; + + @Excel(name = "应急措施") + private String yjcs; + + @Excel(name = "备注") + private String note; + + @Excel(name = "") + private String dwmcjc; + + @Excel(name = "主要负责人") + private String principal; + + @Excel(name = "用途") + private String user; + + @Excel(name = "") + private String layer; + + @Excel(name = "") + private String ssjdb; + + @Excel(name = "插入日期") + private Date insertTime; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghYjbmcsExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghYjbmcsExcel.java new file mode 100644 index 0000000000..b180b13932 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghYjbmcsExcel.java @@ -0,0 +1,57 @@ +package com.epmet.opendata.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 应急避难场所信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghYjbmcsExcel { + + @Excel(name = "") + private Integer objectid; + + @Excel(name = "") + private String grade; + + @Excel(name = "地址") + private String adress; + + @Excel(name = "面积(㎡)") + private String area; + + @Excel(name = "容纳人数") + private String rnns; + + @Excel(name = "") + private String sfbsp; + + @Excel(name = "") + private String zysbcs; + + @Excel(name = "") + private String fzr; + + @Excel(name = "") + private String zgdw; + + @Excel(name = "") + private String name; + + @Excel(name = "") + private String fzrtel; + + @Excel(name = "") + private String ssjd; + + @Excel(name = "") + private Date insertTime; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghYqhjzExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghYqhjzExcel.java new file mode 100644 index 0000000000..c6bfaa9307 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghYqhjzExcel.java @@ -0,0 +1,81 @@ +package com.epmet.opendata.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 油气合建站信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Data +public class WghYqhjzExcel { + + @Excel(name = "") + private Integer objectid; + + @Excel(name = "序号") + private String xh; + + @Excel(name = "单位名称") + private String name; + + @Excel(name = "") + private Double area; + + @Excel(name = "周边安全间距") + private String space; + + @Excel(name = "危险源类型") + private String type; + + @Excel(name = "经营地址") + private String location; + + @Excel(name = "负责人") + private String principal; + + @Excel(name = "联系电话") + private String phone; + + @Excel(name = "企业类型") + private String qtype; + + @Excel(name = "危化品种类") + private String wtype; + + @Excel(name = "数量") + private String amount; + + @Excel(name = "等级") + private String grade; + + @Excel(name = "性质") + private String natrue; + + @Excel(name = "应急措施") + private String yjcs; + + @Excel(name = "备注") + private String note; + + @Excel(name = "简称") + private String dwmcjc; + + @Excel(name = "所在图层") + private String layer; + + @Excel(name = "所属街道办") + private String ssjdb; + + @Excel(name = "存在问题") + private String problem; + + @Excel(name = "插入日期") + private Date insertTime; + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/BasegridRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/BasegridRedis.java new file mode 100644 index 0000000000..26ac2a5600 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/BasegridRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Component +public class BasegridRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/BmGridRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/BmGridRedis.java new file mode 100644 index 0000000000..29e6df66c3 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/BmGridRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Component +public class BmGridRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/CommunityRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/CommunityRedis.java new file mode 100644 index 0000000000..201fa90d44 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/CommunityRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Component +public class CommunityRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/SubdistrictOfficeRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/SubdistrictOfficeRedis.java new file mode 100644 index 0000000000..11e7458396 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/SubdistrictOfficeRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Component +public class SubdistrictOfficeRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghDywgRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghDywgRedis.java new file mode 100644 index 0000000000..7ae8d82888 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghDywgRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 单元网格 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Component +public class WghDywgRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghJdbRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghJdbRedis.java new file mode 100644 index 0000000000..7eb624a467 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghJdbRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 街道办 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Component +public class WghJdbRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghJqzRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghJqzRedis.java new file mode 100644 index 0000000000..2c05f982dd --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghJqzRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 加气站信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Component +public class WghJqzRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghJxcsRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghJxcsRedis.java new file mode 100644 index 0000000000..4463866cd3 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghJxcsRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 九小场所信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Component +public class WghJxcsRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghJyzRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghJyzRedis.java new file mode 100644 index 0000000000..6d477dd45c --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghJyzRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 加油站 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Component +public class WghJyzRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghSjxxbRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghSjxxbRedis.java new file mode 100644 index 0000000000..f52724484b --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghSjxxbRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 事件信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Component +public class WghSjxxbRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghSqxxRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghSqxxRedis.java new file mode 100644 index 0000000000..ae6c063db3 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghSqxxRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Component +public class WghSqxxRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghSzcgwghRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghSzcgwghRedis.java new file mode 100644 index 0000000000..3ad17f710a --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghSzcgwghRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 数字城管网格化信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Component +public class WghSzcgwghRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghSzzrwgRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghSzzrwgRedis.java new file mode 100644 index 0000000000..d3bf717cb2 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghSzzrwgRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 市政责任网格信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Component +public class WghSzzrwgRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghWhpdwRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghWhpdwRedis.java new file mode 100644 index 0000000000..91d21285f1 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghWhpdwRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 危化品单位信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Component +public class WghWhpdwRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghYjbmcsRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghYjbmcsRedis.java new file mode 100644 index 0000000000..cbe2fb69d5 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghYjbmcsRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 应急避难场所信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Component +public class WghYjbmcsRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghYqhjzRedis.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghYqhjzRedis.java new file mode 100644 index 0000000000..4143ec72df --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/redis/WghYqhjzRedis.java @@ -0,0 +1,30 @@ +package com.epmet.opendata.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 油气合建站信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Component +public class WghYqhjzRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BasegridService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BasegridService.java new file mode 100644 index 0000000000..2dad26e69a --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BasegridService.java @@ -0,0 +1,88 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.BasegridDTO; +import com.epmet.opendata.entity.BasegridEntity; + + +import java.util.List; +import java.util.Map; + +/** + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface BasegridService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return BasegridDTO + * @author generator + * @date 2022-06-14 + */ + BasegridDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(BasegridDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(BasegridDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); + + /** + * 调用ruoyi存储基础网格的数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 13:40 + */ + void preserBaseGridVation(PreserVationFormDTO dto); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BmGridService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BmGridService.java new file mode 100644 index 0000000000..c61414ab19 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BmGridService.java @@ -0,0 +1,82 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.BmGridDTO; +import com.epmet.opendata.entity.BmGridEntity; + + +import java.util.List; +import java.util.Map; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface BmGridService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return BmGridDTO + * @author generator + * @date 2022-06-14 + */ + BmGridDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(BmGridDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(BmGridDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CommunityService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CommunityService.java new file mode 100644 index 0000000000..002c3f0fd6 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CommunityService.java @@ -0,0 +1,79 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.wgh.CommunityDTO; +import com.epmet.opendata.entity.CommunityEntity; + + +import java.util.List; +import java.util.Map; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface CommunityService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return CommunityDTO + * @author generator + * @date 2022-06-14 + */ + CommunityDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(CommunityDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(CommunityDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/SubdistrictOfficeService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/SubdistrictOfficeService.java new file mode 100644 index 0000000000..8d37a4ff87 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/SubdistrictOfficeService.java @@ -0,0 +1,79 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.wgh.SubdistrictOfficeDTO; +import com.epmet.opendata.entity.SubdistrictOfficeEntity; + + +import java.util.List; +import java.util.Map; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface SubdistrictOfficeService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return SubdistrictOfficeDTO + * @author generator + * @date 2022-06-14 + */ + SubdistrictOfficeDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(SubdistrictOfficeDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(SubdistrictOfficeDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghDywgService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghDywgService.java new file mode 100644 index 0000000000..e078faba79 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghDywgService.java @@ -0,0 +1,78 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.wgh.WghDywgDTO; +import com.epmet.opendata.entity.WghDywgEntity; + +import java.util.List; +import java.util.Map; + +/** + * 单元网格 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface WghDywgService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return WghDywgDTO + * @author generator + * @date 2022-06-14 + */ + WghDywgDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(WghDywgDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(WghDywgDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJdbService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJdbService.java new file mode 100644 index 0000000000..6c85b56301 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJdbService.java @@ -0,0 +1,79 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.wgh.WghJdbDTO; +import com.epmet.opendata.entity.WghJdbEntity; + + +import java.util.List; +import java.util.Map; + +/** + * 街道办 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface WghJdbService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return WghJdbDTO + * @author generator + * @date 2022-06-14 + */ + WghJdbDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(WghJdbDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(WghJdbDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJqzService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJqzService.java new file mode 100644 index 0000000000..941e4c2b29 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJqzService.java @@ -0,0 +1,79 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.wgh.WghJqzDTO; +import com.epmet.opendata.entity.WghJqzEntity; + + +import java.util.List; +import java.util.Map; + +/** + * 加气站信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface WghJqzService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return WghJqzDTO + * @author generator + * @date 2022-06-14 + */ + WghJqzDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(WghJqzDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(WghJqzDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJxcsService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJxcsService.java new file mode 100644 index 0000000000..4f0d630cff --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJxcsService.java @@ -0,0 +1,79 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.wgh.WghJxcsDTO; +import com.epmet.opendata.entity.WghJxcsEntity; + + +import java.util.List; +import java.util.Map; + +/** + * 九小场所信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface WghJxcsService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return WghJxcsDTO + * @author generator + * @date 2022-06-14 + */ + WghJxcsDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(WghJxcsDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(WghJxcsDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJyzService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJyzService.java new file mode 100644 index 0000000000..816c3950fe --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJyzService.java @@ -0,0 +1,78 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.wgh.WghJyzDTO; +import com.epmet.opendata.entity.WghJyzEntity; + +import java.util.List; +import java.util.Map; + +/** + * 加油站 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface WghJyzService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return WghJyzDTO + * @author generator + * @date 2022-06-14 + */ + WghJyzDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(WghJyzDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(WghJyzDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxbService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxbService.java new file mode 100644 index 0000000000..260daf8c31 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxbService.java @@ -0,0 +1,78 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.wgh.WghSjxxbDTO; +import com.epmet.opendata.entity.WghSjxxbEntity; + +import java.util.List; +import java.util.Map; + +/** + * 事件信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface WghSjxxbService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return WghSjxxbDTO + * @author generator + * @date 2022-06-14 + */ + WghSjxxbDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(WghSjxxbDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(WghSjxxbDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSqxxService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSqxxService.java new file mode 100644 index 0000000000..8b2f86155c --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSqxxService.java @@ -0,0 +1,79 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.wgh.WghSqxxDTO; +import com.epmet.opendata.entity.WghSqxxEntity; + + +import java.util.List; +import java.util.Map; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface WghSqxxService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return WghSqxxDTO + * @author generator + * @date 2022-06-14 + */ + WghSqxxDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(WghSqxxDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(WghSqxxDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSzcgwghService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSzcgwghService.java new file mode 100644 index 0000000000..c31d4d68ad --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSzcgwghService.java @@ -0,0 +1,79 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.wgh.WghSzcgwghDTO; +import com.epmet.opendata.entity.WghSzcgwghEntity; + + +import java.util.List; +import java.util.Map; + +/** + * 数字城管网格化信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface WghSzcgwghService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return WghSzcgwghDTO + * @author generator + * @date 2022-06-14 + */ + WghSzcgwghDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(WghSzcgwghDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(WghSzcgwghDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSzzrwgService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSzzrwgService.java new file mode 100644 index 0000000000..6a83a2401a --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSzzrwgService.java @@ -0,0 +1,79 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.wgh.WghSzzrwgDTO; +import com.epmet.opendata.entity.WghSzzrwgEntity; + + +import java.util.List; +import java.util.Map; + +/** + * 市政责任网格信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface WghSzzrwgService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return WghSzzrwgDTO + * @author generator + * @date 2022-06-14 + */ + WghSzzrwgDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(WghSzzrwgDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(WghSzzrwgDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghWhpdwService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghWhpdwService.java new file mode 100644 index 0000000000..44469f2890 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghWhpdwService.java @@ -0,0 +1,79 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.wgh.WghWhpdwDTO; +import com.epmet.opendata.entity.WghWhpdwEntity; + + +import java.util.List; +import java.util.Map; + +/** + * 危化品单位信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface WghWhpdwService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return WghWhpdwDTO + * @author generator + * @date 2022-06-14 + */ + WghWhpdwDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(WghWhpdwDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(WghWhpdwDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghYjbmcsService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghYjbmcsService.java new file mode 100644 index 0000000000..d73715139d --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghYjbmcsService.java @@ -0,0 +1,79 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.wgh.WghYjbmcsDTO; +import com.epmet.opendata.entity.WghYjbmcsEntity; + + +import java.util.List; +import java.util.Map; + +/** + * 应急避难场所信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface WghYjbmcsService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return WghYjbmcsDTO + * @author generator + * @date 2022-06-14 + */ + WghYjbmcsDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(WghYjbmcsDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(WghYjbmcsDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghYqhjzService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghYqhjzService.java new file mode 100644 index 0000000000..7aff21c044 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghYqhjzService.java @@ -0,0 +1,78 @@ +package com.epmet.opendata.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.entity.WghYqhjzEntity; +import com.epmet.opendata.dto.wgh.WghYqhjzDTO; + +import java.util.List; +import java.util.Map; + +/** + * 油气合建站信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +public interface WghYqhjzService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-14 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-14 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return WghYqhjzDTO + * @author generator + * @date 2022-06-14 + */ + WghYqhjzDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void save(WghYqhjzDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-14 + */ + void update(WghYqhjzDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-14 + */ + void delete(String[] ids); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BasegridServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BasegridServiceImpl.java new file mode 100644 index 0000000000..3cbabe9382 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BasegridServiceImpl.java @@ -0,0 +1,168 @@ +package com.epmet.opendata.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; +import com.epmet.opendata.dao.BasegridDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.BasegridDTO; +import com.epmet.opendata.entity.BasegridEntity; +import com.epmet.opendata.entity.CaLoudongEntity; +import com.epmet.opendata.redis.BasegridRedis; +import com.epmet.opendata.service.BasegridService; +import com.epmet.opendata.util.AesUtils; +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.Arrays; +import java.util.List; +import java.util.Map; + +/** + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class BasegridServiceImpl extends BaseServiceImpl implements BasegridService { + + @Autowired + private BasegridRedis basegridRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, BasegridDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, BasegridDTO.class); + } + + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public BasegridDTO get(String id) { + BasegridEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, BasegridDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(BasegridDTO dto) { + BasegridEntity entity = ConvertUtils.sourceToTarget(dto, BasegridEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(BasegridDTO dto) { + BasegridEntity entity = ConvertUtils.sourceToTarget(dto, BasegridEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + /** + * 调用ruoyi存储基础网格的数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 13:41 + */ + @Override + public void preserBaseGridVation(PreserVationFormDTO dto) { + int i = baseDao.deleteAll(); + if (i > 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(NumConstant.FIFTY); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableName(CaWghDataConstant.SHARE_BASE_GRID); + + dto.setWhereCase("1=1"); + dto.setOrderBy(""); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listBaseGrid(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + + } + } + + private int listBaseGrid(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.SHARE_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + private int total; + private List list; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BmGridServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BmGridServiceImpl.java new file mode 100644 index 0000000000..349e77f2cf --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BmGridServiceImpl.java @@ -0,0 +1,91 @@ +package com.epmet.opendata.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; + +import com.epmet.opendata.dao.BmGridDao; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.BmGridDTO; +import com.epmet.opendata.entity.BmGridEntity; +import com.epmet.opendata.redis.BmGridRedis; +import com.epmet.opendata.service.BmGridService; +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.Arrays; +import java.util.List; +import java.util.Map; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class BmGridServiceImpl extends BaseServiceImpl implements BmGridService { + + @Autowired + private BmGridRedis bmGridRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, BmGridDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, BmGridDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public BmGridDTO get(String id) { + BmGridEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, BmGridDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(BmGridDTO dto) { + BmGridEntity entity = ConvertUtils.sourceToTarget(dto, BmGridEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(BmGridDTO dto) { + BmGridEntity entity = ConvertUtils.sourceToTarget(dto, BmGridEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CommunityServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CommunityServiceImpl.java new file mode 100644 index 0000000000..d1143a6ac9 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CommunityServiceImpl.java @@ -0,0 +1,87 @@ +package com.epmet.opendata.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.opendata.dao.CommunityDao; +import com.epmet.opendata.dto.wgh.CommunityDTO; +import com.epmet.opendata.entity.CommunityEntity; +import com.epmet.opendata.redis.CommunityRedis; +import com.epmet.opendata.service.CommunityService; +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.Arrays; +import java.util.List; +import java.util.Map; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class CommunityServiceImpl extends BaseServiceImpl implements CommunityService { + + @Autowired + private CommunityRedis communityRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, CommunityDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, CommunityDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public CommunityDTO get(String id) { + CommunityEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, CommunityDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(CommunityDTO dto) { + CommunityEntity entity = ConvertUtils.sourceToTarget(dto, CommunityEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(CommunityDTO dto) { + CommunityEntity entity = ConvertUtils.sourceToTarget(dto, CommunityEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java index b8e1f0b669..9a790ccd56 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java @@ -25,6 +25,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { @Autowired private CaRotatorsService rotatorsService; + @Autowired + private BasegridService basegridService; + @Override public void guardarDatosTask(PreserVationFormDTO dto) { if (StringUtils.isBlank(dto.getTableName())) { @@ -33,6 +36,7 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { rentalService.preserRentalVation(dto); residentService.preserResidentVation(dto); rotatorsService.preserRotatorsVation(dto); + basegridService.preserBaseGridVation(dto); } switch (dto.getTableName()) { @@ -51,6 +55,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { case CaWghDataConstant.UNICOM_ROTATORS: rotatorsService.preserRotatorsVation(dto); break; + case CaWghDataConstant.SHARE_BASE_GRID: + basegridService.preserBaseGridVation(dto); + break; } } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/SubdistrictOfficeServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/SubdistrictOfficeServiceImpl.java new file mode 100644 index 0000000000..bc1d42dd32 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/SubdistrictOfficeServiceImpl.java @@ -0,0 +1,87 @@ +package com.epmet.opendata.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.opendata.dao.SubdistrictOfficeDao; +import com.epmet.opendata.dto.wgh.SubdistrictOfficeDTO; +import com.epmet.opendata.entity.SubdistrictOfficeEntity; +import com.epmet.opendata.redis.SubdistrictOfficeRedis; +import com.epmet.opendata.service.SubdistrictOfficeService; +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.Arrays; +import java.util.List; +import java.util.Map; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class SubdistrictOfficeServiceImpl extends BaseServiceImpl implements SubdistrictOfficeService { + + @Autowired + private SubdistrictOfficeRedis subdistrictOfficeRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, SubdistrictOfficeDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, SubdistrictOfficeDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public SubdistrictOfficeDTO get(String id) { + SubdistrictOfficeEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, SubdistrictOfficeDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(SubdistrictOfficeDTO dto) { + SubdistrictOfficeEntity entity = ConvertUtils.sourceToTarget(dto, SubdistrictOfficeEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(SubdistrictOfficeDTO dto) { + SubdistrictOfficeEntity entity = ConvertUtils.sourceToTarget(dto, SubdistrictOfficeEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghDywgServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghDywgServiceImpl.java new file mode 100644 index 0000000000..ed55100449 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghDywgServiceImpl.java @@ -0,0 +1,87 @@ +package com.epmet.opendata.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.opendata.dao.WghDywgDao; +import com.epmet.opendata.dto.wgh.WghDywgDTO; +import com.epmet.opendata.entity.WghDywgEntity; +import com.epmet.opendata.redis.WghDywgRedis; +import com.epmet.opendata.service.WghDywgService; +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.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 单元网格 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class WghDywgServiceImpl extends BaseServiceImpl implements WghDywgService { + + @Autowired + private WghDywgRedis wghDywgRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, WghDywgDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, WghDywgDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public WghDywgDTO get(String id) { + WghDywgEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, WghDywgDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(WghDywgDTO dto) { + WghDywgEntity entity = ConvertUtils.sourceToTarget(dto, WghDywgEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(WghDywgDTO dto) { + WghDywgEntity entity = ConvertUtils.sourceToTarget(dto, WghDywgEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJdbServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJdbServiceImpl.java new file mode 100644 index 0000000000..874af41b73 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJdbServiceImpl.java @@ -0,0 +1,87 @@ +package com.epmet.opendata.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.opendata.dao.WghJdbDao; +import com.epmet.opendata.dto.wgh.WghJdbDTO; +import com.epmet.opendata.entity.WghJdbEntity; +import com.epmet.opendata.redis.WghJdbRedis; +import com.epmet.opendata.service.WghJdbService; +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.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 街道办 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class WghJdbServiceImpl extends BaseServiceImpl implements WghJdbService { + + @Autowired + private WghJdbRedis wghJdbRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, WghJdbDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, WghJdbDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public WghJdbDTO get(String id) { + WghJdbEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, WghJdbDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(WghJdbDTO dto) { + WghJdbEntity entity = ConvertUtils.sourceToTarget(dto, WghJdbEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(WghJdbDTO dto) { + WghJdbEntity entity = ConvertUtils.sourceToTarget(dto, WghJdbEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJqzServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJqzServiceImpl.java new file mode 100644 index 0000000000..79ed9af41e --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJqzServiceImpl.java @@ -0,0 +1,87 @@ +package com.epmet.opendata.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.opendata.dao.WghJqzDao; +import com.epmet.opendata.dto.wgh.WghJqzDTO; +import com.epmet.opendata.entity.WghJqzEntity; +import com.epmet.opendata.redis.WghJqzRedis; +import com.epmet.opendata.service.WghJqzService; +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.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 加气站信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class WghJqzServiceImpl extends BaseServiceImpl implements WghJqzService { + + @Autowired + private WghJqzRedis wghJqzRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, WghJqzDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, WghJqzDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public WghJqzDTO get(String id) { + WghJqzEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, WghJqzDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(WghJqzDTO dto) { + WghJqzEntity entity = ConvertUtils.sourceToTarget(dto, WghJqzEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(WghJqzDTO dto) { + WghJqzEntity entity = ConvertUtils.sourceToTarget(dto, WghJqzEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJxcsServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJxcsServiceImpl.java new file mode 100644 index 0000000000..1817a3bf57 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJxcsServiceImpl.java @@ -0,0 +1,87 @@ +package com.epmet.opendata.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.opendata.dao.WghJxcsDao; +import com.epmet.opendata.dto.wgh.WghJxcsDTO; +import com.epmet.opendata.entity.WghJxcsEntity; +import com.epmet.opendata.redis.WghJxcsRedis; +import com.epmet.opendata.service.WghJxcsService; +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.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 九小场所信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class WghJxcsServiceImpl extends BaseServiceImpl implements WghJxcsService { + + @Autowired + private WghJxcsRedis wghJxcsRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, WghJxcsDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, WghJxcsDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public WghJxcsDTO get(String id) { + WghJxcsEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, WghJxcsDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(WghJxcsDTO dto) { + WghJxcsEntity entity = ConvertUtils.sourceToTarget(dto, WghJxcsEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(WghJxcsDTO dto) { + WghJxcsEntity entity = ConvertUtils.sourceToTarget(dto, WghJxcsEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJyzServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJyzServiceImpl.java new file mode 100644 index 0000000000..893d0a3000 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJyzServiceImpl.java @@ -0,0 +1,87 @@ +package com.epmet.opendata.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.opendata.dao.WghJyzDao; +import com.epmet.opendata.dto.wgh.WghJyzDTO; +import com.epmet.opendata.entity.WghJyzEntity; +import com.epmet.opendata.redis.WghJyzRedis; +import com.epmet.opendata.service.WghJyzService; +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.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 加油站 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class WghJyzServiceImpl extends BaseServiceImpl implements WghJyzService { + + @Autowired + private WghJyzRedis wghJyzRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, WghJyzDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, WghJyzDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public WghJyzDTO get(String id) { + WghJyzEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, WghJyzDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(WghJyzDTO dto) { + WghJyzEntity entity = ConvertUtils.sourceToTarget(dto, WghJyzEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(WghJyzDTO dto) { + WghJyzEntity entity = ConvertUtils.sourceToTarget(dto, WghJyzEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxbServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxbServiceImpl.java new file mode 100644 index 0000000000..1ecbbcfa48 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxbServiceImpl.java @@ -0,0 +1,87 @@ +package com.epmet.opendata.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.opendata.dao.WghSjxxbDao; +import com.epmet.opendata.dto.wgh.WghSjxxbDTO; +import com.epmet.opendata.entity.WghSjxxbEntity; +import com.epmet.opendata.redis.WghSjxxbRedis; +import com.epmet.opendata.service.WghSjxxbService; +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.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 事件信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class WghSjxxbServiceImpl extends BaseServiceImpl implements WghSjxxbService { + + @Autowired + private WghSjxxbRedis wghSjxxbRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, WghSjxxbDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, WghSjxxbDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public WghSjxxbDTO get(String id) { + WghSjxxbEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, WghSjxxbDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(WghSjxxbDTO dto) { + WghSjxxbEntity entity = ConvertUtils.sourceToTarget(dto, WghSjxxbEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(WghSjxxbDTO dto) { + WghSjxxbEntity entity = ConvertUtils.sourceToTarget(dto, WghSjxxbEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSqxxServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSqxxServiceImpl.java new file mode 100644 index 0000000000..791f65fcb7 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSqxxServiceImpl.java @@ -0,0 +1,87 @@ +package com.epmet.opendata.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.opendata.dao.WghSqxxDao; +import com.epmet.opendata.dto.wgh.WghSqxxDTO; +import com.epmet.opendata.entity.WghSqxxEntity; +import com.epmet.opendata.redis.WghSqxxRedis; +import com.epmet.opendata.service.WghSqxxService; +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.Arrays; +import java.util.List; +import java.util.Map; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class WghSqxxServiceImpl extends BaseServiceImpl implements WghSqxxService { + + @Autowired + private WghSqxxRedis wghSqxxRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, WghSqxxDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, WghSqxxDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public WghSqxxDTO get(String id) { + WghSqxxEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, WghSqxxDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(WghSqxxDTO dto) { + WghSqxxEntity entity = ConvertUtils.sourceToTarget(dto, WghSqxxEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(WghSqxxDTO dto) { + WghSqxxEntity entity = ConvertUtils.sourceToTarget(dto, WghSqxxEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSzcgwghServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSzcgwghServiceImpl.java new file mode 100644 index 0000000000..945a091d0a --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSzcgwghServiceImpl.java @@ -0,0 +1,87 @@ +package com.epmet.opendata.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.opendata.dao.WghSzcgwghDao; +import com.epmet.opendata.dto.wgh.WghSzcgwghDTO; +import com.epmet.opendata.entity.WghSzcgwghEntity; +import com.epmet.opendata.redis.WghSzcgwghRedis; +import com.epmet.opendata.service.WghSzcgwghService; +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.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 数字城管网格化信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class WghSzcgwghServiceImpl extends BaseServiceImpl implements WghSzcgwghService { + + @Autowired + private WghSzcgwghRedis wghSzcgwghRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, WghSzcgwghDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, WghSzcgwghDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public WghSzcgwghDTO get(String id) { + WghSzcgwghEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, WghSzcgwghDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(WghSzcgwghDTO dto) { + WghSzcgwghEntity entity = ConvertUtils.sourceToTarget(dto, WghSzcgwghEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(WghSzcgwghDTO dto) { + WghSzcgwghEntity entity = ConvertUtils.sourceToTarget(dto, WghSzcgwghEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSzzrwgServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSzzrwgServiceImpl.java new file mode 100644 index 0000000000..5020b084c0 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSzzrwgServiceImpl.java @@ -0,0 +1,88 @@ +package com.epmet.opendata.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; + +import com.epmet.opendata.dao.WghSzzrwgDao; +import com.epmet.opendata.dto.wgh.WghSzzrwgDTO; +import com.epmet.opendata.entity.WghSzzrwgEntity; +import com.epmet.opendata.redis.WghSzzrwgRedis; +import com.epmet.opendata.service.WghSzzrwgService; +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.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 市政责任网格信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class WghSzzrwgServiceImpl extends BaseServiceImpl implements WghSzzrwgService { + + @Autowired + private WghSzzrwgRedis wghSzzrwgRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, WghSzzrwgDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, WghSzzrwgDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public WghSzzrwgDTO get(String id) { + WghSzzrwgEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, WghSzzrwgDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(WghSzzrwgDTO dto) { + WghSzzrwgEntity entity = ConvertUtils.sourceToTarget(dto, WghSzzrwgEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(WghSzzrwgDTO dto) { + WghSzzrwgEntity entity = ConvertUtils.sourceToTarget(dto, WghSzzrwgEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghWhpdwServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghWhpdwServiceImpl.java new file mode 100644 index 0000000000..b2e05da08a --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghWhpdwServiceImpl.java @@ -0,0 +1,87 @@ +package com.epmet.opendata.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.opendata.dao.WghWhpdwDao; +import com.epmet.opendata.dto.wgh.WghWhpdwDTO; +import com.epmet.opendata.entity.WghWhpdwEntity; +import com.epmet.opendata.redis.WghWhpdwRedis; +import com.epmet.opendata.service.WghWhpdwService; +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.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 危化品单位信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class WghWhpdwServiceImpl extends BaseServiceImpl implements WghWhpdwService { + + @Autowired + private WghWhpdwRedis wghWhpdwRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, WghWhpdwDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, WghWhpdwDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public WghWhpdwDTO get(String id) { + WghWhpdwEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, WghWhpdwDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(WghWhpdwDTO dto) { + WghWhpdwEntity entity = ConvertUtils.sourceToTarget(dto, WghWhpdwEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(WghWhpdwDTO dto) { + WghWhpdwEntity entity = ConvertUtils.sourceToTarget(dto, WghWhpdwEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghYjbmcsServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghYjbmcsServiceImpl.java new file mode 100644 index 0000000000..367d539a63 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghYjbmcsServiceImpl.java @@ -0,0 +1,87 @@ +package com.epmet.opendata.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.opendata.dao.WghYjbmcsDao; +import com.epmet.opendata.dto.wgh.WghYjbmcsDTO; +import com.epmet.opendata.entity.WghYjbmcsEntity; +import com.epmet.opendata.redis.WghYjbmcsRedis; +import com.epmet.opendata.service.WghYjbmcsService; +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.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 应急避难场所信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class WghYjbmcsServiceImpl extends BaseServiceImpl implements WghYjbmcsService { + + @Autowired + private WghYjbmcsRedis wghYjbmcsRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, WghYjbmcsDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, WghYjbmcsDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public WghYjbmcsDTO get(String id) { + WghYjbmcsEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, WghYjbmcsDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(WghYjbmcsDTO dto) { + WghYjbmcsEntity entity = ConvertUtils.sourceToTarget(dto, WghYjbmcsEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(WghYjbmcsDTO dto) { + WghYjbmcsEntity entity = ConvertUtils.sourceToTarget(dto, WghYjbmcsEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghYqhjzServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghYqhjzServiceImpl.java new file mode 100644 index 0000000000..aa8b06d753 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghYqhjzServiceImpl.java @@ -0,0 +1,87 @@ +package com.epmet.opendata.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; + +import com.epmet.opendata.dao.WghYqhjzDao; +import com.epmet.opendata.entity.WghYqhjzEntity; +import com.epmet.opendata.redis.WghYqhjzRedis; +import com.epmet.opendata.service.WghYqhjzService; +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 com.epmet.opendata.dto.wgh.WghYqhjzDTO; +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 油气合建站信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class WghYqhjzServiceImpl extends BaseServiceImpl implements WghYqhjzService { + + @Autowired + private WghYqhjzRedis wghYqhjzRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, WghYqhjzDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, WghYqhjzDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public WghYqhjzDTO get(String id) { + WghYqhjzEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, WghYqhjzDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(WghYqhjzDTO dto) { + WghYqhjzEntity entity = ConvertUtils.sourceToTarget(dto, WghYqhjzEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(WghYqhjzDTO dto) { + WghYqhjzEntity entity = ConvertUtils.sourceToTarget(dto, WghYqhjzEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/BasegridDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/BasegridDao.xml new file mode 100644 index 0000000000..daab0d0aee --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/BasegridDao.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + delete from BaseGrid + + + + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/BmGridDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/BmGridDao.xml new file mode 100644 index 0000000000..5afad7c849 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/BmGridDao.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CommunityDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CommunityDao.xml new file mode 100644 index 0000000000..dd20682a82 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CommunityDao.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/SubdistrictOfficeDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/SubdistrictOfficeDao.xml new file mode 100644 index 0000000000..9848740d6e --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/SubdistrictOfficeDao.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghDywgDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghDywgDao.xml new file mode 100644 index 0000000000..08611dc01e --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghDywgDao.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJdbDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJdbDao.xml new file mode 100644 index 0000000000..f5ef0fa1fb --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJdbDao.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJqzDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJqzDao.xml new file mode 100644 index 0000000000..d4549ee7a3 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJqzDao.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJxcsDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJxcsDao.xml new file mode 100644 index 0000000000..92f7c4f881 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJxcsDao.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJyzDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJyzDao.xml new file mode 100644 index 0000000000..4f2e3eddc5 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJyzDao.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxbDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxbDao.xml new file mode 100644 index 0000000000..8fd239723f --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxbDao.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSqxxDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSqxxDao.xml new file mode 100644 index 0000000000..fd055baeb0 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSqxxDao.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSzcgwghDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSzcgwghDao.xml new file mode 100644 index 0000000000..4c68a27413 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSzcgwghDao.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSzzrwgDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSzzrwgDao.xml new file mode 100644 index 0000000000..1c8dd6b88f --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSzzrwgDao.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghWhpdwDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghWhpdwDao.xml new file mode 100644 index 0000000000..d4c41c8e94 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghWhpdwDao.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghYjbmcsDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghYjbmcsDao.xml new file mode 100644 index 0000000000..536ca04ca0 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghYjbmcsDao.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghYqhjzDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghYqhjzDao.xml new file mode 100644 index 0000000000..1ec98d4387 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghYqhjzDao.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From de9a7bdc2352df83ee7292fc4a67b60cb961e91a Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 14 Jun 2022 14:23:24 +0800 Subject: [PATCH 02/58] =?UTF-8?q?=E8=B0=83=E7=94=A8ruoyi=E5=AD=98=E5=82=A8?= =?UTF-8?q?bm=5Fgrid=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/constant/CaWghDataConstant.java | 1 + .../opendata/controller/BmGridController.java | 15 +++- .../com/epmet/opendata/dao/BmGridDao.java | 1 + .../epmet/opendata/service/BmGridService.java | 10 ++- .../service/impl/BmGridServiceImpl.java | 80 +++++++++++++++++++ .../impl/GuardarDatosTaskServiceImpl.java | 8 ++ .../src/main/resources/mapper/BmGridDao.xml | 3 + 7 files changed, 115 insertions(+), 3 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java index 208790880a..95773cb324 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java @@ -21,6 +21,7 @@ public interface CaWghDataConstant { String UNICOM_RENTAL = "ca_rental"; String SHARE_BASE_GRID = "BaseGrid"; + String SHARE_BM_GRID = "bm_grid"; String DATA_URL_UNICON = "http://120.221.72.83:9090/bridge/unicom/page"; String DATA_URL_SHARE = "http://120.221.72.83:9090/bridge/share/sharePage"; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BmGridController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BmGridController.java index c89a16bce1..4c87101c5b 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BmGridController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BmGridController.java @@ -78,6 +78,17 @@ public class BmGridController { ExcelUtils.exportExcelToTarget(response, null, list, BmGridExcel.class); } - - + /** + * 调用ruoyi存储bm_grid数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 14:16 + */ + @PostMapping("preserBmGridVation") + public Result getpreserBmGridVation(@RequestBody PreserVationFormDTO dto) { + bmGridService.getPreserBmGridVation(dto); + return new Result(); + } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/BmGridDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/BmGridDao.java index 257761fae9..b4988f03c6 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/BmGridDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/BmGridDao.java @@ -14,4 +14,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface BmGridDao extends BaseDao { + int deleteAll(); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BmGridService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BmGridService.java index c61414ab19..d2f79c35fe 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BmGridService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BmGridService.java @@ -78,5 +78,13 @@ public interface BmGridService extends BaseService { */ void delete(String[] ids); - + /** + * 调用ruoyi存储bm_grid数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 14:17 + */ + void getPreserBmGridVation(PreserVationFormDTO dto); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BmGridServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BmGridServiceImpl.java index 349e77f2cf..d3cf864f00 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BmGridServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BmGridServiceImpl.java @@ -1,18 +1,26 @@ package com.epmet.opendata.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; import com.epmet.opendata.dao.BmGridDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.BmGridDTO; +import com.epmet.opendata.entity.BasegridEntity; import com.epmet.opendata.entity.BmGridEntity; import com.epmet.opendata.redis.BmGridRedis; import com.epmet.opendata.service.BmGridService; +import com.epmet.opendata.util.AesUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -86,6 +94,78 @@ public class BmGridServiceImpl extends BaseServiceImpl baseDao.deleteBatchIds(Arrays.asList(ids)); } + /** + * 调用ruoyi存储bm_grid数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 14:17 + */ + @Override + public void getPreserBmGridVation(PreserVationFormDTO dto) { + int i = baseDao.deleteAll(); + if (i > 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(NumConstant.FIFTY); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableName(CaWghDataConstant.SHARE_BM_GRID); + + dto.setWhereCase("delete_flag = 'normal'"); + dto.setOrderBy("grid_id,parent_id,create_date"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listBmGrid(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + } + + private int listBmGrid(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.SHARE_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()),ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + private int total; + private List list; + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java index 9a790ccd56..f7f955d333 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java @@ -3,6 +3,7 @@ package com.epmet.opendata.service.impl; import com.epmet.opendata.dto.constant.CaWghDataConstant; import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.service.*; +import net.bytebuddy.asm.Advice; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,6 +29,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { @Autowired private BasegridService basegridService; + @Autowired + private BmGridService bmGridService; + @Override public void guardarDatosTask(PreserVationFormDTO dto) { if (StringUtils.isBlank(dto.getTableName())) { @@ -37,6 +41,7 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { residentService.preserResidentVation(dto); rotatorsService.preserRotatorsVation(dto); basegridService.preserBaseGridVation(dto); + bmGridService.getPreserBmGridVation(dto); } switch (dto.getTableName()) { @@ -58,6 +63,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { case CaWghDataConstant.SHARE_BASE_GRID: basegridService.preserBaseGridVation(dto); break; + case CaWghDataConstant.SHARE_BM_GRID: + bmGridService.getPreserBmGridVation(dto); + break; } } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/BmGridDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/BmGridDao.xml index 5afad7c849..230d6fee17 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/BmGridDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/BmGridDao.xml @@ -42,6 +42,9 @@ + + delete from bm_grid + From ff2e388156d53ee01ffd7a70a1aa6efa8559b760 Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 14 Jun 2022 15:04:50 +0800 Subject: [PATCH 03/58] =?UTF-8?q?=E8=B0=83=E7=94=A8ruoyi=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AD=98=E5=82=A8=E7=A4=BE=E5=8C=BA=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/constant/CaWghDataConstant.java | 1 + .../controller/CommunityController.java | 29 ++++-- .../com/epmet/opendata/dao/CommunityDao.java | 1 + .../opendata/service/CommunityService.java | 13 ++- .../service/impl/CommunityServiceImpl.java | 90 ++++++++++++++++++- .../impl/GuardarDatosTaskServiceImpl.java | 7 ++ .../main/resources/mapper/CommunityDao.xml | 3 + 7 files changed, 129 insertions(+), 15 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java index 95773cb324..0419eb859f 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java @@ -22,6 +22,7 @@ public interface CaWghDataConstant { String SHARE_BASE_GRID = "BaseGrid"; String SHARE_BM_GRID = "bm_grid"; + String SHARE_COMMUNITY = "community"; String DATA_URL_UNICON = "http://120.221.72.83:9090/bridge/unicom/page"; String DATA_URL_SHARE = "http://120.221.72.83:9090/bridge/share/sharePage"; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CommunityController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CommunityController.java index 8e7b7f9528..a7f54e01e4 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CommunityController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CommunityController.java @@ -10,6 +10,7 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.CommunityDTO; import com.epmet.opendata.excel.CommunityExcel; import com.epmet.opendata.service.CommunityService; @@ -22,8 +23,6 @@ import java.util.Map; /** - * - * * @author generator generator@elink-cn.com * @since v1.0.0 2022-06-14 */ @@ -35,20 +34,20 @@ public class CommunityController { private CommunityService communityService; @RequestMapping("page") - public Result> page(@RequestParam Map params){ + public Result> page(@RequestParam Map params) { PageData page = communityService.page(params); return new Result>().ok(page); } - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ + @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) + public Result get(@PathVariable("id") String id) { CommunityDTO data = communityService.get(id); return new Result().ok(data); } @NoRepeatSubmit @PostMapping("save") - public Result save(@RequestBody CommunityDTO dto){ + public Result save(@RequestBody CommunityDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); communityService.save(dto); @@ -57,7 +56,7 @@ public class CommunityController { @NoRepeatSubmit @PostMapping("update") - public Result update(@RequestBody CommunityDTO dto){ + public Result update(@RequestBody CommunityDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); communityService.update(dto); @@ -65,7 +64,7 @@ public class CommunityController { } @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ + public Result delete(@RequestBody String[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); communityService.delete(ids); @@ -78,6 +77,18 @@ public class CommunityController { ExcelUtils.exportExcelToTarget(response, null, list, CommunityExcel.class); } - + /** + * 调用ruoyi接口存储社区数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 15:02 + */ + @PostMapping("preserCommunityVation") + public Result getPreserCommunityVation(@RequestBody PreserVationFormDTO dto) { + communityService.getPreserCommunityVation(dto); + return new Result(); + } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CommunityDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CommunityDao.java index 9dd874ef17..8457a499f4 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CommunityDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CommunityDao.java @@ -14,4 +14,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface CommunityDao extends BaseDao { + int deleteAll(); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CommunityService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CommunityService.java index 002c3f0fd6..1c22cad274 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CommunityService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CommunityService.java @@ -2,6 +2,7 @@ package com.epmet.opendata.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.CommunityDTO; import com.epmet.opendata.entity.CommunityEntity; @@ -10,8 +11,6 @@ import java.util.List; import java.util.Map; /** - * - * * @author generator generator@elink-cn.com * @since v1.0.0 2022-06-14 */ @@ -76,4 +75,14 @@ public interface CommunityService extends BaseService { * @date 2022-06-14 */ void delete(String[] ids); + + /** + * 调用ruoyi接口存储社区数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 15:03 + */ + void getPreserCommunityVation(PreserVationFormDTO dto); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CommunityServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CommunityServiceImpl.java index d1143a6ac9..0846ff4a95 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CommunityServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CommunityServiceImpl.java @@ -1,16 +1,25 @@ package com.epmet.opendata.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; import com.epmet.opendata.dao.CommunityDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.CommunityDTO; +import com.epmet.opendata.entity.CaLoudongEntity; import com.epmet.opendata.entity.CommunityEntity; import com.epmet.opendata.redis.CommunityRedis; import com.epmet.opendata.service.CommunityService; +import com.epmet.opendata.util.AesUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -21,8 +30,6 @@ import java.util.List; import java.util.Map; /** - * - * * @author generator generator@elink-cn.com * @since v1.0.0 2022-06-14 */ @@ -48,8 +55,8 @@ public class CommunityServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -84,4 +91,79 @@ public class CommunityServiceImpl extends BaseServiceImpl= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(NumConstant.FIFTY); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableName(CaWghDataConstant.SHARE_COMMUNITY); + + dto.setWhereCase("1=1"); + dto.setOrderBy(""); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listCommunity(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + } + + private int listCommunity(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.SHARE_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + + private int total; + private List list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java index f7f955d333..a4c42f7b09 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java @@ -32,6 +32,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { @Autowired private BmGridService bmGridService; + @Autowired + private CommunityService communityService; + @Override public void guardarDatosTask(PreserVationFormDTO dto) { if (StringUtils.isBlank(dto.getTableName())) { @@ -42,6 +45,7 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { rotatorsService.preserRotatorsVation(dto); basegridService.preserBaseGridVation(dto); bmGridService.getPreserBmGridVation(dto); + communityService.getPreserCommunityVation(dto); } switch (dto.getTableName()) { @@ -66,6 +70,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { case CaWghDataConstant.SHARE_BM_GRID: bmGridService.getPreserBmGridVation(dto); break; + case CaWghDataConstant.SHARE_COMMUNITY: + communityService.getPreserCommunityVation(dto); + break; } } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CommunityDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CommunityDao.xml index dd20682a82..03d2f5d563 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CommunityDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CommunityDao.xml @@ -12,6 +12,9 @@ + + delete from community + From 33b73c63121acd17fff0b978f940dfb8a2bcf998 Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 14 Jun 2022 15:14:38 +0800 Subject: [PATCH 04/58] =?UTF-8?q?=E8=B0=83=E7=94=A8ruoyi=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=8E=B7=E5=8F=96dywg=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/constant/CaWghDataConstant.java | 1 + .../controller/WghDywgController.java | 15 +++- .../com/epmet/opendata/dao/WghDywgDao.java | 1 + .../opendata/service/WghDywgService.java | 11 +++ .../impl/GuardarDatosTaskServiceImpl.java | 7 ++ .../service/impl/WghDywgServiceImpl.java | 84 +++++++++++++++++++ .../src/main/resources/mapper/WghDywgDao.xml | 3 + 7 files changed, 121 insertions(+), 1 deletion(-) diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java index 0419eb859f..f34ceda2ff 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java @@ -23,6 +23,7 @@ public interface CaWghDataConstant { String SHARE_BASE_GRID = "BaseGrid"; String SHARE_BM_GRID = "bm_grid"; String SHARE_COMMUNITY = "community"; + String SHARE_WGH_DYWG = "wgh_dywg"; String DATA_URL_UNICON = "http://120.221.72.83:9090/bridge/unicom/page"; String DATA_URL_SHARE = "http://120.221.72.83:9090/bridge/share/sharePage"; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghDywgController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghDywgController.java index d7e2123e75..90f910d9c2 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghDywgController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghDywgController.java @@ -10,6 +10,7 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghDywgDTO; import com.epmet.opendata.excel.WghDywgExcel; import com.epmet.opendata.service.WghDywgService; @@ -78,6 +79,18 @@ public class WghDywgController { ExcelUtils.exportExcelToTarget(response, null, list, WghDywgExcel.class); } - + /** + * 调用ruoyi接口获取dywg数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 15:11 + */ + @PostMapping("preserDywgVation") + public Result getPreserDywgVation(@RequestBody PreserVationFormDTO dto) { + wghDywgService.getPreserDywgVation(dto); + return new Result(); + } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghDywgDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghDywgDao.java index 488784b3d2..341db87c61 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghDywgDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghDywgDao.java @@ -14,4 +14,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface WghDywgDao extends BaseDao { + int deleteAll(); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghDywgService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghDywgService.java index e078faba79..8f13184379 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghDywgService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghDywgService.java @@ -2,6 +2,7 @@ package com.epmet.opendata.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghDywgDTO; import com.epmet.opendata.entity.WghDywgEntity; @@ -75,4 +76,14 @@ public interface WghDywgService extends BaseService { * @date 2022-06-14 */ void delete(String[] ids); + + /** + * 调用ruoyi接口获取dywg数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 15:11 + */ + void getPreserDywgVation(PreserVationFormDTO dto); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java index a4c42f7b09..3fcb79ec23 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java @@ -35,6 +35,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { @Autowired private CommunityService communityService; + @Autowired + private WghDywgService wghDywgService; + @Override public void guardarDatosTask(PreserVationFormDTO dto) { if (StringUtils.isBlank(dto.getTableName())) { @@ -46,6 +49,7 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { basegridService.preserBaseGridVation(dto); bmGridService.getPreserBmGridVation(dto); communityService.getPreserCommunityVation(dto); + wghDywgService.getPreserDywgVation(dto); } switch (dto.getTableName()) { @@ -73,6 +77,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { case CaWghDataConstant.SHARE_COMMUNITY: communityService.getPreserCommunityVation(dto); break; + case CaWghDataConstant.SHARE_WGH_DYWG: + wghDywgService.getPreserDywgVation(dto); + break; } } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghDywgServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghDywgServiceImpl.java index ed55100449..b3c29d6f40 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghDywgServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghDywgServiceImpl.java @@ -1,16 +1,25 @@ package com.epmet.opendata.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; import com.epmet.opendata.dao.WghDywgDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghDywgDTO; +import com.epmet.opendata.entity.CaLoudongEntity; import com.epmet.opendata.entity.WghDywgEntity; import com.epmet.opendata.redis.WghDywgRedis; import com.epmet.opendata.service.WghDywgService; +import com.epmet.opendata.util.AesUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -84,4 +93,79 @@ public class WghDywgServiceImpl extends BaseServiceImpl= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(NumConstant.FIFTY); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableName(CaWghDataConstant.SHARE_WGH_DYWG); + + dto.setWhereCase("1=1"); + dto.setOrderBy("ORDATE"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listDywg(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + } + + private int listDywg(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.SHARE_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + + private int total; + private List list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghDywgDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghDywgDao.xml index 08611dc01e..d5334a8e8a 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghDywgDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghDywgDao.xml @@ -16,6 +16,9 @@ + + delete from wgh_dywg + From c8df11700b573d943a55dffbd5fa14189a431cfa Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 14 Jun 2022 15:32:24 +0800 Subject: [PATCH 05/58] =?UTF-8?q?=E8=B0=83=E7=94=A8ruoyi=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=8E=B7=E5=8F=96wgh=5Fjdb=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/constant/CaWghDataConstant.java | 1 + .../opendata/controller/WghJdbController.java | 27 ++++-- .../com/epmet/opendata/dao/WghJdbDao.java | 1 + .../epmet/opendata/service/WghJdbService.java | 11 +++ .../impl/GuardarDatosTaskServiceImpl.java | 6 ++ .../service/impl/WghJdbServiceImpl.java | 88 ++++++++++++++++++- .../src/main/resources/mapper/WghJdbDao.xml | 3 + 7 files changed, 128 insertions(+), 9 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java index f34ceda2ff..4fa98e64af 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java @@ -24,6 +24,7 @@ public interface CaWghDataConstant { String SHARE_BM_GRID = "bm_grid"; String SHARE_COMMUNITY = "community"; String SHARE_WGH_DYWG = "wgh_dywg"; + String SHARE_WGH_JDB = "wgh_jdb"; String DATA_URL_UNICON = "http://120.221.72.83:9090/bridge/unicom/page"; String DATA_URL_SHARE = "http://120.221.72.83:9090/bridge/share/sharePage"; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJdbController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJdbController.java index 9ccb44429d..643bf049ca 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJdbController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJdbController.java @@ -10,6 +10,7 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghJdbDTO; import com.epmet.opendata.excel.WghJdbExcel; import com.epmet.opendata.service.WghJdbService; @@ -35,20 +36,20 @@ public class WghJdbController { private WghJdbService wghJdbService; @RequestMapping("page") - public Result> page(@RequestParam Map params){ + public Result> page(@RequestParam Map params) { PageData page = wghJdbService.page(params); return new Result>().ok(page); } - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ + @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) + public Result get(@PathVariable("id") String id) { WghJdbDTO data = wghJdbService.get(id); return new Result().ok(data); } @NoRepeatSubmit @PostMapping("save") - public Result save(@RequestBody WghJdbDTO dto){ + public Result save(@RequestBody WghJdbDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); wghJdbService.save(dto); @@ -57,7 +58,7 @@ public class WghJdbController { @NoRepeatSubmit @PostMapping("update") - public Result update(@RequestBody WghJdbDTO dto){ + public Result update(@RequestBody WghJdbDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); wghJdbService.update(dto); @@ -65,7 +66,7 @@ public class WghJdbController { } @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ + public Result delete(@RequestBody String[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); wghJdbService.delete(ids); @@ -78,6 +79,18 @@ public class WghJdbController { ExcelUtils.exportExcelToTarget(response, null, list, WghJdbExcel.class); } - + /** + * 调用ruoyi接口获取wgh_jdb数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 15:31 + */ + @PostMapping("/preserWghJdbVation") + public Result getPreserWghJdbVation(@RequestBody PreserVationFormDTO dto) { + wghJdbService.getPreserWghJdbVation(dto); + return new Result(); + } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJdbDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJdbDao.java index 51aa3e73c0..4806bdcf0d 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJdbDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJdbDao.java @@ -14,4 +14,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface WghJdbDao extends BaseDao { + int deleteAll(); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJdbService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJdbService.java index 6c85b56301..ab9e62fc86 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJdbService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJdbService.java @@ -2,6 +2,7 @@ package com.epmet.opendata.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghJdbDTO; import com.epmet.opendata.entity.WghJdbEntity; @@ -76,4 +77,14 @@ public interface WghJdbService extends BaseService { * @date 2022-06-14 */ void delete(String[] ids); + + /** + * 调用ruoyi接口获取wgh_jdb数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 15:31 + */ + void getPreserWghJdbVation(PreserVationFormDTO dto); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java index 3fcb79ec23..0380ef8e10 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java @@ -38,6 +38,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { @Autowired private WghDywgService wghDywgService; + @Autowired + private WghJdbService wghJdbService; + @Override public void guardarDatosTask(PreserVationFormDTO dto) { if (StringUtils.isBlank(dto.getTableName())) { @@ -80,6 +83,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { case CaWghDataConstant.SHARE_WGH_DYWG: wghDywgService.getPreserDywgVation(dto); break; + case CaWghDataConstant.SHARE_WGH_JDB: + wghJdbService.getPreserWghJdbVation(dto); + break; } } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJdbServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJdbServiceImpl.java index 874af41b73..6d55943eac 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJdbServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJdbServiceImpl.java @@ -1,16 +1,25 @@ package com.epmet.opendata.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; import com.epmet.opendata.dao.WghJdbDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghJdbDTO; +import com.epmet.opendata.entity.CaLoudongEntity; import com.epmet.opendata.entity.WghJdbEntity; import com.epmet.opendata.redis.WghJdbRedis; import com.epmet.opendata.service.WghJdbService; +import com.epmet.opendata.util.AesUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -48,8 +57,8 @@ public class WghJdbServiceImpl extends BaseServiceImpl return ConvertUtils.sourceToTarget(entityList, WghJdbDTO.class); } - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -84,4 +93,79 @@ public class WghJdbServiceImpl extends BaseServiceImpl baseDao.deleteBatchIds(Arrays.asList(ids)); } + /** + * 调用ruoyi接口获取wgh_jdb数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 15:31 + */ + @Override + public void getPreserWghJdbVation(PreserVationFormDTO dto) { + int i = baseDao.deleteAll(); + if (i >= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(NumConstant.FIFTY); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableName(CaWghDataConstant.SHARE_WGH_JDB); + + dto.setWhereCase("1=1"); + dto.setOrderBy("insert_time"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listWghJdb(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + } + + private int listWghJdb(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.SHARE_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + + private int total; + private List list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJdbDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJdbDao.xml index f5ef0fa1fb..c6e6c1a7e8 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJdbDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJdbDao.xml @@ -12,6 +12,9 @@ + + delete from wgh_jdb + From e0027535a04aeaf23fdc105ed6fffa62d7d39904 Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 14 Jun 2022 15:40:41 +0800 Subject: [PATCH 06/58] =?UTF-8?q?=E8=B0=83=E7=94=A8ruoyi=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AD=98=E5=82=A8wgh=5Fjqz=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/constant/CaWghDataConstant.java | 1 + .../opendata/controller/WghJqzController.java | 14 ++++ .../com/epmet/opendata/dao/WghJqzDao.java | 1 + .../epmet/opendata/service/WghJqzService.java | 11 +++ .../impl/GuardarDatosTaskServiceImpl.java | 72 +++++++++------- .../service/impl/WghJqzServiceImpl.java | 84 +++++++++++++++++++ .../src/main/resources/mapper/WghJqzDao.xml | 3 + 7 files changed, 154 insertions(+), 32 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java index 4fa98e64af..b2ca16aca4 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java @@ -25,6 +25,7 @@ public interface CaWghDataConstant { String SHARE_COMMUNITY = "community"; String SHARE_WGH_DYWG = "wgh_dywg"; String SHARE_WGH_JDB = "wgh_jdb"; + String SHARE_WGH_JQZ = "wgh_jqz"; String DATA_URL_UNICON = "http://120.221.72.83:9090/bridge/unicom/page"; String DATA_URL_SHARE = "http://120.221.72.83:9090/bridge/share/sharePage"; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJqzController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJqzController.java index 57b51603ce..bb38ffc0ca 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJqzController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJqzController.java @@ -10,6 +10,7 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghJqzDTO; import com.epmet.opendata.excel.WghJqzExcel; import com.epmet.opendata.service.WghJqzService; @@ -78,6 +79,19 @@ public class WghJqzController { ExcelUtils.exportExcelToTarget(response, null, list, WghJqzExcel.class); } + /** + * 调用ruoyi接口存储wgh_jqz数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 15:39 + */ + @PostMapping("/preserWghjqzVation") + public Result getPreserWghjqzVation(@RequestBody PreserVationFormDTO dto) { + wghJqzService.getPreserWghjqzVation(dto); + return new Result(); + } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJqzDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJqzDao.java index 4e38c5a9e1..52881f0543 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJqzDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJqzDao.java @@ -13,4 +13,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface WghJqzDao extends BaseDao { + int deleteAll(); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJqzService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJqzService.java index 941e4c2b29..9ad0ee26d6 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJqzService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJqzService.java @@ -2,6 +2,7 @@ package com.epmet.opendata.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghJqzDTO; import com.epmet.opendata.entity.WghJqzEntity; @@ -76,4 +77,14 @@ public interface WghJqzService extends BaseService { * @date 2022-06-14 */ void delete(String[] ids); + + /** + * 调用ruoyi接口存储wgh_jqz数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 15:40 + */ + void getPreserWghjqzVation(PreserVationFormDTO dto); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java index 0380ef8e10..7cad0e6cb7 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java @@ -41,6 +41,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { @Autowired private WghJdbService wghJdbService; + @Autowired + private WghJqzService wghJqzService; + @Override public void guardarDatosTask(PreserVationFormDTO dto) { if (StringUtils.isBlank(dto.getTableName())) { @@ -53,39 +56,44 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { bmGridService.getPreserBmGridVation(dto); communityService.getPreserCommunityVation(dto); wghDywgService.getPreserDywgVation(dto); - } + wghJqzService.getPreserWghjqzVation(dto); + } else { - switch (dto.getTableName()) { - case CaWghDataConstant.UNICOM_LOUDONG: - caLoudongService.preserLouDongVation(dto); - break; - case CaWghDataConstant.UNICOM_PINGFANG: - pingfangService.preserPingFangVation(dto); - break; - case CaWghDataConstant.UNICOM_RESIDENT: - residentService.preserResidentVation(dto); - break; - case CaWghDataConstant.UNICOM_RENTAL: - rentalService.preserRentalVation(dto); - break; - case CaWghDataConstant.UNICOM_ROTATORS: - rotatorsService.preserRotatorsVation(dto); - break; - case CaWghDataConstant.SHARE_BASE_GRID: - basegridService.preserBaseGridVation(dto); - break; - case CaWghDataConstant.SHARE_BM_GRID: - bmGridService.getPreserBmGridVation(dto); - break; - case CaWghDataConstant.SHARE_COMMUNITY: - communityService.getPreserCommunityVation(dto); - break; - case CaWghDataConstant.SHARE_WGH_DYWG: - wghDywgService.getPreserDywgVation(dto); - break; - case CaWghDataConstant.SHARE_WGH_JDB: - wghJdbService.getPreserWghJdbVation(dto); - break; + switch (dto.getTableName()) { + case CaWghDataConstant.UNICOM_LOUDONG: + caLoudongService.preserLouDongVation(dto); + break; + case CaWghDataConstant.UNICOM_PINGFANG: + pingfangService.preserPingFangVation(dto); + break; + case CaWghDataConstant.UNICOM_RESIDENT: + residentService.preserResidentVation(dto); + break; + case CaWghDataConstant.UNICOM_RENTAL: + rentalService.preserRentalVation(dto); + break; + case CaWghDataConstant.UNICOM_ROTATORS: + rotatorsService.preserRotatorsVation(dto); + break; + case CaWghDataConstant.SHARE_BASE_GRID: + basegridService.preserBaseGridVation(dto); + break; + case CaWghDataConstant.SHARE_BM_GRID: + bmGridService.getPreserBmGridVation(dto); + break; + case CaWghDataConstant.SHARE_COMMUNITY: + communityService.getPreserCommunityVation(dto); + break; + case CaWghDataConstant.SHARE_WGH_DYWG: + wghDywgService.getPreserDywgVation(dto); + break; + case CaWghDataConstant.SHARE_WGH_JDB: + wghJdbService.getPreserWghJdbVation(dto); + break; + case CaWghDataConstant.SHARE_WGH_JQZ: + wghJqzService.getPreserWghjqzVation(dto); + break; + } } } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJqzServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJqzServiceImpl.java index 79ed9af41e..9870565af7 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJqzServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJqzServiceImpl.java @@ -1,16 +1,25 @@ package com.epmet.opendata.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; import com.epmet.opendata.dao.WghJqzDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghJqzDTO; +import com.epmet.opendata.entity.CaLoudongEntity; import com.epmet.opendata.entity.WghJqzEntity; import com.epmet.opendata.redis.WghJqzRedis; import com.epmet.opendata.service.WghJqzService; +import com.epmet.opendata.util.AesUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -84,4 +93,79 @@ public class WghJqzServiceImpl extends BaseServiceImpl baseDao.deleteBatchIds(Arrays.asList(ids)); } + /** + * 调用ruoyi接口存储wgh_jqz数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 15:40 + */ + @Override + public void getPreserWghjqzVation(PreserVationFormDTO dto) { + int i = baseDao.deleteAll(); + if (i >= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(NumConstant.FIFTY); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableName(CaWghDataConstant.SHARE_WGH_JQZ); + + dto.setWhereCase("1=1"); + dto.setOrderBy(""); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listWghJqz(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + } + + private int listWghJqz(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.SHARE_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + + private int total; + private List list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJqzDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJqzDao.xml index d4549ee7a3..a0e0b7a610 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJqzDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJqzDao.xml @@ -26,6 +26,9 @@ + + delete from wgh_jdb + From 11278a4c1cf6ceca92e0916331cda85b4b00f28e Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 14 Jun 2022 15:47:18 +0800 Subject: [PATCH 07/58] =?UTF-8?q?=E8=B0=83=E7=94=A8ruoyi=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=AD=98=E5=82=A8wgh=5Fjxcs=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/constant/CaWghDataConstant.java | 1 + .../controller/WghJxcsController.java | 15 +++- .../com/epmet/opendata/dao/WghJxcsDao.java | 1 + .../opendata/service/WghJxcsService.java | 11 +++ .../impl/GuardarDatosTaskServiceImpl.java | 7 ++ .../service/impl/WghJxcsServiceImpl.java | 86 +++++++++++++++++++ .../src/main/resources/mapper/WghJxcsDao.xml | 3 + 7 files changed, 123 insertions(+), 1 deletion(-) diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java index b2ca16aca4..54a63dd271 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java @@ -26,6 +26,7 @@ public interface CaWghDataConstant { String SHARE_WGH_DYWG = "wgh_dywg"; String SHARE_WGH_JDB = "wgh_jdb"; String SHARE_WGH_JQZ = "wgh_jqz"; + String SHARE_WGH_JXCS = "wgh_jxcs"; String DATA_URL_UNICON = "http://120.221.72.83:9090/bridge/unicom/page"; String DATA_URL_SHARE = "http://120.221.72.83:9090/bridge/share/sharePage"; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJxcsController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJxcsController.java index 0f2d225327..c392595534 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJxcsController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJxcsController.java @@ -9,6 +9,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghJxcsDTO; import com.epmet.opendata.excel.WghJxcsExcel; import com.epmet.opendata.service.WghJxcsService; @@ -77,6 +78,18 @@ public class WghJxcsController { ExcelUtils.exportExcelToTarget(response, null, list, WghJxcsExcel.class); } - + /** + * 调用ruoyi接口存储wgh_jxcs数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 15:46 + */ + @PostMapping("/preserWghJxcsVation") + public Result getPreserWghJxcsVation(@RequestBody PreserVationFormDTO dto) { + wghJxcsService.preserWghJxcsVation(dto); + return new Result(); + } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJxcsDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJxcsDao.java index cca15fbf4d..afbda65ea1 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJxcsDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJxcsDao.java @@ -13,4 +13,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface WghJxcsDao extends BaseDao { + int deleteAll(); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJxcsService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJxcsService.java index 4f0d630cff..de8df4334d 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJxcsService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJxcsService.java @@ -2,6 +2,7 @@ package com.epmet.opendata.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghJxcsDTO; import com.epmet.opendata.entity.WghJxcsEntity; @@ -76,4 +77,14 @@ public interface WghJxcsService extends BaseService { * @date 2022-06-14 */ void delete(String[] ids); + + /** + * 调用ruoyi接口存储wgh_jxcs数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 15:46 + */ + void preserWghJxcsVation(PreserVationFormDTO dto); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java index 7cad0e6cb7..6b2fbd9c12 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java @@ -44,6 +44,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { @Autowired private WghJqzService wghJqzService; + @Autowired + private WghJxcsService wghJxcsService; + @Override public void guardarDatosTask(PreserVationFormDTO dto) { if (StringUtils.isBlank(dto.getTableName())) { @@ -57,6 +60,7 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { communityService.getPreserCommunityVation(dto); wghDywgService.getPreserDywgVation(dto); wghJqzService.getPreserWghjqzVation(dto); + wghJxcsService.preserWghJxcsVation(dto); } else { switch (dto.getTableName()) { @@ -93,6 +97,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { case CaWghDataConstant.SHARE_WGH_JQZ: wghJqzService.getPreserWghjqzVation(dto); break; + case CaWghDataConstant.SHARE_WGH_JXCS: + wghJxcsService.preserWghJxcsVation(dto); + break; } } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJxcsServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJxcsServiceImpl.java index 1817a3bf57..c28fba0277 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJxcsServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJxcsServiceImpl.java @@ -1,16 +1,25 @@ package com.epmet.opendata.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; import com.epmet.opendata.dao.WghJxcsDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghJxcsDTO; +import com.epmet.opendata.entity.CaLoudongEntity; import com.epmet.opendata.entity.WghJxcsEntity; import com.epmet.opendata.redis.WghJxcsRedis; import com.epmet.opendata.service.WghJxcsService; +import com.epmet.opendata.util.AesUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -84,4 +93,81 @@ public class WghJxcsServiceImpl extends BaseServiceImpl= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(NumConstant.FIFTY); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableName(CaWghDataConstant.SHARE_WGH_JXCS); + + dto.setWhereCase("1=1"); + dto.setOrderBy("USER_ID,ID"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listWghJxcs(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + + } + + + private int listWghJxcs(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.SHARE_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + + private int total; + private List list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJxcsDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJxcsDao.xml index 92f7c4f881..9217f3002c 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJxcsDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJxcsDao.xml @@ -25,6 +25,9 @@ + + delete from wgh_jxcs + From 58b720b18ae2bc6d49ec628cee9224c93c65e990 Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 14 Jun 2022 15:55:54 +0800 Subject: [PATCH 08/58] =?UTF-8?q?=E8=B0=83=E7=94=A8ruoyi=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=8E=B7=E5=8F=96wgh=5Fjyz=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/constant/CaWghDataConstant.java | 1 + .../opendata/controller/WghJyzController.java | 15 +++- .../com/epmet/opendata/dao/WghJyzDao.java | 1 + .../epmet/opendata/service/WghJyzService.java | 11 +++ .../impl/GuardarDatosTaskServiceImpl.java | 7 ++ .../service/impl/WghJyzServiceImpl.java | 86 +++++++++++++++++++ .../src/main/resources/mapper/WghJyzDao.xml | 3 + 7 files changed, 123 insertions(+), 1 deletion(-) diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java index 54a63dd271..7970dc7226 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java @@ -27,6 +27,7 @@ public interface CaWghDataConstant { String SHARE_WGH_JDB = "wgh_jdb"; String SHARE_WGH_JQZ = "wgh_jqz"; String SHARE_WGH_JXCS = "wgh_jxcs"; + String SHARE_WGH_JYZ = "wgh_jyz"; String DATA_URL_UNICON = "http://120.221.72.83:9090/bridge/unicom/page"; String DATA_URL_SHARE = "http://120.221.72.83:9090/bridge/share/sharePage"; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJyzController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJyzController.java index 38b74659e0..2cb21796ad 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJyzController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghJyzController.java @@ -9,6 +9,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghJyzDTO; import com.epmet.opendata.excel.WghJyzExcel; import com.epmet.opendata.service.WghJyzService; @@ -77,6 +78,18 @@ public class WghJyzController { ExcelUtils.exportExcelToTarget(response, null, list, WghJyzExcel.class); } - + /** + * 调用ruoyi接口获取wgh_jyz数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 15:52 + */ + @PostMapping("/preserWghJyzVation") + public Result getPreserWghJyzVation(@RequestBody PreserVationFormDTO dto) { + wghJyzService.getPreserWghJyzVation(dto); + return new Result(); + } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJyzDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJyzDao.java index 8e1234f7c6..01fcc12a97 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJyzDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghJyzDao.java @@ -13,4 +13,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface WghJyzDao extends BaseDao { + int deleteAll(); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJyzService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJyzService.java index 816c3950fe..77778a6262 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJyzService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghJyzService.java @@ -2,6 +2,7 @@ package com.epmet.opendata.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghJyzDTO; import com.epmet.opendata.entity.WghJyzEntity; @@ -75,4 +76,14 @@ public interface WghJyzService extends BaseService { * @date 2022-06-14 */ void delete(String[] ids); + + /** + * 调用ruoyi接口获取wgh_jyz数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 15:53 + */ + void getPreserWghJyzVation(PreserVationFormDTO dto); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java index 6b2fbd9c12..95cc8812d3 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java @@ -47,6 +47,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { @Autowired private WghJxcsService wghJxcsService; + @Autowired + private WghJyzService wghJyzService; + @Override public void guardarDatosTask(PreserVationFormDTO dto) { if (StringUtils.isBlank(dto.getTableName())) { @@ -61,6 +64,7 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { wghDywgService.getPreserDywgVation(dto); wghJqzService.getPreserWghjqzVation(dto); wghJxcsService.preserWghJxcsVation(dto); + wghJyzService.getPreserWghJyzVation(dto); } else { switch (dto.getTableName()) { @@ -100,6 +104,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { case CaWghDataConstant.SHARE_WGH_JXCS: wghJxcsService.preserWghJxcsVation(dto); break; + case CaWghDataConstant.SHARE_WGH_JYZ: + wghJyzService.getPreserWghJyzVation(dto); + break; } } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJyzServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJyzServiceImpl.java index 893d0a3000..9d14a3a6bf 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJyzServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJyzServiceImpl.java @@ -1,16 +1,25 @@ package com.epmet.opendata.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; import com.epmet.opendata.dao.WghJyzDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghJyzDTO; +import com.epmet.opendata.entity.CaLoudongEntity; import com.epmet.opendata.entity.WghJyzEntity; import com.epmet.opendata.redis.WghJyzRedis; import com.epmet.opendata.service.WghJyzService; +import com.epmet.opendata.util.AesUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -84,4 +93,81 @@ public class WghJyzServiceImpl extends BaseServiceImpl baseDao.deleteBatchIds(Arrays.asList(ids)); } + /** + * 调用ruoyi接口获取wgh_jyz数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 15:53 + */ + @Override + public void getPreserWghJyzVation(PreserVationFormDTO dto) { + int i = baseDao.deleteAll(); + if (i >= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(NumConstant.FIFTY); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableName(CaWghDataConstant.SHARE_WGH_JYZ); + + dto.setWhereCase("1=1"); + dto.setOrderBy("OBJECTID,等级,insert_time"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listLouDong(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + + } + + + private int listLouDong(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.SHARE_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + + private int total; + private List list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJyzDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJyzDao.xml index 4f2e3eddc5..2b97665feb 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJyzDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghJyzDao.xml @@ -26,6 +26,9 @@ + + delete from wgh_jyz + From faeb74750ecced7e031de9b39132cf3043d522ce Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 14 Jun 2022 16:02:48 +0800 Subject: [PATCH 09/58] =?UTF-8?q?=E8=B0=83=E7=94=A8ruoyi=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=8E=B7=E5=8F=96wgh=5Fsjxx=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/constant/CaWghDataConstant.java | 1 + .../controller/WghSjxxbController.java | 15 +++- .../com/epmet/opendata/dao/WghSjxxbDao.java | 1 + .../opendata/service/WghSjxxbService.java | 11 +++ .../impl/GuardarDatosTaskServiceImpl.java | 7 ++ .../service/impl/WghSjxxbServiceImpl.java | 86 +++++++++++++++++++ .../src/main/resources/mapper/WghSjxxbDao.xml | 3 + 7 files changed, 123 insertions(+), 1 deletion(-) diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java index 7970dc7226..c3f83ace8a 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java @@ -28,6 +28,7 @@ public interface CaWghDataConstant { String SHARE_WGH_JQZ = "wgh_jqz"; String SHARE_WGH_JXCS = "wgh_jxcs"; String SHARE_WGH_JYZ = "wgh_jyz"; + String SHARE_WGH_SJXX = "wgh_sjxx"; String DATA_URL_UNICON = "http://120.221.72.83:9090/bridge/unicom/page"; String DATA_URL_SHARE = "http://120.221.72.83:9090/bridge/share/sharePage"; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxbController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxbController.java index 512d3f19d4..4d3a6cd04b 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxbController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSjxxbController.java @@ -9,6 +9,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghSjxxbDTO; import com.epmet.opendata.excel.WghSjxxbExcel; import com.epmet.opendata.service.WghSjxxbService; @@ -77,6 +78,18 @@ public class WghSjxxbController { ExcelUtils.exportExcelToTarget(response, null, list, WghSjxxbExcel.class); } - + /** + * 调用ruoyi接口获取wgh_sjxx数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 16:01 + */ + @PostMapping("/preserSjxxVation") + public Result getPreserSjxxVation(@RequestBody PreserVationFormDTO dto) { + wghSjxxbService.getPreserSjxxVation(dto); + return new Result(); + } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxbDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxbDao.java index 8734113bd2..d2806b93fe 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxbDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSjxxbDao.java @@ -13,4 +13,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface WghSjxxbDao extends BaseDao { + int deleteAll(); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxbService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxbService.java index 260daf8c31..1185b76fcb 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxbService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSjxxbService.java @@ -2,6 +2,7 @@ package com.epmet.opendata.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghSjxxbDTO; import com.epmet.opendata.entity.WghSjxxbEntity; @@ -75,4 +76,14 @@ public interface WghSjxxbService extends BaseService { * @date 2022-06-14 */ void delete(String[] ids); + + /** + * 调用ruoyi接口获取wgh_sjxx数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 16:02 + */ + void getPreserSjxxVation(PreserVationFormDTO dto); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java index 95cc8812d3..97ade4add6 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java @@ -50,6 +50,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { @Autowired private WghJyzService wghJyzService; + @Autowired + private WghSjxxbService wghSjxxbService; + @Override public void guardarDatosTask(PreserVationFormDTO dto) { if (StringUtils.isBlank(dto.getTableName())) { @@ -65,6 +68,7 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { wghJqzService.getPreserWghjqzVation(dto); wghJxcsService.preserWghJxcsVation(dto); wghJyzService.getPreserWghJyzVation(dto); + wghSjxxbService.getPreserSjxxVation(dto); } else { switch (dto.getTableName()) { @@ -107,6 +111,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { case CaWghDataConstant.SHARE_WGH_JYZ: wghJyzService.getPreserWghJyzVation(dto); break; + case CaWghDataConstant.SHARE_WGH_SJXX: + wghSjxxbService.getPreserSjxxVation(dto); + break; } } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxbServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxbServiceImpl.java index 1ecbbcfa48..387a4c7649 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxbServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxbServiceImpl.java @@ -1,16 +1,25 @@ package com.epmet.opendata.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; import com.epmet.opendata.dao.WghSjxxbDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghSjxxbDTO; +import com.epmet.opendata.entity.CaLoudongEntity; import com.epmet.opendata.entity.WghSjxxbEntity; import com.epmet.opendata.redis.WghSjxxbRedis; import com.epmet.opendata.service.WghSjxxbService; +import com.epmet.opendata.util.AesUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -84,4 +93,81 @@ public class WghSjxxbServiceImpl extends BaseServiceImpl= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(NumConstant.FIFTY); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableName(CaWghDataConstant.SHARE_WGH_SJXX); + + dto.setWhereCase("1=1"); + dto.setOrderBy("OBJECTID,OBJECTID_1,insert_time"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listLouDong(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + + } + + + private int listLouDong(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.SHARE_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + + private int total; + private List list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxbDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxbDao.xml index 8fd239723f..9749b49da5 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxbDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSjxxbDao.xml @@ -20,6 +20,9 @@ + + delete from wgh_sjxx + From 75f1896054480483176cd1c7021f44810467ff72 Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 14 Jun 2022 16:09:03 +0800 Subject: [PATCH 10/58] =?UTF-8?q?=E8=B0=83=E7=94=A8ruoyi=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=8E=B7=E5=8F=96wgh=5Fsqxx=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/constant/CaWghDataConstant.java | 3 +- .../controller/WghSqxxController.java | 15 +++- .../com/epmet/opendata/dao/WghSqxxDao.java | 1 + .../opendata/service/WghSqxxService.java | 11 +++ .../impl/GuardarDatosTaskServiceImpl.java | 7 ++ .../service/impl/WghSqxxServiceImpl.java | 86 +++++++++++++++++++ .../src/main/resources/mapper/WghSqxxDao.xml | 3 + 7 files changed, 124 insertions(+), 2 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java index c3f83ace8a..66f8395df5 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java @@ -28,7 +28,8 @@ public interface CaWghDataConstant { String SHARE_WGH_JQZ = "wgh_jqz"; String SHARE_WGH_JXCS = "wgh_jxcs"; String SHARE_WGH_JYZ = "wgh_jyz"; - String SHARE_WGH_SJXX = "wgh_sjxx"; + String SHARE_WGH_SJXX = "wgh_sjxxb"; + String SHARE_WGH_SQXX = "wgh_sqxx"; String DATA_URL_UNICON = "http://120.221.72.83:9090/bridge/unicom/page"; String DATA_URL_SHARE = "http://120.221.72.83:9090/bridge/share/sharePage"; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSqxxController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSqxxController.java index 8e5b513d15..1c36726db0 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSqxxController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSqxxController.java @@ -9,6 +9,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghSqxxDTO; import com.epmet.opendata.excel.WghSqxxExcel; import com.epmet.opendata.service.WghSqxxService; @@ -77,6 +78,18 @@ public class WghSqxxController { ExcelUtils.exportExcelToTarget(response, null, list, WghSqxxExcel.class); } - + /** + * 调用ruoyi接口获取wgh_sqxx数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 16:08 + */ + @PostMapping("/preserWghSqxxVation") + public Result getPreserWghSqxxVation(@RequestBody PreserVationFormDTO dto) { + wghSqxxService.getPreserWghSqxxVation(dto); + return new Result(); + } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSqxxDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSqxxDao.java index 53b16dfb73..8a75f69fde 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSqxxDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSqxxDao.java @@ -14,4 +14,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface WghSqxxDao extends BaseDao { + int deleteAll(); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSqxxService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSqxxService.java index 8b2f86155c..93a9a297b4 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSqxxService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSqxxService.java @@ -2,6 +2,7 @@ package com.epmet.opendata.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghSqxxDTO; import com.epmet.opendata.entity.WghSqxxEntity; @@ -76,4 +77,14 @@ public interface WghSqxxService extends BaseService { * @date 2022-06-14 */ void delete(String[] ids); + + /** + * 调用ruoyi接口获取wgh_sqxx数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 16:08 + */ + void getPreserWghSqxxVation(PreserVationFormDTO dto); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java index 97ade4add6..5207614dd2 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java @@ -53,6 +53,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { @Autowired private WghSjxxbService wghSjxxbService; + @Autowired + private WghSqxxService wghSqxxService; + @Override public void guardarDatosTask(PreserVationFormDTO dto) { if (StringUtils.isBlank(dto.getTableName())) { @@ -69,6 +72,7 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { wghJxcsService.preserWghJxcsVation(dto); wghJyzService.getPreserWghJyzVation(dto); wghSjxxbService.getPreserSjxxVation(dto); + wghSqxxService.getPreserWghSqxxVation(dto); } else { switch (dto.getTableName()) { @@ -114,6 +118,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { case CaWghDataConstant.SHARE_WGH_SJXX: wghSjxxbService.getPreserSjxxVation(dto); break; + case CaWghDataConstant.SHARE_WGH_SQXX: + wghSqxxService.getPreserWghSqxxVation(dto); + break; } } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSqxxServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSqxxServiceImpl.java index 791f65fcb7..496cff2a62 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSqxxServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSqxxServiceImpl.java @@ -1,16 +1,25 @@ package com.epmet.opendata.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; import com.epmet.opendata.dao.WghSqxxDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghSqxxDTO; +import com.epmet.opendata.entity.CaLoudongEntity; import com.epmet.opendata.entity.WghSqxxEntity; import com.epmet.opendata.redis.WghSqxxRedis; import com.epmet.opendata.service.WghSqxxService; +import com.epmet.opendata.util.AesUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -84,4 +93,81 @@ public class WghSqxxServiceImpl extends BaseServiceImpl= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(NumConstant.FIFTY); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableName(CaWghDataConstant.SHARE_WGH_SQXX); + + dto.setWhereCase("1=1"); + dto.setOrderBy("OBJECTID,街道编码,社区编码,insert_time"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listWghSqxx(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + + } + + + private int listWghSqxx(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.SHARE_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + + private int total; + private List list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSqxxDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSqxxDao.xml index fd055baeb0..2987884be1 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSqxxDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSqxxDao.xml @@ -29,6 +29,9 @@ + + delete from wgh_sqxx + From ecc0a46eb52b482edb21ceb5c348f59302d7af00 Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 14 Jun 2022 16:21:01 +0800 Subject: [PATCH 11/58] =?UTF-8?q?=E8=B0=83=E7=94=A8ruoyi=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E8=8E=B7=E5=8F=96wgh=5Fszcgwgh=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/constant/CaWghDataConstant.java | 1 + .../controller/WghSzcgwghController.java | 15 +++- .../com/epmet/opendata/dao/WghSzcgwghDao.java | 1 + .../opendata/service/WghSzcgwghService.java | 11 +++ .../impl/GuardarDatosTaskServiceImpl.java | 7 ++ .../service/impl/WghSzcgwghServiceImpl.java | 86 +++++++++++++++++++ .../main/resources/mapper/WghSzcgwghDao.xml | 3 + 7 files changed, 123 insertions(+), 1 deletion(-) diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java index 66f8395df5..f08c274ee2 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java @@ -30,6 +30,7 @@ public interface CaWghDataConstant { String SHARE_WGH_JYZ = "wgh_jyz"; String SHARE_WGH_SJXX = "wgh_sjxxb"; String SHARE_WGH_SQXX = "wgh_sqxx"; + String SHARE_WGH_SZCGWGH = "wgh_szcgwgh"; String DATA_URL_UNICON = "http://120.221.72.83:9090/bridge/unicom/page"; String DATA_URL_SHARE = "http://120.221.72.83:9090/bridge/share/sharePage"; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSzcgwghController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSzcgwghController.java index 809db1330d..c678c9a7fd 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSzcgwghController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSzcgwghController.java @@ -9,6 +9,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghSzcgwghDTO; import com.epmet.opendata.excel.WghSzcgwghExcel; import com.epmet.opendata.service.WghSzcgwghService; @@ -77,6 +78,18 @@ public class WghSzcgwghController { ExcelUtils.exportExcelToTarget(response, null, list, WghSzcgwghExcel.class); } - + /** + * 调用ruoyi系统获取wgh_szcgwgh数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 16:19 + */ + @PostMapping("/preserWghSzcgwghVation") + public Result getPreserWghSzcgwghVation(@RequestBody PreserVationFormDTO dto) { + wghSzcgwghService.getPreserWghSzcgwghVation(dto); + return new Result(); + } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSzcgwghDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSzcgwghDao.java index 900503ff51..66d2c0197c 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSzcgwghDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSzcgwghDao.java @@ -14,4 +14,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface WghSzcgwghDao extends BaseDao { + int deleteAll(); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSzcgwghService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSzcgwghService.java index c31d4d68ad..39533fc2a1 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSzcgwghService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSzcgwghService.java @@ -2,6 +2,7 @@ package com.epmet.opendata.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghSzcgwghDTO; import com.epmet.opendata.entity.WghSzcgwghEntity; @@ -76,4 +77,14 @@ public interface WghSzcgwghService extends BaseService { * @date 2022-06-14 */ void delete(String[] ids); + + /** + * 调用ruoyi系统获取wgh_szcgwgh数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 16:20 + */ + void getPreserWghSzcgwghVation(PreserVationFormDTO dto); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java index 5207614dd2..540142a28f 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java @@ -56,6 +56,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { @Autowired private WghSqxxService wghSqxxService; + @Autowired + private WghSzcgwghService wghSzcgwghService; + @Override public void guardarDatosTask(PreserVationFormDTO dto) { if (StringUtils.isBlank(dto.getTableName())) { @@ -73,6 +76,7 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { wghJyzService.getPreserWghJyzVation(dto); wghSjxxbService.getPreserSjxxVation(dto); wghSqxxService.getPreserWghSqxxVation(dto); + wghSzcgwghService.getPreserWghSzcgwghVation(dto); } else { switch (dto.getTableName()) { @@ -121,6 +125,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { case CaWghDataConstant.SHARE_WGH_SQXX: wghSqxxService.getPreserWghSqxxVation(dto); break; + case CaWghDataConstant.SHARE_WGH_SZCGWGH: + wghSzcgwghService.getPreserWghSzcgwghVation(dto); + break; } } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSzcgwghServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSzcgwghServiceImpl.java index 945a091d0a..313001955d 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSzcgwghServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSzcgwghServiceImpl.java @@ -1,16 +1,25 @@ package com.epmet.opendata.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; import com.epmet.opendata.dao.WghSzcgwghDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghSzcgwghDTO; +import com.epmet.opendata.entity.CaLoudongEntity; import com.epmet.opendata.entity.WghSzcgwghEntity; import com.epmet.opendata.redis.WghSzcgwghRedis; import com.epmet.opendata.service.WghSzcgwghService; +import com.epmet.opendata.util.AesUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -84,4 +93,81 @@ public class WghSzcgwghServiceImpl extends BaseServiceImpl= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(NumConstant.FIFTY); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableName(CaWghDataConstant.SHARE_WGH_SZCGWGH); + + dto.setWhereCase("1=1"); + dto.setOrderBy("OBJECTID,ID,insert_time"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listWghSzcgWgh(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + + } + + + private int listWghSzcgWgh(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.SHARE_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + + private int total; + private List list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSzcgwghDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSzcgwghDao.xml index 4c68a27413..adcc9df6f8 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSzcgwghDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSzcgwghDao.xml @@ -11,6 +11,9 @@ + + delete from wgh_szcgwgh + From b7f1a8d7ddc20320722ee20cb454ad256f7959b0 Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 14 Jun 2022 16:27:27 +0800 Subject: [PATCH 12/58] =?UTF-8?q?=E8=B0=83=E7=94=A8ruoyi=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=8E=B7=E5=8F=96wgh=5Fszzrwg=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/constant/CaWghDataConstant.java | 1 + .../controller/WghSzzrwgController.java | 15 +++- .../com/epmet/opendata/dao/WghSzzrwgDao.java | 1 + .../opendata/service/WghSzzrwgService.java | 11 +++ .../impl/GuardarDatosTaskServiceImpl.java | 7 ++ .../service/impl/WghSzzrwgServiceImpl.java | 87 +++++++++++++++++++ .../main/resources/mapper/WghSzzrwgDao.xml | 3 + 7 files changed, 124 insertions(+), 1 deletion(-) diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java index f08c274ee2..93661f72c9 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java @@ -31,6 +31,7 @@ public interface CaWghDataConstant { String SHARE_WGH_SJXX = "wgh_sjxxb"; String SHARE_WGH_SQXX = "wgh_sqxx"; String SHARE_WGH_SZCGWGH = "wgh_szcgwgh"; + String SHARE_WGH_SZZRWG = "wgh_szzrwg"; String DATA_URL_UNICON = "http://120.221.72.83:9090/bridge/unicom/page"; String DATA_URL_SHARE = "http://120.221.72.83:9090/bridge/share/sharePage"; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSzzrwgController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSzzrwgController.java index aa3142f80d..d2f5316399 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSzzrwgController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSzzrwgController.java @@ -9,6 +9,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghSzzrwgDTO; import com.epmet.opendata.excel.WghSzzrwgExcel; import com.epmet.opendata.service.WghSzzrwgService; @@ -77,6 +78,18 @@ public class WghSzzrwgController { ExcelUtils.exportExcelToTarget(response, null, list, WghSzzrwgExcel.class); } - + /** + * 调用ruoyi接口获取wgh_szzrwg数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 16:26 + */ + @PostMapping("/preserWghSzzrwgVation") + public Result getPreserWghSzzrwgVation(@RequestBody PreserVationFormDTO dto) { + wghSzzrwgService.getPreserWghSzzrwgVation(dto); + return new Result(); + } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSzzrwgDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSzzrwgDao.java index b1fe06ac53..f3d34fee32 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSzzrwgDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSzzrwgDao.java @@ -13,4 +13,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface WghSzzrwgDao extends BaseDao { + int deleteAll(); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSzzrwgService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSzzrwgService.java index 6a83a2401a..17048d584d 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSzzrwgService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSzzrwgService.java @@ -2,6 +2,7 @@ package com.epmet.opendata.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghSzzrwgDTO; import com.epmet.opendata.entity.WghSzzrwgEntity; @@ -76,4 +77,14 @@ public interface WghSzzrwgService extends BaseService { * @date 2022-06-14 */ void delete(String[] ids); + + /** + * 调用ruoyi接口获取wgh_szzrwg数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 16:27 + */ + void getPreserWghSzzrwgVation(PreserVationFormDTO dto); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java index 540142a28f..57114cbec3 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java @@ -59,6 +59,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { @Autowired private WghSzcgwghService wghSzcgwghService; + @Autowired + private WghSzzrwgService wghSzzrwgService; + @Override public void guardarDatosTask(PreserVationFormDTO dto) { if (StringUtils.isBlank(dto.getTableName())) { @@ -77,6 +80,7 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { wghSjxxbService.getPreserSjxxVation(dto); wghSqxxService.getPreserWghSqxxVation(dto); wghSzcgwghService.getPreserWghSzcgwghVation(dto); + wghSzzrwgService.getPreserWghSzzrwgVation(dto); } else { switch (dto.getTableName()) { @@ -128,6 +132,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { case CaWghDataConstant.SHARE_WGH_SZCGWGH: wghSzcgwghService.getPreserWghSzcgwghVation(dto); break; + case CaWghDataConstant.SHARE_WGH_SZZRWG: + wghSzzrwgService.getPreserWghSzzrwgVation(dto); + break; } } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSzzrwgServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSzzrwgServiceImpl.java index 5020b084c0..8669b58968 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSzzrwgServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSzzrwgServiceImpl.java @@ -1,17 +1,26 @@ package com.epmet.opendata.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; import com.epmet.opendata.dao.WghSzzrwgDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghSzzrwgDTO; +import com.epmet.opendata.entity.CaLoudongEntity; import com.epmet.opendata.entity.WghSzzrwgEntity; import com.epmet.opendata.redis.WghSzzrwgRedis; import com.epmet.opendata.service.WghSzzrwgService; +import com.epmet.opendata.util.AesUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -85,4 +94,82 @@ public class WghSzzrwgServiceImpl extends BaseServiceImpl= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(NumConstant.FIFTY); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableName(CaWghDataConstant.SHARE_WGH_SZZRWG); + + dto.setWhereCase("1=1"); + dto.setOrderBy(""); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listSzzrwg(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + + } + + + private int listSzzrwg(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.SHARE_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + + private int total; + private List list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSzzrwgDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSzzrwgDao.xml index 1c8dd6b88f..cff4414111 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSzzrwgDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSzzrwgDao.xml @@ -11,6 +11,9 @@ + + delete from wgh_szzrwg + From db60d01170e541685c41b25200b335d728ffab68 Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 14 Jun 2022 16:34:31 +0800 Subject: [PATCH 13/58] =?UTF-8?q?=E8=B0=83=E7=94=A8ruoyi=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E8=8E=B7=E5=8F=96wgh=5Fwhpdw=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/constant/CaWghDataConstant.java | 1 + .../controller/WghWhpdwController.java | 15 +++- .../com/epmet/opendata/dao/WghWhpdwDao.java | 1 + .../opendata/service/WghWhpdwService.java | 11 +++ .../impl/GuardarDatosTaskServiceImpl.java | 7 ++ .../service/impl/WghWhpdwServiceImpl.java | 86 +++++++++++++++++++ .../src/main/resources/mapper/WghWhpdwDao.xml | 3 + 7 files changed, 123 insertions(+), 1 deletion(-) diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java index 93661f72c9..362d920dbf 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java @@ -32,6 +32,7 @@ public interface CaWghDataConstant { String SHARE_WGH_SQXX = "wgh_sqxx"; String SHARE_WGH_SZCGWGH = "wgh_szcgwgh"; String SHARE_WGH_SZZRWG = "wgh_szzrwg"; + String SHARE_WGH_WHPDW = "wgh_whpdw"; String DATA_URL_UNICON = "http://120.221.72.83:9090/bridge/unicom/page"; String DATA_URL_SHARE = "http://120.221.72.83:9090/bridge/share/sharePage"; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghWhpdwController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghWhpdwController.java index 2a7a81f156..9381038398 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghWhpdwController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghWhpdwController.java @@ -9,6 +9,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghWhpdwDTO; import com.epmet.opendata.excel.WghWhpdwExcel; import com.epmet.opendata.service.WghWhpdwService; @@ -77,6 +78,18 @@ public class WghWhpdwController { ExcelUtils.exportExcelToTarget(response, null, list, WghWhpdwExcel.class); } - + /** + * 调用ruoyi系统获取wgh_whpdw数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 16:33 + */ + @PostMapping("/preserWhpdwVation") + public Result getPreserWhpdwVation(@RequestBody PreserVationFormDTO dto) { + wghWhpdwService.getPreserWhpdwVation(dto); + return new Result(); + } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghWhpdwDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghWhpdwDao.java index 98ab1ed32c..cffef5c3f0 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghWhpdwDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghWhpdwDao.java @@ -13,4 +13,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface WghWhpdwDao extends BaseDao { + int deleteAll(); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghWhpdwService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghWhpdwService.java index 44469f2890..16214aeb9f 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghWhpdwService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghWhpdwService.java @@ -2,6 +2,7 @@ package com.epmet.opendata.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghWhpdwDTO; import com.epmet.opendata.entity.WghWhpdwEntity; @@ -76,4 +77,14 @@ public interface WghWhpdwService extends BaseService { * @date 2022-06-14 */ void delete(String[] ids); + + /** + * 调用ruoyi系统获取wgh_whpdw数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 16:34 + */ + void getPreserWhpdwVation(PreserVationFormDTO dto); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java index 57114cbec3..3c6c61cab6 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java @@ -62,6 +62,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { @Autowired private WghSzzrwgService wghSzzrwgService; + @Autowired + private WghWhpdwService wghWhpdwService; + @Override public void guardarDatosTask(PreserVationFormDTO dto) { if (StringUtils.isBlank(dto.getTableName())) { @@ -81,6 +84,7 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { wghSqxxService.getPreserWghSqxxVation(dto); wghSzcgwghService.getPreserWghSzcgwghVation(dto); wghSzzrwgService.getPreserWghSzzrwgVation(dto); + wghWhpdwService.getPreserWhpdwVation(dto); } else { switch (dto.getTableName()) { @@ -135,6 +139,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { case CaWghDataConstant.SHARE_WGH_SZZRWG: wghSzzrwgService.getPreserWghSzzrwgVation(dto); break; + case CaWghDataConstant.SHARE_WGH_WHPDW: + wghWhpdwService.getPreserWhpdwVation(dto); + break; } } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghWhpdwServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghWhpdwServiceImpl.java index b2e05da08a..785493b305 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghWhpdwServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghWhpdwServiceImpl.java @@ -1,16 +1,25 @@ package com.epmet.opendata.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; import com.epmet.opendata.dao.WghWhpdwDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghWhpdwDTO; +import com.epmet.opendata.entity.CaLoudongEntity; import com.epmet.opendata.entity.WghWhpdwEntity; import com.epmet.opendata.redis.WghWhpdwRedis; import com.epmet.opendata.service.WghWhpdwService; +import com.epmet.opendata.util.AesUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -84,4 +93,81 @@ public class WghWhpdwServiceImpl extends BaseServiceImpl= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(NumConstant.FIFTY); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableName(CaWghDataConstant.SHARE_WGH_WHPDW); + + dto.setWhereCase("1=1"); + dto.setOrderBy("OBJECTID,XH,GRADE,insert_time"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listWghWhpdw(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + + } + + + private int listWghWhpdw(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.SHARE_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + + private int total; + private List list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghWhpdwDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghWhpdwDao.xml index d4c41c8e94..3c5a295dc3 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghWhpdwDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghWhpdwDao.xml @@ -28,6 +28,9 @@ + + delete from wgh_whpdw + From ff15abcc87a2cb05335fe94c55b48dcf823e8847 Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 14 Jun 2022 16:40:33 +0800 Subject: [PATCH 14/58] =?UTF-8?q?=E8=B0=83=E7=94=A8ruoyi=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E8=8E=B7=E5=8F=96wgh=5Fyjbmcs=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/constant/CaWghDataConstant.java | 1 + .../controller/WghYjbmcsController.java | 27 ++++-- .../com/epmet/opendata/dao/WghYjbmcsDao.java | 1 + .../opendata/service/WghYjbmcsService.java | 11 +++ .../impl/GuardarDatosTaskServiceImpl.java | 7 ++ .../service/impl/WghYjbmcsServiceImpl.java | 90 ++++++++++++++++++- .../main/resources/mapper/WghYjbmcsDao.xml | 3 + 7 files changed, 131 insertions(+), 9 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java index 362d920dbf..c094b6aaa5 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java @@ -33,6 +33,7 @@ public interface CaWghDataConstant { String SHARE_WGH_SZCGWGH = "wgh_szcgwgh"; String SHARE_WGH_SZZRWG = "wgh_szzrwg"; String SHARE_WGH_WHPDW = "wgh_whpdw"; + String SHARE_WGH_YJBMCS = "wgh_yjbmcs"; String DATA_URL_UNICON = "http://120.221.72.83:9090/bridge/unicom/page"; String DATA_URL_SHARE = "http://120.221.72.83:9090/bridge/share/sharePage"; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghYjbmcsController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghYjbmcsController.java index a76832bba8..3a6764c36c 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghYjbmcsController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghYjbmcsController.java @@ -9,6 +9,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghYjbmcsDTO; import com.epmet.opendata.excel.WghYjbmcsExcel; import com.epmet.opendata.service.WghYjbmcsService; @@ -34,20 +35,20 @@ public class WghYjbmcsController { private WghYjbmcsService wghYjbmcsService; @RequestMapping("page") - public Result> page(@RequestParam Map params){ + public Result> page(@RequestParam Map params) { PageData page = wghYjbmcsService.page(params); return new Result>().ok(page); } - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ + @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) + public Result get(@PathVariable("id") String id) { WghYjbmcsDTO data = wghYjbmcsService.get(id); return new Result().ok(data); } @NoRepeatSubmit @PostMapping("save") - public Result save(@RequestBody WghYjbmcsDTO dto){ + public Result save(@RequestBody WghYjbmcsDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); wghYjbmcsService.save(dto); @@ -56,7 +57,7 @@ public class WghYjbmcsController { @NoRepeatSubmit @PostMapping("update") - public Result update(@RequestBody WghYjbmcsDTO dto){ + public Result update(@RequestBody WghYjbmcsDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); wghYjbmcsService.update(dto); @@ -64,7 +65,7 @@ public class WghYjbmcsController { } @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ + public Result delete(@RequestBody String[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); wghYjbmcsService.delete(ids); @@ -77,6 +78,18 @@ public class WghYjbmcsController { ExcelUtils.exportExcelToTarget(response, null, list, WghYjbmcsExcel.class); } - + /** + * 调用ruoyi系统获取wgh_yjbmcs数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 16:39 + */ + @PostMapping("/preserWghYjbmcsVation") + public Result getPreserWghYjbmcsVation(@RequestBody PreserVationFormDTO dto) { + wghYjbmcsService.getPreserWghYjbmcsVation(dto); + return new Result(); + } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghYjbmcsDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghYjbmcsDao.java index effb876078..1bc32540b1 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghYjbmcsDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghYjbmcsDao.java @@ -13,4 +13,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface WghYjbmcsDao extends BaseDao { + int deleteAll(); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghYjbmcsService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghYjbmcsService.java index d73715139d..03cbb10b49 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghYjbmcsService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghYjbmcsService.java @@ -2,6 +2,7 @@ package com.epmet.opendata.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghYjbmcsDTO; import com.epmet.opendata.entity.WghYjbmcsEntity; @@ -76,4 +77,14 @@ public interface WghYjbmcsService extends BaseService { * @date 2022-06-14 */ void delete(String[] ids); + + /** + * 调用ruoyi系统获取wgh_yjbmcs数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 16:39 + */ + void getPreserWghYjbmcsVation(PreserVationFormDTO dto); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java index 3c6c61cab6..fbe4b53085 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java @@ -65,6 +65,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { @Autowired private WghWhpdwService wghWhpdwService; + @Autowired + private WghYjbmcsService wghYjbmcsService; + @Override public void guardarDatosTask(PreserVationFormDTO dto) { if (StringUtils.isBlank(dto.getTableName())) { @@ -85,6 +88,7 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { wghSzcgwghService.getPreserWghSzcgwghVation(dto); wghSzzrwgService.getPreserWghSzzrwgVation(dto); wghWhpdwService.getPreserWhpdwVation(dto); + wghYjbmcsService.getPreserWghYjbmcsVation(dto); } else { switch (dto.getTableName()) { @@ -142,6 +146,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { case CaWghDataConstant.SHARE_WGH_WHPDW: wghWhpdwService.getPreserWhpdwVation(dto); break; + case CaWghDataConstant.SHARE_WGH_YJBMCS: + wghYjbmcsService.getPreserWghYjbmcsVation(dto); + break; } } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghYjbmcsServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghYjbmcsServiceImpl.java index 367d539a63..4652ee8906 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghYjbmcsServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghYjbmcsServiceImpl.java @@ -1,16 +1,25 @@ package com.epmet.opendata.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; import com.epmet.opendata.dao.WghYjbmcsDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.WghYjbmcsDTO; +import com.epmet.opendata.entity.CaLoudongEntity; import com.epmet.opendata.entity.WghYjbmcsEntity; import com.epmet.opendata.redis.WghYjbmcsRedis; import com.epmet.opendata.service.WghYjbmcsService; +import com.epmet.opendata.util.AesUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -48,8 +57,8 @@ public class WghYjbmcsServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -84,4 +93,81 @@ public class WghYjbmcsServiceImpl extends BaseServiceImpl= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(NumConstant.FIFTY); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableName(CaWghDataConstant.SHARE_WGH_YJBMCS); + + dto.setWhereCase("1=1"); + dto.setOrderBy("OBJECTID,INSERT_TIME"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listLouDong(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + + } + + + private int listLouDong(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.SHARE_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + + private int total; + private List list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghYjbmcsDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghYjbmcsDao.xml index 536ca04ca0..2f23df803e 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghYjbmcsDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghYjbmcsDao.xml @@ -18,6 +18,9 @@ + + delete from wgh_yjbmcs + From 03d66d37749b2f9659705eb920b107354daf4033 Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 14 Jun 2022 16:47:13 +0800 Subject: [PATCH 15/58] =?UTF-8?q?=E8=B0=83=E7=94=A8ruoyi=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E8=8E=B7=E5=8F=96wgh=5Fyqhjz=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/constant/CaWghDataConstant.java | 1 + .../controller/WghYqhjzController.java | 15 +++- .../com/epmet/opendata/dao/WghYqhjzDao.java | 1 + .../opendata/service/WghYqhjzService.java | 11 +++ .../impl/GuardarDatosTaskServiceImpl.java | 7 ++ .../service/impl/WghYqhjzServiceImpl.java | 86 +++++++++++++++++++ .../src/main/resources/mapper/WghYqhjzDao.xml | 3 + 7 files changed, 123 insertions(+), 1 deletion(-) diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java index c094b6aaa5..9af21b42a9 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java @@ -34,6 +34,7 @@ public interface CaWghDataConstant { String SHARE_WGH_SZZRWG = "wgh_szzrwg"; String SHARE_WGH_WHPDW = "wgh_whpdw"; String SHARE_WGH_YJBMCS = "wgh_yjbmcs"; + String SHARE_WGH_YQHJZ = "wgh_yqhjz"; String DATA_URL_UNICON = "http://120.221.72.83:9090/bridge/unicom/page"; String DATA_URL_SHARE = "http://120.221.72.83:9090/bridge/share/sharePage"; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghYqhjzController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghYqhjzController.java index 9b91f4bc11..972710d611 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghYqhjzController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghYqhjzController.java @@ -9,6 +9,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.service.WghYqhjzService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -76,6 +77,18 @@ public class WghYqhjzController { ExcelUtils.exportExcelToTarget(response, null, list, WghYqhjzExcel.class); } - + /** + * 调用ruoyi系统获取wgh_yqhjz数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 16:46 + */ + @PostMapping("/preserWghYqhjzVation") + public Result getPreserWghYqhjzVation(@RequestBody PreserVationFormDTO dto) { + wghYqhjzService.getPreserWghYqhjzVation(dto); + return new Result(); + } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghYqhjzDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghYqhjzDao.java index 661c60f9a4..a8984a2aa7 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghYqhjzDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghYqhjzDao.java @@ -13,4 +13,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface WghYqhjzDao extends BaseDao { + int deleteAll(); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghYqhjzService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghYqhjzService.java index 7aff21c044..129c917617 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghYqhjzService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghYqhjzService.java @@ -2,6 +2,7 @@ package com.epmet.opendata.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.entity.WghYqhjzEntity; import com.epmet.opendata.dto.wgh.WghYqhjzDTO; @@ -75,4 +76,14 @@ public interface WghYqhjzService extends BaseService { * @date 2022-06-14 */ void delete(String[] ids); + + /** + * 调用ruoyi系统获取wgh_yqhjz数据 + * + * @param dto + * @return void + * @author LZN + * @date 2022/6/14 16:46 + */ + void getPreserWghYqhjzVation(PreserVationFormDTO dto); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java index fbe4b53085..9957afe1e4 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java @@ -68,6 +68,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { @Autowired private WghYjbmcsService wghYjbmcsService; + @Autowired + private WghYqhjzService wghYqhjzService; + @Override public void guardarDatosTask(PreserVationFormDTO dto) { if (StringUtils.isBlank(dto.getTableName())) { @@ -89,6 +92,7 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { wghSzzrwgService.getPreserWghSzzrwgVation(dto); wghWhpdwService.getPreserWhpdwVation(dto); wghYjbmcsService.getPreserWghYjbmcsVation(dto); + wghYqhjzService.getPreserWghYqhjzVation(dto); } else { switch (dto.getTableName()) { @@ -149,6 +153,9 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { case CaWghDataConstant.SHARE_WGH_YJBMCS: wghYjbmcsService.getPreserWghYjbmcsVation(dto); break; + case CaWghDataConstant.SHARE_WGH_YQHJZ: + wghYqhjzService.getPreserWghYqhjzVation(dto); + break; } } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghYqhjzServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghYqhjzServiceImpl.java index aa8b06d753..f7ee3830b4 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghYqhjzServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghYqhjzServiceImpl.java @@ -1,16 +1,25 @@ package com.epmet.opendata.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; import com.epmet.opendata.dao.WghYqhjzDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.entity.CaLoudongEntity; import com.epmet.opendata.entity.WghYqhjzEntity; import com.epmet.opendata.redis.WghYqhjzRedis; import com.epmet.opendata.service.WghYqhjzService; +import com.epmet.opendata.util.AesUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -84,4 +93,81 @@ public class WghYqhjzServiceImpl extends BaseServiceImpl= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(NumConstant.FIFTY); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableName(CaWghDataConstant.SHARE_WGH_YQHJZ); + + dto.setWhereCase("1=1"); + dto.setOrderBy("OBJECTID,XH,insert_time"); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listWghYqhjz(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + + } + + + private int listWghYqhjz(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.SHARE_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + + private int total; + private List list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghYqhjzDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghYqhjzDao.xml index 1ec98d4387..c9b26071ee 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghYqhjzDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghYqhjzDao.xml @@ -26,6 +26,9 @@ + + delete from wgh_yqhjz + From c90d157626fe1764fe51b3465ba02204237d30b1 Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 14 Jun 2022 17:02:20 +0800 Subject: [PATCH 16/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9dto=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/opendata/dto/wgh/BasegridDTO.java | 14 +++++++------- .../epmet/opendata/dto/wgh/CommunityDTO.java | 10 +++++----- .../opendata/dto/wgh/SubdistrictOfficeDTO.java | 6 +++--- .../com/epmet/opendata/dto/wgh/WghJdbDTO.java | 4 ++-- .../com/epmet/opendata/dto/wgh/WghJqzDTO.java | 6 +++--- .../com/epmet/opendata/dto/wgh/WghJyzDTO.java | 6 +++--- .../com/epmet/opendata/dto/wgh/WghSqxxDTO.java | 18 +++++++++--------- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/BasegridDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/BasegridDTO.java index 1cc3585aa1..0180f59b47 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/BasegridDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/BasegridDTO.java @@ -19,37 +19,37 @@ public class BasegridDTO implements Serializable { /** * */ - private String 坐标信息; + private String coordinateInfo; /** * */ - private String 网格名称; + private String gridName; /** * */ - private String 所属街道办; + private String subDistrictOffice; /** * */ - private String 所属社区; + private String community; /** * */ - private String 街道编码; + private String streetCode; /** * */ - private String 网格编码; + private String gridCode; /** * */ - private String 社区编码; + private String communityCode; /** * diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/CommunityDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/CommunityDTO.java index b3314d2ef3..de6db91652 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/CommunityDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/CommunityDTO.java @@ -19,27 +19,27 @@ public class CommunityDTO implements Serializable { /** * */ - private String 坐标信息; + private String coordinateInfo; /** * */ - private String 街道名称; + private String streetName; /** * */ - private String 街道编码; + private String streetCode; /** * */ - private String 社区名称; + private String communityName; /** * */ - private String 社区编码; + private String communityCode; /** * diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/SubdistrictOfficeDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/SubdistrictOfficeDTO.java index e3b7793ec9..ccb89c4ca0 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/SubdistrictOfficeDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/SubdistrictOfficeDTO.java @@ -19,17 +19,17 @@ public class SubdistrictOfficeDTO implements Serializable { /** * */ - private String 坐标信息; + private String coordinateInfo; /** * */ - private String 街道名称; + private String streetName; /** * */ - private String 街道代码; + private String streetCode; /** * diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJdbDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJdbDTO.java index ec29eb022f..307df64c6a 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJdbDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJdbDTO.java @@ -34,12 +34,12 @@ public class WghJdbDTO implements Serializable { /** * 责任人 */ - private String 责任人; + private String personInCharge; /** * 联系电话 */ - private String 联系电话; + private String phone; /** * diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJqzDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJqzDTO.java index c635e57281..26d20c8bbc 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJqzDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJqzDTO.java @@ -79,17 +79,17 @@ public class WghJqzDTO implements Serializable { /** * 等级 */ - private String 等级; + private String level; /** * 性质 */ - private String 性质; + private String nature; /** * 备注 */ - private String 备注; + private String remarks; /** * diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJyzDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJyzDTO.java index 605d5685dd..2d38d831da 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJyzDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghJyzDTO.java @@ -79,17 +79,17 @@ public class WghJyzDTO implements Serializable { /** * 等级 */ - private String 等级; + private String level; /** * 性质 */ - private String 性质; + private String nature; /** * 备注 */ - private String 备注; + private String remarks; /** * diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSqxxDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSqxxDTO.java index 3e08eccd72..5b859c277a 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSqxxDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/wgh/WghSqxxDTO.java @@ -44,17 +44,17 @@ public class WghSqxxDTO implements Serializable { /** * */ - private Double 网格数量; + private Double numberOfGrid; /** * */ - private String 街道编码; + private String streetCode; /** * */ - private String 社区编码; + private String communityCode; /** * @@ -74,32 +74,32 @@ public class WghSqxxDTO implements Serializable { /** * */ - private String 交警姓名; + private String policeName; /** * */ - private Double 交警电话; + private Double trafficPolicePhone; /** * */ - private String 交警单位; + private String trafficPoliceCompany; /** * */ - private String 民警姓名; + private String peoPoliceName; /** * */ - private String 民警电话; + private String peoPolicePhone; /** * */ - private String 派出所; + private String policeStation; /** * From 93a42261c8d9115f674747b7c65555d4da7e4807 Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 14 Jun 2022 18:16:34 +0800 Subject: [PATCH 17/58] =?UTF-8?q?=E4=B8=8D=E7=BB=A7=E6=89=BF=EF=BC=8C?= =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=8B=89=E5=8F=96=E6=95=B0=E6=8D=AE=E8=A1=97?= =?UTF-8?q?=E9=81=93=E5=8A=9E=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/constant/CaWghDataConstant.java | 7 +- .../opendata/controller/BmGridController.java | 94 ---------- ...roller.java => WghBaseGridController.java} | 10 +- ...oller.java => WghCommunityController.java} | 13 +- ...va => WghSubdistrictOfficeController.java} | 25 ++- .../{BasegridDao.java => WghBaseGridDao.java} | 5 +- .../{CommunityDao.java => WghBmGridDao.java} | 5 +- .../{BmGridDao.java => WghCommunityDao.java} | 5 +- ...eDao.java => WghSubdistrictOfficeDao.java} | 6 +- ...gridEntity.java => WghBaseGridEntity.java} | 2 +- ...BmGridEntity.java => WghBmGridEntity.java} | 2 +- ...ityEntity.java => WghCommunityEntity.java} | 2 +- .../epmet/opendata/entity/WghDywgEntity.java | 2 +- .../epmet/opendata/entity/WghJdbEntity.java | 2 +- .../epmet/opendata/entity/WghJqzEntity.java | 2 +- .../epmet/opendata/entity/WghJxcsEntity.java | 2 +- .../epmet/opendata/entity/WghJyzEntity.java | 2 +- .../epmet/opendata/entity/WghSjxxbEntity.java | 2 +- .../epmet/opendata/entity/WghSqxxEntity.java | 2 +- ...y.java => WghSubdistrictOfficeEntity.java} | 2 +- .../opendata/entity/WghSzcgwghEntity.java | 2 +- .../opendata/entity/WghSzzrwgEntity.java | 2 +- .../epmet/opendata/entity/WghWhpdwEntity.java | 2 +- .../opendata/entity/WghYjbmcsEntity.java | 2 +- .../epmet/opendata/entity/WghYqhjzEntity.java | 2 +- ...segridExcel.java => WghBaseGridExcel.java} | 2 +- .../{BmGridExcel.java => WghBmGridExcel.java} | 2 +- ...unityExcel.java => WghCommunityExcel.java} | 2 +- ...el.java => WghSubdistrictOfficeExcel.java} | 2 +- ...idService.java => WghBaseGridService.java} | 4 +- ...GridService.java => WghBmGridService.java} | 4 +- ...yService.java => WghCommunityService.java} | 4 +- ....java => WghSubdistrictOfficeService.java} | 8 +- .../impl/GuardarDatosTaskServiceImpl.java | 6 +- .../impl/SubdistrictOfficeServiceImpl.java | 87 --------- ...eImpl.java => WghBaseGridServiceImpl.java} | 33 ++-- ...iceImpl.java => WghBmGridServiceImpl.java} | 35 ++-- ...Impl.java => WghCommunityServiceImpl.java} | 30 ++-- .../impl/WghSubdistrictOfficeServiceImpl.java | 165 ++++++++++++++++++ .../src/main/resources/mapper/BasegridDao.xml | 22 --- .../src/main/resources/mapper/BmGridDao.xml | 50 ------ .../main/resources/mapper/CommunityDao.xml | 20 --- .../resources/mapper/SubdistrictOfficeDao.xml | 15 -- .../main/resources/mapper/WghBaseGridDao.xml | 11 ++ .../main/resources/mapper/WghBmGridDao.xml | 12 ++ .../main/resources/mapper/WghCommunityDao.xml | 12 ++ .../mapper/WghSubdistrictOfficeDao.xml | 10 ++ 47 files changed, 339 insertions(+), 399 deletions(-) delete mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BmGridController.java rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/{BasegridController.java => WghBaseGridController.java} (91%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/{CommunityController.java => WghCommunityController.java} (91%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/{SubdistrictOfficeController.java => WghSubdistrictOfficeController.java} (77%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/{BasegridDao.java => WghBaseGridDao.java} (66%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/{CommunityDao.java => WghBmGridDao.java} (68%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/{BmGridDao.java => WghCommunityDao.java} (66%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/{SubdistrictOfficeDao.java => WghSubdistrictOfficeDao.java} (56%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/{BasegridEntity.java => WghBaseGridEntity.java} (94%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/{BmGridEntity.java => WghBmGridEntity.java} (98%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/{CommunityEntity.java => WghCommunityEntity.java} (93%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/{SubdistrictOfficeEntity.java => WghSubdistrictOfficeEntity.java} (91%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/{BasegridExcel.java => WghBaseGridExcel.java} (95%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/{BmGridExcel.java => WghBmGridExcel.java} (99%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/{CommunityExcel.java => WghCommunityExcel.java} (94%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/{SubdistrictOfficeExcel.java => WghSubdistrictOfficeExcel.java} (92%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/{BasegridService.java => WghBaseGridService.java} (92%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/{BmGridService.java => WghBmGridService.java} (93%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/{CommunityService.java => WghCommunityService.java} (92%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/{SubdistrictOfficeService.java => WghSubdistrictOfficeService.java} (84%) delete mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/SubdistrictOfficeServiceImpl.java rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/{BasegridServiceImpl.java => WghBaseGridServiceImpl.java} (81%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/{BmGridServiceImpl.java => WghBmGridServiceImpl.java} (82%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/{CommunityServiceImpl.java => WghCommunityServiceImpl.java} (82%) create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSubdistrictOfficeServiceImpl.java delete mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/BasegridDao.xml delete mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/BmGridDao.xml delete mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CommunityDao.xml delete mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/SubdistrictOfficeDao.xml create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghBaseGridDao.xml create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghBmGridDao.xml create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghCommunityDao.xml create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSubdistrictOfficeDao.xml diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java index 9af21b42a9..e603610dea 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java @@ -20,9 +20,10 @@ public interface CaWghDataConstant { String UNICOM_ROTATORS = "ca_rotators"; String UNICOM_RENTAL = "ca_rental"; - String SHARE_BASE_GRID = "BaseGrid"; - String SHARE_BM_GRID = "bm_grid"; - String SHARE_COMMUNITY = "community"; + String SHARE_BASE_GRID = "Wgh_base_grid"; + String SHARE_WGH_SUB = "wgh_subdistrict_office"; + String SHARE_BM_GRID = "wgh_bm_grid"; + String SHARE_COMMUNITY = "wgh_community"; String SHARE_WGH_DYWG = "wgh_dywg"; String SHARE_WGH_JDB = "wgh_jdb"; String SHARE_WGH_JQZ = "wgh_jqz"; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BmGridController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BmGridController.java deleted file mode 100644 index 4c87101c5b..0000000000 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BmGridController.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.epmet.opendata.controller; - -import com.epmet.commons.tools.aop.NoRepeatSubmit; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ExcelUtils; -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.AssertUtils; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.DefaultGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.opendata.dto.form.PreserVationFormDTO; -import com.epmet.opendata.dto.wgh.BmGridDTO; -import com.epmet.opendata.excel.BmGridExcel; -import com.epmet.opendata.service.BmGridService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - - -/** - * - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-06-14 - */ -@RestController -@RequestMapping("bmGrid") -public class BmGridController { - - @Autowired - private BmGridService bmGridService; - - @RequestMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = bmGridService.page(params); - return new Result>().ok(page); - } - - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ - BmGridDTO data = bmGridService.get(id); - return new Result().ok(data); - } - - @NoRepeatSubmit - @PostMapping("save") - public Result save(@RequestBody BmGridDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - bmGridService.save(dto); - return new Result(); - } - - @NoRepeatSubmit - @PostMapping("update") - public Result update(@RequestBody BmGridDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - bmGridService.update(dto); - return new Result(); - } - - @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - bmGridService.delete(ids); - return new Result(); - } - - @GetMapping("export") - public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = bmGridService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, BmGridExcel.class); - } - - /** - * 调用ruoyi存储bm_grid数据 - * - * @param dto - * @return com.epmet.commons.tools.utils.Result - * @author LZN - * @date 2022/6/14 14:16 - */ - @PostMapping("preserBmGridVation") - public Result getpreserBmGridVation(@RequestBody PreserVationFormDTO dto) { - bmGridService.getPreserBmGridVation(dto); - return new Result(); - } -} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BasegridController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghBaseGridController.java similarity index 91% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BasegridController.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghBaseGridController.java index f9acf3489a..dc990c7324 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/BasegridController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghBaseGridController.java @@ -11,8 +11,8 @@ import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.BasegridDTO; -import com.epmet.opendata.excel.BasegridExcel; -import com.epmet.opendata.service.BasegridService; +import com.epmet.opendata.excel.WghBaseGridExcel; +import com.epmet.opendata.service.WghBaseGridService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -29,10 +29,10 @@ import java.util.Map; */ @RestController @RequestMapping("basegrid") -public class BasegridController { +public class WghBaseGridController { @Autowired - private BasegridService basegridService; + private WghBaseGridService basegridService; @RequestMapping("page") public Result> page(@RequestParam Map params){ @@ -75,7 +75,7 @@ public class BasegridController { @GetMapping("export") public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { List list = basegridService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, BasegridExcel.class); + ExcelUtils.exportExcelToTarget(response, null, list, WghBaseGridExcel.class); } /** diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CommunityController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghCommunityController.java similarity index 91% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CommunityController.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghCommunityController.java index a7f54e01e4..90ff0ca529 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CommunityController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghCommunityController.java @@ -7,13 +7,12 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; - +import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.CommunityDTO; -import com.epmet.opendata.excel.CommunityExcel; -import com.epmet.opendata.service.CommunityService; +import com.epmet.opendata.excel.WghCommunityExcel; +import com.epmet.opendata.service.WghCommunityService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -28,10 +27,10 @@ import java.util.Map; */ @RestController @RequestMapping("community") -public class CommunityController { +public class WghCommunityController { @Autowired - private CommunityService communityService; + private WghCommunityService communityService; @RequestMapping("page") public Result> page(@RequestParam Map params) { @@ -74,7 +73,7 @@ public class CommunityController { @GetMapping("export") public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { List list = communityService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, CommunityExcel.class); + ExcelUtils.exportExcelToTarget(response, null, list, WghCommunityExcel.class); } /** diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/SubdistrictOfficeController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSubdistrictOfficeController.java similarity index 77% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/SubdistrictOfficeController.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSubdistrictOfficeController.java index 52b881b741..1deed4b024 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/SubdistrictOfficeController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghSubdistrictOfficeController.java @@ -10,9 +10,11 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.SubdistrictOfficeDTO; -import com.epmet.opendata.excel.SubdistrictOfficeExcel; -import com.epmet.opendata.service.SubdistrictOfficeService; + +import com.epmet.opendata.excel.WghSubdistrictOfficeExcel; +import com.epmet.opendata.service.WghSubdistrictOfficeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -29,10 +31,10 @@ import java.util.Map; */ @RestController @RequestMapping("subdistrictOffice") -public class SubdistrictOfficeController { +public class WghSubdistrictOfficeController { @Autowired - private SubdistrictOfficeService subdistrictOfficeService; + private WghSubdistrictOfficeService subdistrictOfficeService; @RequestMapping("page") public Result> page(@RequestParam Map params){ @@ -75,9 +77,22 @@ public class SubdistrictOfficeController { @GetMapping("export") public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { List list = subdistrictOfficeService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, SubdistrictOfficeExcel.class); + ExcelUtils.exportExcelToTarget(response, null, list, WghSubdistrictOfficeExcel.class); } + /** + * 调用ruoyi接口 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 17:36 + */ + @PostMapping("/preserSubVation") + public Result getpreserSubVation(@RequestBody PreserVationFormDTO dto) { + subdistrictOfficeService.getpreserSubVation(dto); + return new Result(); + } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/BasegridDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghBaseGridDao.java similarity index 66% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/BasegridDao.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghBaseGridDao.java index 8cdc58af1c..c48f75c03f 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/BasegridDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghBaseGridDao.java @@ -2,7 +2,7 @@ package com.epmet.opendata.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.opendata.entity.BasegridEntity; +import com.epmet.opendata.entity.WghBaseGridEntity; import org.apache.ibatis.annotations.Mapper; /** @@ -12,7 +12,6 @@ import org.apache.ibatis.annotations.Mapper; * @since v1.0.0 2022-06-14 */ @Mapper -public interface BasegridDao extends BaseDao { - +public interface WghBaseGridDao extends BaseDao { int deleteAll(); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CommunityDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghBmGridDao.java similarity index 68% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CommunityDao.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghBmGridDao.java index 8457a499f4..f41a557914 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CommunityDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghBmGridDao.java @@ -2,7 +2,8 @@ package com.epmet.opendata.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.opendata.entity.CommunityEntity; + +import com.epmet.opendata.entity.WghBmGridEntity; import org.apache.ibatis.annotations.Mapper; /** @@ -12,7 +13,7 @@ import org.apache.ibatis.annotations.Mapper; * @since v1.0.0 2022-06-14 */ @Mapper -public interface CommunityDao extends BaseDao { +public interface WghBmGridDao extends BaseDao { int deleteAll(); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/BmGridDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghCommunityDao.java similarity index 66% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/BmGridDao.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghCommunityDao.java index b4988f03c6..624403d977 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/BmGridDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghCommunityDao.java @@ -2,7 +2,8 @@ package com.epmet.opendata.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.opendata.entity.BmGridEntity; + +import com.epmet.opendata.entity.WghCommunityEntity; import org.apache.ibatis.annotations.Mapper; /** @@ -12,7 +13,7 @@ import org.apache.ibatis.annotations.Mapper; * @since v1.0.0 2022-06-14 */ @Mapper -public interface BmGridDao extends BaseDao { +public interface WghCommunityDao extends BaseDao { int deleteAll(); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/SubdistrictOfficeDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSubdistrictOfficeDao.java similarity index 56% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/SubdistrictOfficeDao.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSubdistrictOfficeDao.java index 2300a96e5c..0b58b480d1 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/SubdistrictOfficeDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghSubdistrictOfficeDao.java @@ -2,7 +2,8 @@ package com.epmet.opendata.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.opendata.entity.SubdistrictOfficeEntity; + +import com.epmet.opendata.entity.WghSubdistrictOfficeEntity; import org.apache.ibatis.annotations.Mapper; /** @@ -12,6 +13,7 @@ import org.apache.ibatis.annotations.Mapper; * @since v1.0.0 2022-06-14 */ @Mapper -public interface SubdistrictOfficeDao extends BaseDao { +public interface WghSubdistrictOfficeDao extends BaseDao { + int deleteAll(); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BasegridEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghBaseGridEntity.java similarity index 94% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BasegridEntity.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghBaseGridEntity.java index 3f97751b94..060a64e921 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BasegridEntity.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghBaseGridEntity.java @@ -17,7 +17,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper=false) @TableName("basegrid") -public class BasegridEntity extends BaseEpmetEntity { +public class WghBaseGridEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BmGridEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghBmGridEntity.java similarity index 98% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BmGridEntity.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghBmGridEntity.java index 0df07d3dc4..157a526928 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/BmGridEntity.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghBmGridEntity.java @@ -17,7 +17,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper=false) @TableName("bm_grid") -public class BmGridEntity extends BaseEpmetEntity { +public class WghBmGridEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CommunityEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghCommunityEntity.java similarity index 93% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CommunityEntity.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghCommunityEntity.java index aba2fa7d1b..f2e8a2a9c6 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/CommunityEntity.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghCommunityEntity.java @@ -17,7 +17,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper=false) @TableName("community") -public class CommunityEntity extends BaseEpmetEntity { +public class WghCommunityEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghDywgEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghDywgEntity.java index c223b3edd0..9c47bdd298 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghDywgEntity.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghDywgEntity.java @@ -17,7 +17,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper=false) @TableName("wgh_dywg") -public class WghDywgEntity extends BaseEpmetEntity { +public class WghDywgEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJdbEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJdbEntity.java index 26f9ca493c..6dd4cab773 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJdbEntity.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJdbEntity.java @@ -17,7 +17,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper=false) @TableName("wgh_jdb") -public class WghJdbEntity extends BaseEpmetEntity { +public class WghJdbEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJqzEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJqzEntity.java index 767ccacabe..eecfe7048a 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJqzEntity.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJqzEntity.java @@ -17,7 +17,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper=false) @TableName("wgh_jqz") -public class WghJqzEntity extends BaseEpmetEntity { +public class WghJqzEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJxcsEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJxcsEntity.java index c2ae105195..53ad3a48e3 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJxcsEntity.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJxcsEntity.java @@ -17,7 +17,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper=false) @TableName("wgh_jxcs") -public class WghJxcsEntity extends BaseEpmetEntity { +public class WghJxcsEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJyzEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJyzEntity.java index 7f14adb663..9468201318 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJyzEntity.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJyzEntity.java @@ -17,7 +17,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper=false) @TableName("wgh_jyz") -public class WghJyzEntity extends BaseEpmetEntity { +public class WghJyzEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSjxxbEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSjxxbEntity.java index 586a8a75db..ea97c3cefe 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSjxxbEntity.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSjxxbEntity.java @@ -17,7 +17,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper=false) @TableName("wgh_sjxxb") -public class WghSjxxbEntity extends BaseEpmetEntity { +public class WghSjxxbEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSqxxEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSqxxEntity.java index d1121e17d7..3ef9574bb9 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSqxxEntity.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSqxxEntity.java @@ -17,7 +17,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper=false) @TableName("wgh_sqxx") -public class WghSqxxEntity extends BaseEpmetEntity { +public class WghSqxxEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/SubdistrictOfficeEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSubdistrictOfficeEntity.java similarity index 91% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/SubdistrictOfficeEntity.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSubdistrictOfficeEntity.java index bd3e3aaa6a..f9d249ecf7 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/SubdistrictOfficeEntity.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSubdistrictOfficeEntity.java @@ -17,7 +17,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper=false) @TableName("subdistrict_office") -public class SubdistrictOfficeEntity extends BaseEpmetEntity { +public class WghSubdistrictOfficeEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSzcgwghEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSzcgwghEntity.java index ae5b53f708..35c3e95f8f 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSzcgwghEntity.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSzcgwghEntity.java @@ -17,7 +17,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper=false) @TableName("wgh_szcgwgh") -public class WghSzcgwghEntity extends BaseEpmetEntity { +public class WghSzcgwghEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSzzrwgEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSzzrwgEntity.java index 6b2baae270..697b37f90f 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSzzrwgEntity.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSzzrwgEntity.java @@ -17,7 +17,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper=false) @TableName("wgh_szzrwg") -public class WghSzzrwgEntity extends BaseEpmetEntity { +public class WghSzzrwgEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghWhpdwEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghWhpdwEntity.java index 4c379db795..760057255a 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghWhpdwEntity.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghWhpdwEntity.java @@ -17,7 +17,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper=false) @TableName("wgh_whpdw") -public class WghWhpdwEntity extends BaseEpmetEntity { +public class WghWhpdwEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghYjbmcsEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghYjbmcsEntity.java index 097baf6258..6f4f0d7a74 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghYjbmcsEntity.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghYjbmcsEntity.java @@ -17,7 +17,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper=false) @TableName("wgh_yjbmcs") -public class WghYjbmcsEntity extends BaseEpmetEntity { +public class WghYjbmcsEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghYqhjzEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghYqhjzEntity.java index 39718863c5..909e33fd59 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghYqhjzEntity.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghYqhjzEntity.java @@ -17,7 +17,7 @@ import java.util.Date; @Data @EqualsAndHashCode(callSuper=false) @TableName("wgh_yqhjz") -public class WghYqhjzEntity extends BaseEpmetEntity { +public class WghYqhjzEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/BasegridExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghBaseGridExcel.java similarity index 95% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/BasegridExcel.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghBaseGridExcel.java index c78c090c22..e1370f23d0 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/BasegridExcel.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghBaseGridExcel.java @@ -12,7 +12,7 @@ import java.util.Date; * @since v1.0.0 2022-06-14 */ @Data -public class BasegridExcel { +public class WghBaseGridExcel { @Excel(name = "") private String coordinateInfo; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/BmGridExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghBmGridExcel.java similarity index 99% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/BmGridExcel.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghBmGridExcel.java index 351509c9dd..7703a171df 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/BmGridExcel.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghBmGridExcel.java @@ -12,7 +12,7 @@ import java.util.Date; * @since v1.0.0 2022-06-14 */ @Data -public class BmGridExcel { +public class WghBmGridExcel { @Excel(name = "网格ID") private Long gridId; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/CommunityExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghCommunityExcel.java similarity index 94% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/CommunityExcel.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghCommunityExcel.java index cf4f22c20f..243c77c0d3 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/CommunityExcel.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghCommunityExcel.java @@ -12,7 +12,7 @@ import java.util.Date; * @since v1.0.0 2022-06-14 */ @Data -public class CommunityExcel { +public class WghCommunityExcel { @Excel(name = "") private String coordinateInfo; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/SubdistrictOfficeExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSubdistrictOfficeExcel.java similarity index 92% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/SubdistrictOfficeExcel.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSubdistrictOfficeExcel.java index 43af5c9c7a..f33f6df6ea 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/SubdistrictOfficeExcel.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghSubdistrictOfficeExcel.java @@ -12,7 +12,7 @@ import java.util.Date; * @since v1.0.0 2022-06-14 */ @Data -public class SubdistrictOfficeExcel { +public class WghSubdistrictOfficeExcel { @Excel(name = "") private String coordinateInfo; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BasegridService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghBaseGridService.java similarity index 92% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BasegridService.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghBaseGridService.java index 2dad26e69a..6c2cff2cf2 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BasegridService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghBaseGridService.java @@ -4,7 +4,7 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.BasegridDTO; -import com.epmet.opendata.entity.BasegridEntity; +import com.epmet.opendata.entity.WghBaseGridEntity; import java.util.List; @@ -14,7 +14,7 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2022-06-14 */ -public interface BasegridService extends BaseService { +public interface WghBaseGridService extends BaseService { /** * 默认分页 diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BmGridService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghBmGridService.java similarity index 93% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BmGridService.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghBmGridService.java index d2f79c35fe..164506d33a 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/BmGridService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghBmGridService.java @@ -4,7 +4,7 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.BmGridDTO; -import com.epmet.opendata.entity.BmGridEntity; +import com.epmet.opendata.entity.WghBmGridEntity; import java.util.List; @@ -16,7 +16,7 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2022-06-14 */ -public interface BmGridService extends BaseService { +public interface WghBmGridService extends BaseService { /** * 默认分页 diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CommunityService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghCommunityService.java similarity index 92% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CommunityService.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghCommunityService.java index 1c22cad274..a53ffb8a6a 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CommunityService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghCommunityService.java @@ -4,7 +4,7 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.CommunityDTO; -import com.epmet.opendata.entity.CommunityEntity; +import com.epmet.opendata.entity.WghCommunityEntity; import java.util.List; @@ -14,7 +14,7 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2022-06-14 */ -public interface CommunityService extends BaseService { +public interface WghCommunityService extends BaseService { /** * 默认分页 diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/SubdistrictOfficeService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSubdistrictOfficeService.java similarity index 84% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/SubdistrictOfficeService.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSubdistrictOfficeService.java index 8d37a4ff87..f378b09109 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/SubdistrictOfficeService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghSubdistrictOfficeService.java @@ -2,9 +2,9 @@ package com.epmet.opendata.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.SubdistrictOfficeDTO; -import com.epmet.opendata.entity.SubdistrictOfficeEntity; - +import com.epmet.opendata.entity.WghSubdistrictOfficeEntity; import java.util.List; import java.util.Map; @@ -15,7 +15,7 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2022-06-14 */ -public interface SubdistrictOfficeService extends BaseService { +public interface WghSubdistrictOfficeService extends BaseService { /** * 默认分页 @@ -76,4 +76,6 @@ public interface SubdistrictOfficeService extends BaseService implements SubdistrictOfficeService { - - @Autowired - private SubdistrictOfficeRedis subdistrictOfficeRedis; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, SubdistrictOfficeDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, SubdistrictOfficeDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public SubdistrictOfficeDTO get(String id) { - SubdistrictOfficeEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, SubdistrictOfficeDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(SubdistrictOfficeDTO dto) { - SubdistrictOfficeEntity entity = ConvertUtils.sourceToTarget(dto, SubdistrictOfficeEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(SubdistrictOfficeDTO dto) { - SubdistrictOfficeEntity entity = ConvertUtils.sourceToTarget(dto, SubdistrictOfficeEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - -} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BasegridServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghBaseGridServiceImpl.java similarity index 81% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BasegridServiceImpl.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghBaseGridServiceImpl.java index 3cbabe9382..b799f6cec9 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BasegridServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghBaseGridServiceImpl.java @@ -11,14 +11,13 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.HttpClientManager; import com.epmet.commons.tools.utils.Result; -import com.epmet.opendata.dao.BasegridDao; +import com.epmet.opendata.dao.WghBaseGridDao; import com.epmet.opendata.dto.constant.CaWghDataConstant; import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.BasegridDTO; -import com.epmet.opendata.entity.BasegridEntity; -import com.epmet.opendata.entity.CaLoudongEntity; +import com.epmet.opendata.entity.WghBaseGridEntity; import com.epmet.opendata.redis.BasegridRedis; -import com.epmet.opendata.service.BasegridService; +import com.epmet.opendata.service.WghBaseGridService; import com.epmet.opendata.util.AesUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -34,14 +33,14 @@ import java.util.Map; * @since v1.0.0 2022-06-14 */ @Service -public class BasegridServiceImpl extends BaseServiceImpl implements BasegridService { +public class WghBaseGridServiceImpl extends BaseServiceImpl implements WghBaseGridService { @Autowired private BasegridRedis basegridRedis; @Override public PageData page(Map params) { - IPage page = baseDao.selectPage( + IPage page = baseDao.selectPage( getPage(params, FieldConstant.CREATED_TIME, false), getWrapper(params) ); @@ -50,15 +49,15 @@ public class BasegridServiceImpl extends BaseServiceImpl list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); + List entityList = baseDao.selectList(getWrapper(params)); return ConvertUtils.sourceToTarget(entityList, BasegridDTO.class); } - private QueryWrapper getWrapper(Map params) { + private QueryWrapper getWrapper(Map params) { String id = (String) params.get(FieldConstant.ID_HUMP); - QueryWrapper wrapper = new QueryWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); return wrapper; @@ -66,21 +65,21 @@ public class BasegridServiceImpl extends BaseServiceImpl 0) { + if (i >= 0) { dto.setPageNo(NumConstant.ONE); dto.setPageSize(NumConstant.FIFTY); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); dto.setTableName(CaWghDataConstant.SHARE_BASE_GRID); dto.setWhereCase("1=1"); - dto.setOrderBy(""); + dto.setOrderBy("gridName"); int pageNo = 1; @@ -146,7 +145,7 @@ public class BasegridServiceImpl extends BaseServiceImpl list; + private List list; public int getTotal() { return total; @@ -156,11 +155,11 @@ public class BasegridServiceImpl extends BaseServiceImpl getList() { + public List getList() { return list; } - public void setList(List list) { + public void setList(List list) { this.list = list; } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BmGridServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghBmGridServiceImpl.java similarity index 82% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BmGridServiceImpl.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghBmGridServiceImpl.java index d3cf864f00..622f59da1a 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BmGridServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghBmGridServiceImpl.java @@ -5,21 +5,20 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; - import com.epmet.commons.tools.utils.HttpClientManager; import com.epmet.commons.tools.utils.Result; -import com.epmet.opendata.dao.BmGridDao; +import com.epmet.opendata.dao.WghBmGridDao; import com.epmet.opendata.dto.constant.CaWghDataConstant; import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.BmGridDTO; -import com.epmet.opendata.entity.BasegridEntity; -import com.epmet.opendata.entity.BmGridEntity; +import com.epmet.opendata.entity.WghBmGridEntity; import com.epmet.opendata.redis.BmGridRedis; -import com.epmet.opendata.service.BmGridService; + +import com.epmet.opendata.service.WghBmGridService; import com.epmet.opendata.util.AesUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -37,14 +36,14 @@ import java.util.Map; * @since v1.0.0 2022-06-14 */ @Service -public class BmGridServiceImpl extends BaseServiceImpl implements BmGridService { +public class WghBmGridServiceImpl extends BaseServiceImpl implements WghBmGridService { @Autowired private BmGridRedis bmGridRedis; @Override public PageData page(Map params) { - IPage page = baseDao.selectPage( + IPage page = baseDao.selectPage( getPage(params, FieldConstant.CREATED_TIME, false), getWrapper(params) ); @@ -53,15 +52,15 @@ public class BmGridServiceImpl extends BaseServiceImpl @Override public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); + List entityList = baseDao.selectList(getWrapper(params)); return ConvertUtils.sourceToTarget(entityList, BmGridDTO.class); } - private QueryWrapper getWrapper(Map params){ + private QueryWrapper getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); - QueryWrapper wrapper = new QueryWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); return wrapper; @@ -69,21 +68,21 @@ public class BmGridServiceImpl extends BaseServiceImpl @Override public BmGridDTO get(String id) { - BmGridEntity entity = baseDao.selectById(id); + WghBmGridEntity entity = baseDao.selectById(id); return ConvertUtils.sourceToTarget(entity, BmGridDTO.class); } @Override @Transactional(rollbackFor = Exception.class) public void save(BmGridDTO dto) { - BmGridEntity entity = ConvertUtils.sourceToTarget(dto, BmGridEntity.class); + WghBmGridEntity entity = ConvertUtils.sourceToTarget(dto, WghBmGridEntity.class); insert(entity); } @Override @Transactional(rollbackFor = Exception.class) public void update(BmGridDTO dto) { - BmGridEntity entity = ConvertUtils.sourceToTarget(dto, BmGridEntity.class); + WghBmGridEntity entity = ConvertUtils.sourceToTarget(dto, WghBmGridEntity.class); updateById(entity); } @@ -105,7 +104,7 @@ public class BmGridServiceImpl extends BaseServiceImpl @Override public void getPreserBmGridVation(PreserVationFormDTO dto) { int i = baseDao.deleteAll(); - if (i > 0) { + if (i >= 0) { dto.setPageNo(NumConstant.ONE); dto.setPageSize(NumConstant.FIFTY); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); @@ -148,7 +147,7 @@ public class BmGridServiceImpl extends BaseServiceImpl static class ReturnDate { private int total; - private List list; + private List list; public int getTotal() { return total; @@ -158,11 +157,11 @@ public class BmGridServiceImpl extends BaseServiceImpl this.total = total; } - public List getList() { + public List getList() { return list; } - public void setList(List list) { + public void setList(List list) { this.list = list; } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CommunityServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghCommunityServiceImpl.java similarity index 82% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CommunityServiceImpl.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghCommunityServiceImpl.java index 0846ff4a95..7b19f3b5b1 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CommunityServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghCommunityServiceImpl.java @@ -11,14 +11,14 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.HttpClientManager; import com.epmet.commons.tools.utils.Result; -import com.epmet.opendata.dao.CommunityDao; +import com.epmet.opendata.dao.WghCommunityDao; import com.epmet.opendata.dto.constant.CaWghDataConstant; import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.CommunityDTO; -import com.epmet.opendata.entity.CaLoudongEntity; -import com.epmet.opendata.entity.CommunityEntity; +import com.epmet.opendata.entity.WghCommunityEntity; import com.epmet.opendata.redis.CommunityRedis; -import com.epmet.opendata.service.CommunityService; + +import com.epmet.opendata.service.WghCommunityService; import com.epmet.opendata.util.AesUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -34,14 +34,14 @@ import java.util.Map; * @since v1.0.0 2022-06-14 */ @Service -public class CommunityServiceImpl extends BaseServiceImpl implements CommunityService { +public class WghCommunityServiceImpl extends BaseServiceImpl implements WghCommunityService { @Autowired private CommunityRedis communityRedis; @Override public PageData page(Map params) { - IPage page = baseDao.selectPage( + IPage page = baseDao.selectPage( getPage(params, FieldConstant.CREATED_TIME, false), getWrapper(params) ); @@ -50,15 +50,15 @@ public class CommunityServiceImpl extends BaseServiceImpl list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); + List entityList = baseDao.selectList(getWrapper(params)); return ConvertUtils.sourceToTarget(entityList, CommunityDTO.class); } - private QueryWrapper getWrapper(Map params) { + private QueryWrapper getWrapper(Map params) { String id = (String) params.get(FieldConstant.ID_HUMP); - QueryWrapper wrapper = new QueryWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); return wrapper; @@ -66,21 +66,21 @@ public class CommunityServiceImpl extends BaseServiceImpl list; + private List list; public int getTotal() { @@ -157,11 +157,11 @@ public class CommunityServiceImpl extends BaseServiceImpl getList() { + public List getList() { return list; } - public void setList(List list) { + public void setList(List list) { this.list = list; } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSubdistrictOfficeServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSubdistrictOfficeServiceImpl.java new file mode 100644 index 0000000000..2cccafee16 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSubdistrictOfficeServiceImpl.java @@ -0,0 +1,165 @@ +package com.epmet.opendata.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.HttpClientManager; +import com.epmet.commons.tools.utils.Result; +import com.epmet.opendata.dao.WghSubdistrictOfficeDao; +import com.epmet.opendata.dto.constant.CaWghDataConstant; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.SubdistrictOfficeDTO; +import com.epmet.opendata.entity.CaLoudongEntity; +import com.epmet.opendata.entity.WghSubdistrictOfficeEntity; +import com.epmet.opendata.redis.SubdistrictOfficeRedis; +import com.epmet.opendata.service.WghSubdistrictOfficeService; +import com.epmet.opendata.util.AesUtils; +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.Arrays; +import java.util.List; +import java.util.Map; + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class WghSubdistrictOfficeServiceImpl extends BaseServiceImpl implements WghSubdistrictOfficeService { + + @Autowired + private SubdistrictOfficeRedis subdistrictOfficeRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, SubdistrictOfficeDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, SubdistrictOfficeDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public SubdistrictOfficeDTO get(String id) { + WghSubdistrictOfficeEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, SubdistrictOfficeDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(SubdistrictOfficeDTO dto) { + WghSubdistrictOfficeEntity entity = ConvertUtils.sourceToTarget(dto, WghSubdistrictOfficeEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(SubdistrictOfficeDTO dto) { + WghSubdistrictOfficeEntity entity = ConvertUtils.sourceToTarget(dto, WghSubdistrictOfficeEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @Override + public void getpreserSubVation(PreserVationFormDTO dto) { + int i = baseDao.deleteAll(); + if (i >= 0) { + dto.setPageNo(NumConstant.ONE); + dto.setPageSize(NumConstant.FIFTY); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableName(CaWghDataConstant.SHARE_WGH_SUB); + + dto.setWhereCase("1=1"); + dto.setOrderBy(""); + + int pageNo = 1; + + int total = 0; + + do { + try { + total = listSub(dto); + pageNo++; + dto.setPageNo(pageNo); + } catch (Exception e) { + e.printStackTrace(); + } + } while (total > (pageNo * NumConstant.FIFTY)); + } + + } + + + private int listSub(PreserVationFormDTO dto) throws Exception { + String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); + JSONObject obj = new JSONObject(); + obj.put(CaWghDataConstant.SHARE_CONDITION, aes); + String data = HttpClientManager.getInstance().sendPostByJSON(CaWghDataConstant.DATA_URL_SHARE, obj.toJSONString()).getData(); + JSONObject toResult = JSON.parseObject(data); + Result result = ConvertUtils.mapToEntity(toResult, Result.class); + if (!result.success()) { + return dto.getPageNo() + 1; + } + + ReturnDate returnDate = JSONObject.parseObject(JSONObject.toJSONString(result.getData()), ReturnDate.class); + this.insertBatch(returnDate.getList()); + return returnDate.getTotal(); + } + + static class ReturnDate { + + private int total; + private List list; + + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } + } + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/BasegridDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/BasegridDao.xml deleted file mode 100644 index daab0d0aee..0000000000 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/BasegridDao.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - delete from BaseGrid - - - - diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/BmGridDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/BmGridDao.xml deleted file mode 100644 index 230d6fee17..0000000000 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/BmGridDao.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - delete from bm_grid - - - - diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CommunityDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CommunityDao.xml deleted file mode 100644 index 03d2f5d563..0000000000 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CommunityDao.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - delete from community - - - - diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/SubdistrictOfficeDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/SubdistrictOfficeDao.xml deleted file mode 100644 index 9848740d6e..0000000000 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/SubdistrictOfficeDao.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghBaseGridDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghBaseGridDao.xml new file mode 100644 index 0000000000..da9b931654 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghBaseGridDao.xml @@ -0,0 +1,11 @@ + + + + + + + delete from wgh_base_grid + + + + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghBmGridDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghBmGridDao.xml new file mode 100644 index 0000000000..bc8c5b7f7e --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghBmGridDao.xml @@ -0,0 +1,12 @@ + + + + + + + + delete from wgh_bm_grid + + + + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghCommunityDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghCommunityDao.xml new file mode 100644 index 0000000000..0b843deb67 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghCommunityDao.xml @@ -0,0 +1,12 @@ + + + + + + + + delete from wgh_community + + + + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSubdistrictOfficeDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSubdistrictOfficeDao.xml new file mode 100644 index 0000000000..b34fb0e20e --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghSubdistrictOfficeDao.xml @@ -0,0 +1,10 @@ + + + + + + + + delete from wgh_subdistrict_office + + From 7d4cfa28735ceea21a2590b3bde75f3906c47838 Mon Sep 17 00:00:00 2001 From: HAHA Date: Tue, 14 Jun 2022 18:17:31 +0800 Subject: [PATCH 18/58] =?UTF-8?q?=E8=A1=A5=E5=85=85controller?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WghBmGridController.java | 96 +++++++++++++++++++ 1 file changed, 96 insertions(+) create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghBmGridController.java diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghBmGridController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghBmGridController.java new file mode 100644 index 0000000000..c4d6c0773a --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghBmGridController.java @@ -0,0 +1,96 @@ +package com.epmet.opendata.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.epmet.opendata.dto.form.PreserVationFormDTO; +import com.epmet.opendata.dto.wgh.BmGridDTO; + +import com.epmet.opendata.excel.WghBmGridExcel; + +import com.epmet.opendata.service.WghBmGridService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@RestController +@RequestMapping("bmGrid") +public class WghBmGridController { + + @Autowired + private WghBmGridService bmGridService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = bmGridService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + BmGridDTO data = bmGridService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody BmGridDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + bmGridService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody BmGridDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + bmGridService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + bmGridService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = bmGridService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, WghBmGridExcel.class); + } + + /** + * 调用ruoyi存储bm_grid数据 + * + * @param dto + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/14 14:16 + */ + @PostMapping("preserBmGridVation") + public Result getpreserBmGridVation(@RequestBody PreserVationFormDTO dto) { + bmGridService.getPreserBmGridVation(dto); + return new Result(); + } +} From fb10bd34692b0b0b0bfd1f68c30715509d3df741 Mon Sep 17 00:00:00 2001 From: HAHA Date: Wed, 15 Jun 2022 11:00:10 +0800 Subject: [PATCH 19/58] =?UTF-8?q?=E6=94=B9=E4=B8=80=E4=BA=9B=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/constant/CaWghDataConstant.java | 4 +- .../controller/WghBaseGridController.java | 2 +- ...ontroller.java => caBmGridController.java} | 10 ++--- .../{WghBmGridDao.java => caBmGridDao.java} | 4 +- .../opendata/entity/WghBaseGridEntity.java | 2 +- .../opendata/entity/WghCommunityEntity.java | 2 +- .../epmet/opendata/entity/WghJdbEntity.java | 2 +- .../epmet/opendata/entity/WghSjxxbEntity.java | 2 +- .../entity/WghSubdistrictOfficeEntity.java | 2 +- ...hBmGridEntity.java => caBmGridEntity.java} | 4 +- ...WghBmGridExcel.java => caBmGridExcel.java} | 2 +- ...mGridService.java => caBmGridService.java} | 4 +- ...viceImpl.java => CaBmGridServiceImpl.java} | 38 ++++++++++--------- .../impl/GuardarDatosTaskServiceImpl.java | 2 +- .../service/impl/WghBaseGridServiceImpl.java | 2 +- .../service/impl/WghCommunityServiceImpl.java | 2 +- .../service/impl/WghJqzServiceImpl.java | 2 +- .../impl/WghSubdistrictOfficeServiceImpl.java | 2 +- .../service/impl/WghSzzrwgServiceImpl.java | 2 +- .../src/main/resources/mapper/WghSjxxbDao.xml | 2 +- .../{WghBmGridDao.xml => caBmGridDao.xml} | 4 +- 21 files changed, 49 insertions(+), 47 deletions(-) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/{WghBmGridController.java => caBmGridController.java} (91%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/{WghBmGridDao.java => caBmGridDao.java} (68%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/{WghBmGridEntity.java => caBmGridEntity.java} (98%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/{WghBmGridExcel.java => caBmGridExcel.java} (99%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/{WghBmGridService.java => caBmGridService.java} (93%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/{WghBmGridServiceImpl.java => CaBmGridServiceImpl.java} (78%) rename epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/{WghBmGridDao.xml => caBmGridDao.xml} (69%) diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java index e603610dea..029f846273 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java @@ -20,9 +20,9 @@ public interface CaWghDataConstant { String UNICOM_ROTATORS = "ca_rotators"; String UNICOM_RENTAL = "ca_rental"; - String SHARE_BASE_GRID = "Wgh_base_grid"; + String SHARE_BASE_GRID = "wgh_base_grid"; String SHARE_WGH_SUB = "wgh_subdistrict_office"; - String SHARE_BM_GRID = "wgh_bm_grid"; + String SHARE_BM_GRID = "ca_bm_grid"; String SHARE_COMMUNITY = "wgh_community"; String SHARE_WGH_DYWG = "wgh_dywg"; String SHARE_WGH_JDB = "wgh_jdb"; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghBaseGridController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghBaseGridController.java index dc990c7324..d537ae63e9 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghBaseGridController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghBaseGridController.java @@ -86,7 +86,7 @@ public class WghBaseGridController { * @author LZN * @date 2022/6/14 13:40 */ - @PostMapping("preserBaseGridVation") + @PostMapping("/preserBaseGridVation") public Result getPreserLouDongVation(@RequestBody PreserVationFormDTO dto) { basegridService.preserBaseGridVation(dto); return new Result(); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghBmGridController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/caBmGridController.java similarity index 91% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghBmGridController.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/caBmGridController.java index c4d6c0773a..6c344bc523 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/WghBmGridController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/caBmGridController.java @@ -12,9 +12,9 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.BmGridDTO; -import com.epmet.opendata.excel.WghBmGridExcel; -import com.epmet.opendata.service.WghBmGridService; +import com.epmet.opendata.excel.caBmGridExcel; +import com.epmet.opendata.service.caBmGridService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -31,10 +31,10 @@ import java.util.Map; */ @RestController @RequestMapping("bmGrid") -public class WghBmGridController { +public class caBmGridController { @Autowired - private WghBmGridService bmGridService; + private caBmGridService bmGridService; @RequestMapping("page") public Result> page(@RequestParam Map params){ @@ -77,7 +77,7 @@ public class WghBmGridController { @GetMapping("export") public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { List list = bmGridService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, WghBmGridExcel.class); + ExcelUtils.exportExcelToTarget(response, null, list, caBmGridExcel.class); } /** diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghBmGridDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/caBmGridDao.java similarity index 68% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghBmGridDao.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/caBmGridDao.java index f41a557914..b9a1ca4e5b 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/WghBmGridDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/caBmGridDao.java @@ -3,7 +3,7 @@ package com.epmet.opendata.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.opendata.entity.WghBmGridEntity; +import com.epmet.opendata.entity.caBmGridEntity; import org.apache.ibatis.annotations.Mapper; /** @@ -13,7 +13,7 @@ import org.apache.ibatis.annotations.Mapper; * @since v1.0.0 2022-06-14 */ @Mapper -public interface WghBmGridDao extends BaseDao { +public interface caBmGridDao extends BaseDao { int deleteAll(); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghBaseGridEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghBaseGridEntity.java index 060a64e921..0a4d1ff91c 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghBaseGridEntity.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghBaseGridEntity.java @@ -16,7 +16,7 @@ import java.util.Date; */ @Data @EqualsAndHashCode(callSuper=false) -@TableName("basegrid") +@TableName("wgh_base_grid") public class WghBaseGridEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghCommunityEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghCommunityEntity.java index f2e8a2a9c6..cafd34e05c 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghCommunityEntity.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghCommunityEntity.java @@ -16,7 +16,7 @@ import java.util.Date; */ @Data @EqualsAndHashCode(callSuper=false) -@TableName("community") +@TableName("wgh_community") public class WghCommunityEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJdbEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJdbEntity.java index 6dd4cab773..b02d41dd5c 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJdbEntity.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghJdbEntity.java @@ -24,7 +24,7 @@ public class WghJdbEntity { /** * */ - private String objectid1; + private String objectid_1; /** * diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSjxxbEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSjxxbEntity.java index ea97c3cefe..2e443c2205 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSjxxbEntity.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSjxxbEntity.java @@ -24,7 +24,7 @@ public class WghSjxxbEntity { /** * */ - private Integer objectid1; + private Integer objectid_1; /** * diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSubdistrictOfficeEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSubdistrictOfficeEntity.java index f9d249ecf7..fa133bc1fb 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSubdistrictOfficeEntity.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghSubdistrictOfficeEntity.java @@ -16,7 +16,7 @@ import java.util.Date; */ @Data @EqualsAndHashCode(callSuper=false) -@TableName("subdistrict_office") +@TableName("wgh_subdistrict_office") public class WghSubdistrictOfficeEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghBmGridEntity.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/caBmGridEntity.java similarity index 98% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghBmGridEntity.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/caBmGridEntity.java index 157a526928..f287d88494 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/WghBmGridEntity.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/entity/caBmGridEntity.java @@ -16,8 +16,8 @@ import java.util.Date; */ @Data @EqualsAndHashCode(callSuper=false) -@TableName("bm_grid") -public class WghBmGridEntity { +@TableName("ca_bm_grid") +public class caBmGridEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghBmGridExcel.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/caBmGridExcel.java similarity index 99% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghBmGridExcel.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/caBmGridExcel.java index 7703a171df..21ee4853dd 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/WghBmGridExcel.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/excel/caBmGridExcel.java @@ -12,7 +12,7 @@ import java.util.Date; * @since v1.0.0 2022-06-14 */ @Data -public class WghBmGridExcel { +public class caBmGridExcel { @Excel(name = "网格ID") private Long gridId; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghBmGridService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/caBmGridService.java similarity index 93% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghBmGridService.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/caBmGridService.java index 164506d33a..0d559be42c 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/WghBmGridService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/caBmGridService.java @@ -4,7 +4,7 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.BmGridDTO; -import com.epmet.opendata.entity.WghBmGridEntity; +import com.epmet.opendata.entity.caBmGridEntity; import java.util.List; @@ -16,7 +16,7 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2022-06-14 */ -public interface WghBmGridService extends BaseService { +public interface caBmGridService extends BaseService { /** * 默认分页 diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghBmGridServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaBmGridServiceImpl.java similarity index 78% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghBmGridServiceImpl.java rename to epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaBmGridServiceImpl.java index 622f59da1a..ad44a7dda5 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghBmGridServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaBmGridServiceImpl.java @@ -11,14 +11,16 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.HttpClientManager; import com.epmet.commons.tools.utils.Result; -import com.epmet.opendata.dao.WghBmGridDao; + +import com.epmet.opendata.dao.caBmGridDao; import com.epmet.opendata.dto.constant.CaWghDataConstant; import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.wgh.BmGridDTO; -import com.epmet.opendata.entity.WghBmGridEntity; + +import com.epmet.opendata.entity.caBmGridEntity; import com.epmet.opendata.redis.BmGridRedis; -import com.epmet.opendata.service.WghBmGridService; +import com.epmet.opendata.service.caBmGridService; import com.epmet.opendata.util.AesUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -36,14 +38,14 @@ import java.util.Map; * @since v1.0.0 2022-06-14 */ @Service -public class WghBmGridServiceImpl extends BaseServiceImpl implements WghBmGridService { +public class CaBmGridServiceImpl extends BaseServiceImpl implements caBmGridService { @Autowired private BmGridRedis bmGridRedis; @Override public PageData page(Map params) { - IPage page = baseDao.selectPage( + IPage page = baseDao.selectPage( getPage(params, FieldConstant.CREATED_TIME, false), getWrapper(params) ); @@ -52,15 +54,15 @@ public class WghBmGridServiceImpl extends BaseServiceImpl list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); + List entityList = baseDao.selectList(getWrapper(params)); return ConvertUtils.sourceToTarget(entityList, BmGridDTO.class); } - private QueryWrapper getWrapper(Map params){ + private QueryWrapper getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); - QueryWrapper wrapper = new QueryWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); return wrapper; @@ -68,21 +70,21 @@ public class WghBmGridServiceImpl extends BaseServiceImpl= 0) { dto.setPageNo(NumConstant.ONE); dto.setPageSize(NumConstant.FIFTY); - dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); + dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM); dto.setTableName(CaWghDataConstant.SHARE_BM_GRID); dto.setWhereCase("delete_flag = 'normal'"); - dto.setOrderBy("grid_id,parent_id,create_date"); + dto.setOrderBy("grid_id"); int pageNo = 1; @@ -132,8 +134,8 @@ public class WghBmGridServiceImpl extends BaseServiceImpl list; + private List list; public int getTotal() { return total; @@ -157,11 +159,11 @@ public class WghBmGridServiceImpl extends BaseServiceImpl getList() { + public List getList() { return list; } - public void setList(List list) { + public void setList(List list) { this.list = list; } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java index 65f83e02a7..d819c24758 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java @@ -30,7 +30,7 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { private WghBaseGridService basegridService; @Autowired - private WghBmGridService bmGridService; + private caBmGridService bmGridService; @Autowired private WghCommunityService communityService; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghBaseGridServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghBaseGridServiceImpl.java index b799f6cec9..e3105dab2e 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghBaseGridServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghBaseGridServiceImpl.java @@ -108,7 +108,7 @@ public class WghBaseGridServiceImpl extends BaseServiceImpl dto.setTableName(CaWghDataConstant.SHARE_WGH_JQZ); dto.setWhereCase("1=1"); - dto.setOrderBy(""); + dto.setOrderBy("OBJECTID"); int pageNo = 1; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSubdistrictOfficeServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSubdistrictOfficeServiceImpl.java index 2cccafee16..8425427509 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSubdistrictOfficeServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSubdistrictOfficeServiceImpl.java @@ -103,7 +103,7 @@ public class WghSubdistrictOfficeServiceImpl extends BaseServiceImpl - delete from wgh_sjxx + delete from wgh_sjxxb diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghBmGridDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/caBmGridDao.xml similarity index 69% rename from epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghBmGridDao.xml rename to epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/caBmGridDao.xml index bc8c5b7f7e..a87a72b682 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/WghBmGridDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/caBmGridDao.xml @@ -1,11 +1,11 @@ - + - delete from wgh_bm_grid + delete from ca_bm_grid From 21b15c0a57e9a5ff9bbf72cf1190cac130466f36 Mon Sep 17 00:00:00 2001 From: HAHA Date: Wed, 15 Jun 2022 15:02:55 +0800 Subject: [PATCH 20/58] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=EF=BC=8C=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E6=A5=BC=E6=A0=8B=E6=9E=84=E9=80=A0=E6=A0=91=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/utils/LouDongTreeNodeUtils.java | 34 +++++++ .../commons/tools/utils/LoudongTreeNode.java | 48 ++++++++++ .../opendata/dto/form/CaLoudongFormDTO.java | 5 + .../opendata/dto/form/CaPingfangFormDTO.java | 5 + .../opendata/dto/form/CaRentalFormtDTO.java | 5 + .../opendata/dto/form/CaResidentFormDTO.java | 5 + .../opendata/dto/form/CaRotatorsFormDTO.java | 5 + .../dto/result/LouDongCascadeResultDTO.java | 28 ++++++ .../controller/CaLoudongController.java | 15 +++ .../com/epmet/opendata/dao/CaLoudongDao.java | 7 +- .../com/epmet/opendata/dao/CaPingfangDao.java | 3 +- .../com/epmet/opendata/dao/CaRentalDao.java | 3 +- .../com/epmet/opendata/dao/CaResidentDao.java | 3 +- .../com/epmet/opendata/dao/CaRotatorsDao.java | 3 +- .../opendata/service/CaLoudongService.java | 13 ++- .../service/impl/CaLoudongServiceImpl.java | 20 +++- .../service/impl/CaPingfangServiceImpl.java | 2 +- .../service/impl/CaRentalServiceImpl.java | 3 +- .../service/impl/CaResidentServiceImpl.java | 3 +- .../service/impl/CaRotatorsServiceImpl.java | 3 +- .../main/resources/mapper/CaLoudongDao.xml | 83 +++++++++------- .../main/resources/mapper/CaPingfangDao.xml | 71 +++++++------- .../src/main/resources/mapper/CaRentalDao.xml | 65 +++++++------ .../main/resources/mapper/CaResidentDao.xml | 93 +++++++++--------- .../main/resources/mapper/CaRotatorsDao.xml | 95 ++++++++++--------- 25 files changed, 426 insertions(+), 194 deletions(-) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/LouDongTreeNodeUtils.java create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/LoudongTreeNode.java create mode 100644 epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/LouDongCascadeResultDTO.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/LouDongTreeNodeUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/LouDongTreeNodeUtils.java new file mode 100644 index 0000000000..3c92b6865b --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/LouDongTreeNodeUtils.java @@ -0,0 +1,34 @@ +package com.epmet.commons.tools.utils; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +public class LouDongTreeNodeUtils { + + /** + * 构建树节点 + */ + public static List build(List treeNodes) { + List result = new ArrayList<>(); + + //list转map + Map nodeMap = new LinkedHashMap<>(treeNodes.size()); + for(T treeNode : treeNodes){ + nodeMap.put(treeNode.getId(), treeNode); + } + + for(T node : nodeMap.values()) { + T parent = nodeMap.get(node.getPid()); + if(parent != null && !(node.getId().equals(parent.getId()))){ + parent.getChildren().add(node); + continue; + } + + result.add(node); + } + + return result; + } +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/LoudongTreeNode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/LoudongTreeNode.java new file mode 100644 index 0000000000..f25d7638a5 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/LoudongTreeNode.java @@ -0,0 +1,48 @@ +package com.epmet.commons.tools.utils; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +public class LoudongTreeNode implements Serializable { + + private static final long serialVersionUID = 1L; + /** + * 主键 + */ + private Long id; + /** + * 上级ID + */ + private String pid; + /** + * 子节点列表 + */ + private List children = new ArrayList<>(); + + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + + public List getChildren() { + return children; + } + + public void setChildren(List children) { + this.children = children; + } +} diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaLoudongFormDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaLoudongFormDTO.java index 0822a5fcf1..4bc0cec51d 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaLoudongFormDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaLoudongFormDTO.java @@ -20,6 +20,11 @@ public class CaLoudongFormDTO implements Serializable { */ private String buildingName; + /** + * 网格id + */ + private String gridId; + private Integer page; private Integer limit; diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaPingfangFormDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaPingfangFormDTO.java index f6388581f1..e98bf07580 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaPingfangFormDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaPingfangFormDTO.java @@ -19,6 +19,11 @@ public class CaPingfangFormDTO implements Serializable { */ private String communityName; + /** + * 网格id + */ + private String gridId; + private Integer page; private Integer limit; diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRentalFormtDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRentalFormtDTO.java index e268304026..dab0b4611a 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRentalFormtDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRentalFormtDTO.java @@ -19,6 +19,11 @@ public class CaRentalFormtDTO implements Serializable { */ private String houseName; + /** + * 网格id + */ + private String gridId; + /** * 承租人姓名 */ diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaResidentFormDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaResidentFormDTO.java index dc7972f46c..d2303ff5e9 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaResidentFormDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaResidentFormDTO.java @@ -28,4 +28,9 @@ public class CaResidentFormDTO implements Serializable { */ private String telephone; + /** + * 网格id + */ + private String gridId; + } diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRotatorsFormDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRotatorsFormDTO.java index 322c9783b3..664e6f4c2f 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRotatorsFormDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/CaRotatorsFormDTO.java @@ -25,6 +25,11 @@ public class CaRotatorsFormDTO implements Serializable { */ private String telephone; + /** + * 网格id + */ + private String gridId; + private Integer page; private Integer limit; } diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/LouDongCascadeResultDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/LouDongCascadeResultDTO.java new file mode 100644 index 0000000000..e38b852cc8 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/LouDongCascadeResultDTO.java @@ -0,0 +1,28 @@ +package com.epmet.opendata.dto.result; + +import com.epmet.commons.tools.utils.LoudongTreeNode; +import com.epmet.commons.tools.utils.TreeNode; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class LouDongCascadeResultDTO extends LoudongTreeNode implements Serializable { + + private static final long serialVersionUID = -359443782589013555L; + + private String gridId; + + private String gridName; + + private String communityId; + + private String communityName; + + private String streetId; + + private String streetName; + + private String pid; + +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaLoudongController.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaLoudongController.java index c349b17ae0..70b62c5738 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaLoudongController.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/controller/CaLoudongController.java @@ -17,6 +17,7 @@ import com.epmet.opendata.dto.form.CaLoudongFormDTO; import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.result.CaLoudongDetailsResultDTO; import com.epmet.opendata.dto.result.CaLoudongResultDTO; +import com.epmet.opendata.dto.result.LouDongCascadeResultDTO; import com.epmet.opendata.excel.CaLoudongExcel; import com.epmet.opendata.service.CaLoudongService; import org.springframework.beans.factory.annotation.Autowired; @@ -128,4 +129,18 @@ public class CaLoudongController { return new Result(); } + /** + * 获取级联菜单 + * + * @param + * @return com.epmet.commons.tools.utils.Result + * @author LZN + * @date 2022/6/15 14:01 + */ + @PostMapping("getLouDongCascade") + public Result getLouDongCascade(){ + List dto = caLoudongService.getLouDongCascade(); + return new Result().ok(dto); + } + } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java index d5d87db881..57286319a0 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaLoudongDao.java @@ -5,6 +5,7 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.opendata.dto.ca.CaLoudongDTO; import com.epmet.opendata.dto.result.CaLoudongDetailsResultDTO; import com.epmet.opendata.dto.result.CaLoudongResultDTO; +import com.epmet.opendata.dto.result.LouDongCascadeResultDTO; import com.epmet.opendata.entity.CaLoudongEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -32,7 +33,8 @@ public interface CaLoudongDao extends BaseDao { * @date 2022/5/31 18:57 */ List getPage(@Param("communityName") String communityName, - @Param("buildingName") String buildingName); + @Param("buildingName") String buildingName, + @Param("gridId") String gridId); /** * 楼栋基本信息详情 @@ -43,4 +45,7 @@ public interface CaLoudongDao extends BaseDao { CaLoudongDetailsResultDTO getLouDongDetails(@Param("buildingId") BigInteger buildingId); int deleteAll(); + + List getLouDongCascade(); } + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaPingfangDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaPingfangDao.java index ad48accf01..28675c6bb2 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaPingfangDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaPingfangDao.java @@ -23,7 +23,8 @@ public interface CaPingfangDao extends BaseDao { * @return */ List getPage(@Param("buildingName") String buildingName, - @Param("communityName") String communityName); + @Param("communityName") String communityName, + @Param("gridId") String gridId); int deleteAll(); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRentalDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRentalDao.java index 67ecfe2cbd..4b1460a9ea 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRentalDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRentalDao.java @@ -28,7 +28,8 @@ public interface CaRentalDao extends BaseDao { */ List getPage(@Param("residentName") String residentName, @Param("houseName") String houseName, - @Param("renterName") String renterName); + @Param("renterName") String renterName, + @Param("gridId") String gridId); int deleteAll(); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaResidentDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaResidentDao.java index 5c83b1e4d0..3f907c76e2 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaResidentDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaResidentDao.java @@ -27,7 +27,8 @@ public interface CaResidentDao extends BaseDao { */ List getPage(@Param("residentName") String residentName, @Param("idCard") String idCard, - @Param("telephone") String telephone); + @Param("telephone") String telephone, + @Param("gridId") String gridId); int deleteAll(); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRotatorsDao.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRotatorsDao.java index 8a8787171d..ade7309eaa 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRotatorsDao.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/dao/CaRotatorsDao.java @@ -28,7 +28,8 @@ public interface CaRotatorsDao extends BaseDao { */ List getPage(@Param("rotatorsName") String rotatorsName, @Param("idCard") String idCard, - @Param("telephone") String telephone); + @Param("telephone") String telephone, + @Param("gridId") String gridId); int deleteAll(); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaLoudongService.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaLoudongService.java index 19a067ebe6..ef432c4e68 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaLoudongService.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/CaLoudongService.java @@ -9,6 +9,7 @@ import com.epmet.opendata.dto.form.CaLoudongFormDTO; import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.result.CaLoudongDetailsResultDTO; import com.epmet.opendata.dto.result.CaLoudongResultDTO; +import com.epmet.opendata.dto.result.LouDongCascadeResultDTO; import com.epmet.opendata.entity.CaLoudongEntity; @@ -107,4 +108,14 @@ public interface CaLoudongService extends BaseService { * @param dto */ void preserLouDongVation(PreserVationFormDTO dto); -} \ No newline at end of file + + /** + * 获取级联菜单 + * + * @param + * @return java.util.List + * @author LZN + * @date 2022/6/15 14:01 + */ + List getLouDongCascade(); +} diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java index a5e55fa6c6..77116d369d 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java @@ -7,9 +7,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.HttpClientManager; -import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.*; import com.epmet.opendata.dao.CaLoudongDao; import com.epmet.opendata.dto.ca.CaLoudongDTO; import com.epmet.opendata.dto.constant.CaWghDataConstant; @@ -18,6 +16,7 @@ import com.epmet.opendata.dto.form.CaLoudongFormDTO; import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.dto.result.CaLoudongDetailsResultDTO; import com.epmet.opendata.dto.result.CaLoudongResultDTO; +import com.epmet.opendata.dto.result.LouDongCascadeResultDTO; import com.epmet.opendata.entity.CaLoudongEntity; import com.epmet.opendata.redis.CaLoudongRedis; import com.epmet.opendata.service.CaLoudongService; @@ -106,7 +105,7 @@ public class CaLoudongServiceImpl extends BaseServiceImpl getPage(CaLoudongFormDTO dto) { PageHelper.startPage(dto.getPage(), dto.getLimit()); - List result = baseDao.getPage(dto.getCommunityName(), dto.getBuildingName()); + List result = baseDao.getPage(dto.getCommunityName(), dto.getBuildingName(),dto.getGridId()); PageInfo info = new PageInfo<>(result); return new PageData<>(result, info.getTotal()); } @@ -162,6 +161,19 @@ public class CaLoudongServiceImpl extends BaseServiceImpl + * @author LZN + * @date 2022/6/15 14:01 + */ + @Override + public List getLouDongCascade() { + List list = baseDao.getLouDongCascade(); + return LouDongTreeNodeUtils.build(list); + } private int listLouDong(PreserVationFormDTO dto) throws Exception { String aes = AesUtils.encryptByAES(JSONObject.toJSONString(dto), CaWghDataConstant.AESKEY); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java index dcb8823872..c548a634c8 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java @@ -99,7 +99,7 @@ public class CaPingfangServiceImpl extends BaseServiceImpl result = baseDao.getPage(dto.getBuildingName(), dto.getCommunityName()); + List result = baseDao.getPage(dto.getBuildingName(), dto.getCommunityName(),dto.getGridId()); PageInfo info = new PageInfo<>(result); return new PageData<>(result, info.getTotal()); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java index 7104457494..88066c6233 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java @@ -104,7 +104,8 @@ public class CaRentalServiceImpl extends BaseServiceImpl result = baseDao.getPage(dto.getResidentName(), dto.getHouseName(), - dto.getRenterName()); + dto.getRenterName(), + dto.getGridId()); PageInfo info = new PageInfo<>(result); return new PageData<>(result, info.getTotal()); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java index 8a6648b5fc..740375cf83 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java @@ -107,7 +107,8 @@ public class CaResidentServiceImpl extends BaseServiceImpl result = baseDao.getPage(dto.getResidentName(), dto.getIdCard(), - dto.getTelephone()); + dto.getTelephone(), + dto.getGridId()); PageInfo info = new PageInfo<>(result); return new PageData<>(result, info.getTotal()); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java index 1007be5e6c..3af2fd8013 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java @@ -107,7 +107,8 @@ public class CaRotatorsServiceImpl extends BaseServiceImpl result = baseDao.getPage(dto.getRotatorsName(), dto.getIdCard(), - dto.getTelephone()); + dto.getTelephone(), + dto.getGridId()); PageInfo info = new PageInfo<>(result); return new PageData<>(result, info.getTotal()); } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml index a29a8929a0..a6f1765830 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml @@ -56,45 +56,52 @@ + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml index 99c8195b49..102983e37c 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml @@ -53,45 +53,52 @@ SELECT - rental_id, - grid_id, - house_id, - house_name, - house_address, - house_use, - house_area, - id_type, - id_card, - resident_name, - telephone, - curlive_address, - rent_use, - trouble_type, - renter_id, - renter_card_number, - renter_card_type, - renter_name, - renter_phone, - longitude, - latitude, - point_status, - plat_code + ca.rental_id, + ca.grid_id, + ca.house_id, + ca.house_name, + ca.house_address, + ca.house_use, + ca.house_area, + ca.id_type, + ca.id_card, + ca.resident_name, + ca.telephone, + ca.curlive_address, + ca.rent_use, + ca.trouble_type, + ca.renter_id, + ca.renter_card_number, + ca.renter_card_type, + ca.renter_name, + ca.renter_phone, + ca.longitude, + ca.latitude, + ca.point_status, + ca.plat_code, + vs.grid_name, + vs.community_name, + vs.street_name FROM - ca_rental + ca_rental as ca + left join view_grid_comm_street as vs on ca.grid_id = vs.grid_id - delete_flag = 'normal' + ca.delete_flag = 'normal' - AND resident_name like '%${residentName}%' + AND ca.resident_name like '%${residentName}%' - AND house_name like '%${houseName}%' + AND ca.house_name like '%${houseName}%' - AND renter_name like '%${renterName}%' + AND ca.renter_name like '%${renterName}%' + + + AND vs.grid_id_path like '%${gridId}%' - order by grid_id,rental_id,id_card desc + order by ca.grid_id,ca.rental_id,ca.id_card desc SELECT - resident_id, - grid_id, - resident_property, - resident_type, - id_type, - id_card, - resident_name, - sex, - birthday, - nation, - telephone, - household_prov, - household_city, - household_county, - household_town, - household_village, - household_address_detail, - curlive_prov, - curlive_city, - curlive_county, - curlive_town, - curlive_village, - curlive_address_detail, - native_address_prov, - native_address_city, - native_address_county, - former_name, - education, - occupation, - occupation_type, - service_address, - marriage_status, - party, - religious, - conversion_state, - nationality, - plat_code + ca.resident_id, + ca.grid_id, + ca.resident_property, + ca.resident_type, + ca.id_type, + ca.id_card, + ca.resident_name, + ca.sex, + ca.birthday, + ca.nation, + ca.telephone, + ca.household_prov, + ca.household_city, + ca.household_county, + ca.household_town, + ca.household_village, + ca.household_address_detail, + ca.curlive_prov, + ca.curlive_city, + ca.curlive_county, + ca.curlive_town, + ca.curlive_village, + ca.curlive_address_detail, + ca.native_address_prov, + ca.native_address_city, + ca.native_address_county, + ca.former_name, + ca.education, + ca.occupation, + ca.occupation_type, + ca.service_address, + ca.marriage_status, + ca.party, + ca.religious, + ca.conversion_state, + ca.nationality, + ca.plat_code, + vs.grid_name, + vs.community_name, + vs.street_name FROM - ca_resident + ca_resident as ca + left join view_grid_comm_street as vs on ca.grid_id = vs.grid_id - delete_flag = 'normal' + ca.delete_flag = 'normal' - AND resident_name like '%${residentName}%' + AND ca.resident_name like '%${residentName}%' - AND id_card like '%${idCard}%' + AND ca.id_card like '%${idCard}%' - AND telephone like '%${telephone}%' + AND ca.telephone like '%${telephone}%' + + + AND vs.grid_id_path like '%${gridId}%' - order by grid_id,resident_id,id_card desc + order by ca.grid_id,ca.resident_id,ca.id_card desc SELECT - rotators_id, - id_card, - id_type, - rotators_name, - former_name, - sex, - birthday, - nation, - native_address_prov, - native_address_city, - native_address_country, - marriage_status, - party, - education, - religious, - occupation_type, - occupation, - service_address, - telephone, - household_address_prov, - household_address_city, - household_address_country, - household_address_town, - household_address_village, - household_address_detail, - curlive_address_prov, - curlive_address_city, - curlive_address_country, - curlive_address_town, - curlive_address_village, - curlive_address_detail, - inflow_reason, - certificate_type, - certificate_number, - sign_date, - end_date, - residence_type, - is_focus_person + ca.rotators_id, + ca.id_card, + ca.id_type, + ca.rotators_name, + ca.former_name, + ca.sex, + ca.birthday, + ca.nation, + ca.native_address_prov, + ca.native_address_city, + ca.native_address_country, + ca.marriage_status, + ca.party, + ca.education, + ca.religious, + ca.occupation_type, + ca.occupation, + ca.service_address, + ca.telephone, + ca.household_address_prov, + ca.household_address_city, + ca.household_address_country, + ca.household_address_town, + ca.household_address_village, + ca.household_address_detail, + ca.curlive_address_prov, + ca.curlive_address_city, + ca.curlive_address_country, + ca.curlive_address_town, + ca.curlive_address_village, + ca.curlive_address_detail, + ca.inflow_reason, + ca.certificate_type, + ca.certificate_number, + ca.sign_date, + ca.end_date, + ca.residence_type, + ca.is_focus_person, + vs.grid_name, + vs.community_name, + vs.street_name FROM - ca_rotators + ca_rotators as ca + left join view_grid_comm_street as vs on vs.grid_id = ca.grid_id - delete_flag = 'normal' + ca.delete_flag = 'normal' - AND rotators_name like '%${rotatorsName}%' + AND ca.rotators_name like '%${rotatorsName}%' - AND id_card like '%${idCard}%' + AND ca.id_card like '%${idCard}%' - AND telephone like '%${telephone}%' + AND ca.telephone like '%${telephone}%' + + + AND vs.grid_id_path like '%${gridId}%' - order by grid_id,rotators_id,id_card desc + order by ca.grid_id,ca.rotators_id,ca.id_card desc From 9d9260c4869eb74562d9ef507f07ceaa9e66f83c Mon Sep 17 00:00:00 2001 From: HAHA Date: Wed, 15 Jun 2022 18:04:52 +0800 Subject: [PATCH 22/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/CaLoudongDao.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml index 57f4c256c0..0ecbc89c1c 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml @@ -122,7 +122,9 @@ ca.grid_name as label, ca.parent_id as pid FROM - ca_bm_grid ca + ca_bm_grid ca + WHERE + ca.grid_level IN ('level2','level3','level4') From 9d2acc102cd0c8e1d5ee1c1a3a98067afe5259f7 Mon Sep 17 00:00:00 2001 From: HAHA Date: Thu, 16 Jun 2022 10:04:32 +0800 Subject: [PATCH 23/58] =?UTF-8?q?flyway=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.4__create_wgh_table.sql | 324 ++++++++++++++++++ 1 file changed, 324 insertions(+) create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.4__create_wgh_table.sql diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.4__create_wgh_table.sql b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.4__create_wgh_table.sql new file mode 100644 index 0000000000..d63a579232 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.4__create_wgh_table.sql @@ -0,0 +1,324 @@ +CREATE TABLE `ca_bm_grid` ( + `grid_id` bigint(20) NOT NULL COMMENT '网格ID', + `grid_code` varchar(50) COLLATE utf8_bin NOT NULL COMMENT '网格编码。人工填写，编码规则业务规定，不允许重复。', + `grid_name` varchar(200) COLLATE utf8_bin NOT NULL COMMENT '网格名称', + `gb_code` varchar(50) COLLATE utf8_bin DEFAULT NULL COMMENT '行政区划的国标编码', + `parent_id` bigint(20) DEFAULT NULL COMMENT '上级网格ID', + `parent_code` varchar(50) COLLATE utf8_bin DEFAULT NULL COMMENT '上级网格编码', + `grid_classification` varchar(10) COLLATE utf8_bin NOT NULL COMMENT '网格分类。1基础网格 2环保网格 3防火网格 4城管网格 5执法网格 6安监网格等', + `grid_level` varchar(10) COLLATE utf8_bin NOT NULL COMMENT '网格层级。网格层级表的层级\n根据【网格层级表】的层级关系动态展示。\n查询【网格层级表】层级 条件：上层级=网格树返回的网格层级', + `grid_property` varchar(10) COLLATE utf8_bin DEFAULT NULL COMMENT '网格属性。01村庄、02小区、03企业、04学校（幼儿园）、05医院、06驻镇（街）单位、07其他', + `is_end` char(1) COLLATE utf8_bin NOT NULL COMMENT '是否最后一级:0否 1是', + `grid_address` varchar(200) COLLATE utf8_bin DEFAULT NULL COMMENT '网格地址', + `grid_introduce` varchar(1024) COLLATE utf8_bin DEFAULT NULL COMMENT '网格介绍', + `grid_picture` varchar(240) COLLATE utf8_bin DEFAULT NULL COMMENT '宣传图片', + `regin_scope_desc` varchar(1024) COLLATE utf8_bin DEFAULT NULL COMMENT '地图区域范围', + `grid_sort` int(10) DEFAULT NULL COMMENT '展示顺序', + `point_status` varchar(10) COLLATE utf8_bin NOT NULL COMMENT '标绘状态', + `grid_em_center` bigint(10) DEFAULT NULL COMMENT '事件上报中心', + `grid_begin_time` datetime DEFAULT NULL COMMENT '初始日期', + `grid_end_time` datetime DEFAULT NULL COMMENT '终止日期', + `grid_area` varchar(240) COLLATE utf8_bin DEFAULT NULL COMMENT '面积', + `is_valid` varchar(10) COLLATE utf8_bin DEFAULT '1' COMMENT '是否有效', + `create_by` bigint(20) NOT NULL COMMENT '创建人', + `create_date` datetime NOT NULL COMMENT '创建时间', + `update_by` bigint(20) NOT NULL, + `update_date` datetime NOT NULL, + `delete_flag` varchar(10) COLLATE utf8_bin NOT NULL DEFAULT 'normal' COMMENT '删除状态: 字典值：normal正常，删除deleted', + `versions` int(10) DEFAULT '1' COMMENT '乐观锁', + `attribute1` varchar(240) COLLATE utf8_bin DEFAULT NULL COMMENT '网格内人口规模', + `attribute2` varchar(240) COLLATE utf8_bin DEFAULT NULL COMMENT '是否成立网格党支部或网格党小组', + `attribute3` varchar(240) COLLATE utf8_bin DEFAULT NULL COMMENT '网格党组织类型', + `attribute4` varchar(240) COLLATE utf8_bin DEFAULT NULL COMMENT '党组织编码', + `attribute5` varchar(240) COLLATE utf8_bin DEFAULT NULL COMMENT '扩展字段', + `attribute6` bigint(20) DEFAULT NULL COMMENT '扩展字段', + `attribute7` bigint(20) DEFAULT NULL COMMENT '扩展字段', + `attribute8` bigint(20) DEFAULT NULL COMMENT '扩展字段', + `attribute9` datetime DEFAULT NULL COMMENT '扩展字段', + `attribute10` datetime DEFAULT NULL COMMENT '扩展字段', + PRIMARY KEY (`grid_id`) USING BTREE, + KEY `SELECT_PARENT` (`parent_id`) USING BTREE, + KEY `idx_grid_grid_id` (`grid_id`) USING BTREE, + KEY `idx_grid_grid_sort` (`grid_sort`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; + +CREATE TABLE `wgh_base_grid` ( + `coordinate_info` text, + `grid_name` varchar(100) DEFAULT NULL, + `sub_district_office` varchar(100) DEFAULT NULL, + `community` varchar(100) DEFAULT NULL, + `street_code` varchar(100) DEFAULT NULL, + `grid_code` varchar(100) DEFAULT NULL, + `community_code` varchar(100) DEFAULT NULL, + `longitude` varchar(100) DEFAULT NULL, + `latitude` varchar(100) DEFAULT NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +CREATE TABLE `wgh_community` ( + `coordinate_info` text, + `street_name` varchar(100) DEFAULT NULL, + `street_code` varchar(100) DEFAULT NULL, + `community_name` varchar(100) DEFAULT NULL, + `community_code` varchar(100) DEFAULT NULL, + `longitude` varchar(100) DEFAULT NULL, + `latitude` varchar(100) DEFAULT NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +CREATE TABLE `wgh_dywg` ( + `OBJECTID` int(11) NOT NULL, + `BGNAME` varchar(200) DEFAULT NULL COMMENT '网格名称', + `STREET` varchar(20) DEFAULT NULL COMMENT '所属街镇', + `COMMUNITY` varchar(50) DEFAULT NULL COMMENT '所属社区', + `BGSQUA` double DEFAULT NULL COMMENT '网格面积', + `ORDATE` datetime DEFAULT NULL COMMENT '初始时间', + `CHDATE` datetime DEFAULT NULL COMMENT '变更时间', + `NOTE` varchar(500) DEFAULT NULL COMMENT '备注', + `CONTACTS` varchar(50) DEFAULT NULL, + `TELPHONE` varchar(100) DEFAULT NULL COMMENT '联系电话', + `insert_time` datetime DEFAULT NULL COMMENT '插入日期' +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='单元网格'; + +CREATE TABLE `wgh_jdb` ( + `OBJECTID_1` varchar(50) DEFAULT NULL, + `OBJECTID` varchar(50) DEFAULT NULL, + `MC` varchar(60) DEFAULT NULL COMMENT '街道名称', + `person_in_charge` varchar(20) DEFAULT NULL COMMENT '责任人', + `phone` varchar(50) DEFAULT NULL COMMENT '联系电话', + `SHAPE_LENG` double DEFAULT NULL, + `insert_time` datetime DEFAULT NULL COMMENT '插入日期' +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='街道办'; + +CREATE TABLE `wgh_jqz` ( + `OBJECTID` int(11) DEFAULT NULL, + `XH` varchar(500) DEFAULT NULL COMMENT '序号', + `NAME` varchar(500) DEFAULT NULL COMMENT '单位名称', + `AREA` double DEFAULT NULL, + `SPACE` varchar(500) DEFAULT NULL COMMENT '周边安全间距', + `PROBLEM` varchar(500) DEFAULT NULL COMMENT '存在问题', + `TYPE` varchar(500) DEFAULT NULL COMMENT '危险源类型', + `LOCATION` varchar(500) DEFAULT NULL COMMENT '经营地址', + `PRINCIPAL` varchar(500) DEFAULT NULL COMMENT '负责人', + `PHONE` varchar(500) DEFAULT NULL COMMENT '联系电话', + `QTYPE` varchar(500) DEFAULT NULL COMMENT '企业类型', + `WTYPE` varchar(500) DEFAULT NULL COMMENT '危化品种类', + `level` varchar(500) DEFAULT NULL COMMENT '等级', + `nature` varchar(500) DEFAULT NULL COMMENT '性质', + `remarks` varchar(500) DEFAULT NULL COMMENT '备注', + `DWMCJC` varchar(50) DEFAULT NULL, + `LAYER` varchar(50) DEFAULT NULL, + `SSJDB` varchar(50) DEFAULT NULL, + `AMOUNT` varchar(50) DEFAULT NULL COMMENT '数量', + `YJCS` varchar(100) DEFAULT NULL COMMENT '应急措施', + `insert_time` datetime DEFAULT NULL COMMENT '插入日期' +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='加气站信息'; + +CREATE TABLE `wgh_jxcs` ( + `OBJECTID` varchar(255) DEFAULT NULL, + `JSON_INFO` varchar(255) DEFAULT NULL, + `CREAT_TIME` varchar(255) DEFAULT NULL, + `SSJD` varchar(255) DEFAULT NULL COMMENT '所属街道', + `SSSQ` varchar(255) DEFAULT NULL COMMENT '所属社区', + `DLM` varchar(255) DEFAULT NULL COMMENT '道路名', + `MPH` varchar(255) DEFAULT NULL COMMENT '门牌号', + `NAME` varchar(255) DEFAULT NULL COMMENT '名称', + `ZTLX` varchar(255) DEFAULT NULL, + `TYPE` varchar(255) DEFAULT NULL COMMENT '子类型', + `XYDM` varchar(255) DEFAULT NULL COMMENT '统一社会信用代码', + `LXR` varchar(255) DEFAULT NULL COMMENT '联系人', + `LXDH` varchar(255) DEFAULT NULL COMMENT '联系电话', + `USER_NAME` varchar(255) DEFAULT NULL, + `BZ` varchar(255) DEFAULT NULL COMMENT '备注', + `AVAILABLE` varchar(255) DEFAULT NULL, + `ID` varchar(255) DEFAULT NULL, + `USER_ID` varchar(255) DEFAULT NULL COMMENT '编辑人ID', + `UPDATE_TIM` varchar(255) DEFAULT NULL COMMENT '编辑人姓名', + `INSERT_TIME` varchar(255) DEFAULT NULL COMMENT '插入日期' +) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='九小场所信息'; + +CREATE TABLE `wgh_jyz` ( + `OBJECTID` int(11) DEFAULT NULL, + `XH` varchar(500) DEFAULT NULL COMMENT '序号', + `NAME` varchar(500) DEFAULT NULL COMMENT '单位名称', + `AREA` double DEFAULT NULL, + `SPACE` varchar(500) DEFAULT NULL COMMENT '周边安全间距', + `PROBLEM` varchar(500) DEFAULT NULL COMMENT '存在问题', + `TYPE` varchar(500) DEFAULT NULL COMMENT '危险源类型', + `LOCATION` varchar(500) DEFAULT NULL COMMENT '经营地址', + `PRINCIPAL` varchar(500) DEFAULT NULL COMMENT '负责人', + `PHONE` varchar(500) DEFAULT NULL COMMENT '联系电话', + `QTYPE` varchar(500) DEFAULT NULL COMMENT '企业类型', + `WTYPE` varchar(500) DEFAULT NULL COMMENT '危化品种类', + `level` varchar(500) DEFAULT NULL COMMENT '等级', + `nature` varchar(500) DEFAULT NULL COMMENT '性质', + `remarks` varchar(500) DEFAULT NULL COMMENT '备注', + `DWMCJC` varchar(50) DEFAULT NULL, + `LAYER` varchar(50) DEFAULT NULL, + `SSJDB` varchar(50) DEFAULT NULL, + `AMOUNT` varchar(300) DEFAULT NULL COMMENT '数量', + `YJCS` varchar(260) DEFAULT NULL COMMENT '应急措施', + `insert_time` datetime DEFAULT NULL COMMENT '插入日期' +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='加油站'; + +CREATE TABLE `wgh_sjxxb` ( + `OBJECTID_1` int(11) DEFAULT NULL, + `OBJECTID` double DEFAULT NULL, + `INFOSOURCENAME` varchar(700) DEFAULT NULL COMMENT '事件来源', + `INFOTYPENAME` varchar(700) DEFAULT NULL COMMENT '事件类别', + `COMMUNITYNAME` varchar(700) DEFAULT NULL COMMENT '社区名称', + `DESCRIPTION` varchar(700) DEFAULT NULL COMMENT '事件描述', + `TASKID` varchar(500) DEFAULT NULL, + `CASESN` varchar(500) DEFAULT NULL, + `ADDRESS` varchar(700) DEFAULT NULL COMMENT '事件地址', + `STATUSNAME` varchar(700) DEFAULT NULL COMMENT '事件状态', + `INFOBCNAME` varchar(700) DEFAULT NULL, + `INFOSCNAME` varchar(700) DEFAULT NULL, + `STREETNAME` varchar(700) DEFAULT NULL COMMENT '街道名称', + `DISCOVERTIME` datetime DEFAULT NULL, + `insert_time` datetime DEFAULT NULL COMMENT '插入日期' +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='事件信息'; + +CREATE TABLE `wgh_sqxx` ( + `OBJECTID` int(11) DEFAULT NULL, + `COMMUAREA` double DEFAULT NULL, + `BELONGTO` varchar(100) DEFAULT NULL, + `CONTACTS` varchar(100) DEFAULT NULL, + `TELPHONE` varchar(100) DEFAULT NULL, + `number_of_grid` double DEFAULT NULL, + `street_code` varchar(100) DEFAULT NULL, + `community_code` varchar(100) DEFAULT NULL, + `COMMNAME` varchar(200) DEFAULT NULL, + `JDCJGB` varchar(200) DEFAULT NULL, + `WGZ` varchar(100) DEFAULT NULL, + `police_name` varchar(500) DEFAULT NULL, + `traffic_police_phone` double DEFAULT NULL, + `traffic_police_company` varchar(500) DEFAULT NULL, + `peo_police_name` varchar(500) DEFAULT NULL, + `peo_police_phone` varchar(500) DEFAULT NULL, + `police_station` varchar(500) DEFAULT NULL, + `WGY` varchar(200) DEFAULT NULL, + `JDLXKS` varchar(200) DEFAULT NULL, + `DDY` varchar(200) DEFAULT NULL, + `ZHZFXM` varchar(100) DEFAULT NULL, + `ZHZFDH` varchar(100) DEFAULT NULL, + `ZHZFBM` varchar(100) DEFAULT NULL, + `insert_time` datetime DEFAULT NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +CREATE TABLE `wgh_subdistrict_office` ( + `coordinate_info` text, + `street_name` varchar(100) DEFAULT NULL, + `street_code` varchar(100) DEFAULT NULL, + `longitude` varchar(100) DEFAULT NULL, + `latitude` varchar(100) DEFAULT NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +CREATE TABLE `wgh_szcgwgh` ( + `OBJECTID` int(11) DEFAULT NULL, + `NOTE` varchar(200) DEFAULT NULL COMMENT '备注', + `SSSQ` varchar(200) DEFAULT NULL, + `SSJD` varchar(200) DEFAULT NULL, + `ID` varchar(200) DEFAULT NULL, + `insert_time` datetime DEFAULT NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='数字城管网格化信息'; + +CREATE TABLE `wgh_szzrwg` ( + `OBJECTID` int(11) DEFAULT NULL, + `NOTE` varchar(100) DEFAULT NULL COMMENT '备注', + `NAME` varchar(100) DEFAULT NULL COMMENT '责任单位', + `PRINCIPAL` varchar(100) DEFAULT NULL COMMENT '监管人', + `PHONE` varchar(100) DEFAULT NULL COMMENT '联系方式', + `insert_time` datetime DEFAULT NULL COMMENT '插入日期' +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='市政责任网格信息'; + +CREATE TABLE `wgh_whpdw` ( + `OBJECTID` int(11) DEFAULT NULL, + `XH` varchar(500) DEFAULT NULL COMMENT '序号', + `NAME` varchar(500) DEFAULT NULL COMMENT '单位名称', + `AREA` double DEFAULT NULL, + `SPACE` varchar(500) DEFAULT NULL COMMENT '周边安全间距', + `PROBLEM` varchar(500) DEFAULT NULL COMMENT '存在问题', + `TYPE` varchar(500) DEFAULT NULL COMMENT '危险源类型', + `LOCATION` varchar(500) DEFAULT NULL COMMENT '经营地址', + `PERSON` varchar(500) DEFAULT NULL COMMENT '安全负责人', + `PHONE` varchar(500) DEFAULT NULL COMMENT '联系电话', + `QTYPE` varchar(500) DEFAULT NULL COMMENT '企业类型', + `WTYPE` varchar(500) DEFAULT NULL COMMENT '危化品种类', + `AMOUNT` varchar(500) DEFAULT NULL COMMENT '数量', + `GRADE` varchar(500) DEFAULT NULL COMMENT '等级', + `NATRUE` varchar(500) DEFAULT NULL COMMENT '性质', + `YJCS` varchar(500) DEFAULT NULL COMMENT '应急措施', + `NOTE` varchar(500) DEFAULT NULL COMMENT '备注', + `DWMCJC` varchar(100) DEFAULT NULL, + `PRINCIPAL` varchar(500) DEFAULT NULL COMMENT '主要负责人', + `USER` varchar(500) DEFAULT NULL COMMENT '用途', + `LAYER` varchar(100) DEFAULT NULL, + `SSJDB` varchar(100) DEFAULT NULL, + `insert_time` timestamp NULL DEFAULT NULL COMMENT '插入日期' +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='危化品单位信息'; + +CREATE TABLE `wgh_yjbmcs` ( + `OBJECTID` int(11) DEFAULT NULL, + `GRADE` varchar(500) DEFAULT NULL, + `ADRESS` varchar(500) DEFAULT NULL COMMENT '地址', + `AREA` varchar(500) DEFAULT NULL COMMENT '面积(㎡)', + `RNNS` varchar(500) DEFAULT NULL COMMENT '容纳人数', + `SFBSP` varchar(500) DEFAULT NULL, + `ZYSBCS` varchar(500) DEFAULT NULL, + `FZR` varchar(500) DEFAULT NULL, + `ZGDW` varchar(500) DEFAULT NULL, + `NAME` varchar(500) DEFAULT NULL, + `FZRTEL` varchar(100) DEFAULT NULL, + `SSJD` varchar(100) DEFAULT NULL, + `INSERT_TIME` timestamp NULL DEFAULT NULL +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='应急避难场所信息'; + +CREATE TABLE `wgh_yqhjz` ( + `OBJECTID` int(11) DEFAULT NULL, + `XH` varchar(1000) DEFAULT NULL COMMENT '序号', + `NAME` varchar(1000) DEFAULT NULL COMMENT '单位名称', + `AREA` double DEFAULT NULL, + `SPACE` varchar(1000) DEFAULT NULL COMMENT '周边安全间距', + `TYPE` varchar(1000) DEFAULT NULL COMMENT '危险源类型', + `LOCATION` varchar(1000) DEFAULT NULL COMMENT '经营地址', + `PRINCIPAL` varchar(1000) DEFAULT NULL COMMENT '负责人', + `PHONE` varchar(1000) DEFAULT NULL COMMENT '联系电话', + `QTYPE` varchar(1000) DEFAULT NULL COMMENT '企业类型', + `WTYPE` varchar(1000) DEFAULT NULL COMMENT '危化品种类', + `AMOUNT` varchar(1000) DEFAULT NULL COMMENT '数量', + `GRADE` varchar(1000) DEFAULT NULL COMMENT '等级', + `NATRUE` varchar(1000) DEFAULT NULL COMMENT '性质', + `YJCS` varchar(1000) DEFAULT NULL COMMENT '应急措施', + `NOTE` varchar(1000) DEFAULT NULL COMMENT '备注', + `DWMCJC` varchar(100) DEFAULT NULL COMMENT '简称', + `LAYER` varchar(100) DEFAULT NULL COMMENT '所在图层', + `SSJDB` varchar(100) DEFAULT NULL COMMENT '所属街道办', + `PROBLEM` varchar(100) DEFAULT NULL COMMENT '存在问题', + `insert_time` timestamp NULL DEFAULT NULL COMMENT '插入日期' +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='油气合建站信息'; + +CREATE ALGORITHM = UNDEFINED DEFINER = `root` @`%` SQL SECURITY DEFINER VIEW `view_grid_comm_street` AS SELECT +`g4`.`grid_id` AS `grid_id`, +`g4`.`grid_name` AS `grid_name`, +`g3`.`grid_id` AS `community_id`, +`g3`.`grid_name` AS `community_name`, +`g2`.`grid_id` AS `street_id`, +`g2`.`grid_name` AS `street_name`, +concat( `g2`.`grid_id`, ':', `g3`.`grid_id`, ':', `g4`.`grid_id` ) AS `grid_id_path` +FROM + (( + `ca_bm_grid` `g4` + JOIN `ca_bm_grid` `g3` ON ((( + `g3`.`grid_id` = `g4`.`parent_id` + ) + AND ( `g3`.`grid_level` = 'level3' ) + AND ( `g3`.`delete_flag` = 'normal' )))) + JOIN `ca_bm_grid` `g2` ON ((( + `g2`.`grid_id` = `g3`.`parent_id` + ) + AND ( `g2`.`grid_level` = 'level2' ) + AND ( `g2`.`delete_flag` = 'normal' )))) +WHERE + (( + `g4`.`grid_level` = 'level4' + ) + AND ( `g4`.`delete_flag` = 'normal' )) From 7d0b4f24da9564b56dfba3fe7fd6ed6f48f3978f Mon Sep 17 00:00:00 2001 From: HAHA Date: Thu, 16 Jun 2022 10:16:56 +0800 Subject: [PATCH 24/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9flyway=E8=AF=AD?= =?UTF-8?q?=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.0.4__create_wgh_table.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.4__create_wgh_table.sql b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.4__create_wgh_table.sql index d63a579232..85dddfa3d3 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.4__create_wgh_table.sql +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.4__create_wgh_table.sql @@ -296,7 +296,7 @@ CREATE TABLE `wgh_yqhjz` ( `insert_time` timestamp NULL DEFAULT NULL COMMENT '插入日期' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='油气合建站信息'; -CREATE ALGORITHM = UNDEFINED DEFINER = `root` @`%` SQL SECURITY DEFINER VIEW `view_grid_comm_street` AS SELECT +CREATE ALGORITHM = UNDEFINED SQL SECURITY DEFINER VIEW `view_grid_comm_street` AS SELECT `g4`.`grid_id` AS `grid_id`, `g4`.`grid_name` AS `grid_name`, `g3`.`grid_id` AS `community_id`, From 21979136d2115d7f3bf02b7e5b10eef71bc43440 Mon Sep 17 00:00:00 2001 From: HAHA Date: Thu, 16 Jun 2022 10:44:57 +0800 Subject: [PATCH 25/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9flyway=E8=AF=AD?= =?UTF-8?q?=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.5__create_view.sql | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.5__create_view.sql diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.5__create_view.sql b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.5__create_view.sql new file mode 100644 index 0000000000..51ee2dd094 --- /dev/null +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.5__create_view.sql @@ -0,0 +1,26 @@ +CREATE ALGORITHM = UNDEFINED SQL SECURITY DEFINER VIEW `view_grid_comm_street` AS SELECT +`g4`.`grid_id` AS `grid_id`, +`g4`.`grid_name` AS `grid_name`, +`g3`.`grid_id` AS `community_id`, +`g3`.`grid_name` AS `community_name`, +`g2`.`grid_id` AS `street_id`, +`g2`.`grid_name` AS `street_name`, +concat( `g2`.`grid_id`, ':', `g3`.`grid_id`, ':', `g4`.`grid_id` ) AS `grid_id_path` +FROM + (( + `ca_bm_grid` `g4` + JOIN `ca_bm_grid` `g3` ON ((( + `g3`.`grid_id` = `g4`.`parent_id` + ) + AND ( `g3`.`grid_level` = 'level3' ) + AND ( `g3`.`delete_flag` = 'normal' )))) + JOIN `ca_bm_grid` `g2` ON ((( + `g2`.`grid_id` = `g3`.`parent_id` + ) + AND ( `g2`.`grid_level` = 'level2' ) + AND ( `g2`.`delete_flag` = 'normal' )))) +WHERE + (( + `g4`.`grid_level` = 'level4' + ) + AND ( `g4`.`delete_flag` = 'normal' )) From a7b09ff56fad4bcff7cd35178c62dd80e8a52041 Mon Sep 17 00:00:00 2001 From: HAHA Date: Thu, 16 Jun 2022 11:02:27 +0800 Subject: [PATCH 26/58] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/opendata/dto/result/CaLoudongResultDTO.java | 6 ++++++ .../com/epmet/opendata/dto/result/CaPingfangResultDTO.java | 6 ++++++ .../com/epmet/opendata/dto/result/CaRentalResultDTO.java | 6 ++++++ .../com/epmet/opendata/dto/result/CaResidentResultDTO.java | 6 ++++++ .../com/epmet/opendata/dto/result/CaRotatorsResultDTO.java | 6 ++++++ .../src/main/resources/mapper/CaLoudongDao.xml | 2 +- .../src/main/resources/mapper/CaPingfangDao.xml | 2 +- .../src/main/resources/mapper/CaRentalDao.xml | 2 +- .../src/main/resources/mapper/CaResidentDao.xml | 2 +- .../src/main/resources/mapper/CaRotatorsDao.xml | 2 +- 10 files changed, 35 insertions(+), 5 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaLoudongResultDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaLoudongResultDTO.java index 71f91a0aee..35b101ce32 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaLoudongResultDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaLoudongResultDTO.java @@ -12,6 +12,12 @@ public class CaLoudongResultDTO extends PageFormDTO implements Serializable { private static final long serialVersionUID = 2835612060476537433L; + private String gridName; + + private String comName; + + private String streetName; + /** * 楼栋ID */ diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaPingfangResultDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaPingfangResultDTO.java index 21500d78d6..c4f1bfe23e 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaPingfangResultDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaPingfangResultDTO.java @@ -12,6 +12,12 @@ public class CaPingfangResultDTO extends PageFormDTO implements Serializable { private static final long serialVersionUID = 3689421598802326474L; + private String gridName; + + private String comName; + + private String streetName; + /** * 楼栋ID */ diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaRentalResultDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaRentalResultDTO.java index 9264d24aac..b5c5b0bbd6 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaRentalResultDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaRentalResultDTO.java @@ -10,6 +10,12 @@ public class CaRentalResultDTO implements Serializable { private static final long serialVersionUID = -1721373620271590333L; + private String gridName; + + private String comName; + + private String streetName; + /** * 出租房ID */ diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaResidentResultDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaResidentResultDTO.java index 8fac0b7cba..a94247a9ba 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaResidentResultDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaResidentResultDTO.java @@ -10,6 +10,12 @@ public class CaResidentResultDTO implements Serializable { private static final long serialVersionUID = 3876909002181822355L; + private String gridName; + + private String comName; + + private String streetName; + /** * 人口ID */ diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaRotatorsResultDTO.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaRotatorsResultDTO.java index 7736d81e41..04a5895ad8 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaRotatorsResultDTO.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/result/CaRotatorsResultDTO.java @@ -10,6 +10,12 @@ public class CaRotatorsResultDTO implements Serializable { private static final long serialVersionUID = -5388784241677803257L; + private String gridName; + + private String comName; + + private String streetName; + /** * 主键id */ diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml index 0ecbc89c1c..325c224424 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaLoudongDao.xml @@ -84,7 +84,7 @@ ca.plat_code, ca.community_id, vs.grid_name, - vs.community_name, + vs.community_name as comName, vs.street_name FROM ca_loudong as ca diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml index 102983e37c..f3c7bb973e 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaPingfangDao.xml @@ -81,7 +81,7 @@ ca.plat_code, ca.community_id, vs.grid_name, - vs.community_name, + vs.community_name as comName, vs.street_name FROM ca_pingfang as ca diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRentalDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRentalDao.xml index e65d1e64f1..c350e49bb1 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRentalDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRentalDao.xml @@ -73,7 +73,7 @@ ca.point_status, ca.plat_code, vs.grid_name, - vs.community_name, + vs.community_name as comName, vs.street_name FROM ca_rental as ca diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml index 3e42d02ef5..0f00defec3 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaResidentDao.xml @@ -102,7 +102,7 @@ ca.nationality, ca.plat_code, vs.grid_name, - vs.community_name, + vs.community_name as comName, vs.street_name FROM ca_resident as ca diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml index a4628f4d65..0c109d744b 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/CaRotatorsDao.xml @@ -105,7 +105,7 @@ ca.residence_type, ca.is_focus_person, vs.grid_name, - vs.community_name, + vs.community_name as comName, vs.street_name FROM ca_rotators as ca From a4932fc1dac577b93ea60261ebbbc70861a99932 Mon Sep 17 00:00:00 2001 From: HAHA Date: Thu, 16 Jun 2022 11:15:09 +0800 Subject: [PATCH 27/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9flyway=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.4__create_wgh_table.sql | 642 +++++++++--------- 1 file changed, 338 insertions(+), 304 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.4__create_wgh_table.sql b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.4__create_wgh_table.sql index 85dddfa3d3..c8fb0c832d 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.4__create_wgh_table.sql +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/db/migration/V0.0.4__create_wgh_table.sql @@ -1,324 +1,358 @@ -CREATE TABLE `ca_bm_grid` ( +DROP TABLE IF EXISTS `ca_bm_grid`; +CREATE TABLE `ca_bm_grid` ( `grid_id` bigint(20) NOT NULL COMMENT '网格ID', - `grid_code` varchar(50) COLLATE utf8_bin NOT NULL COMMENT '网格编码。人工填写，编码规则业务规定，不允许重复。', - `grid_name` varchar(200) COLLATE utf8_bin NOT NULL COMMENT '网格名称', - `gb_code` varchar(50) COLLATE utf8_bin DEFAULT NULL COMMENT '行政区划的国标编码', - `parent_id` bigint(20) DEFAULT NULL COMMENT '上级网格ID', - `parent_code` varchar(50) COLLATE utf8_bin DEFAULT NULL COMMENT '上级网格编码', - `grid_classification` varchar(10) COLLATE utf8_bin NOT NULL COMMENT '网格分类。1基础网格 2环保网格 3防火网格 4城管网格 5执法网格 6安监网格等', - `grid_level` varchar(10) COLLATE utf8_bin NOT NULL COMMENT '网格层级。网格层级表的层级\n根据【网格层级表】的层级关系动态展示。\n查询【网格层级表】层级 条件：上层级=网格树返回的网格层级', - `grid_property` varchar(10) COLLATE utf8_bin DEFAULT NULL COMMENT '网格属性。01村庄、02小区、03企业、04学校（幼儿园）、05医院、06驻镇（街）单位、07其他', - `is_end` char(1) COLLATE utf8_bin NOT NULL COMMENT '是否最后一级:0否 1是', - `grid_address` varchar(200) COLLATE utf8_bin DEFAULT NULL COMMENT '网格地址', - `grid_introduce` varchar(1024) COLLATE utf8_bin DEFAULT NULL COMMENT '网格介绍', - `grid_picture` varchar(240) COLLATE utf8_bin DEFAULT NULL COMMENT '宣传图片', - `regin_scope_desc` varchar(1024) COLLATE utf8_bin DEFAULT NULL COMMENT '地图区域范围', - `grid_sort` int(10) DEFAULT NULL COMMENT '展示顺序', - `point_status` varchar(10) COLLATE utf8_bin NOT NULL COMMENT '标绘状态', - `grid_em_center` bigint(10) DEFAULT NULL COMMENT '事件上报中心', - `grid_begin_time` datetime DEFAULT NULL COMMENT '初始日期', - `grid_end_time` datetime DEFAULT NULL COMMENT '终止日期', - `grid_area` varchar(240) COLLATE utf8_bin DEFAULT NULL COMMENT '面积', - `is_valid` varchar(10) COLLATE utf8_bin DEFAULT '1' COMMENT '是否有效', + `grid_code` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '网格编码。人工填写，编码规则业务规定，不允许重复。', + `grid_name` varchar(200) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '网格名称', + `gb_code` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '行政区划的国标编码', + `parent_id` bigint(20) NULL DEFAULT NULL COMMENT '上级网格ID', + `parent_code` varchar(50) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '上级网格编码', + `grid_classification` varchar(10) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '网格分类。1基础网格 2环保网格 3防火网格 4城管网格 5执法网格 6安监网格等', + `grid_level` varchar(10) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '网格层级。网格层级表的层级\n根据【网格层级表】的层级关系动态展示。\n查询【网格层级表】层级 条件：上层级=网格树返回的网格层级', + `grid_property` varchar(10) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '网格属性。01村庄、02小区、03企业、04学校（幼儿园）、05医院、06驻镇（街）单位、07其他', + `is_end` char(1) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '是否最后一级:0否 1是', + `grid_address` varchar(200) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '网格地址', + `grid_introduce` varchar(1024) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '网格介绍', + `grid_picture` varchar(240) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '宣传图片', + `regin_scope_desc` varchar(1024) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '地图区域范围', + `grid_sort` int(10) NULL DEFAULT NULL COMMENT '展示顺序', + `point_status` varchar(10) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL COMMENT '标绘状态', + `grid_em_center` bigint(10) NULL DEFAULT NULL COMMENT '事件上报中心', + `grid_begin_time` datetime(0) NULL DEFAULT NULL COMMENT '初始日期', + `grid_end_time` datetime(0) NULL DEFAULT NULL COMMENT '终止日期', + `grid_area` varchar(240) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '面积', + `is_valid` varchar(10) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT '1' COMMENT '是否有效', `create_by` bigint(20) NOT NULL COMMENT '创建人', - `create_date` datetime NOT NULL COMMENT '创建时间', + `create_date` datetime(0) NOT NULL COMMENT '创建时间', `update_by` bigint(20) NOT NULL, - `update_date` datetime NOT NULL, - `delete_flag` varchar(10) COLLATE utf8_bin NOT NULL DEFAULT 'normal' COMMENT '删除状态: 字典值：normal正常，删除deleted', - `versions` int(10) DEFAULT '1' COMMENT '乐观锁', - `attribute1` varchar(240) COLLATE utf8_bin DEFAULT NULL COMMENT '网格内人口规模', - `attribute2` varchar(240) COLLATE utf8_bin DEFAULT NULL COMMENT '是否成立网格党支部或网格党小组', - `attribute3` varchar(240) COLLATE utf8_bin DEFAULT NULL COMMENT '网格党组织类型', - `attribute4` varchar(240) COLLATE utf8_bin DEFAULT NULL COMMENT '党组织编码', - `attribute5` varchar(240) COLLATE utf8_bin DEFAULT NULL COMMENT '扩展字段', - `attribute6` bigint(20) DEFAULT NULL COMMENT '扩展字段', - `attribute7` bigint(20) DEFAULT NULL COMMENT '扩展字段', - `attribute8` bigint(20) DEFAULT NULL COMMENT '扩展字段', - `attribute9` datetime DEFAULT NULL COMMENT '扩展字段', - `attribute10` datetime DEFAULT NULL COMMENT '扩展字段', + `update_date` datetime(0) NOT NULL, + `delete_flag` varchar(10) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT 'normal' COMMENT '删除状态: 字典值：normal正常，删除deleted', + `versions` int(10) NULL DEFAULT 1 COMMENT '乐观锁', + `attribute1` varchar(240) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '网格内人口规模', + `attribute2` varchar(240) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '是否成立网格党支部或网格党小组', + `attribute3` varchar(240) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '网格党组织类型', + `attribute4` varchar(240) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '党组织编码', + `attribute5` varchar(240) CHARACTER SET utf8 COLLATE utf8_bin NULL DEFAULT NULL COMMENT '扩展字段', + `attribute6` bigint(20) NULL DEFAULT NULL COMMENT '扩展字段', + `attribute7` bigint(20) NULL DEFAULT NULL COMMENT '扩展字段', + `attribute8` bigint(20) NULL DEFAULT NULL COMMENT '扩展字段', + `attribute9` datetime(0) NULL DEFAULT NULL COMMENT '扩展字段', + `attribute10` datetime(0) NULL DEFAULT NULL COMMENT '扩展字段', PRIMARY KEY (`grid_id`) USING BTREE, - KEY `SELECT_PARENT` (`parent_id`) USING BTREE, - KEY `idx_grid_grid_id` (`grid_id`) USING BTREE, - KEY `idx_grid_grid_sort` (`grid_sort`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_bin; + INDEX `SELECT_PARENT`(`parent_id`) USING BTREE, + INDEX `idx_grid_grid_id`(`grid_id`) USING BTREE, + INDEX `idx_grid_grid_sort`(`grid_sort`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_bin ROW_FORMAT = Dynamic; -CREATE TABLE `wgh_base_grid` ( - `coordinate_info` text, - `grid_name` varchar(100) DEFAULT NULL, - `sub_district_office` varchar(100) DEFAULT NULL, - `community` varchar(100) DEFAULT NULL, - `street_code` varchar(100) DEFAULT NULL, - `grid_code` varchar(100) DEFAULT NULL, - `community_code` varchar(100) DEFAULT NULL, - `longitude` varchar(100) DEFAULT NULL, - `latitude` varchar(100) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; +-- ---------------------------- +-- Table structure for wgh_base_grid +-- ---------------------------- +DROP TABLE IF EXISTS `wgh_base_grid`; +CREATE TABLE `wgh_base_grid` ( + `coordinate_info` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL, + `grid_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `sub_district_office` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `community` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `street_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `grid_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `community_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `longitude` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `latitude` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; -CREATE TABLE `wgh_community` ( - `coordinate_info` text, - `street_name` varchar(100) DEFAULT NULL, - `street_code` varchar(100) DEFAULT NULL, - `community_name` varchar(100) DEFAULT NULL, - `community_code` varchar(100) DEFAULT NULL, - `longitude` varchar(100) DEFAULT NULL, - `latitude` varchar(100) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; +-- ---------------------------- +-- Table structure for wgh_community +-- ---------------------------- +DROP TABLE IF EXISTS `wgh_community`; +CREATE TABLE `wgh_community` ( + `coordinate_info` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL, + `street_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `street_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `community_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `community_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `longitude` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `latitude` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; -CREATE TABLE `wgh_dywg` ( +-- ---------------------------- +-- Table structure for wgh_dywg +-- ---------------------------- +DROP TABLE IF EXISTS `wgh_dywg`; +CREATE TABLE `wgh_dywg` ( `OBJECTID` int(11) NOT NULL, - `BGNAME` varchar(200) DEFAULT NULL COMMENT '网格名称', - `STREET` varchar(20) DEFAULT NULL COMMENT '所属街镇', - `COMMUNITY` varchar(50) DEFAULT NULL COMMENT '所属社区', - `BGSQUA` double DEFAULT NULL COMMENT '网格面积', - `ORDATE` datetime DEFAULT NULL COMMENT '初始时间', - `CHDATE` datetime DEFAULT NULL COMMENT '变更时间', - `NOTE` varchar(500) DEFAULT NULL COMMENT '备注', - `CONTACTS` varchar(50) DEFAULT NULL, - `TELPHONE` varchar(100) DEFAULT NULL COMMENT '联系电话', - `insert_time` datetime DEFAULT NULL COMMENT '插入日期' -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='单元网格'; + `BGNAME` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '网格名称', + `STREET` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属街镇', + `COMMUNITY` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属社区', + `BGSQUA` double NULL DEFAULT NULL COMMENT '网格面积', + `ORDATE` datetime(0) NULL DEFAULT NULL COMMENT '初始时间', + `CHDATE` datetime(0) NULL DEFAULT NULL COMMENT '变更时间', + `NOTE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `CONTACTS` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `TELPHONE` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系电话', + `insert_time` datetime(0) NULL DEFAULT NULL COMMENT '插入日期' +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '单元网格' ROW_FORMAT = Dynamic; -CREATE TABLE `wgh_jdb` ( - `OBJECTID_1` varchar(50) DEFAULT NULL, - `OBJECTID` varchar(50) DEFAULT NULL, - `MC` varchar(60) DEFAULT NULL COMMENT '街道名称', - `person_in_charge` varchar(20) DEFAULT NULL COMMENT '责任人', - `phone` varchar(50) DEFAULT NULL COMMENT '联系电话', - `SHAPE_LENG` double DEFAULT NULL, - `insert_time` datetime DEFAULT NULL COMMENT '插入日期' -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='街道办'; +-- ---------------------------- +-- Table structure for wgh_jdb +-- ---------------------------- +DROP TABLE IF EXISTS `wgh_jdb`; +CREATE TABLE `wgh_jdb` ( + `OBJECTID_1` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `OBJECTID` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `MC` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '街道名称', + `person_in_charge` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '责任人', + `phone` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系电话', + `SHAPE_LENG` double NULL DEFAULT NULL, + `insert_time` datetime(0) NULL DEFAULT NULL COMMENT '插入日期' +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '街道办' ROW_FORMAT = Dynamic; -CREATE TABLE `wgh_jqz` ( - `OBJECTID` int(11) DEFAULT NULL, - `XH` varchar(500) DEFAULT NULL COMMENT '序号', - `NAME` varchar(500) DEFAULT NULL COMMENT '单位名称', - `AREA` double DEFAULT NULL, - `SPACE` varchar(500) DEFAULT NULL COMMENT '周边安全间距', - `PROBLEM` varchar(500) DEFAULT NULL COMMENT '存在问题', - `TYPE` varchar(500) DEFAULT NULL COMMENT '危险源类型', - `LOCATION` varchar(500) DEFAULT NULL COMMENT '经营地址', - `PRINCIPAL` varchar(500) DEFAULT NULL COMMENT '负责人', - `PHONE` varchar(500) DEFAULT NULL COMMENT '联系电话', - `QTYPE` varchar(500) DEFAULT NULL COMMENT '企业类型', - `WTYPE` varchar(500) DEFAULT NULL COMMENT '危化品种类', - `level` varchar(500) DEFAULT NULL COMMENT '等级', - `nature` varchar(500) DEFAULT NULL COMMENT '性质', - `remarks` varchar(500) DEFAULT NULL COMMENT '备注', - `DWMCJC` varchar(50) DEFAULT NULL, - `LAYER` varchar(50) DEFAULT NULL, - `SSJDB` varchar(50) DEFAULT NULL, - `AMOUNT` varchar(50) DEFAULT NULL COMMENT '数量', - `YJCS` varchar(100) DEFAULT NULL COMMENT '应急措施', - `insert_time` datetime DEFAULT NULL COMMENT '插入日期' -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='加气站信息'; +-- ---------------------------- +-- Table structure for wgh_jqz +-- ---------------------------- +DROP TABLE IF EXISTS `wgh_jqz`; +CREATE TABLE `wgh_jqz` ( + `OBJECTID` int(11) NULL DEFAULT NULL, + `XH` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '序号', + `NAME` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '单位名称', + `AREA` double NULL DEFAULT NULL, + `SPACE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '周边安全间距', + `PROBLEM` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '存在问题', + `TYPE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '危险源类型', + `LOCATION` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '经营地址', + `PRINCIPAL` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '负责人', + `PHONE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系电话', + `QTYPE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '企业类型', + `WTYPE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '危化品种类', + `level` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '等级', + `nature` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '性质', + `remarks` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `DWMCJC` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `LAYER` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `SSJDB` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `AMOUNT` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数量', + `YJCS` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '应急措施', + `insert_time` datetime(0) NULL DEFAULT NULL COMMENT '插入日期' +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '加气站信息' ROW_FORMAT = Dynamic; -CREATE TABLE `wgh_jxcs` ( - `OBJECTID` varchar(255) DEFAULT NULL, - `JSON_INFO` varchar(255) DEFAULT NULL, - `CREAT_TIME` varchar(255) DEFAULT NULL, - `SSJD` varchar(255) DEFAULT NULL COMMENT '所属街道', - `SSSQ` varchar(255) DEFAULT NULL COMMENT '所属社区', - `DLM` varchar(255) DEFAULT NULL COMMENT '道路名', - `MPH` varchar(255) DEFAULT NULL COMMENT '门牌号', - `NAME` varchar(255) DEFAULT NULL COMMENT '名称', - `ZTLX` varchar(255) DEFAULT NULL, - `TYPE` varchar(255) DEFAULT NULL COMMENT '子类型', - `XYDM` varchar(255) DEFAULT NULL COMMENT '统一社会信用代码', - `LXR` varchar(255) DEFAULT NULL COMMENT '联系人', - `LXDH` varchar(255) DEFAULT NULL COMMENT '联系电话', - `USER_NAME` varchar(255) DEFAULT NULL, - `BZ` varchar(255) DEFAULT NULL COMMENT '备注', - `AVAILABLE` varchar(255) DEFAULT NULL, - `ID` varchar(255) DEFAULT NULL, - `USER_ID` varchar(255) DEFAULT NULL COMMENT '编辑人ID', - `UPDATE_TIM` varchar(255) DEFAULT NULL COMMENT '编辑人姓名', - `INSERT_TIME` varchar(255) DEFAULT NULL COMMENT '插入日期' -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='九小场所信息'; +-- ---------------------------- +-- Table structure for wgh_jxcs +-- ---------------------------- +DROP TABLE IF EXISTS `wgh_jxcs`; +CREATE TABLE `wgh_jxcs` ( + `OBJECTID` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `JSON_INFO` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `CREAT_TIME` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `SSJD` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '所属街道', + `SSSQ` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '所属社区', + `DLM` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '道路名', + `MPH` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '门牌号', + `NAME` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '名称', + `ZTLX` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `TYPE` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '子类型', + `XYDM` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '统一社会信用代码', + `LXR` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系人', + `LXDH` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '联系电话', + `USER_NAME` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `BZ` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '备注', + `AVAILABLE` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `ID` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL, + `USER_ID` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '编辑人ID', + `UPDATE_TIM` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '编辑人姓名', + `INSERT_TIME` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '插入日期' +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '九小场所信息' ROW_FORMAT = Dynamic; -CREATE TABLE `wgh_jyz` ( - `OBJECTID` int(11) DEFAULT NULL, - `XH` varchar(500) DEFAULT NULL COMMENT '序号', - `NAME` varchar(500) DEFAULT NULL COMMENT '单位名称', - `AREA` double DEFAULT NULL, - `SPACE` varchar(500) DEFAULT NULL COMMENT '周边安全间距', - `PROBLEM` varchar(500) DEFAULT NULL COMMENT '存在问题', - `TYPE` varchar(500) DEFAULT NULL COMMENT '危险源类型', - `LOCATION` varchar(500) DEFAULT NULL COMMENT '经营地址', - `PRINCIPAL` varchar(500) DEFAULT NULL COMMENT '负责人', - `PHONE` varchar(500) DEFAULT NULL COMMENT '联系电话', - `QTYPE` varchar(500) DEFAULT NULL COMMENT '企业类型', - `WTYPE` varchar(500) DEFAULT NULL COMMENT '危化品种类', - `level` varchar(500) DEFAULT NULL COMMENT '等级', - `nature` varchar(500) DEFAULT NULL COMMENT '性质', - `remarks` varchar(500) DEFAULT NULL COMMENT '备注', - `DWMCJC` varchar(50) DEFAULT NULL, - `LAYER` varchar(50) DEFAULT NULL, - `SSJDB` varchar(50) DEFAULT NULL, - `AMOUNT` varchar(300) DEFAULT NULL COMMENT '数量', - `YJCS` varchar(260) DEFAULT NULL COMMENT '应急措施', - `insert_time` datetime DEFAULT NULL COMMENT '插入日期' -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='加油站'; +-- ---------------------------- +-- Table structure for wgh_jyz +-- ---------------------------- +DROP TABLE IF EXISTS `wgh_jyz`; +CREATE TABLE `wgh_jyz` ( + `OBJECTID` int(11) NULL DEFAULT NULL, + `XH` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '序号', + `NAME` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '单位名称', + `AREA` double NULL DEFAULT NULL, + `SPACE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '周边安全间距', + `PROBLEM` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '存在问题', + `TYPE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '危险源类型', + `LOCATION` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '经营地址', + `PRINCIPAL` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '负责人', + `PHONE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系电话', + `QTYPE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '企业类型', + `WTYPE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '危化品种类', + `level` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '等级', + `nature` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '性质', + `remarks` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `DWMCJC` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `LAYER` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `SSJDB` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `AMOUNT` varchar(300) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数量', + `YJCS` varchar(260) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '应急措施', + `insert_time` datetime(0) NULL DEFAULT NULL COMMENT '插入日期' +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '加油站' ROW_FORMAT = Dynamic; -CREATE TABLE `wgh_sjxxb` ( - `OBJECTID_1` int(11) DEFAULT NULL, - `OBJECTID` double DEFAULT NULL, - `INFOSOURCENAME` varchar(700) DEFAULT NULL COMMENT '事件来源', - `INFOTYPENAME` varchar(700) DEFAULT NULL COMMENT '事件类别', - `COMMUNITYNAME` varchar(700) DEFAULT NULL COMMENT '社区名称', - `DESCRIPTION` varchar(700) DEFAULT NULL COMMENT '事件描述', - `TASKID` varchar(500) DEFAULT NULL, - `CASESN` varchar(500) DEFAULT NULL, - `ADDRESS` varchar(700) DEFAULT NULL COMMENT '事件地址', - `STATUSNAME` varchar(700) DEFAULT NULL COMMENT '事件状态', - `INFOBCNAME` varchar(700) DEFAULT NULL, - `INFOSCNAME` varchar(700) DEFAULT NULL, - `STREETNAME` varchar(700) DEFAULT NULL COMMENT '街道名称', - `DISCOVERTIME` datetime DEFAULT NULL, - `insert_time` datetime DEFAULT NULL COMMENT '插入日期' -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='事件信息'; +-- ---------------------------- +-- Table structure for wgh_sjxxb +-- ---------------------------- +DROP TABLE IF EXISTS `wgh_sjxxb`; +CREATE TABLE `wgh_sjxxb` ( + `OBJECTID_1` int(11) NULL DEFAULT NULL, + `OBJECTID` double NULL DEFAULT NULL, + `INFOSOURCENAME` varchar(700) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '事件来源', + `INFOTYPENAME` varchar(700) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '事件类别', + `COMMUNITYNAME` varchar(700) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '社区名称', + `DESCRIPTION` varchar(700) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '事件描述', + `TASKID` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `CASESN` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `ADDRESS` varchar(700) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '事件地址', + `STATUSNAME` varchar(700) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '事件状态', + `INFOBCNAME` varchar(700) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `INFOSCNAME` varchar(700) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `STREETNAME` varchar(700) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '街道名称', + `DISCOVERTIME` datetime(0) NULL DEFAULT NULL, + `insert_time` datetime(0) NULL DEFAULT NULL COMMENT '插入日期' +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '事件信息' ROW_FORMAT = Dynamic; -CREATE TABLE `wgh_sqxx` ( - `OBJECTID` int(11) DEFAULT NULL, - `COMMUAREA` double DEFAULT NULL, - `BELONGTO` varchar(100) DEFAULT NULL, - `CONTACTS` varchar(100) DEFAULT NULL, - `TELPHONE` varchar(100) DEFAULT NULL, - `number_of_grid` double DEFAULT NULL, - `street_code` varchar(100) DEFAULT NULL, - `community_code` varchar(100) DEFAULT NULL, - `COMMNAME` varchar(200) DEFAULT NULL, - `JDCJGB` varchar(200) DEFAULT NULL, - `WGZ` varchar(100) DEFAULT NULL, - `police_name` varchar(500) DEFAULT NULL, - `traffic_police_phone` double DEFAULT NULL, - `traffic_police_company` varchar(500) DEFAULT NULL, - `peo_police_name` varchar(500) DEFAULT NULL, - `peo_police_phone` varchar(500) DEFAULT NULL, - `police_station` varchar(500) DEFAULT NULL, - `WGY` varchar(200) DEFAULT NULL, - `JDLXKS` varchar(200) DEFAULT NULL, - `DDY` varchar(200) DEFAULT NULL, - `ZHZFXM` varchar(100) DEFAULT NULL, - `ZHZFDH` varchar(100) DEFAULT NULL, - `ZHZFBM` varchar(100) DEFAULT NULL, - `insert_time` datetime DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; +-- ---------------------------- +-- Table structure for wgh_sqxx +-- ---------------------------- +DROP TABLE IF EXISTS `wgh_sqxx`; +CREATE TABLE `wgh_sqxx` ( + `OBJECTID` int(11) NULL DEFAULT NULL, + `COMMUAREA` double NULL DEFAULT NULL, + `BELONGTO` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `CONTACTS` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `TELPHONE` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `number_of_grid` double NULL DEFAULT NULL, + `street_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `community_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `COMMNAME` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `JDCJGB` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `WGZ` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `police_name` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `traffic_police_phone` double NULL DEFAULT NULL, + `traffic_police_company` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `peo_police_name` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `peo_police_phone` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `police_station` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `WGY` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `JDLXKS` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `DDY` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `ZHZFXM` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `ZHZFDH` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `ZHZFBM` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `insert_time` datetime(0) NULL DEFAULT NULL +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; -CREATE TABLE `wgh_subdistrict_office` ( - `coordinate_info` text, - `street_name` varchar(100) DEFAULT NULL, - `street_code` varchar(100) DEFAULT NULL, - `longitude` varchar(100) DEFAULT NULL, - `latitude` varchar(100) DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; +-- ---------------------------- +-- Table structure for wgh_subdistrict_office +-- ---------------------------- +DROP TABLE IF EXISTS `wgh_subdistrict_office`; +CREATE TABLE `wgh_subdistrict_office` ( + `coordinate_info` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL, + `street_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `street_code` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `longitude` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `latitude` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; -CREATE TABLE `wgh_szcgwgh` ( - `OBJECTID` int(11) DEFAULT NULL, - `NOTE` varchar(200) DEFAULT NULL COMMENT '备注', - `SSSQ` varchar(200) DEFAULT NULL, - `SSJD` varchar(200) DEFAULT NULL, - `ID` varchar(200) DEFAULT NULL, - `insert_time` datetime DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='数字城管网格化信息'; +-- ---------------------------- +-- Table structure for wgh_szcgwgh +-- ---------------------------- +DROP TABLE IF EXISTS `wgh_szcgwgh`; +CREATE TABLE `wgh_szcgwgh` ( + `OBJECTID` int(11) NULL DEFAULT NULL, + `NOTE` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `SSSQ` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `SSJD` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `ID` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `insert_time` datetime(0) NULL DEFAULT NULL +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '数字城管网格化信息' ROW_FORMAT = Dynamic; -CREATE TABLE `wgh_szzrwg` ( - `OBJECTID` int(11) DEFAULT NULL, - `NOTE` varchar(100) DEFAULT NULL COMMENT '备注', - `NAME` varchar(100) DEFAULT NULL COMMENT '责任单位', - `PRINCIPAL` varchar(100) DEFAULT NULL COMMENT '监管人', - `PHONE` varchar(100) DEFAULT NULL COMMENT '联系方式', - `insert_time` datetime DEFAULT NULL COMMENT '插入日期' -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='市政责任网格信息'; +-- ---------------------------- +-- Table structure for wgh_szzrwg +-- ---------------------------- +DROP TABLE IF EXISTS `wgh_szzrwg`; +CREATE TABLE `wgh_szzrwg` ( + `OBJECTID` int(11) NULL DEFAULT NULL, + `NOTE` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `NAME` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '责任单位', + `PRINCIPAL` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '监管人', + `PHONE` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系方式', + `insert_time` datetime(0) NULL DEFAULT NULL COMMENT '插入日期' +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '市政责任网格信息' ROW_FORMAT = Dynamic; -CREATE TABLE `wgh_whpdw` ( - `OBJECTID` int(11) DEFAULT NULL, - `XH` varchar(500) DEFAULT NULL COMMENT '序号', - `NAME` varchar(500) DEFAULT NULL COMMENT '单位名称', - `AREA` double DEFAULT NULL, - `SPACE` varchar(500) DEFAULT NULL COMMENT '周边安全间距', - `PROBLEM` varchar(500) DEFAULT NULL COMMENT '存在问题', - `TYPE` varchar(500) DEFAULT NULL COMMENT '危险源类型', - `LOCATION` varchar(500) DEFAULT NULL COMMENT '经营地址', - `PERSON` varchar(500) DEFAULT NULL COMMENT '安全负责人', - `PHONE` varchar(500) DEFAULT NULL COMMENT '联系电话', - `QTYPE` varchar(500) DEFAULT NULL COMMENT '企业类型', - `WTYPE` varchar(500) DEFAULT NULL COMMENT '危化品种类', - `AMOUNT` varchar(500) DEFAULT NULL COMMENT '数量', - `GRADE` varchar(500) DEFAULT NULL COMMENT '等级', - `NATRUE` varchar(500) DEFAULT NULL COMMENT '性质', - `YJCS` varchar(500) DEFAULT NULL COMMENT '应急措施', - `NOTE` varchar(500) DEFAULT NULL COMMENT '备注', - `DWMCJC` varchar(100) DEFAULT NULL, - `PRINCIPAL` varchar(500) DEFAULT NULL COMMENT '主要负责人', - `USER` varchar(500) DEFAULT NULL COMMENT '用途', - `LAYER` varchar(100) DEFAULT NULL, - `SSJDB` varchar(100) DEFAULT NULL, - `insert_time` timestamp NULL DEFAULT NULL COMMENT '插入日期' -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='危化品单位信息'; +-- ---------------------------- +-- Table structure for wgh_whpdw +-- ---------------------------- +DROP TABLE IF EXISTS `wgh_whpdw`; +CREATE TABLE `wgh_whpdw` ( + `OBJECTID` int(11) NULL DEFAULT NULL, + `XH` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '序号', + `NAME` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '单位名称', + `AREA` double NULL DEFAULT NULL, + `SPACE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '周边安全间距', + `PROBLEM` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '存在问题', + `TYPE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '危险源类型', + `LOCATION` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '经营地址', + `PERSON` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '安全负责人', + `PHONE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系电话', + `QTYPE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '企业类型', + `WTYPE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '危化品种类', + `AMOUNT` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数量', + `GRADE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '等级', + `NATRUE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '性质', + `YJCS` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '应急措施', + `NOTE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `DWMCJC` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `PRINCIPAL` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '主要负责人', + `USER` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '用途', + `LAYER` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `SSJDB` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `insert_time` timestamp(0) NULL DEFAULT NULL COMMENT '插入日期' +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '危化品单位信息' ROW_FORMAT = Dynamic; -CREATE TABLE `wgh_yjbmcs` ( - `OBJECTID` int(11) DEFAULT NULL, - `GRADE` varchar(500) DEFAULT NULL, - `ADRESS` varchar(500) DEFAULT NULL COMMENT '地址', - `AREA` varchar(500) DEFAULT NULL COMMENT '面积(㎡)', - `RNNS` varchar(500) DEFAULT NULL COMMENT '容纳人数', - `SFBSP` varchar(500) DEFAULT NULL, - `ZYSBCS` varchar(500) DEFAULT NULL, - `FZR` varchar(500) DEFAULT NULL, - `ZGDW` varchar(500) DEFAULT NULL, - `NAME` varchar(500) DEFAULT NULL, - `FZRTEL` varchar(100) DEFAULT NULL, - `SSJD` varchar(100) DEFAULT NULL, - `INSERT_TIME` timestamp NULL DEFAULT NULL -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='应急避难场所信息'; +-- ---------------------------- +-- Table structure for wgh_yjbmcs +-- ---------------------------- +DROP TABLE IF EXISTS `wgh_yjbmcs`; +CREATE TABLE `wgh_yjbmcs` ( + `OBJECTID` int(11) NULL DEFAULT NULL, + `GRADE` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `ADRESS` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '地址', + `AREA` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '面积(㎡)', + `RNNS` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '容纳人数', + `SFBSP` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `ZYSBCS` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `FZR` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `ZGDW` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `NAME` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `FZRTEL` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `SSJD` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `INSERT_TIME` timestamp(0) NULL DEFAULT NULL +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '应急避难场所信息' ROW_FORMAT = Dynamic; -CREATE TABLE `wgh_yqhjz` ( - `OBJECTID` int(11) DEFAULT NULL, - `XH` varchar(1000) DEFAULT NULL COMMENT '序号', - `NAME` varchar(1000) DEFAULT NULL COMMENT '单位名称', - `AREA` double DEFAULT NULL, - `SPACE` varchar(1000) DEFAULT NULL COMMENT '周边安全间距', - `TYPE` varchar(1000) DEFAULT NULL COMMENT '危险源类型', - `LOCATION` varchar(1000) DEFAULT NULL COMMENT '经营地址', - `PRINCIPAL` varchar(1000) DEFAULT NULL COMMENT '负责人', - `PHONE` varchar(1000) DEFAULT NULL COMMENT '联系电话', - `QTYPE` varchar(1000) DEFAULT NULL COMMENT '企业类型', - `WTYPE` varchar(1000) DEFAULT NULL COMMENT '危化品种类', - `AMOUNT` varchar(1000) DEFAULT NULL COMMENT '数量', - `GRADE` varchar(1000) DEFAULT NULL COMMENT '等级', - `NATRUE` varchar(1000) DEFAULT NULL COMMENT '性质', - `YJCS` varchar(1000) DEFAULT NULL COMMENT '应急措施', - `NOTE` varchar(1000) DEFAULT NULL COMMENT '备注', - `DWMCJC` varchar(100) DEFAULT NULL COMMENT '简称', - `LAYER` varchar(100) DEFAULT NULL COMMENT '所在图层', - `SSJDB` varchar(100) DEFAULT NULL COMMENT '所属街道办', - `PROBLEM` varchar(100) DEFAULT NULL COMMENT '存在问题', - `insert_time` timestamp NULL DEFAULT NULL COMMENT '插入日期' -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='油气合建站信息'; - -CREATE ALGORITHM = UNDEFINED SQL SECURITY DEFINER VIEW `view_grid_comm_street` AS SELECT -`g4`.`grid_id` AS `grid_id`, -`g4`.`grid_name` AS `grid_name`, -`g3`.`grid_id` AS `community_id`, -`g3`.`grid_name` AS `community_name`, -`g2`.`grid_id` AS `street_id`, -`g2`.`grid_name` AS `street_name`, -concat( `g2`.`grid_id`, ':', `g3`.`grid_id`, ':', `g4`.`grid_id` ) AS `grid_id_path` -FROM - (( - `ca_bm_grid` `g4` - JOIN `ca_bm_grid` `g3` ON ((( - `g3`.`grid_id` = `g4`.`parent_id` - ) - AND ( `g3`.`grid_level` = 'level3' ) - AND ( `g3`.`delete_flag` = 'normal' )))) - JOIN `ca_bm_grid` `g2` ON ((( - `g2`.`grid_id` = `g3`.`parent_id` - ) - AND ( `g2`.`grid_level` = 'level2' ) - AND ( `g2`.`delete_flag` = 'normal' )))) -WHERE - (( - `g4`.`grid_level` = 'level4' - ) - AND ( `g4`.`delete_flag` = 'normal' )) +-- ---------------------------- +-- Table structure for wgh_yqhjz +-- ---------------------------- +DROP TABLE IF EXISTS `wgh_yqhjz`; +CREATE TABLE `wgh_yqhjz` ( + `OBJECTID` int(11) NULL DEFAULT NULL, + `XH` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '序号', + `NAME` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '单位名称', + `AREA` double NULL DEFAULT NULL, + `SPACE` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '周边安全间距', + `TYPE` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '危险源类型', + `LOCATION` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '经营地址', + `PRINCIPAL` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '负责人', + `PHONE` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '联系电话', + `QTYPE` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '企业类型', + `WTYPE` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '危化品种类', + `AMOUNT` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '数量', + `GRADE` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '等级', + `NATRUE` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '性质', + `YJCS` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '应急措施', + `NOTE` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注', + `DWMCJC` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '简称', + `LAYER` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所在图层', + `SSJDB` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '所属街道办', + `PROBLEM` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '存在问题', + `insert_time` timestamp(0) NULL DEFAULT NULL COMMENT '插入日期' +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '油气合建站信息' ROW_FORMAT = Dynamic; From 35c68c2e18553a212dfaa0aa0530fb331037c2fa Mon Sep 17 00:00:00 2001 From: HAHA Date: Thu, 16 Jun 2022 14:18:59 +0800 Subject: [PATCH 28/58] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=85=A8=E9=87=8F?= =?UTF-8?q?=E6=8B=89=E5=8F=96=E6=95=B0=E6=8D=AE=E7=9A=84=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/GuardarDatosTaskServiceImpl.java | 25 +++---------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java index d819c24758..a619e082a3 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java @@ -73,28 +73,7 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { @Override public void guardarDatosTask(PreserVationFormDTO dto) { - if (StringUtils.isBlank(dto.getTableName())) { - caLoudongService.preserLouDongVation(dto); - pingfangService.preserPingFangVation(dto); - rentalService.preserRentalVation(dto); - residentService.preserResidentVation(dto); - rotatorsService.preserRotatorsVation(dto); - basegridService.preserBaseGridVation(dto); - bmGridService.getPreserBmGridVation(dto); - communityService.getPreserCommunityVation(dto); - wghDywgService.getPreserDywgVation(dto); - wghJqzService.getPreserWghjqzVation(dto); - wghJxcsService.preserWghJxcsVation(dto); - wghJyzService.getPreserWghJyzVation(dto); - wghSjxxbService.getPreserSjxxVation(dto); - wghSqxxService.getPreserWghSqxxVation(dto); - wghSzcgwghService.getPreserWghSzcgwghVation(dto); - wghSzzrwgService.getPreserWghSzzrwgVation(dto); - wghWhpdwService.getPreserWhpdwVation(dto); - wghYjbmcsService.getPreserWghYjbmcsVation(dto); - wghYqhjzService.getPreserWghYqhjzVation(dto); - } else { - + if (StringUtils.isNotBlank(dto.getTableName())) { switch (dto.getTableName()) { case CaWghDataConstant.UNICOM_LOUDONG: caLoudongService.preserLouDongVation(dto); @@ -157,6 +136,8 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { wghYqhjzService.getPreserWghYqhjzVation(dto); break; } + } else{ + throw new Error("没传名字"); } } } From c9e00dccf1c4cb1cb64b19cac210ef1aa864a45a Mon Sep 17 00:00:00 2001 From: HAHA Date: Thu, 16 Jun 2022 14:28:15 +0800 Subject: [PATCH 29/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9flyway=E8=AF=AD?= =?UTF-8?q?=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../opendata/service/impl/GuardarDatosTaskServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java index a619e082a3..447b7d7c5b 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java @@ -3,11 +3,13 @@ package com.epmet.opendata.service.impl; import com.epmet.opendata.dto.constant.CaWghDataConstant; import com.epmet.opendata.dto.form.PreserVationFormDTO; import com.epmet.opendata.service.*; +import lombok.extern.slf4j.Slf4j; import net.bytebuddy.asm.Advice; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +@Slf4j @Service public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { @@ -73,6 +75,7 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { @Override public void guardarDatosTask(PreserVationFormDTO dto) { + log.error("传的对象",dto); if (StringUtils.isNotBlank(dto.getTableName())) { switch (dto.getTableName()) { case CaWghDataConstant.UNICOM_LOUDONG: From 2f4d9023dab654ab793bc76a5f19b5665d82fd41 Mon Sep 17 00:00:00 2001 From: HAHA Date: Thu, 16 Jun 2022 14:42:13 +0800 Subject: [PATCH 30/58] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=89=E5=8F=96?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=9A=84=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/opendata/dto/constant/CaWghDataConstant.java | 1 + .../com/epmet/opendata/service/impl/CaBmGridServiceImpl.java | 2 +- .../com/epmet/opendata/service/impl/CaLoudongServiceImpl.java | 2 +- .../com/epmet/opendata/service/impl/CaPingfangServiceImpl.java | 2 +- .../com/epmet/opendata/service/impl/CaRentalServiceImpl.java | 2 +- .../com/epmet/opendata/service/impl/CaResidentServiceImpl.java | 2 +- .../com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java | 2 +- .../com/epmet/opendata/service/impl/WghBaseGridServiceImpl.java | 2 +- .../epmet/opendata/service/impl/WghCommunityServiceImpl.java | 2 +- .../com/epmet/opendata/service/impl/WghDywgServiceImpl.java | 2 +- .../java/com/epmet/opendata/service/impl/WghJdbServiceImpl.java | 2 +- .../java/com/epmet/opendata/service/impl/WghJqzServiceImpl.java | 2 +- .../com/epmet/opendata/service/impl/WghJxcsServiceImpl.java | 2 +- .../java/com/epmet/opendata/service/impl/WghJyzServiceImpl.java | 2 +- .../com/epmet/opendata/service/impl/WghSjxxbServiceImpl.java | 2 +- .../com/epmet/opendata/service/impl/WghSqxxServiceImpl.java | 2 +- .../opendata/service/impl/WghSubdistrictOfficeServiceImpl.java | 2 +- .../com/epmet/opendata/service/impl/WghSzcgwghServiceImpl.java | 2 +- .../com/epmet/opendata/service/impl/WghSzzrwgServiceImpl.java | 2 +- .../com/epmet/opendata/service/impl/WghWhpdwServiceImpl.java | 2 +- .../com/epmet/opendata/service/impl/WghYjbmcsServiceImpl.java | 2 +- .../com/epmet/opendata/service/impl/WghYqhjzServiceImpl.java | 2 +- 22 files changed, 22 insertions(+), 21 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java index 029f846273..bab005732b 100644 --- a/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java +++ b/epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/constant/CaWghDataConstant.java @@ -7,6 +7,7 @@ package com.epmet.opendata.dto.constant; */ public interface CaWghDataConstant { + int PAGE_LIMIT = 200; String AESKEY = "hriajrutnbghajsd"; diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaBmGridServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaBmGridServiceImpl.java index ad44a7dda5..e15b7dfccb 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaBmGridServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaBmGridServiceImpl.java @@ -108,7 +108,7 @@ public class CaBmGridServiceImpl extends BaseServiceImpl= 0) { dto.setPageNo(NumConstant.ONE); - dto.setPageSize(NumConstant.FIFTY); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM); dto.setTableName(CaWghDataConstant.SHARE_BM_GRID); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java index 77116d369d..8d7dc657fc 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaLoudongServiceImpl.java @@ -137,7 +137,7 @@ public class CaLoudongServiceImpl extends BaseServiceImpl= 0) { dto.setPageNo(NumConstant.ONE); - dto.setPageSize(NumConstant.FIFTY); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM); dto.setTableName(CaWghDataConstant.UNICOM_LOUDONG); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java index c548a634c8..efd49ea4dd 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaPingfangServiceImpl.java @@ -117,7 +117,7 @@ public class CaPingfangServiceImpl extends BaseServiceImpl= 0) { dto.setPageNo(NumConstant.ONE); - dto.setPageSize(NumConstant.FIFTY); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM); dto.setTableName(CaWghDataConstant.UNICOM_PINGFANG); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java index 88066c6233..44dffcc7ee 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRentalServiceImpl.java @@ -124,7 +124,7 @@ public class CaRentalServiceImpl extends BaseServiceImpl= 0) { dto.setPageNo(NumConstant.ONE); - dto.setPageSize(NumConstant.FIFTY); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM); dto.setTableName(CaWghDataConstant.UNICOM_RENTAL); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java index 740375cf83..b0f71b2f42 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaResidentServiceImpl.java @@ -126,7 +126,7 @@ public class CaResidentServiceImpl extends BaseServiceImpl= 0) { dto.setPageNo(NumConstant.ONE); - dto.setPageSize(NumConstant.FIFTY); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM); dto.setTableName(CaWghDataConstant.UNICOM_RESIDENT); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java index 3af2fd8013..2d76b56fc0 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/CaRotatorsServiceImpl.java @@ -126,7 +126,7 @@ public class CaRotatorsServiceImpl extends BaseServiceImpl= 0) { dto.setPageNo(NumConstant.ONE); - dto.setPageSize(NumConstant.FIFTY); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_UNICOM); dto.setTableName(CaWghDataConstant.UNICOM_ROTATORS); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghBaseGridServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghBaseGridServiceImpl.java index e3105dab2e..9aaf2ae706 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghBaseGridServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghBaseGridServiceImpl.java @@ -103,7 +103,7 @@ public class WghBaseGridServiceImpl extends BaseServiceImpl= 0) { dto.setPageNo(NumConstant.ONE); - dto.setPageSize(NumConstant.FIFTY); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); dto.setTableName(CaWghDataConstant.SHARE_BASE_GRID); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghCommunityServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghCommunityServiceImpl.java index c5de38730c..05a77768f8 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghCommunityServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghCommunityServiceImpl.java @@ -104,7 +104,7 @@ public class WghCommunityServiceImpl extends BaseServiceImpl= 0) { dto.setPageNo(NumConstant.ONE); - dto.setPageSize(NumConstant.FIFTY); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); dto.setTableName(CaWghDataConstant.SHARE_COMMUNITY); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghDywgServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghDywgServiceImpl.java index b3c29d6f40..3f98dd5c40 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghDywgServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghDywgServiceImpl.java @@ -106,7 +106,7 @@ public class WghDywgServiceImpl extends BaseServiceImpl= 0) { dto.setPageNo(NumConstant.ONE); - dto.setPageSize(NumConstant.FIFTY); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); dto.setTableName(CaWghDataConstant.SHARE_WGH_DYWG); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJdbServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJdbServiceImpl.java index 6d55943eac..cb164432b0 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJdbServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJdbServiceImpl.java @@ -106,7 +106,7 @@ public class WghJdbServiceImpl extends BaseServiceImpl int i = baseDao.deleteAll(); if (i >= 0) { dto.setPageNo(NumConstant.ONE); - dto.setPageSize(NumConstant.FIFTY); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); dto.setTableName(CaWghDataConstant.SHARE_WGH_JDB); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJqzServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJqzServiceImpl.java index a0d1526dea..1023edffa7 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJqzServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJqzServiceImpl.java @@ -106,7 +106,7 @@ public class WghJqzServiceImpl extends BaseServiceImpl int i = baseDao.deleteAll(); if (i >= 0) { dto.setPageNo(NumConstant.ONE); - dto.setPageSize(NumConstant.FIFTY); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); dto.setTableName(CaWghDataConstant.SHARE_WGH_JQZ); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJxcsServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJxcsServiceImpl.java index c28fba0277..0e202ffa6b 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJxcsServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJxcsServiceImpl.java @@ -106,7 +106,7 @@ public class WghJxcsServiceImpl extends BaseServiceImpl= 0) { dto.setPageNo(NumConstant.ONE); - dto.setPageSize(NumConstant.FIFTY); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); dto.setTableName(CaWghDataConstant.SHARE_WGH_JXCS); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJyzServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJyzServiceImpl.java index 9d14a3a6bf..f159e690de 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJyzServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghJyzServiceImpl.java @@ -106,7 +106,7 @@ public class WghJyzServiceImpl extends BaseServiceImpl int i = baseDao.deleteAll(); if (i >= 0) { dto.setPageNo(NumConstant.ONE); - dto.setPageSize(NumConstant.FIFTY); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); dto.setTableName(CaWghDataConstant.SHARE_WGH_JYZ); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxbServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxbServiceImpl.java index 387a4c7649..ad2dee773b 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxbServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSjxxbServiceImpl.java @@ -106,7 +106,7 @@ public class WghSjxxbServiceImpl extends BaseServiceImpl= 0) { dto.setPageNo(NumConstant.ONE); - dto.setPageSize(NumConstant.FIFTY); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); dto.setTableName(CaWghDataConstant.SHARE_WGH_SJXX); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSqxxServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSqxxServiceImpl.java index 496cff2a62..e804f85a5c 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSqxxServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSqxxServiceImpl.java @@ -106,7 +106,7 @@ public class WghSqxxServiceImpl extends BaseServiceImpl= 0) { dto.setPageNo(NumConstant.ONE); - dto.setPageSize(NumConstant.FIFTY); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); dto.setTableName(CaWghDataConstant.SHARE_WGH_SQXX); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSubdistrictOfficeServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSubdistrictOfficeServiceImpl.java index 8425427509..6c60f83523 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSubdistrictOfficeServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSubdistrictOfficeServiceImpl.java @@ -98,7 +98,7 @@ public class WghSubdistrictOfficeServiceImpl extends BaseServiceImpl= 0) { dto.setPageNo(NumConstant.ONE); - dto.setPageSize(NumConstant.FIFTY); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); dto.setTableName(CaWghDataConstant.SHARE_WGH_SUB); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSzcgwghServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSzcgwghServiceImpl.java index 313001955d..e8b1a8d19c 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSzcgwghServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSzcgwghServiceImpl.java @@ -106,7 +106,7 @@ public class WghSzcgwghServiceImpl extends BaseServiceImpl= 0) { dto.setPageNo(NumConstant.ONE); - dto.setPageSize(NumConstant.FIFTY); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); dto.setTableName(CaWghDataConstant.SHARE_WGH_SZCGWGH); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSzzrwgServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSzzrwgServiceImpl.java index d8eaf54bcf..6a34e91255 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSzzrwgServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghSzzrwgServiceImpl.java @@ -108,7 +108,7 @@ public class WghSzzrwgServiceImpl extends BaseServiceImpl= 0) { dto.setPageNo(NumConstant.ONE); - dto.setPageSize(NumConstant.FIFTY); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); dto.setTableName(CaWghDataConstant.SHARE_WGH_SZZRWG); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghWhpdwServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghWhpdwServiceImpl.java index 785493b305..c62f8689f4 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghWhpdwServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghWhpdwServiceImpl.java @@ -106,7 +106,7 @@ public class WghWhpdwServiceImpl extends BaseServiceImpl= 0) { dto.setPageNo(NumConstant.ONE); - dto.setPageSize(NumConstant.FIFTY); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); dto.setTableName(CaWghDataConstant.SHARE_WGH_WHPDW); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghYjbmcsServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghYjbmcsServiceImpl.java index 4652ee8906..550822bf20 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghYjbmcsServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghYjbmcsServiceImpl.java @@ -106,7 +106,7 @@ public class WghYjbmcsServiceImpl extends BaseServiceImpl= 0) { dto.setPageNo(NumConstant.ONE); - dto.setPageSize(NumConstant.FIFTY); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); dto.setTableName(CaWghDataConstant.SHARE_WGH_YJBMCS); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghYqhjzServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghYqhjzServiceImpl.java index f7ee3830b4..a32a484816 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghYqhjzServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/WghYqhjzServiceImpl.java @@ -106,7 +106,7 @@ public class WghYqhjzServiceImpl extends BaseServiceImpl= 0) { dto.setPageNo(NumConstant.ONE); - dto.setPageSize(NumConstant.FIFTY); + dto.setPageSize(CaWghDataConstant.PAGE_LIMIT); dto.setTableSchema(CaWghDataConstant.TABLESCHEMA_SHARE); dto.setTableName(CaWghDataConstant.SHARE_WGH_YQHJZ); From 5fd92b20dcbd83e1b1ce2846a4b62cdcada6febb Mon Sep 17 00:00:00 2001 From: HAHA Date: Thu, 16 Jun 2022 15:41:28 +0800 Subject: [PATCH 31/58] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../opendata/service/impl/GuardarDatosTaskServiceImpl.java | 1 - .../modules/partymember/service/IcPartyMemberPointService.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java index 447b7d7c5b..bf60cdf4a1 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GuardarDatosTaskServiceImpl.java @@ -75,7 +75,6 @@ public class GuardarDatosTaskServiceImpl implements GuardarDatosTaskService { @Override public void guardarDatosTask(PreserVationFormDTO dto) { - log.error("传的对象",dto); if (StringUtils.isNotBlank(dto.getTableName())) { switch (dto.getTableName()) { case CaWghDataConstant.UNICOM_LOUDONG: diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberPointService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberPointService.java index 701ce482aa..026c402318 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberPointService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberPointService.java @@ -114,4 +114,4 @@ public interface IcPartyMemberPointService extends BaseService getExport(PartyMemberPointListFormDTO form, TokenDto tokenDto); -} \ No newline at end of file +} From b471a0a28d155849d63a98d913a7d3cc98664f42 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 16 Jun 2022 16:09:50 +0800 Subject: [PATCH 32/58] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E9=87=87=E9=9B=86=E4=BF=AE=E6=94=B9=E6=88=B7=E7=B1=8D=E6=89=80?= =?UTF-8?q?=E5=9C=A8=E5=9C=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/form/CollectListFormDTO.java | 4 ++++ .../com/epmet/dto/form/IcResiCollectMemFormDTO.java | 10 ++++++++++ .../main/java/com/epmet/entity/IcResiMemberEntity.java | 10 ++++++++++ .../db/migration/V0.0.53__ic_resimember_huji.sql | 2 ++ .../src/main/resources/mapper/IcResiCollectDao.xml | 4 ++++ 5 files changed, 30 insertions(+) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.53__ic_resimember_huji.sql diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java index decce16f25..99957503cf 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java @@ -24,6 +24,10 @@ public class CollectListFormDTO extends PageFormDTO { */ private String startDate; private String endDate; + /** + * 户籍所在地 + */ + private String domicilePlace; private String userId; private String customerId; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java index 12aff48466..9e30557f72 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiCollectMemFormDTO.java @@ -49,6 +49,16 @@ public class IcResiCollectMemFormDTO implements Serializable { */ private String domicilePlace; + /** + * 户籍所在地行政地区编码 + */ + private String domicilePlaceCode; + + /** + * 户籍所在地行政地区编码全路径，包含自己,英文逗号隔开例如：37,3702,370203 + */ + private String domicilePlaceCodePath; + /** * 学校或公司 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java index b93190e5c5..b943676543 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiMemberEntity.java @@ -58,6 +58,16 @@ public class IcResiMemberEntity extends BaseEpmetEntity { */ private String domicilePlace; + /** + * 户籍所在地行政地区编码 + */ + private String domicilePlaceCode; + + /** + * 户籍所在地行政地区编码全路径，包含自己,英文逗号隔开例如：37,3702,370203 + */ + private String domicilePlaceCodePath; + /** * 学校或公司 */ diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.53__ic_resimember_huji.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.53__ic_resimember_huji.sql new file mode 100644 index 0000000000..e10f045969 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.53__ic_resimember_huji.sql @@ -0,0 +1,2 @@ +alter table ic_resi_member add COLUMN DOMICILE_PLACE_CODE VARCHAR(64) DEFAULT '' comment '户籍所在地行政地区编码' AFTER DOMICILE_PLACE; +alter table ic_resi_member add COLUMN DOMICILE_PLACE_CODE_PATH VARCHAR(255) DEFAULT '' comment '户籍所在地行政地区编码全路径，包含自己,英文逗号隔开例如：37,3702,370203' AFTER DOMICILE_PLACE_CODE; \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml index ebfe3767fd..9820bdf7d4 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml @@ -42,6 +42,10 @@ AND c.id=#{id} + + AND c.DOMICILE_PLACE LIKE CONCAT('%',#{domicilePlace},'%') + + ORDER BY c.CREATED_TIME DESC + + + - + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/caBmGridDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/caBmGridDao.xml index a87a72b682..2fe689c55c 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/caBmGridDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/caBmGridDao.xml @@ -7,6 +7,17 @@ delete from ca_bm_grid + From 57e73a68fa3d68bb58521a2e58b74d9a7d9fab80 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 17 Jun 2022 13:57:58 +0800 Subject: [PATCH 45/58] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E7=BB=84=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E8=BF=94=E5=9B=9EMULTI=5FSELECT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/ConditionResultDTO.java | 5 +++++ .../java/com/epmet/entity/IcFormQueryBuilderEntity.java | 7 ++++++- .../src/main/resources/mapper/IcFormItemDao.xml | 3 ++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java index 4d0a000b8a..386fffd4d5 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/ConditionResultDTO.java @@ -96,5 +96,10 @@ public class ConditionResultDTO implements Serializable { * 这个表 是否支持添加 即是否是多对一 eg:居民需求是多个对一个 */ private boolean supportAdd; + + /** + * 是否为多选 1可以多选，0单选 + */ + private Integer multiSelect; } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java index 22f83887ba..a6940e9499 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java @@ -76,7 +76,12 @@ public class IcFormQueryBuilderEntity extends BaseEpmetEntity { * 手机号：mobile; 身份证：id_card；只能输入数字:num */ private String validType; - + + /** + * 是否为多选 1可以多选，0单选 + */ + private Integer multiSelect; + /** * 排序 */ diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml index b58666f21c..20974d2afa 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml @@ -85,7 +85,8 @@ IFNULL(i.PLACEHOLDER,'') as PLACEHOLDER, IFNULL(i.COLUMN_NAME,'')as COLUMN_NAME, b.QUERY_TYPE, - b.FUN_TYPE + b.FUN_TYPE, + b.MULTI_SELECT as multiSelect FROM ic_form_query_builder b inner join ic_form_item i on(i.id=b.FORM_ITEM_ID and i.DEL_FLAG='0') LEFT JOIN ic_form_item_group g ON ( i.ITEM_GROUP_ID = g.id ) From 98a769f34cd6a1e4c46bcb5c447884533e632899 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 17 Jun 2022 14:28:21 +0800 Subject: [PATCH 46/58] queryType=resi_category --- .../src/main/resources/mapper/IcResiUserDao.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 81f3c65f49..8fa484805f 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -128,6 +128,12 @@ ${subCondition.tableName}.${subCondition.columnName} like concat('%',#{colValue},'%') + + + + ${subCondition.tableName}.${colValue} ='1' + + From 7961404fa7eb16fab2e1a8dfbbd38df0b8e44374 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 17 Jun 2022 14:37:24 +0800 Subject: [PATCH 47/58] queryType=resi_category --- .../src/main/resources/mapper/IcResiUserDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 8fa484805f..caf51d1d3b 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -130,8 +130,8 @@ - - ${subCondition.tableName}.${colValue} ='1' + + and ${subCondition.tableName}.${colValue} ='1' From 2f5ec4e8bde982c763a797c2fed2ee305ef598f7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 17 Jun 2022 14:47:12 +0800 Subject: [PATCH 48/58] =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiUserDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index caf51d1d3b..182caedcf6 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -130,7 +130,7 @@ - + and ${subCondition.tableName}.${colValue} ='1' From 2d29c8872e1464f09072d319f7fa97d329bcee08 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 17 Jun 2022 16:00:51 +0800 Subject: [PATCH 49/58] =?UTF-8?q?sql=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.0.30__item_query.sql | 7 +++++++ .../src/main/resources/mapper/IcResiUserDao.xml | 8 +++++--- 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.30__item_query.sql diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.30__item_query.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.30__item_query.sql new file mode 100644 index 0000000000..5f8f565bed --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.30__item_query.sql @@ -0,0 +1,7 @@ +alter TABLE ic_form_query_builder add COLUMN `MULTI_SELECT` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1可以多选，0单选，默认0' after VALID_TYPE; + +update ic_form_query_builder set MULTI_SELECT=( + select ic_form_item.MULTI_SELECT from ic_form_item where ic_form_item.CUSTOMER_ID=ic_form_query_builder.CUSTOMER_ID + and ic_form_item.ID=ic_form_query_builder.FORM_ITEM_ID +)where ic_form_query_builder.DEL_FLAG='0' +; diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 182caedcf6..934839a316 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -130,9 +130,11 @@ - - and ${subCondition.tableName}.${colValue} ='1' - + + + and ${subCondition.tableName}.${colValue} ='1' + + From 42d4d9d328ee8eda73c3ec65789f52323fd35caf Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 17 Jun 2022 16:03:47 +0800 Subject: [PATCH 50/58] /latest-submit --- .../src/main/resources/mapper/IcResiMemberDao.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiMemberDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiMemberDao.xml index b9bc9300dd..13db077a3c 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiMemberDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiMemberDao.xml @@ -14,7 +14,10 @@ m.HE_SUAN_COUNT, m.YMJZ, m.DOMICILE_PLACE, - m.WORK_PLACE + m.WORK_PLACE, + m.DOMICILE_PLACE_CODE, + m.DOMICILE_PLACE_CODE_PATH, + m.REMARK FROM ic_resi_member m WHERE From 5ed2d1c2fdb99ca34c276e98be52956058b851df Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 17 Jun 2022 22:36:06 +0800 Subject: [PATCH 51/58] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95=20=E4=BA=8B?= =?UTF-8?q?=E5=8A=A1=E7=B2=92=E5=BA=A6=E5=8F=8A=E5=88=86=E6=89=B9=E5=A4=84?= =?UTF-8?q?=E7=90=86=E7=B2=92=E5=BA=A6=E7=BC=A9=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcUserChangeRecordServiceImpl.java | 36 ++++++++++++------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java index bc88226da3..5e58019074 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java @@ -17,6 +17,7 @@ package com.epmet.service.impl; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; @@ -45,7 +46,6 @@ import com.epmet.service.IcUserChangeRecordService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -175,7 +175,6 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl"+customerId); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -205,8 +204,7 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl map : icUserList){ //存放一个人的类别为是的变更明细数据 - List subList = new ArrayList<>(); - String changeId = UUID.randomUUID().toString().replaceAll("-", ""); + String changeId = IdWorker.getIdStr(); for (IcResiCategoryStatsConfigDTO dto : categoryListResult.getData()){ if(map.containsKey(dto.getColumnName())&&"1".equals(map.get(dto.getColumnName()))){ detailed = new IcUserChangeDetailedEntity(); @@ -228,12 +226,10 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl NumConstant.ZERO) { - detailedList.addAll(subList); - } + if (!hash.containsKey(map.get("CREATED_BY"))) { CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(customerId, map.get("CREATED_BY")); //被删除或被移除的工作人员，名字为空 @@ -257,20 +253,34 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl= NumConstant.FIVE_HUNDRED){ + delAndInsertChangeRecord(customerId, changeList, detailedList); + } } while (icUserList.size() == NumConstant.ONE_THOUSAND); //4.批量新增数据,先删后增【只删除新增节点的历史数据】 //4-1.删除待处理的人员数据【这类人是指在变更记录表中不存在新增节点数据的人】 + //最后再处理一批 + delAndInsertChangeRecord(customerId, changeList, detailedList); + } + + @Transactional(rollbackFor = Exception.class) + public void delAndInsertChangeRecord(String customerId, List changeList, List detailedList) { + if (CollectionUtils.isEmpty(changeList)) { + log.info("customerId:{}初始变更记录数据 已完成!", customerId); + return; + } List icUserIdList = changeList.stream().map(IcUserChangeRecordEntity::getIcUserId).collect(Collectors.toList()); - List> partition = ListUtils.partition(icUserIdList, NumConstant.FIVE_HUNDRED); - partition.forEach(part -> { - baseDao.delByCustomerId(customerId, "add", part); - icUserChangeDetailedService.delByCustomerId(customerId, "add", part); - }); + baseDao.delByCustomerId(customerId, "add", icUserIdList); + icUserChangeDetailedService.delByCustomerId(customerId, "add", icUserIdList); log.info("初始变更记录数据，总条数->" + changeList.size()); icUserChangeRecordService.insertBatch(changeList); log.info("初始变更记录明细数据，总条数->" + detailedList.size()); icUserChangeDetailedService.insertBatch(detailedList); + changeList.clear(); + detailedList.clear(); + icUserIdList.clear(); } } From ba409827beb4114a5f55049b047a23ec5856f816 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 17 Jun 2022 23:09:50 +0800 Subject: [PATCH 52/58] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95=20=E4=B8=8D?= =?UTF-8?q?=E8=A6=81count?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcUserChangeRecordServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java index 5e58019074..172e6b073b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java @@ -197,7 +197,7 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl> icUserList = new ArrayList<>(); do { //一千条一循环查询客户下居民数据 - PageHelper.startPage(pageNo, NumConstant.ONE_THOUSAND); + PageHelper.startPage(pageNo, NumConstant.ONE_THOUSAND,false); icUserList = icResiUserDao.getIcUserList(customerId, columns); pageNo++; From b763c0235b6a015c223937ba0f9d7cef84aee0d6 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 17 Jun 2022 23:44:56 +0800 Subject: [PATCH 53/58] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95=20=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcUserChangeRecordServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java index 172e6b073b..ffd3a18389 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java @@ -252,10 +252,10 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl= NumConstant.FIVE_HUNDRED){ - delAndInsertChangeRecord(customerId, changeList, detailedList); + //每500个居民处理一批 + if (changeList.size()>= NumConstant.FIVE_HUNDRED){ + delAndInsertChangeRecord(customerId, changeList, detailedList); + } } } while (icUserList.size() == NumConstant.ONE_THOUSAND); //4.批量新增数据,先删后增【只删除新增节点的历史数据】 From 20c090046ad380151c542c291b66733b7ac14a6f Mon Sep 17 00:00:00 2001 From: jianjun Date: Sat, 18 Jun 2022 00:08:16 +0800 Subject: [PATCH 54/58] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95=20=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcUserChangeRecordServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java index ffd3a18389..f72d695c5e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserChangeRecordServiceImpl.java @@ -199,7 +199,8 @@ public class IcUserChangeRecordServiceImpl extends BaseServiceImpl map : icUserList){ From df0489940ec6f6b4888311cc301714ae68748a53 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 19 Jun 2022 13:05:08 +0800 Subject: [PATCH 55/58] =?UTF-8?q?=EF=BC=81=3D''?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiUserDao.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 934839a316..edb2455bee 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -132,7 +132,9 @@ - and ${subCondition.tableName}.${colValue} ='1' + + and ${subCondition.tableName}.${colValue} ='1' + From 62451d7338293db67d62e0cdae9ab71a7d4aac92 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 19 Jun 2022 15:16:04 +0800 Subject: [PATCH 56/58] change --- .../main/resources/db/migration/V0.0.30__item_query.sql | 5 ----- .../main/resources/db/migration/V0.0.31__item_query2.sql | 7 +++++++ 2 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__item_query2.sql diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.30__item_query.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.30__item_query.sql index 5f8f565bed..cdf0174eab 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.30__item_query.sql +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.30__item_query.sql @@ -1,7 +1,2 @@ alter TABLE ic_form_query_builder add COLUMN `MULTI_SELECT` tinyint(1) NOT NULL DEFAULT '0' COMMENT '1可以多选，0单选，默认0' after VALID_TYPE; -update ic_form_query_builder set MULTI_SELECT=( - select ic_form_item.MULTI_SELECT from ic_form_item where ic_form_item.CUSTOMER_ID=ic_form_query_builder.CUSTOMER_ID - and ic_form_item.ID=ic_form_query_builder.FORM_ITEM_ID -)where ic_form_query_builder.DEL_FLAG='0' -; diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__item_query2.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__item_query2.sql new file mode 100644 index 0000000000..32d8738bbc --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__item_query2.sql @@ -0,0 +1,7 @@ +update ic_form_query_builder b set b.MULTI_SELECT=( + select i.MULTI_SELECT + from ic_form_item i + where i.CUSTOMER_ID=b.CUSTOMER_ID + and i.ID=b.FORM_ITEM_ID + and i.del_flag='0' +)where b.DEL_FLAG='0'; \ No newline at end of file From b73f2593f533e51f2309bb36543c4cc5898335d4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 19 Jun 2022 15:26:13 +0800 Subject: [PATCH 57/58] =?UTF-8?q?=E4=B8=8D=E6=9B=B4=E6=96=B0=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.0.31__item_query2.sql | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__item_query2.sql diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__item_query2.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__item_query2.sql deleted file mode 100644 index 32d8738bbc..0000000000 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__item_query2.sql +++ /dev/null @@ -1,7 +0,0 @@ -update ic_form_query_builder b set b.MULTI_SELECT=( - select i.MULTI_SELECT - from ic_form_item i - where i.CUSTOMER_ID=b.CUSTOMER_ID - and i.ID=b.FORM_ITEM_ID - and i.del_flag='0' -)where b.DEL_FLAG='0'; \ No newline at end of file From 89443f9a9afc85a5a3fc828575777b46529669c3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 20 Jun 2022 09:40:43 +0800 Subject: [PATCH 58/58] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=87=87=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/CollectListResultDTO.java | 3 +++ .../java/com/epmet/dao/IcResiCollectDao.java | 2 ++ .../main/resources/mapper/IcResiCollectDao.xml | 17 +++++++++++------ 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java index 6a23e0cc1c..0fcaa480d4 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.result; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -38,6 +39,8 @@ public class CollectListResultDTO implements Serializable { */ private Integer totalResi; + private String domicilePlace; + private List list; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java index 547ef63ca8..db8eb3db7c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiCollectDao.java @@ -34,6 +34,8 @@ public interface IcResiCollectDao extends BaseDao { */ List getCollectList(CollectListFormDTO formDTO); + List selectMemberList(@Param("id") String id, @Param("domicilePlace") String domicilePlace); + /** * 我上次提交的主表记录 * @param customerId diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml index 1269859264..d2ca4339c1 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml @@ -16,16 +16,19 @@ - + + - select m.`NAME` AS memberName, m.ID_NUM AS memberIdNum, @@ -63,6 +65,9 @@ from ic_resi_member m where m.DEL_FLAG = 0 and m.IC_RESI_COLLECT_ID = #{id} + + AND m.DOMICILE_PLACE LIKE CONCAT('%',#{domicilePlace},'%') +