diff --git a/docs/architecture/Maven工作区子工程版本一览.md b/docs/architecture/Maven工作区子工程版本一览.md index 9adcb484..f1bf8918 100644 --- a/docs/architecture/Maven工作区子工程版本一览.md +++ b/docs/architecture/Maven工作区子工程版本一览.md @@ -132,6 +132,7 @@ maven-ninca-qk-alarm/ninca-qk-alarm-app-starter/pom.xml |------|------| | 2026-04-24 | 初稿:工作区 `pom` 走查 | | 2026-04-24 | **主版本升级**(与历史反编译/私服坐标区分):电梯 **2.0-SNAPSHOT**、intelligent **3.0.0-xinghewan**、cloudwalk-cloud **4.0.0-Brussels-SRX**、ninca-crk **2.0.0**、ninca-qk-alarm **1.0.0-SNAPSHOT**;`cloudwalk.internal.version`、电梯与 ninca-crk 中 intelligent 属性已对齐 | +| 2026-04-24 | **`cloudwalk.legacy.public.version`(3.7.2-Brussels-SRX)**:私服未发布新主版本的 `cloudwalk-common-result` / `web` / `serial` 时,与反应堆 **4.0.0** 解耦;本地编译说明见 [docs/build/本地编译说明.md](../build/本地编译说明.md) | --- diff --git a/docs/build/本地编译说明.md b/docs/build/本地编译说明.md new file mode 100644 index 00000000..6f94eadf --- /dev/null +++ b/docs/build/本地编译说明.md @@ -0,0 +1,60 @@ +# 本地编译说明(Maven 工作区) + +## 1. 环境与 JVM + +- **Maven 进程 JVM**:须为 **JDK 8**(与 `maven-enforcer-plugin` 及各父 POM `java.version` 一致)。 + 示例(Linux): + +```bash +export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 +export PATH="$JAVA_HOME/bin:$PATH" +java -version # 应显示 1.8.x +``` + +## 2. 私服与网络 + +- 各 `pom.xml` 中默认 Nexus 为 **`http://192.168.3.12/...`**(或带端口 `8081` 的 `maven-public`)。 +- **须在能访问该私服的网络环境**(如内网/VPN)下执行,否则 `intelligent-cwoscomponent`、`cw-elevator-application-service` 等模块会因 **父 POM / 传递依赖无法解析** 而失败。 + +## 3. 推荐编译顺序(依赖链) + +在仓库根下按顺序 **install**(或至少 **compile** 前序模块并 install 到本地 `~/.m2`): + +1. **`maven-cloudwalk-cloud`**:`mvn -DskipTests clean install` +2. **`maven-intelligent-cwoscomponent`**:`mvn -DskipTests clean install`(依赖 cloudwalk 与私服 `cloudwalk-device-sdk` 等) +3. **`maven-cw-elevator-application`**:`mvn -DskipTests clean install` +4. 其余:`maven-ninca-crk`、`maven-ninca-qk-alarm` 按需单独编译。 + +单工程示例: + +```bash +cd maven-cloudwalk-cloud && mvn -DskipTests clean install +cd ../maven-intelligent-cwoscomponent && mvn -DskipTests clean install +cd ../maven-cw-elevator-application && mvn -DskipTests clean compile +``` + +## 4. 版本与私服坐标说明 + +- **`cloudwalk.internal.version`(如 4.0.0-Brussels-SRX)**:表示本仓库 **`cloudwalk-common-event` / `cloudwalk-common-service`** 等**已迁入源码**构件的版本。 +- **`cloudwalk.legacy.public.version`(固定 3.7.2-Brussels-SRX)**:表示**未迁入本仓库**、仍只能从私服获取的 **`cloudwalk-common-result` / `cloudwalk-common-web` / `cloudwalk-common-serial`** 等历史 GAV,**勿与反应堆主版本混用**,否则 Nexus 上无对应版本会导致解析失败。 + +详见 [Maven工作区子工程版本一览](../architecture/Maven工作区子工程版本一览.md)。 + +## 5. 本机验证结果(参考) + +| 模块 | 说明 | +|------|------| +| `maven-cloudwalk-cloud` | 在可访问 Nexus 时,`mvn clean install` 可通过。 | +| `maven-cw-elevator-application` 之 **common / data** | 已补齐 `spring-web`、`CollectionUtils` 与部分 DTO 反编译错误后,`mvn clean compile` 可编过至 **data** 模块。 | +| `cw-elevator-application-service` | 依赖 **`cwos-component-resource`、`cwos-portal`、`davinci-manager-storage`** 等父工程,**须私服完整** 方可继续解析。 | + +若仅修改电梯 **data/service 内业务代码**,可在完整依赖环境执行: + +```bash +cd maven-cw-elevator-application +mvn -pl cw-elevator-application-service -am -DskipTests clean compile +``` + +--- + +*随 POM 与私服策略变更请更新本文。* diff --git a/maven-cloudwalk-cloud/pom.xml b/maven-cloudwalk-cloud/pom.xml index fdcc2c9d..a2d85f2e 100644 --- a/maven-cloudwalk-cloud/pom.xml +++ b/maven-cloudwalk-cloud/pom.xml @@ -28,6 +28,8 @@ 1.8 Greenwich.SR6 4.0.0-Brussels-SRX + + 3.7.2-Brussels-SRX 1.5.0-SNAPSHOT @@ -50,7 +52,7 @@ cn.cloudwalk.cloud cloudwalk-common-result - ${cloudwalk.internal.version} + ${cloudwalk.legacy.public.version} cn.cloudwalk.cloud diff --git a/maven-cw-elevator-application/cw-elevator-application-common/pom.xml b/maven-cw-elevator-application/cw-elevator-application-common/pom.xml index 9ea083ad..94b5abf7 100644 --- a/maven-cw-elevator-application/cw-elevator-application-common/pom.xml +++ b/maven-cw-elevator-application/cw-elevator-application-common/pom.xml @@ -66,6 +66,10 @@ net.lingala.zip4j zip4j + + org.springframework + spring-web + org.springframework.data spring-data-redis diff --git a/maven-cw-elevator-application/cw-elevator-application-common/src/main/java/cn/cloudwalk/elevator/util/CollectionUtils.java b/maven-cw-elevator-application/cw-elevator-application-common/src/main/java/cn/cloudwalk/elevator/util/CollectionUtils.java index 6b50de0b..061a2d37 100644 --- a/maven-cw-elevator-application/cw-elevator-application-common/src/main/java/cn/cloudwalk/elevator/util/CollectionUtils.java +++ b/maven-cw-elevator-application/cw-elevator-application-common/src/main/java/cn/cloudwalk/elevator/util/CollectionUtils.java @@ -267,7 +267,7 @@ public class CollectionUtils { } } } else if (value instanceof Collection || value instanceof Stack) { - for (Object object : value) { + for (Object object : (Iterable)value) { collection.add((T)object); } } else if (value instanceof Iterator) { @@ -294,7 +294,7 @@ public class CollectionUtils { } } } else if (value instanceof Collection || value instanceof Stack) { - for (Object object : value) { + for (Object object : (Iterable)value) { stack.push((T)object); } } else { diff --git a/maven-cw-elevator-application/cw-elevator-application-data/src/main/java/cn/cloudwalk/elevator/device/dto/AcsElevatorDeviceListByBuildingIdDto.java b/maven-cw-elevator-application/cw-elevator-application-data/src/main/java/cn/cloudwalk/elevator/device/dto/AcsElevatorDeviceListByBuildingIdDto.java index cd02f327..1aca0409 100644 --- a/maven-cw-elevator-application/cw-elevator-application-data/src/main/java/cn/cloudwalk/elevator/device/dto/AcsElevatorDeviceListByBuildingIdDto.java +++ b/maven-cw-elevator-application/cw-elevator-application-data/src/main/java/cn/cloudwalk/elevator/device/dto/AcsElevatorDeviceListByBuildingIdDto.java @@ -36,7 +36,7 @@ public class AcsElevatorDeviceListByBuildingIdDto implements Serializable { public int hashCode() { int PRIME = 59; - result = 1; + int result = 1; Object $businessId = getBusinessId(); result = result * 59 + (($businessId == null) ? 43 : $businessId.hashCode()); Object $currentBuildingId = getCurrentBuildingId(); diff --git a/maven-cw-elevator-application/cw-elevator-application-data/src/main/java/cn/cloudwalk/elevator/device/dto/AcsElevatorDeviceListResultDto.java b/maven-cw-elevator-application/cw-elevator-application-data/src/main/java/cn/cloudwalk/elevator/device/dto/AcsElevatorDeviceListResultDto.java index feaeb2a6..a3877964 100644 --- a/maven-cw-elevator-application/cw-elevator-application-data/src/main/java/cn/cloudwalk/elevator/device/dto/AcsElevatorDeviceListResultDto.java +++ b/maven-cw-elevator-application/cw-elevator-application-data/src/main/java/cn/cloudwalk/elevator/device/dto/AcsElevatorDeviceListResultDto.java @@ -74,7 +74,7 @@ public class AcsElevatorDeviceListResultDto extends CloudwalkBaseTimes implement public int hashCode() { int PRIME = 59; - result = 1; + int result = 1; Object $businessId = getBusinessId(); result = result * 59 + (($businessId == null) ? 43 : $businessId.hashCode()); Object $deviceId = getDeviceId(); diff --git a/maven-cw-elevator-application/cw-elevator-application-data/src/main/java/cn/cloudwalk/elevator/device/dto/AcsElevatorDeviceQueryFoDTO.java b/maven-cw-elevator-application/cw-elevator-application-data/src/main/java/cn/cloudwalk/elevator/device/dto/AcsElevatorDeviceQueryFoDTO.java index 2aaa8eb4..a03b8c1b 100644 --- a/maven-cw-elevator-application/cw-elevator-application-data/src/main/java/cn/cloudwalk/elevator/device/dto/AcsElevatorDeviceQueryFoDTO.java +++ b/maven-cw-elevator-application/cw-elevator-application-data/src/main/java/cn/cloudwalk/elevator/device/dto/AcsElevatorDeviceQueryFoDTO.java @@ -137,7 +137,7 @@ public class AcsElevatorDeviceQueryFoDTO { public int hashCode() { int PRIME = 59; - result = 1; + int result = 1; Object $id = getId(); result = result * 59 + (($id == null) ? 43 : $id.hashCode()); Object $businessId = getBusinessId(); diff --git a/maven-cw-elevator-application/cw-elevator-application-data/src/main/java/cn/cloudwalk/elevator/device/dto/AcsElevatorDeviceResultDTO.java b/maven-cw-elevator-application/cw-elevator-application-data/src/main/java/cn/cloudwalk/elevator/device/dto/AcsElevatorDeviceResultDTO.java index f4abc45e..cbbfda02 100644 --- a/maven-cw-elevator-application/cw-elevator-application-data/src/main/java/cn/cloudwalk/elevator/device/dto/AcsElevatorDeviceResultDTO.java +++ b/maven-cw-elevator-application/cw-elevator-application-data/src/main/java/cn/cloudwalk/elevator/device/dto/AcsElevatorDeviceResultDTO.java @@ -115,7 +115,7 @@ public class AcsElevatorDeviceResultDTO { public int hashCode() { int PRIME = 59; - result = 1; + int result = 1; Object $id = getId(); result = result * 59 + (($id == null) ? 43 : $id.hashCode()); Object $businessId = getBusinessId(); diff --git a/maven-cw-elevator-application/cw-elevator-application-data/src/main/java/cn/cloudwalk/elevator/passrule/dto/ImageRuleRefAddDto.java b/maven-cw-elevator-application/cw-elevator-application-data/src/main/java/cn/cloudwalk/elevator/passrule/dto/ImageRuleRefAddDto.java index 0de2290f..fc8f4b6a 100644 --- a/maven-cw-elevator-application/cw-elevator-application-data/src/main/java/cn/cloudwalk/elevator/passrule/dto/ImageRuleRefAddDto.java +++ b/maven-cw-elevator-application/cw-elevator-application-data/src/main/java/cn/cloudwalk/elevator/passrule/dto/ImageRuleRefAddDto.java @@ -131,7 +131,7 @@ public class ImageRuleRefAddDto extends CloudwalkBaseTimes implements Serializab public int hashCode() { int PRIME = 59; - result = 1; + int result = 1; Object $businessId = getBusinessId(); result = result * 59 + (($businessId == null) ? 43 : $businessId.hashCode()); Object $name = getName(); diff --git a/maven-cw-elevator-application/cw-elevator-application-data/src/main/java/cn/cloudwalk/elevator/passrule/dto/ImageRuleRefListResult.java b/maven-cw-elevator-application/cw-elevator-application-data/src/main/java/cn/cloudwalk/elevator/passrule/dto/ImageRuleRefListResult.java index 09d503f4..2293e72b 100644 --- a/maven-cw-elevator-application/cw-elevator-application-data/src/main/java/cn/cloudwalk/elevator/passrule/dto/ImageRuleRefListResult.java +++ b/maven-cw-elevator-application/cw-elevator-application-data/src/main/java/cn/cloudwalk/elevator/passrule/dto/ImageRuleRefListResult.java @@ -1,5 +1,6 @@ package cn.cloudwalk.elevator.passrule.dto; +import cn.cloudwalk.cloud.entity.CloudwalkBaseTimes; import java.io.Serializable; import java.util.List; @@ -69,18 +70,16 @@ public class ImageRuleRefListResult extends CloudwalkBaseTimes implements Serial Object this$personId = getPersonId(), other$personId = other.getPersonId(); if ((this$personId == null) ? (other$personId != null) : !this$personId.equals(other$personId)) return false; - Object this$includeLabels = (Object)getIncludeLabels(), - other$includeLabels = (Object)other.getIncludeLabels(); + Object this$includeLabels = getIncludeLabels(), other$includeLabels = other.getIncludeLabels(); if ((this$includeLabels == null) ? (other$includeLabels != null) : !this$includeLabels.equals(other$includeLabels)) return false; - Object this$includeOrganizations = (Object)getIncludeOrganizations(), - other$includeOrganizations = (Object)other.getIncludeOrganizations(); + Object this$includeOrganizations = getIncludeOrganizations(), other$includeOrganizations = + other.getIncludeOrganizations(); if ((this$includeOrganizations == null) ? (other$includeOrganizations != null) : !this$includeOrganizations.equals(other$includeOrganizations)) return false; - Object this$excludeLabels = (Object)getExcludeLabels(), - other$excludeLabels = (Object)other.getExcludeLabels(); + Object this$excludeLabels = getExcludeLabels(), other$excludeLabels = other.getExcludeLabels(); return !((this$excludeLabels == null) ? (other$excludeLabels != null) : !this$excludeLabels.equals(other$excludeLabels)); } @@ -91,7 +90,7 @@ public class ImageRuleRefListResult extends CloudwalkBaseTimes implements Serial public int hashCode() { int PRIME = 59; - result = 1; + int result = 1; Object $businessId = getBusinessId(); result = result * 59 + (($businessId == null) ? 43 : $businessId.hashCode()); Object $name = getName(); @@ -102,11 +101,11 @@ public class ImageRuleRefListResult extends CloudwalkBaseTimes implements Serial result = result * 59 + (($zoneName == null) ? 43 : $zoneName.hashCode()); Object $personId = getPersonId(); result = result * 59 + (($personId == null) ? 43 : $personId.hashCode()); - Object $includeLabels = (Object)getIncludeLabels(); + Object $includeLabels = getIncludeLabels(); result = result * 59 + (($includeLabels == null) ? 43 : $includeLabels.hashCode()); - Object $includeOrganizations = (Object)getIncludeOrganizations(); + Object $includeOrganizations = getIncludeOrganizations(); result = result * 59 + (($includeOrganizations == null) ? 43 : $includeOrganizations.hashCode()); - Object $excludeLabels = (Object)getExcludeLabels(); + Object $excludeLabels = getExcludeLabels(); return result * 59 + (($excludeLabels == null) ? 43 : $excludeLabels.hashCode()); } diff --git a/maven-cw-elevator-application/pom.xml b/maven-cw-elevator-application/pom.xml index acc10933..847124ed 100644 --- a/maven-cw-elevator-application/pom.xml +++ b/maven-cw-elevator-application/pom.xml @@ -29,6 +29,7 @@ ${project.basedir}/../cw-elevator-application-V1.0.0.20211103/lib 4.0.0-Brussels-SRX + 3.7.2-Brussels-SRX 3.0.0-xinghewan 1.2.83 28.2-jre @@ -60,12 +61,12 @@ cn.cloudwalk.cloud cloudwalk-common-result - ${cloudwalk.internal.version} + ${cloudwalk.legacy.public.version} cn.cloudwalk.cloud cloudwalk-common-web - ${cloudwalk.internal.version} + ${cloudwalk.legacy.public.version} cn.cloudwalk.cloud @@ -80,7 +81,7 @@ cn.cloudwalk.cloud cloudwalk-common-serial - ${cloudwalk.internal.version} + ${cloudwalk.legacy.public.version} cn.cloudwalk.intelligent diff --git a/maven-intelligent-cwoscomponent/pom.xml b/maven-intelligent-cwoscomponent/pom.xml index 335669af..e59b29a4 100644 --- a/maven-intelligent-cwoscomponent/pom.xml +++ b/maven-intelligent-cwoscomponent/pom.xml @@ -27,6 +27,7 @@ 1.8 Greenwich.SR6 4.0.0-Brussels-SRX + 3.7.2-Brussels-SRX 1.2.83 2.2.0 @@ -49,7 +50,7 @@ cn.cloudwalk.cloud cloudwalk-common-result - ${cloudwalk.internal.version} + ${cloudwalk.legacy.public.version} cn.cloudwalk.cloud diff --git a/maven-ninca-crk/pom.xml b/maven-ninca-crk/pom.xml index 2d9885a7..efc9614b 100644 --- a/maven-ninca-crk/pom.xml +++ b/maven-ninca-crk/pom.xml @@ -25,6 +25,7 @@ 1.8 Edgware.SR6 4.0.0-Brussels-SRX + 3.7.2-Brussels-SRX 3.0.0-xinghewan 2.9.1_210630-SNAPSHOT 2.9.1_210630-SNAPSHOT diff --git a/maven-ninca-qk-alarm/pom.xml b/maven-ninca-qk-alarm/pom.xml index b4760c6c..68f8a96f 100644 --- a/maven-ninca-qk-alarm/pom.xml +++ b/maven-ninca-qk-alarm/pom.xml @@ -24,6 +24,7 @@ 1.8 4.0.0-Brussels-SRX + 3.7.2-Brussels-SRX 4.2.0 3.4.14 2.0.1 @@ -74,7 +75,7 @@ cn.cloudwalk.cloud cloudwalk-common-web - ${cloudwalk.internal.version} + ${cloudwalk.legacy.public.version}