Sfoglia il codice sorgente

Merge remote-tracking branch 'origin/develop' into develop

lijie 3 anni fa
parent
commit
049b42bce5

+ 3 - 1
src/main/java/com/persagy/proxy/adm/constant/SpaceTypeEnum.java

@@ -28,7 +28,9 @@ public enum SpaceTypeEnum {
 	PassengerFlowZone("PassengerFlowZone", "客流分区"),
 	EvacuateZone("EvacuateZone", "疏散分区"),
 	EnvironmentZone("EnvironmentZone", "环境分区"),
-	OtherZone("OtherZone", "其他分区");
+	OtherZone("OtherZone", "其他分区"),
+	MajorOperationZone("MajorOperationZone", "主要功能区"),
+	ParkingZone("ParkingZone", "停车分区");
 
 	private String code;
     private String desc;

+ 0 - 38
src/main/java/com/persagy/proxy/object/controller/AdmEquipmentController.java

@@ -15,7 +15,6 @@ import cn.hutool.poi.excel.WorkbookUtil;
 import cn.hutool.poi.excel.cell.CellUtil;
 import cn.hutool.poi.excel.editors.TrimEditor;
 import com.alibaba.excel.EasyExcel;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.dto.RequestData;
 import com.persagy.dmp.basic.model.QueryCriteria;
@@ -186,43 +185,6 @@ public class AdmEquipmentController {
 		if(CollUtil.isEmpty(vos)) {
 			return AdmResponse.success(vos);
 		}
-		for(AdmEquipment vo:vos) {
-			if(StrUtil.isNotBlank(vo.getFlowBuild())) {
-				// 处理建筑-楼层信息点
-				List<String> flows = StrUtil.splitTrim(vo.getFlowBuild(), "-");
-				for(String flow:flows) {
-					if(StrUtil.startWith(flow, "Bd")) {
-						vo.setBuildingId(flow);
-					} else if(StrUtil.startWith(flow, "fl")) {
-						vo.setFloorId(flow);
-					}
-				}
-				vo.setFlowBuild(null);
-			}
-			// 设置remove信息
-			Set<String> nullList = CollUtil.newHashSet();
-			CollUtil.addAll(nullList, vo.getNullList());
-			if(StrUtil.isBlank(vo.getFloorId())) {
-				nullList.add("floorId");
-			}
-			if(StrUtil.isBlank(vo.getBuildingId())) {
-				nullList.add("buildingId");
-			}
-			vo.setNullList(CollUtil.newArrayList(nullList));
-			//特殊处理位置信息
-			Map<String,Object> infos = vo.getInfos();
-			if(infos == null) {
-				infos = new HashMap<String, Object>();
-				vo.setInfos(infos);
-			}
-			if(StrUtil.isNotEmpty(vo.getBimLocation())){
-				infos.put("bimLocation", vo.getBimLocation());
-			}
-			String localId = MapUtil.getStr(infos, "localId");
-			if(StrUtil.isNotEmpty(localId)){
-				vo.setLocalId(localId);
-			}
-		}
 		vos = service.doUpdate(AdmContextUtil.toDmpContext(), AdmEquipment.class, vos);
 		return AdmResponse.success(vos);
 	}