From a580f400e19bf7b2b9c7ce03be3ff77369aed0c7 Mon Sep 17 00:00:00 2001 From: shenzhidan Date: Mon, 3 Aug 2026 08:36:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E4=BC=81=E4=B8=9AID=E4=B8=BB=E9=94=AE=E5=B9=B6=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3=E5=8C=B9=E9=85=8D=E5=9B=9E=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/FlywayRecoveryConfiguration.java | 11 +- start/src/main/resources/bootstrap.yml | 4 +- start/src/main/resources/kafka.yml | 2 +- start/src/main/resources/sdk.yml | 4 +- .../config/CorpinfoIdJacksonConfig.java | 40 +++ .../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 +- .../positioning/web/SyncLogController.java | 4 +- .../positioning/web/SyncTaskController.java | 4 +- .../web/TerminalBindController.java | 4 +- .../positioning/web/TerminalController.java | 8 +- .../MockPersonLocationPublisher.java | 6 +- .../command/AlarmRecordFindsPullService.java | 11 +- .../command/AlarmRuleConfigPersistence.java | 8 +- .../command/AlarmRuleFindsPullService.java | 25 +- .../command/FenceCompanyAreaSaveExe.java | 8 +- .../command/FenceFindsPullService.java | 8 +- .../command/FindsCorpMappingService.java | 25 +- .../command/FindsPersonCorpResolver.java | 4 +- .../command/TerminalAppSyncExe.java | 18 +- .../command/TerminalBindingService.java | 8 +- .../command/TerminalCardSyncExe.java | 18 +- .../command/query/AlarmRecordQueryExe.java | 4 +- .../command/query/AlarmRuleQueryExe.java | 38 +-- .../command/query/AreaQueryExe.java | 8 +- .../query/BiPersonLocationProvider.java | 10 +- .../command/query/FenceQueryExe.java | 8 +- .../query/FindsStaffMappingSyncService.java | 8 +- .../query/PersonnelPositioningBiQueryExe.java | 42 +-- .../PositionPersonLocalLookupService.java | 4 +- .../query/RealtimePersonLocationMatcher.java | 5 +- .../integration/finds/FindsOpenApiClient.java | 3 +- .../integration/finds/OpenapiConfigCache.java | 12 +- .../positioning/service/AreaServiceImpl.java | 2 +- .../positioning/service/FenceServiceImpl.java | 2 +- .../positioning/api/AreaServiceI.java | 2 +- .../positioning/api/FenceServiceI.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/AreaPersonStatCO.java | 2 +- .../dto/clientobject/BiAreaFenceCO.java | 2 +- .../dto/clientobject/BiCompanyLocationCO.java | 2 +- .../clientobject/BiCompanyOnlinePersonCO.java | 2 +- .../BiCompanyPersonPositionCO.java | 2 +- .../dto/clientobject/BiPersonLocationCO.java | 2 +- .../dto/clientobject/BiPersonPositionCO.java | 2 +- .../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 +- .../dataobject/AlarmRuleCompanyStatDO.java | 2 +- .../persistence/dataobject/AlarmRuleDO.java | 2 +- .../dataobject/AlarmRuleFenceRelDO.java | 2 +- .../dataobject/AlarmRuleItemDO.java | 2 +- .../persistence/dataobject/AreaDO.java | 2 +- .../dataobject/BiAreaSnapshotDO.java | 2 +- .../dataobject/BiCompanyAlarmCountDO.java | 2 +- .../persistence/dataobject/BiCorpInfoDO.java | 2 +- .../dataobject/BiPersonPositionUserDO.java | 2 +- .../dataobject/CorpInfoSnapshotDO.java | 2 +- .../dataobject/FenceCompanyStatDO.java | 2 +- .../persistence/dataobject/FenceDO.java | 2 +- .../persistence/dataobject/FencePointDO.java | 2 +- .../dataobject/OpenapiConfigDO.java | 2 +- .../dataobject/OrgLocalCorpDO.java | 2 +- .../dataobject/OrgLocalDepartmentDO.java | 2 +- .../dataobject/OrgMatchSnapshotDO.java | 2 +- .../dataobject/PersonnelLocalPersonDO.java | 2 +- .../persistence/dataobject/SyncLogDO.java | 2 +- .../persistence/dataobject/SyncTaskDO.java | 2 +- .../dataobject/TerminalAppCompanyStatDO.java | 2 +- .../dataobject/TerminalAppDetailDO.java | 2 +- .../dataobject/TerminalBindDO.java | 2 +- .../TerminalCardCompanyOptionDO.java | 2 +- .../dataobject/TerminalCardCompanyStatDO.java | 2 +- .../dataobject/TerminalCardDetailDO.java | 2 +- .../TerminalCardPersonOptionDO.java | 2 +- .../persistence/dataobject/TerminalDO.java | 2 +- .../dataobject/TerminalPersonSnapshotDO.java | 2 +- .../persistence/mapper/AlarmRecordMapper.java | 4 +- .../persistence/mapper/AreaMapper.java | 2 +- .../mapper/PersonnelPositioningBiMapper.java | 4 +- .../mapper/TerminalBindMapper.java | 4 + .../persistence/mapper/TerminalMapper.java | 2 + .../persistence/mapper/UserMapper.java | 2 +- .../repository/AlarmRecordRepository.java | 4 +- .../repository/AreaRepository.java | 2 +- .../PersonnelPositioningBiRepository.java | 4 +- .../repository/TerminalBindRepository.java | 2 + .../repository/TerminalRepository.java | 2 + .../repository/UserRepository.java | 2 +- .../impl/AlarmRecordRepositoryImpl.java | 4 +- .../repository/impl/AreaRepositoryImpl.java | 2 +- .../PersonnelPositioningBiRepositoryImpl.java | 4 +- .../impl/TerminalBindRepositoryImpl.java | 10 + .../impl/TerminalRepositoryImpl.java | 9 + .../repository/impl/UserRepositoryImpl.java | 2 +- .../src/main/resources/TableCreationDDL.sql | 28 +- .../V20260801_01__corpinfo_id_internal_pk.sql | 258 ++++++++++++++++++ ...60801_02__org_match_status_consistency.sql | 12 + .../resources/mapper/AlarmRecordMapper.xml | 34 +-- .../main/resources/mapper/AlarmRuleMapper.xml | 40 +-- .../src/main/resources/mapper/AreaMapper.xml | 4 +- .../src/main/resources/mapper/FenceMapper.xml | 28 +- .../main/resources/mapper/OrgMatchMapper.xml | 9 +- .../resources/mapper/PersonnelMatchMapper.xml | 20 +- .../mapper/PersonnelPositioningBiMapper.xml | 10 +- .../resources/mapper/TerminalBindMapper.xml | 6 + .../main/resources/mapper/TerminalMapper.xml | 63 ++--- .../src/main/resources/mapper/UserMapper.xml | 6 +- 213 files changed, 780 insertions(+), 495 deletions(-) create mode 100644 web-adapter/src/main/java/com/zcloud/personnel/positioning/config/CorpinfoIdJacksonConfig.java create mode 100644 web-infrastructure/src/main/resources/db/migration/mysql/V20260801_01__corpinfo_id_internal_pk.sql create mode 100644 web-infrastructure/src/main/resources/db/migration/mysql/V20260801_02__org_match_status_consistency.sql diff --git a/start/src/main/java/com/zcloud/personnel/positioning/config/FlywayRecoveryConfiguration.java b/start/src/main/java/com/zcloud/personnel/positioning/config/FlywayRecoveryConfiguration.java index ca9ffbe..a821259 100644 --- a/start/src/main/java/com/zcloud/personnel/positioning/config/FlywayRecoveryConfiguration.java +++ b/start/src/main/java/com/zcloud/personnel/positioning/config/FlywayRecoveryConfiguration.java @@ -17,8 +17,10 @@ import java.util.stream.Collectors; * *

V20260710_02 is idempotent and can be safely rerun after Flyway removes * its failed history entry. V20260722_01 was removed and only its failed - * history entry needs cleanup. Other failed migrations are never repaired - * automatically so that new database problems still stop application startup.

+ * history entry needs cleanup. V20260801_01 is also idempotent: it normalizes + * unmappable legacy company ids to NULL before changing the column type. + * Other failed migrations are never repaired automatically so that new + * database problems still stop application startup.

