diff --git a/.gitignore b/.gitignore index 9651f798..2ff5af00 100644 --- a/.gitignore +++ b/.gitignore @@ -63,6 +63,8 @@ **/releases/*.good /cw-elevator-application-V1.0.0.20211103/cw-elevator-application-V1.0.0.20211103.jar *.jar.bak +**/deploy/v2-maven/*.jar +**/deploy/v1-legacy/*.jar # Generated test env files scripts/test-env/logs/ diff --git a/docs/sql/tenant_visitor_floor_policy_init_guangfa_fund.sql b/docs/sql/tenant_visitor_floor_policy_init_guangfa_fund.sql index 85d1521e..67bc4cdb 100644 --- a/docs/sql/tenant_visitor_floor_policy_init_guangfa_fund.sql +++ b/docs/sql/tenant_visitor_floor_policy_init_guangfa_fund.sql @@ -1,22 +1,21 @@ -- 广发基金租户:访客默认楼层策略初始化(电梯库 cw-elevator-application) -- --- 请先执行同目录 tenant_visitor_floor_policy.sql 建表(或 releases/v2.0.0/ddl 同源 DDL)。 +-- 字段说明:allow_zone_ids 为 JSON 数组,元素使用 code_elevator_area.zone_id(snowflake 格式), +-- 与 PersonResult.floorList 和 image_rule_ref.zone_id 同一套 ID。 -- --- 字段说明:allow_zone_ids 为 JSON 数组字符串,元素须与组织/派梯侧 floorList、image_rule_ref 使用的 --- zone_id(电梯库 snowflake 形态)一致,勿使用 cw_is_area 的 UUID。 --- --- 数据来源(现场查询 192.168.3.12:3307,截至脚本编写日): --- business_id:component-organization.cw_is_organization --- NAME='[28-38F]广发基金管理有限公司' -> BUSINESS_ID = 2524639890ba4f2cba9ba1a4eeaa4015 --- 28F zone_id:cw-elevator-application.code_elevator_area / image_rule_ref +-- 数据来源(现场查询 192.168.3.12:3307): +-- org_id:component-organization.cw_is_organization +-- NAME='[28-38F]广发基金管理有限公司' -> ID = 488b8ad049bb43408a6fbcc50bcb89ac +-- 28F zone_id:cw-elevator-application.code_elevator_area -- zone_id = 605560545117995008(zone_name=28F,code=0x1C) -- --- 重复执行:依赖主键 id 固定,使用 ON DUPLICATE KEY UPDATE 刷新策略字段。 +-- 重复执行:使用固定 id + ON DUPLICATE KEY UPDATE,幂等。 SET NAMES utf8mb4; INSERT INTO tenant_visitor_floor_policy ( id, + org_id, business_id, policy_type, allow_zone_ids, @@ -28,17 +27,18 @@ INSERT INTO tenant_visitor_floor_policy ( updated_at ) VALUES ( 'gf_vstr_policy_guangfa_fund_001x', + '488b8ad049bb43408a6fbcc50bcb89ac', '2524639890ba4f2cba9ba1a4eeaa4015', 'INTERSECT_ALLOWLIST', '["605560545117995008"]', NULL, 1, 1, - '广发基金:访客与 floorList 求交后仅保留 allowlist(默认仅 28F zone)。业务配置见产品方案。', + '广发基金:访客与 floorList 求交后仅保留 allowlist(默认仅 28F zone)。', UNIX_TIMESTAMP(NOW()) * 1000, UNIX_TIMESTAMP(NOW()) * 1000 -) -ON DUPLICATE KEY UPDATE +) ON DUPLICATE KEY UPDATE + org_id = VALUES(org_id), policy_type = VALUES(policy_type), allow_zone_ids = VALUES(allow_zone_ids), enabled = VALUES(enabled), diff --git a/docs/sql/tenant_visitor_floor_policy_init_property_mgmt_6f.sql b/docs/sql/tenant_visitor_floor_policy_init_property_mgmt_6f.sql new file mode 100644 index 00000000..0fc2613a --- /dev/null +++ b/docs/sql/tenant_visitor_floor_policy_init_property_mgmt_6f.sql @@ -0,0 +1,186 @@ +-- 物业公司租户:访客默认楼层策略初始化(电梯库 cw-elevator-application) +-- 访客不传 floorIds 时,默认仅开放 6F,与被访人 floorList 求交。 +-- +-- 数据来源(192.168.3.12:3307): +-- org_id:component-organization.cw_is_organization +-- 星河湾物业管理有限公司 → 64fdc8eaf5824df5a1329819af29b79f +-- 星河湾物业管理公司 → 8fc3f910bd834198a539832017fe920e +-- 星河湾物管公司 → cc760fdf9c384a0cbf4951ccf2c6452e +-- 星中心物业管理公司 → f216235e54ca42bfa0379e69b3754aff +-- 星中心物业服务中心 → 95818575a2284db6833289474d33671f +-- 星中心物管公司 → 348328d755624b3491cd307a3109f36a +-- 物业管理总部 → dde6cc9a4f6b4f5490d03e26fb016200 +-- 6F zone_id:cw-elevator-application.code_elevator_area +-- zone_id = 605560541473144832(code=0x06) +-- +-- 重复执行:使用固定 id + ON DUPLICATE KEY UPDATE。 + +SET NAMES utf8mb4; + +-- ============================================================ +-- 1. 星河湾物业管理有限公司 +-- ============================================================ +INSERT INTO tenant_visitor_floor_policy ( + id, business_id, org_id, policy_type, allow_zone_ids, + building_id, enabled, policy_version, remark, created_at, updated_at +) VALUES ( + 'pm_6f_vstr_policy_001', + '2524639890ba4f2cba9ba1a4eeaa4015', + '64fdc8eaf5824df5a1329819af29b79f', + 'INTERSECT_ALLOWLIST', + '["605560541473144832"]', + NULL, 1, 1, + '星河湾物业管理有限公司:访客默认仅开放 6F。', + UNIX_TIMESTAMP(NOW()) * 1000, + UNIX_TIMESTAMP(NOW()) * 1000 +) ON DUPLICATE KEY UPDATE + policy_type = VALUES(policy_type), + allow_zone_ids = VALUES(allow_zone_ids), + enabled = VALUES(enabled), + policy_version = policy_version + 1, + remark = VALUES(remark), + updated_at = VALUES(updated_at); + +-- ============================================================ +-- 2. 星河湾物业管理公司 +-- ============================================================ +INSERT INTO tenant_visitor_floor_policy ( + id, business_id, org_id, policy_type, allow_zone_ids, + building_id, enabled, policy_version, remark, created_at, updated_at +) VALUES ( + 'pm_6f_vstr_policy_002', + '2524639890ba4f2cba9ba1a4eeaa4015', + '8fc3f910bd834198a539832017fe920e', + 'INTERSECT_ALLOWLIST', + '["605560541473144832"]', + NULL, 1, 1, + '星河湾物业管理公司:访客默认仅开放 6F。', + UNIX_TIMESTAMP(NOW()) * 1000, + UNIX_TIMESTAMP(NOW()) * 1000 +) ON DUPLICATE KEY UPDATE + policy_type = VALUES(policy_type), + allow_zone_ids = VALUES(allow_zone_ids), + enabled = VALUES(enabled), + policy_version = policy_version + 1, + remark = VALUES(remark), + updated_at = VALUES(updated_at); + +-- ============================================================ +-- 3. 星河湾物管公司 +-- ============================================================ +INSERT INTO tenant_visitor_floor_policy ( + id, business_id, org_id, policy_type, allow_zone_ids, + building_id, enabled, policy_version, remark, created_at, updated_at +) VALUES ( + 'pm_6f_vstr_policy_003', + '2524639890ba4f2cba9ba1a4eeaa4015', + 'cc760fdf9c384a0cbf4951ccf2c6452e', + 'INTERSECT_ALLOWLIST', + '["605560541473144832"]', + NULL, 1, 1, + '星河湾物管公司:访客默认仅开放 6F。', + UNIX_TIMESTAMP(NOW()) * 1000, + UNIX_TIMESTAMP(NOW()) * 1000 +) ON DUPLICATE KEY UPDATE + policy_type = VALUES(policy_type), + allow_zone_ids = VALUES(allow_zone_ids), + enabled = VALUES(enabled), + policy_version = policy_version + 1, + remark = VALUES(remark), + updated_at = VALUES(updated_at); + +-- ============================================================ +-- 4. 星中心物业管理公司 +-- ============================================================ +INSERT INTO tenant_visitor_floor_policy ( + id, business_id, org_id, policy_type, allow_zone_ids, + building_id, enabled, policy_version, remark, created_at, updated_at +) VALUES ( + 'pm_6f_vstr_policy_004', + '2524639890ba4f2cba9ba1a4eeaa4015', + 'f216235e54ca42bfa0379e69b3754aff', + 'INTERSECT_ALLOWLIST', + '["605560541473144832"]', + NULL, 1, 1, + '星中心物业管理公司:访客默认仅开放 6F。', + UNIX_TIMESTAMP(NOW()) * 1000, + UNIX_TIMESTAMP(NOW()) * 1000 +) ON DUPLICATE KEY UPDATE + policy_type = VALUES(policy_type), + allow_zone_ids = VALUES(allow_zone_ids), + enabled = VALUES(enabled), + policy_version = policy_version + 1, + remark = VALUES(remark), + updated_at = VALUES(updated_at); + +-- ============================================================ +-- 5. 星中心物业服务中心 +-- ============================================================ +INSERT INTO tenant_visitor_floor_policy ( + id, business_id, org_id, policy_type, allow_zone_ids, + building_id, enabled, policy_version, remark, created_at, updated_at +) VALUES ( + 'pm_6f_vstr_policy_005', + '2524639890ba4f2cba9ba1a4eeaa4015', + '95818575a2284db6833289474d33671f', + 'INTERSECT_ALLOWLIST', + '["605560541473144832"]', + NULL, 1, 1, + '星中心物业服务中心:访客默认仅开放 6F。', + UNIX_TIMESTAMP(NOW()) * 1000, + UNIX_TIMESTAMP(NOW()) * 1000 +) ON DUPLICATE KEY UPDATE + policy_type = VALUES(policy_type), + allow_zone_ids = VALUES(allow_zone_ids), + enabled = VALUES(enabled), + policy_version = policy_version + 1, + remark = VALUES(remark), + updated_at = VALUES(updated_at); + +-- ============================================================ +-- 6. 星中心物管公司 +-- ============================================================ +INSERT INTO tenant_visitor_floor_policy ( + id, business_id, org_id, policy_type, allow_zone_ids, + building_id, enabled, policy_version, remark, created_at, updated_at +) VALUES ( + 'pm_6f_vstr_policy_006', + '2524639890ba4f2cba9ba1a4eeaa4015', + '348328d755624b3491cd307a3109f36a', + 'INTERSECT_ALLOWLIST', + '["605560541473144832"]', + NULL, 1, 1, + '星中心物管公司:访客默认仅开放 6F。', + UNIX_TIMESTAMP(NOW()) * 1000, + UNIX_TIMESTAMP(NOW()) * 1000 +) ON DUPLICATE KEY UPDATE + policy_type = VALUES(policy_type), + allow_zone_ids = VALUES(allow_zone_ids), + enabled = VALUES(enabled), + policy_version = policy_version + 1, + remark = VALUES(remark), + updated_at = VALUES(updated_at); + +-- ============================================================ +-- 7. 物业管理总部 +-- ============================================================ +INSERT INTO tenant_visitor_floor_policy ( + id, business_id, org_id, policy_type, allow_zone_ids, + building_id, enabled, policy_version, remark, created_at, updated_at +) VALUES ( + 'pm_6f_vstr_policy_007', + '2524639890ba4f2cba9ba1a4eeaa4015', + 'dde6cc9a4f6b4f5490d03e26fb016200', + 'INTERSECT_ALLOWLIST', + '["605560541473144832"]', + NULL, 1, 1, + '物业管理总部:访客默认仅开放 6F。', + UNIX_TIMESTAMP(NOW()) * 1000, + UNIX_TIMESTAMP(NOW()) * 1000 +) ON DUPLICATE KEY UPDATE + policy_type = VALUES(policy_type), + allow_zone_ids = VALUES(allow_zone_ids), + enabled = VALUES(enabled), + policy_version = policy_version + 1, + remark = VALUES(remark), + updated_at = VALUES(updated_at); diff --git a/scripts/release-cw-elevator-application.sh b/scripts/release-cw-elevator-application.sh index 6d6c74d7..3861233e 100755 --- a/scripts/release-cw-elevator-application.sh +++ b/scripts/release-cw-elevator-application.sh @@ -69,9 +69,14 @@ require_file "${DDL_SRC}" "DDL" install -m0644 "${DDL_SRC}" "${DDL_DIR}/tenant_visitor_floor_policy.sql" DDL_INIT_SRC="${ROOT}/docs/sql/tenant_visitor_floor_policy_init_guangfa_fund.sql" -require_file "${DDL_INIT_SRC}" "初始化 SQL" +require_file "${DDL_INIT_SRC}" "初始化 SQL(广发基金)" install -m0644 "${DDL_INIT_SRC}" "${DDL_DIR}/tenant_visitor_floor_policy_init_guangfa_fund.sql" +DDL_PROP_MGMT_SRC="${ROOT}/docs/sql/tenant_visitor_floor_policy_init_property_mgmt_6f.sql" +if [[ -f "${DDL_PROP_MGMT_SRC}" ]]; then + install -m0644 "${DDL_PROP_MGMT_SRC}" "${DDL_DIR}/tenant_visitor_floor_policy_init_property_mgmt_6f.sql" +fi + UPGRADE_SRC="${ROOT}/docs/build/cw-elevator-application-v${REL_VER}-版本升级说明书.md" if [[ ! -f "${UPGRADE_SRC}" ]]; then UPGRADE_SRC="${ROOT}/docs/build/cw-elevator-application-v${DOC_FALLBACK_VER}-版本升级说明书.md"