浏览代码

添加空间多楼层统计接口

zhangqiankun 3 年之前
父节点
当前提交
73aa4d3b13

+ 45 - 0
src/main/java/com/persagy/proxy/adm/controller/AdmSpaceInfoController.java

@@ -0,0 +1,45 @@
+package com.persagy.proxy.adm.controller;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.persagy.proxy.adm.constant.AdmCommonConstant;
+import com.persagy.proxy.adm.request.AdmResponse;
+
+import lombok.RequiredArgsConstructor;
+
+/**
+ * 
+ * @version 1.0.0
+ * @company persagy
+ * @author zhangqiankun
+ * @date 2021年10月18日 上午10:55:24
+ */
+@RestController
+@RequiredArgsConstructor
+public class AdmSpaceInfoController {
+
+	public static final String EXPORT_SHEET_NAME = "关系维护";
+
+	@Value("${middleware.group.code}")
+	private String defaultCode;
+
+	/**
+	 * 统计 属于多建筑楼层的空间
+	 * 
+	 * @param request
+	 * @return
+	 */
+	@RequestMapping("/space/space-bd-fl")
+	public AdmResponse queryCount(HttpServletRequest request) {
+		String groupCode = request.getHeader(AdmCommonConstant.GROUP_CODE_HEADER);
+		String projectId = request.getHeader(AdmCommonConstant.PROJECT_ID_HEADER);
+		AdmResponse response = AdmResponse.success();
+		response.setCount(0L);
+		return response;
+	}
+
+}

+ 0 - 1
src/main/java/com/persagy/proxy/adm/controller/RelationReportController.java

@@ -77,7 +77,6 @@ public class RelationReportController {
 	
 	private final IRelationReportService relationReportService;
 	
-	
 	/**
 	 * 查询总数量
 	 * 

+ 1 - 1
src/main/java/com/persagy/proxy/adm/service/impl/RelationReportService.java

@@ -719,7 +719,7 @@ public class RelationReportService implements IRelationReportService {
 		result.put("relationTypeName",relationProject.has("relCodeName")?relationProject.get("relCodeName").asText():null);
 		result.put("source", relationProject.has("sourceFlag") && relationProject.get("sourceFlag").asBoolean());
 		result.put("automatic", relationProject.has("automaticFlag") && relationProject.get("automaticFlag").asBoolean());
-		result.put("mepSystemType", relationProject.has("mepSystemType") ? new JSONArray() : relationProject.get("mepSystemType").asText());
+		result.put("mepSystemType", relationProject.has("mepSystemType") ? relationProject.get("mepSystemType").asText() : new JSONArray());
 		
 		Long modifiedTime = relationProject.get("modifiedTime") == null ? null : relationProject.get("modifiedTime").asLong();
 		Long creationTime = relationProject.get("creationTime") == null ? null : relationProject.get("creationTime").asLong();