*/ @Configuration public class FlywayRecoveryConfiguration { @@ -26,6 +28,7 @@ public class FlywayRecoveryConfiguration { private static final Logger LOGGER = LoggerFactory.getLogger(FlywayRecoveryConfiguration.class); private static final MigrationVersion RECOVERABLE_VERSION = MigrationVersion.fromVersion("20260710.02"); private static final MigrationVersion REMOVED_VERSION = MigrationVersion.fromVersion("20260722.01"); + private static final MigrationVersion CORPINFO_ID_VERSION = MigrationVersion.fromVersion("20260801.01"); @Bean public FlywayMigrationStrategy flywayMigrationStrategy() { @@ -57,6 +60,8 @@ public class FlywayRecoveryConfiguration { } private boolean isRecoverable(MigrationVersion version) { - return RECOVERABLE_VERSION.equals(version) || REMOVED_VERSION.equals(version); + return RECOVERABLE_VERSION.equals(version) + || REMOVED_VERSION.equals(version) + || CORPINFO_ID_VERSION.equals(version); } } diff --git a/start/src/main/resources/bootstrap.yml b/start/src/main/resources/bootstrap.yml index 272b3e7..dfff433 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 754983e..89c3d62 100644 --- a/start/src/main/resources/kafka.yml +++ b/start/src/main/resources/kafka.yml @@ -31,7 +31,7 @@ personnel-positioning: 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} mock: - enabled: ${PERSONNEL_POSITIONING_WEBSOCKET_LOCATION_MOCK_ENABLED:true} + enabled: ${PERSONNEL_POSITIONING_WEBSOCKET_LOCATION_MOCK_ENABLED:false} initial-delay-ms: ${PERSONNEL_POSITIONING_WEBSOCKET_LOCATION_MOCK_INITIAL_DELAY_MS:1000} interval-ms: ${PERSONNEL_POSITIONING_WEBSOCKET_LOCATION_MOCK_INTERVAL_MS:1000} new-person-delay-ms: ${PERSONNEL_POSITIONING_WEBSOCKET_LOCATION_MOCK_NEW_PERSON_DELAY_MS:8000} diff --git a/start/src/main/resources/sdk.yml b/start/src/main/resources/sdk.yml index 8b7abd3..3808688 100644 --- a/start/src/main/resources/sdk.yml +++ b/start/src/main/resources/sdk.yml @@ -1,7 +1,7 @@ sdk: server: -# app-key: 4e11af8a2b224f6fb1c680df53c72457 - app-key: 9f32c2300c4444a6a2ab8f48a15802a0 +# app-key: 4e11af8a2b224f6fb1c680df53c72457 #生产 + app-key: 9f32c2300c4444a6a2ab8f48a15802a0 #测试 client: gateway: url: ${common.gateway.network.http.external} diff --git a/web-adapter/src/main/java/com/zcloud/personnel/positioning/config/CorpinfoIdJacksonConfig.java b/web-adapter/src/main/java/com/zcloud/personnel/positioning/config/CorpinfoIdJacksonConfig.java new file mode 100644 index 0000000..c397f93 --- /dev/null +++ b/web-adapter/src/main/java/com/zcloud/personnel/positioning/config/CorpinfoIdJacksonConfig.java @@ -0,0 +1,40 @@ +package com.zcloud.personnel.positioning.config; + +import com.fasterxml.jackson.databind.BeanDescription; +import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.Module; +import com.fasterxml.jackson.databind.SerializationConfig; +import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.databind.ser.BeanPropertyWriter; +import com.fasterxml.jackson.databind.ser.BeanSerializerModifier; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.List; + +@Configuration +public class CorpinfoIdJacksonConfig { + + @Bean + public Module corpinfoIdStringModule() { + SimpleModule module = new SimpleModule("CorpinfoIdStringModule"); + module.setSerializerModifier(new BeanSerializerModifier() { + @Override + public List changeProperties(SerializationConfig config, + BeanDescription beanDesc, + List beanProperties) { + for (BeanPropertyWriter writer : beanProperties) { + JavaType type = writer.getType(); + if ("corpinfoId".equals(writer.getName()) + && (type.hasRawClass(Long.class) || type.hasRawClass(Long.TYPE))) { + // 企业主键可能达到 19 位，对外按字符串输出以避免 JavaScript 精度丢失。 + writer.assignSerializer(ToStringSerializer.instance); + } + } + return beanProperties; + } + }); + return module; + } +} 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 810914c..c9acb2d 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(String.valueOf(ssoUser.getCompanyId())); + cmd.setCorpinfoId(ssoUser.getCompanyId()); } } private void fillCorpinfo(AlarmDisposeRecordUpdateCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); + cmd.setCorpinfoId(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 2ea2e77..7db44e2 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 @@ -105,14 +105,14 @@ public class AlarmRecordController { private void fillCorpinfo(AlarmRecordAddCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); + cmd.setCorpinfoId(ssoUser.getCompanyId()); } } private void fillCorpinfo(AlarmRecordUpdateCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); + cmd.setCorpinfoId(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 a5b2b69..893801d 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(String.valueOf(ssoUser.getCompanyId())); + cmd.setCorpinfoId(ssoUser.getCompanyId()); } } private void fillCorpinfo(AlarmRecordTargetUpdateCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); + cmd.setCorpinfoId(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 06f23f5..37dfc5c 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(String.valueOf(ssoUser.getCompanyId())); + cmd.setCorpinfoId(ssoUser.getCompanyId()); } } private void fillCorpinfo(AlarmRuleUpdateCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (cmd.getCorpinfoId() == null && ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); + cmd.setCorpinfoId(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 96df64c..4458fd9 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(String.valueOf(ssoUser.getCompanyId())); + cmd.setCorpinfoId(ssoUser.getCompanyId()); } } private void fillCorpinfo(AlarmRuleFenceRelUpdateCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); + cmd.setCorpinfoId(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 2197c7c..cbe162a 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(String.valueOf(ssoUser.getCompanyId())); + cmd.setCorpinfoId(ssoUser.getCompanyId()); } } private void fillCorpinfo(AlarmRuleItemUpdateCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); + cmd.setCorpinfoId(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 e0e2880..5d4d495 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 @@ -62,7 +62,7 @@ public class AreaController { @ApiOperation("可选区域选项") @GetMapping("/options") - public MultiResponse options(@RequestParam(required = false) String corpinfoId, + public MultiResponse options(@RequestParam(required = false) Long corpinfoId, @RequestParam(required = false) String keyword) { return MultiResponse.of(areaService.listOptions(corpinfoId, keyword)); } @@ -99,14 +99,14 @@ public class AreaController { private void fillCorpinfo(AreaAddCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); + cmd.setCorpinfoId(ssoUser.getCompanyId()); } } private void fillCorpinfo(AreaUpdateCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); + cmd.setCorpinfoId(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 9dbbe3c..85747be 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) String corpinfoId, + public SingleResponse getCompanyArea(@RequestParam(required = false) Long corpinfoId, @RequestParam(required = false) String corpinfoName) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (corpinfoId == null && ssoUser != null && ssoUser.getCompanyId() != null) { - corpinfoId = String.valueOf(ssoUser.getCompanyId()); + corpinfoId = 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(String.valueOf(ssoUser.getCompanyId())); + cmd.setCorpinfoId(ssoUser.getCompanyId()); } } private void fillCorpinfo(FenceUpdateCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (cmd.getCorpinfoId() == null && ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); + cmd.setCorpinfoId(ssoUser.getCompanyId()); } } private void fillCorpinfo(FenceCompanyAreaSaveCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (cmd.getCorpinfoId() == null && ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); + cmd.setCorpinfoId(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 92cdba5..c9eed13 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(String.valueOf(ssoUser.getCompanyId())); + cmd.setCorpinfoId(ssoUser.getCompanyId()); } } private void fillCorpinfo(FencePointUpdateCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); + cmd.setCorpinfoId(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 36db006..d76fcf5 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(String.valueOf(ssoUser.getCompanyId())); + cmd.setCorpinfoId(ssoUser.getCompanyId()); } } private void fillCorpinfo(OpenapiConfigUpdateCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); + cmd.setCorpinfoId(ssoUser.getCompanyId()); } } } 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 8beef8d..26c1bfb 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(String.valueOf(ssoUser.getCompanyId())); + cmd.setCorpinfoId(ssoUser.getCompanyId()); } } private void fillCorpinfo(SyncLogUpdateCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); + cmd.setCorpinfoId(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 8241620..0aa97d9 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(String.valueOf(ssoUser.getCompanyId())); + cmd.setCorpinfoId(ssoUser.getCompanyId()); } } private void fillCorpinfo(SyncTaskUpdateCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); + cmd.setCorpinfoId(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 9a8c86f..f7e8c59 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(String.valueOf(ssoUser.getCompanyId())); + cmd.setCorpinfoId(ssoUser.getCompanyId()); } } private void fillCorpinfo(TerminalBindUpdateCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); + cmd.setCorpinfoId(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 92397a7..0011d27 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(String.valueOf(ssoUser.getCompanyId())); + cmd.setCorpinfoId(ssoUser.getCompanyId()); } } private void fillCorpinfo(TerminalUpdateCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); + cmd.setCorpinfoId(ssoUser.getCompanyId()); } } private void fillCorpinfo(TerminalCardSaveCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (cmd.getCorpinfoId() == null && ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); + cmd.setCorpinfoId(ssoUser.getCompanyId()); } } private void fillCorpinfo(TerminalAppSaveCmd cmd) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (cmd.getCorpinfoId() == null && ssoUser != null && ssoUser.getCompanyId() != null) { - cmd.setCorpinfoId(String.valueOf(ssoUser.getCompanyId())); + cmd.setCorpinfoId(ssoUser.getCompanyId()); } } } diff --git a/web-adapter/src/main/java/com/zcloud/personnel/positioning/websocket/MockPersonLocationPublisher.java b/web-adapter/src/main/java/com/zcloud/personnel/positioning/websocket/MockPersonLocationPublisher.java index 8a21744..f96c3b1 100644 --- a/web-adapter/src/main/java/com/zcloud/personnel/positioning/websocket/MockPersonLocationPublisher.java +++ b/web-adapter/src/main/java/com/zcloud/personnel/positioning/websocket/MockPersonLocationPublisher.java @@ -108,7 +108,7 @@ public class MockPersonLocationPublisher { BiPersonLocationCO location = baseLocation( "Codex测试人员A", "CODEX-STAFF-001", "CODEX-TERMINAL-001"); location.setCompanyName("Codex测试东港公司"); - location.setCorpinfoId("CODEX-CORP-EAST"); + location.setCorpinfoId(1001L); location.setCorpinfoName("Codex测试东港公司"); location.setOrgCode("CODEX-ORG-EAST"); location.setOrgName("Codex测试东港组织"); @@ -125,7 +125,7 @@ public class MockPersonLocationPublisher { BiPersonLocationCO location = baseLocation( "Codex测试人员B", "CODEX-STAFF-002", "CODEX-TERMINAL-002"); location.setCompanyName("Codex测试西港公司"); - location.setCorpinfoId("CODEX-CORP-WEST"); + location.setCorpinfoId(1002L); location.setCorpinfoName("Codex测试西港公司"); location.setOrgCode("CODEX-ORG-WEST"); location.setOrgName("Codex测试西港组织"); @@ -142,7 +142,7 @@ public class MockPersonLocationPublisher { BiPersonLocationCO location = baseLocation( "Codex测试新增人员C", "CODEX-STAFF-003", "CODEX-TERMINAL-003"); location.setCompanyName("Codex测试港区公司"); - location.setCorpinfoId("CODEX-CORP-HARBOR"); + location.setCorpinfoId(1003L); location.setCorpinfoName("Codex测试港区公司"); location.setOrgCode("CODEX-ORG-HARBOR"); location.setOrgName("Codex测试港区组织"); 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 594313e..bca3126 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 @@ -229,13 +229,16 @@ public class AlarmRecordFindsPullService { record.getFirstIdCardNo(), record.getFirstStaffNoSnapshot(), record.getFirstStaffNameSnapshot(), terminalNoAt(row.path("terminalNoList"), 0)); if (corpMatch == null) { - corpMatch = findsCorpMappingService.resolve(config.getConfigCode(), config.getCorpinfoId(), - config.getCorpinfoName(), null, null); + corpMatch = config.getCorpinfoId() == null + ? findsCorpMappingService.resolve(config.getConfigCode(), null, + config.getCorpinfoName(), null, null) + : new FindsCorpMappingService.CorpMatch(config.getCorpinfoId(), config.getCorpinfoName(), + null, null, "CONFIG"); } if (corpMatch != null) { record.setCorpinfoId(corpMatch.getCorpinfoId()); record.setCorpinfoName(corpMatch.getCorpinfoName()); - } else if ("0".equals(record.getCorpinfoId())) { + } else if (Long.valueOf(0L).equals(record.getCorpinfoId())) { record.setCorpinfoId(null); record.setCorpinfoName(null); } @@ -346,7 +349,7 @@ public class AlarmRecordFindsPullService { task.setTaskCode(taskCode); task.setTaskName("FindS告警增量拉取-" + configIdentity(config)); task.setBizType("ALARM"); - task.setCorpinfoId(config.getCorpinfoId() == null ? "0" : config.getCorpinfoId()); + task.setCorpinfoId(config.getCorpinfoId()); task.setCorpinfoName(config.getCorpinfoName()); task.setSyncDirection("PULL"); task.setCronExpr(TASK_CRON); 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 4590d23..7ca38c7 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 @@ -108,7 +108,7 @@ public class AlarmRuleConfigPersistence { AlarmRuleFenceRelDO rel = new AlarmRuleFenceRelDO(); BeanUtils.copyProperties(relCmd, rel); rel.setRuleId(rule.getId()); - rel.setCorpinfoId(defaultString(rel.getCorpinfoId(), rule.getCorpinfoId())); + rel.setCorpinfoId(defaultLong(rel.getCorpinfoId(), rule.getCorpinfoId())); rel.setCorpinfoName(defaultIfBlank(rel.getCorpinfoName(), rule.getCorpinfoName())); rel.setRelType(defaultIfBlank(rel.getRelType(), REL_EFFECTIVE)); fillFenceSnapshot(rel); @@ -142,7 +142,7 @@ public class AlarmRuleConfigPersistence { AlarmRuleItemDO item = new AlarmRuleItemDO(); BeanUtils.copyProperties(itemCmd, item); item.setRuleId(rule.getId()); - item.setCorpinfoId(defaultString(item.getCorpinfoId(), rule.getCorpinfoId())); + item.setCorpinfoId(defaultLong(item.getCorpinfoId(), rule.getCorpinfoId())); item.setCorpinfoName(defaultIfBlank(item.getCorpinfoName(), rule.getCorpinfoName())); if (item.getLevel() == null) { item.setLevel(1); @@ -192,7 +192,7 @@ public class AlarmRuleConfigPersistence { rel.setFenceName(fence.getFenceName()); rel.setFindsFenceId(fence.getFindsFenceId()); rel.setRelType(REL_EFFECTIVE); - rel.setCorpinfoId(defaultString(rule.getCorpinfoId(), fence.getCorpinfoId())); + rel.setCorpinfoId(defaultLong(rule.getCorpinfoId(), fence.getCorpinfoId())); rel.setCorpinfoName(defaultIfBlank(rule.getCorpinfoName(), fence.getCorpinfoName())); alarmRuleFenceRelRepository.save(rel); } @@ -208,7 +208,7 @@ public class AlarmRuleConfigPersistence { } rel.setFenceName(defaultIfBlank(rel.getFenceName(), fence.getFenceName())); rel.setFindsFenceId(defaultLong(rel.getFindsFenceId(), fence.getFindsFenceId())); - rel.setCorpinfoId(defaultString(rel.getCorpinfoId(), fence.getCorpinfoId())); + rel.setCorpinfoId(defaultLong(rel.getCorpinfoId(), fence.getCorpinfoId())); rel.setCorpinfoName(defaultIfBlank(rel.getCorpinfoName(), fence.getCorpinfoName())); } 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 a21fc00..7f570ba 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 @@ -62,12 +62,12 @@ public class AlarmRuleFindsPullService { private final ObjectMapper objectMapper; public void refreshForCompanyStats(AlarmRuleCompanyPageQry qry) { - String companyId = qry == null ? null : qry.getEqCorpinfoId(); + Long companyId = qry == null ? null : qry.getEqCorpinfoId(); refreshConfigs(resolveConfigs(companyId), null); } public void refreshForList(AlarmRulePageQry qry) { - String companyId = qry == null ? null : qry.getEqCorpinfoId(); + Long companyId = qry == null ? null : qry.getEqCorpinfoId(); String alarmCode = qry == null ? null : qry.getEqAlarmCode(); refreshConfigs(resolveConfigs(companyId), alarmCode); } @@ -178,9 +178,12 @@ public class AlarmRuleFindsPullService { FindsCorpMappingService.CorpMatch mappedCorp = validCorp(scopeFence) ? new FindsCorpMappingService.CorpMatch(scopeFence.getCorpinfoId(), scopeFence.getCorpinfoName(), null, null, "FENCE") - : findsCorpMappingService.resolve(config.getConfigCode(), config.getCorpinfoId(), - config.getCorpinfoName(), null, null); - String corpinfoId = mappedCorp == null ? validCorpinfoId(rule.getCorpinfoId()) : mappedCorp.getCorpinfoId(); + : config.getCorpinfoId() == null + ? findsCorpMappingService.resolve(config.getConfigCode(), null, + config.getCorpinfoName(), null, null) + : new FindsCorpMappingService.CorpMatch(config.getCorpinfoId(), config.getCorpinfoName(), + null, null, "CONFIG"); + Long corpinfoId = mappedCorp == null ? validCorpinfoId(rule.getCorpinfoId()) : mappedCorp.getCorpinfoId(); String corpinfoName = mappedCorp == null ? rule.getCorpinfoName() : mappedCorp.getCorpinfoName(); rule.setCorpinfoId(corpinfoId); rule.setCorpinfoName(corpinfoName); @@ -253,7 +256,7 @@ public class AlarmRuleFindsPullService { if (fence != null) { rel.setFenceId(fence.getId()); rel.setFenceName(fence.getFenceName()); - if (!StringUtils.hasText(rel.getCorpinfoId()) || "0".equals(rel.getCorpinfoId())) { + if (rel.getCorpinfoId() == null || Long.valueOf(0L).equals(rel.getCorpinfoId())) { rel.setCorpinfoId(fence.getCorpinfoId()); rel.setCorpinfoName(fence.getCorpinfoName()); } @@ -264,8 +267,8 @@ public class AlarmRuleFindsPullService { return fence != null && validCorpinfoId(fence.getCorpinfoId()) != null; } - private String validCorpinfoId(String corpinfoId) { - return StringUtils.hasText(corpinfoId) && !"0".equals(corpinfoId) ? corpinfoId : null; + private Long validCorpinfoId(Long corpinfoId) { + return corpinfoId != null && corpinfoId.longValue() != 0L ? corpinfoId : null; } private FenceDO findFirstScopeFence(JsonNode scope) { @@ -330,12 +333,12 @@ public class AlarmRuleFindsPullService { } } - private List resolveConfigs(String requestedCorpinfoId) { + private List resolveConfigs(Long requestedCorpinfoId) { SSOUser ssoUser = AuthContext.getCurrentUser(); - String corpinfoId = requestedCorpinfoId != null + Long corpinfoId = requestedCorpinfoId != null ? requestedCorpinfoId : (ssoUser == null || ssoUser.getCompanyId() == null - ? null : String.valueOf(ssoUser.getCompanyId())); + ? null : ssoUser.getCompanyId()); QueryWrapper queryWrapper = baseConfigQuery(); if (corpinfoId != null) { queryWrapper.eq("corpinfo_id", corpinfoId); 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 dcc6003..ffbe852 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(String corpinfoId, String corpinfoName) { + public FenceCompanyAreaCO query(Long 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, String corpinfoId, String corpinfoName) { + private AreaDO queryArea(Long areaId, Long 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, String corpinfoId, String corpinfoName) { + private FenceDO queryFence(Long fenceId, Long 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, String corpinfoId, String corpinfoName) { + private void applyCompany(QueryWrapper queryWrapper, Long 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 a051855..dca34cc 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 @@ -52,7 +52,7 @@ public class FenceFindsPullService { public FenceSyncCO sync(FenceSyncCmd cmd) { FenceSyncCmd command = cmd == null ? new FenceSyncCmd() : cmd; - String companyId = command.getCorpinfoId() == null ? currentCompanyId() : command.getCorpinfoId(); + Long companyId = command.getCorpinfoId() == null ? currentCompanyId() : command.getCorpinfoId(); if (command.getCorpinfoId() == null && companyId != null) { command.setCorpinfoId(companyId); } @@ -488,14 +488,14 @@ public class FenceFindsPullService { return value == null || value < 1 ? defaultValue : value; } - private String currentCompanyId() { + private Long currentCompanyId() { SSOUser currentUser = AuthContext.getCurrentUser(); return currentUser == null || currentUser.getCompanyId() == null - ? null : String.valueOf(currentUser.getCompanyId()); + ? null : currentUser.getCompanyId(); } private static class CorpInfo { - private String corpinfoId; + private Long corpinfoId; private String corpName; private String orgCode; } diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/FindsCorpMappingService.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/FindsCorpMappingService.java index 3d277eb..2e4338a 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/FindsCorpMappingService.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/FindsCorpMappingService.java @@ -38,7 +38,7 @@ public class FindsCorpMappingService { OrgMatchSnapshotDO saved = StringUtils.hasText(corpName) || StringUtils.hasText(departmentName) ? orgMatchRepository.findMatched(configCode, emptyIfBlank(corpName), emptyIfBlank(departmentName)) : null; - if (saved != null) { + if (saved != null && saved.getLocalCorpinfoId() != null) { orgMatchRepository.touch(configCode, emptyIfBlank(corpName), emptyIfBlank(departmentName), LocalDateTime.now()); return fromSaved(saved); @@ -68,8 +68,8 @@ public class FindsCorpMappingService { return resolved; } - private MatchAttempt queryCorp(String matchType, String key, String value) { - if (!StringUtils.hasText(value)) { + private MatchAttempt queryCorp(String matchType, String key, Object value) { + if (value == null || value instanceof String && !StringUtils.hasText((String) value)) { return null; } Map params = new LinkedHashMap<>(); @@ -95,9 +95,9 @@ public class FindsCorpMappingService { } private MatchAttempt distinct(String matchType, List rows) { - Map distinct = new LinkedHashMap<>(); + Map distinct = new LinkedHashMap<>(); for (CorpMatch row : rows) { - if (row != null && StringUtils.hasText(row.corpinfoId)) { + if (row != null && row.corpinfoId != null) { distinct.putIfAbsent(row.corpinfoId, row); } } @@ -130,8 +130,15 @@ public class FindsCorpMappingService { return attempt != null && !attempt.candidates.isEmpty(); } - private String validCorpinfoId(String value) { - return StringUtils.hasText(value) && !"0".equals(value) ? value : null; + private Long validCorpinfoId(String value) { + if (!StringUtils.hasText(value) || "0".equals(value)) { + return null; + } + try { + return Long.valueOf(value); + } catch (NumberFormatException ignored) { + return null; + } } private String clean(String value) { @@ -152,13 +159,13 @@ public class FindsCorpMappingService { @Getter public static class CorpMatch { - private final String corpinfoId; + private final Long corpinfoId; private final String corpinfoName; private final Long departmentId; private final String departmentName; private final String matchType; - public CorpMatch(String corpinfoId, String corpinfoName, Long departmentId, + public CorpMatch(Long corpinfoId, String corpinfoName, Long departmentId, String departmentName, String matchType) { this.corpinfoId = corpinfoId; this.corpinfoName = corpinfoName; diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/FindsPersonCorpResolver.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/FindsPersonCorpResolver.java index 3e5b2ed..eb779d1 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/FindsPersonCorpResolver.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/FindsPersonCorpResolver.java @@ -59,9 +59,9 @@ public class FindsPersonCorpResolver { } private Resolution resolveRows(List rows, String matchType) { - Map distinct = new LinkedHashMap<>(); + Map distinct = new LinkedHashMap<>(); for (CorpInfoSnapshotDO row : rows) { - if (row != null && StringUtils.hasText(row.getCorpinfoId())) { + if (row != null && row.getCorpinfoId() != null) { distinct.putIfAbsent(row.getCorpinfoId(), row); } } diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/TerminalAppSyncExe.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/TerminalAppSyncExe.java index 4b1d47a..ad0de45 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/TerminalAppSyncExe.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/TerminalAppSyncExe.java @@ -165,10 +165,10 @@ public class TerminalAppSyncExe { terminal.setDeviceType(DEVICE_TYPE_APP); terminal.setAppAccount(appAccount); terminal.setCorpinfoId(corpInfo == null - ? firstText(cmd.getCorpinfoId(), keepExistingCorp ? terminal.getCorpinfoId() : null) + ? firstLong(cmd.getCorpinfoId(), keepExistingCorp ? terminal.getCorpinfoId() : null) : corpInfo.corpinfoId); terminal.setCorpinfoName(firstText(cmd.getCorpinfoName(), corpInfo == null ? null : corpInfo.corpName, - keepExistingCorp && StringUtils.hasText(terminal.getCorpinfoId()) ? terminal.getCorpinfoName() : null, + keepExistingCorp && terminal.getCorpinfoId() != null ? terminal.getCorpinfoName() : null, textValue(child(row, "corpinfoName")), textValue(child(row, "corpName")), textValue(child(row, "orgName")), terminal.getCorpinfoName())); terminal.setOrgCode(firstText(textValue(child(row, "orgCode")), textValue(child(row, "orgId")), @@ -194,6 +194,7 @@ public class TerminalAppSyncExe { terminalRepository.save(terminal); } else { terminalRepository.updateById(terminal); + terminalRepository.updateCorpInfo(terminal.getId(), terminal.getCorpinfoId(), terminal.getCorpinfoName()); } PersonSnapshot person = personFromTrack(track); @@ -214,7 +215,7 @@ public class TerminalAppSyncExe { return false; } PersonSnapshot normalized = mergePerson(person, resolvePerson(person.idCardNo, person.staffNo, person.staffName)); - if (StringUtils.hasText(normalized.corpinfoId)) { + if (normalized.corpinfoId != null) { terminal.setCorpinfoId(normalized.corpinfoId); terminal.setCorpinfoName(normalized.corpinfoName); terminal.setOrgName(firstText(normalized.corpinfoName, terminal.getOrgName())); @@ -231,6 +232,7 @@ public class TerminalAppSyncExe { active.setFindsTerminalId(firstLong(terminal.getFindsTerminalId(), active.getFindsTerminalId())); markBindingSyncStatus(active, callFinds, now); terminalBindRepository.updateById(active); + terminalBindRepository.updateCorpInfo(active.getId(), active.getCorpinfoId(), active.getCorpinfoName()); updateTerminalBindIdCardNo(terminal, active.getIdCardNo()); return true; } @@ -361,7 +363,7 @@ public class TerminalAppSyncExe { return mergePerson(person, fallback); } - private CorpInfo resolveCorpInfo(String corpinfoId, String corpinfoName, String orgCode, String orgName) { + private CorpInfo resolveCorpInfo(Long corpinfoId, String corpinfoName, String orgCode, String orgName) { Map params = new HashMap<>(); if (corpinfoId != null) { params.put("corpinfoId", corpinfoId); @@ -392,7 +394,7 @@ public class TerminalAppSyncExe { } private boolean shouldKeepExistingCorp(TerminalDO terminal, String remoteOrgName, String remoteOrgCode) { - if (!StringUtils.hasText(terminal.getCorpinfoId())) { + if (terminal.getCorpinfoId() == null) { return false; } if (!StringUtils.hasText(remoteOrgName) && !StringUtils.hasText(remoteOrgCode)) { @@ -508,7 +510,7 @@ public class TerminalAppSyncExe { first.staffNo = firstText(first.staffNo, second.staffNo); first.staffName = firstText(first.staffName, second.staffName); first.mobileNo = firstText(first.mobileNo, second.mobileNo); - first.corpinfoId = firstText(first.corpinfoId, second.corpinfoId); + first.corpinfoId = firstLong(first.corpinfoId, second.corpinfoId); first.corpinfoName = firstText(first.corpinfoName, second.corpinfoName); first.findsTrackId = firstLong(first.findsTrackId, second.findsTrackId); return first; @@ -735,13 +737,13 @@ public class TerminalAppSyncExe { private String staffNo; private String staffName; private String mobileNo; - private String corpinfoId; + private Long corpinfoId; private String corpinfoName; private Long findsTrackId; } private static class CorpInfo { - private String corpinfoId; + private Long corpinfoId; private String corpName; private String creditCode; } diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/TerminalBindingService.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/TerminalBindingService.java index 425d0f1..519652b 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/TerminalBindingService.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/TerminalBindingService.java @@ -91,14 +91,16 @@ public class TerminalBindingService { return mergePerson(person, fallback); } - public CorpInfoSnapshotDO resolveCorpInfo(String corpinfoId, String corpinfoName, + public CorpInfoSnapshotDO resolveCorpInfo(Long corpinfoId, String corpinfoName, String orgCode, String orgName) { if (corpinfoId == null && !StringUtils.hasText(orgCode) && !StringUtils.hasText(corpinfoName) && !StringUtils.hasText(orgName)) { return null; } Map params = new HashMap<>(); - putText(params, "corpinfoId", corpinfoId); + if (corpinfoId != null) { + params.put("corpinfoId", corpinfoId); + } putText(params, "orgCode", orgCode); putText(params, "corpinfoName", firstText(corpinfoName, orgName)); return terminalRepository.findCorpInfo(params); @@ -244,7 +246,7 @@ public class TerminalBindingService { result.setStaffNo(firstText(preferred.getStaffNo(), fallback.getStaffNo())); result.setStaffName(firstText(preferred.getStaffName(), fallback.getStaffName())); result.setMobileNo(firstText(preferred.getMobileNo(), fallback.getMobileNo())); - result.setCorpinfoId(firstText(preferred.getCorpinfoId(), fallback.getCorpinfoId())); + result.setCorpinfoId(firstLong(preferred.getCorpinfoId(), fallback.getCorpinfoId())); result.setCorpinfoName(firstText(preferred.getCorpinfoName(), fallback.getCorpinfoName())); result.setFindsTrackId(firstLong(preferred.getFindsTrackId(), fallback.getFindsTrackId())); return result; diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/TerminalCardSyncExe.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/TerminalCardSyncExe.java index aa7f332..951cad9 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/TerminalCardSyncExe.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/TerminalCardSyncExe.java @@ -161,10 +161,10 @@ public class TerminalCardSyncExe { terminal.setSimCardNo(firstText(textValue(child(row, "simCardNo")), textValue(child(row, "simNo")), terminal.getSimCardNo())); terminal.setCorpinfoId(corpInfo == null - ? firstText(cmd.getCorpinfoId(), keepExistingCorp ? terminal.getCorpinfoId() : null) + ? firstLong(cmd.getCorpinfoId(), keepExistingCorp ? terminal.getCorpinfoId() : null) : corpInfo.corpinfoId); terminal.setCorpinfoName(firstText(cmd.getCorpinfoName(), corpInfo == null ? null : corpInfo.corpName, - keepExistingCorp && StringUtils.hasText(terminal.getCorpinfoId()) ? terminal.getCorpinfoName() : null, + keepExistingCorp && terminal.getCorpinfoId() != null ? terminal.getCorpinfoName() : null, textValue(child(row, "corpinfoName")), textValue(child(row, "corpName")), textValue(child(row, "orgName")), terminal.getCorpinfoName())); terminal.setOrgCode(firstText(textValue(child(row, "orgCode")), textValue(child(row, "orgId")), @@ -190,6 +190,7 @@ public class TerminalCardSyncExe { terminalRepository.save(terminal); } else { terminalRepository.updateById(terminal); + terminalRepository.updateCorpInfo(terminal.getId(), terminal.getCorpinfoId(), terminal.getCorpinfoName()); } PersonSnapshot person = personFromTrack(track); @@ -210,7 +211,7 @@ public class TerminalCardSyncExe { return false; } PersonSnapshot normalized = mergePerson(person, resolvePerson(person.idCardNo, person.staffNo, person.staffName)); - if (StringUtils.hasText(normalized.corpinfoId)) { + if (normalized.corpinfoId != null) { terminal.setCorpinfoId(normalized.corpinfoId); terminal.setCorpinfoName(normalized.corpinfoName); terminal.setOrgName(firstText(normalized.corpinfoName, terminal.getOrgName())); @@ -227,6 +228,7 @@ public class TerminalCardSyncExe { active.setFindsTerminalId(firstLong(terminal.getFindsTerminalId(), active.getFindsTerminalId())); markBindingSyncStatus(active, callFinds, now); terminalBindRepository.updateById(active); + terminalBindRepository.updateCorpInfo(active.getId(), active.getCorpinfoId(), active.getCorpinfoName()); updateTerminalBindIdCardNo(terminal, active.getIdCardNo()); return true; } @@ -342,7 +344,7 @@ public class TerminalCardSyncExe { return mergePerson(person, fallback); } - private CorpInfo resolveCorpInfo(String corpinfoId, String corpinfoName, String orgCode, String orgName) { + private CorpInfo resolveCorpInfo(Long corpinfoId, String corpinfoName, String orgCode, String orgName) { Map params = new HashMap<>(); if (corpinfoId != null) { params.put("corpinfoId", corpinfoId); @@ -374,7 +376,7 @@ public class TerminalCardSyncExe { } private boolean shouldKeepExistingCorp(TerminalDO terminal, String remoteOrgName, String remoteOrgCode) { - if (!StringUtils.hasText(terminal.getCorpinfoId())) { + if (terminal.getCorpinfoId() == null) { return false; } if (!StringUtils.hasText(remoteOrgName) && !StringUtils.hasText(remoteOrgCode)) { @@ -470,7 +472,7 @@ public class TerminalCardSyncExe { first.staffNo = firstText(first.staffNo, second.staffNo); first.staffName = firstText(first.staffName, second.staffName); first.mobileNo = firstText(first.mobileNo, second.mobileNo); - first.corpinfoId = firstText(first.corpinfoId, second.corpinfoId); + first.corpinfoId = firstLong(first.corpinfoId, second.corpinfoId); first.corpinfoName = firstText(first.corpinfoName, second.corpinfoName); first.findsTrackId = firstLong(first.findsTrackId, second.findsTrackId); return first; @@ -697,13 +699,13 @@ public class TerminalCardSyncExe { private String staffNo; private String staffName; private String mobileNo; - private String corpinfoId; + private Long corpinfoId; private String corpinfoName; private Long findsTrackId; } private static class CorpInfo { - private String corpinfoId; + private Long corpinfoId; private String corpName; private String creditCode; private String contactName; 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 0eb2721..f2bef81 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 @@ -63,7 +63,7 @@ public class AlarmRecordQueryExe { public List listBiAlarm(AlarmRecordBiQry qry) { AlarmRecordBiQry query = qry == null ? new AlarmRecordBiQry() : qry; - String corpinfoId = query.getCorpinfoId() == null ? null : String.valueOf(query.getCorpinfoId()); + Long corpinfoId = query.getCorpinfoId(); List rows = alarmRecordCoConvertor.converDOsToCOs( alarmRecordRepository.listBiAlarm(corpinfoId, query.getPortArea())); return rows; @@ -71,7 +71,7 @@ public class AlarmRecordQueryExe { public List listBiAlarmType(AlarmRecordBiAlarmTypeQry qry) { AlarmRecordBiAlarmTypeQry query = qry == null ? new AlarmRecordBiAlarmTypeQry() : qry; - String corpinfoId = query.getCorpinfoId() == null ? null : String.valueOf(query.getCorpinfoId()); + Long corpinfoId = query.getCorpinfoId(); List rows = alarmRecordRepository.listBiAlarmType(corpinfoId); if (rows == null || rows.isEmpty()) { return Collections.emptyList(); 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 c525f02..a368378 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 @@ -44,11 +44,7 @@ import java.util.stream.Collectors; @Component @AllArgsConstructor public class AlarmRuleQueryExe { - private static final String COMPANY_GROUP_UNMAPPED = "UNMAPPED"; private static final String COMPANY_GROUP_UNMAPPED_NAME = "未归属企业"; - private static final String COMPANY_GROUP_ID_PREFIX = "ID:"; - private static final String COMPANY_GROUP_ORG_PREFIX = "ORG:"; - private static final String COMPANY_GROUP_NAME_PREFIX = "NAME:"; private final AlarmRuleRepository alarmRuleRepository; private final AlarmRuleFenceRelRepository alarmRuleFenceRelRepository; @@ -75,7 +71,7 @@ public class AlarmRuleQueryExe { Map params = new HashMap<>(); SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - params.put("eqCorpinfoId", String.valueOf(ssoUser.getCompanyId())); + params.put("eqCorpinfoId", ssoUser.getCompanyId()); } if (StringUtils.hasText(keyword)) { params.put("keyword", keyword.trim()); @@ -173,39 +169,25 @@ public class AlarmRuleQueryExe { } SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - params.put("eqCorpinfoId", String.valueOf(ssoUser.getCompanyId())); + params.put("eqCorpinfoId", ssoUser.getCompanyId()); } } private void normalizeCompanyGroupParams(Map params) { - String corpinfoId = textValue(params.get("eqCorpinfoId")); - String corpinfoName = textValue(params.get("eqCorpinfoName")); - String likeCorpinfoName = textValue(params.get("likeCorpinfoName")); + Long corpinfoId = (Long) params.get("eqCorpinfoId"); + String corpinfoName = (String) params.get("eqCorpinfoName"); + String likeCorpinfoName = (String) params.get("likeCorpinfoName"); if (StringUtils.hasText(likeCorpinfoName) && COMPANY_GROUP_UNMAPPED_NAME.contains(likeCorpinfoName)) { params.put("includeUnmappedCompany", Boolean.TRUE); } - if (COMPANY_GROUP_UNMAPPED.equalsIgnoreCase(corpinfoId) - || COMPANY_GROUP_UNMAPPED_NAME.equals(corpinfoName) - || ("0".equals(corpinfoId) && !StringUtils.hasText(corpinfoName))) { + if (COMPANY_GROUP_UNMAPPED_NAME.equals(corpinfoName)) { params.remove("eqCorpinfoId"); params.remove("eqCorpinfoName"); params.put("unmappedCompany", Boolean.TRUE); return; } - if (StringUtils.hasText(corpinfoId) && corpinfoId.startsWith(COMPANY_GROUP_ID_PREFIX)) { - corpinfoId = corpinfoId.substring(COMPANY_GROUP_ID_PREFIX.length()); - } else if (StringUtils.hasText(corpinfoId) && corpinfoId.startsWith(COMPANY_GROUP_ORG_PREFIX)) { - params.remove("eqCorpinfoId"); - params.remove("eqCorpinfoName"); - params.put("companyGroupOrgCode", corpinfoId.substring(COMPANY_GROUP_ORG_PREFIX.length())); - return; - } else if (StringUtils.hasText(corpinfoId) && corpinfoId.startsWith(COMPANY_GROUP_NAME_PREFIX)) { - params.remove("eqCorpinfoId"); - params.put("eqCorpinfoName", corpinfoId.substring(COMPANY_GROUP_NAME_PREFIX.length())); - return; - } - if (!StringUtils.hasText(corpinfoId) || "0".equals(corpinfoId)) { + if (corpinfoId == null || corpinfoId.longValue() == 0L) { params.remove("eqCorpinfoId"); return; } @@ -213,14 +195,10 @@ public class AlarmRuleQueryExe { params.remove("eqCorpinfoName"); } - private String textValue(Object value) { - return value == null ? null : String.valueOf(value).trim(); - } - private void applyCorpinfo(QueryWrapper queryWrapper) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - queryWrapper.eq("corpinfo_id", String.valueOf(ssoUser.getCompanyId())); + queryWrapper.eq("corpinfo_id", 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 9252af8..acd695d 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 @@ -56,7 +56,7 @@ public class AreaQueryExe { return areaCoConvertor.converDOsToCOs(areaRepository.list(queryWrapper)); } - public List listOptions(String corpinfoId, String keyword) { + public List listOptions(Long 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,7 +79,7 @@ public class AreaQueryExe { if (corpinfoId == null) { throw new BizException("企业id不能为空"); } - String companyId = String.valueOf(corpinfoId); + Long companyId = corpinfoId; List areas = listCompanyAreas(companyId); List personList = biPersonLocationProvider.listCompanyOnlinePersons(companyId, null, null); @@ -101,7 +101,7 @@ public class AreaQueryExe { return areaCoConvertor.converDOToCO(dataObject); } - private List listCompanyAreas(String corpinfoId) { + private List listCompanyAreas(Long corpinfoId) { 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")); @@ -190,7 +190,7 @@ public class AreaQueryExe { } } - private void applyCorpinfo(QueryWrapper queryWrapper, String corpinfoId) { + private void applyCorpinfo(QueryWrapper queryWrapper, Long corpinfoId) { if (corpinfoId != null) { queryWrapper.eq("corpinfo_id", corpinfoId); return; diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/BiPersonLocationProvider.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/BiPersonLocationProvider.java index c95ca92..856211f 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/BiPersonLocationProvider.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/BiPersonLocationProvider.java @@ -37,10 +37,10 @@ public class BiPersonLocationProvider { private final UserRepository userRepository; private final PositionPersonQueryExe positionPersonQueryExe; - public List listCompanyOnlinePersons(String corpinfoId, + public List listCompanyOnlinePersons(Long corpinfoId, String corpinfoName, String corpCode) { - if (!StringUtils.hasText(corpinfoId)) { + if (corpinfoId == null) { return Collections.emptyList(); } LOGGER.info("开始查询可视化大屏第三方人员定位，corpinfoId={}", corpinfoId); @@ -62,7 +62,7 @@ public class BiPersonLocationProvider { return person != null && STATUS_ONLINE.equalsIgnoreCase(person.getLocationStatus()); } - private List loadThirdPartyPersonLocations(String corpinfoId, + private List loadThirdPartyPersonLocations(Long corpinfoId, String corpinfoName, String corpCode) { LOGGER.info("开始调用企业人员定位查询，corpinfoId={}，corpinfoName={}，corpCode={}", @@ -110,7 +110,7 @@ public class BiPersonLocationProvider { return location; } - private Map buildUserMap(String corpinfoId) { + private Map buildUserMap(Long corpinfoId) { List users = userRepository.listBiPersonPositionUsers(corpinfoId); Map result = new LinkedHashMap<>(); for (BiPersonPositionUserDO user : users) { @@ -130,7 +130,7 @@ public class BiPersonLocationProvider { } } - private BiCompanyOnlinePersonCO toOnlinePerson(String corpinfoId, + private BiCompanyOnlinePersonCO toOnlinePerson(Long corpinfoId, String corpinfoName, ThirdPartyPersonLocation location, Map userMap) { 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 6eb3d3f..ae7cac0 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 @@ -35,7 +35,7 @@ public class FenceQueryExe { Map params = new HashMap<>(); SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - params.put("eqCorpinfoId", String.valueOf(ssoUser.getCompanyId())); + params.put("eqCorpinfoId", ssoUser.getCompanyId()); } if (StringUtils.hasText(keyword)) { params.put("keyword", keyword.trim()); @@ -97,8 +97,8 @@ public class FenceQueryExe { } private void preferCorpinfoId(Map params) { - String corpinfoId = (String) params.get("eqCorpinfoId"); - if (!StringUtils.hasText(corpinfoId)) { + Long corpinfoId = (Long) params.get("eqCorpinfoId"); + if (corpinfoId == null) { return; } params.remove("eqCorpinfoName"); @@ -107,7 +107,7 @@ public class FenceQueryExe { private void applyCorpinfo(QueryWrapper queryWrapper) { SSOUser ssoUser = AuthContext.getCurrentUser(); if (ssoUser != null && ssoUser.getCompanyId() != null) { - queryWrapper.eq("corpinfo_id", String.valueOf(ssoUser.getCompanyId())); + queryWrapper.eq("corpinfo_id", ssoUser.getCompanyId()); } } diff --git a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/FindsStaffMappingSyncService.java b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/FindsStaffMappingSyncService.java index a1ffb9c..b562db9 100644 --- a/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/FindsStaffMappingSyncService.java +++ b/web-app/src/main/java/com/zcloud/personnel/positioning/command/query/FindsStaffMappingSyncService.java @@ -47,7 +47,7 @@ public class FindsStaffMappingSyncService { PersonIndexes localPeople = new PersonIndexes(localLookupService.findAllPeople()); int matchedCount = 0; for (StaffSnapshot row : staffRows) { - findsCorpMappingService.resolve(SOURCE_CONFIG_CODE, row.corpinfoId, + findsCorpMappingService.resolve(SOURCE_CONFIG_CODE, row.findsCorpinfoId, row.corpinfoName, row.departmentName, null); LocalMatch localMatch = localPeople.match(row); upsert(row, localMatch, syncTime); @@ -139,7 +139,7 @@ public class FindsStaffMappingSyncService { text(firstPresent(row, "idCardNo", "identityNo", "certificateNo", "cardNo")), text(firstPresent(terminalInfo, "idCardNo"))); snapshot.staffName = firstText(text(firstPresent(row, "staffName", "name", "realName", "userName"))); - snapshot.corpinfoId = firstText(text(firstPresent(row, + snapshot.findsCorpinfoId = firstText(text(firstPresent(row, "corpinfoId", "companyId", "corpId", "enterpriseId"))); // FindS staff rows carry the org hierarchy as orgNamePath (root-to-leaf, e.g. // ["秦港股份","杂货公司","机械一部"]) plus a single orgName for the leaf (assigned) node. @@ -174,7 +174,7 @@ public class FindsStaffMappingSyncService { params.put("findsTrackId", row.findsTrackId); params.put("idCardNo", row.idCardNo); params.put("staffName", row.staffName); - params.put("corpinfoId", row.corpinfoId); + params.put("corpinfoId", row.findsCorpinfoId); params.put("corpinfoName", row.corpinfoName); params.put("departmentName", row.departmentName); params.put("terminalNo", row.terminalNo); @@ -289,7 +289,7 @@ public class FindsStaffMappingSyncService { private Long findsTrackId; private String idCardNo; private String staffName; - private String corpinfoId; + private String findsCorpinfoId; private String corpinfoName; private String departmentName; private String terminalNo; 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 6778b33..86c266a 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 @@ -146,10 +146,10 @@ public class PersonnelPositioningBiQueryExe { private List mergeCorpInfoCompanies(List fenceCompanies, Integer portArea) { - Map companiesById = new LinkedHashMap<>(); + Map companiesById = new LinkedHashMap<>(); Map companiesByName = new LinkedHashMap<>(); for (BiCompanyLocationCO company : fenceCompanies) { - if (StringUtils.hasText(company.getCorpinfoId())) { + if (company.getCorpinfoId() != null) { companiesById.putIfAbsent(company.getCorpinfoId(), company); } String companyName = firstText(company.getCorpinfoName(), company.getCompanyName()); @@ -269,7 +269,7 @@ public class PersonnelPositioningBiQueryExe { public List listCompanyPersonPosition(BiCompanyOnlinePersonQry qry) { BiCompanyOnlinePersonQry query = qry == null ? new BiCompanyOnlinePersonQry() : qry; validatePortArea(query.getPortArea()); - String corpinfoId = query.getCorpinfoId() == null ? null : String.valueOf(query.getCorpinfoId()); + Long corpinfoId = query.getCorpinfoId(); List result = new ArrayList<>(); for (BiCorpInfoDO corpInfo : biRepository.listPersonPositionCompanies(corpinfoId, query.getPortArea())) { List personList = biPersonLocationProvider.listCompanyOnlinePersons( @@ -288,7 +288,7 @@ public class PersonnelPositioningBiQueryExe { if (qry == null || qry.getCorpinfoId() == null) { throw new BizException("企业id不能为空"); } - String corpinfoId = String.valueOf(qry.getCorpinfoId()); + Long corpinfoId = qry.getCorpinfoId(); List areas = loadBiPersonPositionAreas(corpinfoId); Map locationMap = loadBiPersonPositionLocationMap(corpinfoId); List result = new ArrayList<>(); @@ -299,7 +299,7 @@ public class PersonnelPositioningBiQueryExe { return result; } - private List loadBiPersonPositionAreas(String corpinfoId) { + private List loadBiPersonPositionAreas(Long corpinfoId) { List rows = areaRepository.listBiPersonPositionAreas(corpinfoId); List result = new ArrayList<>(); for (AreaDO row : rows) { @@ -308,7 +308,7 @@ public class PersonnelPositioningBiQueryExe { return result; } - private Map loadBiPersonPositionLocationMap(String corpinfoId) { + private Map loadBiPersonPositionLocationMap(Long corpinfoId) { List locations = biPersonLocationProvider.listCompanyOnlinePersons(corpinfoId, null, null); Map result = new LinkedHashMap<>(); @@ -483,7 +483,7 @@ public class PersonnelPositioningBiQueryExe { private List queryCompanyOnlineCorpInfos(BiCompanyOnlinePersonQry qry) { if (qry.getCorpinfoId() != null) { - CorpInfoView corpInfo = queryCorpInfoById(String.valueOf(qry.getCorpinfoId())); + CorpInfoView corpInfo = queryCorpInfoById(qry.getCorpinfoId()); if (corpInfo == null) { throw new BizException("未找到对应企业信息"); } @@ -496,7 +496,7 @@ public class PersonnelPositioningBiQueryExe { } private List loadMatchedPersonLocations(BiPersonLocationQry query) { - if (StringUtils.hasText(query.getCorpinfoId()) && localLookupService.hasPersonnelMappings()) { + if (query.getCorpinfoId() != null && localLookupService.hasPersonnelMappings()) { return loadPersistedPersonLocations(query); } List staffRows = loadAllStaffSnapshots(); @@ -557,7 +557,7 @@ public class PersonnelPositioningBiQueryExe { private List loadPersistedPersonLocations(BiPersonLocationQry query) { PositionPersonPageQry localQuery = new PositionPersonPageQry(); - localQuery.setCorpinfoId(query.getCorpinfoId().trim()); + localQuery.setCorpinfoId(query.getCorpinfoId()); localQuery.setCorpinfoName(query.getCompanyName()); localQuery.setStaffName(query.getStaffName()); @@ -991,7 +991,7 @@ public class PersonnelPositioningBiQueryExe { co.setTerminalNo(terminalNo); co.setCompanyName(local.getCorpinfoName()); co.setCorpinfoName(local.getCorpinfoName()); - co.setCorpinfoId(local.getCorpinfoId() == null ? null : String.valueOf(local.getCorpinfoId())); + co.setCorpinfoId(local.getCorpinfoId()); co.setPortArea(local.getPortArea()); co.setCreditCode(local.getCreditCode()); CorpInfoView corpInfo = queryCorpInfoById(local.getCorpinfoId()); @@ -1022,7 +1022,7 @@ public class PersonnelPositioningBiQueryExe { private boolean matchesPersonLocation(BiPersonLocationCO co, BiPersonLocationQry qry) { if (qry.getCorpinfoId() != null - && !String.valueOf(qry.getCorpinfoId()).equals(co.getCorpinfoId())) { + && !qry.getCorpinfoId().equals(co.getCorpinfoId())) { return false; } if (StringUtils.hasText(qry.getTerminalNo()) && !qry.getTerminalNo().equals(co.getTerminalNo())) { @@ -1191,13 +1191,13 @@ public class PersonnelPositioningBiQueryExe { private void fillCompanyOnlineCounts(List companies, List personList) { - Map countsByCompanyId = new HashMap<>(); + Map countsByCompanyId = new HashMap<>(); Map countsByCompanyName = new HashMap<>(); for (BiPersonLocationCO person : personList) { if (!Boolean.TRUE.equals(person.getOnline())) { continue; } - if (StringUtils.hasText(person.getCorpinfoId())) { + if (person.getCorpinfoId() != null) { countsByCompanyId.merge(person.getCorpinfoId(), 1, Integer::sum); } String companyName = firstText(person.getCorpinfoName(), person.getCompanyName()); @@ -1254,11 +1254,11 @@ public class PersonnelPositioningBiQueryExe { } private void fillCompanyAlarmCounts(List rows) { - Map countsByCompanyId = new HashMap<>(); + Map countsByCompanyId = new HashMap<>(); Map countsByCompanyName = new HashMap<>(); for (BiCompanyAlarmCountDO row : biRepository.listCompanyAlarmCounts()) { int count = row.getAlarmCount() == null ? 0 : row.getAlarmCount(); - if (StringUtils.hasText(row.getCorpinfoId())) { + if (row.getCorpinfoId() != null) { countsByCompanyId.merge(row.getCorpinfoId(), count, Integer::sum); } if (StringUtils.hasText(row.getCorpinfoName())) { @@ -1523,7 +1523,7 @@ public class PersonnelPositioningBiQueryExe { return mapCorpInfo(biRepository.findCorpByCreditCode(creditCode)); } - private CorpInfoView queryCorpInfoById(String corpinfoId) { + private CorpInfoView queryCorpInfoById(Long corpinfoId) { if (corpinfoId == null) { return null; } @@ -1735,7 +1735,7 @@ public class PersonnelPositioningBiQueryExe { private String areaType; private Long parentId; private String parentCode; - private String corpinfoId; + private Long corpinfoId; private String corpinfoName; private BigDecimal centerLon; private BigDecimal centerLat; @@ -1743,7 +1743,7 @@ public class PersonnelPositioningBiQueryExe { } private static class CorpInfoView { - private String corpinfoId; + private Long corpinfoId; private String corpName; private String code; private String address; @@ -1764,7 +1764,7 @@ public class PersonnelPositioningBiQueryExe { private final String companyName; private String orgCode; private String creditCode; - private String corpinfoId; + private Long corpinfoId; private Long portId; private String portCode; private String portName; @@ -1787,8 +1787,8 @@ public class PersonnelPositioningBiQueryExe { if (!StringUtils.hasText(creditCode)) { creditCode = fence.getCreditCode(); } - if (!StringUtils.hasText(corpinfoId) && fence.getCorpinfoId() != null) { - corpinfoId = String.valueOf(fence.getCorpinfoId()); + if (corpinfoId == null && fence.getCorpinfoId() != null) { + corpinfoId = fence.getCorpinfoId(); } if (portId == null && fence.getPortId() != null) { portId = fence.getPortId(); 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 af71a59..b5ae5d5 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 @@ -39,7 +39,7 @@ class PositionPersonLocalLookupService { if (query != null) { params.put("userId", query.getUserId()); params.put("staffName", normalize(query.getStaffName())); - params.put("corpinfoId", query.getCorpinfoId() == null ? null : String.valueOf(query.getCorpinfoId())); + params.put("corpinfoId", query.getCorpinfoId()); params.put("corpinfoName", normalize(query.getCorpinfoName())); params.put("departmentId", query.getDepartmentId()); params.put("departmentName", normalize(query.getDepartmentName())); @@ -180,7 +180,7 @@ class PositionPersonLocalLookupService { private String staffName; private String mobileNo; private String idCardNo; - private String corpinfoId; + private Long corpinfoId; private String corpinfoName; private String creditCode; private Integer portArea; 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 index 2241239..7f6d85a 100644 --- 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 @@ -166,9 +166,8 @@ public class RealtimePersonLocationMatcher { directText(row, "companyName", "corpName", "enterpriseName"), directText(staff, "companyName", "corpName", "enterpriseName"), orgName)); - co.setCorpinfoId(firstText( - directText(row, "corpinfoId", "companyId", "corpId", "enterpriseId"), - directText(staff, "corpinfoId", "companyId", "corpId", "enterpriseId"))); + // FindS 企业标识是外部字符串，不能直接当作本地 corp_info.id。 + co.setCorpinfoId(null); co.setCorpinfoName(firstText(co.getCompanyName(), orgName)); co.setOrgName(orgName); co.setOrgCode(orgCode); 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 2204e9a..78914b0 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 @@ -141,8 +141,7 @@ public class FindsOpenApiClient { private OpenapiConfigDO loadEnabledConfig() { SSOUser currentUser = AuthContext.getCurrentUser(); - String companyId = currentUser == null || currentUser.getCompanyId() == null - ? null : String.valueOf(currentUser.getCompanyId()); + Long companyId = currentUser == null ? null : 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 e5c6376..216a8ed 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(String companyId) { + public OpenapiConfigDO getEnabledConfig(Long 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(String companyId) { + private OpenapiConfigDO queryConfigByCorpinfo(Long 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(String companyId) { + private String companyKey(Long 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(text(map.get("corpinfoId"))); + config.setCorpinfoId(longValue(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 String corpinfoId; + private final Long corpinfoId; private final String corpinfoName; private CachedOpenapiConfig(OpenapiConfigDO config) { @@ -308,7 +308,7 @@ public class OpenapiConfigCache { return enabled; } - public String getCorpinfoId() { + public Long getCorpinfoId() { return corpinfoId; } 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 76fd320..432b7b8 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 @@ -43,7 +43,7 @@ public class AreaServiceImpl implements AreaServiceI { } @Override - public List listOptions(String corpinfoId, String keyword) { + public List listOptions(Long 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 2a11bbf..6afaeb3 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 @@ -61,7 +61,7 @@ public class FenceServiceImpl implements FenceServiceI { } @Override - public FenceCompanyAreaCO queryCompanyArea(String corpinfoId, String corpinfoName) { + public FenceCompanyAreaCO queryCompanyArea(Long corpinfoId, String corpinfoName) { return fenceCompanyAreaSaveExe.query(corpinfoId, corpinfoName); } 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 c050427..b4f6585 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 @@ -22,7 +22,7 @@ public interface AreaServiceI { List listAll(); - List listOptions(String corpinfoId, String keyword); + List listOptions(Long corpinfoId, String keyword); List listPersonStat(Long corpinfoId); 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 1883316..e8b4fe3 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(String corpinfoId, String corpinfoName); + FenceCompanyAreaCO queryCompanyArea(Long corpinfoId, String corpinfoName); SingleResponse add(FenceAddCmd cmd); 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 2e977bd..e1ede4c 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 String corpinfoId; + private Long 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 ed99baa..0eb685c 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 @@ -20,7 +20,7 @@ public class AlarmDisposeRecordPageQry extends PageQuery { private Long eqAlarmRecordId; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "eqCorpinfoId") - private String eqCorpinfoId; + private Long 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 b90a242..6c03fc2 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 String corpinfoId; + private Long 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 eb07f3b..c034664 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 String corpinfoId; + private Long 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 bc1cf50..c9267fc 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 @@ -78,7 +78,7 @@ public class AlarmRecordPageQry extends PageQuery { private LocalDateTime leGt; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "eqCorpinfoId") - private String eqCorpinfoId; + private Long 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 1953679..e4768a1 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 String corpinfoId; + private Long 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 e5a2ff1..bb464b9 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 @@ -20,7 +20,7 @@ public class AlarmRecordTargetPageQry extends PageQuery { private Long eqAlarmRecordId; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "eqCorpinfoId") - private String eqCorpinfoId; + private Long 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 7e85ae3..074bd0d 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 String corpinfoId; + private Long 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 4148027..fc6b81f 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 String corpinfoId; + private Long 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 ad741c1..da4dfa2 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 String corpinfoId; + private Long 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 6fff9a4..4e41701 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 String eqCorpinfoId; + private Long 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 0a795df..2d75a66 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 String corpinfoId; + private Long 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 2a15a8a..762862b 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 @@ -32,7 +32,7 @@ public class AlarmRuleFenceRelPageQry extends PageQuery { private String eqRelType; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "eqCorpinfoId") - private String eqCorpinfoId; + private Long 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 cdd05d4..70bb9bb 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 String corpinfoId; + private Long 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 8108346..a29939e 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 String corpinfoId; + private Long 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 d904fc2..0594c6c 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 @@ -21,7 +21,7 @@ public class AlarmRuleItemPageQry extends PageQuery { private Long eqRuleId; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "eqCorpinfoId") - private String eqCorpinfoId; + private Long 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 e3a6d44..a8a2a06 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 String corpinfoId; + private Long 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 339de5a..72f6059 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 @@ -38,7 +38,7 @@ public class AlarmRulePageQry extends PageQuery { private String eqRuleStatus; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "eqCorpinfoId") - private String eqCorpinfoId; + private Long 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 af687a5..71f1864 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 String corpinfoId; + private Long 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 3e87cb9..d305b31 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 String corpinfoId; + private Long 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 9e84daf..f577302 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 @@ -39,7 +39,7 @@ public class AreaPageQry extends PageQuery { private String likeOrgName; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "eqCorpinfoId") - private String eqCorpinfoId; + private Long 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 0b4fc0a..0e583a3 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 String corpinfoId; + private Long 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 a7bcc98..9994052 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 String corpinfoId; + private Long 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 36c0574..9d6e9b6 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 String corpinfoId; + private Long 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 7f4b5cb..60daad0 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 String corpinfoId; + private Long 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 504cd28..c234b4d 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 String corpinfoId; + private Long 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 23773a5..c418638 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 String eqCorpinfoId; + private Long 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 3bb3072..d4a4523 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 @@ -30,7 +30,7 @@ public class FencePageQry extends PageQuery { private String likeFenceBizName; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "eqCorpinfoId") - private String eqCorpinfoId; + private Long 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 8cbee7c..4efce18 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 String corpinfoId; + private Long 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 fb68407..2942159 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 @@ -36,7 +36,7 @@ public class FencePointPageQry extends PageQuery { private BigDecimal eqAlt; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "eqCorpinfoId") - private String eqCorpinfoId; + private Long 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 5bb02f0..024cff2 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 String corpinfoId; + private Long 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 7d75d87..eb371b2 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 String corpinfoId; + private Long 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 6885c18..9faf10c 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 String corpinfoId; + private Long 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 20d5194..f7a571a 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 String corpinfoId; + private Long 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 755f113..6f3e90b 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 @@ -56,7 +56,7 @@ public class OpenapiConfigPageQry extends PageQuery { private LocalDateTime leLastCheckTime; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "eqCorpinfoId") - private String eqCorpinfoId; + private Long 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 4f2385a..fff9485 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 String corpinfoId; + private Long 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 eea0c11..24c6531 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 String corpinfoId; + private Long 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 306bb11..4076f6c 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 String corpinfoId; + private Long 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 f30d187..0ff7284 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 String corpinfoId; + private Long 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 fdcc7e7..78723d4 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 @@ -29,7 +29,7 @@ public class SyncLogPageQry extends PageQuery { private String eqBizId; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "eqCorpinfoId") - private String eqCorpinfoId; + private Long 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 9c81bb1..2442f7d 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 String corpinfoId; + private Long 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 c191dab..8f4747d 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 String corpinfoId; + private Long 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 5d9e2a9..fc031fc 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 @@ -26,7 +26,7 @@ public class SyncTaskPageQry extends PageQuery { private String eqBizType; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "eqCorpinfoId") - private String eqCorpinfoId; + private Long 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 e9ffbed..466e716 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 String corpinfoId; + private Long 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 ec5fa47..dc0cfb3 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 String corpinfoId; + private Long 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 6098024..52d89e3 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 String eqCorpinfoId; + private Long 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 663ae2c..c235537 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 String eqCorpinfoId; + private Long 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 0a8cb74..d3ddfbb 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 String corpinfoId; + private Long 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 2a57393..4061f16 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 String corpinfoId; + private Long 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 d7e9d88..c47c7b3 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 String corpinfoId; + private Long 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 83a2de7..2647210 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 @@ -29,7 +29,7 @@ public class TerminalBindPageQry extends PageQuery { private String eqDeviceType; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "eqCorpinfoId") - private String eqCorpinfoId; + private Long 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 72c4895..943ea05 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 String corpinfoId; + private Long 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 29bf3ea..7c8388f 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 String eqCorpinfoId; + private Long 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 387deea..9085cf8 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 String eqCorpinfoId; + private Long 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 4c91e2e..ebd8b64 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 String corpinfoId; + private Long 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 e2783ce..4afd8c7 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 String corpinfoId; + private Long 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 428d2c3..5886a04 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 String corpinfoId; + private Long 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 4553850..0d94728 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 @@ -38,7 +38,7 @@ public class TerminalPageQry extends PageQuery { private String eqCheckCode; @ApiModelProperty(value = "企业id/公司id（公司及子公司数据隔离）", name = "eqCorpinfoId") - private String eqCorpinfoId; + private Long 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 4c77768..fd08140 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 String corpinfoId; + private Long 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 e4a8dfe..75f05a9 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 String corpinfoId; + private Long 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 1c91014..24725fd 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 String corpinfoId; + private Long 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 84c605a..d88557d 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 String corpinfoId; + private Long 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 ba2c442..b4f13e7 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 String corpinfoId; + private Long 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 ce7f1c1..0b6f220 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 String corpinfoId; + private Long 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 bf3ecab..a8dcab2 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 String corpinfoId; + private Long 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 5b63a02..67725f4 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 String corpinfoId; + private Long 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 eb06655..d9111da 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 String corpinfoId; + private Long corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AreaPersonStatCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AreaPersonStatCO.java index ed43ff2..fb1c086 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AreaPersonStatCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/AreaPersonStatCO.java @@ -27,7 +27,7 @@ public class AreaPersonStatCO extends ClientObject { private String areaType; @ApiModelProperty(value = "企业id", name = "corpinfoId") - private String corpinfoId; + private Long 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 cc40dcc..6835bcc 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 String corpinfoId; + private Long 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 1178e22..59990b1 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 @@ -36,7 +36,7 @@ public class BiCompanyLocationCO extends ClientObject { private String orgCode; @ApiModelProperty(value = "企业id/公司id", name = "corpinfoId") - private String corpinfoId; + private Long corpinfoId; @ApiModelProperty(value = "企业名称/公司名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/BiCompanyOnlinePersonCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/BiCompanyOnlinePersonCO.java index 3973c4e..4805b37 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/BiCompanyOnlinePersonCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/BiCompanyOnlinePersonCO.java @@ -27,7 +27,7 @@ public class BiCompanyOnlinePersonCO extends ClientObject { private String mobileNo; @ApiModelProperty(value = "企业id", name = "corpinfoId") - private String corpinfoId; + private Long corpinfoId; @ApiModelProperty(value = "企业名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/BiCompanyPersonPositionCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/BiCompanyPersonPositionCO.java index ca573ca..1b5804a 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/BiCompanyPersonPositionCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/BiCompanyPersonPositionCO.java @@ -13,7 +13,7 @@ import lombok.Data; @Data public class BiCompanyPersonPositionCO extends ClientObject { @ApiModelProperty(value = "企业id", name = "corpinfoId") - private String corpinfoId; + private Long corpinfoId; @ApiModelProperty(value = "企业名称", name = "corpinfoName") private String corpinfoName; 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 a45271e..e1aefe1 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 @@ -48,7 +48,7 @@ public class BiPersonLocationCO extends ClientObject { private String orgCode; @ApiModelProperty(value = "企业信息ID", name = "corpinfoId") - private String corpinfoId; + private Long corpinfoId; @ApiModelProperty(value = "企业信息名称", name = "corpinfoName") private String corpinfoName; diff --git a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/BiPersonPositionCO.java b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/BiPersonPositionCO.java index bfce225..58f2d45 100644 --- a/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/BiPersonPositionCO.java +++ b/web-client/src/main/java/com/zcloud/personnel/positioning/dto/clientobject/BiPersonPositionCO.java @@ -30,7 +30,7 @@ public class BiPersonPositionCO extends ClientObject { private String onlineStatusName; @ApiModelProperty(value = "企业id", name = "corpinfoId") - private String corpinfoId; + private Long corpinfoId; @ApiModelProperty(value = "企业名称", name = "corpinfoName") private String corpinfoName; 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 5f9ec55..36dada7 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 String corpinfoId; + private Long 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 9773212..248f66c 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 String corpinfoId; + private Long 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 b5bf97d..a883bd4 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 String corpinfoId; + private Long 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 6ea6ed2..eaf0118 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 String corpinfoId; + private Long 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 36721da..80de070 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 String corpinfoId; + private Long 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 6955e48..70d165c 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 String corpinfoId; + private Long 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 d804d26..852a0e4 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 String corpinfoId; + private Long 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 88d1450..d26d01e 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 String corpinfoId; + private Long 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 0f5e863..433566d 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 String corpinfoId; + private Long 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 aa3054f..5138fd4 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 String corpinfoId; + private Long 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 e857883..dd011de 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 String corpinfoId; + private Long 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 69119c5..c99cff0 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 String corpinfoId; + private Long 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 dee89e3..6d39bb2 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 String corpinfoId; + private Long 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 534c808..c7fa0cf 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 String corpinfoId; + private Long 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 cbdf786..eb83981 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 String corpinfoId; + private Long 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 d892774..5a8fb10 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 String corpinfoId; + private Long 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 50718d3..79229f2 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 String corpinfoId; + private Long 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 4103f49..32acee7 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 String corpinfoId; + private Long 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 c75ff9c..15d4b70 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 String corpinfoId; + private Long 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 4201aa1..2df859a 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 String corpinfoId; + private Long 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 f316dbd..cec3557 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 @@ -56,7 +56,7 @@ public class AlarmRuleE extends BaseE { /** * 企业id/公司id（公司及子公司数据隔离） */ - private String corpinfoId; + private Long 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 5f9c73c..0ec5854 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 String corpinfoId; + private Long 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 2f48da6..cd29e32 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 String corpinfoId; + private Long 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 3155461..a69f018 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 String corpinfoId; + private Long 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 0458be9..e894ff4 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 @@ -45,7 +45,7 @@ public class FenceE extends BaseE { /** * 企业id/公司id（公司及子公司数据隔离） */ - private String corpinfoId; + private Long 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 c413cfe..c7c01be 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 String corpinfoId; + private Long 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 9744cd5..c3a3d19 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 String corpinfoId; + private Long 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 2a1f5e8..a39b727 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 String corpinfoId; + private Long 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 0b0cf90..03b7628 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 String corpinfoId; + private Long 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 87194ad..b78fc60 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 @@ -44,7 +44,7 @@ public class TerminalBindE extends BaseE { /** * 企业id/公司id（公司及子公司数据隔离） */ - private String corpinfoId; + private Long 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 1355269..a619287 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 @@ -55,7 +55,7 @@ public class TerminalE extends BaseE { /** * 企业id/公司id（公司及子公司数据隔离） */ - private String corpinfoId; + private Long 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 cec9849..a3a802b 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 String corpinfoId; + private Long 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 dbea0bf..36bef4d 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 String corpinfoId; + private Long 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 57ae22d..ef4281a 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 String corpinfoId; + private Long corpinfoId; /** * 企业名称/公司名称 diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AlarmRuleCompanyStatDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AlarmRuleCompanyStatDO.java index 3b3e09b..1cc4090 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AlarmRuleCompanyStatDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/AlarmRuleCompanyStatDO.java @@ -6,7 +6,7 @@ import java.time.LocalDateTime; @Data public class AlarmRuleCompanyStatDO { - private String corpinfoId; + private Long corpinfoId; private String corpinfoName; private Integer configCount; private Integer enabledCount; 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 56ee4f2..ef42480 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 String corpinfoId; + private Long 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 493cd58..30e0b36 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 String corpinfoId; + private Long 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 ae65af9..050ae79 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 String corpinfoId; + private Long 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 b222db7..f65a6c8 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 String corpinfoId; + private Long corpinfoId; /** * 企业名称/公司名称 diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/BiAreaSnapshotDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/BiAreaSnapshotDO.java index 8e1bddb..875a7c4 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/BiAreaSnapshotDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/BiAreaSnapshotDO.java @@ -12,7 +12,7 @@ public class BiAreaSnapshotDO { private String areaType; private Long parentId; private String parentCode; - private String corpinfoId; + private Long corpinfoId; private String corpinfoName; private BigDecimal centerLon; private BigDecimal centerLat; diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/BiCompanyAlarmCountDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/BiCompanyAlarmCountDO.java index b05aeba..e10ff2f 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/BiCompanyAlarmCountDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/BiCompanyAlarmCountDO.java @@ -4,7 +4,7 @@ import lombok.Data; @Data public class BiCompanyAlarmCountDO { - private String corpinfoId; + private Long corpinfoId; private String corpinfoName; private Integer alarmCount; } diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/BiCorpInfoDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/BiCorpInfoDO.java index ce58277..57b6bc2 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/BiCorpInfoDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/BiCorpInfoDO.java @@ -5,7 +5,7 @@ import lombok.Data; @Data public class BiCorpInfoDO { - private String corpinfoId; + private Long corpinfoId; private String corpName; private String code; private String address; diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/BiPersonPositionUserDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/BiPersonPositionUserDO.java index e622b58..b1eecb4 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/BiPersonPositionUserDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/BiPersonPositionUserDO.java @@ -15,6 +15,6 @@ public class BiPersonPositionUserDO { private String personName; private String mobileNo; private String idCardNo; - private String corpinfoId; + private Long corpinfoId; private String corpinfoName; } diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/CorpInfoSnapshotDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/CorpInfoSnapshotDO.java index fb5a75a..2062598 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/CorpInfoSnapshotDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/CorpInfoSnapshotDO.java @@ -4,7 +4,7 @@ import lombok.Data; @Data public class CorpInfoSnapshotDO { - private String corpinfoId; + private Long corpinfoId; private String corpName; private String creditCode; private String contactName; diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/FenceCompanyStatDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/FenceCompanyStatDO.java index 71083d1..be49498 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/FenceCompanyStatDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/FenceCompanyStatDO.java @@ -6,7 +6,7 @@ import java.time.LocalDateTime; @Data public class FenceCompanyStatDO { - private String corpinfoId; + private Long corpinfoId; private String corpinfoName; private Integer fenceCount; private Integer enabledCount; 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 444fd09..24ef970 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 String corpinfoId; + private Long 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 b0be217..0cc22cc 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 String corpinfoId; + private Long 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 c3c50d4..eedb04d 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 String corpinfoId; + private Long corpinfoId; /** * 企业名称/公司名称 diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/OrgLocalCorpDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/OrgLocalCorpDO.java index 5a6332c..0a3f95b 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/OrgLocalCorpDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/OrgLocalCorpDO.java @@ -4,7 +4,7 @@ import lombok.Data; @Data public class OrgLocalCorpDO { - private String corpinfoId; + private Long corpinfoId; private String corpinfoName; private String creditCode; private Long corpDepartmentId; diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/OrgLocalDepartmentDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/OrgLocalDepartmentDO.java index a06bee7..c17aede 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/OrgLocalDepartmentDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/OrgLocalDepartmentDO.java @@ -6,6 +6,6 @@ import lombok.Data; public class OrgLocalDepartmentDO { private Long departmentId; private String departmentName; - private String rootCorpinfoId; + private Long rootCorpinfoId; private String rootCorpinfoName; } diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/OrgMatchSnapshotDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/OrgMatchSnapshotDO.java index 70d490f..165a9ec 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/OrgMatchSnapshotDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/OrgMatchSnapshotDO.java @@ -4,7 +4,7 @@ import lombok.Data; @Data public class OrgMatchSnapshotDO { - private String localCorpinfoId; + private Long localCorpinfoId; private String localCorpinfoName; private Long localDepartmentId; private String localDepartmentName; diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/PersonnelLocalPersonDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/PersonnelLocalPersonDO.java index 45ab4c8..4912acf 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/PersonnelLocalPersonDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/PersonnelLocalPersonDO.java @@ -10,7 +10,7 @@ public class PersonnelLocalPersonDO { private String staffName; private String mobileNo; private String idCardNo; - private String corpinfoId; + private Long corpinfoId; private String corpinfoName; private String creditCode; private Integer portArea; 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 17830e2..73688be 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 String corpinfoId; + private Long 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 f57c24a..57fce14 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 String corpinfoId; + private Long corpinfoId; /** * 企业名称/公司名称 diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalAppCompanyStatDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalAppCompanyStatDO.java index da5655c..e2b9299 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalAppCompanyStatDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalAppCompanyStatDO.java @@ -6,7 +6,7 @@ import java.time.LocalDateTime; @Data public class TerminalAppCompanyStatDO { - private String corpinfoId; + private Long corpinfoId; private String corpinfoName; private String orgCode; private String orgName; diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalAppDetailDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalAppDetailDO.java index 5170202..c000447 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalAppDetailDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalAppDetailDO.java @@ -10,7 +10,7 @@ public class TerminalAppDetailDO { private String appAccount; private String terminalNo; private String terminalName; - private String corpinfoId; + private Long corpinfoId; private String corpinfoName; private String orgCode; private String orgName; 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 9334402..d730341 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 String corpinfoId; + private Long corpinfoId; /** * 企业名称/公司名称 diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalCardCompanyOptionDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalCardCompanyOptionDO.java index 179101f..134a571 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalCardCompanyOptionDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalCardCompanyOptionDO.java @@ -4,7 +4,7 @@ import lombok.Data; @Data public class TerminalCardCompanyOptionDO { - private String corpinfoId; + private Long corpinfoId; private String corpinfoName; private String creditCode; private String contactName; diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalCardCompanyStatDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalCardCompanyStatDO.java index 33717f6..8c8425e 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalCardCompanyStatDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalCardCompanyStatDO.java @@ -6,7 +6,7 @@ import java.time.LocalDateTime; @Data public class TerminalCardCompanyStatDO { - private String corpinfoId; + private Long corpinfoId; private String corpinfoName; private String orgCode; private String orgName; diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalCardDetailDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalCardDetailDO.java index b884e6e..2fe2297 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalCardDetailDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalCardDetailDO.java @@ -11,7 +11,7 @@ public class TerminalCardDetailDO { private String terminalName; private String terminalModel; private String simCardNo; - private String corpinfoId; + private Long corpinfoId; private String corpinfoName; private String orgCode; private String orgName; diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalCardPersonOptionDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalCardPersonOptionDO.java index 320186b..a3badf3 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalCardPersonOptionDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalCardPersonOptionDO.java @@ -9,7 +9,7 @@ public class TerminalCardPersonOptionDO { private String staffName; private String idCardNo; private String mobileNo; - private String corpinfoId; + private Long corpinfoId; private String corpinfoName; private Long departmentId; private String postName; 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 a8f7562..cd37c79 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 String corpinfoId; + private Long corpinfoId; /** * 企业名称/公司名称 diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalPersonSnapshotDO.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalPersonSnapshotDO.java index e086d26..c30ec45 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalPersonSnapshotDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/dataobject/TerminalPersonSnapshotDO.java @@ -8,7 +8,7 @@ public class TerminalPersonSnapshotDO { private String staffNo; private String staffName; private String mobileNo; - private String corpinfoId; + private Long corpinfoId; private String corpinfoName; private Long findsTrackId; } diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/mapper/AlarmRecordMapper.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/mapper/AlarmRecordMapper.java index 38ef303..4ca93f3 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/mapper/AlarmRecordMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/mapper/AlarmRecordMapper.java @@ -22,10 +22,10 @@ public interface AlarmRecordMapper extends BaseMapper { IPage listAlarmRecords(IPage page, @Param("params") Map params); - List selectBiAlarmList(@Param("corpinfoId") String corpinfoId, + List selectBiAlarmList(@Param("corpinfoId") Long corpinfoId, @Param("portArea") Integer portArea); - List selectBiAlarmTypeList(@Param("corpinfoId") String corpinfoId); + List selectBiAlarmTypeList(@Param("corpinfoId") Long corpinfoId); List listCompanyOptions(@Param("params") Map params); diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/mapper/AreaMapper.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/mapper/AreaMapper.java index d6b7ece..29ed566 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/mapper/AreaMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/mapper/AreaMapper.java @@ -15,5 +15,5 @@ import java.util.List; */ @Mapper public interface AreaMapper extends BaseMapper { - List selectBiPersonPositionAreas(@Param("corpinfoId") String corpinfoId); + List selectBiPersonPositionAreas(@Param("corpinfoId") Long corpinfoId); } diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/mapper/PersonnelPositioningBiMapper.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/mapper/PersonnelPositioningBiMapper.java index 4fab9db..747d8bc 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/mapper/PersonnelPositioningBiMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/mapper/PersonnelPositioningBiMapper.java @@ -11,7 +11,7 @@ import java.util.List; @Mapper public interface PersonnelPositioningBiMapper { List listCorpInfos(@Param("portArea") Integer portArea); - List listPersonPositionCompanies(@Param("corpinfoId") String corpinfoId, + List listPersonPositionCompanies(@Param("corpinfoId") Long corpinfoId, @Param("portArea") Integer portArea); List listAreaSnapshots(); List listCompanyAlarmCounts(); @@ -19,7 +19,7 @@ public interface PersonnelPositioningBiMapper { int countOpenAlarmPersons(); int countOpenAlarmsByPerson(@Param("idCardNo") String idCardNo, @Param("terminalNo") String terminalNo); String findPositionMode(@Param("terminalNo") String terminalNo); - BiCorpInfoDO findCorpById(@Param("corpinfoId") String corpinfoId); + BiCorpInfoDO findCorpById(@Param("corpinfoId") Long corpinfoId); BiCorpInfoDO findCorpByCreditCode(@Param("creditCode") String creditCode); BiCorpInfoDO findCorpByName(@Param("corpName") String corpName); BiCorpInfoDO findCorpFuzzy(@Param("corpName") String corpName); diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/mapper/TerminalBindMapper.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/mapper/TerminalBindMapper.java index 3f02907..c2e23fa 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/mapper/TerminalBindMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/mapper/TerminalBindMapper.java @@ -3,6 +3,9 @@ package com.zcloud.personnel.positioning.persistence.mapper; import com.zcloud.personnel.positioning.persistence.dataobject.TerminalBindDO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.Map; /** * web-infrastructure @@ -12,4 +15,5 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface TerminalBindMapper extends BaseMapper { + int updateCorpInfo(@Param("params") Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/mapper/TerminalMapper.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/mapper/TerminalMapper.java index 6c5c11f..b00f8d5 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/mapper/TerminalMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/mapper/TerminalMapper.java @@ -51,4 +51,6 @@ public interface TerminalMapper extends BaseMapper { CorpInfoSnapshotDO findCorpInfo(@Param("params") Map params); int updateBindIdCardNo(@Param("params") Map params); + + int updateCorpInfo(@Param("params") Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/mapper/UserMapper.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/mapper/UserMapper.java index 01b3803..aabe658 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/mapper/UserMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/mapper/UserMapper.java @@ -14,5 +14,5 @@ import java.util.List; */ @Mapper public interface UserMapper { - List selectBiPersonPositionUsers(@Param("corpinfoId") String corpinfoId); + List selectBiPersonPositionUsers(@Param("corpinfoId") Long corpinfoId); } diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/AlarmRecordRepository.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/AlarmRecordRepository.java index 1539b54..691dfd9 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/AlarmRecordRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/AlarmRecordRepository.java @@ -18,9 +18,9 @@ import java.util.Map; public interface AlarmRecordRepository extends BaseRepository { PageResponse listPage(Map params); - List listBiAlarm(String corpinfoId, Integer portArea); + List listBiAlarm(Long corpinfoId, Integer portArea); - List listBiAlarmType(String corpinfoId); + List listBiAlarmType(Long corpinfoId); List listCompanyOptions(Map params); diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/AreaRepository.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/AreaRepository.java index 1d11bee..ce1ebcd 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/AreaRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/AreaRepository.java @@ -16,5 +16,5 @@ import java.util.Map; public interface AreaRepository extends BaseRepository { PageResponse listPage(Map params); - List listBiPersonPositionAreas(String corpinfoId); + List listBiPersonPositionAreas(Long corpinfoId); } diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/PersonnelPositioningBiRepository.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/PersonnelPositioningBiRepository.java index 00cccf4..421ff15 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/PersonnelPositioningBiRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/PersonnelPositioningBiRepository.java @@ -8,14 +8,14 @@ import java.util.List; public interface PersonnelPositioningBiRepository { List listCorpInfos(Integer portArea); - List listPersonPositionCompanies(String corpinfoId, Integer portArea); + List listPersonPositionCompanies(Long corpinfoId, Integer portArea); List listAreaSnapshots(); List listCompanyAlarmCounts(); int countOpenAlarms(); int countOpenAlarmPersons(); int countOpenAlarmsByPerson(String idCardNo, String terminalNo); String findPositionMode(String terminalNo); - BiCorpInfoDO findCorpById(String corpinfoId); + BiCorpInfoDO findCorpById(Long corpinfoId); BiCorpInfoDO findCorpByCreditCode(String creditCode); BiCorpInfoDO findCorpByName(String corpName); BiCorpInfoDO findCorpFuzzy(String corpName); diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/TerminalBindRepository.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/TerminalBindRepository.java index 99e524e..62671f1 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/TerminalBindRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/TerminalBindRepository.java @@ -14,4 +14,6 @@ import java.util.Map; */ public interface TerminalBindRepository extends BaseRepository { PageResponse listPage(Map params); + + boolean updateCorpInfo(Long id, Long corpinfoId, String corpinfoName); } diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/TerminalRepository.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/TerminalRepository.java index 6c6fe10..75a4451 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/TerminalRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/TerminalRepository.java @@ -45,4 +45,6 @@ public interface TerminalRepository extends BaseRepository { CorpInfoSnapshotDO findCorpInfo(Map params); boolean updateBindIdCardNo(Long id, String idCardNo); + + boolean updateCorpInfo(Long id, Long corpinfoId, String corpinfoName); } diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/UserRepository.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/UserRepository.java index c031324..42bd9c7 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/UserRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/UserRepository.java @@ -11,5 +11,5 @@ import java.util.List; * @Date 2026-07-27 */ public interface UserRepository { - List listBiPersonPositionUsers(String corpinfoId); + List listBiPersonPositionUsers(Long corpinfoId); } diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/impl/AlarmRecordRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/impl/AlarmRecordRepositoryImpl.java index f575cce..2894a14 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/impl/AlarmRecordRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/impl/AlarmRecordRepositoryImpl.java @@ -35,12 +35,12 @@ public class AlarmRecordRepositoryImpl extends BaseRepositoryImpl listBiAlarm(String corpinfoId, Integer portArea) { + public List listBiAlarm(Long corpinfoId, Integer portArea) { return alarmRecordMapper.selectBiAlarmList(corpinfoId, portArea); } @Override - public List listBiAlarmType(String corpinfoId) { + public List listBiAlarmType(Long corpinfoId) { return alarmRecordMapper.selectBiAlarmTypeList(corpinfoId); } diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/impl/AreaRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/impl/AreaRepositoryImpl.java index 7573764..5370021 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/impl/AreaRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/impl/AreaRepositoryImpl.java @@ -38,7 +38,7 @@ public class AreaRepositoryImpl extends BaseRepositoryImpl i } @Override - public List listBiPersonPositionAreas(String corpinfoId) { + public List listBiPersonPositionAreas(Long corpinfoId) { return areaMapper.selectBiPersonPositionAreas(corpinfoId); } } diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/impl/PersonnelPositioningBiRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/impl/PersonnelPositioningBiRepositoryImpl.java index 18637c3..2ede449 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/impl/PersonnelPositioningBiRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/impl/PersonnelPositioningBiRepositoryImpl.java @@ -15,14 +15,14 @@ import java.util.List; public class PersonnelPositioningBiRepositoryImpl implements PersonnelPositioningBiRepository { private final PersonnelPositioningBiMapper mapper; @Override public List listCorpInfos(Integer portArea) { return mapper.listCorpInfos(portArea); } - @Override public List listPersonPositionCompanies(String corpinfoId, Integer portArea) { return mapper.listPersonPositionCompanies(corpinfoId, portArea); } + @Override public List listPersonPositionCompanies(Long corpinfoId, Integer portArea) { return mapper.listPersonPositionCompanies(corpinfoId, portArea); } @Override public List listAreaSnapshots() { return mapper.listAreaSnapshots(); } @Override public List listCompanyAlarmCounts() { return mapper.listCompanyAlarmCounts(); } @Override public int countOpenAlarms() { return mapper.countOpenAlarms(); } @Override public int countOpenAlarmPersons() { return mapper.countOpenAlarmPersons(); } @Override public int countOpenAlarmsByPerson(String id, String terminal) { return mapper.countOpenAlarmsByPerson(id, terminal); } @Override public String findPositionMode(String terminalNo) { return mapper.findPositionMode(terminalNo); } - @Override public BiCorpInfoDO findCorpById(String id) { return mapper.findCorpById(id); } + @Override public BiCorpInfoDO findCorpById(Long id) { return mapper.findCorpById(id); } @Override public BiCorpInfoDO findCorpByCreditCode(String code) { return mapper.findCorpByCreditCode(code); } @Override public BiCorpInfoDO findCorpByName(String name) { return mapper.findCorpByName(name); } @Override public BiCorpInfoDO findCorpFuzzy(String name) { return mapper.findCorpFuzzy(name); } diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/impl/TerminalBindRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/impl/TerminalBindRepositoryImpl.java index 275fbc5..86fb75d 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/impl/TerminalBindRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/impl/TerminalBindRepositoryImpl.java @@ -14,6 +14,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.Map; +import java.util.HashMap; /** * web-infrastructure @@ -35,4 +36,13 @@ public class TerminalBindRepositoryImpl extends BaseRepositoryImpl result = terminalBindMapper.selectPage(iPage, queryWrapper); return PageHelper.pageToResponse(result, result.getRecords()); } + + @Override + public boolean updateCorpInfo(Long id, Long corpinfoId, String corpinfoName) { + Map params = new HashMap<>(); + params.put("id", id); + params.put("corpinfoId", corpinfoId); + params.put("corpinfoName", corpinfoName); + return terminalBindMapper.updateCorpInfo(params) == 1; + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/impl/TerminalRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/impl/TerminalRepositoryImpl.java index 9ebf294..ddddece 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/impl/TerminalRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/impl/TerminalRepositoryImpl.java @@ -113,4 +113,13 @@ public class TerminalRepositoryImpl extends BaseRepositoryImpl params = new HashMap<>(); + params.put("id", id); + params.put("corpinfoId", corpinfoId); + params.put("corpinfoName", corpinfoName); + return terminalMapper.updateCorpInfo(params) == 1; + } } diff --git a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/impl/UserRepositoryImpl.java index 7af6e42..a7b7fd9 100644 --- a/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/impl/UserRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/personnel/positioning/persistence/repository/impl/UserRepositoryImpl.java @@ -20,7 +20,7 @@ public class UserRepositoryImpl implements UserRepository { private final UserMapper userMapper; @Override - public List listBiPersonPositionUsers(String corpinfoId) { + public List listBiPersonPositionUsers(Long corpinfoId) { return userMapper.selectBiPersonPositionUsers(corpinfoId); } } diff --git a/web-infrastructure/src/main/resources/TableCreationDDL.sql b/web-infrastructure/src/main/resources/TableCreationDDL.sql index c26deb5..145c69d 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` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', + `corpinfo_id` bigint DEFAULT NULL COMMENT '企业主键，关联corp_info.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` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', + `corpinfo_id` bigint DEFAULT NULL COMMENT '企业主键，关联corp_info.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` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', + `corpinfo_id` bigint DEFAULT NULL COMMENT '企业主键，关联corp_info.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` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', + `corpinfo_id` bigint DEFAULT NULL COMMENT '企业主键，关联corp_info.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 '校验码', @@ -225,7 +225,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` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', + `corpinfo_id` bigint DEFAULT NULL COMMENT '企业主键，关联corp_info.id', `corpinfo_name` varchar(255) DEFAULT NULL COMMENT '企业名称/公司名称', `org_code` varchar(64) DEFAULT NULL COMMENT '所属公司编码', `org_name` varchar(255) DEFAULT NULL COMMENT '所属公司名称', @@ -279,7 +279,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` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', + `corpinfo_id` bigint DEFAULT NULL COMMENT '企业主键，关联corp_info.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 '备注', @@ -308,7 +308,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` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', + `corpinfo_id` bigint DEFAULT NULL COMMENT '企业主键，关联corp_info.id', `corpinfo_name` varchar(255) DEFAULT NULL COMMENT '企业名称/公司名称', `org_code` varchar(64) DEFAULT NULL COMMENT '所属公司编码', `org_name` varchar(255) DEFAULT NULL COMMENT '所属公司名称', @@ -348,7 +348,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` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', + `corpinfo_id` bigint DEFAULT NULL COMMENT '企业主键，关联corp_info.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 '备注', @@ -372,7 +372,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` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', + `corpinfo_id` bigint DEFAULT NULL COMMENT '企业主键，关联corp_info.id', `corpinfo_name` varchar(255) DEFAULT NULL COMMENT '企业名称/公司名称', `level` int DEFAULT 1 COMMENT '告警等级', `enable` tinyint(1) NOT NULL DEFAULT 1 COMMENT '是否启用', @@ -431,7 +431,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` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', + `corpinfo_id` bigint DEFAULT NULL COMMENT '企业主键，关联corp_info.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 '首个告警人员工号快照', @@ -465,7 +465,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` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', + `corpinfo_id` bigint DEFAULT NULL COMMENT '企业主键，关联corp_info.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设施', @@ -498,7 +498,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` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', + `corpinfo_id` bigint DEFAULT NULL COMMENT '企业主键，关联corp_info.id', `corpinfo_name` varchar(255) DEFAULT NULL COMMENT '企业名称/公司名称', `dispose_status` varchar(32) NOT NULL COMMENT '处置状态 INIT未处置 CLOSE已处置', `dispose_result` varchar(1000) DEFAULT NULL COMMENT '处置结果', @@ -530,7 +530,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` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', + `corpinfo_id` bigint DEFAULT NULL COMMENT '企业主键，关联corp_info.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 '定时表达式', @@ -564,7 +564,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` varchar(64) DEFAULT NULL COMMENT '企业id/公司id（公司及子公司数据隔离）', + `corpinfo_id` bigint DEFAULT NULL COMMENT '企业主键，关联corp_info.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/V20260801_01__corpinfo_id_internal_pk.sql b/web-infrastructure/src/main/resources/db/migration/mysql/V20260801_01__corpinfo_id_internal_pk.sql new file mode 100644 index 0000000..910e627 --- /dev/null +++ b/web-infrastructure/src/main/resources/db/migration/mysql/V20260801_01__corpinfo_id_internal_pk.sql @@ -0,0 +1,258 @@ +-- 本项目 corpinfo_id 统一保存 corp_info.id。 +-- 迁移兼容两类存量数据：已经保存内部主键的记录，以及仍保存 corp_info.corpinfo_id 的记录。 +CREATE TEMPORARY TABLE `_corpinfo_id_map_20260801` ( + `legacy_corpinfo_id` varchar(64) NOT NULL, + `internal_id` bigint NOT NULL, + `match_count` int NOT NULL, + PRIMARY KEY (`legacy_corpinfo_id`) +); + +INSERT INTO `_corpinfo_id_map_20260801` (`legacy_corpinfo_id`, `internal_id`, `match_count`) +SELECT CAST(`corpinfo_id` AS CHAR), MIN(`id`), COUNT(1) +FROM `corp_info` +WHERE `corpinfo_id` IS NOT NULL AND CAST(`corpinfo_id` AS CHAR) <> '' +GROUP BY CAST(`corpinfo_id` AS CHAR); + +-- 空串和 0 仅是旧版的“未归属”占位值，统一改为 NULL，避免伪造本地企业主键。 +UPDATE `openapi_config` SET `corpinfo_id` = NULL WHERE TRIM(CAST(`corpinfo_id` AS CHAR)) IN ('', '0'); +UPDATE `area` SET `corpinfo_id` = NULL WHERE TRIM(CAST(`corpinfo_id` AS CHAR)) IN ('', '0'); +UPDATE `terminal` SET `corpinfo_id` = NULL WHERE TRIM(CAST(`corpinfo_id` AS CHAR)) IN ('', '0'); +UPDATE `terminal_bind` SET `corpinfo_id` = NULL WHERE TRIM(CAST(`corpinfo_id` AS CHAR)) IN ('', '0'); +UPDATE `fence` SET `corpinfo_id` = NULL WHERE TRIM(CAST(`corpinfo_id` AS CHAR)) IN ('', '0'); +UPDATE `fence_point` SET `corpinfo_id` = NULL WHERE TRIM(CAST(`corpinfo_id` AS CHAR)) IN ('', '0'); +UPDATE `alarm_rule` SET `corpinfo_id` = NULL WHERE TRIM(CAST(`corpinfo_id` AS CHAR)) IN ('', '0'); +UPDATE `alarm_rule_fence_rel` SET `corpinfo_id` = NULL WHERE TRIM(CAST(`corpinfo_id` AS CHAR)) IN ('', '0'); +UPDATE `alarm_rule_item` SET `corpinfo_id` = NULL WHERE TRIM(CAST(`corpinfo_id` AS CHAR)) IN ('', '0'); +UPDATE `alarm_record` SET `corpinfo_id` = NULL WHERE TRIM(CAST(`corpinfo_id` AS CHAR)) IN ('', '0'); +UPDATE `alarm_record_target` SET `corpinfo_id` = NULL WHERE TRIM(CAST(`corpinfo_id` AS CHAR)) IN ('', '0'); +UPDATE `alarm_dispose_record` SET `corpinfo_id` = NULL WHERE TRIM(CAST(`corpinfo_id` AS CHAR)) IN ('', '0'); +UPDATE `sync_task` SET `corpinfo_id` = NULL WHERE TRIM(CAST(`corpinfo_id` AS CHAR)) IN ('', '0'); +UPDATE `sync_log` SET `corpinfo_id` = NULL WHERE TRIM(CAST(`corpinfo_id` AS CHAR)) IN ('', '0'); +UPDATE `org_match` SET `local_corpinfo_id` = NULL +WHERE TRIM(CAST(`local_corpinfo_id` AS CHAR)) IN ('', '0'); + +UPDATE `openapi_config` t +LEFT JOIN `corp_info` current_corp ON CAST(current_corp.`id` AS CHAR) = t.`corpinfo_id` +INNER JOIN `_corpinfo_id_map_20260801` id_map + ON id_map.`legacy_corpinfo_id` = t.`corpinfo_id` AND id_map.`match_count` = 1 +SET t.`corpinfo_id` = CAST(id_map.`internal_id` AS CHAR) +WHERE t.`corpinfo_id` IS NOT NULL AND current_corp.`id` IS NULL; + +UPDATE `area` t +LEFT JOIN `corp_info` current_corp ON CAST(current_corp.`id` AS CHAR) = t.`corpinfo_id` +INNER JOIN `_corpinfo_id_map_20260801` id_map + ON id_map.`legacy_corpinfo_id` = t.`corpinfo_id` AND id_map.`match_count` = 1 +SET t.`corpinfo_id` = CAST(id_map.`internal_id` AS CHAR) +WHERE t.`corpinfo_id` IS NOT NULL AND current_corp.`id` IS NULL; + +UPDATE `terminal` t +LEFT JOIN `corp_info` current_corp ON CAST(current_corp.`id` AS CHAR) = t.`corpinfo_id` +INNER JOIN `_corpinfo_id_map_20260801` id_map + ON id_map.`legacy_corpinfo_id` = t.`corpinfo_id` AND id_map.`match_count` = 1 +SET t.`corpinfo_id` = CAST(id_map.`internal_id` AS CHAR) +WHERE t.`corpinfo_id` IS NOT NULL AND current_corp.`id` IS NULL; + +UPDATE `terminal_bind` t +LEFT JOIN `corp_info` current_corp ON CAST(current_corp.`id` AS CHAR) = t.`corpinfo_id` +INNER JOIN `_corpinfo_id_map_20260801` id_map + ON id_map.`legacy_corpinfo_id` = t.`corpinfo_id` AND id_map.`match_count` = 1 +SET t.`corpinfo_id` = CAST(id_map.`internal_id` AS CHAR) +WHERE t.`corpinfo_id` IS NOT NULL AND current_corp.`id` IS NULL; + +UPDATE `fence` t +LEFT JOIN `corp_info` current_corp ON CAST(current_corp.`id` AS CHAR) = t.`corpinfo_id` +INNER JOIN `_corpinfo_id_map_20260801` id_map + ON id_map.`legacy_corpinfo_id` = t.`corpinfo_id` AND id_map.`match_count` = 1 +SET t.`corpinfo_id` = CAST(id_map.`internal_id` AS CHAR) +WHERE t.`corpinfo_id` IS NOT NULL AND current_corp.`id` IS NULL; + +UPDATE `fence_point` t +LEFT JOIN `corp_info` current_corp ON CAST(current_corp.`id` AS CHAR) = t.`corpinfo_id` +INNER JOIN `_corpinfo_id_map_20260801` id_map + ON id_map.`legacy_corpinfo_id` = t.`corpinfo_id` AND id_map.`match_count` = 1 +SET t.`corpinfo_id` = CAST(id_map.`internal_id` AS CHAR) +WHERE t.`corpinfo_id` IS NOT NULL AND current_corp.`id` IS NULL; + +UPDATE `alarm_rule` t +LEFT JOIN `corp_info` current_corp ON CAST(current_corp.`id` AS CHAR) = t.`corpinfo_id` +INNER JOIN `_corpinfo_id_map_20260801` id_map + ON id_map.`legacy_corpinfo_id` = t.`corpinfo_id` AND id_map.`match_count` = 1 +SET t.`corpinfo_id` = CAST(id_map.`internal_id` AS CHAR) +WHERE t.`corpinfo_id` IS NOT NULL AND current_corp.`id` IS NULL; + +UPDATE `alarm_rule_fence_rel` t +LEFT JOIN `corp_info` current_corp ON CAST(current_corp.`id` AS CHAR) = t.`corpinfo_id` +INNER JOIN `_corpinfo_id_map_20260801` id_map + ON id_map.`legacy_corpinfo_id` = t.`corpinfo_id` AND id_map.`match_count` = 1 +SET t.`corpinfo_id` = CAST(id_map.`internal_id` AS CHAR) +WHERE t.`corpinfo_id` IS NOT NULL AND current_corp.`id` IS NULL; + +UPDATE `alarm_rule_item` t +LEFT JOIN `corp_info` current_corp ON CAST(current_corp.`id` AS CHAR) = t.`corpinfo_id` +INNER JOIN `_corpinfo_id_map_20260801` id_map + ON id_map.`legacy_corpinfo_id` = t.`corpinfo_id` AND id_map.`match_count` = 1 +SET t.`corpinfo_id` = CAST(id_map.`internal_id` AS CHAR) +WHERE t.`corpinfo_id` IS NOT NULL AND current_corp.`id` IS NULL; + +UPDATE `alarm_record` t +LEFT JOIN `corp_info` current_corp ON CAST(current_corp.`id` AS CHAR) = t.`corpinfo_id` +INNER JOIN `_corpinfo_id_map_20260801` id_map + ON id_map.`legacy_corpinfo_id` = t.`corpinfo_id` AND id_map.`match_count` = 1 +SET t.`corpinfo_id` = CAST(id_map.`internal_id` AS CHAR) +WHERE t.`corpinfo_id` IS NOT NULL AND current_corp.`id` IS NULL; + +UPDATE `alarm_record_target` t +LEFT JOIN `corp_info` current_corp ON CAST(current_corp.`id` AS CHAR) = t.`corpinfo_id` +INNER JOIN `_corpinfo_id_map_20260801` id_map + ON id_map.`legacy_corpinfo_id` = t.`corpinfo_id` AND id_map.`match_count` = 1 +SET t.`corpinfo_id` = CAST(id_map.`internal_id` AS CHAR) +WHERE t.`corpinfo_id` IS NOT NULL AND current_corp.`id` IS NULL; + +UPDATE `alarm_dispose_record` t +LEFT JOIN `corp_info` current_corp ON CAST(current_corp.`id` AS CHAR) = t.`corpinfo_id` +INNER JOIN `_corpinfo_id_map_20260801` id_map + ON id_map.`legacy_corpinfo_id` = t.`corpinfo_id` AND id_map.`match_count` = 1 +SET t.`corpinfo_id` = CAST(id_map.`internal_id` AS CHAR) +WHERE t.`corpinfo_id` IS NOT NULL AND current_corp.`id` IS NULL; + +UPDATE `sync_task` t +LEFT JOIN `corp_info` current_corp ON CAST(current_corp.`id` AS CHAR) = t.`corpinfo_id` +INNER JOIN `_corpinfo_id_map_20260801` id_map + ON id_map.`legacy_corpinfo_id` = t.`corpinfo_id` AND id_map.`match_count` = 1 +SET t.`corpinfo_id` = CAST(id_map.`internal_id` AS CHAR) +WHERE t.`corpinfo_id` IS NOT NULL AND current_corp.`id` IS NULL; + +UPDATE `sync_log` t +LEFT JOIN `corp_info` current_corp ON CAST(current_corp.`id` AS CHAR) = t.`corpinfo_id` +INNER JOIN `_corpinfo_id_map_20260801` id_map + ON id_map.`legacy_corpinfo_id` = t.`corpinfo_id` AND id_map.`match_count` = 1 +SET t.`corpinfo_id` = CAST(id_map.`internal_id` AS CHAR) +WHERE t.`corpinfo_id` IS NOT NULL AND current_corp.`id` IS NULL; + +UPDATE `org_match` t +LEFT JOIN `corp_info` current_corp ON CAST(current_corp.`id` AS CHAR) = t.`local_corpinfo_id` +INNER JOIN `_corpinfo_id_map_20260801` id_map + ON id_map.`legacy_corpinfo_id` = t.`local_corpinfo_id` AND id_map.`match_count` = 1 +SET t.`local_corpinfo_id` = CAST(id_map.`internal_id` AS CHAR) +WHERE t.`local_corpinfo_id` IS NOT NULL AND current_corp.`id` IS NULL; + +-- 当前 corp_info 视图中不存在或无法唯一映射的历史企业标识不能安全转换为本地主键。 +-- 置为 NULL 并保留 corpinfo_name 等快照字段，避免把第三方标识误写成本地 corp_info.id。 +UPDATE `openapi_config` t +LEFT JOIN `corp_info` c ON CAST(c.`id` AS CHAR) = CAST(t.`corpinfo_id` AS CHAR) +SET t.`corpinfo_id` = NULL +WHERE t.`corpinfo_id` IS NOT NULL AND c.`id` IS NULL; + +UPDATE `area` t +LEFT JOIN `corp_info` c ON CAST(c.`id` AS CHAR) = CAST(t.`corpinfo_id` AS CHAR) +SET t.`corpinfo_id` = NULL +WHERE t.`corpinfo_id` IS NOT NULL AND c.`id` IS NULL; + +UPDATE `terminal` t +LEFT JOIN `corp_info` c ON CAST(c.`id` AS CHAR) = CAST(t.`corpinfo_id` AS CHAR) +SET t.`corpinfo_id` = NULL +WHERE t.`corpinfo_id` IS NOT NULL AND c.`id` IS NULL; + +UPDATE `terminal_bind` t +LEFT JOIN `corp_info` c ON CAST(c.`id` AS CHAR) = CAST(t.`corpinfo_id` AS CHAR) +SET t.`corpinfo_id` = NULL +WHERE t.`corpinfo_id` IS NOT NULL AND c.`id` IS NULL; + +UPDATE `fence` t +LEFT JOIN `corp_info` c ON CAST(c.`id` AS CHAR) = CAST(t.`corpinfo_id` AS CHAR) +SET t.`corpinfo_id` = NULL +WHERE t.`corpinfo_id` IS NOT NULL AND c.`id` IS NULL; + +UPDATE `fence_point` t +LEFT JOIN `corp_info` c ON CAST(c.`id` AS CHAR) = CAST(t.`corpinfo_id` AS CHAR) +SET t.`corpinfo_id` = NULL +WHERE t.`corpinfo_id` IS NOT NULL AND c.`id` IS NULL; + +UPDATE `alarm_rule` t +LEFT JOIN `corp_info` c ON CAST(c.`id` AS CHAR) = CAST(t.`corpinfo_id` AS CHAR) +SET t.`corpinfo_id` = NULL +WHERE t.`corpinfo_id` IS NOT NULL AND c.`id` IS NULL; + +UPDATE `alarm_rule_fence_rel` t +LEFT JOIN `corp_info` c ON CAST(c.`id` AS CHAR) = CAST(t.`corpinfo_id` AS CHAR) +SET t.`corpinfo_id` = NULL +WHERE t.`corpinfo_id` IS NOT NULL AND c.`id` IS NULL; + +UPDATE `alarm_rule_item` t +LEFT JOIN `corp_info` c ON CAST(c.`id` AS CHAR) = CAST(t.`corpinfo_id` AS CHAR) +SET t.`corpinfo_id` = NULL +WHERE t.`corpinfo_id` IS NOT NULL AND c.`id` IS NULL; + +UPDATE `alarm_record` t +LEFT JOIN `corp_info` c ON CAST(c.`id` AS CHAR) = CAST(t.`corpinfo_id` AS CHAR) +SET t.`corpinfo_id` = NULL +WHERE t.`corpinfo_id` IS NOT NULL AND c.`id` IS NULL; + +UPDATE `alarm_record_target` t +LEFT JOIN `corp_info` c ON CAST(c.`id` AS CHAR) = CAST(t.`corpinfo_id` AS CHAR) +SET t.`corpinfo_id` = NULL +WHERE t.`corpinfo_id` IS NOT NULL AND c.`id` IS NULL; + +UPDATE `alarm_dispose_record` t +LEFT JOIN `corp_info` c ON CAST(c.`id` AS CHAR) = CAST(t.`corpinfo_id` AS CHAR) +SET t.`corpinfo_id` = NULL +WHERE t.`corpinfo_id` IS NOT NULL AND c.`id` IS NULL; + +UPDATE `sync_task` t +LEFT JOIN `corp_info` c ON CAST(c.`id` AS CHAR) = CAST(t.`corpinfo_id` AS CHAR) +SET t.`corpinfo_id` = NULL +WHERE t.`corpinfo_id` IS NOT NULL AND c.`id` IS NULL; + +UPDATE `sync_log` t +LEFT JOIN `corp_info` c ON CAST(c.`id` AS CHAR) = CAST(t.`corpinfo_id` AS CHAR) +SET t.`corpinfo_id` = NULL +WHERE t.`corpinfo_id` IS NOT NULL AND c.`id` IS NULL; + +UPDATE `org_match` t +LEFT JOIN `corp_info` c ON CAST(c.`id` AS CHAR) = CAST(t.`local_corpinfo_id` AS CHAR) +SET t.`local_corpinfo_id` = NULL +WHERE t.`local_corpinfo_id` IS NOT NULL AND c.`id` IS NULL; + +-- 所有仍保留的非空值都已确认是 corp_info.id，以下校验只防止遗漏新表或新字段。 +CREATE TEMPORARY TABLE `_corpinfo_id_guard_20260801` ( + `all_rows_mapped` tinyint NOT NULL +); + +INSERT INTO `_corpinfo_id_guard_20260801` (`all_rows_mapped`) +SELECT CASE WHEN SUM(unmatched_count) = 0 THEN 1 ELSE NULL END +FROM ( + SELECT COUNT(1) unmatched_count FROM `openapi_config` t LEFT JOIN `corp_info` c ON CAST(c.`id` AS CHAR) = t.`corpinfo_id` WHERE t.`corpinfo_id` IS NOT NULL AND c.`id` IS NULL + UNION ALL SELECT COUNT(1) FROM `area` t LEFT JOIN `corp_info` c ON CAST(c.`id` AS CHAR) = t.`corpinfo_id` WHERE t.`corpinfo_id` IS NOT NULL AND c.`id` IS NULL + UNION ALL SELECT COUNT(1) FROM `terminal` t LEFT JOIN `corp_info` c ON CAST(c.`id` AS CHAR) = t.`corpinfo_id` WHERE t.`corpinfo_id` IS NOT NULL AND c.`id` IS NULL + UNION ALL SELECT COUNT(1) FROM `terminal_bind` t LEFT JOIN `corp_info` c ON CAST(c.`id` AS CHAR) = t.`corpinfo_id` WHERE t.`corpinfo_id` IS NOT NULL AND c.`id` IS NULL + UNION ALL SELECT COUNT(1) FROM `fence` t LEFT JOIN `corp_info` c ON CAST(c.`id` AS CHAR) = t.`corpinfo_id` WHERE t.`corpinfo_id` IS NOT NULL AND c.`id` IS NULL + UNION ALL SELECT COUNT(1) FROM `fence_point` t LEFT JOIN `corp_info` c ON CAST(c.`id` AS CHAR) = t.`corpinfo_id` WHERE t.`corpinfo_id` IS NOT NULL AND c.`id` IS NULL + UNION ALL SELECT COUNT(1) FROM `alarm_rule` t LEFT JOIN `corp_info` c ON CAST(c.`id` AS CHAR) = t.`corpinfo_id` WHERE t.`corpinfo_id` IS NOT NULL AND c.`id` IS NULL + UNION ALL SELECT COUNT(1) FROM `alarm_rule_fence_rel` t LEFT JOIN `corp_info` c ON CAST(c.`id` AS CHAR) = t.`corpinfo_id` WHERE t.`corpinfo_id` IS NOT NULL AND c.`id` IS NULL + UNION ALL SELECT COUNT(1) FROM `alarm_rule_item` t LEFT JOIN `corp_info` c ON CAST(c.`id` AS CHAR) = t.`corpinfo_id` WHERE t.`corpinfo_id` IS NOT NULL AND c.`id` IS NULL + UNION ALL SELECT COUNT(1) FROM `alarm_record` t LEFT JOIN `corp_info` c ON CAST(c.`id` AS CHAR) = t.`corpinfo_id` WHERE t.`corpinfo_id` IS NOT NULL AND c.`id` IS NULL + UNION ALL SELECT COUNT(1) FROM `alarm_record_target` t LEFT JOIN `corp_info` c ON CAST(c.`id` AS CHAR) = t.`corpinfo_id` WHERE t.`corpinfo_id` IS NOT NULL AND c.`id` IS NULL + UNION ALL SELECT COUNT(1) FROM `alarm_dispose_record` t LEFT JOIN `corp_info` c ON CAST(c.`id` AS CHAR) = t.`corpinfo_id` WHERE t.`corpinfo_id` IS NOT NULL AND c.`id` IS NULL + UNION ALL SELECT COUNT(1) FROM `sync_task` t LEFT JOIN `corp_info` c ON CAST(c.`id` AS CHAR) = t.`corpinfo_id` WHERE t.`corpinfo_id` IS NOT NULL AND c.`id` IS NULL + UNION ALL SELECT COUNT(1) FROM `sync_log` t LEFT JOIN `corp_info` c ON CAST(c.`id` AS CHAR) = t.`corpinfo_id` WHERE t.`corpinfo_id` IS NOT NULL AND c.`id` IS NULL + UNION ALL SELECT COUNT(1) FROM `org_match` t LEFT JOIN `corp_info` c ON CAST(c.`id` AS CHAR) = t.`local_corpinfo_id` WHERE t.`local_corpinfo_id` IS NOT NULL AND c.`id` IS NULL +) validation_counts; + +ALTER TABLE `openapi_config` MODIFY COLUMN `corpinfo_id` bigint DEFAULT NULL COMMENT '企业主键，关联corp_info.id'; +ALTER TABLE `area` MODIFY COLUMN `corpinfo_id` bigint DEFAULT NULL COMMENT '企业主键，关联corp_info.id'; +ALTER TABLE `terminal` MODIFY COLUMN `corpinfo_id` bigint DEFAULT NULL COMMENT '企业主键，关联corp_info.id'; +ALTER TABLE `terminal_bind` MODIFY COLUMN `corpinfo_id` bigint DEFAULT NULL COMMENT '企业主键，关联corp_info.id'; +ALTER TABLE `fence` MODIFY COLUMN `corpinfo_id` bigint DEFAULT NULL COMMENT '企业主键，关联corp_info.id'; +ALTER TABLE `fence_point` MODIFY COLUMN `corpinfo_id` bigint DEFAULT NULL COMMENT '企业主键，关联corp_info.id'; +ALTER TABLE `alarm_rule` MODIFY COLUMN `corpinfo_id` bigint DEFAULT NULL COMMENT '企业主键，关联corp_info.id'; +ALTER TABLE `alarm_rule_fence_rel` MODIFY COLUMN `corpinfo_id` bigint DEFAULT NULL COMMENT '企业主键，关联corp_info.id'; +ALTER TABLE `alarm_rule_item` MODIFY COLUMN `corpinfo_id` bigint DEFAULT NULL COMMENT '企业主键，关联corp_info.id'; +ALTER TABLE `alarm_record` MODIFY COLUMN `corpinfo_id` bigint DEFAULT NULL COMMENT '企业主键，关联corp_info.id'; +ALTER TABLE `alarm_record_target` MODIFY COLUMN `corpinfo_id` bigint DEFAULT NULL COMMENT '企业主键，关联corp_info.id'; +ALTER TABLE `alarm_dispose_record` MODIFY COLUMN `corpinfo_id` bigint DEFAULT NULL COMMENT '企业主键，关联corp_info.id'; +ALTER TABLE `sync_task` MODIFY COLUMN `corpinfo_id` bigint DEFAULT NULL COMMENT '企业主键，关联corp_info.id'; +ALTER TABLE `sync_log` MODIFY COLUMN `corpinfo_id` bigint DEFAULT NULL COMMENT '企业主键，关联corp_info.id'; +ALTER TABLE `org_match` MODIFY COLUMN `local_corpinfo_id` bigint DEFAULT NULL COMMENT '本地企业主键，关联corp_info.id'; + +DROP TEMPORARY TABLE `_corpinfo_id_guard_20260801`; +DROP TEMPORARY TABLE `_corpinfo_id_map_20260801`; diff --git a/web-infrastructure/src/main/resources/db/migration/mysql/V20260801_02__org_match_status_consistency.sql b/web-infrastructure/src/main/resources/db/migration/mysql/V20260801_02__org_match_status_consistency.sql new file mode 100644 index 0000000..4b5dc44 --- /dev/null +++ b/web-infrastructure/src/main/resources/db/migration/mysql/V20260801_02__org_match_status_consistency.sql @@ -0,0 +1,12 @@ +-- 清理企业主键迁移后残留的“已匹配但没有本地企业ID”状态。 +-- FindS 快照字段保留，下一次同步会按企业名/部门名重新计算匹配结果。 +UPDATE `org_match` t +LEFT JOIN `corp_info` c ON c.`id` = t.`local_corpinfo_id` +SET t.`match_status` = 'UNMATCHED', + t.`match_type` = NULL, + t.`local_corpinfo_id` = NULL, + t.`local_corpinfo_name` = NULL, + t.`local_department_id` = NULL, + t.`local_department_name` = NULL +WHERE t.`match_status` = 'MATCHED' + AND c.`id` IS NULL; diff --git a/web-infrastructure/src/main/resources/mapper/AlarmRecordMapper.xml b/web-infrastructure/src/main/resources/mapper/AlarmRecordMapper.xml index 881cade..27676aa 100644 --- a/web-infrastructure/src/main/resources/mapper/AlarmRecordMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/AlarmRecordMapper.xml @@ -4,32 +4,16 @@ - LEFT JOIN ( - SELECT local_corpinfo_id, MAX(local_corpinfo_name) AS local_corpinfo_name - FROM org_match - WHERE match_status = 'MATCHED' - AND (delete_enum IS NULL OR delete_enum = 'FALSE') - AND local_corpinfo_id IS NOT NULL AND local_corpinfo_id != '' - GROUP BY local_corpinfo_id - ) mapped_org ON mapped_org.local_corpinfo_id = CAST(ar.corpinfo_id AS CHAR) - LEFT JOIN corp_info corp_uuid - ON mapped_org.local_corpinfo_id IS NULL - AND CAST(corp_uuid.corpinfo_id AS CHAR) = CAST(ar.corpinfo_id AS CHAR) - AND (corp_uuid.delete_enum IS NULL OR corp_uuid.delete_enum = 'FALSE') - LEFT JOIN corp_info corp_internal - ON mapped_org.local_corpinfo_id IS NULL - AND corp_uuid.corpinfo_id IS NULL - AND CAST(corp_internal.id AS CHAR) = CAST(ar.corpinfo_id AS CHAR) - AND (corp_internal.delete_enum IS NULL OR corp_internal.delete_enum = 'FALSE') + LEFT JOIN corp_info corp ON corp.id = ar.corpinfo_id + AND (corp.delete_enum IS NULL OR corp.delete_enum = 'FALSE') - COALESCE(mapped_org.local_corpinfo_id, CAST(corp_uuid.corpinfo_id AS CHAR), - CAST(corp_internal.corpinfo_id AS CHAR)) + corp.id - COALESCE(mapped_org.local_corpinfo_name, corp_uuid.corp_name, corp_internal.corp_name) + corp.corp_name @@ -53,7 +37,7 @@ WHERE (ar.delete_enum IS NULL OR ar.delete_enum = 'FALSE') AND IS NOT NULL - + AND = #{params.eqCorpinfoId} @@ -83,10 +67,10 @@ WHERE (ar.delete_enum IS NULL OR ar.delete_enum = 'FALSE') AND IS NOT NULL - AND = CAST(#{corpinfoId} AS CHAR) + AND = #{corpinfoId} - AND COALESCE(corp_uuid.port_area, corp_internal.port_area) = #{portArea} + AND corp.port_area = #{portArea} ORDER BY COALESCE(ar.start_time, ar.create_time) DESC, ar.id DESC @@ -119,10 +103,10 @@ AND local_corpinfo_id IS NOT NULL AND local_corpinfo_id != '' AND local_corpinfo_name IS NOT NULL AND local_corpinfo_name != '' UNION ALL - SELECT corp_name, CAST(corpinfo_id AS CHAR) + SELECT corp_name, id FROM corp_info WHERE (delete_enum IS NULL OR delete_enum = 'FALSE') - AND corpinfo_id IS NOT NULL AND corp_name IS NOT NULL + AND id IS NOT NULL AND corp_name IS NOT NULL ) platform_company WHERE 1 = 1 diff --git a/web-infrastructure/src/main/resources/mapper/AlarmRuleMapper.xml b/web-infrastructure/src/main/resources/mapper/AlarmRuleMapper.xml index 4162ade..744dc34 100644 --- a/web-infrastructure/src/main/resources/mapper/AlarmRuleMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/AlarmRuleMapper.xml @@ -5,44 +5,26 @@ LEFT JOIN ( - SELECT rel.rule_id, MIN(CAST(f.corpinfo_id AS CHAR)) AS corpinfo_id + SELECT rel.rule_id, MIN(f.corpinfo_id) AS corpinfo_id FROM alarm_rule_fence_rel rel INNER JOIN fence f ON f.id = rel.fence_id WHERE (rel.delete_enum IS NULL OR rel.delete_enum = 'FALSE') AND (f.delete_enum IS NULL OR f.delete_enum = 'FALSE') - AND f.corpinfo_id IS NOT NULL AND f.corpinfo_id != '' AND f.corpinfo_id != '0' + AND f.corpinfo_id IS NOT NULL AND f.corpinfo_id != 0 GROUP BY rel.rule_id HAVING COUNT(DISTINCT f.corpinfo_id) = 1 ) rule_fence ON rule_fence.rule_id = ar.id - LEFT JOIN ( - SELECT local_corpinfo_id, MAX(local_corpinfo_name) AS local_corpinfo_name - FROM org_match - WHERE match_status = 'MATCHED' - AND (delete_enum IS NULL OR delete_enum = 'FALSE') - AND local_corpinfo_id IS NOT NULL AND local_corpinfo_id != '' - GROUP BY local_corpinfo_id - ) mapped_org ON mapped_org.local_corpinfo_id = - COALESCE(NULLIF(NULLIF(CAST(ar.corpinfo_id AS CHAR), ''), '0'), rule_fence.corpinfo_id) - LEFT JOIN corp_info corp_uuid - ON mapped_org.local_corpinfo_id IS NULL - AND CAST(corp_uuid.corpinfo_id AS CHAR) = - COALESCE(NULLIF(NULLIF(CAST(ar.corpinfo_id AS CHAR), ''), '0'), rule_fence.corpinfo_id) - AND (corp_uuid.delete_enum IS NULL OR corp_uuid.delete_enum = 'FALSE') - LEFT JOIN corp_info corp_internal - ON mapped_org.local_corpinfo_id IS NULL - AND corp_uuid.corpinfo_id IS NULL - AND CAST(corp_internal.id AS CHAR) = - COALESCE(NULLIF(NULLIF(CAST(ar.corpinfo_id AS CHAR), ''), '0'), rule_fence.corpinfo_id) - AND (corp_internal.delete_enum IS NULL OR corp_internal.delete_enum = 'FALSE') + LEFT JOIN corp_info corp + ON corp.id = COALESCE(NULLIF(ar.corpinfo_id, 0), rule_fence.corpinfo_id) + AND (corp.delete_enum IS NULL OR corp.delete_enum = 'FALSE') - COALESCE(mapped_org.local_corpinfo_id, CAST(corp_uuid.corpinfo_id AS CHAR), - CAST(corp_internal.corpinfo_id AS CHAR)) + corp.id - COALESCE(mapped_org.local_corpinfo_name, corp_uuid.corp_name, corp_internal.corp_name) + corp.corp_name diff --git a/web-infrastructure/src/main/resources/mapper/FenceMapper.xml b/web-infrastructure/src/main/resources/mapper/FenceMapper.xml index a579cc0..abd9515 100644 --- a/web-infrastructure/src/main/resources/mapper/FenceMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/FenceMapper.xml @@ -4,32 +4,16 @@ - LEFT JOIN ( - SELECT local_corpinfo_id, MAX(local_corpinfo_name) AS local_corpinfo_name - FROM org_match - WHERE match_status = 'MATCHED' - AND (delete_enum IS NULL OR delete_enum = 'FALSE') - AND local_corpinfo_id IS NOT NULL AND local_corpinfo_id != '' - GROUP BY local_corpinfo_id - ) mapped_org ON mapped_org.local_corpinfo_id = CAST(f.corpinfo_id AS CHAR) - LEFT JOIN corp_info corp_uuid - ON mapped_org.local_corpinfo_id IS NULL - AND CAST(corp_uuid.corpinfo_id AS CHAR) = CAST(f.corpinfo_id AS CHAR) - AND (corp_uuid.delete_enum IS NULL OR corp_uuid.delete_enum = 'FALSE') - LEFT JOIN corp_info corp_internal - ON mapped_org.local_corpinfo_id IS NULL - AND corp_uuid.corpinfo_id IS NULL - AND CAST(corp_internal.id AS CHAR) = CAST(f.corpinfo_id AS CHAR) - AND (corp_internal.delete_enum IS NULL OR corp_internal.delete_enum = 'FALSE') + LEFT JOIN corp_info corp ON corp.id = f.corpinfo_id + AND (corp.delete_enum IS NULL OR corp.delete_enum = 'FALSE') - COALESCE(mapped_org.local_corpinfo_id, CAST(corp_uuid.corpinfo_id AS CHAR), - CAST(corp_internal.corpinfo_id AS CHAR)) + corp.id - COALESCE(mapped_org.local_corpinfo_name, corp_uuid.corp_name, corp_internal.corp_name) + corp.corp_name SELECT d.id AS department_id, d.dept_name AS department_name, - CAST(ci.corpinfo_id AS CHAR) AS root_corpinfo_id, + ci.id AS root_corpinfo_id, ci.corp_name AS root_corpinfo_name FROM department d - INNER JOIN corp_info ci ON ci.id = d.corpinfo_id + INNER JOIN corp_info ci ON ci.id = d.org_id WHERE (d.delete_enum IS NULL OR d.delete_enum = 'FALSE') AND (ci.delete_enum IS NULL OR ci.delete_enum = 'FALSE') AND d.dept_name = #{departmentName} diff --git a/web-infrastructure/src/main/resources/mapper/PersonnelMatchMapper.xml b/web-infrastructure/src/main/resources/mapper/PersonnelMatchMapper.xml index cc2d81b..bf6369c 100644 --- a/web-infrastructure/src/main/resources/mapper/PersonnelMatchMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/PersonnelMatchMapper.xml @@ -85,8 +85,8 @@ 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, ci.corpinfo_id, - ci.corp_name AS corpinfo_name, ci.code AS credit_code, ci.port_area, + TRIM(u.phone) AS mobile_no, u.user_id_card AS id_card_no, ci.id AS corpinfo_id, + ci.corp_name AS corpinfo_name, ci.code AS credit_code, u.department_id, d.dept_name AS department_name FROM user_scope_v u LEFT JOIN corp_info ci ON ci.id = u.corpinfo_id @@ -106,8 +106,8 @@ - SELECT DISTINCT CAST(ci.corpinfo_id AS CHAR) AS corpinfo_id, ci.corp_name + SELECT DISTINCT ci.id AS corpinfo_id, ci.corp_name FROM personnel_match pm INNER JOIN user_scope_v u ON u.id = pm.local_user_id INNER JOIN corp_info ci ON ci.id = u.corpinfo_id @@ -189,7 +189,7 @@ - SELECT DISTINCT CAST(corpinfo_id AS CHAR) AS corpinfo_id, corpinfo_name AS corp_name + SELECT DISTINCT corpinfo_id, corpinfo_name AS corp_name FROM terminal WHERE terminal_no = #{terminalNo} - AND corpinfo_id IS NOT NULL AND corpinfo_id != '0' + AND corpinfo_id IS NOT NULL AND corpinfo_id != 0 AND (delete_enum IS NULL OR delete_enum = 'FALSE') diff --git a/web-infrastructure/src/main/resources/mapper/PersonnelPositioningBiMapper.xml b/web-infrastructure/src/main/resources/mapper/PersonnelPositioningBiMapper.xml index 8dea44b..1d8b3d6 100644 --- a/web-infrastructure/src/main/resources/mapper/PersonnelPositioningBiMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/PersonnelPositioningBiMapper.xml @@ -14,17 +14,17 @@ SELECT u.username AS staff_no, u.name AS staff_name, u.user_id_card AS id_card_no, - u.phone AS mobile_no, CAST(ci.corpinfo_id AS CHAR) AS corpinfo_id, + u.phone AS mobile_no, ci.id AS corpinfo_id, ci.corp_name AS corpinfo_name FROM user_scope_v u LEFT JOIN corp_info ci ON ci.id = u.corpinfo_id @@ -370,13 +352,13 @@