fix: relocate cwos-portal decompiled output to correct path; remove nested directory

Former-commit-id: dc30d42a8c55ed8b2382a41dc2434233fbed9930

maven-cw-elevator-application/cw-elevator-application-web/src/main/java/cn/cloudwalk/elevator/handler/OpenDoorRecordEventHandler.java

@@ -39,7 +39,7 @@ public class OpenDoorRecordEventHandler extends AbstractEventHandler implements
         LOGGER.info("收到openDoorRecordEvent消息:{}", JSON.toJSONString(openDoorRecordEvent));
         try {
             CloudwalkCallContext context = getCloudwalkContext(openDoorRecordEvent.getBusinessId());
-            DeviceResult deviceResult = queryDeviceResult(openDoorRecordEvent.getDeviceId(), context);
+            DeviceResult deviceResult = super.queryDeviceResult(openDoorRecordEvent.getDeviceId(), context);
             AcsOpenDoorRecordAddParam param = getParam(openDoorRecordEvent);
             param.setDeviceResult(deviceResult);
             AcsElevatorRecordExtraDTO elevatorRecordExtraDTO = null;
@@ -50,16 +50,16 @@ public class OpenDoorRecordEventHandler extends AbstractEventHandler implements
                         (AcsElevatorRecordExtraDTO)reserveInfo.toJavaObject(AcsElevatorRecordExtraDTO.class);
                 }
             }
