elevator: 反编译编译修复（equals/hash、Feign、POI4、分片 DTO、lambda）

Made-with: Cursor

maven-cw-elevator-application/cw-elevator-application-service/pom.xml

@@ -69,6 +69,12 @@
             <groupId>cn.cloudwalk.intelligent</groupId>
             <artifactId>intelligent-cwoscomponent-rest</artifactId>
         </dependency>
+        <!-- 反编译源码曾引用 netflix.feign；与 Spring Boot 2.1 对齐为 openfeign 注解包 -->
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-openfeign-core</artifactId>
+            <version>2.1.5.RELEASE</version>
+        </dependency>
     </dependencies>
 
     <build>

maven-cw-elevator-application/cw-elevator-application-service/src/main/java/cn/cloudwalk/client/davinci/portal/file/param/part/FilePartAppendParam.java

@@ -0,0 +1,44 @@
+package cn.cloudwalk.client.davinci.portal.file.param.part;
+
+import java.io.Serializable;
+
+/** 分片追加参数（与存储层 append 调用约定一致）。 */
+public class FilePartAppendParam<T> implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private String filePath;
+    private Integer partNumber;
+    private String uploadId;
+    private T content;
+
+    public String getFilePath() {
+        return filePath;
+    }
+
+    public void setFilePath(String filePath) {
+        this.filePath = filePath;
+    }
+
+    public Integer getPartNumber() {
+        return partNumber;
+    }
+
+    public void setPartNumber(Integer partNumber) {
+        this.partNumber = partNumber;
+    }
+
+    public String getUploadId() {
+        return uploadId;
+    }
+
+    public void setUploadId(String uploadId) {
+        this.uploadId = uploadId;
+    }
+
+    public T getContent() {
+        return content;
+    }
+
+    public void setContent(T content) {
+        this.content = content;
+    }
+}

maven-cw-elevator-application/cw-elevator-application-service/src/main/java/cn/cloudwalk/client/davinci/portal/file/param/part/FilePartFinishParam.java

@@ -0,0 +1,44 @@
+package cn.cloudwalk.client.davinci.portal.file.param.part;
+
+import java.io.Serializable;
+
+/** 分片结束参数（与 PartFinishDTO 字段对齐）。 */
+public class FilePartFinishParam implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private String uploadId;
+    private Long fileSize;
+    private String filePath;
+    private Integer returnType;
+
+    public String getUploadId() {
+        return uploadId;
+    }
+
+    public void setUploadId(String uploadId) {
+        this.uploadId = uploadId;
+    }
+
+    public Long getFileSize() {
+        return fileSize;
+    }
+
+    public void setFileSize(Long fileSize) {
+        this.fileSize = fileSize;
+    }
+
+    public String getFilePath() {
+        return filePath;
+    }
+
+    public void setFilePath(String filePath) {
+        this.filePath = filePath;
+    }
+
+    public Integer getReturnType() {
+        return returnType;
+    }
+
+    public void setReturnType(Integer returnType) {
+        this.returnType = returnType;
+    }
+}

maven-cw-elevator-application/cw-elevator-application-service/src/main/java/cn/cloudwalk/client/davinci/portal/file/param/part/FilePartInitParam.java

@@ -0,0 +1,17 @@
+package cn.cloudwalk.client.davinci.portal.file.param.part;
+
+import java.io.Serializable;
+
+/** 分片上传初始化参数（与 PartInitDTO 字段对齐，供 BeanCopy 与业务层使用）。 */
+public class FilePartInitParam implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private String fileName;
+
+    public String getFileName() {
+        return fileName;
+    }
+
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
+}

maven-cw-elevator-application/cw-elevator-application-service/src/main/java/cn/cloudwalk/client/davinci/portal/file/result/FilePartResult.java

@@ -0,0 +1,26 @@
+package cn.cloudwalk.client.davinci.portal.file.result;
+
+import java.io.Serializable;
+
+/** 分片初始化/追加返回（与 PartInitResultDTO 字段对齐）。 */
+public class FilePartResult implements Serializable {
+    private static final long serialVersionUID = 1L;
+    private String filePath;
+    private String uploadId;
+
+    public String getFilePath() {
+        return filePath;
+    }
+
+    public void setFilePath(String filePath) {
+        this.filePath = filePath;
+    }
+
+    public String getUploadId() {
+        return uploadId;
+    }
+
+    public void setUploadId(String uploadId) {
+        this.uploadId = uploadId;
+    }
+}

maven-cw-elevator-application/cw-elevator-application-service/src/main/java/cn/cloudwalk/elevator/device/impl/AcsDeviceTaskServiceImpl.java

