From 1c630fa960ddd02a5e9c1ddf82199c8662b53cbf Mon Sep 17 00:00:00 2001 From: shenzhidan Date: Thu, 23 Jul 2026 08:48:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BA=BA=E5=91=98=E5=AE=9A?= =?UTF-8?q?=E4=BD=8D=E5=AE=9E=E6=97=B6=E6=8E=A8=E9=80=81=E5=8F=8A=E6=B8=AF?= =?UTF-8?q?=E5=8C=BA=E6=95=B0=E6=8D=AE=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 接入定位消息匹配和实时推送，增加港区筛选及统计字段；统一企业编号为字符串并补充数据库迁移，切换生产配置。 --- start/src/main/resources/bootstrap.yml | 4 +- start/src/main/resources/kafka.yml | 11 +- web-adapter/pom.xml | 4 + .../web/AlarmDisposeRecordController.java | 4 +- .../web/AlarmRecordController.java | 4 +- .../web/AlarmRecordTargetController.java | 4 +- .../positioning/web/AlarmRuleController.java | 4 +- .../web/AlarmRuleFenceRelController.java | 4 +- .../web/AlarmRuleItemController.java | 4 +- .../positioning/web/AreaController.java | 6 +- .../positioning/web/FenceController.java | 10 +- .../positioning/web/FencePointController.java | 4 +- .../web/OpenapiConfigController.java | 4 +- .../web/PersonnelPositioningBiController.java | 8 +- .../positioning/web/SyncLogController.java | 4 +- .../positioning/web/SyncTaskController.java | 4 +- .../web/TerminalBindController.java | 4 +- .../positioning/web/TerminalController.java | 8 +- .../PersonLocationWebSocketConfiguration.java | 62 ++++ .../PersonLocationWebSocketHandler.java | 93 ++++++ .../command/AlarmRecordFindsPullService.java | 8 +- .../command/AlarmRuleConfigPersistence.java | 12 +- .../command/AlarmRuleFindsPullService.java | 15 +- .../command/FenceCompanyAreaSaveExe.java | 8 +- .../command/FenceFindsPullService.java | 11 +- .../positioning/command/TerminalAppExe.java | 27 +- .../positioning/command/TerminalCardExe.java | 33 +- .../query/AlarmDisposeRecordQueryExe.java | 4 +- .../command/query/AlarmRecordQueryExe.java | 10 +- .../query/AlarmRecordTargetQueryExe.java | 4 +- .../query/AlarmRuleFenceRelQueryExe.java | 4 +- .../command/query/AlarmRuleItemQueryExe.java | 4 +- .../command/query/AlarmRuleQueryExe.java | 14 +- .../command/query/AreaQueryExe.java | 8 +- .../command/query/FencePointQueryExe.java | 4 +- .../command/query/FenceQueryExe.java | 13 +- .../command/query/OpenapiConfigQueryExe.java | 4 +- .../query/PersonnelPositioningBiQueryExe.java | 139 ++++++-- .../PositionPersonLocalLookupService.java | 20 +- .../RealtimeLocationPayloadException.java | 11 + .../query/RealtimePersonLocationMatcher.java | 312 ++++++++++++++++++ .../command/query/SyncLogQueryExe.java | 4 +- .../command/query/SyncTaskQueryExe.java | 4 +- .../command/query/TerminalBindQueryExe.java | 4 +- .../command/query/TerminalQueryExe.java | 4 +- .../integration/finds/FindsOpenApiClient.java | 3 +- .../integration/finds/OpenapiConfigCache.java | 12 +- .../kafka/LocationKafkaProbeListener.java | 64 +++- .../realtime/RealtimeLocationPublisher.java | 5 + .../positioning/service/AreaServiceImpl.java | 2 +- .../positioning/service/FenceServiceImpl.java | 2 +- .../PersonnelPositioningBiServiceImpl.java | 4 +- .../positioning/api/AreaServiceI.java | 2 +- .../positioning/api/FenceServiceI.java | 2 +- .../api/PersonnelPositioningBiServiceI.java | 2 +- .../dto/AlarmDisposeRecordAddCmd.java | 2 +- .../dto/AlarmDisposeRecordPageQry.java | 2 +- .../dto/AlarmDisposeRecordUpdateCmd.java | 2 +- .../positioning/dto/AlarmRecordAddCmd.java | 2 +- .../positioning/dto/AlarmRecordPageQry.java | 2 +- .../dto/AlarmRecordTargetAddCmd.java | 2 +- .../dto/AlarmRecordTargetPageQry.java | 2 +- .../dto/AlarmRecordTargetUpdateCmd.java | 2 +- .../positioning/dto/AlarmRecordUpdateCmd.java | 2 +- .../positioning/dto/AlarmRuleAddCmd.java | 2 +- .../dto/AlarmRuleCompanyPageQry.java | 2 +- .../dto/AlarmRuleFenceRelAddCmd.java | 2 +- .../dto/AlarmRuleFenceRelPageQry.java | 2 +- .../dto/AlarmRuleFenceRelUpdateCmd.java | 2 +- .../positioning/dto/AlarmRuleItemAddCmd.java | 2 +- .../positioning/dto/AlarmRuleItemPageQry.java | 2 +- .../dto/AlarmRuleItemUpdateCmd.java | 2 +- .../positioning/dto/AlarmRulePageQry.java | 2 +- .../positioning/dto/AlarmRuleUpdateCmd.java | 2 +- .../personnel/positioning/dto/AreaAddCmd.java | 2 +- .../positioning/dto/AreaPageQry.java | 2 +- .../positioning/dto/AreaUpdateCmd.java | 2 +- .../positioning/dto/BiCompanyFenceQry.java | 2 +- .../positioning/dto/BiPersonLocationQry.java | 2 +- .../positioning/dto/FenceAddCmd.java | 2 +- .../dto/FenceCompanyAreaSaveCmd.java | 2 +- .../positioning/dto/FenceCompanyPageQry.java | 2 +- .../positioning/dto/FencePageQry.java | 2 +- .../positioning/dto/FencePointAddCmd.java | 2 +- .../positioning/dto/FencePointPageQry.java | 2 +- .../positioning/dto/FencePointUpdateCmd.java | 2 +- .../positioning/dto/FenceSyncCmd.java | 2 +- .../positioning/dto/FenceUpdateCmd.java | 2 +- .../positioning/dto/OpenapiConfigAddCmd.java | 2 +- .../positioning/dto/OpenapiConfigPageQry.java | 2 +- .../dto/OpenapiConfigUpdateCmd.java | 2 +- .../dto/PositionPersonPageQry.java | 2 +- .../dto/PositionVehiclePageQry.java | 2 +- .../positioning/dto/SyncLogAddCmd.java | 2 +- .../positioning/dto/SyncLogPageQry.java | 2 +- .../positioning/dto/SyncLogUpdateCmd.java | 2 +- .../positioning/dto/SyncTaskAddCmd.java | 2 +- .../positioning/dto/SyncTaskPageQry.java | 2 +- .../positioning/dto/SyncTaskUpdateCmd.java | 2 +- .../positioning/dto/TerminalAddCmd.java | 2 +- .../dto/TerminalAppCompanyPageQry.java | 2 +- .../positioning/dto/TerminalAppPageQry.java | 2 +- .../positioning/dto/TerminalAppSaveCmd.java | 2 +- .../positioning/dto/TerminalAppSyncCmd.java | 2 +- .../positioning/dto/TerminalBindAddCmd.java | 2 +- .../positioning/dto/TerminalBindPageQry.java | 2 +- .../dto/TerminalBindUpdateCmd.java | 2 +- .../dto/TerminalCardCompanyPageQry.java | 2 +- .../positioning/dto/TerminalCardPageQry.java | 2 +- .../dto/TerminalCardPersonOptionQry.java | 2 +- .../positioning/dto/TerminalCardSaveCmd.java | 2 +- .../positioning/dto/TerminalCardSyncCmd.java | 2 +- .../positioning/dto/TerminalPageQry.java | 2 +- .../positioning/dto/TerminalUpdateCmd.java | 2 +- .../clientobject/AlarmDisposeRecordCO.java | 2 +- .../dto/clientobject/AlarmRecordCO.java | 2 +- .../dto/clientobject/AlarmRecordTargetCO.java | 2 +- .../dto/clientobject/AlarmRuleCO.java | 2 +- .../clientobject/AlarmRuleCompanyStatCO.java | 2 +- .../dto/clientobject/AlarmRuleFenceRelCO.java | 2 +- .../dto/clientobject/AlarmRuleItemCO.java | 2 +- .../positioning/dto/clientobject/AreaCO.java | 2 +- .../dto/clientobject/BiAreaFenceCO.java | 2 +- .../dto/clientobject/BiCompanyLocationCO.java | 3 + .../dto/clientobject/BiPersonLocationCO.java | 3 + .../dto/clientobject/BiPortStatCO.java | 3 + .../positioning/dto/clientobject/FenceCO.java | 2 +- .../dto/clientobject/FenceCompanyAreaCO.java | 2 +- .../dto/clientobject/FenceCompanyStatCO.java | 2 +- .../dto/clientobject/FencePointCO.java | 2 +- .../dto/clientobject/OpenapiConfigCO.java | 2 +- .../dto/clientobject/PositionPersonCO.java | 2 +- .../dto/clientobject/PositionVehicleCO.java | 2 +- .../dto/clientobject/SyncLogCO.java | 2 +- .../dto/clientobject/SyncTaskCO.java | 2 +- .../dto/clientobject/TerminalAppCO.java | 2 +- .../clientobject/TerminalAppCompanyCO.java | 2 +- .../dto/clientobject/TerminalBindCO.java | 2 +- .../dto/clientobject/TerminalCO.java | 2 +- .../dto/clientobject/TerminalCardCO.java | 2 +- .../clientobject/TerminalCardCompanyCO.java | 2 +- .../TerminalCardCompanyOptionCO.java | 2 +- .../TerminalCardPersonOptionCO.java | 2 +- .../domain/model/AlarmDisposeRecordE.java | 2 +- .../domain/model/AlarmRecordE.java | 2 +- .../domain/model/AlarmRecordTargetE.java | 2 +- .../positioning/domain/model/AlarmRuleE.java | 2 +- .../domain/model/AlarmRuleFenceRelE.java | 2 +- .../domain/model/AlarmRuleItemE.java | 2 +- .../positioning/domain/model/AreaE.java | 2 +- .../positioning/domain/model/FenceE.java | 2 +- .../positioning/domain/model/FencePointE.java | 2 +- .../domain/model/OpenapiConfigE.java | 2 +- .../positioning/domain/model/SyncLogE.java | 2 +- .../positioning/domain/model/SyncTaskE.java | 2 +- .../domain/model/TerminalBindE.java | 2 +- .../positioning/domain/model/TerminalE.java | 2 +- .../dataobject/AlarmDisposeRecordDO.java | 2 +- .../persistence/dataobject/AlarmRecordDO.java | 2 +- .../dataobject/AlarmRecordTargetDO.java | 2 +- .../persistence/dataobject/AlarmRuleDO.java | 2 +- .../dataobject/AlarmRuleFenceRelDO.java | 2 +- .../dataobject/AlarmRuleItemDO.java | 2 +- .../persistence/dataobject/AreaDO.java | 2 +- .../persistence/dataobject/FenceDO.java | 2 +- .../persistence/dataobject/FencePointDO.java | 2 +- .../dataobject/OpenapiConfigDO.java | 2 +- .../persistence/dataobject/SyncLogDO.java | 2 +- .../persistence/dataobject/SyncTaskDO.java | 2 +- .../dataobject/TerminalBindDO.java | 2 +- .../persistence/dataobject/TerminalDO.java | 2 +- .../src/main/resources/TableCreationDDL.sql | 28 +- .../V20260722_01__corp_info_port_area.sql | 5 + .../V20260722_02__corpinfo_id_string.sql | 42 +++ 174 files changed, 1028 insertions(+), 311 deletions(-) create mode 100644 web-adapter/src/main/java/com/zcloud/personnel/positioning/websocket/PersonLocationWebSocketConfiguration.java create mode 100644 web-adapter/src/main/java/com/zcloud/personnel/positioning/websocket/PersonLocationWebSocketHandler.java create mode 100644 web-app/src/main/java/com/zcloud/personnel/positioning/command/query/RealtimeLocationPayloadException.java create mode 100644 web-app/src/main/java/com/zcloud/personnel/positioning/command/query/RealtimePersonLocationMatcher.java create mode 100644 web-app/src/main/java/com/zcloud/personnel/positioning/integration/realtime/RealtimeLocationPublisher.java create mode 100644 web-infrastructure/src/main/resources/db/migration/mysql/V20260722_01__corp_info_port_area.sql create mode 100644 web-infrastructure/src/main/resources/db/migration/mysql/V20260722_02__corpinfo_id_string.sql diff --git a/start/src/main/resources/bootstrap.yml b/start/src/main/resources/bootstrap.yml index dfff433..272b3e7 100644 --- a/start/src/main/resources/bootstrap.yml +++ b/start/src/main/resources/bootstrap.yml @@ -1,8 +1,8 @@ spring: config: import: -# - classpath:nacos-prod.yml - - classpath:nacos.yml + - classpath:nacos-prod.yml +# - classpath:nacos.yml - classpath:kafka.yml - classpath:sdk.yml - classpath:swagger.yml diff --git a/start/src/main/resources/kafka.yml b/start/src/main/resources/kafka.yml index 36b8439..fc17624 100644 --- a/start/src/main/resources/kafka.yml +++ b/start/src/main/resources/kafka.yml @@ -19,7 +19,14 @@ spring: personnel-positioning: kafka: location: - enabled: ${PERSONNEL_POSITIONING_KAFKA_LOCATION_ENABLED:false} + enabled: ${PERSONNEL_POSITIONING_KAFKA_LOCATION_ENABLED:true} topic: ${PERSONNEL_POSITIONING_KAFKA_LOCATION_TOPIC:point_push} - group-id: ${PERSONNEL_POSITIONING_KAFKA_LOCATION_GROUP_ID:personnel-position-location-probe} + # Each WebSocket-serving instance must consume every point so it can notify its own clients. + group-id: ${PERSONNEL_POSITIONING_KAFKA_LOCATION_GROUP_ID:personnel-position-location-${HOSTNAME:standalone}} max-log-bytes: ${PERSONNEL_POSITIONING_KAFKA_LOCATION_MAX_LOG_BYTES:16384} + websocket: + location: + enabled: ${PERSONNEL_POSITIONING_WEBSOCKET_LOCATION_ENABLED:true} + allowed-origins: ${PERSONNEL_POSITIONING_WEBSOCKET_LOCATION_ALLOWED_ORIGINS:*} + send-time-limit-ms: ${PERSONNEL_POSITIONING_WEBSOCKET_LOCATION_SEND_TIME_LIMIT_MS:10000} + buffer-size-limit-bytes: ${PERSONNEL_POSITIONING_WEBSOCKET_LOCATION_BUFFER_SIZE_LIMIT_BYTES:524288} diff --git a/web-adapter/pom.xml b/web-adapter/pom.xml index 34bf4e0..5662def 100644 --- a/web-adapter/pom.xml +++ b/web-adapter/pom.xml @@ -30,5 +30,9 @@ com.zcloud.personnel.positioning web-client + + org.springframework + spring-websocket + diff --git a/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/AlarmDisposeRecordController.java b/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/AlarmDisposeRecordController.java index c9acb2d..810914c 100644 --- a/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/AlarmDisposeRecordController.java +++ b/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/AlarmDisposeRecordController.java @@ -88,14 +88,14 @@ public class AlarmDisposeRecordController { private void fillCorpinfo(AlarmDisposeRecordAddCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(ssoUser.getCompanyId()); + cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); } } private void fillCorpinfo(AlarmDisposeRecordUpdateCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(ssoUser.getCompanyId()); + cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); } } } diff --git a/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/AlarmRecordController.java b/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/AlarmRecordController.java index 31ea5a0..59e68c8 100644 --- a/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/AlarmRecordController.java +++ b/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/AlarmRecordController.java @@ -101,14 +101,14 @@ public class AlarmRecordController { private void fillCorpinfo(AlarmRecordAddCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(ssoUser.getCompanyId()); + cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); } } private void fillCorpinfo(AlarmRecordUpdateCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(ssoUser.getCompanyId()); + cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); } } } diff --git a/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/AlarmRecordTargetController.java b/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/AlarmRecordTargetController.java index 893801d..a5b2b69 100644 --- a/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/AlarmRecordTargetController.java +++ b/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/AlarmRecordTargetController.java @@ -88,14 +88,14 @@ public class AlarmRecordTargetController { private void fillCorpinfo(AlarmRecordTargetAddCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(ssoUser.getCompanyId()); + cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); } } private void fillCorpinfo(AlarmRecordTargetUpdateCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(ssoUser.getCompanyId()); + cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); } } } diff --git a/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/AlarmRuleController.java b/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/AlarmRuleController.java index 37dfc5c..06f23f5 100644 --- a/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/AlarmRuleController.java +++ b/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/AlarmRuleController.java @@ -117,14 +117,14 @@ public class AlarmRuleController { private void fillCorpinfo(AlarmRuleAddCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (cmd.getCorpinfoId() == null && ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(ssoUser.getCompanyId()); + cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); } } private void fillCorpinfo(AlarmRuleUpdateCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (cmd.getCorpinfoId() == null && ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(ssoUser.getCompanyId()); + cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); } } } diff --git a/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/AlarmRuleFenceRelController.java b/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/AlarmRuleFenceRelController.java index 4458fd9..96df64c 100644 --- a/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/AlarmRuleFenceRelController.java +++ b/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/AlarmRuleFenceRelController.java @@ -88,14 +88,14 @@ public class AlarmRuleFenceRelController { private void fillCorpinfo(AlarmRuleFenceRelAddCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(ssoUser.getCompanyId()); + cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); } } private void fillCorpinfo(AlarmRuleFenceRelUpdateCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(ssoUser.getCompanyId()); + cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); } } } diff --git a/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/AlarmRuleItemController.java b/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/AlarmRuleItemController.java index cbe162a..2197c7c 100644 --- a/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/AlarmRuleItemController.java +++ b/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/AlarmRuleItemController.java @@ -88,14 +88,14 @@ public class AlarmRuleItemController { private void fillCorpinfo(AlarmRuleItemAddCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(ssoUser.getCompanyId()); + cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); } } private void fillCorpinfo(AlarmRuleItemUpdateCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(ssoUser.getCompanyId()); + cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); } } } diff --git a/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/AreaController.java b/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/AreaController.java index afacbae..67a6401 100644 --- a/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/AreaController.java +++ b/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/AreaController.java @@ -60,7 +60,7 @@ public class AreaController { @ApiOperation("可选区域选项") @GetMapping("/options") - public MultiResponse options(@RequestParam(required = false) Long corpinfoId, + public MultiResponse options(@RequestParam(required = false) String corpinfoId, @RequestParam(required = false) String keyword) { return MultiResponse.of(areaService.listOptions(corpinfoId, keyword)); } @@ -96,14 +96,14 @@ public class AreaController { private void fillCorpinfo(AreaAddCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(ssoUser.getCompanyId()); + cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); } } private void fillCorpinfo(AreaUpdateCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(ssoUser.getCompanyId()); + cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); } } } diff --git a/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/FenceController.java b/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/FenceController.java index 85747be..9dbbe3c 100644 --- a/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/FenceController.java +++ b/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/FenceController.java @@ -53,11 +53,11 @@ public class FenceController { @ApiOperation("公司区域详情") @GetMapping("/company-area") - public SingleResponse getCompanyArea(@RequestParam(required = false) Long corpinfoId, + public SingleResponse getCompanyArea(@RequestParam(required = false) String corpinfoId, @RequestParam(required = false) String corpinfoName) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (corpinfoId == null && ssoUser != null && ssoUser.getCompanyId() != null) { - corpinfoId = ssoUser.getCompanyId(); + corpinfoId = String.valueOf(ssoUser.getCompanyId()); } return SingleResponse.of(fenceService.queryCompanyArea(corpinfoId, corpinfoName)); } @@ -139,21 +139,21 @@ public class FenceController { private void fillCorpinfo(FenceAddCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (cmd.getCorpinfoId() == null && ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(ssoUser.getCompanyId()); + cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); } } private void fillCorpinfo(FenceUpdateCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (cmd.getCorpinfoId() == null && ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(ssoUser.getCompanyId()); + cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); } } private void fillCorpinfo(FenceCompanyAreaSaveCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (cmd.getCorpinfoId() == null && ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(ssoUser.getCompanyId()); + cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); } } } diff --git a/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/FencePointController.java b/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/FencePointController.java index c9eed13..92cdba5 100644 --- a/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/FencePointController.java +++ b/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/FencePointController.java @@ -88,14 +88,14 @@ public class FencePointController { private void fillCorpinfo(FencePointAddCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(ssoUser.getCompanyId()); + cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); } } private void fillCorpinfo(FencePointUpdateCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(ssoUser.getCompanyId()); + cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); } } } diff --git a/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/OpenapiConfigController.java b/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/OpenapiConfigController.java index d76fcf5..36db006 100644 --- a/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/OpenapiConfigController.java +++ b/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/OpenapiConfigController.java @@ -88,14 +88,14 @@ public class OpenapiConfigController { private void fillCorpinfo(OpenapiConfigAddCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(ssoUser.getCompanyId()); + cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); } } private void fillCorpinfo(OpenapiConfigUpdateCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(ssoUser.getCompanyId()); + cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); } } } diff --git a/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/PersonnelPositioningBiController.java b/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/PersonnelPositioningBiController.java index a252b23..9c99f4d 100644 --- a/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/PersonnelPositioningBiController.java +++ b/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/PersonnelPositioningBiController.java @@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; /** @@ -42,10 +43,11 @@ public class PersonnelPositioningBiController { return SingleResponse.of(personnelPositioningBiService.queryOverview()); } - @ApiOperation("公司定位点") + @ApiOperation("公司定位点，可按港区过滤") @GetMapping("/companyLocation/list") - public MultiResponse listCompanyLocation() { - return MultiResponse.of(personnelPositioningBiService.listCompanyLocation()); + public MultiResponse listCompanyLocation( + @RequestParam(value = "portArea", required = false) Integer portArea) { + return MultiResponse.of(personnelPositioningBiService.listCompanyLocation(portArea)); } @ApiOperation("公司围栏分页") diff --git a/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/SyncLogController.java b/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/SyncLogController.java index 26c1bfb..8beef8d 100644 --- a/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/SyncLogController.java +++ b/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/SyncLogController.java @@ -88,14 +88,14 @@ public class SyncLogController { private void fillCorpinfo(SyncLogAddCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(ssoUser.getCompanyId()); + cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); } } private void fillCorpinfo(SyncLogUpdateCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(ssoUser.getCompanyId()); + cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); } } } diff --git a/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/SyncTaskController.java b/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/SyncTaskController.java index 0aa97d9..8241620 100644 --- a/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/SyncTaskController.java +++ b/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/SyncTaskController.java @@ -88,14 +88,14 @@ public class SyncTaskController { private void fillCorpinfo(SyncTaskAddCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(ssoUser.getCompanyId()); + cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); } } private void fillCorpinfo(SyncTaskUpdateCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(ssoUser.getCompanyId()); + cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); } } } diff --git a/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/TerminalBindController.java b/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/TerminalBindController.java index f7e8c59..9a8c86f 100644 --- a/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/TerminalBindController.java +++ b/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/TerminalBindController.java @@ -88,14 +88,14 @@ public class TerminalBindController { private void fillCorpinfo(TerminalBindAddCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(ssoUser.getCompanyId()); + cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); } } private void fillCorpinfo(TerminalBindUpdateCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(ssoUser.getCompanyId()); + cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); } } } diff --git a/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/TerminalController.java b/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/TerminalController.java index 0011d27..92397a7 100644 --- a/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/TerminalController.java +++ b/web-adapter/src/main/java/com/zcloud/personnel/positioning/web/TerminalController.java @@ -208,28 +208,28 @@ public class TerminalController { private void fillCorpinfo(TerminalAddCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(ssoUser.getCompanyId()); + cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); } } private void fillCorpinfo(TerminalUpdateCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(ssoUser.getCompanyId()); + cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); } } private void fillCorpinfo(TerminalCardSaveCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (cmd.getCorpinfoId() == null && ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(ssoUser.getCompanyId()); + cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); } } private void fillCorpinfo(TerminalAppSaveCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (cmd.getCorpinfoId() == null && ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(ssoUser.getCompanyId()); + cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); } } } diff --git a/web-adapter/src/main/java/com/zcloud/personnel/positioning/websocket/PersonLocationWebSocketConfiguration.java b/web-adapter/src/main/java/com/zcloud/personnel/positioning/websocket/PersonLocationWebSocketConfiguration.java new file mode 100644 index 0000000..e576e48 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/personnel/positioning/websocket/PersonLocationWebSocketConfiguration.java @@ -0,0 +1,62 @@ +package com.zcloud.personnel.positioning.websocket; + +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.annotation.Configuration; +import org.springframework.util.StringUtils; +import org.springframework.web.socket.config.annotation.EnableWebSocket; +import org.springframework.web.socket.config.annotation.WebSocketConfigurer; +import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry; + +import java.util.ArrayList; +import java.util.List; + +@Configuration +@EnableWebSocket +@RequiredArgsConstructor +@ConditionalOnProperty( + prefix = "personnel-positioning.websocket.location", + name = "enabled", + havingValue = "true", + matchIfMissing = true +) +public class PersonLocationWebSocketConfiguration implements WebSocketConfigurer { + private final PersonLocationWebSocketHandler handler; + + @Value("${application.gateway:personnelPosition}") + private String gateway; + + @Value("${personnel-positioning.websocket.location.allowed-origins:*}") + private String allowedOrigins; + + @Override + public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) { + registry.addHandler(handler, endpointPath()) + .setAllowedOrigins(originValues()); + } + + private String endpointPath() { + String value = gateway == null ? "" : gateway.trim(); + while (value.startsWith("/")) { + value = value.substring(1); + } + while (value.endsWith("/")) { + value = value.substring(0, value.length() - 1); + } + return StringUtils.hasText(value) ? "/" + value + "/ws/location" : "/ws/location"; + } + + private String[] originValues() { + List values = new ArrayList<>(); + for (String origin : StringUtils.commaDelimitedListToStringArray(allowedOrigins)) { + if (StringUtils.hasText(origin)) { + values.add(origin.trim()); + } + } + if (values.isEmpty()) { + values.add("*"); + } + return values.toArray(new String[0]); + } +} diff --git a/web-adapter/src/main/java/com/zcloud/personnel/positioning/websocket/PersonLocationWebSocketHandler.java b/web-adapter/src/main/java/com/zcloud/personnel/positioning/websocket/PersonLocationWebSocketHandler.java new file mode 100644 index 0000000..795e8d4 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/personnel/positioning/websocket/PersonLocationWebSocketHandler.java @@ -0,0 +1,93 @@ +package com.zcloud.personnel.positioning.websocket; + +import com.zcloud.personnel.positioning.integration.realtime.RealtimeLocationPublisher; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; +import org.springframework.web.socket.CloseStatus; +import org.springframework.web.socket.TextMessage; +import org.springframework.web.socket.WebSocketSession; +import org.springframework.web.socket.handler.ConcurrentWebSocketSessionDecorator; +import org.springframework.web.socket.handler.TextWebSocketHandler; + +import java.io.IOException; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +@Component +public class PersonLocationWebSocketHandler extends TextWebSocketHandler implements RealtimeLocationPublisher { + private static final Logger LOGGER = LoggerFactory.getLogger(PersonLocationWebSocketHandler.class); + + private final Map sessions = new ConcurrentHashMap<>(); + private final int sendTimeLimitMs; + private final int bufferSizeLimitBytes; + + public PersonLocationWebSocketHandler( + @Value("${personnel-positioning.websocket.location.send-time-limit-ms:10000}") int sendTimeLimitMs, + @Value("${personnel-positioning.websocket.location.buffer-size-limit-bytes:524288}") + int bufferSizeLimitBytes) { + this.sendTimeLimitMs = Math.max(1, sendTimeLimitMs); + this.bufferSizeLimitBytes = Math.max(1024, bufferSizeLimitBytes); + } + + @Override + public void afterConnectionEstablished(WebSocketSession session) { + WebSocketSession concurrentSession = new ConcurrentWebSocketSessionDecorator( + session, sendTimeLimitMs, bufferSizeLimitBytes); + sessions.put(session.getId(), concurrentSession); + LOGGER.info("Personnel location WebSocket connected, sessionId={}, connectionCount={}", + session.getId(), sessions.size()); + } + + @Override + public void afterConnectionClosed(WebSocketSession session, CloseStatus status) { + sessions.remove(session.getId()); + LOGGER.info("Personnel location WebSocket disconnected, sessionId={}, status={}, connectionCount={}", + session.getId(), status, sessions.size()); + } + + @Override + public void handleTransportError(WebSocketSession session, Throwable exception) { + removeAndClose(session.getId()); + LOGGER.warn("Personnel location WebSocket transport error, sessionId={}, connectionCount={}", + session.getId(), sessions.size(), exception); + } + + @Override + public int publish(String payload) { + TextMessage message = new TextMessage(payload); + int delivered = 0; + for (Map.Entry entry : sessions.entrySet()) { + WebSocketSession session = entry.getValue(); + if (!session.isOpen()) { + sessions.remove(entry.getKey(), session); + continue; + } + try { + session.sendMessage(message); + delivered++; + } catch (Exception e) { + removeAndClose(entry.getKey()); + LOGGER.warn("Failed to send personnel location, sessionId={}", entry.getKey(), e); + } + } + return delivered; + } + + int connectionCount() { + return sessions.size(); + } + + private void removeAndClose(String sessionId) { + WebSocketSession session = sessions.remove(sessionId); + if (session == null || !session.isOpen()) { + return; + } + try { + session.close(CloseStatus.SERVER_ERROR); + } catch (IOException e) { + LOGGER.debug("Failed to close personnel location WebSocket, sessionId={}", sessionId, e); + } + } +} diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/AlarmRecordFindsPullService.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/AlarmRecordFindsPullService.java index 2dea3c7..e25d509 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/AlarmRecordFindsPullService.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/AlarmRecordFindsPullService.java @@ -223,7 +223,7 @@ public class AlarmRecordFindsPullService { record.setStartFencesJson(jsonValue(row.path("startFences"))); record.setEndFencesJson(jsonValue(row.path("endFences"))); fillLocation(record, row.path("location")); - record.setCorpinfoId(config.getCorpinfoId() == null ? 0L : config.getCorpinfoId()); + record.setCorpinfoId(config.getCorpinfoId() == null ? "0" : config.getCorpinfoId()); record.setCorpinfoName(defaultIfBlank(config.getCorpinfoName(), resolveCorpinfoName(config.getCorpinfoId()))); fillFirstTrack(record, row.path("trackInfoList")); record.setTerminalNoListJson(jsonValue(row.path("terminalNoList"))); @@ -333,7 +333,7 @@ public class AlarmRecordFindsPullService { task.setTaskCode(taskCode); task.setTaskName("FindS告警增量拉取-" + configIdentity(config)); task.setBizType("ALARM"); - task.setCorpinfoId(config.getCorpinfoId() == null ? 0L : config.getCorpinfoId()); + task.setCorpinfoId(config.getCorpinfoId() == null ? "0" : config.getCorpinfoId()); task.setCorpinfoName(config.getCorpinfoName()); task.setSyncDirection("PULL"); task.setCronExpr(TASK_CRON); @@ -546,7 +546,7 @@ public class AlarmRecordFindsPullService { return terminalNoList.asText(); } - private String resolveCorpinfoName(Long corpinfoId) { + private String resolveCorpinfoName(String corpinfoId) { if (corpinfoId == null) { return null; } @@ -554,7 +554,7 @@ public class AlarmRecordFindsPullService { List names = jdbcTemplate.queryForList( "SELECT corp_name FROM corp_info WHERE CAST(corpinfo_id AS CHAR) = ? " + "AND (delete_enum IS NULL OR delete_enum = 'FALSE') LIMIT 1", - String.class, String.valueOf(corpinfoId)); + String.class, corpinfoId); return names.isEmpty() ? null : names.get(0); } catch (Exception ignored) { return null; diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/AlarmRuleConfigPersistence.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/AlarmRuleConfigPersistence.java index c77a0b9..aefb7c9 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/AlarmRuleConfigPersistence.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/AlarmRuleConfigPersistence.java @@ -96,7 +96,7 @@ public class AlarmRuleConfigPersistence { AlarmRuleFenceRelDO rel = new AlarmRuleFenceRelDO(); BeanUtils.copyProperties(relCmd, rel); rel.setRuleId(rule.getId()); - rel.setCorpinfoId(defaultLong(rel.getCorpinfoId(), rule.getCorpinfoId())); + rel.setCorpinfoId(defaultString(rel.getCorpinfoId(), rule.getCorpinfoId())); rel.setCorpinfoName(defaultIfBlank(rel.getCorpinfoName(), rule.getCorpinfoName())); rel.setRelType(defaultIfBlank(rel.getRelType(), REL_EFFECTIVE)); fillFenceSnapshot(rel); @@ -126,7 +126,7 @@ public class AlarmRuleConfigPersistence { AlarmRuleItemDO item = new AlarmRuleItemDO(); BeanUtils.copyProperties(itemCmd, item); item.setRuleId(rule.getId()); - item.setCorpinfoId(defaultLong(item.getCorpinfoId(), rule.getCorpinfoId())); + item.setCorpinfoId(defaultString(item.getCorpinfoId(), rule.getCorpinfoId())); item.setCorpinfoName(defaultIfBlank(item.getCorpinfoName(), rule.getCorpinfoName())); if (item.getLevel() == null) { item.setLevel(1); @@ -171,7 +171,7 @@ public class AlarmRuleConfigPersistence { rel.setFenceName(fence.getFenceName()); rel.setFindsFenceId(fence.getFindsFenceId()); rel.setRelType(REL_EFFECTIVE); - rel.setCorpinfoId(defaultLong(rule.getCorpinfoId(), fence.getCorpinfoId())); + rel.setCorpinfoId(defaultString(rule.getCorpinfoId(), fence.getCorpinfoId())); rel.setCorpinfoName(defaultIfBlank(rule.getCorpinfoName(), fence.getCorpinfoName())); alarmRuleFenceRelRepository.save(rel); } @@ -187,7 +187,7 @@ public class AlarmRuleConfigPersistence { } rel.setFenceName(defaultIfBlank(rel.getFenceName(), fence.getFenceName())); rel.setFindsFenceId(defaultLong(rel.getFindsFenceId(), fence.getFindsFenceId())); - rel.setCorpinfoId(defaultLong(rel.getCorpinfoId(), fence.getCorpinfoId())); + rel.setCorpinfoId(defaultString(rel.getCorpinfoId(), fence.getCorpinfoId())); rel.setCorpinfoName(defaultIfBlank(rel.getCorpinfoName(), fence.getCorpinfoName())); } @@ -265,4 +265,8 @@ public class AlarmRuleConfigPersistence { private Long defaultLong(Long value, Long defaultValue) { return value == null ? defaultValue : value; } + + private String defaultString(String value, String defaultValue) { + return StringUtils.hasText(value) ? value : defaultValue; + } } diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/AlarmRuleFindsPullService.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/AlarmRuleFindsPullService.java index 9ecc885..3591fb4 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/AlarmRuleFindsPullService.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/AlarmRuleFindsPullService.java @@ -61,12 +61,12 @@ public class AlarmRuleFindsPullService { private final ObjectMapper objectMapper; public void refreshForCompanyStats(AlarmRuleCompanyPageQry qry) { - Long companyId = qry == null ? null : qry.getEqCorpinfoId(); + String companyId = qry == null ? null : qry.getEqCorpinfoId(); refreshConfigs(resolveConfigs(companyId), null); } public void refreshForList(AlarmRulePageQry qry) { - Long companyId = qry == null ? null : qry.getEqCorpinfoId(); + String companyId = qry == null ? null : qry.getEqCorpinfoId(); String alarmCode = qry == null ? null : qry.getEqAlarmCode(); refreshConfigs(resolveConfigs(companyId), alarmCode); } @@ -174,7 +174,7 @@ public class AlarmRuleFindsPullService { rule.setTrackTypes(defaultIfBlank(rule.getTrackTypes(), "STAFF")); rule.setCrashType(firstText(row.path("crashType"), rule.getCrashType())); FenceDO scopeFence = findFirstScopeFence(scope); - Long corpinfoId = config.getCorpinfoId() != null + String corpinfoId = config.getCorpinfoId() != null ? config.getCorpinfoId() : (scopeFence == null ? rule.getCorpinfoId() : scopeFence.getCorpinfoId()); String corpinfoName = defaultIfBlank(config.getCorpinfoName(), @@ -315,11 +315,12 @@ public class AlarmRuleFindsPullService { } } - private List resolveConfigs(Long requestedCorpinfoId) { + private List resolveConfigs(String requestedCorpinfoId) { SSOUser ssoUser = AuthContext.getCurrentUser(); - Long corpinfoId = requestedCorpinfoId != null + String corpinfoId = requestedCorpinfoId != null ? requestedCorpinfoId - : (ssoUser == null ? null : ssoUser.getCompanyId()); + : (ssoUser == null || ssoUser.getCompanyId() == null + ? null : String.valueOf(ssoUser.getCompanyId())); QueryWrapper queryWrapper = baseConfigQuery(); if (corpinfoId != null) { queryWrapper.eq("corpinfo_id", corpinfoId); @@ -327,7 +328,7 @@ public class AlarmRuleFindsPullService { List configs = openapiConfigRepository.list(queryWrapper); if ((configs == null || configs.isEmpty()) && corpinfoId != null) { QueryWrapper defaultWrapper = baseConfigQuery(); - defaultWrapper.and(wrapper -> wrapper.isNull("corpinfo_id").or().eq("corpinfo_id", 0)); + defaultWrapper.and(wrapper -> wrapper.isNull("corpinfo_id").or().eq("corpinfo_id", "0")); configs = openapiConfigRepository.list(defaultWrapper); if (configs != null) { for (OpenapiConfigDO config : configs) { diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/FenceCompanyAreaSaveExe.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/FenceCompanyAreaSaveExe.java index ffbe852..dcc6003 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/FenceCompanyAreaSaveExe.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/FenceCompanyAreaSaveExe.java @@ -36,7 +36,7 @@ public class FenceCompanyAreaSaveExe { return map(area, fence); } - public FenceCompanyAreaCO query(Long corpinfoId, String corpinfoName) { + public FenceCompanyAreaCO query(String corpinfoId, String corpinfoName) { AreaDO area = queryArea(null, corpinfoId, corpinfoName); FenceDO fence = null; if (area != null && area.getBindFenceId() != null) { @@ -142,7 +142,7 @@ public class FenceCompanyAreaSaveExe { return fence; } - private AreaDO queryArea(Long areaId, Long corpinfoId, String corpinfoName) { + private AreaDO queryArea(Long areaId, String corpinfoId, String corpinfoName) { if (areaId != null) { return areaRepository.getById(areaId); } @@ -155,7 +155,7 @@ public class FenceCompanyAreaSaveExe { return areaRepository.getOne(queryWrapper, false); } - private FenceDO queryFence(Long fenceId, Long corpinfoId, String corpinfoName) { + private FenceDO queryFence(Long fenceId, String corpinfoId, String corpinfoName) { if (fenceId != null) { return fenceRepository.getById(fenceId); } @@ -168,7 +168,7 @@ public class FenceCompanyAreaSaveExe { return fenceRepository.getOne(queryWrapper, false); } - private void applyCompany(QueryWrapper queryWrapper, Long corpinfoId, String corpinfoName) { + private void applyCompany(QueryWrapper queryWrapper, String corpinfoId, String corpinfoName) { if (corpinfoId != null) { queryWrapper.eq("corpinfo_id", corpinfoId); return; diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/FenceFindsPullService.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/FenceFindsPullService.java index e268140..07dec19 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/FenceFindsPullService.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/FenceFindsPullService.java @@ -57,7 +57,7 @@ public class FenceFindsPullService { public FenceSyncCO sync(FenceSyncCmd cmd) { FenceSyncCmd command = cmd == null ? new FenceSyncCmd() : cmd; - Long companyId = command.getCorpinfoId() == null ? currentCompanyId() : command.getCorpinfoId(); + String companyId = command.getCorpinfoId() == null ? currentCompanyId() : command.getCorpinfoId(); if (command.getCorpinfoId() == null && companyId != null) { command.setCorpinfoId(companyId); } @@ -339,7 +339,7 @@ public class FenceFindsPullService { private CorpInfo mapCorpInfo(ResultSet rs, int rowNum) throws SQLException { CorpInfo corpInfo = new CorpInfo(); - long id = rs.getLong("corpinfo_id"); + String id = rs.getString("corpinfo_id"); corpInfo.corpinfoId = rs.wasNull() ? null : id; corpInfo.corpName = rs.getString("corp_name"); corpInfo.orgCode = rs.getString("code"); @@ -510,13 +510,14 @@ public class FenceFindsPullService { return value == null || value < 1 ? defaultValue : value; } - private Long currentCompanyId() { + private String currentCompanyId() { SSOUser currentUser = AuthContext.getCurrentUser(); - return currentUser == null ? null : currentUser.getCompanyId(); + return currentUser == null || currentUser.getCompanyId() == null + ? null : String.valueOf(currentUser.getCompanyId()); } private static class CorpInfo { - private Long corpinfoId; + private String corpinfoId; private String corpName; private String orgCode; } diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/TerminalAppExe.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/TerminalAppExe.java index 38e8fd0..ae1f0df 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/TerminalAppExe.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/TerminalAppExe.java @@ -340,12 +340,12 @@ public class TerminalAppExe { sql.append(" AND COALESCE(tb.id_card_no, t.bind_id_card_no) = ?"); args.add(qry.getIdCardNo().trim()); } - Long requestedCorpinfoId = qry.getEqCorpinfoId(); + String requestedCorpinfoId = qry.getEqCorpinfoId(); boolean hasEqCorpinfoName = StringUtils.hasText(qry.getEqCorpinfoName()); boolean hasLikeCorpinfoName = StringUtils.hasText(qry.getLikeCorpinfoName()); boolean hasExplicitCorpinfoFilter = requestedCorpinfoId != null || hasEqCorpinfoName || hasLikeCorpinfoName; - Long corpinfoId = hasExplicitCorpinfoFilter ? requestedCorpinfoId : currentCompanyId(); + String corpinfoId = hasExplicitCorpinfoFilter ? requestedCorpinfoId : currentCompanyId(); if (requestedCorpinfoId != null && hasEqCorpinfoName) { String corpinfoName = qry.getEqCorpinfoName().trim(); sql.append(" AND (t.corpinfo_id = ? OR (t.corpinfo_id IS NULL" @@ -444,7 +444,7 @@ public class TerminalAppExe { terminal.getTerminalName(), appAccount)); terminal.setDeviceType(DEVICE_TYPE_APP); terminal.setAppAccount(appAccount); - terminal.setCorpinfoId(corpInfo == null ? firstLong(cmd.getCorpinfoId(), terminal.getCorpinfoId()) : corpInfo.corpinfoId); + terminal.setCorpinfoId(corpInfo == null ? firstText(cmd.getCorpinfoId(), terminal.getCorpinfoId()) : corpInfo.corpinfoId); terminal.setCorpinfoName(firstText(cmd.getCorpinfoName(), corpInfo == null ? null : corpInfo.corpName, textValue(child(row, "corpinfoName")), textValue(child(row, "corpName")), textValue(child(row, "orgName")), terminal.getCorpinfoName())); @@ -686,7 +686,7 @@ public class TerminalAppExe { return rows.isEmpty() ? fallback : mergePerson(rows.get(0), fallback); } - private CorpInfo resolveCorpInfo(Long corpinfoId, String corpinfoName, String orgCode, String orgName) { + private CorpInfo resolveCorpInfo(String corpinfoId, String corpinfoName, String orgCode, String orgName) { List args = new ArrayList<>(); StringBuilder sql = new StringBuilder("SELECT corpinfo_id, corp_name, code, contacts, lr_name FROM corp_info " + "WHERE (delete_enum IS NULL OR delete_enum = 'FALSE')"); @@ -709,7 +709,7 @@ public class TerminalAppExe { private TerminalAppCompanyCO mapCompany(ResultSet rs, int rowNum) throws SQLException { TerminalAppCompanyCO co = new TerminalAppCompanyCO(); - long corpinfoId = rs.getLong("corpinfo_id"); + String corpinfoId = rs.getString("corpinfo_id"); co.setCorpinfoId(rs.wasNull() ? null : corpinfoId); co.setCorpinfoName(rs.getString("corpinfo_name")); co.setOrgCode(rs.getString("org_code")); @@ -727,7 +727,7 @@ public class TerminalAppExe { co.setAppAccount(rs.getString("app_account")); co.setTerminalNo(rs.getString("terminal_no")); co.setTerminalName(rs.getString("terminal_name")); - long corpinfoId = rs.getLong("corpinfo_id"); + String corpinfoId = rs.getString("corpinfo_id"); co.setCorpinfoId(rs.wasNull() ? null : corpinfoId); co.setCorpinfoName(rs.getString("corpinfo_name")); co.setOrgCode(rs.getString("org_code")); @@ -757,7 +757,7 @@ public class TerminalAppExe { person.staffName = rs.getString("staff_name"); person.idCardNo = rs.getString("id_card_no"); person.mobileNo = rs.getString("mobile_no"); - long corpinfoId = rs.getLong("corpinfo_id"); + String corpinfoId = rs.getString("corpinfo_id"); person.corpinfoId = rs.wasNull() ? null : corpinfoId; person.corpinfoName = rs.getString("corpinfo_name"); return person; @@ -765,7 +765,7 @@ public class TerminalAppExe { private CorpInfo mapCorpInfo(ResultSet rs, int rowNum) throws SQLException { CorpInfo corpInfo = new CorpInfo(); - long corpinfoId = rs.getLong("corpinfo_id"); + String corpinfoId = rs.getString("corpinfo_id"); corpInfo.corpinfoId = rs.wasNull() ? null : corpinfoId; corpInfo.corpName = rs.getString("corp_name"); corpInfo.creditCode = rs.getString("code"); @@ -872,7 +872,7 @@ public class TerminalAppExe { first.staffNo = firstText(first.staffNo, second.staffNo); first.staffName = firstText(first.staffName, second.staffName); first.mobileNo = firstText(first.mobileNo, second.mobileNo); - first.corpinfoId = firstLong(first.corpinfoId, second.corpinfoId); + first.corpinfoId = firstText(first.corpinfoId, second.corpinfoId); first.corpinfoName = firstText(first.corpinfoName, second.corpinfoName); first.findsTrackId = firstLong(first.findsTrackId, second.findsTrackId); return first; @@ -1128,9 +1128,10 @@ public class TerminalAppExe { } } - private Long currentCompanyId() { + private String currentCompanyId() { SSOUser currentUser = AuthContext.getCurrentUser(); - return currentUser == null ? null : currentUser.getCompanyId(); + return currentUser == null || currentUser.getCompanyId() == null + ? null : String.valueOf(currentUser.getCompanyId()); } private static class SyncRowResult { @@ -1144,13 +1145,13 @@ public class TerminalAppExe { private String staffNo; private String staffName; private String mobileNo; - private Long corpinfoId; + private String corpinfoId; private String corpinfoName; private Long findsTrackId; } private static class CorpInfo { - private Long corpinfoId; + private String corpinfoId; private String corpName; private String creditCode; } diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/TerminalCardExe.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/TerminalCardExe.java index fcdb24f..d0c8b72 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/TerminalCardExe.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/TerminalCardExe.java @@ -365,12 +365,12 @@ public class TerminalCardExe { sql.append(" AND COALESCE(tb.id_card_no, t.bind_id_card_no) = ?"); args.add(qry.getIdCardNo().trim()); } - Long requestedCorpinfoId = qry.getEqCorpinfoId(); + String requestedCorpinfoId = qry.getEqCorpinfoId(); boolean hasEqCorpinfoName = StringUtils.hasText(qry.getEqCorpinfoName()); boolean hasLikeCorpinfoName = StringUtils.hasText(qry.getLikeCorpinfoName()); boolean hasExplicitCorpinfoFilter = requestedCorpinfoId != null || hasEqCorpinfoName || hasLikeCorpinfoName; - Long corpinfoId = hasExplicitCorpinfoFilter ? requestedCorpinfoId : currentCompanyId(); + String corpinfoId = hasExplicitCorpinfoFilter ? requestedCorpinfoId : currentCompanyId(); if (requestedCorpinfoId != null && hasEqCorpinfoName) { String corpinfoName = qry.getEqCorpinfoName().trim(); sql.append(" AND (t.corpinfo_id = ? OR (t.corpinfo_id IS NULL" @@ -439,7 +439,7 @@ public class TerminalCardExe { sql.append(" AND u.user_id_card = ?"); args.add(qry.getIdCardNo().trim()); } - Long corpinfoId = firstLong(qry.getCorpinfoId(), currentCompanyId()); + String corpinfoId = firstText(qry.getCorpinfoId(), currentCompanyId()); if (corpinfoId != null) { sql.append(" AND u.corpinfo_id = ?"); args.add(corpinfoId); @@ -497,7 +497,7 @@ public class TerminalCardExe { terminal.setDeviceType(DEVICE_TYPE_CARD); terminal.setSimCardNo(firstText(textValue(child(row, "simCardNo")), textValue(child(row, "simNo")), terminal.getSimCardNo())); - terminal.setCorpinfoId(corpInfo == null ? firstLong(cmd.getCorpinfoId(), terminal.getCorpinfoId()) : corpInfo.corpinfoId); + terminal.setCorpinfoId(corpInfo == null ? firstText(cmd.getCorpinfoId(), terminal.getCorpinfoId()) : corpInfo.corpinfoId); terminal.setCorpinfoName(firstText(cmd.getCorpinfoName(), corpInfo == null ? null : corpInfo.corpName, textValue(child(row, "corpinfoName")), textValue(child(row, "corpName")), textValue(child(row, "orgName")), terminal.getCorpinfoName())); @@ -733,7 +733,7 @@ public class TerminalCardExe { return rows.isEmpty() ? fallback : mergePerson(rows.get(0), fallback); } - private CorpInfo resolveCorpInfo(Long corpinfoId, String corpinfoName, String orgCode, String orgName) { + private CorpInfo resolveCorpInfo(String corpinfoId, String corpinfoName, String orgCode, String orgName) { List args = new ArrayList<>(); StringBuilder sql = new StringBuilder("SELECT corpinfo_id, corp_name, code, contacts, lr_name FROM corp_info " + "WHERE (delete_enum IS NULL OR delete_enum = 'FALSE')"); @@ -756,7 +756,7 @@ public class TerminalCardExe { private TerminalCardCompanyCO mapCompany(ResultSet rs, int rowNum) throws SQLException { TerminalCardCompanyCO co = new TerminalCardCompanyCO(); - long corpinfoId = rs.getLong("corpinfo_id"); + String corpinfoId = rs.getString("corpinfo_id"); co.setCorpinfoId(rs.wasNull() ? null : corpinfoId); co.setCorpinfoName(rs.getString("corpinfo_name")); co.setOrgCode(rs.getString("org_code")); @@ -776,7 +776,7 @@ public class TerminalCardExe { co.setTerminalName(rs.getString("terminal_name")); co.setTerminalModel(rs.getString("terminal_model")); co.setSimCardNo(rs.getString("sim_card_no")); - long corpinfoId = rs.getLong("corpinfo_id"); + String corpinfoId = rs.getString("corpinfo_id"); co.setCorpinfoId(rs.wasNull() ? null : corpinfoId); co.setCorpinfoName(rs.getString("corpinfo_name")); co.setOrgCode(rs.getString("org_code")); @@ -808,7 +808,7 @@ public class TerminalCardExe { co.setStaffName(rs.getString("staff_name")); co.setIdCardNo(rs.getString("id_card_no")); co.setMobileNo(rs.getString("mobile_no")); - long corpinfoId = rs.getLong("corpinfo_id"); + String corpinfoId = rs.getString("corpinfo_id"); co.setCorpinfoId(rs.wasNull() ? null : corpinfoId); co.setCorpinfoName(rs.getString("corpinfo_name")); long departmentId = rs.getLong("department_id"); @@ -819,7 +819,7 @@ public class TerminalCardExe { private TerminalCardCompanyOptionCO mapCompanyOption(ResultSet rs, int rowNum) throws SQLException { TerminalCardCompanyOptionCO co = new TerminalCardCompanyOptionCO(); - long corpinfoId = rs.getLong("corpinfo_id"); + String corpinfoId = rs.getString("corpinfo_id"); co.setCorpinfoId(rs.wasNull() ? null : corpinfoId); co.setCorpinfoName(rs.getString("corp_name")); co.setCreditCode(rs.getString("code")); @@ -833,7 +833,7 @@ public class TerminalCardExe { person.staffName = rs.getString("staff_name"); person.idCardNo = rs.getString("id_card_no"); person.mobileNo = rs.getString("mobile_no"); - long corpinfoId = rs.getLong("corpinfo_id"); + String corpinfoId = rs.getString("corpinfo_id"); person.corpinfoId = rs.wasNull() ? null : corpinfoId; person.corpinfoName = rs.getString("corpinfo_name"); return person; @@ -841,7 +841,7 @@ public class TerminalCardExe { private CorpInfo mapCorpInfo(ResultSet rs, int rowNum) throws SQLException { CorpInfo corpInfo = new CorpInfo(); - long corpinfoId = rs.getLong("corpinfo_id"); + String corpinfoId = rs.getString("corpinfo_id"); corpInfo.corpinfoId = rs.wasNull() ? null : corpinfoId; corpInfo.corpName = rs.getString("corp_name"); corpInfo.creditCode = rs.getString("code"); @@ -929,7 +929,7 @@ public class TerminalCardExe { first.staffNo = firstText(first.staffNo, second.staffNo); first.staffName = firstText(first.staffName, second.staffName); first.mobileNo = firstText(first.mobileNo, second.mobileNo); - first.corpinfoId = firstLong(first.corpinfoId, second.corpinfoId); + first.corpinfoId = firstText(first.corpinfoId, second.corpinfoId); first.corpinfoName = firstText(first.corpinfoName, second.corpinfoName); first.findsTrackId = firstLong(first.findsTrackId, second.findsTrackId); return first; @@ -1177,9 +1177,10 @@ public class TerminalCardExe { } } - private Long currentCompanyId() { + private String currentCompanyId() { SSOUser currentUser = AuthContext.getCurrentUser(); - return currentUser == null ? null : currentUser.getCompanyId(); + return currentUser == null || currentUser.getCompanyId() == null + ? null : String.valueOf(currentUser.getCompanyId()); } private static class SyncRowResult { @@ -1193,13 +1194,13 @@ public class TerminalCardExe { private String staffNo; private String staffName; private String mobileNo; - private Long corpinfoId; + private String corpinfoId; private String corpinfoName; private Long findsTrackId; } private static class CorpInfo { - private Long corpinfoId; + private String corpinfoId; private String corpName; private String creditCode; private String contactName; diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AlarmDisposeRecordQueryExe.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AlarmDisposeRecordQueryExe.java index 536ff30..68eac14 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AlarmDisposeRecordQueryExe.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AlarmDisposeRecordQueryExe.java @@ -53,14 +53,14 @@ public class AlarmDisposeRecordQueryExe { private void fillCorpinfo(Map params) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - params.put("eqCorpinfoId", ssoUser.getCompanyId()); + params.put("eqCorpinfoId", String.valueOf(ssoUser.getCompanyId())); } } private void applyCorpinfo(QueryWrapper queryWrapper) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - queryWrapper.eq("corpinfo_id", ssoUser.getCompanyId()); + queryWrapper.eq("corpinfo_id", String.valueOf(ssoUser.getCompanyId())); } } } diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AlarmRecordQueryExe.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AlarmRecordQueryExe.java index 98bb40b..2893060 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AlarmRecordQueryExe.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AlarmRecordQueryExe.java @@ -90,7 +90,7 @@ public class AlarmRecordQueryExe { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { sql.append(" AND corpinfo_id = ?"); - args.add(ssoUser.getCompanyId()); + args.add(String.valueOf(ssoUser.getCompanyId())); } sql.append(" ORDER BY corp_name ASC LIMIT 200"); return jdbcTemplate.query(sql.toString(), args.toArray(), this::mapCompanyOption); @@ -114,8 +114,8 @@ public class AlarmRecordQueryExe { } private OptionCO mapCompanyOption(ResultSet rs, int rowNum) throws SQLException { - Long corpinfoId = rs.getLong("corpinfo_id"); - return new OptionCO(rs.getString("corp_name"), rs.wasNull() ? null : String.valueOf(corpinfoId)); + String corpinfoId = rs.getString("corpinfo_id"); + return new OptionCO(rs.getString("corp_name"), corpinfoId); } private void fillTargetsAndDisplayFields(List rows) { @@ -186,14 +186,14 @@ public class AlarmRecordQueryExe { } SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - params.put("eqCorpinfoId", ssoUser.getCompanyId()); + params.put("eqCorpinfoId", String.valueOf(ssoUser.getCompanyId())); } } private void applyCorpinfo(QueryWrapper queryWrapper) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - queryWrapper.eq("corpinfo_id", ssoUser.getCompanyId()); + queryWrapper.eq("corpinfo_id", String.valueOf(ssoUser.getCompanyId())); } } diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AlarmRecordTargetQueryExe.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AlarmRecordTargetQueryExe.java index e2e09db..2272591 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AlarmRecordTargetQueryExe.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AlarmRecordTargetQueryExe.java @@ -53,14 +53,14 @@ public class AlarmRecordTargetQueryExe { private void fillCorpinfo(Map params) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - params.put("eqCorpinfoId", ssoUser.getCompanyId()); + params.put("eqCorpinfoId", String.valueOf(ssoUser.getCompanyId())); } } private void applyCorpinfo(QueryWrapper queryWrapper) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - queryWrapper.eq("corpinfo_id", ssoUser.getCompanyId()); + queryWrapper.eq("corpinfo_id", String.valueOf(ssoUser.getCompanyId())); } } } diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AlarmRuleFenceRelQueryExe.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AlarmRuleFenceRelQueryExe.java index bfb8ae0..93ee2f1 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AlarmRuleFenceRelQueryExe.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AlarmRuleFenceRelQueryExe.java @@ -53,14 +53,14 @@ public class AlarmRuleFenceRelQueryExe { private void fillCorpinfo(Map params) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - params.put("eqCorpinfoId", ssoUser.getCompanyId()); + params.put("eqCorpinfoId", String.valueOf(ssoUser.getCompanyId())); } } private void applyCorpinfo(QueryWrapper queryWrapper) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - queryWrapper.eq("corpinfo_id", ssoUser.getCompanyId()); + queryWrapper.eq("corpinfo_id", String.valueOf(ssoUser.getCompanyId())); } } } diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AlarmRuleItemQueryExe.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AlarmRuleItemQueryExe.java index 9d6efc2..050fe38 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AlarmRuleItemQueryExe.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AlarmRuleItemQueryExe.java @@ -53,14 +53,14 @@ public class AlarmRuleItemQueryExe { private void fillCorpinfo(Map params) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - params.put("eqCorpinfoId", ssoUser.getCompanyId()); + params.put("eqCorpinfoId", String.valueOf(ssoUser.getCompanyId())); } } private void applyCorpinfo(QueryWrapper queryWrapper) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - queryWrapper.eq("corpinfo_id", ssoUser.getCompanyId()); + queryWrapper.eq("corpinfo_id", String.valueOf(ssoUser.getCompanyId())); } } } diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AlarmRuleQueryExe.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AlarmRuleQueryExe.java index f737d51..f13384c 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AlarmRuleQueryExe.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AlarmRuleQueryExe.java @@ -87,7 +87,7 @@ public class AlarmRuleQueryExe { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { sql.append(" AND corpinfo_id = ?"); - args.add(ssoUser.getCompanyId()); + args.add(String.valueOf(ssoUser.getCompanyId())); } if (StringUtils.hasText(keyword)) { sql.append(" AND (corp_name LIKE ? OR code LIKE ? OR contacts LIKE ? OR lr_name LIKE ?)"); @@ -169,7 +169,7 @@ public class AlarmRuleQueryExe { private AlarmRuleCompanyStatCO mapCompanyStat(ResultSet rs, int rowNum) throws SQLException { AlarmRuleCompanyStatCO co = new AlarmRuleCompanyStatCO(); - long corpinfoId = rs.getLong("corpinfo_id"); + String corpinfoId = rs.getString("corpinfo_id"); co.setCorpinfoId(rs.wasNull() ? null : corpinfoId); co.setCorpinfoName(rs.getString("corpinfo_name")); co.setConfigCount(rs.getInt("config_count")); @@ -180,8 +180,8 @@ public class AlarmRuleQueryExe { } private OptionCO mapCompanyOption(ResultSet rs, int rowNum) throws SQLException { - long corpinfoId = rs.getLong("corpinfo_id"); - return new OptionCO(rs.getString("corp_name"), rs.wasNull() ? null : String.valueOf(corpinfoId)); + String corpinfoId = rs.getString("corpinfo_id"); + return new OptionCO(rs.getString("corp_name"), corpinfoId); } private void fillFenceRelations(List rows) { @@ -236,12 +236,12 @@ public class AlarmRuleQueryExe { } SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - params.put("eqCorpinfoId", ssoUser.getCompanyId()); + params.put("eqCorpinfoId", String.valueOf(ssoUser.getCompanyId())); } } private void prepareCorpinfoFallback(Map params) { - Object corpinfoId = params.get("eqCorpinfoId"); + String corpinfoId = (String) params.get("eqCorpinfoId"); String corpinfoName = (String) params.get("eqCorpinfoName"); if (corpinfoId == null || !StringUtils.hasText(corpinfoName)) { return; @@ -255,7 +255,7 @@ public class AlarmRuleQueryExe { private void applyCorpinfo(QueryWrapper queryWrapper) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - queryWrapper.eq("corpinfo_id", ssoUser.getCompanyId()); + queryWrapper.eq("corpinfo_id", String.valueOf(ssoUser.getCompanyId())); } } diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AreaQueryExe.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AreaQueryExe.java index fd8debb..fe984ca 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AreaQueryExe.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/AreaQueryExe.java @@ -46,7 +46,7 @@ public class AreaQueryExe { return areaCoConvertor.converDOsToCOs(areaRepository.list(queryWrapper)); } - public List listOptions(Long corpinfoId, String keyword) { + public List listOptions(String corpinfoId, String keyword) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.and(wrapper -> wrapper.isNull("delete_enum").or().eq("delete_enum", "FALSE")); queryWrapper.and(wrapper -> wrapper.isNull("status").or().eq("status", "ENABLED")); @@ -79,18 +79,18 @@ public class AreaQueryExe { } SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - params.put("eqCorpinfoId", ssoUser.getCompanyId()); + params.put("eqCorpinfoId", String.valueOf(ssoUser.getCompanyId())); } } - private void applyCorpinfo(QueryWrapper queryWrapper, Long corpinfoId) { + private void applyCorpinfo(QueryWrapper queryWrapper, String corpinfoId) { if (corpinfoId != null) { queryWrapper.eq("corpinfo_id", corpinfoId); return; } SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - queryWrapper.eq("corpinfo_id", ssoUser.getCompanyId()); + queryWrapper.eq("corpinfo_id", String.valueOf(ssoUser.getCompanyId())); } } } diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/FencePointQueryExe.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/FencePointQueryExe.java index 93194c0..04fead5 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/FencePointQueryExe.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/FencePointQueryExe.java @@ -53,14 +53,14 @@ public class FencePointQueryExe { private void fillCorpinfo(Map params) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - params.put("eqCorpinfoId", ssoUser.getCompanyId()); + params.put("eqCorpinfoId", String.valueOf(ssoUser.getCompanyId())); } } private void applyCorpinfo(QueryWrapper queryWrapper) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - queryWrapper.eq("corpinfo_id", ssoUser.getCompanyId()); + queryWrapper.eq("corpinfo_id", String.valueOf(ssoUser.getCompanyId())); } } } diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/FenceQueryExe.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/FenceQueryExe.java index 5278306..acfe460 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/FenceQueryExe.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/FenceQueryExe.java @@ -41,7 +41,7 @@ public class FenceQueryExe { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { sql.append(" AND corpinfo_id = ?"); - args.add(ssoUser.getCompanyId()); + args.add(String.valueOf(ssoUser.getCompanyId())); } if (StringUtils.hasText(keyword)) { sql.append(" AND (corp_name LIKE ? OR code LIKE ? OR contacts LIKE ? OR lr_name LIKE ?)"); @@ -136,7 +136,7 @@ public class FenceQueryExe { private FenceCompanyStatCO mapCompanyStat(ResultSet rs, int rowNum) throws SQLException { FenceCompanyStatCO co = new FenceCompanyStatCO(); - long corpinfoId = rs.getLong("corpinfo_id"); + String corpinfoId = rs.getString("corpinfo_id"); co.setCorpinfoId(rs.wasNull() ? null : corpinfoId); co.setCorpinfoName(rs.getString("corpinfo_name")); co.setFenceCount(rs.getInt("fence_count")); @@ -147,8 +147,7 @@ public class FenceQueryExe { } private OptionCO mapCompanyOption(ResultSet rs, int rowNum) throws SQLException { - long corpinfoId = rs.getLong("corpinfo_id"); - return new OptionCO(rs.getString("corp_name"), rs.wasNull() ? null : String.valueOf(corpinfoId)); + return new OptionCO(rs.getString("corp_name"), rs.getString("corpinfo_id")); } private void fillCorpinfo(Map params) { @@ -159,12 +158,12 @@ public class FenceQueryExe { } SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - params.put("eqCorpinfoId", ssoUser.getCompanyId()); + params.put("eqCorpinfoId", String.valueOf(ssoUser.getCompanyId())); } } private void prepareCorpinfoFallback(Map params) { - Object corpinfoId = params.get("eqCorpinfoId"); + String corpinfoId = (String) params.get("eqCorpinfoId"); String corpinfoName = (String) params.get("eqCorpinfoName"); if (corpinfoId == null || !StringUtils.hasText(corpinfoName)) { return; @@ -178,7 +177,7 @@ public class FenceQueryExe { private void applyCorpinfo(QueryWrapper queryWrapper) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - queryWrapper.eq("corpinfo_id", ssoUser.getCompanyId()); + queryWrapper.eq("corpinfo_id", String.valueOf(ssoUser.getCompanyId())); } } diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/OpenapiConfigQueryExe.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/OpenapiConfigQueryExe.java index 39251f9..8e490e3 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/OpenapiConfigQueryExe.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/OpenapiConfigQueryExe.java @@ -53,14 +53,14 @@ public class OpenapiConfigQueryExe { private void fillCorpinfo(Map params) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - params.put("eqCorpinfoId", ssoUser.getCompanyId()); + params.put("eqCorpinfoId", String.valueOf(ssoUser.getCompanyId())); } } private void applyCorpinfo(QueryWrapper queryWrapper) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - queryWrapper.eq("corpinfo_id", ssoUser.getCompanyId()); + queryWrapper.eq("corpinfo_id", String.valueOf(ssoUser.getCompanyId())); } } } diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/PersonnelPositioningBiQueryExe.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/PersonnelPositioningBiQueryExe.java index 8d94cb8..a88fef6 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/PersonnelPositioningBiQueryExe.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/PersonnelPositioningBiQueryExe.java @@ -34,6 +34,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; +import java.util.IdentityHashMap; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.List; @@ -55,7 +56,7 @@ public class PersonnelPositioningBiQueryExe { private static final String POINT_TRACE_API = "finds.point.trace"; private static final String CORP_INFO_SELECT = "SELECT corpinfo_id, corp_name, code, address, address_business, " + "address_office, contacts, lr_name, corp_type_name, corp_type2_name, corp_type3_name, corp_type4_name, " - + "longitude, latitude FROM corp_info WHERE (delete_enum IS NULL OR delete_enum = 'FALSE')"; + + "longitude, latitude, port_area FROM corp_info WHERE (delete_enum IS NULL OR delete_enum = 'FALSE')"; private static final String OPEN_ALARM_WHERE = "(delete_enum IS NULL OR delete_enum = 'FALSE') " + "AND (dispose_status IS NULL OR dispose_status <> 'CLOSE')"; private static final int DEFAULT_LIST_ALL_PAGE_SIZE = 200; @@ -79,7 +80,7 @@ public class PersonnelPositioningBiQueryExe { return cached; } List personList = loadMatchedPersonLocations(new BiPersonLocationQry()); - List companyList = listCompanyLocation(personList); + List companyList = listCompanyLocation(personList, null); List portList = buildPortStats(companyList); BiOverviewCO co = new BiOverviewCO(); co.setCompanyList(companyList); @@ -101,11 +102,12 @@ public class PersonnelPositioningBiQueryExe { return co; } - public List listCompanyLocation() { - return listCompanyLocation(loadMatchedPersonLocations(new BiPersonLocationQry())); + public List listCompanyLocation(Integer portArea) { + validatePortArea(portArea); + return listCompanyLocation(loadMatchedPersonLocations(new BiPersonLocationQry()), portArea); } - private List listCompanyLocation(List personList) { + private List listCompanyLocation(List personList, Integer portArea) { Map accumulatorMap = new LinkedHashMap<>(); for (BiAreaFenceCO fence : listAllAreaFence()) { String companyName = firstText(fence.getCorpinfoName(), fence.getOrgName(), "未归属组织"); @@ -115,16 +117,101 @@ public class PersonnelPositioningBiQueryExe { key -> new CompanyMarkerAccumulator(companyName)); accumulator.addFence(fence); } - List result = new ArrayList<>(); + List fenceCompanies = new ArrayList<>(); for (CompanyMarkerAccumulator accumulator : accumulatorMap.values()) { - result.add(accumulator.toCO()); + fenceCompanies.add(accumulator.toCO()); } - fillCompanyInfo(result); + List result = mergeCorpInfoCompanies(fenceCompanies, portArea); fillCompanyAlarmCounts(result); fillCompanyOnlineCounts(result, personList); return result; } + private void validatePortArea(Integer portArea) { + if (portArea != null && (portArea < 1 || portArea > 3)) { + throw new BizException("portArea只支持1、2、3"); + } + } + + private List mergeCorpInfoCompanies(List fenceCompanies, + Integer portArea) { + Map companiesById = new LinkedHashMap<>(); + Map companiesByName = new LinkedHashMap<>(); + for (BiCompanyLocationCO company : fenceCompanies) { + if (StringUtils.hasText(company.getCorpinfoId())) { + companiesById.putIfAbsent(company.getCorpinfoId(), company); + } + String companyName = firstText(company.getCorpinfoName(), company.getCompanyName()); + if (StringUtils.hasText(companyName)) { + companiesByName.putIfAbsent(companyName, company); + } + } + + Set mergedFenceCompanies = Collections.newSetFromMap(new IdentityHashMap<>()); + List result = new ArrayList<>(); + for (CorpInfoView corpInfo : listCorpInfos(portArea)) { + BiCompanyLocationCO company = companiesById.get(corpInfo.corpinfoId); + if (company == null) { + company = companiesByName.get(corpInfo.corpName); + } + if (company == null || mergedFenceCompanies.contains(company)) { + company = emptyCompanyLocation(); + } else { + mergedFenceCompanies.add(company); + } + applyCorpInfo(company, corpInfo); + applyPortArea(company, corpInfo.portArea); + result.add(company); + } + + if (portArea == null) { + for (BiCompanyLocationCO company : fenceCompanies) { + if (!mergedFenceCompanies.contains(company)) { + result.add(company); + } + } + } + return result; + } + + private List listCorpInfos(Integer portArea) { + StringBuilder sql = new StringBuilder(CORP_INFO_SELECT); + List args = new ArrayList<>(); + if (portArea != null) { + sql.append(" AND port_area = ?"); + args.add(portArea); + } + sql.append(" ORDER BY corp_name, corpinfo_id"); + return jdbcTemplate.query(sql.toString(), this::mapCorpInfo, args.toArray()); + } + + private BiCompanyLocationCO emptyCompanyLocation() { + BiCompanyLocationCO company = new BiCompanyLocationCO(); + company.setFenceCount(0); + company.setCompanyAreaCount(0); + company.setWorkFenceCount(0); + company.setAlarmCount(0); + company.setOnlineCount(0); + return company; + } + + private void applyPortArea(BiCompanyLocationCO company, Integer portArea) { + company.setPortArea(portArea); + if (portArea == null) { + return; + } + if (portArea == 1) { + company.setPortCode("QHD"); + company.setPortName("秦皇岛港区"); + } else if (portArea == 2) { + company.setPortCode("EAST"); + company.setPortName("东港区"); + } else if (portArea == 3) { + company.setPortCode("WEST"); + company.setPortName("西港区"); + } + } + public PageResponse listCompanyFence(BiCompanyFenceQry qry) { BiCompanyFenceQry query = qry == null ? new BiCompanyFenceQry() : qry; List matched = new ArrayList<>(); @@ -360,7 +447,7 @@ public class PersonnelPositioningBiQueryExe { long parentId = rs.getLong("parent_id"); area.parentId = rs.wasNull() ? null : parentId; area.parentCode = rs.getString("parent_code"); - long corpinfoId = rs.getLong("corpinfo_id"); + String corpinfoId = rs.getString("corpinfo_id"); area.corpinfoId = rs.wasNull() ? null : corpinfoId; area.corpinfoName = rs.getString("corpinfo_name"); area.centerLon = rs.getBigDecimal("center_lon"); @@ -597,9 +684,12 @@ public class PersonnelPositioningBiQueryExe { co.setCompanyName(local.getCorpinfoName()); co.setCorpinfoName(local.getCorpinfoName()); co.setCorpinfoId(local.getCorpinfoId() == null ? null : String.valueOf(local.getCorpinfoId())); + co.setPortArea(local.getPortArea()); + co.setCreditCode(local.getCreditCode()); CorpInfoView corpInfo = queryCorpInfoById(local.getCorpinfoId()); if (corpInfo != null) { co.setCreditCode(corpInfo.code); + co.setPortArea(corpInfo.portArea); } co.setPositionMode(positionMode(terminal, terminalNo)); co.setLon(decimalValue(firstPresentAny(child(location, "lon"), child(location, "lng"), @@ -817,15 +907,18 @@ public class PersonnelPositioningBiQueryExe { private List buildPortStats(List companyList) { Map portMap = new LinkedHashMap<>(); for (BiCompanyLocationCO company : companyList) { - if (company.getPortId() == null && !StringUtils.hasText(company.getPortCode()) + if (company.getPortArea() == null && company.getPortId() == null + && !StringUtils.hasText(company.getPortCode()) && !StringUtils.hasText(company.getPortName())) { continue; } - String portKey = company.getPortId() != null ? "ID:" + company.getPortId() + String portKey = company.getPortArea() != null ? "AREA:" + company.getPortArea() + : (company.getPortId() != null ? "ID:" + company.getPortId() : (StringUtils.hasText(company.getPortCode()) - ? "CODE:" + company.getPortCode() : "NAME:" + company.getPortName()); + ? "CODE:" + company.getPortCode() : "NAME:" + company.getPortName())); BiPortStatCO port = portMap.computeIfAbsent(portKey, key -> { BiPortStatCO value = new BiPortStatCO(); + value.setPortArea(company.getPortArea()); value.setPortId(company.getPortId()); value.setPortCode(company.getPortCode()); value.setPortName(company.getPortName()); @@ -837,6 +930,9 @@ public class PersonnelPositioningBiQueryExe { value.setCompanyList(new ArrayList<>()); return value; }); + if (port.getPortId() == null && company.getPortId() != null) { + port.setPortId(company.getPortId()); + } port.setCompanyCount(port.getCompanyCount() + 1); port.setCompanyAreaCount(port.getCompanyAreaCount() + safeInt(company.getCompanyAreaCount())); port.setWorkFenceCount(port.getWorkFenceCount() + safeInt(company.getWorkFenceCount())); @@ -1115,18 +1211,6 @@ public class PersonnelPositioningBiQueryExe { return value > Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) Math.max(value, 0); } - private void fillCompanyInfo(List rows) { - for (BiCompanyLocationCO row : rows) { - CorpInfoView corpInfo = queryCorpInfo(row.getCreditCode(), row.getOrgCode(), row.getCompanyName()); - if (corpInfo == null && !row.getCompanyName().equals(row.getCorpinfoName())) { - corpInfo = queryCorpInfo(row.getCreditCode(), row.getOrgCode(), row.getCorpinfoName()); - } - if (corpInfo != null) { - applyCorpInfo(row, corpInfo); - } - } - } - private CorpInfoView queryCorpInfo(String creditCode, String orgCode, String companyName) { CorpInfoView exactByCreditCode = queryCorpInfoByCreditCode(creditCode); if (exactByCreditCode != null) { @@ -1156,7 +1240,7 @@ public class PersonnelPositioningBiQueryExe { return queryFirstCorpInfo(CORP_INFO_SELECT + " AND code = ? LIMIT 1", creditCode); } - private CorpInfoView queryCorpInfoById(Long corpinfoId) { + private CorpInfoView queryCorpInfoById(String corpinfoId) { if (corpinfoId == null) { return null; } @@ -1185,6 +1269,8 @@ public class PersonnelPositioningBiQueryExe { corpInfo.corpType4Name = rs.getString("corp_type4_name"); corpInfo.longitude = rs.getString("longitude"); corpInfo.latitude = rs.getString("latitude"); + int portArea = rs.getInt("port_area"); + corpInfo.portArea = rs.wasNull() ? null : portArea; return corpInfo; } @@ -1359,7 +1445,7 @@ public class PersonnelPositioningBiQueryExe { private String areaType; private Long parentId; private String parentCode; - private Long corpinfoId; + private String corpinfoId; private String corpinfoName; private BigDecimal centerLon; private BigDecimal centerLat; @@ -1381,6 +1467,7 @@ public class PersonnelPositioningBiQueryExe { private String corpType4Name; private String longitude; private String latitude; + private Integer portArea; } private class CompanyMarkerAccumulator { diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/PositionPersonLocalLookupService.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/PositionPersonLocalLookupService.java index 2e361e5..0a26c9d 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/PositionPersonLocalLookupService.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/PositionPersonLocalLookupService.java @@ -28,7 +28,8 @@ class PositionPersonLocalLookupService { String placeholders = String.join(",", Collections.nCopies(batch.size(), "?")); String sql = "SELECT u.id AS user_id, u.username AS local_staff_no, u.name AS staff_name, " + "TRIM(u.phone) AS mobile_no, u.user_id_card AS id_card_no, u.corpinfo_id, " - + "ci.corp_name AS corpinfo_name, u.department_id, d.name AS department_name " + + "ci.corp_name AS corpinfo_name, ci.code AS credit_code, ci.port_area, " + + "u.department_id, d.name AS department_name " + "FROM user_scope_v u " + "LEFT JOIN corp_info ci ON CAST(ci.corpinfo_id AS CHAR) = CAST(u.corpinfo_id AS CHAR) " + "LEFT JOIN department d ON d.id = u.department_id " @@ -43,8 +44,11 @@ class PositionPersonLocalLookupService { person.setStaffName(rs.getString("staff_name")); person.setMobileNo(normalize(rs.getString("mobile_no"))); person.setIdCardNo(rs.getString("id_card_no")); - person.setCorpinfoId(nullableLong(rs.getLong("corpinfo_id"), rs.wasNull())); + person.setCorpinfoId(rs.getString("corpinfo_id")); person.setCorpinfoName(rs.getString("corpinfo_name")); + person.setCreditCode(rs.getString("credit_code")); + int portArea = rs.getInt("port_area"); + person.setPortArea(rs.wasNull() ? null : portArea); person.setDepartmentId(nullableLong(rs.getLong("department_id"), rs.wasNull())); person.setDepartmentName(rs.getString("department_name")); return person; @@ -66,7 +70,8 @@ class PositionPersonLocalLookupService { String placeholders = String.join(",", Collections.nCopies(batch.size(), "?")); String sql = "SELECT DISTINCT t.terminal_no, u.id AS user_id, u.username AS local_staff_no, " + "u.name AS staff_name, TRIM(u.phone) AS mobile_no, u.user_id_card AS id_card_no, " - + "u.corpinfo_id, ci.corp_name AS corpinfo_name, u.department_id, d.name AS department_name " + + "u.corpinfo_id, ci.corp_name AS corpinfo_name, ci.code AS credit_code, ci.port_area, " + + "u.department_id, d.name AS department_name " + "FROM terminal t LEFT JOIN terminal_bind tb ON tb.terminal_id = t.id " + "AND tb.bind_status = 'BOUND' " + "AND (tb.delete_enum IS NULL OR tb.delete_enum = 'FALSE') " @@ -85,8 +90,11 @@ class PositionPersonLocalLookupService { person.setStaffName(rs.getString("staff_name")); person.setMobileNo(normalize(rs.getString("mobile_no"))); person.setIdCardNo(rs.getString("id_card_no")); - person.setCorpinfoId(nullableLong(rs.getLong("corpinfo_id"), rs.wasNull())); + person.setCorpinfoId(rs.getString("corpinfo_id")); person.setCorpinfoName(rs.getString("corpinfo_name")); + person.setCreditCode(rs.getString("credit_code")); + int portArea = rs.getInt("port_area"); + person.setPortArea(rs.wasNull() ? null : portArea); person.setDepartmentId(nullableLong(rs.getLong("department_id"), rs.wasNull())); person.setDepartmentName(rs.getString("department_name")); return new TerminalPerson(rs.getString("terminal_no"), person); @@ -154,8 +162,10 @@ class PositionPersonLocalLookupService { private String staffName; private String mobileNo; private String idCardNo; - private Long corpinfoId; + private String corpinfoId; private String corpinfoName; + private String creditCode; + private Integer portArea; private Long departmentId; private String departmentName; } diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/RealtimeLocationPayloadException.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/RealtimeLocationPayloadException.java new file mode 100644 index 0000000..b4aaff9 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/RealtimeLocationPayloadException.java @@ -0,0 +1,11 @@ +package com.zcloud.personnel.positioning.command.query; + +public class RealtimeLocationPayloadException extends RuntimeException { + public RealtimeLocationPayloadException(String message) { + super(message); + } + + public RealtimeLocationPayloadException(String message, Throwable cause) { + super(message, cause); + } +} diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/RealtimePersonLocationMatcher.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/RealtimePersonLocationMatcher.java new file mode 100644 index 0000000..2f39328 --- /dev/null +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/RealtimePersonLocationMatcher.java @@ -0,0 +1,312 @@ +package com.zcloud.personnel.positioning.command.query; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.zcloud.personnel.positioning.dto.clientobject.BiPersonLocationCO; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; + +import java.io.IOException; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +@Component +@RequiredArgsConstructor +public class RealtimePersonLocationMatcher { + private static final String[] ROW_COLLECTION_FIELDS = {"records", "rows", "list", "points"}; + private static final String[] ENVELOPE_FIELDS = {"data", "payload", "message", "body"}; + + private final ObjectMapper objectMapper; + private final PositionPersonLocalLookupService localLookupService; + + public List match(byte[] payload) { + JsonNode root = parse(payload); + List candidates = new ArrayList<>(); + Set staffNos = new LinkedHashSet<>(); + for (JsonNode row : extractRows(root)) { + String staffNo = staffNo(row); + if (!StringUtils.hasText(staffNo)) { + continue; + } + candidates.add(new LocationCandidate(row, staffNo)); + staffNos.add(staffNo); + } + if (staffNos.isEmpty()) { + return Collections.emptyList(); + } + + Map localPeople = + localLookupService.findUniquePeopleByPhones(staffNos); + if (localPeople.isEmpty()) { + return Collections.emptyList(); + } + Set terminalNos = new LinkedHashSet<>(); + for (LocationCandidate candidate : candidates) { + if (!localPeople.containsKey(candidate.staffNo)) { + continue; + } + candidate.terminalNo = terminalNo(candidate.row); + if (StringUtils.hasText(candidate.terminalNo)) { + terminalNos.add(candidate.terminalNo); + } + } + Map terminals = + localLookupService.findTerminals(terminalNos); + + List result = new ArrayList<>(); + for (LocationCandidate candidate : candidates) { + PositionPersonLocalLookupService.LocalPerson local = localPeople.get(candidate.staffNo); + if (local != null) { + result.add(toClientObject(candidate, local, terminals.get(candidate.terminalNo))); + } + } + return result; + } + + private JsonNode parse(byte[] payload) { + if (payload == null || payload.length == 0) { + throw new RealtimeLocationPayloadException("Kafka location payload is empty"); + } + try { + JsonNode root = objectMapper.readTree(payload); + if (root == null || root.isNull()) { + throw new RealtimeLocationPayloadException("Kafka location payload is empty JSON"); + } + return root; + } catch (IOException e) { + throw new RealtimeLocationPayloadException("Kafka location payload is not valid JSON", e); + } + } + + private List extractRows(JsonNode root) { + if (root.isArray()) { + return arrayValues(root); + } + JsonNode collection = firstArray(root, ROW_COLLECTION_FIELDS); + if (collection != null) { + return arrayValues(collection); + } + for (String envelopeField : ENVELOPE_FIELDS) { + JsonNode nested = parsedNode(root.get(envelopeField)); + if (nested == null) { + continue; + } + if (nested.isArray()) { + return arrayValues(nested); + } + JsonNode nestedCollection = firstArray(nested, ROW_COLLECTION_FIELDS); + if (nestedCollection != null) { + return arrayValues(nestedCollection); + } + if (!StringUtils.hasText(staffNo(root)) && nested.isObject()) { + return Collections.singletonList(nested); + } + } + return Collections.singletonList(root); + } + + private JsonNode parsedNode(JsonNode node) { + if (node == null || node.isNull()) { + return null; + } + if (!node.isTextual()) { + return node; + } + String value = node.asText(); + if (!StringUtils.hasText(value)) { + return null; + } + try { + return objectMapper.readTree(value); + } catch (IOException ignored) { + return null; + } + } + + private JsonNode firstArray(JsonNode node, String... fieldNames) { + if (node == null || !node.isObject()) { + return null; + } + for (String fieldName : fieldNames) { + JsonNode value = node.get(fieldName); + if (value != null && value.isArray()) { + return value; + } + } + return null; + } + + private List arrayValues(JsonNode array) { + List result = new ArrayList<>(); + array.forEach(result::add); + return result; + } + + private String staffNo(JsonNode row) { + return firstText( + directText(row, "staffNo", "code", "employeeNo", "workNo", "trackNo"), + directText(child(row, "terminalInfo"), "trackNo", "staffNo"), + directText(child(row, "staff"), "staffNo", "code", "employeeNo", "workNo", "trackNo"), + directText(child(row, "person"), "staffNo", "code", "employeeNo", "workNo", "trackNo"), + directText(child(row, "personInfo"), "staffNo", "code", "employeeNo", "workNo", "trackNo"), + directText(locationNode(row), "staffNo", "trackNo")); + } + + private String terminalNo(JsonNode row) { + return firstText( + directText(row, "terminalNo"), + directText(child(row, "terminalInfo"), "terminalNo"), + directText(child(row, "terminal"), "terminalNo"), + directText(child(row, "bindTerminal"), "terminalNo"), + directText(locationNode(row), "terminalNo")); + } + + private BiPersonLocationCO toClientObject(LocationCandidate candidate, + PositionPersonLocalLookupService.LocalPerson local, + PositionPersonLocalLookupService.TerminalSnapshot terminal) { + JsonNode row = candidate.row; + JsonNode location = locationNode(row); + BiPersonLocationCO co = new BiPersonLocationCO(); + co.setUserId(local.getUserId()); + co.setStaffName(local.getStaffName()); + co.setLocalStaffNo(local.getLocalStaffNo()); + co.setStaffNo(candidate.staffNo); + co.setIdCardNo(local.getIdCardNo()); + co.setMobileNo(local.getMobileNo()); + co.setDepartmentId(local.getDepartmentId()); + co.setDepartmentName(local.getDepartmentName()); + co.setCompanyName(local.getCorpinfoName()); + co.setCorpinfoId(local.getCorpinfoId()); + co.setCorpinfoName(local.getCorpinfoName()); + co.setCreditCode(local.getCreditCode()); + co.setPortArea(local.getPortArea()); + co.setOrgName(directText(row, "orgName", "companyName", "corpName", "enterpriseName")); + co.setOrgCode(directText(row, "orgCode", "companyCode", "corpCode", "enterpriseCode")); + co.setTerminalNo(candidate.terminalNo); + co.setPositionMode(positionMode(terminal)); + co.setLon(decimalValue(firstValue(location, row, "lon", "lng", "longitude"))); + co.setLat(decimalValue(firstValue(location, row, "lat", "latitude"))); + co.setAlt(decimalValue(firstValue(location, row, "alt", "altitude"))); + co.setSpeed(decimalValue(firstValue(location, row, "spd", "speed"))); + co.setDirection(decimalValue(firstValue(location, row, "dir", "direction"))); + co.setLastLocationTime(longValue(firstValue(location, row, "gt", "time", "locateTime", + "locationTime", "timestamp"))); + co.setCurrentLocation(firstText( + directText(location, "fenceName", "areaName", "positionName", "location", "address"), + directText(row, "fenceName", "areaName", "positionName", "locationName", "address"))); + co.setOnline(co.getLon() != null && co.getLat() != null); + co.setLocationRawJson(row.toString()); + return co; + } + + private JsonNode locationNode(JsonNode row) { + JsonNode nested = firstObject(row, "location", "point", "position", "locationInfo", "data"); + return nested == null ? row : nested; + } + + private JsonNode firstObject(JsonNode node, String... fieldNames) { + if (node == null || !node.isObject()) { + return null; + } + for (String fieldName : fieldNames) { + JsonNode value = node.get(fieldName); + if (value != null && value.isObject()) { + return value; + } + } + return null; + } + + private JsonNode firstValue(JsonNode first, JsonNode second, String... fieldNames) { + JsonNode value = directValue(first, fieldNames); + return value == null ? directValue(second, fieldNames) : value; + } + + private JsonNode directValue(JsonNode node, String... fieldNames) { + if (node == null || !node.isObject()) { + return null; + } + for (String fieldName : fieldNames) { + JsonNode value = node.get(fieldName); + if (value != null && !value.isNull()) { + return value; + } + } + return null; + } + + private String directText(JsonNode node, String... fieldNames) { + JsonNode value = directValue(node, fieldNames); + if (value == null || value.isContainerNode()) { + return null; + } + String text = value.asText(); + return StringUtils.hasText(text) ? text.trim() : null; + } + + private BigDecimal decimalValue(JsonNode node) { + if (node == null || node.isNull()) { + return null; + } + try { + return node.isNumber() ? node.decimalValue() : new BigDecimal(node.asText()); + } catch (NumberFormatException ignored) { + return null; + } + } + + private Long longValue(JsonNode node) { + if (node == null || node.isNull()) { + return null; + } + try { + return node.isNumber() ? node.asLong() : Long.valueOf(node.asText()); + } catch (NumberFormatException ignored) { + return null; + } + } + + private String positionMode(PositionPersonLocalLookupService.TerminalSnapshot terminal) { + String deviceType = terminal == null ? null : terminal.getDeviceType(); + if ("CARD".equalsIgnoreCase(deviceType)) { + return "\u5b9a\u4f4d\u5361"; + } + if ("APP".equalsIgnoreCase(deviceType)) { + return "\u624b\u673aAPP"; + } + if ("OTHER".equalsIgnoreCase(deviceType)) { + return "\u5176\u4ed6"; + } + return StringUtils.hasText(deviceType) ? deviceType : "\u5b9a\u4f4d\u7ec8\u7aef"; + } + + private JsonNode child(JsonNode node, String fieldName) { + return node == null || !node.isObject() ? null : node.get(fieldName); + } + + private String firstText(String... values) { + for (String value : values) { + if (StringUtils.hasText(value)) { + return value; + } + } + return null; + } + + private static class LocationCandidate { + private final JsonNode row; + private final String staffNo; + private String terminalNo; + + private LocationCandidate(JsonNode row, String staffNo) { + this.row = row; + this.staffNo = staffNo; + } + } +} diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/SyncLogQueryExe.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/SyncLogQueryExe.java index cf2ceb6..46b7ccc 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/SyncLogQueryExe.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/SyncLogQueryExe.java @@ -53,14 +53,14 @@ public class SyncLogQueryExe { private void fillCorpinfo(Map params) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - params.put("eqCorpinfoId", ssoUser.getCompanyId()); + params.put("eqCorpinfoId", String.valueOf(ssoUser.getCompanyId())); } } private void applyCorpinfo(QueryWrapper queryWrapper) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - queryWrapper.eq("corpinfo_id", ssoUser.getCompanyId()); + queryWrapper.eq("corpinfo_id", String.valueOf(ssoUser.getCompanyId())); } } } diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/SyncTaskQueryExe.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/SyncTaskQueryExe.java index 7faa731..ef451ad 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/SyncTaskQueryExe.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/SyncTaskQueryExe.java @@ -53,14 +53,14 @@ public class SyncTaskQueryExe { private void fillCorpinfo(Map params) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - params.put("eqCorpinfoId", ssoUser.getCompanyId()); + params.put("eqCorpinfoId", String.valueOf(ssoUser.getCompanyId())); } } private void applyCorpinfo(QueryWrapper queryWrapper) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - queryWrapper.eq("corpinfo_id", ssoUser.getCompanyId()); + queryWrapper.eq("corpinfo_id", String.valueOf(ssoUser.getCompanyId())); } } } diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/TerminalBindQueryExe.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/TerminalBindQueryExe.java index ca38500..776f15e 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/TerminalBindQueryExe.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/TerminalBindQueryExe.java @@ -53,14 +53,14 @@ public class TerminalBindQueryExe { private void fillCorpinfo(Map params) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - params.put("eqCorpinfoId", ssoUser.getCompanyId()); + params.put("eqCorpinfoId", String.valueOf(ssoUser.getCompanyId())); } } private void applyCorpinfo(QueryWrapper queryWrapper) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - queryWrapper.eq("corpinfo_id", ssoUser.getCompanyId()); + queryWrapper.eq("corpinfo_id", String.valueOf(ssoUser.getCompanyId())); } } } diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/TerminalQueryExe.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/TerminalQueryExe.java index 95856eb..b489dc1 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/TerminalQueryExe.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/TerminalQueryExe.java @@ -53,14 +53,14 @@ public class TerminalQueryExe { private void fillCorpinfo(Map params) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - params.put("eqCorpinfoId", ssoUser.getCompanyId()); + params.put("eqCorpinfoId", String.valueOf(ssoUser.getCompanyId())); } } private void applyCorpinfo(QueryWrapper queryWrapper) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - queryWrapper.eq("corpinfo_id", ssoUser.getCompanyId()); + queryWrapper.eq("corpinfo_id", String.valueOf(ssoUser.getCompanyId())); } } } diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/integration/finds/FindsOpenApiClient.java b/web-app/src/main/java/com/zcloud/personnel/positioning/integration/finds/FindsOpenApiClient.java index caadb6b..39bb3fe 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/integration/finds/FindsOpenApiClient.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/integration/finds/FindsOpenApiClient.java @@ -65,7 +65,8 @@ public class FindsOpenApiClient { private OpenapiConfigDO loadEnabledConfig() { SSOUser currentUser = AuthContext.getCurrentUser(); - Long companyId = currentUser == null ? null : currentUser.getCompanyId(); + String companyId = currentUser == null || currentUser.getCompanyId() == null + ? null : String.valueOf(currentUser.getCompanyId()); OpenapiConfigDO config = openapiConfigCache.getEnabledConfig(companyId); if (config == null) { throw new BizException("未配置启用的FindS OpenAPI配置"); diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/integration/finds/OpenapiConfigCache.java b/web-app/src/main/java/com/zcloud/personnel/positioning/integration/finds/OpenapiConfigCache.java index 216a8ed..e5c6376 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/integration/finds/OpenapiConfigCache.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/integration/finds/OpenapiConfigCache.java @@ -46,7 +46,7 @@ public class OpenapiConfigCache { this.stringRedisTemplate = stringRedisTemplateProvider.getIfAvailable(); } - public OpenapiConfigDO getEnabledConfig(Long companyId) { + public OpenapiConfigDO getEnabledConfig(String companyId) { OpenapiConfigDO companyConfig = companyId == null ? null : getOrLoad(companyKey(companyId), () -> queryConfigByCorpinfo(companyId)); if (companyConfig != null) { @@ -111,7 +111,7 @@ public class OpenapiConfigCache { return dbConfig; } - private OpenapiConfigDO queryConfigByCorpinfo(Long companyId) { + private OpenapiConfigDO queryConfigByCorpinfo(String companyId) { QueryWrapper queryWrapper = baseConfigQuery(); queryWrapper.eq("corpinfo_id", companyId); queryWrapper.last("LIMIT 1"); @@ -181,7 +181,7 @@ public class OpenapiConfigCache { localCache.put(key, new CacheEntry(config, System.currentTimeMillis() + LOCAL_TTL_MILLIS)); } - private String companyKey(Long companyId) { + private String companyKey(String companyId) { return "corp:" + companyId; } @@ -206,7 +206,7 @@ public class OpenapiConfigCache { config.setSik(text(map.get("sik"))); config.setSisCipherText(text(map.get("sisCipherText"))); config.setEnabled(integer(map.get("enabled"))); - config.setCorpinfoId(longValue(map.get("corpinfoId"))); + config.setCorpinfoId(text(map.get("corpinfoId"))); config.setCorpinfoName(text(map.get("corpinfoName"))); return config; } @@ -255,7 +255,7 @@ public class OpenapiConfigCache { private final String sik; private final String sisCipherText; private final Integer enabled; - private final Long corpinfoId; + private final String corpinfoId; private final String corpinfoName; private CachedOpenapiConfig(OpenapiConfigDO config) { @@ -308,7 +308,7 @@ public class OpenapiConfigCache { return enabled; } - public Long getCorpinfoId() { + public String getCorpinfoId() { return corpinfoId; } diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/integration/kafka/LocationKafkaProbeListener.java b/web-app/src/main/java/com/zcloud/personnel/positioning/integration/kafka/LocationKafkaProbeListener.java index 2cdf589..e015624 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/integration/kafka/LocationKafkaProbeListener.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/integration/kafka/LocationKafkaProbeListener.java @@ -1,14 +1,28 @@ package com.zcloud.personnel.positioning.integration.kafka; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.zcloud.personnel.positioning.command.query.RealtimeLocationPayloadException; +import com.zcloud.personnel.positioning.command.query.RealtimePersonLocationMatcher; +import com.zcloud.personnel.positioning.dto.clientobject.BiPersonLocationCO; +import com.zcloud.personnel.positioning.integration.realtime.RealtimeLocationPublisher; import org.apache.kafka.clients.consumer.ConsumerRecord; import org.apache.kafka.common.header.Header; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.ObjectProvider; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.kafka.annotation.KafkaListener; +import org.springframework.kafka.support.Acknowledgment; import org.springframework.stereotype.Component; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; import java.util.StringJoiner; @Component @@ -21,10 +35,19 @@ public class LocationKafkaProbeListener { private static final Logger LOGGER = LoggerFactory.getLogger(LocationKafkaProbeListener.class); private final int maxLogBytes; + private final RealtimePersonLocationMatcher locationMatcher; + private final ObjectMapper objectMapper; + private final ObjectProvider publishers; public LocationKafkaProbeListener( - @Value("${personnel-positioning.kafka.location.max-log-bytes:16384}") int maxLogBytes) { + @Value("${personnel-positioning.kafka.location.max-log-bytes:16384}") int maxLogBytes, + RealtimePersonLocationMatcher locationMatcher, + ObjectMapper objectMapper, + ObjectProvider publishers) { this.maxLogBytes = Math.max(1, maxLogBytes); + this.locationMatcher = locationMatcher; + this.objectMapper = objectMapper; + this.publishers = publishers; } @KafkaListener( @@ -32,7 +55,7 @@ public class LocationKafkaProbeListener { topics = "${personnel-positioning.kafka.location.topic:point_push}", groupId = "${personnel-positioning.kafka.location.group-id:personnel-position-location-probe}" ) - public void onMessage(ConsumerRecord record) { + public void onMessage(ConsumerRecord record, Acknowledgment acknowledgment) { LOGGER.info( "收到Kafka定位原始消息，topic={}, partition={}, offset={}, timestamp={}, " + "timestampType={}, keyBytes={}, valueBytes={}, key={}, headers={}, value={}", @@ -47,6 +70,43 @@ public class LocationKafkaProbeListener { renderHeaders(record), LocationKafkaPayloadPreview.render(record.value(), maxLogBytes) ); + + try { + List matchedLocations = locationMatcher.match(record.value()); + int deliveries = 0; + for (BiPersonLocationCO location : matchedLocations) { + String payload = serialize(location); + for (RealtimeLocationPublisher publisher : publishers) { + deliveries += publisher.publish(payload); + } + } + acknowledgment.acknowledge(); + LOGGER.info("Kafka location message processed, topic={}, partition={}, offset={}, matched={}, " + + "websocketDeliveries={}", + record.topic(), record.partition(), record.offset(), matchedLocations.size(), deliveries); + } catch (RealtimeLocationPayloadException e) { + acknowledgment.acknowledge(); + LOGGER.warn("Ignored invalid Kafka location message, topic={}, partition={}, offset={}, reason={}", + record.topic(), record.partition(), record.offset(), e.getMessage()); + } + } + + private String serialize(BiPersonLocationCO location) { + try { + ObjectNode payload = objectMapper.valueToTree(location); + List nullFields = new ArrayList<>(); + Iterator> fields = payload.fields(); + while (fields.hasNext()) { + Map.Entry field = fields.next(); + if (field.getValue().isNull()) { + nullFields.add(field.getKey()); + } + } + payload.remove(nullFields); + return objectMapper.writeValueAsString(payload); + } catch (JsonProcessingException e) { + throw new IllegalStateException("Failed to serialize matched personnel location", e); + } } private int length(byte[] value) { diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/integration/realtime/RealtimeLocationPublisher.java b/web-app/src/main/java/com/zcloud/personnel/positioning/integration/realtime/RealtimeLocationPublisher.java new file mode 100644 index 0000000..7422d3a --- /dev/null +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/integration/realtime/RealtimeLocationPublisher.java @@ -0,0 +1,5 @@ +package com.zcloud.personnel.positioning.integration.realtime; + +public interface RealtimeLocationPublisher { + int publish(String payload); +} diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/service/AreaServiceImpl.java b/web-app/src/main/java/com/zcloud/personnel/positioning/service/AreaServiceImpl.java index cabe4d1..0dfe2a3 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/service/AreaServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/service/AreaServiceImpl.java @@ -42,7 +42,7 @@ public class AreaServiceImpl implements AreaServiceI { } @Override - public List listOptions(Long corpinfoId, String keyword) { + public List listOptions(String corpinfoId, String keyword) { return areaQueryExe.listOptions(corpinfoId, keyword); } diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/service/FenceServiceImpl.java b/web-app/src/main/java/com/zcloud/personnel/positioning/service/FenceServiceImpl.java index 41340ee..a9dfece 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/service/FenceServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/service/FenceServiceImpl.java @@ -62,7 +62,7 @@ public class FenceServiceImpl implements FenceServiceI { } @Override - public FenceCompanyAreaCO queryCompanyArea(Long corpinfoId, String corpinfoName) { + public FenceCompanyAreaCO queryCompanyArea(String corpinfoId, String corpinfoName) { return fenceCompanyAreaSaveExe.query(corpinfoId, corpinfoName); } diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/service/PersonnelPositioningBiServiceImpl.java b/web-app/src/main/java/com/zcloud/personnel/positioning/service/PersonnelPositioningBiServiceImpl.java index 819d45d..56f6bba 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/service/PersonnelPositioningBiServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/service/PersonnelPositioningBiServiceImpl.java @@ -34,8 +34,8 @@ public class PersonnelPositioningBiServiceImpl implements PersonnelPositioningBi } @Override - public List listCompanyLocation() { - return personnelPositioningBiQueryExe.listCompanyLocation(); + public List listCompanyLocation(Integer portArea) { + return personnelPositioningBiQueryExe.listCompanyLocation(portArea); } @Override diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/api/AreaServiceI.java b/web-client/src/main/java/com/zcloud/personnel/positioning/api/AreaServiceI.java index 1ad12c6..3e16de7 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/api/AreaServiceI.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/api/AreaServiceI.java @@ -21,7 +21,7 @@ public interface AreaServiceI { List listAll(); - List listOptions(Long corpinfoId, String keyword); + List listOptions(String corpinfoId, String keyword); AreaCO queryById(Long id); diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/api/FenceServiceI.java b/web-client/src/main/java/com/zcloud/personnel/positioning/api/FenceServiceI.java index e8b4fe3..1883316 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/api/FenceServiceI.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/api/FenceServiceI.java @@ -27,7 +27,7 @@ public interface FenceServiceI { FenceCO queryById(Long id); - FenceCompanyAreaCO queryCompanyArea(Long corpinfoId, String corpinfoName); + FenceCompanyAreaCO queryCompanyArea(String corpinfoId, String corpinfoName); SingleResponse add(FenceAddCmd cmd); diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/api/PersonnelPositioningBiServiceI.java b/web-client/src/main/java/com/zcloud/personnel/positioning/api/PersonnelPositioningBiServiceI.java index 1460f89..0c76b7a 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/api/PersonnelPositioningBiServiceI.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/api/PersonnelPositioningBiServiceI.java @@ -22,7 +22,7 @@ import java.util.List; public interface PersonnelPositioningBiServiceI { BiOverviewCO queryOverview(); - List listCompanyLocation(); + List listCompanyLocation(Integer portArea); PageResponse listCompanyFence(BiCompanyFenceQry qry); diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmDisposeRecordAddCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmDisposeRecordAddCmd.java index e1ede4c..2e977bd 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmDisposeRecordAddCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmDisposeRecordAddCmd.java @@ -23,7 +23,7 @@ public class AlarmDisposeRecordAddCmd extends Command { private Long alarmRecordId; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmDisposeRecordPageQry.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmDisposeRecordPageQry.java index 6e67948..c143eda 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmDisposeRecordPageQry.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmDisposeRecordPageQry.java @@ -23,7 +23,7 @@ public class AlarmDisposeRecordPageQry extends PageQuery { private Long eqAlarmRecordId; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "eqCorpinfoId") - private Long eqCorpinfoId; + private String eqCorpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "likeCorpinfoName") private String likeCorpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmDisposeRecordUpdateCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmDisposeRecordUpdateCmd.java index 6c03fc2..b90a242 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmDisposeRecordUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmDisposeRecordUpdateCmd.java @@ -26,7 +26,7 @@ public class AlarmDisposeRecordUpdateCmd extends Command { private Long alarmRecordId; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRecordAddCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRecordAddCmd.java index c034664..eb07f3b 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRecordAddCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRecordAddCmd.java @@ -78,7 +78,7 @@ public class AlarmRecordAddCmd extends Command { private LocalDateTime gt; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRecordPageQry.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRecordPageQry.java index 855c5a4..2e27623 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRecordPageQry.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRecordPageQry.java @@ -81,7 +81,7 @@ public class AlarmRecordPageQry extends PageQuery { private LocalDateTime leGt; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "eqCorpinfoId") - private Long eqCorpinfoId; + private String eqCorpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "likeCorpinfoName") private String likeCorpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRecordTargetAddCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRecordTargetAddCmd.java index e4768a1..1953679 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRecordTargetAddCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRecordTargetAddCmd.java @@ -22,7 +22,7 @@ public class AlarmRecordTargetAddCmd extends Command { private Long alarmRecordId; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRecordTargetPageQry.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRecordTargetPageQry.java index bf7ef41..d3cd50c 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRecordTargetPageQry.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRecordTargetPageQry.java @@ -23,7 +23,7 @@ public class AlarmRecordTargetPageQry extends PageQuery { private Long eqAlarmRecordId; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "eqCorpinfoId") - private Long eqCorpinfoId; + private String eqCorpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "likeCorpinfoName") private String likeCorpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRecordTargetUpdateCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRecordTargetUpdateCmd.java index 074bd0d..7e85ae3 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRecordTargetUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRecordTargetUpdateCmd.java @@ -25,7 +25,7 @@ public class AlarmRecordTargetUpdateCmd extends Command { private Long alarmRecordId; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRecordUpdateCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRecordUpdateCmd.java index fc6b81f..4148027 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRecordUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRecordUpdateCmd.java @@ -81,7 +81,7 @@ public class AlarmRecordUpdateCmd extends Command { private LocalDateTime gt; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleAddCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleAddCmd.java index da4dfa2..ad741c1 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleAddCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleAddCmd.java @@ -42,7 +42,7 @@ public class AlarmRuleAddCmd extends Command { private String ruleStatus; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleCompanyPageQry.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleCompanyPageQry.java index 4e41701..6fff9a4 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleCompanyPageQry.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleCompanyPageQry.java @@ -13,7 +13,7 @@ import lombok.Data; @Data public class AlarmRuleCompanyPageQry extends PageQuery { @ApiModelProperty(value = "企业id/公司id", name = "eqCorpinfoId") - private Long eqCorpinfoId; + private String eqCorpinfoId; @ApiModelProperty(value = "公司名称", name = "likeCorpinfoName") private String likeCorpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleFenceRelAddCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleFenceRelAddCmd.java index 2d75a66..0a795df 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleFenceRelAddCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleFenceRelAddCmd.java @@ -34,7 +34,7 @@ public class AlarmRuleFenceRelAddCmd extends Command { private String relType; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleFenceRelPageQry.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleFenceRelPageQry.java index 3584452..3ec3c44 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleFenceRelPageQry.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleFenceRelPageQry.java @@ -35,7 +35,7 @@ public class AlarmRuleFenceRelPageQry extends PageQuery { private String eqRelType; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "eqCorpinfoId") - private Long eqCorpinfoId; + private String eqCorpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "likeCorpinfoName") private String likeCorpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleFenceRelUpdateCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleFenceRelUpdateCmd.java index 70bb9bb..cdd05d4 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleFenceRelUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleFenceRelUpdateCmd.java @@ -37,7 +37,7 @@ public class AlarmRuleFenceRelUpdateCmd extends Command { private String relType; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleItemAddCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleItemAddCmd.java index a29939e..8108346 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleItemAddCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleItemAddCmd.java @@ -23,7 +23,7 @@ public class AlarmRuleItemAddCmd extends Command { private Long ruleId; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleItemPageQry.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleItemPageQry.java index fe4f098..86de1e6 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleItemPageQry.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleItemPageQry.java @@ -24,7 +24,7 @@ public class AlarmRuleItemPageQry extends PageQuery { private Long eqRuleId; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "eqCorpinfoId") - private Long eqCorpinfoId; + private String eqCorpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "likeCorpinfoName") private String likeCorpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleItemUpdateCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleItemUpdateCmd.java index a8a2a06..e3a6d44 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleItemUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleItemUpdateCmd.java @@ -26,7 +26,7 @@ public class AlarmRuleItemUpdateCmd extends Command { private Long ruleId; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRulePageQry.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRulePageQry.java index 89fc4c9..5234901 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRulePageQry.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRulePageQry.java @@ -41,7 +41,7 @@ public class AlarmRulePageQry extends PageQuery { private String eqRuleStatus; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "eqCorpinfoId") - private Long eqCorpinfoId; + private String eqCorpinfoId; @ApiModelProperty(value = "企业名称/公司名称（精确查询）", name = "eqCorpinfoName") private String eqCorpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleUpdateCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleUpdateCmd.java index 71f1864..af687a5 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AlarmRuleUpdateCmd.java @@ -45,7 +45,7 @@ public class AlarmRuleUpdateCmd extends Command { private String ruleStatus; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AreaAddCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AreaAddCmd.java index d305b31..3e87cb9 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AreaAddCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AreaAddCmd.java @@ -41,7 +41,7 @@ public class AreaAddCmd extends Command { private String orgName; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AreaPageQry.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AreaPageQry.java index 933946b..8f5501d 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AreaPageQry.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AreaPageQry.java @@ -42,7 +42,7 @@ public class AreaPageQry extends PageQuery { private String likeOrgName; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "eqCorpinfoId") - private Long eqCorpinfoId; + private String eqCorpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "likeCorpinfoName") private String likeCorpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AreaUpdateCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AreaUpdateCmd.java index 0e583a3..0b4fc0a 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AreaUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/AreaUpdateCmd.java @@ -44,7 +44,7 @@ public class AreaUpdateCmd extends Command { private String orgName; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/BiCompanyFenceQry.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/BiCompanyFenceQry.java index 9994052..a7bcc98 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/BiCompanyFenceQry.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/BiCompanyFenceQry.java @@ -13,7 +13,7 @@ import lombok.Data; @Data public class BiCompanyFenceQry extends PageQuery { @ApiModelProperty(value = "公司ID", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "公司名称", name = "companyName") private String companyName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/BiPersonLocationQry.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/BiPersonLocationQry.java index 9d6e9b6..36c0574 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/BiPersonLocationQry.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/BiPersonLocationQry.java @@ -13,7 +13,7 @@ import lombok.Data; @Data public class BiPersonLocationQry extends PageQuery { @ApiModelProperty(value = "本平台公司ID", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "公司名称", name = "companyName") private String companyName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FenceAddCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FenceAddCmd.java index 60daad0..7f4b5cb 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FenceAddCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FenceAddCmd.java @@ -33,7 +33,7 @@ public class FenceAddCmd extends Command { private String fenceBizName; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FenceCompanyAreaSaveCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FenceCompanyAreaSaveCmd.java index c234b4d..504cd28 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FenceCompanyAreaSaveCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FenceCompanyAreaSaveCmd.java @@ -17,7 +17,7 @@ public class FenceCompanyAreaSaveCmd extends Command { private Long fenceId; @ApiModelProperty(value = "公司ID", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FenceCompanyPageQry.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FenceCompanyPageQry.java index c418638..23773a5 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FenceCompanyPageQry.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FenceCompanyPageQry.java @@ -7,7 +7,7 @@ import lombok.Data; @Data public class FenceCompanyPageQry extends PageQuery { @ApiModelProperty(value = "公司ID", name = "eqCorpinfoId") - private Long eqCorpinfoId; + private String eqCorpinfoId; @ApiModelProperty(value = "公司名称", name = "likeCorpinfoName") private String likeCorpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FencePageQry.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FencePageQry.java index 869e625..c043e8e 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FencePageQry.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FencePageQry.java @@ -33,7 +33,7 @@ public class FencePageQry extends PageQuery { private String likeFenceBizName; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "eqCorpinfoId") - private Long eqCorpinfoId; + private String eqCorpinfoId; @ApiModelProperty(value = "企业名称/公司名称（精确查询）", name = "eqCorpinfoName") private String eqCorpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FencePointAddCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FencePointAddCmd.java index 4efce18..8cbee7c 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FencePointAddCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FencePointAddCmd.java @@ -38,7 +38,7 @@ public class FencePointAddCmd extends Command { private BigDecimal alt; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FencePointPageQry.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FencePointPageQry.java index abe90ab..72d74bc 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FencePointPageQry.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FencePointPageQry.java @@ -39,7 +39,7 @@ public class FencePointPageQry extends PageQuery { private BigDecimal eqAlt; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "eqCorpinfoId") - private Long eqCorpinfoId; + private String eqCorpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "likeCorpinfoName") private String likeCorpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FencePointUpdateCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FencePointUpdateCmd.java index 024cff2..5bb02f0 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FencePointUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FencePointUpdateCmd.java @@ -41,7 +41,7 @@ public class FencePointUpdateCmd extends Command { private BigDecimal alt; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FenceSyncCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FenceSyncCmd.java index eb371b2..7d75d87 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FenceSyncCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FenceSyncCmd.java @@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode; @Data public class FenceSyncCmd extends Command { @ApiModelProperty(value = "FindS组织无法匹配时使用的默认公司ID", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "FindS组织无法匹配时使用的默认公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FenceUpdateCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FenceUpdateCmd.java index 9faf10c..6885c18 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FenceUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/FenceUpdateCmd.java @@ -36,7 +36,7 @@ public class FenceUpdateCmd extends Command { private String fenceBizName; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/OpenapiConfigAddCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/OpenapiConfigAddCmd.java index f7a571a..20d5194 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/OpenapiConfigAddCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/OpenapiConfigAddCmd.java @@ -53,7 +53,7 @@ public class OpenapiConfigAddCmd extends Command { private LocalDateTime lastCheckTime; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/OpenapiConfigPageQry.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/OpenapiConfigPageQry.java index a21f8dd..a2e16e9 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/OpenapiConfigPageQry.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/OpenapiConfigPageQry.java @@ -59,7 +59,7 @@ public class OpenapiConfigPageQry extends PageQuery { private LocalDateTime leLastCheckTime; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "eqCorpinfoId") - private Long eqCorpinfoId; + private String eqCorpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "likeCorpinfoName") private String likeCorpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/OpenapiConfigUpdateCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/OpenapiConfigUpdateCmd.java index fff9485..4f2385a 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/OpenapiConfigUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/OpenapiConfigUpdateCmd.java @@ -56,7 +56,7 @@ public class OpenapiConfigUpdateCmd extends Command { private LocalDateTime lastCheckTime; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/PositionPersonPageQry.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/PositionPersonPageQry.java index 24c6531..eea0c11 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/PositionPersonPageQry.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/PositionPersonPageQry.java @@ -13,7 +13,7 @@ public class PositionPersonPageQry extends PageQuery { private String staffName; @ApiModelProperty(value = "本平台公司ID", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "本平台公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/PositionVehiclePageQry.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/PositionVehiclePageQry.java index 4076f6c..306bb11 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/PositionVehiclePageQry.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/PositionVehiclePageQry.java @@ -10,7 +10,7 @@ public class PositionVehiclePageQry extends PageQuery { private String plateNo; @ApiModelProperty(value = "本平台公司ID", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "本平台公司名称，模糊查询", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/SyncLogAddCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/SyncLogAddCmd.java index 0ff7284..f30d187 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/SyncLogAddCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/SyncLogAddCmd.java @@ -32,7 +32,7 @@ public class SyncLogAddCmd extends Command { private String bizId; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/SyncLogPageQry.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/SyncLogPageQry.java index 012614d..5a9f3a6 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/SyncLogPageQry.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/SyncLogPageQry.java @@ -32,7 +32,7 @@ public class SyncLogPageQry extends PageQuery { private String eqBizId; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "eqCorpinfoId") - private Long eqCorpinfoId; + private String eqCorpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "likeCorpinfoName") private String likeCorpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/SyncLogUpdateCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/SyncLogUpdateCmd.java index 2442f7d..9c81bb1 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/SyncLogUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/SyncLogUpdateCmd.java @@ -35,7 +35,7 @@ public class SyncLogUpdateCmd extends Command { private String bizId; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/SyncTaskAddCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/SyncTaskAddCmd.java index 8f4747d..c191dab 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/SyncTaskAddCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/SyncTaskAddCmd.java @@ -29,7 +29,7 @@ public class SyncTaskAddCmd extends Command { private String bizType; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/SyncTaskPageQry.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/SyncTaskPageQry.java index 767fd21..534f8b8 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/SyncTaskPageQry.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/SyncTaskPageQry.java @@ -29,7 +29,7 @@ public class SyncTaskPageQry extends PageQuery { private String eqBizType; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "eqCorpinfoId") - private Long eqCorpinfoId; + private String eqCorpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "likeCorpinfoName") private String likeCorpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/SyncTaskUpdateCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/SyncTaskUpdateCmd.java index 466e716..e9ffbed 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/SyncTaskUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/SyncTaskUpdateCmd.java @@ -32,7 +32,7 @@ public class SyncTaskUpdateCmd extends Command { private String bizType; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalAddCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalAddCmd.java index dc0cfb3..ec5fa47 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalAddCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalAddCmd.java @@ -41,7 +41,7 @@ public class TerminalAddCmd extends Command { private String checkCode; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalAppCompanyPageQry.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalAppCompanyPageQry.java index 52d89e3..6098024 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalAppCompanyPageQry.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalAppCompanyPageQry.java @@ -7,7 +7,7 @@ import lombok.Data; @Data public class TerminalAppCompanyPageQry extends PageQuery { @ApiModelProperty(value = "公司ID", name = "eqCorpinfoId") - private Long eqCorpinfoId; + private String eqCorpinfoId; @ApiModelProperty(value = "公司名称", name = "likeCorpinfoName") private String likeCorpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalAppPageQry.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalAppPageQry.java index c235537..663ae2c 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalAppPageQry.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalAppPageQry.java @@ -22,7 +22,7 @@ public class TerminalAppPageQry extends PageQuery { private String idCardNo; @ApiModelProperty(value = "公司ID，精确匹配", name = "eqCorpinfoId") - private Long eqCorpinfoId; + private String eqCorpinfoId; @ApiModelProperty(value = "公司名称，精确匹配", name = "eqCorpinfoName") private String eqCorpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalAppSaveCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalAppSaveCmd.java index d3ddfbb..0a8cb74 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalAppSaveCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalAppSaveCmd.java @@ -21,7 +21,7 @@ public class TerminalAppSaveCmd extends Command { private String bizName; @ApiModelProperty(value = "公司ID", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalAppSyncCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalAppSyncCmd.java index 4061f16..2a57393 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalAppSyncCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalAppSyncCmd.java @@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode; @Data public class TerminalAppSyncCmd extends Command { @ApiModelProperty(value = "公司ID", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalBindAddCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalBindAddCmd.java index c47c7b3..d7e9d88 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalBindAddCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalBindAddCmd.java @@ -32,7 +32,7 @@ public class TerminalBindAddCmd extends Command { private String deviceType; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalBindPageQry.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalBindPageQry.java index d8d9120..fc2ee7c 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalBindPageQry.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalBindPageQry.java @@ -32,7 +32,7 @@ public class TerminalBindPageQry extends PageQuery { private String eqDeviceType; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "eqCorpinfoId") - private Long eqCorpinfoId; + private String eqCorpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "likeCorpinfoName") private String likeCorpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalBindUpdateCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalBindUpdateCmd.java index 943ea05..72c4895 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalBindUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalBindUpdateCmd.java @@ -35,7 +35,7 @@ public class TerminalBindUpdateCmd extends Command { private String deviceType; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalCardCompanyPageQry.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalCardCompanyPageQry.java index 7c8388f..29bf3ea 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalCardCompanyPageQry.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalCardCompanyPageQry.java @@ -7,7 +7,7 @@ import lombok.Data; @Data public class TerminalCardCompanyPageQry extends PageQuery { @ApiModelProperty(value = "公司ID", name = "eqCorpinfoId") - private Long eqCorpinfoId; + private String eqCorpinfoId; @ApiModelProperty(value = "公司名称", name = "likeCorpinfoName") private String likeCorpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalCardPageQry.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalCardPageQry.java index 9085cf8..387deea 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalCardPageQry.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalCardPageQry.java @@ -19,7 +19,7 @@ public class TerminalCardPageQry extends PageQuery { private String idCardNo; @ApiModelProperty(value = "公司ID，精确匹配", name = "eqCorpinfoId") - private Long eqCorpinfoId; + private String eqCorpinfoId; @ApiModelProperty(value = "公司名称，精确匹配", name = "eqCorpinfoName") private String eqCorpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalCardPersonOptionQry.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalCardPersonOptionQry.java index ebd8b64..4c91e2e 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalCardPersonOptionQry.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalCardPersonOptionQry.java @@ -19,7 +19,7 @@ public class TerminalCardPersonOptionQry extends PageQuery { private String idCardNo; @ApiModelProperty(value = "公司ID", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalCardSaveCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalCardSaveCmd.java index 4afd8c7..e2783ce 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalCardSaveCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalCardSaveCmd.java @@ -24,7 +24,7 @@ public class TerminalCardSaveCmd extends Command { private String checkCode; @ApiModelProperty(value = "公司ID", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalCardSyncCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalCardSyncCmd.java index 5886a04..428d2c3 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalCardSyncCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalCardSyncCmd.java @@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode; @Data public class TerminalCardSyncCmd extends Command { @ApiModelProperty(value = "公司ID", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalPageQry.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalPageQry.java index 465aa25..976ac33 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalPageQry.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalPageQry.java @@ -41,7 +41,7 @@ public class TerminalPageQry extends PageQuery { private String eqCheckCode; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "eqCorpinfoId") - private Long eqCorpinfoId; + private String eqCorpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "likeCorpinfoName") private String likeCorpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalUpdateCmd.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalUpdateCmd.java index fd08140..4c77768 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalUpdateCmd.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/TerminalUpdateCmd.java @@ -44,7 +44,7 @@ public class TerminalUpdateCmd extends Command { private String checkCode; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AlarmDisposeRecordCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AlarmDisposeRecordCO.java index 75f05a9..e4a8dfe 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AlarmDisposeRecordCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AlarmDisposeRecordCO.java @@ -21,7 +21,7 @@ public class AlarmDisposeRecordCO extends ClientObject { private Long alarmRecordId; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AlarmRecordCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AlarmRecordCO.java index 24725fd..1c91014 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AlarmRecordCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AlarmRecordCO.java @@ -80,7 +80,7 @@ public class AlarmRecordCO extends ClientObject { private LocalDateTime gt; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AlarmRecordTargetCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AlarmRecordTargetCO.java index d88557d..84c605a 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AlarmRecordTargetCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AlarmRecordTargetCO.java @@ -21,7 +21,7 @@ public class AlarmRecordTargetCO extends ClientObject { private Long alarmRecordId; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AlarmRuleCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AlarmRuleCO.java index b4f13e7..ba2c442 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AlarmRuleCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AlarmRuleCO.java @@ -40,7 +40,7 @@ public class AlarmRuleCO extends ClientObject { private String ruleStatus; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AlarmRuleCompanyStatCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AlarmRuleCompanyStatCO.java index 0b6f220..ce7f1c1 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AlarmRuleCompanyStatCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AlarmRuleCompanyStatCO.java @@ -16,7 +16,7 @@ import java.time.LocalDateTime; @Data public class AlarmRuleCompanyStatCO extends ClientObject { @ApiModelProperty(value = "企业id/公司id", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AlarmRuleFenceRelCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AlarmRuleFenceRelCO.java index a8dcab2..bf3ecab 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AlarmRuleFenceRelCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AlarmRuleFenceRelCO.java @@ -33,7 +33,7 @@ public class AlarmRuleFenceRelCO extends ClientObject { private String relType; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AlarmRuleItemCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AlarmRuleItemCO.java index 67725f4..5b63a02 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AlarmRuleItemCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AlarmRuleItemCO.java @@ -22,7 +22,7 @@ public class AlarmRuleItemCO extends ClientObject { private Long ruleId; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AreaCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AreaCO.java index d9111da..eb06655 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AreaCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AreaCO.java @@ -40,7 +40,7 @@ public class AreaCO extends ClientObject { private String orgName; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/BiAreaFenceCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/BiAreaFenceCO.java index 6835bcc..cc40dcc 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/BiAreaFenceCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/BiAreaFenceCO.java @@ -36,7 +36,7 @@ public class BiAreaFenceCO extends ClientObject { private String status; @ApiModelProperty(value = "公司ID", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/BiCompanyLocationCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/BiCompanyLocationCO.java index 338d67c..1178e22 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/BiCompanyLocationCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/BiCompanyLocationCO.java @@ -14,6 +14,9 @@ import java.math.BigDecimal; */ @Data public class BiCompanyLocationCO extends ClientObject { + @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西", name = "portArea") + private Integer portArea; + @ApiModelProperty(value = "港区区域ID", name = "portId") private Long portId; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/BiPersonLocationCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/BiPersonLocationCO.java index e954450..a45271e 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/BiPersonLocationCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/BiPersonLocationCO.java @@ -53,6 +53,9 @@ public class BiPersonLocationCO extends ClientObject { @ApiModelProperty(value = "企业信息名称", name = "corpinfoName") private String corpinfoName; + @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西", name = "portArea") + private Integer portArea; + @ApiModelProperty(value = "统一社会信用代码", name = "creditCode") private String creditCode; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/BiPortStatCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/BiPortStatCO.java index 656b7ec..c2b1c3a 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/BiPortStatCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/BiPortStatCO.java @@ -14,6 +14,9 @@ import java.util.List; */ @Data public class BiPortStatCO extends ClientObject { + @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西", name = "portArea") + private Integer portArea; + @ApiModelProperty(value = "港区区域ID", name = "portId") private Long portId; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/FenceCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/FenceCO.java index 36dada7..5f9ec55 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/FenceCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/FenceCO.java @@ -31,7 +31,7 @@ public class FenceCO extends ClientObject { private String fenceBizName; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/FenceCompanyAreaCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/FenceCompanyAreaCO.java index 248f66c..9773212 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/FenceCompanyAreaCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/FenceCompanyAreaCO.java @@ -17,7 +17,7 @@ public class FenceCompanyAreaCO extends ClientObject { private Long fenceId; @ApiModelProperty(value = "公司ID", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/FenceCompanyStatCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/FenceCompanyStatCO.java index a883bd4..b5bf97d 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/FenceCompanyStatCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/FenceCompanyStatCO.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; @Data public class FenceCompanyStatCO extends ClientObject { @ApiModelProperty(value = "公司ID", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/FencePointCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/FencePointCO.java index eaf0118..6ea6ed2 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/FencePointCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/FencePointCO.java @@ -37,7 +37,7 @@ public class FencePointCO extends ClientObject { private BigDecimal alt; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/OpenapiConfigCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/OpenapiConfigCO.java index 80de070..36721da 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/OpenapiConfigCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/OpenapiConfigCO.java @@ -52,7 +52,7 @@ public class OpenapiConfigCO extends ClientObject { private LocalDateTime lastCheckTime; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/PositionPersonCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/PositionPersonCO.java index 70d165c..6955e48 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/PositionPersonCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/PositionPersonCO.java @@ -24,7 +24,7 @@ public class PositionPersonCO extends ClientObject { private String idCardNo; @ApiModelProperty(value = "本平台公司ID", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "本平台公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/PositionVehicleCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/PositionVehicleCO.java index 852a0e4..d804d26 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/PositionVehicleCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/PositionVehicleCO.java @@ -15,7 +15,7 @@ public class PositionVehicleCO extends ClientObject { private String plateNo; @ApiModelProperty(value = "本平台公司ID", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "本平台公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/SyncLogCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/SyncLogCO.java index d26d01e..88d1450 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/SyncLogCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/SyncLogCO.java @@ -30,7 +30,7 @@ public class SyncLogCO extends ClientObject { private String bizId; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/SyncTaskCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/SyncTaskCO.java index 433566d..0f5e863 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/SyncTaskCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/SyncTaskCO.java @@ -27,7 +27,7 @@ public class SyncTaskCO extends ClientObject { private String bizType; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalAppCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalAppCO.java index 5138fd4..aa3054f 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalAppCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalAppCO.java @@ -22,7 +22,7 @@ public class TerminalAppCO extends ClientObject { private String terminalName; @ApiModelProperty(value = "公司ID", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalAppCompanyCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalAppCompanyCO.java index dd011de..e857883 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalAppCompanyCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalAppCompanyCO.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; @Data public class TerminalAppCompanyCO extends ClientObject { @ApiModelProperty(value = "公司ID", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalBindCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalBindCO.java index c99cff0..69119c5 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalBindCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalBindCO.java @@ -30,7 +30,7 @@ public class TerminalBindCO extends ClientObject { private String deviceType; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalCO.java index 6d39bb2..dee89e3 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalCO.java @@ -39,7 +39,7 @@ public class TerminalCO extends ClientObject { private String checkCode; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalCardCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalCardCO.java index c7fa0cf..534c808 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalCardCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalCardCO.java @@ -25,7 +25,7 @@ public class TerminalCardCO extends ClientObject { private String simCardNo; @ApiModelProperty(value = "公司ID", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalCardCompanyCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalCardCompanyCO.java index eb83981..cbdf786 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalCardCompanyCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalCardCompanyCO.java @@ -10,7 +10,7 @@ import java.time.LocalDateTime; @Data public class TerminalCardCompanyCO extends ClientObject { @ApiModelProperty(value = "公司ID", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalCardCompanyOptionCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalCardCompanyOptionCO.java index 5a8fb10..d892774 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalCardCompanyOptionCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalCardCompanyOptionCO.java @@ -7,7 +7,7 @@ import lombok.Data; @Data public class TerminalCardCompanyOptionCO extends ClientObject { @ApiModelProperty(value = "公司ID", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalCardPersonOptionCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalCardPersonOptionCO.java index 79229f2..50718d3 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalCardPersonOptionCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/TerminalCardPersonOptionCO.java @@ -22,7 +22,7 @@ public class TerminalCardPersonOptionCO extends ClientObject { private String mobileNo; @ApiModelProperty(value = "公司ID", name = "corpinfoId") - private Long corpinfoId; + private String corpinfoId; @ApiModelProperty(value = "公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/AlarmDisposeRecordE.java b/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/AlarmDisposeRecordE.java index 32acee7..4103f49 100644 --- a/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/AlarmDisposeRecordE.java +++ b/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/AlarmDisposeRecordE.java @@ -24,7 +24,7 @@ public class AlarmDisposeRecordE extends BaseE { /** * 企业id/公司id（公司及子公司数据隔离） */ - private Long corpinfoId; + private String corpinfoId; /** * 企业名称/公司名称 diff --git a/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/AlarmRecordE.java b/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/AlarmRecordE.java index 15d4b70..c75ff9c 100644 --- a/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/AlarmRecordE.java +++ b/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/AlarmRecordE.java @@ -115,7 +115,7 @@ public class AlarmRecordE extends BaseE { /** * 企业id/公司id（公司及子公司数据隔离） */ - private Long corpinfoId; + private String corpinfoId; /** * 企业名称/公司名称 diff --git a/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/AlarmRecordTargetE.java b/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/AlarmRecordTargetE.java index 2df859a..4201aa1 100644 --- a/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/AlarmRecordTargetE.java +++ b/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/AlarmRecordTargetE.java @@ -23,7 +23,7 @@ public class AlarmRecordTargetE extends BaseE { /** * 企业id/公司id（公司及子公司数据隔离） */ - private Long corpinfoId; + private String corpinfoId; /** * 企业名称/公司名称 diff --git a/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/AlarmRuleE.java b/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/AlarmRuleE.java index cc2b790..f9ede0c 100644 --- a/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/AlarmRuleE.java +++ b/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/AlarmRuleE.java @@ -54,7 +54,7 @@ public class AlarmRuleE extends BaseE { /** * 企业id/公司id（公司及子公司数据隔离） */ - private Long corpinfoId; + private String corpinfoId; /** * 企业名称/公司名称 diff --git a/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/AlarmRuleFenceRelE.java b/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/AlarmRuleFenceRelE.java index 0ec5854..5f9c73c 100644 --- a/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/AlarmRuleFenceRelE.java +++ b/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/AlarmRuleFenceRelE.java @@ -43,7 +43,7 @@ public class AlarmRuleFenceRelE extends BaseE { /** * 企业id/公司id（公司及子公司数据隔离） */ - private Long corpinfoId; + private String corpinfoId; /** * 企业名称/公司名称 diff --git a/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/AlarmRuleItemE.java b/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/AlarmRuleItemE.java index cd29e32..2f48da6 100644 --- a/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/AlarmRuleItemE.java +++ b/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/AlarmRuleItemE.java @@ -24,7 +24,7 @@ public class AlarmRuleItemE extends BaseE { /** * 企业id/公司id（公司及子公司数据隔离） */ - private Long corpinfoId; + private String corpinfoId; /** * 企业名称/公司名称 diff --git a/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/AreaE.java b/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/AreaE.java index a69f018..3155461 100644 --- a/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/AreaE.java +++ b/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/AreaE.java @@ -54,7 +54,7 @@ public class AreaE extends BaseE { /** * 企业id/公司id（公司及子公司数据隔离） */ - private Long corpinfoId; + private String corpinfoId; /** * 企业名称/公司名称 diff --git a/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/FenceE.java b/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/FenceE.java index c2c34db..db77e3d 100644 --- a/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/FenceE.java +++ b/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/FenceE.java @@ -40,7 +40,7 @@ public class FenceE extends BaseE { /** * 企业id/公司id（公司及子公司数据隔离） */ - private Long corpinfoId; + private String corpinfoId; /** * 企业名称/公司名称 diff --git a/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/FencePointE.java b/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/FencePointE.java index c7c01be..c413cfe 100644 --- a/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/FencePointE.java +++ b/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/FencePointE.java @@ -49,7 +49,7 @@ public class FencePointE extends BaseE { /** * 企业id/公司id（公司及子公司数据隔离） */ - private Long corpinfoId; + private String corpinfoId; /** * 企业名称/公司名称 diff --git a/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/OpenapiConfigE.java b/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/OpenapiConfigE.java index c3a3d19..9744cd5 100644 --- a/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/OpenapiConfigE.java +++ b/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/OpenapiConfigE.java @@ -74,7 +74,7 @@ public class OpenapiConfigE extends BaseE { /** * 企业id/公司id（公司及子公司数据隔离） */ - private Long corpinfoId; + private String corpinfoId; /** * 企业名称/公司名称 diff --git a/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/SyncLogE.java b/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/SyncLogE.java index a39b727..2a1f5e8 100644 --- a/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/SyncLogE.java +++ b/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/SyncLogE.java @@ -39,7 +39,7 @@ public class SyncLogE extends BaseE { /** * 企业id/公司id（公司及子公司数据隔离） */ - private Long corpinfoId; + private String corpinfoId; /** * 企业名称/公司名称 diff --git a/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/SyncTaskE.java b/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/SyncTaskE.java index 03b7628..0b0cf90 100644 --- a/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/SyncTaskE.java +++ b/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/SyncTaskE.java @@ -34,7 +34,7 @@ public class SyncTaskE extends BaseE { /** * 企业id/公司id（公司及子公司数据隔离） */ - private Long corpinfoId; + private String corpinfoId; /** * 企业名称/公司名称 diff --git a/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/TerminalBindE.java b/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/TerminalBindE.java index f72ed3c..23e165b 100644 --- a/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/TerminalBindE.java +++ b/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/TerminalBindE.java @@ -39,7 +39,7 @@ public class TerminalBindE extends BaseE { /** * 企业id/公司id（公司及子公司数据隔离） */ - private Long corpinfoId; + private String corpinfoId; /** * 企业名称/公司名称 diff --git a/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/TerminalE.java b/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/TerminalE.java index 9163b2f..3a44e72 100644 --- a/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/TerminalE.java +++ b/web-domain/src/main/java/com/zcloud/personnel/positioning/domain/model/TerminalE.java @@ -54,7 +54,7 @@ public class TerminalE extends BaseE { /** * 企业id/公司id（公司及子公司数据隔离） */ - private Long corpinfoId; + private String corpinfoId; /** * 企业名称/公司名称 diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AlarmDisposeRecordDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AlarmDisposeRecordDO.java index a3a802b..cec9849 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AlarmDisposeRecordDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AlarmDisposeRecordDO.java @@ -24,7 +24,7 @@ public class AlarmDisposeRecordDO extends BaseDO { /** * 企业id/公司id（公司及子公司数据隔离） */ - private Long corpinfoId; + private String corpinfoId; /** * 企业名称/公司名称 diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AlarmRecordDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AlarmRecordDO.java index 36bef4d..dbea0bf 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AlarmRecordDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AlarmRecordDO.java @@ -119,7 +119,7 @@ public class AlarmRecordDO extends BaseDO { /** * 企业id/公司id（公司及子公司数据隔离） */ - private Long corpinfoId; + private String corpinfoId; /** * 企业名称/公司名称 diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AlarmRecordTargetDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AlarmRecordTargetDO.java index ef4281a..57ae22d 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AlarmRecordTargetDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AlarmRecordTargetDO.java @@ -23,7 +23,7 @@ public class AlarmRecordTargetDO extends BaseDO { /** * 企业id/公司id（公司及子公司数据隔离） */ - private Long corpinfoId; + private String corpinfoId; /** * 企业名称/公司名称 diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AlarmRuleDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AlarmRuleDO.java index ef42480..56ee4f2 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AlarmRuleDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AlarmRuleDO.java @@ -54,7 +54,7 @@ public class AlarmRuleDO extends BaseDO { /** * 企业id/公司id（公司及子公司数据隔离） */ - private Long corpinfoId; + private String corpinfoId; /** * 企业名称/公司名称 diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AlarmRuleFenceRelDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AlarmRuleFenceRelDO.java index 30e0b36..493cd58 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AlarmRuleFenceRelDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AlarmRuleFenceRelDO.java @@ -43,7 +43,7 @@ public class AlarmRuleFenceRelDO extends BaseDO { /** * 企业id/公司id（公司及子公司数据隔离） */ - private Long corpinfoId; + private String corpinfoId; /** * 企业名称/公司名称 diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AlarmRuleItemDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AlarmRuleItemDO.java index 050ae79..ae65af9 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AlarmRuleItemDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AlarmRuleItemDO.java @@ -24,7 +24,7 @@ public class AlarmRuleItemDO extends BaseDO { /** * 企业id/公司id（公司及子公司数据隔离） */ - private Long corpinfoId; + private String corpinfoId; /** * 企业名称/公司名称 diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AreaDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AreaDO.java index f65a6c8..b222db7 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AreaDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AreaDO.java @@ -54,7 +54,7 @@ public class AreaDO extends BaseDO { /** * 企业id/公司id（公司及子公司数据隔离） */ - private Long corpinfoId; + private String corpinfoId; /** * 企业名称/公司名称 diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/FenceDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/FenceDO.java index 24ef970..444fd09 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/FenceDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/FenceDO.java @@ -40,7 +40,7 @@ public class FenceDO extends BaseDO { /** * 企业id/公司id（公司及子公司数据隔离） */ - private Long corpinfoId; + private String corpinfoId; /** * 企业名称/公司名称 diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/FencePointDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/FencePointDO.java index 0cc22cc..b0be217 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/FencePointDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/FencePointDO.java @@ -49,7 +49,7 @@ public class FencePointDO extends BaseDO { /** * 企业id/公司id（公司及子公司数据隔离） */ - private Long corpinfoId; + private String corpinfoId; /** * 企业名称/公司名称 diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/OpenapiConfigDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/OpenapiConfigDO.java index eedb04d..c3c50d4 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/OpenapiConfigDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/OpenapiConfigDO.java @@ -74,7 +74,7 @@ public class OpenapiConfigDO extends BaseDO { /** * 企业id/公司id（公司及子公司数据隔离） */ - private Long corpinfoId; + private String corpinfoId; /** * 企业名称/公司名称 diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/SyncLogDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/SyncLogDO.java index 73688be..17830e2 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/SyncLogDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/SyncLogDO.java @@ -39,7 +39,7 @@ public class SyncLogDO extends BaseDO { /** * 企业id/公司id（公司及子公司数据隔离） */ - private Long corpinfoId; + private String corpinfoId; /** * 企业名称/公司名称 diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/SyncTaskDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/SyncTaskDO.java index 57fce14..f57c24a 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/SyncTaskDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/SyncTaskDO.java @@ -34,7 +34,7 @@ public class SyncTaskDO extends BaseDO { /** * 企业id/公司id（公司及子公司数据隔离） */ - private Long corpinfoId; + private String corpinfoId; /** * 企业名称/公司名称 diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalBindDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalBindDO.java index d730341..9334402 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalBindDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalBindDO.java @@ -49,7 +49,7 @@ public class TerminalBindDO extends BaseDO { /** * 企业id/公司id（公司及子公司数据隔离） */ - private Long corpinfoId; + private String corpinfoId; /** * 企业名称/公司名称 diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalDO.java index cd37c79..a8f7562 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalDO.java @@ -54,7 +54,7 @@ public class TerminalDO extends BaseDO { /** * 企业id/公司id（公司及子公司数据隔离） */ - private Long corpinfoId; + private String corpinfoId; /** * 企业名称/公司名称 diff --git a/web-infrastructure/src/main/resources/TableCreationDDL.sql b/web-infrastructure/src/main/resources/TableCreationDDL.sql index e14a54b..8fd4472 100644 --- a/web-infrastructure/src/main/resources/TableCreationDDL.sql +++ b/web-infrastructure/src/main/resources/TableCreationDDL.sql @@ -22,7 +22,7 @@ CREATE TABLE IF NOT EXISTS `openapi_config` ( `enabled` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否启用 1是 0否', `last_check_status` varchar(32) DEFAULT NULL COMMENT '最近检测状态', `last_check_time` datetime DEFAULT NULL COMMENT '最近检测时间', - `corpinfo_id` bigint DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', + `corpinfo_id` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', `corpinfo_name` varchar(255) DEFAULT NULL COMMENT '企业名称/公司名称', `delete_enum` varchar(32) NOT NULL DEFAULT 'FALSE' COMMENT '删除标识 TRUE/FALSE', `remarks` varchar(500) DEFAULT NULL COMMENT '备注', @@ -51,7 +51,7 @@ CREATE TABLE IF NOT EXISTS `area` ( `parent_code` varchar(64) DEFAULT NULL COMMENT '上级区域编码', `org_code` varchar(64) DEFAULT NULL COMMENT '所属组织编码', `org_name` varchar(255) DEFAULT NULL COMMENT '所属组织名称', - `corpinfo_id` bigint DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', + `corpinfo_id` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', `corpinfo_name` varchar(255) DEFAULT NULL COMMENT '企业名称/公司名称', `area_level` int DEFAULT 1 COMMENT '区域层级', `sort_no` int DEFAULT 0 COMMENT '排序号', @@ -92,7 +92,7 @@ CREATE TABLE IF NOT EXISTS `terminal` ( `app_account` varchar(128) DEFAULT NULL COMMENT 'APP账号或手机号', `sim_card_no` varchar(64) DEFAULT NULL COMMENT 'SIM卡号', `check_code` varchar(64) DEFAULT NULL COMMENT '校验码', - `corpinfo_id` bigint DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', + `corpinfo_id` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', `corpinfo_name` varchar(255) DEFAULT NULL COMMENT '企业名称/公司名称', `org_code` varchar(64) DEFAULT NULL COMMENT '归属组织编码', `org_name` varchar(255) DEFAULT NULL COMMENT '归属组织名称', @@ -137,7 +137,7 @@ CREATE TABLE IF NOT EXISTS `terminal_bind` ( `terminal_id` bigint DEFAULT NULL COMMENT '终端id', `terminal_no` varchar(64) NOT NULL COMMENT '终端号', `device_type` varchar(32) NOT NULL COMMENT '设备类型 CARD定位卡 APP手机APP TERMINAL终端 OTHER其他', - `corpinfo_id` bigint DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', + `corpinfo_id` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', `corpinfo_name` varchar(255) DEFAULT NULL COMMENT '企业名称/公司名称', `track_type` varchar(32) NOT NULL DEFAULT 'STAFF' COMMENT '追踪对象类型 STAFF人员 CAR车辆', `check_code` varchar(64) DEFAULT NULL COMMENT '校验码', @@ -176,7 +176,7 @@ CREATE TABLE IF NOT EXISTS `fence` ( `fence_name` varchar(255) NOT NULL COMMENT '围栏名称', `fence_scope` varchar(32) NOT NULL COMMENT '围栏范围 COMPANY_AREA公司区域 ELECTRONIC电子围栏 WORK_AREA作业区 SILENCE静默区', `fence_biz_name` varchar(64) NOT NULL DEFAULT '区域' COMMENT 'FindS围栏业务类型', - `corpinfo_id` bigint DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', + `corpinfo_id` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', `corpinfo_name` varchar(255) DEFAULT NULL COMMENT '企业名称/公司名称', `org_code` varchar(64) DEFAULT NULL COMMENT '所属公司编码', `org_name` varchar(255) DEFAULT NULL COMMENT '所属公司名称', @@ -230,7 +230,7 @@ CREATE TABLE IF NOT EXISTS `fence_point` ( `lon` decimal(18,10) NOT NULL COMMENT '经度', `lat` decimal(18,10) NOT NULL COMMENT '纬度', `alt` decimal(12,4) DEFAULT NULL COMMENT '高度', - `corpinfo_id` bigint DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', + `corpinfo_id` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', `corpinfo_name` varchar(255) DEFAULT NULL COMMENT '企业名称/公司名称', `delete_enum` varchar(32) NOT NULL DEFAULT 'FALSE' COMMENT '删除标识 TRUE/FALSE', `remarks` varchar(500) DEFAULT NULL COMMENT '备注', @@ -259,7 +259,7 @@ CREATE TABLE IF NOT EXISTS `alarm_rule` ( `alarm_name` varchar(128) DEFAULT NULL COMMENT '告警类型名称', `enable` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否启用', `rule_status` varchar(32) NOT NULL DEFAULT 'ENABLED' COMMENT '状态 ENABLED启用 DISABLED停用', - `corpinfo_id` bigint DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', + `corpinfo_id` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', `corpinfo_name` varchar(255) DEFAULT NULL COMMENT '企业名称/公司名称', `org_code` varchar(64) DEFAULT NULL COMMENT '所属公司编码', `org_name` varchar(255) DEFAULT NULL COMMENT '所属公司名称', @@ -299,7 +299,7 @@ CREATE TABLE IF NOT EXISTS `alarm_rule_fence_rel` ( `fence_name` varchar(255) DEFAULT NULL COMMENT '围栏名称', `finds_fence_id` bigint DEFAULT NULL COMMENT 'FindS围栏id', `rel_type` varchar(32) NOT NULL DEFAULT 'EFFECTIVE' COMMENT '关联类型 EFFECTIVE生效 IGNORE忽略', - `corpinfo_id` bigint DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', + `corpinfo_id` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', `corpinfo_name` varchar(255) DEFAULT NULL COMMENT '企业名称/公司名称', `delete_enum` varchar(32) NOT NULL DEFAULT 'FALSE' COMMENT '删除标识 TRUE/FALSE', `remarks` varchar(500) DEFAULT NULL COMMENT '备注', @@ -323,7 +323,7 @@ CREATE TABLE IF NOT EXISTS `alarm_rule_fence_rel` ( CREATE TABLE IF NOT EXISTS `alarm_rule_item` ( `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键', `rule_id` bigint NOT NULL COMMENT '告警规则id', - `corpinfo_id` bigint DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', + `corpinfo_id` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', `corpinfo_name` varchar(255) DEFAULT NULL COMMENT '企业名称/公司名称', `level` int DEFAULT 1 COMMENT '告警等级', `enable` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否启用', @@ -382,7 +382,7 @@ CREATE TABLE IF NOT EXISTS `alarm_record` ( `speed` decimal(12,4) DEFAULT NULL COMMENT '速度', `direction` decimal(12,4) DEFAULT NULL COMMENT '方向', `gt` datetime DEFAULT NULL COMMENT '历元时间', - `corpinfo_id` bigint DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', + `corpinfo_id` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', `corpinfo_name` varchar(255) DEFAULT NULL COMMENT '企业名称/公司名称', `first_id_card_no` varchar(64) DEFAULT NULL COMMENT '首个告警人员身份证号，关联资质库人员视图', `first_staff_no_snapshot` varchar(64) DEFAULT NULL COMMENT '首个告警人员工号快照', @@ -416,7 +416,7 @@ CREATE TABLE IF NOT EXISTS `alarm_record` ( CREATE TABLE IF NOT EXISTS `alarm_record_target` ( `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键', `alarm_record_id` bigint NOT NULL COMMENT '告警记录id', - `corpinfo_id` bigint DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', + `corpinfo_id` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', `corpinfo_name` varchar(255) DEFAULT NULL COMMENT '企业名称/公司名称', `track_id` bigint DEFAULT NULL COMMENT 'FindS追踪对象id', `track_type` varchar(32) DEFAULT NULL COMMENT '对象类型 STAFF人员 CAR车辆 INSTALLATION设施', @@ -449,7 +449,7 @@ CREATE TABLE IF NOT EXISTS `alarm_record_target` ( CREATE TABLE IF NOT EXISTS `alarm_dispose_record` ( `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键', `alarm_record_id` bigint NOT NULL COMMENT '告警记录id', - `corpinfo_id` bigint DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', + `corpinfo_id` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', `corpinfo_name` varchar(255) DEFAULT NULL COMMENT '企业名称/公司名称', `dispose_status` varchar(32) NOT NULL COMMENT '处置状态 INIT未处置 CLOSE已处置', `dispose_result` varchar(1000) DEFAULT NULL COMMENT '处置结果', @@ -481,7 +481,7 @@ CREATE TABLE IF NOT EXISTS `sync_task` ( `task_code` varchar(64) NOT NULL COMMENT '任务编码', `task_name` varchar(128) NOT NULL COMMENT '任务名称', `biz_type` varchar(64) NOT NULL COMMENT '业务类型 ORG/STAFF/TERMINAL/FENCE/ALARM_RULE/ALARM/CALLBACK', - `corpinfo_id` bigint DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', + `corpinfo_id` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', `corpinfo_name` varchar(255) DEFAULT NULL COMMENT '企业名称/公司名称', `sync_direction` varchar(32) NOT NULL DEFAULT 'PULL' COMMENT '同步方向 PUSH推送 PULL拉取', `cron_expr` varchar(128) DEFAULT NULL COMMENT '定时表达式', @@ -515,7 +515,7 @@ CREATE TABLE IF NOT EXISTS `sync_log` ( `task_id` bigint DEFAULT NULL COMMENT '同步任务id', `biz_type` varchar(64) NOT NULL COMMENT '业务类型', `biz_id` varchar(64) DEFAULT NULL COMMENT '业务id', - `corpinfo_id` bigint DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', + `corpinfo_id` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', `corpinfo_name` varchar(255) DEFAULT NULL COMMENT '企业名称/公司名称', `api_name` varchar(128) DEFAULT NULL COMMENT '接口名称', `api_path` varchar(255) DEFAULT NULL COMMENT '接口路径', diff --git a/web-infrastructure/src/main/resources/db/migration/mysql/V20260722_01__corp_info_port_area.sql b/web-infrastructure/src/main/resources/db/migration/mysql/V20260722_01__corp_info_port_area.sql new file mode 100644 index 0000000..6f40549 --- /dev/null +++ b/web-infrastructure/src/main/resources/db/migration/mysql/V20260722_01__corp_info_port_area.sql @@ -0,0 +1,5 @@ +-- Refresh the proxy view after basic-info.corp_info adds port_area. +CREATE OR REPLACE VIEW `corp_info` AS +SELECT * +FROM `jjb-saas-zcloud-basic-info`.`corp_info` +WHERE `delete_enum` = 'FALSE'; diff --git a/web-infrastructure/src/main/resources/db/migration/mysql/V20260722_02__corpinfo_id_string.sql b/web-infrastructure/src/main/resources/db/migration/mysql/V20260722_02__corpinfo_id_string.sql new file mode 100644 index 0000000..2ffaacb --- /dev/null +++ b/web-infrastructure/src/main/resources/db/migration/mysql/V20260722_02__corpinfo_id_string.sql @@ -0,0 +1,42 @@ +-- Align local company references with the string ID used by basic-info.corp_info. +ALTER TABLE `openapi_config` + MODIFY COLUMN `corpinfo_id` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）'; + +ALTER TABLE `area` + MODIFY COLUMN `corpinfo_id` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）'; + +ALTER TABLE `terminal` + MODIFY COLUMN `corpinfo_id` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）'; + +ALTER TABLE `terminal_bind` + MODIFY COLUMN `corpinfo_id` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）'; + +ALTER TABLE `fence` + MODIFY COLUMN `corpinfo_id` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）'; + +ALTER TABLE `fence_point` + MODIFY COLUMN `corpinfo_id` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）'; + +ALTER TABLE `alarm_rule` + MODIFY COLUMN `corpinfo_id` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）'; + +ALTER TABLE `alarm_rule_fence_rel` + MODIFY COLUMN `corpinfo_id` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）'; + +ALTER TABLE `alarm_rule_item` + MODIFY COLUMN `corpinfo_id` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）'; + +ALTER TABLE `alarm_record` + MODIFY COLUMN `corpinfo_id` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）'; + +ALTER TABLE `alarm_record_target` + MODIFY COLUMN `corpinfo_id` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）'; + +ALTER TABLE `alarm_dispose_record` + MODIFY COLUMN `corpinfo_id` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）'; + +ALTER TABLE `sync_task` + MODIFY COLUMN `corpinfo_id` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）'; + +ALTER TABLE `sync_log` + MODIFY COLUMN `corpinfo_id` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）';