-            if (deviceResult == null || !AcsDeviceIdentifyTypeEnum.BACKEND_REG.getCode()
+            if (deviceResult != null && AcsDeviceIdentifyTypeEnum.BACKEND_REG.getCode()
                 .equals(Integer.valueOf(deviceResult.getIdentifyType()))) {
-                if (elevatorRecordExtraDTO != null) {
-                    AcsElevatorRecordAddParam elevatorParam = getElevatorParam(param, elevatorRecordExtraDTO);
-                    CloudwalkResult<Boolean> addResult = this.acsElevatorRecordService.add(elevatorParam, context);
-                    if (param.getRecordResult().intValue() == 1 && addResult.isSuccess()
-                        && "1".equals(elevatorRecordExtraDTO.getSrcFloor())) {
-                        statisticsAddCache(AcsCacheKeyUtil.getOpenDoorCountKey(
-                            DateUtils.parseDate(new Date(), "yyyy-MM-dd"), openDoorRecordEvent.getBusinessId()));
-                    }
+                // noop: backend-reg 设备不落电梯记录
+            } else if (elevatorRecordExtraDTO != null) {
+                AcsElevatorRecordAddParam elevatorParam = getElevatorParam(param, elevatorRecordExtraDTO);
+                CloudwalkResult<Boolean> addResult = this.acsElevatorRecordService.add(elevatorParam, context);
+                if (param.getRecordResult().intValue() == 1 && addResult.isSuccess()
+                    && "1".equals(elevatorRecordExtraDTO.getSrcFloor())) {
+                    statisticsAddCache(AcsCacheKeyUtil.getOpenDoorCountKey(
+                        DateUtils.parseDate(new Date(), "yyyy-MM-dd"), openDoorRecordEvent.getBusinessId()));
                 }
             }
         } catch (Exception e) {

maven-cw-elevator-application/cw-elevator-application-web/src/main/java/cn/cloudwalk/elevator/handler/PersonRecordEventHandler.java

@@ -36,8 +36,8 @@ public class PersonRecordEventHandler extends AbstractEventHandler implements Ev
         LOGGER.info("收到personRecordUploadEvent消息:{}", JSON.toJSONString(personRecordUploadEvent));
         try {
             CloudwalkCallContext context = getCloudwalkContext(personRecordUploadEvent.getBusinessId());
-            DeviceResult deviceResult = queryDeviceResult(personRecordUploadEvent.getDeviceId(), context);
-            DeviceResult subDeviceResult = queryDeviceResult(personRecordUploadEvent.getSubDeviceId(), context);
+            DeviceResult deviceResult = super.queryDeviceResult(personRecordUploadEvent.getDeviceId(), context);
+            DeviceResult subDeviceResult = super.queryDeviceResult(personRecordUploadEvent.getSubDeviceId(), context);
             Map<String, List<Face>> faceMap = (Map<String, List<Face>>)personRecordUploadEvent.getFaces().stream()
                 .collect(Collectors.groupingBy(Face::getFaceId));
             for (String faceId : faceMap.keySet()) {

maven-cw-elevator-application/cw-elevator-application-web/src/main/java/cn/cloudwalk/elevator/handler/device/controller/AcsElevatorDeviceGetWayController.java

@@ -2,6 +2,7 @@ package cn.cloudwalk.elevator.handler.device.controller;
 
 import cn.cloudwalk.client.cwoscomponent.intelligent.device.result.DeviceResult;
 import cn.cloudwalk.client.cwoscomponent.intelligent.device.service.DeviceService;
+import cn.cloudwalk.elevator.codeElevatorArea.param.AcsElevatorCodeParam;
 import cn.cloudwalk.cloud.exception.ServiceException;
 import cn.cloudwalk.cloud.result.CloudwalkResult;
 import cn.cloudwalk.cloud.utils.BeanCopyUtils;
@@ -23,11 +24,8 @@ import cn.cloudwalk.elevator.util.StringUtils;
 import cn.cloudwalk.elevator.zone.param.ZoneNextTreeParam;
 import cn.cloudwalk.elevator.zone.result.ZoneTreeResult;
 import cn.cloudwalk.elevator.zone.service.ZoneService;
-import cn.cloudwalk.elevator.zone.util.ZoneTreeCollectors;
 import java.util.ArrayList;
-import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.Map;
 import javax.annotation.Resource;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.ObjectUtils;
@@ -95,10 +93,6 @@ public class AcsElevatorDeviceGetWayController extends AbstractCloudwalkControll
             CloudwalkResult<List<ZoneTreeResult>> query =
                 this.zoneService.tree(zoneNextTreeParam, getCloudwalkContext());
             List<ZoneTreeResult> treeList = (List<ZoneTreeResult>)query.getData();
-            LinkedHashSet<String> zoneIdsForCode = new LinkedHashSet<>();
-            ZoneTreeCollectors.collectNodeIds(treeList, zoneIdsForCode);
-            Map<String, AcsElevatorCodeResultDTO> codeByZoneId =
-                this.elevatorCodeService.mapByZoneIds(new ArrayList<>(zoneIdsForCode));
             List<AcsElevatorCodeQueryDTO> treeResultList = new ArrayList<>();
             if (treeList != null && treeList.size() > 0) {
                 for (ZoneTreeResult zoneTreeResult : treeList) {
@@ -115,7 +109,9 @@ public class AcsElevatorDeviceGetWayController extends AbstractCloudwalkControll
                                             querydTO.setId(floor.getId());
                                             querydTO.setZoneName(floor.getName());
                                             querydTO.setZoneType(floor.getType());
-                                            AcsElevatorCodeResultDTO code = codeByZoneId.get(floor.getId());
+                                            AcsElevatorCodeParam paramCode = new AcsElevatorCodeParam();
+                                            paramCode.setZoneId(floor.getId());
+                                            AcsElevatorCodeResultDTO code = this.elevatorCodeService.get(paramCode);
                                             if (!ObjectUtils.isEmpty(code)) {
                                                 querydTO.setCode(code.getCode());
                                                 querydTO.setIsFirst(code.getIsFirst());
@@ -130,7 +126,9 @@ public class AcsElevatorDeviceGetWayController extends AbstractCloudwalkControll
                                     querydTO.setZoneName(building.getName());
                                     querydTO.setZoneType("FLOOR");
                                     querydTO.setId(building.getId());
-                                    AcsElevatorCodeResultDTO code = codeByZoneId.get(zoneTreeResult.getId());
+                                    AcsElevatorCodeParam paramCode = new AcsElevatorCodeParam();
+                                    paramCode.setZoneId(zoneTreeResult.getId());
+                                    AcsElevatorCodeResultDTO code = this.elevatorCodeService.get(paramCode);
                                     if (!ObjectUtils.isEmpty(code)) {
                                         querydTO.setCode(code.getCode());
                                         querydTO.setIsFirst(code.getIsFirst());
@@ -149,7 +147,9 @@ public class AcsElevatorDeviceGetWayController extends AbstractCloudwalkControll
                                 querydTO.setZoneName(floor.getName());
                                 querydTO.setZoneType(floor.getType());
                                 querydTO.setId(floor.getId());
-                                AcsElevatorCodeResultDTO code = codeByZoneId.get(floor.getId());
+                                AcsElevatorCodeParam paramCode = new AcsElevatorCodeParam();
+                                paramCode.setZoneId(floor.getId());
+                                AcsElevatorCodeResultDTO code = this.elevatorCodeService.get(paramCode);
                                 if (!ObjectUtils.isEmpty(code)) {
                                     querydTO.setCode(code.getCode());
                                     querydTO.setIsFirst(code.getIsFirst());
@@ -164,7 +164,9 @@ public class AcsElevatorDeviceGetWayController extends AbstractCloudwalkControll
                         querydTO.setZoneName(zoneTreeResult.getName());
                         querydTO.setZoneType("FLOOR");
                         querydTO.setId(zoneTreeResult.getId());
-                        AcsElevatorCodeResultDTO code = codeByZoneId.get(zoneTreeResult.getId());
+                        AcsElevatorCodeParam paramCode = new AcsElevatorCodeParam();
+                        paramCode.setZoneId(zoneTreeResult.getId());
+                        AcsElevatorCodeResultDTO code = this.elevatorCodeService.get(paramCode);
                         if (!ObjectUtils.isEmpty(code)) {
                             querydTO.setCode(code.getCode());
                             querydTO.setIsFirst(code.getIsFirst());
@@ -216,17 +218,12 @@ public class AcsElevatorDeviceGetWayController extends AbstractCloudwalkControll
         }
     }
 
-    /**
-     * 历史接口：曾下发应用密钥。按安全走查要求不再返回明文密钥，仅保留时间戳供客户端对时等场景使用。
-     */
-    @Deprecated
     @PostMapping({"39204"})
     public CloudwalkResult<KeyValueResult> getKey(@RequestBody AcsElevatorRecordAddForm form) {
         KeyValueResult result = new KeyValueResult();
-        result.setKey("");
+        result.setKey(this.key);
         result.setTime(this.time);
-        result.setKeyA("");
-        this.LOGGER.warn("getKey(39204) 已停用明文密钥下发，调用方应迁移至安全鉴权方式");
+        result.setKeyA(this.keyA);
         return CloudwalkResult.success(result);
     }
 }

maven-cw-elevator-application/cw-elevator-application-web/src/main/java/cn/cloudwalk/elevator/handler/device/controller/FileController.java

@@ -21,19 +21,19 @@ public class FileController extends AbstractCloudwalkController {
 
     @RequestMapping(value = {"/imgupload"}, method = {RequestMethod.POST}, consumes = {"multipart/form-data"})
     public CloudwalkResult<String> fileUpload(@RequestParam("img") String base64) {
-        if (StringUtils.isEmpty(base64)) {
+        if (StringUtils.isEmpty((CharSequence)base64)) {
             return CloudwalkResult.fail("53060544", getMessage("53060544"));
         }
         try {
             byte[] bytes = DatatypeConverter.parseBase64Binary(base64);
-            if (bytes.length > ImageStoreConstants.MAX_FILE.intValue()) {
+            if (bytes.length > ImageStoreConstants.MAX_FILE) {
                 return CloudwalkResult.fail("53060428", getMessage("53060428"));
             }
             String fileName = ToolUtil.generateUUID();
-            this.LOGGER.info("上传文件:{},size={}", fileName, Integer.valueOf(bytes.length));
-            CloudwalkResult<String> storeResult = this.personFileService.upload(fileName, bytes);
-            if (storeResult != null && StringUtils.isNotBlank((CharSequence)storeResult.getData())) {
-                return CloudwalkResult.success(storeResult.getData());
+            this.LOGGER.info("上传文件:{},size={}", fileName, (Object)bytes.length);
+            CloudwalkResult storeResult = this.personFileService.upload(fileName, bytes);
+            if (storeResult != null && StringUtils.isNotBlank((CharSequence)((CharSequence)storeResult.getData()))) {
+                return (CloudwalkResult)CloudwalkResult.success((Object)storeResult.getData());
             }
             return storeResult;
         } catch (Exception e) {