@@ -79,7 +79,7 @@ public class AcsDeviceTaskServiceImpl extends AbstractAcsDeviceService implement
             if (!CollectionUtils.isEmpty(delFloorIds)) {
                 List<AcsPassRuleImageResultDto> ruleList = this.imageRuleRefDao.listZoneInfoByIds(delFloorIds);
                 Map<String, String> ruleMap = new HashMap<>();
-                ruleList.forEach(rule -> (String)ruleMap.put(rule.getZoneId(), rule.getZoneName()));
+                ruleList.forEach(rule -> ruleMap.put(rule.getZoneId(), rule.getZoneName()));
                 for (String delFloorId : delFloorIds) {
                     AcsDeviceTaskDTO task = this.acsDeviceTaskDao.getById(param.getTaskId());
                     if (task.getIsStop().intValue() == 0) {

maven-cw-elevator-application/cw-elevator-application-service/src/main/java/cn/cloudwalk/elevator/device/param/AcsDeviceRestructureTaskParam.java

@@ -12,7 +12,7 @@ public class AcsDeviceRestructureTaskParam implements Serializable {
 
     public int hashCode() {
         int PRIME = 59;
-        result = 1;
+        int result = 1;
         Object $taskId = getTaskId();
         return result * 59 + (($taskId == null) ? 43 : $taskId.hashCode());
     }

maven-cw-elevator-application/cw-elevator-application-service/src/main/java/cn/cloudwalk/elevator/device/param/AcsRestructureBindingParam.java

@@ -2,6 +2,7 @@ package cn.cloudwalk.elevator.device.param;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Objects;
 
 public class AcsRestructureBindingParam implements Serializable {
     private String parentId;
@@ -46,36 +47,20 @@ public class AcsRestructureBindingParam implements Serializable {
     }
 
     public boolean equals(Object o) {
-        if (o == this)
+        if (o == this) {
             return true;
-        if (!(o instanceof AcsRestructureBindingParam))
+        }
+        if (!(o instanceof AcsRestructureBindingParam)) {
             return false;
+        }
         AcsRestructureBindingParam other = (AcsRestructureBindingParam)o;
-        if (!other.canEqual(this))
+        if (!other.canEqual(this)) {
             return false;
-        Object this$parentId = getParentId(), other$parentId = other.getParentId();
-        if ((this$parentId == null) ? (other$parentId != null) : !this$parentId.equals(other$parentId))
-            return false;
-        Object this$orgId = getOrgId(), other$orgId = other.getOrgId();
-        if ((this$orgId == null) ? (other$orgId != null) : !this$orgId.equals(other$orgId))
-            return false;
-        Object this$orgName = getOrgName(), other$orgName = other.getOrgName();
-        if ((this$orgName == null) ? (other$orgName != null) : !this$orgName.equals(other$orgName))
-            return false;
-        Object this$labelId = getLabelId(), other$labelId = other.getLabelId();
-        if ((this$labelId == null) ? (other$labelId != null) : !this$labelId.equals(other$labelId))
-            return false;
-        Object this$labelName = getLabelName(), other$labelName = other.getLabelName();
-        if ((this$labelName == null) ? (other$labelName != null) : !this$labelName.equals(other$labelName))
-            return false;
-        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$zoneIds = (Object<String>)getZoneIds(), other$zoneIds = (Object<String>)other.getZoneIds();
-        if ((this$zoneIds == null) ? (other$zoneIds != null) : !this$zoneIds.equals(other$zoneIds))
-            return false;
-        Object this$taskId = getTaskId(), other$taskId = other.getTaskId();
-        return !((this$taskId == null) ? (other$taskId != null) : !this$taskId.equals(other$taskId));
+        }
+        return Objects.equals(parentId, other.parentId) && Objects.equals(orgId, other.orgId)
+            && Objects.equals(orgName, other.orgName) && Objects.equals(labelId, other.labelId)
+            && Objects.equals(labelName, other.labelName) && Objects.equals(personId, other.personId)
+            && Objects.equals(zoneIds, other.zoneIds) && Objects.equals(taskId, other.taskId);
     }
 
     protected boolean canEqual(Object other) {
@@ -83,24 +68,7 @@ public class AcsRestructureBindingParam implements Serializable {
     }
 
     public int hashCode() {
-        int PRIME = 59;
-        result = 1;
-        Object $parentId = getParentId();
-        result = result * 59 + (($parentId == null) ? 43 : $parentId.hashCode());
-        Object $orgId = getOrgId();
-        result = result * 59 + (($orgId == null) ? 43 : $orgId.hashCode());
-        Object $orgName = getOrgName();
-        result = result * 59 + (($orgName == null) ? 43 : $orgName.hashCode());
-        Object $labelId = getLabelId();
-        result = result * 59 + (($labelId == null) ? 43 : $labelId.hashCode());
-        Object $labelName = getLabelName();
-        result = result * 59 + (($labelName == null) ? 43 : $labelName.hashCode());
-        Object $personId = getPersonId();
-        result = result * 59 + (($personId == null) ? 43 : $personId.hashCode());
-        Object<String> $zoneIds = (Object<String>)getZoneIds();
-        result = result * 59 + (($zoneIds == null) ? 43 : $zoneIds.hashCode());
-        Object $taskId = getTaskId();
-        return result * 59 + (($taskId == null) ? 43 : $taskId.hashCode());
+        return Objects.hash(parentId, orgId, orgName, labelId, labelName, personId, zoneIds, taskId);
     }
 
     public String toString() {

maven-cw-elevator-application/cw-elevator-application-service/src/main/java/cn/cloudwalk/elevator/device/param/AcsRestructureQueryParam.java

@@ -2,6 +2,7 @@ package cn.cloudwalk.elevator.device.param;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Objects;
 
 public class AcsRestructureQueryParam implements Serializable {
     private String orgId;
@@ -36,31 +37,19 @@ public class AcsRestructureQueryParam implements Serializable {
     }
 
     public boolean equals(Object o) {
-        if (o == this)
+        if (o == this) {
             return true;
-        if (!(o instanceof AcsRestructureQueryParam))
+        }
+        if (!(o instanceof AcsRestructureQueryParam)) {
             return false;
+        }
         AcsRestructureQueryParam other = (AcsRestructureQueryParam)o;
-        if (!other.canEqual(this))
+        if (!other.canEqual(this)) {
             return false;
-        Object this$orgId = getOrgId(), other$orgId = other.getOrgId();
-        if ((this$orgId == null) ? (other$orgId != null) : !this$orgId.equals(other$orgId))
-            return false;
-        Object this$labelId = getLabelId(), other$labelId = other.getLabelId();
-        if ((this$labelId == null) ? (other$labelId != null) : !this$labelId.equals(other$labelId))
-            return false;
-        Object<String> this$labelIds = (Object<String>)getLabelIds(),
-            other$labelIds = (Object<String>)other.getLabelIds();
-        if ((this$labelIds == null) ? (other$labelIds != null) : !this$labelIds.equals(other$labelIds))
-            return false;
-        Object this$personId = getPersonId(), other$personId = other.getPersonId();
-        if ((this$personId == null) ? (other$personId != null) : !this$personId.equals(other$personId))
-            return false;
-        Object this$zoneId = getZoneId(), other$zoneId = other.getZoneId();
-        if ((this$zoneId == null) ? (other$zoneId != null) : !this$zoneId.equals(other$zoneId))
-            return false;
-        Object this$businessId = getBusinessId(), other$businessId = other.getBusinessId();
-        return !((this$businessId == null) ? (other$businessId != null) : !this$businessId.equals(other$businessId));
+        }
+        return Objects.equals(orgId, other.orgId) && Objects.equals(labelId, other.labelId)
+            && Objects.equals(labelIds, other.labelIds) && Objects.equals(personId, other.personId)
+            && Objects.equals(zoneId, other.zoneId) && Objects.equals(businessId, other.businessId);
     }
 
     protected boolean canEqual(Object other) {
@@ -68,20 +57,7 @@ public class AcsRestructureQueryParam implements Serializable {
     }
 
     public int hashCode() {
-        int PRIME = 59;
-        result = 1;
-        Object $orgId = getOrgId();
-        result = result * 59 + (($orgId == null) ? 43 : $orgId.hashCode());
-        Object $labelId = getLabelId();
-        result = result * 59 + (($labelId == null) ? 43 : $labelId.hashCode());
-        Object<String> $labelIds = (Object<String>)getLabelIds();
-        result = result * 59 + (($labelIds == null) ? 43 : $labelIds.hashCode());
-        Object $personId = getPersonId();
-        result = result * 59 + (($personId == null) ? 43 : $personId.hashCode());
-        Object $zoneId = getZoneId();
-        result = result * 59 + (($zoneId == null) ? 43 : $zoneId.hashCode());
-        Object $businessId = getBusinessId();
-        return result * 59 + (($businessId == null) ? 43 : $businessId.hashCode());
+        return Objects.hash(orgId, labelId, labelIds, personId, zoneId, businessId);
     }
 
     public String toString() {

maven-cw-elevator-application/cw-elevator-application-service/src/main/java/cn/cloudwalk/elevator/device/result/AcsDeviceRestructureResult.java

@@ -59,7 +59,7 @@ public class AcsDeviceRestructureResult {
 
     public int hashCode() {
         int PRIME = 59;
-        result = 1;
+        int result = 1;
         Object $parentId = getParentId();
         result = result * 59 + (($parentId == null) ? 43 : $parentId.hashCode());
         Object $zoneId = getZoneId();

maven-cw-elevator-application/cw-elevator-application-service/src/main/java/cn/cloudwalk/elevator/device/result/AcsElevatorDeviceListResult.java

@@ -122,7 +122,7 @@ public class AcsElevatorDeviceListResult extends CloudwalkBaseTimes implements S
 
     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();

maven-cw-elevator-application/cw-elevator-application-service/src/main/java/cn/cloudwalk/elevator/device/result/AcsLabelElevatorResult.java

@@ -2,6 +2,7 @@ package cn.cloudwalk.elevator.device.result;
 
 import cn.cloudwalk.elevator.passrule.dto.AcsPassRuleLabelResultDto;
 import java.util.List;
+import java.util.Objects;
 
 public class AcsLabelElevatorResult {
     private String labelId;
@@ -16,19 +17,17 @@ public class AcsLabelElevatorResult {
     }
 
     public boolean equals(Object o) {
-        if (o == this)
+        if (o == this) {
             return true;
-        if (!(o instanceof AcsLabelElevatorResult))
+        }
+        if (!(o instanceof AcsLabelElevatorResult)) {
             return false;
+        }
         AcsLabelElevatorResult other = (AcsLabelElevatorResult)o;
-        if (!other.canEqual(this))
+        if (!other.canEqual(this)) {
             return false;
-        Object this$labelId = getLabelId(), other$labelId = other.getLabelId();
-        if ((this$labelId == null) ? (other$labelId != null) : !this$labelId.equals(other$labelId))
-            return false;
-        Object<AcsPassRuleLabelResultDto> this$details = (Object<AcsPassRuleLabelResultDto>)getDetails(),
-            other$details = (Object<AcsPassRuleLabelResultDto>)other.getDetails();
-        return !((this$details == null) ? (other$details != null) : !this$details.equals(other$details));
+        }
+        return Objects.equals(labelId, other.labelId) && Objects.equals(details, other.details);
     }
 
     protected boolean canEqual(Object other) {
@@ -36,12 +35,7 @@ public class AcsLabelElevatorResult {
     }
 
     public int hashCode() {
-        int PRIME = 59;
-        result = 1;
-        Object $labelId = getLabelId();
-        result = result * 59 + (($labelId == null) ? 43 : $labelId.hashCode());
-        Object<AcsPassRuleLabelResultDto> $details = (Object<AcsPassRuleLabelResultDto>)getDetails();
-        return result * 59 + (($details == null) ? 43 : $details.hashCode());
+        return Objects.hash(labelId, details);
     }
 
     public String toString() {

maven-cw-elevator-application/cw-elevator-application-service/src/main/java/cn/cloudwalk/elevator/device/result/KeyValueResult.java

@@ -41,7 +41,7 @@ public class KeyValueResult {
 
     public int hashCode() {
         int PRIME = 59;
-        result = 1;
+        int result = 1;
         Object $key = getKey();
         result = result * 59 + (($key == null) ? 43 : $key.hashCode());
         Object $time = getTime();

maven-cw-elevator-application/cw-elevator-application-service/src/main/java/cn/cloudwalk/elevator/device/setting/impl/AcsDeviceSettingServiceImpl.java

@@ -31,7 +31,7 @@ public class AcsDeviceSettingServiceImpl extends AbstractAcsDeviceService implem
         AcsDeviceSettingResult result = new AcsDeviceSettingResult();
         result.setDeviceId(param.getDeviceId());
         DeviceSettingQueryParam deviceSettingQueryParam = new DeviceSettingQueryParam();
-        deviceSettingQueryParam.setDeviceIds(Lists.newArrayList((Object[])new String[] {param.getDeviceId()}));
+        deviceSettingQueryParam.setDeviceIds(Lists.newArrayList(param.getDeviceId()));
         deviceSettingQueryParam.setHasDefault(Short.valueOf((short)0));
         CloudwalkResult<List<DeviceSettingResult>> deviceSettingQueryResult =
             this.deviceSettingService.query(deviceSettingQueryParam);

maven-cw-elevator-application/cw-elevator-application-service/src/main/java/cn/cloudwalk/elevator/export/AcsAbstractExportAsyncService.java

@@ -17,7 +17,6 @@ import cn.cloudwalk.elevator.export.utils.ExcelUtil;
 import cn.cloudwalk.elevator.storage.AcsFileStorageService;
 import cn.cloudwalk.elevator.util.CollectionUtils;
 import cn.cloudwalk.elevator.util.DateUtils;
-import cn.cloudwalk.elevator.util.StringUtils;
 import cn.cloudwalk.intelligent.davinci.common.exception.DavinciServiceException;
 import cn.cloudwalk.intelligent.davinci.storage.bean.file.dto.FileRemoveDTO;
 import cn.cloudwalk.intelligent.davinci.storage.manager.FileStorageManager;
@@ -130,8 +129,7 @@ public abstract class AcsAbstractExportAsyncService<T, R> extends AbstractCloudw
                     this.acsDownloadCenterService.finishDownload(fileFinishParam, context);
                 } else if (StringUtils.isNotBlank(exportRecordContext.getFilePath())) {
                     FileRemoveDTO fileRemoveDTO = new FileRemoveDTO();
-                    fileRemoveDTO
-                        .setFileList(Lists.newArrayList((Object[])new String[] {exportRecordContext.getFilePath()}));
+                    fileRemoveDTO.setFileList(Lists.newArrayList(exportRecordContext.getFilePath()));
                     try {
                         this.fileStorageManager.remove(fileRemoveDTO);
                     } catch (DavinciServiceException e1) {

maven-cw-elevator-application/cw-elevator-application-service/src/main/java/cn/cloudwalk/elevator/export/result/ElevatorDeviceRecordExcelResult.java

@@ -1,5 +1,9 @@
 package cn.cloudwalk.elevator.export.result;
 
+import cn.cloudwalk.elevator.export.ExcelAttribute;
+import java.io.Serializable;
+import java.util.Objects;
+
 public class ElevatorDeviceRecordExcelResult implements Serializable {
     @ExcelAttribute(name = "设备名称", column = "A")
     private String deviceName;
@@ -68,51 +72,23 @@ public class ElevatorDeviceRecordExcelResult implements Serializable {
     }
 
     public boolean equals(Object o) {
-        if (o == this)
+        if (o == this) {
             return true;
-        if (!(o instanceof ElevatorDeviceRecordExcelResult))
+        }
+        if (!(o instanceof ElevatorDeviceRecordExcelResult)) {
             return false;
+        }
         ElevatorDeviceRecordExcelResult other = (ElevatorDeviceRecordExcelResult)o;
-        if (!other.canEqual(this))
+        if (!other.canEqual(this)) {
             return false;
-        Object this$deviceName = getDeviceName(), other$deviceName = other.getDeviceName();
-        if ((this$deviceName == null) ? (other$deviceName != null) : !this$deviceName.equals(other$deviceName))
-            return false;
-        Object this$deviceCode = getDeviceCode(), other$deviceCode = other.getDeviceCode();
-        if ((this$deviceCode == null) ? (other$deviceCode != null) : !this$deviceCode.equals(other$deviceCode))
-            return false;
-        Object this$deviceTypeName = getDeviceTypeName(), other$deviceTypeName = other.getDeviceTypeName();
-        if ((this$deviceTypeName == null) ? (other$deviceTypeName != null)
-            : !this$deviceTypeName.equals(other$deviceTypeName))
-            return false;
-        Object this$areaName = getAreaName(), other$areaName = other.getAreaName();
-        if ((this$areaName == null) ? (other$areaName != null) : !this$areaName.equals(other$areaName))
-            return false;
-        Object this$currentFloor = getCurrentFloor(), other$currentFloor = other.getCurrentFloor();
-        if ((this$currentFloor == null) ? (other$currentFloor != null) : !this$currentFloor.equals(other$currentFloor))
-            return false;
-        Object this$elevatorFloorList = getElevatorFloorList(), other$elevatorFloorList = other.getElevatorFloorList();
-        if ((this$elevatorFloorList == null) ? (other$elevatorFloorList != null)
-            : !this$elevatorFloorList.equals(other$elevatorFloorList))
-            return false;
-        Object this$deviceOnlineStatus = getDeviceOnlineStatus(),
-            other$deviceOnlineStatus = other.getDeviceOnlineStatus();
-        if ((this$deviceOnlineStatus == null) ? (other$deviceOnlineStatus != null)
-            : !this$deviceOnlineStatus.equals(other$deviceOnlineStatus))
-            return false;
-        Object this$ip = getIp(), other$ip = other.getIp();
-        if ((this$ip == null) ? (other$ip != null) : !this$ip.equals(other$ip))
-            return false;
-        Object this$lastHeartbeatTime = getLastHeartbeatTime(), other$lastHeartbeatTime = other.getLastHeartbeatTime();
-        if ((this$lastHeartbeatTime == null) ? (other$lastHeartbeatTime != null)
-            : !this$lastHeartbeatTime.equals(other$lastHeartbeatTime))
-            return false;
-        Object this$status = getStatus(), other$status = other.getStatus();
-        if ((this$status == null) ? (other$status != null) : !this$status.equals(other$status))
-            return false;
-        Object this$onlineStatus = getOnlineStatus(), other$onlineStatus = other.getOnlineStatus();
-        return !((this$onlineStatus == null) ? (other$onlineStatus != null)
-            : !this$onlineStatus.equals(other$onlineStatus));
+        }
+        return Objects.equals(deviceName, other.deviceName) && Objects.equals(deviceCode, other.deviceCode)
+            && Objects.equals(deviceTypeName, other.deviceTypeName) && Objects.equals(areaName, other.areaName)
+            && Objects.equals(currentFloor, other.currentFloor)
+            && Objects.equals(elevatorFloorList, other.elevatorFloorList)
+            && Objects.equals(deviceOnlineStatus, other.deviceOnlineStatus) && Objects.equals(ip, other.ip)
+            && Objects.equals(lastHeartbeatTime, other.lastHeartbeatTime) && Objects.equals(status, other.status)
+            && Objects.equals(onlineStatus, other.onlineStatus);
     }
 
     protected boolean canEqual(Object other) {
@@ -120,30 +96,8 @@ public class ElevatorDeviceRecordExcelResult implements Serializable {
     }
 
     public int hashCode() {
-        int PRIME = 59;
-        result = 1;
-        Object $deviceName = getDeviceName();
-        result = result * 59 + (($deviceName == null) ? 43 : $deviceName.hashCode());
-        Object $deviceCode = getDeviceCode();
-        result = result * 59 + (($deviceCode == null) ? 43 : $deviceCode.hashCode());
-        Object $deviceTypeName = getDeviceTypeName();
-        result = result * 59 + (($deviceTypeName == null) ? 43 : $deviceTypeName.hashCode());
-        Object $areaName = getAreaName();
-        result = result * 59 + (($areaName == null) ? 43 : $areaName.hashCode());
-        Object $currentFloor = getCurrentFloor();
-        result = result * 59 + (($currentFloor == null) ? 43 : $currentFloor.hashCode());
-        Object $elevatorFloorList = getElevatorFloorList();
-        result = result * 59 + (($elevatorFloorList == null) ? 43 : $elevatorFloorList.hashCode());
-        Object $deviceOnlineStatus = getDeviceOnlineStatus();
-        result = result * 59 + (($deviceOnlineStatus == null) ? 43 : $deviceOnlineStatus.hashCode());
-        Object $ip = getIp();
-        result = result * 59 + (($ip == null) ? 43 : $ip.hashCode());
-        Object $lastHeartbeatTime = getLastHeartbeatTime();
-        result = result * 59 + (($lastHeartbeatTime == null) ? 43 : $lastHeartbeatTime.hashCode());
-        Object $status = getStatus();
-        result = result * 59 + (($status == null) ? 43 : $status.hashCode());
-        Object $onlineStatus = getOnlineStatus();
-        return result * 59 + (($onlineStatus == null) ? 43 : $onlineStatus.hashCode());
+        return Objects.hash(deviceName, deviceCode, deviceTypeName, areaName, currentFloor, elevatorFloorList,
+            deviceOnlineStatus, ip, lastHeartbeatTime, status, onlineStatus);
     }
 
     public String toString() {

maven-cw-elevator-application/cw-elevator-application-service/src/main/java/cn/cloudwalk/elevator/export/utils/ExcelUtil.java

@@ -33,6 +33,8 @@ import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.CellType;
+import org.apache.poi.ss.usermodel.IndexedColors;
 import org.apache.poi.ss.usermodel.DataValidation;
 import org.apache.poi.ss.usermodel.DataValidationConstraint;
 import org.apache.poi.ss.usermodel.Row;
@@ -82,7 +84,7 @@ public class ExcelUtil {
                             if (!fieldsMap.containsKey(fieldName)) {
                                 continue;
                             }
-                            cell.setCellType(1);
+                            cell.setCellType(CellType.STRING);
                             String c = cell.getStringCellValue();
                             if (StringUtils.isNotEmpty(c)) {
                                 isNull = false;
@@ -332,7 +334,7 @@ public class ExcelUtil {
             cell.setCellStyle(cellStyle);
             sheet.setColumnWidth(i,
                 (int)((((attr.name().getBytes()).length <= 4) ? 6 : (attr.name().getBytes()).length) * 1.5D * 256.0D));
-            cell.setCellType(1);
+            cell.setCellType(CellType.STRING);
             cell.setCellValue(attr.name());
         }
     }
@@ -341,9 +343,9 @@ public class ExcelUtil {
         HSSFFont font = workbook.createFont();
         HSSFCellStyle cellStyle = workbook.createCellStyle();
         font.setFontName("Arail narrow");
-        font.setBoldweight((short)700);
+        font.setBold(true);
         if ("1".equals(type)) {
-            font.setColor('翿');
+            font.setColor(IndexedColors.RED.getIndex());
             cellStyle.setFont(font);
         } else {
             font.setColor((short)10);

maven-cw-elevator-application/cw-elevator-application-service/src/main/java/cn/cloudwalk/elevator/mqtt/client/MqttFeignClient.java

@@ -4,7 +4,7 @@ import cn.cloudwalk.cloud.exception.ServiceException;
 import cn.cloudwalk.cloud.result.CloudwalkResult;
 import cn.cloudwalk.elevator.mqtt.fallback.MqttFeignClientFallback;
 import cn.cloudwalk.elevator.mqtt.param.MqttSendMessageParam;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 

maven-cw-elevator-application/cw-elevator-application-service/src/main/java/cn/cloudwalk/elevator/mqtt/param/MqttSendMessageParam.java

@@ -1,5 +1,7 @@
 package cn.cloudwalk.elevator.mqtt.param;
 
+import java.beans.ConstructorProperties;
+
 public class MqttSendMessageParam {
     private String topic;
     private String data;

maven-cw-elevator-application/cw-elevator-application-service/src/main/java/cn/cloudwalk/elevator/passrule/impl/AcsPassRuleServiceImpl.java

@@ -355,7 +355,7 @@ public class AcsPassRuleServiceImpl extends AbstractAcsPassService implements Ac
                 .map(AcsPassRuleResultDto::getImageStoreId).collect(Collectors.toList());
             List<ImageStoreListResult> imageStoreListResult = getImageStorePageResult(imageStoreIds, context);
             imageStoreResultMap = (Map<String, ImageStoreListResult>)imageStoreListResult.stream()
-                .collect(Collectors.toMap(ImageStoreListResult::getId, imageStoreListResult -> imageStoreListResult));
+                .collect(Collectors.toMap(ImageStoreListResult::getId, r -> r));
         }
         for (AcsPassRuleResultDto dto : passRuleResultDtos) {
             AcsPassRuleResult result = new AcsPassRuleResult();

maven-cw-elevator-application/cw-elevator-application-service/src/main/java/cn/cloudwalk/elevator/passrule/result/AcsPassRuleFloorResult.java

@@ -61,7 +61,7 @@ public class AcsPassRuleFloorResult implements Serializable {
 
     public int hashCode() {
         int PRIME = 59;
-        result = 1;
+        int result = 1;
         Object $id = getId();
         result = result * 59 + (($id == null) ? 43 : $id.hashCode());
         Object $name = getName();

maven-cw-elevator-application/cw-elevator-application-service/src/main/java/cn/cloudwalk/elevator/person/impl/AcsPersonServiceImpl.java

@@ -293,8 +293,8 @@ public class AcsPersonServiceImpl extends AbstractAcsPassService implements AcsP
         imageStorePersonQueryParam.setRowsOfPage(1000);
         CloudwalkResult<CloudwalkPageAble<ImageStorePersonResult>> imageStorePersonPageResult =
             this.imageStorePersonService.page(imageStorePersonQueryParam, context);
-        ImageStorePersonResult imageStoreResult =
-            ((CloudwalkPageAble)imageStorePersonPageResult.getData()).getDatas().iterator().next();
+        CloudwalkPageAble<ImageStorePersonResult> imageStorePage = imageStorePersonPageResult.getData();
+        ImageStorePersonResult imageStoreResult = imageStorePage.getDatas().iterator().next();
         result.setComparePicture(imageStoreResult.getComparePicture());
         result.setPersonName(imageStoreResult.getName());
         result.setPersonId(imageStoreResult.getPersonId());
@@ -400,7 +400,7 @@ public class AcsPersonServiceImpl extends AbstractAcsPassService implements AcsP
         List<PersonResult> personList = (List<PersonResult>)personResult.getData();
         if (personResult.isSuccess() && CollectionUtils.isNotEmpty(personList)) {
             personIcCardMap = (Map<String, PersonResult>)personList.stream()
-                .collect(Collectors.toMap(CloudwalkBaseIdentify::getId, personResult -> personResult));
+                .collect(Collectors.toMap(CloudwalkBaseIdentify::getId, pr -> pr));
         }
         return personIcCardMap;
     }

maven-cw-elevator-application/cw-elevator-application-service/src/main/java/cn/cloudwalk/elevator/person/impl/PersonRuleServiceImpl.java

@@ -116,9 +116,10 @@ public class PersonRuleServiceImpl extends AbstractAcsPassService implements Per
             CloudwalkResult<CloudwalkPageAble<ImageStorePersonResult>> personPage =
                 this.imageStorePersonService.page(queryParam, context);
             List<String> personPageIds = new ArrayList<>();
-            if (!CollectionUtils.isEmpty(((CloudwalkPageAble)personPage.getData()).getDatas())) {
-                for (ImageStorePersonResult personResult : ((CloudwalkPageAble)personPage.getData()).getDatas()) {
-                    personPageIds.add(personResult.getPersonId());
+            CloudwalkPageAble<ImageStorePersonResult> personPageData = personPage.getData();
+            if (personPageData != null && !CollectionUtils.isEmpty(personPageData.getDatas())) {
+                for (ImageStorePersonResult imgPerson : personPageData.getDatas()) {
+                    personPageIds.add(imgPerson.getPersonId());
                 }
             }
             List<String> bindPersonIds = new ArrayList<>();
@@ -603,7 +604,7 @@ public class PersonRuleServiceImpl extends AbstractAcsPassService implements Per
         List<PersonResult> personList = (List<PersonResult>)personResult.getData();
         if (personResult.isSuccess() && CollectionUtils.isNotEmpty(personList)) {
             personIcCardMap = (Map<String, PersonResult>)personList.stream()
-                .collect(Collectors.toMap(CloudwalkBaseIdentify::getId, personResult -> personResult));
+                .collect(Collectors.toMap(CloudwalkBaseIdentify::getId, pr -> pr));
         }
         return personIcCardMap;
     }

maven-cw-elevator-application/cw-elevator-application-service/src/main/java/cn/cloudwalk/elevator/person/param/AcsPersonAddVisitorParam.java

@@ -2,6 +2,7 @@ package cn.cloudwalk.elevator.person.param;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Objects;
 
 public class AcsPersonAddVisitorParam implements Serializable {
     private static final long serialVersionUID = 7916140658162290825L;
@@ -32,30 +33,19 @@ public class AcsPersonAddVisitorParam implements Serializable {
     }
 
     public boolean equals(Object o) {
-        if (o == this)
+        if (o == this) {
             return true;
-        if (!(o instanceof AcsPersonAddVisitorParam))
+        }
+        if (!(o instanceof AcsPersonAddVisitorParam)) {
             return false;
+        }
         AcsPersonAddVisitorParam other = (AcsPersonAddVisitorParam)o;
-        if (!other.canEqual(this))
+        if (!other.canEqual(this)) {
             return false;
-        Object this$visitorId = getVisitorId(), other$visitorId = other.getVisitorId();
-        if ((this$visitorId == null) ? (other$visitorId != null) : !this$visitorId.equals(other$visitorId))
-            return false;
-        Object this$personId = getPersonId(), other$personId = other.getPersonId();
-        if ((this$personId == null) ? (other$personId != null) : !this$personId.equals(other$personId))
-            return false;
-        Object this$begVisitorTime = getBegVisitorTime(), other$begVisitorTime = other.getBegVisitorTime();
-        if ((this$begVisitorTime == null) ? (other$begVisitorTime != null)
-            : !this$begVisitorTime.equals(other$begVisitorTime))
-            return false;
-        Object this$endVisitorTime = getEndVisitorTime(), other$endVisitorTime = other.getEndVisitorTime();
-        if ((this$endVisitorTime == null) ? (other$endVisitorTime != null)
-            : !this$endVisitorTime.equals(other$endVisitorTime))
-            return false;
-        Object<String> this$floorIds = (Object<String>)getFloorIds(),
-            other$floorIds = (Object<String>)other.getFloorIds();
-        return !((this$floorIds == null) ? (other$floorIds != null) : !this$floorIds.equals(other$floorIds));
+        }
+        return Objects.equals(visitorId, other.visitorId) && Objects.equals(personId, other.personId)
+            && Objects.equals(begVisitorTime, other.begVisitorTime) && Objects.equals(endVisitorTime, other.endVisitorTime)
+            && Objects.equals(floorIds, other.floorIds);
     }
 
     protected boolean canEqual(Object other) {
@@ -63,18 +53,7 @@ public class AcsPersonAddVisitorParam implements Serializable {
     }
 
     public int hashCode() {
-        int PRIME = 59;
-        result = 1;
-        Object $visitorId = getVisitorId();
-        result = result * 59 + (($visitorId == null) ? 43 : $visitorId.hashCode());
-        Object $personId = getPersonId();
-        result = result * 59 + (($personId == null) ? 43 : $personId.hashCode());
-        Object $begVisitorTime = getBegVisitorTime();
-        result = result * 59 + (($begVisitorTime == null) ? 43 : $begVisitorTime.hashCode());
-        Object $endVisitorTime = getEndVisitorTime();
-        result = result * 59 + (($endVisitorTime == null) ? 43 : $endVisitorTime.hashCode());
-        Object<String> $floorIds = (Object<String>)getFloorIds();
-        return result * 59 + (($floorIds == null) ? 43 : $floorIds.hashCode());
+        return Objects.hash(visitorId, personId, begVisitorTime, endVisitorTime, floorIds);
     }
 
     public String toString() {

maven-cw-elevator-application/cw-elevator-application-service/src/main/java/cn/cloudwalk/elevator/person/param/AcsPersonQueryParam.java

@@ -2,6 +2,7 @@ package cn.cloudwalk.elevator.person.param;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Objects;
 
 public class AcsPersonQueryParam implements Serializable {
     private static final long serialVersionUID = -3343979289939890513L;
@@ -63,54 +64,23 @@ public class AcsPersonQueryParam implements Serializable {
     }
 
     public boolean equals(Object o) {
-        if (o == this)
+        if (o == this) {
             return true;
-        if (!(o instanceof AcsPersonQueryParam))
+        }
+        if (!(o instanceof AcsPersonQueryParam)) {
             return false;
+        }
         AcsPersonQueryParam other = (AcsPersonQueryParam)o;
-        if (!other.canEqual(this))
+        if (!other.canEqual(this)) {
             return false;
-        Object this$parentId = getParentId(), other$parentId = other.getParentId();
-        if ((this$parentId == null) ? (other$parentId != null) : !this$parentId.equals(other$parentId))
-            return false;
-        Object this$zoneId = getZoneId(), other$zoneId = other.getZoneId();
-        if ((this$zoneId == null) ? (other$zoneId != null) : !this$zoneId.equals(other$zoneId))
-            return false;
-        Object this$personName = getPersonName(), other$personName = other.getPersonName();
-        if ((this$personName == null) ? (other$personName != null) : !this$personName.equals(other$personName))
-            return false;
-        Object this$imageStoreId = getImageStoreId(), other$imageStoreId = other.getImageStoreId();
-        if ((this$imageStoreId == null) ? (other$imageStoreId != null) : !this$imageStoreId.equals(other$imageStoreId))
-            return false;
-        Object<String> this$organizationIds = (Object<String>)getOrganizationIds(),
-            other$organizationIds = (Object<String>)other.getOrganizationIds();
-        if ((this$organizationIds == null) ? (other$organizationIds != null)
-            : !this$organizationIds.equals(other$organizationIds))
-            return false;
-        Object<String> this$labelIds = (Object<String>)getLabelIds(),
-            other$labelIds = (Object<String>)other.getLabelIds();
-        if ((this$labelIds == null) ? (other$labelIds != null) : !this$labelIds.equals(other$labelIds))
-            return false;
-        Object<String> this$personIds = (Object<String>)getPersonIds(),
-            other$personIds = (Object<String>)other.getPersonIds();
-        if ((this$personIds == null) ? (other$personIds != null) : !this$personIds.equals(other$personIds))
-            return false;
-        Object this$isElevator = getIsElevator(), other$isElevator = other.getIsElevator();
-        if ((this$isElevator == null) ? (other$isElevator != null) : !this$isElevator.equals(other$isElevator))
-            return false;
-        Object<String> this$delPersonIds = (Object<String>)getDelPersonIds(),
-            other$delPersonIds = (Object<String>)other.getDelPersonIds();
-        if ((this$delPersonIds == null) ? (other$delPersonIds != null) : !this$delPersonIds.equals(other$delPersonIds))
-            return false;
-        Object<String> this$elevatorLabelIds = (Object<String>)getElevatorLabelIds(),
-            other$elevatorLabelIds = (Object<String>)other.getElevatorLabelIds();
-        if ((this$elevatorLabelIds == null) ? (other$elevatorLabelIds != null)
-            : !this$elevatorLabelIds.equals(other$elevatorLabelIds))
-            return false;
-        Object<String> this$elevatorOrganizationIds = (Object<String>)getElevatorOrganizationIds(),
-            other$elevatorOrganizationIds = (Object<String>)other.getElevatorOrganizationIds();
-        return !((this$elevatorOrganizationIds == null) ? (other$elevatorOrganizationIds != null)
-            : !this$elevatorOrganizationIds.equals(other$elevatorOrganizationIds));
+        }
+        return Objects.equals(parentId, other.parentId) && Objects.equals(zoneId, other.zoneId)
+            && Objects.equals(personName, other.personName) && Objects.equals(imageStoreId, other.imageStoreId)
+            && Objects.equals(organizationIds, other.organizationIds) && Objects.equals(labelIds, other.labelIds)
+            && Objects.equals(personIds, other.personIds) && Objects.equals(isElevator, other.isElevator)
+            && Objects.equals(delPersonIds, other.delPersonIds)
+            && Objects.equals(elevatorLabelIds, other.elevatorLabelIds)
+            && Objects.equals(elevatorOrganizationIds, other.elevatorOrganizationIds);
     }
 
     protected boolean canEqual(Object other) {
@@ -118,30 +88,8 @@ public class AcsPersonQueryParam implements Serializable {
     }
 
     public int hashCode() {
-        int PRIME = 59;
-        result = 1;
-        Object $parentId = getParentId();
-        result = result * 59 + (($parentId == null) ? 43 : $parentId.hashCode());
-        Object $zoneId = getZoneId();
-        result = result * 59 + (($zoneId == null) ? 43 : $zoneId.hashCode());
-        Object $personName = getPersonName();
-        result = result * 59 + (($personName == null) ? 43 : $personName.hashCode());
-        Object $imageStoreId = getImageStoreId();
-        result = result * 59 + (($imageStoreId == null) ? 43 : $imageStoreId.hashCode());
-        Object<String> $organizationIds = (Object<String>)getOrganizationIds();
-        result = result * 59 + (($organizationIds == null) ? 43 : $organizationIds.hashCode());
-        Object<String> $labelIds = (Object<String>)getLabelIds();
-        result = result * 59 + (($labelIds == null) ? 43 : $labelIds.hashCode());
-        Object<String> $personIds = (Object<String>)getPersonIds();
-        result = result * 59 + (($personIds == null) ? 43 : $personIds.hashCode());
-        Object $isElevator = getIsElevator();
-        result = result * 59 + (($isElevator == null) ? 43 : $isElevator.hashCode());
-        Object<String> $delPersonIds = (Object<String>)getDelPersonIds();
-        result = result * 59 + (($delPersonIds == null) ? 43 : $delPersonIds.hashCode());
-        Object<String> $elevatorLabelIds = (Object<String>)getElevatorLabelIds();
-        result = result * 59 + (($elevatorLabelIds == null) ? 43 : $elevatorLabelIds.hashCode());
-        Object<String> $elevatorOrganizationIds = (Object<String>)getElevatorOrganizationIds();
-        return result * 59 + (($elevatorOrganizationIds == null) ? 43 : $elevatorOrganizationIds.hashCode());
+        return Objects.hash(parentId, zoneId, personName, imageStoreId, organizationIds, labelIds, personIds,
+            isElevator, delPersonIds, elevatorLabelIds, elevatorOrganizationIds);
     }
 
     public String toString() {

maven-cw-elevator-application/cw-elevator-application-service/src/main/java/cn/cloudwalk/elevator/person/param/PersonDetailQueryParam.java

@@ -2,6 +2,7 @@ package cn.cloudwalk.elevator.person.param;
 
 import cn.cloudwalk.cloud.page.CloudwalkBasePageForm;
 import java.io.Serializable;
+import java.util.Objects;
 
 public class PersonDetailQueryParam extends CloudwalkBasePageForm implements Serializable {
     private static final long serialVersionUID = -8830219133147503297L;
@@ -27,24 +28,18 @@ public class PersonDetailQueryParam extends CloudwalkBasePageForm implements Ser
     }
 
     public boolean equals(Object o) {
-        if (o == this)
+        if (o == this) {
             return true;
-        if (!(o instanceof PersonDetailQueryParam))
+        }
+        if (!(o instanceof PersonDetailQueryParam)) {
             return false;
+        }
         PersonDetailQueryParam other = (PersonDetailQueryParam)o;
-        if (!other.canEqual(this))
+        if (!other.canEqual(this)) {
             return false;
-        Object this$parentId = getParentId(), other$parentId = other.getParentId();
-        if ((this$parentId == null) ? (other$parentId != null) : !this$parentId.equals(other$parentId))
-            return false;
-        Object this$zoneId = getZoneId(), other$zoneId = other.getZoneId();
-        if ((this$zoneId == null) ? (other$zoneId != null) : !this$zoneId.equals(other$zoneId))
-            return false;
-        Object this$ruleId = getRuleId(), other$ruleId = other.getRuleId();
-        if ((this$ruleId == null) ? (other$ruleId != null) : !this$ruleId.equals(other$ruleId))
-            return false;
-        Object this$personName = getPersonName(), other$personName = other.getPersonName();
-        return !((this$personName == null) ? (other$personName != null) : !this$personName.equals(other$personName));
+        }
+        return Objects.equals(parentId, other.parentId) && Objects.equals(zoneId, other.zoneId)
+            && Objects.equals(ruleId, other.ruleId) && Objects.equals(personName, other.personName);
     }
 
     protected boolean canEqual(Object other) {
@@ -52,16 +47,7 @@ public class PersonDetailQueryParam extends CloudwalkBasePageForm implements Ser
     }
 
     public int hashCode() {
-        int PRIME = 59;
-        result = 1;
-        Object $parentId = getParentId();
-        result = result * 59 + (($parentId == null) ? 43 : $parentId.hashCode());
-        Object $zoneId = getZoneId();
-        result = result * 59 + (($zoneId == null) ? 43 : $zoneId.hashCode());
-        Object $ruleId = getRuleId();
-        result = result * 59 + (($ruleId == null) ? 43 : $ruleId.hashCode());
-        Object $personName = getPersonName();
-        return result * 59 + (($personName == null) ? 43 : $personName.hashCode());
+        return Objects.hash(parentId, zoneId, ruleId, personName);
     }
 
     public String toString() {

maven-cw-elevator-application/cw-elevator-application-service/src/main/java/cn/cloudwalk/elevator/record/impl/AcsElevatorRecordServiceImpl.java

@@ -192,7 +192,9 @@ public class AcsElevatorRecordServiceImpl extends AbstractAcsDeviceService imple
                     this.personService.list(personQueryParam, cloudwalkContext);
                 Map<String, PersonResult> maps = new HashMap<>();
                 if (!CollectionUtils.isEmpty((Collection)personList.getData())) {
-                    ((List)personList.getData()).forEach(person -> (PersonResult)maps.put(person.getId(), person));
+                    for (PersonResult person : (List<PersonResult>)personList.getData()) {
+                        maps.put(person.getId(), person);
+                    }
                 }
                 for (AcsElevatorRecordResult result : acsList) {
                     PersonResult person = maps.get(result.getPersonId());

maven-cw-elevator-application/cw-elevator-application-service/src/main/java/cn/cloudwalk/elevator/visitor/client/VisitorFeignClient.java

@@ -5,7 +5,7 @@ import cn.cloudwalk.cloud.result.CloudwalkResult;
 import cn.cloudwalk.elevator.visitor.fallback.VisitorFeignClientFallback;
 import cn.cloudwalk.elevator.visitor.param.VisitorRecordQueryParam;
 import cn.cloudwalk.elevator.visitor.result.VisitorQueryResult;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 

maven-cw-elevator-application/cw-elevator-application-service/src/main/java/cn/cloudwalk/elevator/zone/client/ZoneFeignClient.java

@@ -9,7 +9,7 @@ import cn.cloudwalk.elevator.zone.param.ZoneQueryParam;
 import cn.cloudwalk.elevator.zone.result.ZoneResult;
 import cn.cloudwalk.elevator.zone.result.ZoneTreeResult;
 import java.util.List;
-import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 

maven-cw-elevator-application/cw-elevator-application-web/src/main/java/cn/cloudwalk/elevator/handler/device/form/AcsDeviceRestructureTaskForm.java

@@ -1,6 +1,7 @@
 package cn.cloudwalk.elevator.handler.device.form;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 public class AcsDeviceRestructureTaskForm implements Serializable {
     private static final long serialVersionUID = -7349123760464380004L;
@@ -11,10 +12,7 @@ public class AcsDeviceRestructureTaskForm implements Serializable {
     }
 
     public int hashCode() {
-        int PRIME = 59;
-        result = 1;
-        Object $taskId = getTaskId();
-        return result * 59 + (($taskId == null) ? 43 : $taskId.hashCode());
+        return Objects.hash(taskId);
     }
 
     protected boolean canEqual(Object other) {
@@ -22,15 +20,17 @@ public class AcsDeviceRestructureTaskForm implements Serializable {
     }
 
     public boolean equals(Object o) {
-        if (o == this)
+        if (o == this) {
             return true;
-        if (!(o instanceof AcsDeviceRestructureTaskForm))
+        }
+        if (!(o instanceof AcsDeviceRestructureTaskForm)) {
             return false;
+        }
         AcsDeviceRestructureTaskForm other = (AcsDeviceRestructureTaskForm)o;
-        if (!other.canEqual(this))
+        if (!other.canEqual(this)) {
             return false;
-        Object this$taskId = getTaskId(), other$taskId = other.getTaskId();
-        return !((this$taskId == null) ? (other$taskId != null) : !this$taskId.equals(other$taskId));
+        }
+        return Objects.equals(taskId, other.taskId);
     }
 
     public void setTaskId(String taskId) {

maven-cw-elevator-application/cw-elevator-application-web/src/main/java/cn/cloudwalk/elevator/handler/device/form/AcsRestructureBindingForm.java

@@ -2,6 +2,7 @@ package cn.cloudwalk.elevator.handler.device.form;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Objects;
 
 public class AcsRestructureBindingForm implements Serializable {
     private String parentId;
@@ -41,33 +42,20 @@ public class AcsRestructureBindingForm implements Serializable {
     }
 
     public boolean equals(Object o) {
-        if (o == this)
+        if (o == this) {
             return true;
-        if (!(o instanceof AcsRestructureBindingForm))
+        }
+        if (!(o instanceof AcsRestructureBindingForm)) {
             return false;
+        }
         AcsRestructureBindingForm other = (AcsRestructureBindingForm)o;
-        if (!other.canEqual(this))
+        if (!other.canEqual(this)) {
             return false;
-        Object this$parentId = getParentId(), other$parentId = other.getParentId();
-        if ((this$parentId == null) ? (other$parentId != null) : !this$parentId.equals(other$parentId))
-            return false;
-        Object this$orgId = getOrgId(), other$orgId = other.getOrgId();
-        if ((this$orgId == null) ? (other$orgId != null) : !this$orgId.equals(other$orgId))
-            return false;
-        Object this$orgName = getOrgName(), other$orgName = other.getOrgName();
-        if ((this$orgName == null) ? (other$orgName != null) : !this$orgName.equals(other$orgName))
-            return false;
-        Object this$labelId = getLabelId(), other$labelId = other.getLabelId();
-        if ((this$labelId == null) ? (other$labelId != null) : !this$labelId.equals(other$labelId))
-            return false;
-        Object this$labelName = getLabelName(), other$labelName = other.getLabelName();
-        if ((this$labelName == null) ? (other$labelName != null) : !this$labelName.equals(other$labelName))
-            return false;
-        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$zoneIds = (Object<String>)getZoneIds(), other$zoneIds = (Object<String>)other.getZoneIds();
-        return !((this$zoneIds == null) ? (other$zoneIds != null) : !this$zoneIds.equals(other$zoneIds));
+        }
+        return Objects.equals(parentId, other.parentId) && Objects.equals(orgId, other.orgId)
+            && Objects.equals(orgName, other.orgName) && Objects.equals(labelId, other.labelId)
+            && Objects.equals(labelName, other.labelName) && Objects.equals(personId, other.personId)
+            && Objects.equals(zoneIds, other.zoneIds);
     }
 
     protected boolean canEqual(Object other) {
@@ -75,22 +63,7 @@ public class AcsRestructureBindingForm implements Serializable {
     }
 
     public int hashCode() {
-        int PRIME = 59;
-        result = 1;
-        Object $parentId = getParentId();
-        result = result * 59 + (($parentId == null) ? 43 : $parentId.hashCode());
-        Object $orgId = getOrgId();
-        result = result * 59 + (($orgId == null) ? 43 : $orgId.hashCode());
-        Object $orgName = getOrgName();
-        result = result * 59 + (($orgName == null) ? 43 : $orgName.hashCode());
-        Object $labelId = getLabelId();
-        result = result * 59 + (($labelId == null) ? 43 : $labelId.hashCode());
-        Object $labelName = getLabelName();
-        result = result * 59 + (($labelName == null) ? 43 : $labelName.hashCode());
-        Object $personId = getPersonId();
-        result = result * 59 + (($personId == null) ? 43 : $personId.hashCode());
-        Object<String> $zoneIds = (Object<String>)getZoneIds();
-        return result * 59 + (($zoneIds == null) ? 43 : $zoneIds.hashCode());
+        return Objects.hash(parentId, orgId, orgName, labelId, labelName, personId, zoneIds);
     }
 
     public String toString() {

maven-cw-elevator-application/cw-elevator-application-web/src/main/java/cn/cloudwalk/elevator/handler/device/form/AcsRestructureQueryForm.java

@@ -2,6 +2,7 @@ package cn.cloudwalk.elevator.handler.device.form;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Objects;
 
 public class AcsRestructureQueryForm implements Serializable {
     private String orgId;
@@ -36,31 +37,19 @@ public class AcsRestructureQueryForm implements Serializable {
     }
 
     public boolean equals(Object o) {
-        if (o == this)
+        if (o == this) {
             return true;
-        if (!(o instanceof AcsRestructureQueryForm))
+        }
+        if (!(o instanceof AcsRestructureQueryForm)) {
             return false;
+        }
         AcsRestructureQueryForm other = (AcsRestructureQueryForm)o;
-        if (!other.canEqual(this))
+        if (!other.canEqual(this)) {
             return false;
-        Object this$orgId = getOrgId(), other$orgId = other.getOrgId();
-        if ((this$orgId == null) ? (other$orgId != null) : !this$orgId.equals(other$orgId))
-            return false;
-        Object this$labelId = getLabelId(), other$labelId = other.getLabelId();
-        if ((this$labelId == null) ? (other$labelId != null) : !this$labelId.equals(other$labelId))
-            return false;
-        Object<String> this$labelIds = (Object<String>)getLabelIds(),
-            other$labelIds = (Object<String>)other.getLabelIds();
-        if ((this$labelIds == null) ? (other$labelIds != null) : !this$labelIds.equals(other$labelIds))
-            return false;
-        Object this$personId = getPersonId(), other$personId = other.getPersonId();
-        if ((this$personId == null) ? (other$personId != null) : !this$personId.equals(other$personId))
-            return false;
-        Object this$zoneId = getZoneId(), other$zoneId = other.getZoneId();
-        if ((this$zoneId == null) ? (other$zoneId != null) : !this$zoneId.equals(other$zoneId))
-            return false;
-        Object this$businessId = getBusinessId(), other$businessId = other.getBusinessId();
-        return !((this$businessId == null) ? (other$businessId != null) : !this$businessId.equals(other$businessId));
+        }
+        return Objects.equals(orgId, other.orgId) && Objects.equals(labelId, other.labelId)
+            && Objects.equals(labelIds, other.labelIds) && Objects.equals(personId, other.personId)
+            && Objects.equals(zoneId, other.zoneId) && Objects.equals(businessId, other.businessId);
     }
 
     protected boolean canEqual(Object other) {
@@ -68,20 +57,7 @@ public class AcsRestructureQueryForm implements Serializable {
     }
 
     public int hashCode() {
-        int PRIME = 59;
-        result = 1;
-        Object $orgId = getOrgId();
-        result = result * 59 + (($orgId == null) ? 43 : $orgId.hashCode());
-        Object $labelId = getLabelId();
-        result = result * 59 + (($labelId == null) ? 43 : $labelId.hashCode());
-        Object<String> $labelIds = (Object<String>)getLabelIds();
-        result = result * 59 + (($labelIds == null) ? 43 : $labelIds.hashCode());
-        Object $personId = getPersonId();
-        result = result * 59 + (($personId == null) ? 43 : $personId.hashCode());
-        Object $zoneId = getZoneId();
-        result = result * 59 + (($zoneId == null) ? 43 : $zoneId.hashCode());
-        Object $businessId = getBusinessId();
-        return result * 59 + (($businessId == null) ? 43 : $businessId.hashCode());
+        return Objects.hash(orgId, labelId, labelIds, personId, zoneId, businessId);
     }
 
     public String toString() {

maven-cw-elevator-application/cw-elevator-application-web/src/main/java/cn/cloudwalk/elevator/person/form/AcsPersonAddVisitorForm.java

@@ -2,6 +2,7 @@ package cn.cloudwalk.elevator.person.form;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Objects;
 
 public class AcsPersonAddVisitorForm implements Serializable {
     private static final long serialVersionUID = 7916140658162290825L;
@@ -32,30 +33,19 @@ public class AcsPersonAddVisitorForm implements Serializable {
     }
 
     public boolean equals(Object o) {
-        if (o == this)
+        if (o == this) {
             return true;
-        if (!(o instanceof AcsPersonAddVisitorForm))
+        }
+        if (!(o instanceof AcsPersonAddVisitorForm)) {
             return false;
+        }
         AcsPersonAddVisitorForm other = (AcsPersonAddVisitorForm)o;
-        if (!other.canEqual(this))
+        if (!other.canEqual(this)) {
             return false;
-        Object this$visitorId = getVisitorId(), other$visitorId = other.getVisitorId();
-        if ((this$visitorId == null) ? (other$visitorId != null) : !this$visitorId.equals(other$visitorId))
-            return false;
-        Object this$personId = getPersonId(), other$personId = other.getPersonId();
-        if ((this$personId == null) ? (other$personId != null) : !this$personId.equals(other$personId))
-            return false;
-        Object this$begVisitorTime = getBegVisitorTime(), other$begVisitorTime = other.getBegVisitorTime();
-        if ((this$begVisitorTime == null) ? (other$begVisitorTime != null)
-            : !this$begVisitorTime.equals(other$begVisitorTime))
-            return false;
-        Object this$endVisitorTime = getEndVisitorTime(), other$endVisitorTime = other.getEndVisitorTime();
-        if ((this$endVisitorTime == null) ? (other$endVisitorTime != null)
-            : !this$endVisitorTime.equals(other$endVisitorTime))
-            return false;
-        Object<String> this$floorIds = (Object<String>)getFloorIds(),
-            other$floorIds = (Object<String>)other.getFloorIds();
-        return !((this$floorIds == null) ? (other$floorIds != null) : !this$floorIds.equals(other$floorIds));
+        }
+        return Objects.equals(visitorId, other.visitorId) && Objects.equals(personId, other.personId)
+            && Objects.equals(begVisitorTime, other.begVisitorTime) && Objects.equals(endVisitorTime, other.endVisitorTime)
+            && Objects.equals(floorIds, other.floorIds);
     }
 
     protected boolean canEqual(Object other) {
@@ -63,18 +53,7 @@ public class AcsPersonAddVisitorForm implements Serializable {
     }
 
     public int hashCode() {
-        int PRIME = 59;
-        result = 1;
-        Object $visitorId = getVisitorId();
-        result = result * 59 + (($visitorId == null) ? 43 : $visitorId.hashCode());
-        Object $personId = getPersonId();
-        result = result * 59 + (($personId == null) ? 43 : $personId.hashCode());
-        Object $begVisitorTime = getBegVisitorTime();
-        result = result * 59 + (($begVisitorTime == null) ? 43 : $begVisitorTime.hashCode());
-        Object $endVisitorTime = getEndVisitorTime();
-        result = result * 59 + (($endVisitorTime == null) ? 43 : $endVisitorTime.hashCode());
-        Object<String> $floorIds = (Object<String>)getFloorIds();
-        return result * 59 + (($floorIds == null) ? 43 : $floorIds.hashCode());
+        return Objects.hash(visitorId, personId, begVisitorTime, endVisitorTime, floorIds);
     }
 
     public String toString() {

maven-cw-elevator-application/cw-elevator-application-web/src/main/java/cn/cloudwalk/elevator/person/form/AcsPersonQueryForm.java

@@ -2,6 +2,7 @@ package cn.cloudwalk.elevator.person.form;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Objects;
 
 public class AcsPersonQueryForm implements Serializable {
     private static final long serialVersionUID = -8830219133147503297L;
@@ -40,36 +41,20 @@ public class AcsPersonQueryForm implements Serializable {
     }
 
     public boolean equals(Object o) {
-        if (o == this)
+        if (o == this) {
             return true;
-        if (!(o instanceof AcsPersonQueryForm))
+        }
+        if (!(o instanceof AcsPersonQueryForm)) {
             return false;
+        }
         AcsPersonQueryForm other = (AcsPersonQueryForm)o;
-        if (!other.canEqual(this))
+        if (!other.canEqual(this)) {
             return false;
-        Object this$parentId = getParentId(), other$parentId = other.getParentId();
-        if ((this$parentId == null) ? (other$parentId != null) : !this$parentId.equals(other$parentId))
-            return false;
-        Object this$zoneId = getZoneId(), other$zoneId = other.getZoneId();
-        if ((this$zoneId == null) ? (other$zoneId != null) : !this$zoneId.equals(other$zoneId))
-            return false;
-        Object this$personName = getPersonName(), other$personName = other.getPersonName();
-        if ((this$personName == null) ? (other$personName != null) : !this$personName.equals(other$personName))
-            return false;
-        Object<String> this$organizationIds = (Object<String>)getOrganizationIds(),
-            other$organizationIds = (Object<String>)other.getOrganizationIds();
-        if ((this$organizationIds == null) ? (other$organizationIds != null)
-            : !this$organizationIds.equals(other$organizationIds))
-            return false;
-        Object<String> this$labelIds = (Object<String>)getLabelIds(),
-            other$labelIds = (Object<String>)other.getLabelIds();
-        if ((this$labelIds == null) ? (other$labelIds != null) : !this$labelIds.equals(other$labelIds))
-            return false;
-        Object this$pageSize = getPageSize(), other$pageSize = other.getPageSize();
-        if ((this$pageSize == null) ? (other$pageSize != null) : !this$pageSize.equals(other$pageSize))
-            return false;
-        Object this$pageNo = getPageNo(), other$pageNo = other.getPageNo();
-        return !((this$pageNo == null) ? (other$pageNo != null) : !this$pageNo.equals(other$pageNo));
+        }
+        return Objects.equals(parentId, other.parentId) && Objects.equals(zoneId, other.zoneId)
+            && Objects.equals(personName, other.personName) && Objects.equals(organizationIds, other.organizationIds)
+            && Objects.equals(labelIds, other.labelIds) && Objects.equals(pageSize, other.pageSize)
+            && Objects.equals(pageNo, other.pageNo);
     }
 
     protected boolean canEqual(Object other) {
@@ -77,22 +62,7 @@ public class AcsPersonQueryForm implements Serializable {
     }
 
     public int hashCode() {
-        int PRIME = 59;
-        result = 1;
-        Object $parentId = getParentId();
-        result = result * 59 + (($parentId == null) ? 43 : $parentId.hashCode());
-        Object $zoneId = getZoneId();
-        result = result * 59 + (($zoneId == null) ? 43 : $zoneId.hashCode());
-        Object $personName = getPersonName();
-        result = result * 59 + (($personName == null) ? 43 : $personName.hashCode());
-        Object<String> $organizationIds = (Object<String>)getOrganizationIds();
-        result = result * 59 + (($organizationIds == null) ? 43 : $organizationIds.hashCode());
-        Object<String> $labelIds = (Object<String>)getLabelIds();
-        result = result * 59 + (($labelIds == null) ? 43 : $labelIds.hashCode());
-        Object $pageSize = getPageSize();
-        result = result * 59 + (($pageSize == null) ? 43 : $pageSize.hashCode());
-        Object $pageNo = getPageNo();
-        return result * 59 + (($pageNo == null) ? 43 : $pageNo.hashCode());
+        return Objects.hash(parentId, zoneId, personName, organizationIds, labelIds, pageSize, pageNo);
     }
 
     public String toString() {

maven-cw-elevator-application/cw-elevator-application-web/src/main/java/cn/cloudwalk/elevator/person/form/PersonDetailQueryForm.java

@@ -2,6 +2,7 @@ package cn.cloudwalk.elevator.person.form;
 
 import cn.cloudwalk.cloud.page.CloudwalkBasePageForm;
 import java.io.Serializable;
+import java.util.Objects;
 
 public class PersonDetailQueryForm extends CloudwalkBasePageForm implements Serializable {
     private static final long serialVersionUID = -8830219133147503297L;
@@ -27,24 +28,18 @@ public class PersonDetailQueryForm extends CloudwalkBasePageForm implements Seri
     }
 
     public boolean equals(Object o) {
-        if (o == this)
+        if (o == this) {
             return true;
-        if (!(o instanceof PersonDetailQueryForm))
+        }
+        if (!(o instanceof PersonDetailQueryForm)) {
             return false;
+        }
         PersonDetailQueryForm other = (PersonDetailQueryForm)o;
-        if (!other.canEqual(this))
+        if (!other.canEqual(this)) {
             return false;
-        Object this$parentId = getParentId(), other$parentId = other.getParentId();
-        if ((this$parentId == null) ? (other$parentId != null) : !this$parentId.equals(other$parentId))
-            return false;
-        Object this$zoneId = getZoneId(), other$zoneId = other.getZoneId();
-        if ((this$zoneId == null) ? (other$zoneId != null) : !this$zoneId.equals(other$zoneId))
-            return false;
-        Object this$ruleId = getRuleId(), other$ruleId = other.getRuleId();
-        if ((this$ruleId == null) ? (other$ruleId != null) : !this$ruleId.equals(other$ruleId))
-            return false;
-        Object this$personName = getPersonName(), other$personName = other.getPersonName();
-        return !((this$personName == null) ? (other$personName != null) : !this$personName.equals(other$personName));
+        }
+        return Objects.equals(parentId, other.parentId) && Objects.equals(zoneId, other.zoneId)
+            && Objects.equals(ruleId, other.ruleId) && Objects.equals(personName, other.personName);
     }
 
     protected boolean canEqual(Object other) {
@@ -52,16 +47,7 @@ public class PersonDetailQueryForm extends CloudwalkBasePageForm implements Seri
     }
 
     public int hashCode() {
-        int PRIME = 59;
-        result = 1;
-        Object $parentId = getParentId();
-        result = result * 59 + (($parentId == null) ? 43 : $parentId.hashCode());
-        Object $zoneId = getZoneId();
-        result = result * 59 + (($zoneId == null) ? 43 : $zoneId.hashCode());
-        Object $ruleId = getRuleId();
-        result = result * 59 + (($ruleId == null) ? 43 : $ruleId.hashCode());
-        Object $personName = getPersonName();
-        return result * 59 + (($personName == null) ? 43 : $personName.hashCode());
+        return Objects.hash(parentId, zoneId, ruleId, personName);
     }
 
     public String toString() {