mirror of
https://github.com/hpd840321/starRiverProperty.git
synced 2026-06-09 08:20:31 +08:00
fix(build): 私服 legacy 坐标分离、电梯 common/data 可编译与本地编译文档
- cloudwalk.legacy.public.version=3.7.2:result/web/serial 仍走私服;event/service 用 4.0.0 - common: spring-web;CollectionUtils for-each Iterable 强转 - data: 反编译 DTO hashCode/import 修正(ImageRuleRef*、AcsElevatorDevice*) - docs/build/本地编译说明.md;Maven工作区修订表补充 legacy 说明 Made-with: Cursor
This commit is contained in:
@@ -66,6 +66,10 @@
|
||||
<groupId>net.lingala.zip4j</groupId>
|
||||
<artifactId>zip4j</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework</groupId>
|
||||
<artifactId>spring-web</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.data</groupId>
|
||||
<artifactId>spring-data-redis</artifactId>
|
||||
|
||||
+2
-2
@@ -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 {
|
||||
|
||||
+1
-1
@@ -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();
|
||||
|
||||
+1
-1
@@ -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();
|
||||
|
||||
+1
-1
@@ -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();
|
||||
|
||||
+1
-1
@@ -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();
|
||||
|
||||
+1
-1
@@ -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();
|
||||
|
||||
+9
-10
@@ -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<String> this$includeLabels = (Object<String>)getIncludeLabels(),
|
||||
other$includeLabels = (Object<String>)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<String> this$includeOrganizations = (Object<String>)getIncludeOrganizations(),
|
||||
other$includeOrganizations = (Object<String>)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<String> this$excludeLabels = (Object<String>)getExcludeLabels(),
|
||||
other$excludeLabels = (Object<String>)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<String> $includeLabels = (Object<String>)getIncludeLabels();
|
||||
Object $includeLabels = getIncludeLabels();
|
||||
result = result * 59 + (($includeLabels == null) ? 43 : $includeLabels.hashCode());
|
||||
Object<String> $includeOrganizations = (Object<String>)getIncludeOrganizations();
|
||||
Object $includeOrganizations = getIncludeOrganizations();
|
||||
result = result * 59 + (($includeOrganizations == null) ? 43 : $includeOrganizations.hashCode());
|
||||
Object<String> $excludeLabels = (Object<String>)getExcludeLabels();
|
||||
Object $excludeLabels = getExcludeLabels();
|
||||
return result * 59 + (($excludeLabels == null) ? 43 : $excludeLabels.hashCode());
|
||||
}
|
||||
|
||||
|
||||
@@ -29,6 +29,7 @@
|
||||
<!-- 与 V1 运行包 lib 目录内 JAR 文件名对齐,便于 install-file 或私服核对 -->
|
||||
<cw.elevator.v1.lib.dir>${project.basedir}/../cw-elevator-application-V1.0.0.20211103/lib</cw.elevator.v1.lib.dir>
|
||||
<cloudwalk.internal.version>4.0.0-Brussels-SRX</cloudwalk.internal.version>
|
||||
<cloudwalk.legacy.public.version>3.7.2-Brussels-SRX</cloudwalk.legacy.public.version>
|
||||
<intelligent.cwoscomponent.version>3.0.0-xinghewan</intelligent.cwoscomponent.version>
|
||||
<fastjson.version>1.2.83</fastjson.version>
|
||||
<guava.version>28.2-jre</guava.version>
|
||||
@@ -60,12 +61,12 @@
|
||||
<dependency>
|
||||
<groupId>cn.cloudwalk.cloud</groupId>
|
||||
<artifactId>cloudwalk-common-result</artifactId>
|
||||
<version>${cloudwalk.internal.version}</version>
|
||||
<version>${cloudwalk.legacy.public.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.cloudwalk.cloud</groupId>
|
||||
<artifactId>cloudwalk-common-web</artifactId>
|
||||
<version>${cloudwalk.internal.version}</version>
|
||||
<version>${cloudwalk.legacy.public.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.cloudwalk.cloud</groupId>
|
||||
@@ -80,7 +81,7 @@
|
||||
<dependency>
|
||||
<groupId>cn.cloudwalk.cloud</groupId>
|
||||
<artifactId>cloudwalk-common-serial</artifactId>
|
||||
<version>${cloudwalk.internal.version}</version>
|
||||
<version>${cloudwalk.legacy.public.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>cn.cloudwalk.intelligent</groupId>
|
||||
|
||||
Reference in New Issue
Block a user