Browse Source

清理所有middleware.group.code的使用。
解决香港置地关系导入到博锐科技问题,并避免其他类似问题。

yucheng 3 years ago
parent
commit
1271ae6581
41 changed files with 114 additions and 316 deletions
  1. 0 2
      src/main/java/com/persagy/proxy/adm/constant/AdmCommonConstant.java
  2. 6 16
      src/main/java/com/persagy/proxy/adm/handler/RelationReportHandler.java
  3. 10 18
      src/main/java/com/persagy/proxy/adm/handler/SpaceRelationInfoHandler.java
  4. 0 2
      src/main/java/com/persagy/proxy/calculation/controller/AdmManualRelCalController.java
  5. 0 3
      src/main/java/com/persagy/proxy/calculation/controller/AdmMepSystemCalcController.java
  6. 0 4
      src/main/java/com/persagy/proxy/calculation/controller/AdmModelRelController.java
  7. 4 24
      src/main/java/com/persagy/proxy/dictionary/controller/AdmLabslController.java
  8. 0 2
      src/main/java/com/persagy/proxy/dictionary/controller/AdmModelController.java
  9. 0 3
      src/main/java/com/persagy/proxy/dictionary/controller/AdmPlanarController.java
  10. 5 9
      src/main/java/com/persagy/proxy/dictionary/service/impl/AbstractAdmDictBaseServiceImpl.java
  11. 0 2
      src/main/java/com/persagy/proxy/object/controller/AdmDoorController.java
  12. 0 3
      src/main/java/com/persagy/proxy/object/controller/AdmLocationPointController.java
  13. 3 13
      src/main/java/com/persagy/proxy/object/controller/AdmProjectController.java
  14. 0 2
      src/main/java/com/persagy/proxy/object/controller/AdmVirtualWallController.java
  15. 0 3
      src/main/java/com/persagy/proxy/object/controller/AdmWindowController.java
  16. 0 3
      src/main/java/com/persagy/proxy/relation/controller/RelationEqForBdController.java
  17. 0 3
      src/main/java/com/persagy/proxy/relation/controller/RelationEqForFlController.java
  18. 0 3
      src/main/java/com/persagy/proxy/relation/controller/RelationEqForShController.java
  19. 0 2
      src/main/java/com/persagy/proxy/relation/controller/RelationEqForSpConreoller.java
  20. 0 2
      src/main/java/com/persagy/proxy/relation/controller/RelationEqInShController.java
  21. 0 2
      src/main/java/com/persagy/proxy/relation/controller/RelationEqInSpController.java
  22. 0 3
      src/main/java/com/persagy/proxy/relation/controller/RelationFlAndBuController.java
  23. 0 3
      src/main/java/com/persagy/proxy/relation/controller/RelationShContainSpBaseController.java
  24. 0 3
      src/main/java/com/persagy/proxy/relation/controller/RelationShaftThroughShaftController.java
  25. 0 2
      src/main/java/com/persagy/proxy/relation/controller/RelationSpInBdOrFlController.java
  26. 0 3
      src/main/java/com/persagy/proxy/relation/controller/RelationSpInSiController.java
  27. 4 4
      src/main/java/com/persagy/proxy/relation/controller/RelationSpaceConnectionController.java
  28. 0 3
      src/main/java/com/persagy/proxy/relation/controller/RelationSyEqController.java
  29. 0 2
      src/main/java/com/persagy/proxy/relation/controller/RelationSyForBdController.java
  30. 0 2
      src/main/java/com/persagy/proxy/relation/controller/RelationSyForFlController.java
  31. 0 3
      src/main/java/com/persagy/proxy/relation/controller/RelationSyForShController.java
  32. 3 8
      src/main/java/com/persagy/proxy/relation/controller/RelationSyForSpController.java
  33. 0 3
      src/main/java/com/persagy/proxy/relation/controller/RelationSyInBdController.java
  34. 0 3
      src/main/java/com/persagy/proxy/relation/controller/RelationSyInShController.java
  35. 0 3
      src/main/java/com/persagy/proxy/relation/controller/RelationSyInSpController.java
  36. 0 3
      src/main/java/com/persagy/proxy/relation/controller/RelationTnInSpController.java
  37. 0 3
      src/main/java/com/persagy/proxy/report/controller/AdmRelationController.java
  38. 2 6
      src/main/java/com/persagy/proxy/report/controller/AdmRelationObjectController.java
  39. 12 18
      src/main/java/com/persagy/proxy/report/controller/ComponentStatisticsController.java
  40. 51 65
      src/main/java/com/persagy/proxy/report/controller/RelationReportController.java
  41. 14 55
      src/main/java/com/persagy/proxy/report/service/impl/RelationReportService.java

+ 0 - 2
src/main/java/com/persagy/proxy/adm/constant/AdmCommonConstant.java

@@ -63,8 +63,6 @@ public interface AdmCommonConstant {
 
     /** 楼层标高 */
     String FLOOR_ELEVATION = "floorElevation";
-    /** 集团编码的code */
-    String MIDDLEWARE_GROUP_CODE = "middleware.group.code";
     
     /** 识别码类型 */
 	Map<String, String> codeColMap = new HashMap<String,String>(){

+ 6 - 16
src/main/java/com/persagy/proxy/adm/handler/RelationReportHandler.java

@@ -1,11 +1,8 @@
 package com.persagy.proxy.adm.handler;
 
-import java.util.*;
-
 import cn.hutool.core.collection.CollUtil;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -19,15 +16,15 @@ import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmObjectType;
 import com.persagy.proxy.adm.constant.GraphCodeEnum;
 import com.persagy.proxy.adm.constant.RelCodeEnum;
+import com.persagy.proxy.adm.strategy.RelationObjectContext;
 import com.persagy.proxy.report.model.EquipmentBindPointExcel;
 import com.persagy.proxy.report.model.EquipmentCountExcel;
 import com.persagy.proxy.report.model.EquipmentExcel;
 import com.persagy.proxy.report.service.IRelationReportService;
-import com.persagy.proxy.adm.strategy.RelationObjectContext;
-
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.StrUtil;
 import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
 
 /**
  * 
@@ -39,9 +36,6 @@ import lombok.RequiredArgsConstructor;
 @Component
 @RequiredArgsConstructor
 public class RelationReportHandler {
-	
-	@Value("${middleware.group.code}")
-	private String defaultCode;
 
 	private final RelationObjectContext relationObjectContext;
 	
@@ -54,7 +48,6 @@ public class RelationReportHandler {
 	 * @param projectId
 	 */
 	public List<EquipmentExcel> findEquipByNotSpace(String groupCode, String projectId) {
-		groupCode = StrUtil.isBlank(groupCode) ? defaultCode : groupCode;
 		String equipment = AdmObjectType.EQUIPMENT.getIndex();
 		HashSet<String> equipments = Sets.newHashSet(equipment);
 		
@@ -93,7 +86,6 @@ public class RelationReportHandler {
 	 * @return
 	 */
 	public List<EquipmentBindPointExcel> queryProjectBindPoint(String groupCode, String projectId) {
-		groupCode = StrUtil.isBlank(groupCode) ? defaultCode : groupCode;
 		String equipment = AdmObjectType.EQUIPMENT.getIndex();
 		
 		List<OrderItem> classCodeAsc = Arrays.asList(OrderItem.asc("classCode"));
@@ -139,7 +131,6 @@ public class RelationReportHandler {
 	 * @return
 	 */
 	public List<EquipmentCountExcel> countClassCodeEquip(String groupCode, String projectId) {
-		groupCode = StrUtil.isBlank(groupCode) ? defaultCode : groupCode;
 		String equipment = AdmObjectType.EQUIPMENT.getIndex();
 		
 		List<OrderItem> classCodeAsc = Collections.singletonList(OrderItem.asc("classCode"));
@@ -538,7 +529,6 @@ public class RelationReportHandler {
 	 * 获取建筑的名称
 	 * 
 	 * @param buildNameTemp key: 设备ID,value: 建筑名称
-	 * @param buildIdTemp key: 设备ID,value: 建筑ID
 	 * @param groupCode
 	 * @param projectId
 	 */

+ 10 - 18
src/main/java/com/persagy/proxy/adm/handler/SpaceRelationInfoHandler.java

@@ -1,13 +1,8 @@
 package com.persagy.proxy.adm.handler;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -23,13 +18,15 @@ import com.persagy.proxy.adm.constant.AdmObjectType;
 import com.persagy.proxy.adm.constant.GraphCodeEnum;
 import com.persagy.proxy.adm.constant.RelCodeEnum;
 import com.persagy.proxy.adm.request.AdmDCSQueryRequest;
-import com.persagy.proxy.report.service.IRelationReportService;
 import com.persagy.proxy.adm.strategy.RelationObjectContext;
-
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.util.StrUtil;
+import com.persagy.proxy.report.service.IRelationReportService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 /**
  * 
@@ -41,9 +38,6 @@ import lombok.RequiredArgsConstructor;
 @Component
 @RequiredArgsConstructor
 public class SpaceRelationInfoHandler {
-	
-	@Value("${middleware.group.code}")
-	private String defaultCode;
 
 	private final RelationObjectContext relationObjectContext;
 	
@@ -109,9 +103,7 @@ public class SpaceRelationInfoHandler {
 	
 	/**
 	 * 获取空间信息,当楼层ID为空,建筑ID不为空时
-	 * 
 	 * @param request
-	 * @param criteria
 	 * @param groupCode
 	 * @param projectId
 	 * @param buildingId

+ 0 - 2
src/main/java/com/persagy/proxy/calculation/controller/AdmManualRelCalController.java

@@ -27,8 +27,6 @@ import org.springframework.web.bind.annotation.RestController;
 public class AdmManualRelCalController {
 
     private final AdmManualRelCalService relationCalcService;
-    @Value("${middleware.group.code}")
-    private String groupCode;
     
     /***
      * Description: 添加关系

+ 0 - 3
src/main/java/com/persagy/proxy/calculation/controller/AdmMepSystemCalcController.java

@@ -24,9 +24,6 @@ public class AdmMepSystemCalcController {
 
     private final AdmMepSystemCalcService admMepSystemCalcService;
 
-    @Value("${middleware.group.code}")
-    private String groupCode;
-
     /***
      * Description: 添加源端设备类型
      * @param request : 请求参数

+ 0 - 4
src/main/java/com/persagy/proxy/calculation/controller/AdmModelRelController.java

@@ -26,10 +26,6 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 public class AdmModelRelController {
 
-    @Value("${middleware.group.code}")
-    private String groupCode;
-
-
     @Autowired
     private IAdmModelRelService service;
 

+ 4 - 24
src/main/java/com/persagy/proxy/dictionary/controller/AdmLabslController.java

@@ -6,20 +6,19 @@ import cn.hutool.core.util.StrUtil;
 import com.persagy.proxy.adm.constant.AdmDictCategoryEnum;
 import com.persagy.proxy.adm.request.AdmDictQueryCriteria;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
+import com.persagy.proxy.adm.request.AdmResponse;
+import com.persagy.proxy.adm.utils.AdmContextUtil;
+import com.persagy.proxy.common.entity.InstanceUrlParam;
 import com.persagy.proxy.dictionary.model.AdmDict;
+import com.persagy.proxy.dictionary.model.AdmObjectType;
 import com.persagy.proxy.dictionary.service.IAdmDictService;
 import com.persagy.proxy.object.model.AdmEquipment;
 import com.persagy.proxy.object.model.AdmObjectInfo;
-import com.persagy.proxy.dictionary.model.AdmObjectType;
-import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.object.service.IAdmEquipmentService;
 import com.persagy.proxy.report.service.IAdmLabslService;
-import com.persagy.proxy.adm.utils.AdmContextUtil;
-import com.persagy.proxy.common.entity.InstanceUrlParam;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -48,9 +47,6 @@ public class AdmLabslController {
     @Autowired
     private IAdmLabslService service;
 
-    @Value("${middleware.group.code}")
-    private String groupCode ="XG";
-
     @Autowired
     private IAdmEquipmentService iAdmEquipmentService;
 
@@ -64,10 +60,6 @@ public class AdmLabslController {
      */
     @PostMapping("/category")
     public AdmResponse queryCategory() throws Exception {
-        InstanceUrlParam context = AdmContextUtil.toDmpContext();
-        if(StringUtils.isEmpty(context.getGroupCode())){
-            context.setGroupCode(groupCode);
-        }
         return querySystemEquipTree(AdmContextUtil.toDmpContext(),AdmObjectType.class);
         //return service.queryCategory(context, AdmObjectInfo.class);
     }
@@ -81,9 +73,6 @@ public class AdmLabslController {
     @PostMapping("/zone/type")
     public AdmResponse queryZoneType() throws Exception {
         InstanceUrlParam context = AdmContextUtil.toDmpContext();
-        if(StringUtils.isEmpty(context.getGroupCode())){
-            context.setGroupCode(groupCode);
-        }
         return service.queryZoneType(context, AdmObjectInfo.class);
     }
 
@@ -95,9 +84,6 @@ public class AdmLabslController {
     @PostMapping("/building/floor")
     public AdmResponse queryBuildFloor(@QueryParam("projectId") String projectId) throws Exception {
         InstanceUrlParam context = AdmContextUtil.toDmpContext();
-        if(StringUtils.isEmpty(context.getGroupCode())){
-            context.setGroupCode(groupCode);
-        }
         return service.queryBuildFloor(context, AdmObjectInfo.class);
     }
 
@@ -122,9 +108,6 @@ public class AdmLabslController {
     @PostMapping("/query/equip")
     public AdmResponse queryEquipType(@RequestBody AdmQueryCriteria request) throws Exception {
         InstanceUrlParam context = AdmContextUtil.toDmpContext();
-        if(StringUtils.isEmpty(context.getGroupCode())){
-            context.setGroupCode(groupCode);
-        }
         // 组装上下文条件
         request.setName(AdmEquipment.OBJ_TYPE);
         //过滤条件处理
@@ -223,9 +206,6 @@ public class AdmLabslController {
     public AdmResponse queryMajorCategory(@QueryParam("projectId") String projectId,
                                           @RequestBody List<String> ids) throws Exception {
         InstanceUrlParam context = AdmContextUtil.toDmpContext();
-        if(StringUtils.isEmpty(context.getGroupCode())){
-            context.setGroupCode(groupCode);
-        }
         if(CollUtil.isEmpty(ids)){
             return AdmResponse.success(new ArrayList<>());
         }

+ 0 - 2
src/main/java/com/persagy/proxy/dictionary/controller/AdmModelController.java

@@ -27,8 +27,6 @@ public class AdmModelController {
 
     @Autowired
     private IAdmModelKeyService service;
-    @Value("${middleware.group.code}")
-    private String groupCode;
 
     /**
      * 模型文件下载地址 key

+ 0 - 3
src/main/java/com/persagy/proxy/dictionary/controller/AdmPlanarController.java

@@ -29,9 +29,6 @@ import javax.ws.rs.QueryParam;
 @Slf4j
 public class AdmPlanarController {
 
-    @Value("${middleware.group.code}")
-    private String groupCode;
-
     @Autowired
     private IAdmPlanarService service;
 

+ 5 - 9
src/main/java/com/persagy/proxy/dictionary/service/impl/AbstractAdmDictBaseServiceImpl.java

@@ -9,30 +9,29 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.basic.utils.JsonNodeUtils;
 import com.persagy.dmp.common.constant.ValidEnum;
+import com.persagy.dmp.common.context.AppContext;
 import com.persagy.dmp.common.utils.JsonHelper;
 import com.persagy.dmp.define.entity.ObjectInfoCollect;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmDictConstant;
-import com.persagy.proxy.object.model.AdmObjectInfo;
-import com.persagy.proxy.dictionary.model.AdmObjectType;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
-import com.persagy.proxy.dictionary.service.IAdmDictBaseService;
 import com.persagy.proxy.adm.utils.AdmEntityTransferUtil;
 import com.persagy.proxy.adm.utils.AdmQueryCriteriaHelper;
 import com.persagy.proxy.common.client.DmpDicClient;
 import com.persagy.proxy.common.client.DmpRwdClient;
 import com.persagy.proxy.common.entity.DmpResult;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
+import com.persagy.proxy.dictionary.model.AdmObjectType;
+import com.persagy.proxy.dictionary.service.IAdmDictBaseService;
+import com.persagy.proxy.object.model.AdmObjectInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 
 /**
  * @ClassName AbstractAdmDictBaseServiceImpl
@@ -50,9 +49,6 @@ public class AbstractAdmDictBaseServiceImpl<T> implements IAdmDictBaseService<T>
     @Autowired
     private DmpDicClient dicClient;
 
-    @Value("${middleware.group.code}")
-    private String groupCode;
-
     /**
      * 查询DMP字典数据
      * @param context
@@ -206,7 +202,7 @@ public class AbstractAdmDictBaseServiceImpl<T> implements IAdmDictBaseService<T>
             admVO.setSecondName(admVO.getSecondTag());
             admVO.setMultiple(admVO.getIsMultiple());
             admVO.setRegion(admVO.getIsRegion());
-            admVO.setGroupCode(groupCode);
+            admVO.setGroupCode(AppContext.getContext().getGroupCode());
             admVO.setSort(admVO.getShowOrder());
 
             //path路径处理

+ 0 - 2
src/main/java/com/persagy/proxy/object/controller/AdmDoorController.java

@@ -29,8 +29,6 @@ public class AdmDoorController {
 
     @Autowired
     private IAdmDoorService service;
-    @Value("${middleware.group.code}")
-    private String groupCode;
 
     /**
      * 创建

+ 0 - 3
src/main/java/com/persagy/proxy/object/controller/AdmLocationPointController.java

@@ -35,9 +35,6 @@ import java.util.List;
 @Slf4j
 public class AdmLocationPointController {
 
-    @Value("${middleware.group.code}")
-    private String groupCode;
-
     @Autowired
     private IAdmLocationPointService service;
 

+ 3 - 13
src/main/java/com/persagy/proxy/object/controller/AdmProjectController.java

@@ -1,14 +1,11 @@
 package com.persagy.proxy.object.controller;
 
-import cn.hutool.core.util.StrUtil;
-import com.persagy.dmp.common.context.AppContext;
-import com.persagy.proxy.object.model.AdmProject;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
+import com.persagy.proxy.adm.utils.AdmContextUtil;
+import com.persagy.proxy.object.model.AdmProject;
 import com.persagy.proxy.object.service.IAdmProjectService;
-import com.persagy.proxy.common.entity.InstanceUrlParam;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -28,9 +25,6 @@ public class AdmProjectController {
     @Autowired
     private IAdmProjectService service;
 
-    @Value("${middleware.group.code}")
-    private String groupCode;
-
     /**
      * 查询项目信息
      * @param request
@@ -40,11 +34,7 @@ public class AdmProjectController {
     @PostMapping("/query")
     public AdmResponse query(@QueryParam("projectId") String projectId, @RequestBody AdmQueryCriteria request) throws Exception {
         request.setName(AdmProject.OBJ_TYPE);
-        String group = (StrUtil.isBlank(AppContext.getContext().getGroupCode()) || AppContext.getContext().getGroupCode().equals("null") ) ? groupCode:AppContext.getContext().getGroupCode();
-        InstanceUrlParam param = InstanceUrlParam.builder().groupCode(group)
-                .projectId(projectId).userId(AppContext.getContext().getAccountId())
-                .appId(AppContext.getContext().getAppId()).build();
-        return service.doQuery(param, request, AdmProject.class);
+        return service.doQuery(AdmContextUtil.toDmpContext(), request, AdmProject.class);
     }
 
     /**

+ 0 - 2
src/main/java/com/persagy/proxy/object/controller/AdmVirtualWallController.java

@@ -30,8 +30,6 @@ public class AdmVirtualWallController {
 
     @Autowired
     private IAdmVirtualWallService service;
-    @Value("${middleware.group.code}")
-    private String groupCode;
 
     /**
      * 创建

+ 0 - 3
src/main/java/com/persagy/proxy/object/controller/AdmWindowController.java

@@ -10,7 +10,6 @@ import com.persagy.proxy.common.entity.InstanceUrlParam;
 import com.persagy.proxy.object.model.AdmWindow;
 import com.persagy.proxy.object.service.IAdmWindowService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,8 +29,6 @@ public class AdmWindowController {
 
     @Autowired
     private IAdmWindowService service;
-    @Value("${middleware.group.code}")
-    private String groupCode;
 
     /**
      * 创建

+ 0 - 3
src/main/java/com/persagy/proxy/relation/controller/RelationEqForBdController.java

@@ -33,9 +33,6 @@ public class RelationEqForBdController {
     @Autowired
     private IAdmRelationService service;
 
-    @Value("${middleware.group.code}")
-    private String groupCode;
-
     /**
      * 创建设备服务于建筑关系
      * 必填项:EquipId(设备id)、BuildingId(建筑id)

+ 0 - 3
src/main/java/com/persagy/proxy/relation/controller/RelationEqForFlController.java

@@ -39,9 +39,6 @@ public class RelationEqForFlController {
     @Autowired
     private IAdmRelationService service;
 
-    @Value("${middleware.group.code}")
-    private String groupCode;
-
     /**
      * 创建设备服务于楼层关系
      * 必填项:EquipId(设备id)、FloorId(楼层id)

+ 0 - 3
src/main/java/com/persagy/proxy/relation/controller/RelationEqForShController.java

@@ -32,9 +32,6 @@ public class RelationEqForShController {
     @Autowired
     private IAdmRelationService service;
 
-    @Value("${middleware.group.code}")
-    private String groupCode;
-
     /**
      * 创建设备服务于竖井关系
      * 必填项:EquipId(设备id)、ShaftId(竖井id)

+ 0 - 2
src/main/java/com/persagy/proxy/relation/controller/RelationEqForSpConreoller.java

@@ -31,8 +31,6 @@ public class RelationEqForSpConreoller {
 
     @Autowired
     private IAdmRelationService service;
-    @Value("${middleware.group.code}")
-    private String groupCode;
 
     /**
      * create 创建设备服务于业务空间关系

+ 0 - 2
src/main/java/com/persagy/proxy/relation/controller/RelationEqInShController.java

@@ -32,8 +32,6 @@ import java.util.List;
 public class RelationEqInShController {
     @Autowired
     private IAdmRelationService service;
-    @Value("${middleware.group.code}")
-    private String groupCode;
     /**
      * 创建设备所在竖井关系,累计添加不会覆盖以前记录
      * @param param

+ 0 - 2
src/main/java/com/persagy/proxy/relation/controller/RelationEqInSpController.java

@@ -30,8 +30,6 @@ public class RelationEqInSpController {
 
     @Autowired
     private IAdmRelationService service;
-    @Value("${middleware.group.code}")
-    private String groupCode;
 
     /**
      * 创建设备所在业务空间关系

+ 0 - 3
src/main/java/com/persagy/proxy/relation/controller/RelationFlAndBuController.java

@@ -40,9 +40,6 @@ public class RelationFlAndBuController {
     @Autowired
     private IAdmRelationService service;
 
-    @Value("${middleware.group.code}")
-    private String groupCode;
-
     @Autowired
     private IAdmSpaceService spaceService;
 

+ 0 - 3
src/main/java/com/persagy/proxy/relation/controller/RelationShContainSpBaseController.java

@@ -60,9 +60,6 @@ public class RelationShContainSpBaseController {
     @Autowired
     DmpRwdClient rwdClient;
     
-    @Value("${middleware.group.code}")
-    private String groupCode;
-    
     @Autowired
     private IRelationReportService relationReportService;
 

+ 0 - 3
src/main/java/com/persagy/proxy/relation/controller/RelationShaftThroughShaftController.java

@@ -13,7 +13,6 @@ import com.persagy.proxy.adm.utils.AdmContextUtil;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 import com.persagy.proxy.common.entity.RelationDTO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -32,8 +31,6 @@ import java.util.List;
 public class RelationShaftThroughShaftController {
     @Autowired
     private IAdmRelationService service;
-    @Value("${middleware.group.code}")
-    private String groupCode;
     /**
      * 创建竖井的贯通关系
      * @param param

+ 0 - 2
src/main/java/com/persagy/proxy/relation/controller/RelationSpInBdOrFlController.java

@@ -34,8 +34,6 @@ public class RelationSpInBdOrFlController {
     private IAdmRelationService service;
     @Autowired
     DmpRwdClient rwdClient;
-    @Value("${middleware.group.code}")
-    private String groupCode;
 
     /**
      * 默认图类型

+ 0 - 3
src/main/java/com/persagy/proxy/relation/controller/RelationSpInSiController.java

@@ -38,9 +38,6 @@ public class RelationSpInSiController {
     @Autowired
     private IAdmRelationService service;
 
-    @Value("${middleware.group.code}")
-    private String groupCode;
-
     /**
      * 创建业务空间内的元空间关系
      *

+ 4 - 4
src/main/java/com/persagy/proxy/relation/controller/RelationSpaceConnectionController.java

@@ -20,8 +20,10 @@ import com.persagy.proxy.common.client.DmpRwdClient;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 import com.persagy.proxy.common.entity.RelationDTO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -42,8 +44,6 @@ public class RelationSpaceConnectionController {
     private IAdmRelationService service;
     @Autowired
     DmpRwdClient rwdClient;
-    @Value("${middleware.group.code}")
-    private String groupCode;
 
 //    //默认图类型 业务空间(同类)邻接关系
 //    public static final String DEFAULT_GRAPH_CODE = "SpaceNeighborhood";

+ 0 - 3
src/main/java/com/persagy/proxy/relation/controller/RelationSyEqController.java

@@ -54,9 +54,6 @@ public class RelationSyEqController {
     private IAdmRelationService service;
     @Autowired
     private IAdmEquipmentService equipmentService;
-    @Value("${middleware.group.code}")
-    private String groupCode;
-
 
     /**
      * 创建系统下的设备关系,数据叠加,不会覆盖以前的数据

+ 0 - 2
src/main/java/com/persagy/proxy/relation/controller/RelationSyForBdController.java

@@ -37,8 +37,6 @@ public class RelationSyForBdController {
     private IAdmRelationService service;
     @Autowired
     DmpRwdClient rwdClient;
-    @Value("${middleware.group.code}")
-    private String groupCode;
 
     /**
      * 默认图类型

+ 0 - 2
src/main/java/com/persagy/proxy/relation/controller/RelationSyForFlController.java

@@ -37,8 +37,6 @@ public class RelationSyForFlController {
     private IAdmRelationService service;
     @Autowired
     DmpRwdClient rwdClient;
-    @Value("${middleware.group.code}")
-    private String groupCode;
 
     /**
      * 默认图类型

+ 0 - 3
src/main/java/com/persagy/proxy/relation/controller/RelationSyForShController.java

@@ -15,7 +15,6 @@ import com.persagy.proxy.common.client.DmpRwdClient;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 import com.persagy.proxy.common.entity.RelationDTO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -37,8 +36,6 @@ public class RelationSyForShController {
     private IAdmRelationService service;
     @Autowired
     DmpRwdClient rwdClient;
-    @Value("${middleware.group.code}")
-    private String groupCode;
 
     /**
      * 默认图类型

+ 3 - 8
src/main/java/com/persagy/proxy/relation/controller/RelationSyForSpController.java

@@ -5,17 +5,16 @@ import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
-import com.persagy.proxy.relation.model.SpForSyBaseList;
-import com.persagy.proxy.relation.model.SyForSpBase;
-import com.persagy.proxy.relation.model.SyForSpBaseList;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.adm.service.IAdmRelationService;
 import com.persagy.proxy.adm.utils.AdmContextUtil;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
 import com.persagy.proxy.common.entity.RelationDTO;
+import com.persagy.proxy.relation.model.SpForSyBaseList;
+import com.persagy.proxy.relation.model.SyForSpBase;
+import com.persagy.proxy.relation.model.SyForSpBaseList;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -43,10 +42,6 @@ public class RelationSyForSpController {
     @Autowired
     private IAdmRelationService service;
 
-    @Value("${middleware.group.code}")
-    private String groupCode;
-
-
 /**
      * 创建系统服务于业务空间关系
      *

+ 0 - 3
src/main/java/com/persagy/proxy/relation/controller/RelationSyInBdController.java

@@ -43,9 +43,6 @@ public class RelationSyInBdController {
     @Autowired
     private IAdmRelationService service;
 
-    @Value("${middleware.group.code}")
-    private String groupCode;
-
     /**
      * 系统所在建筑
      *

+ 0 - 3
src/main/java/com/persagy/proxy/relation/controller/RelationSyInShController.java

@@ -39,9 +39,6 @@ public class RelationSyInShController {
     @Autowired
     private IAdmRelationService service;
 
-    @Value("${middleware.group.code}")
-    private String groupCode;
-
     /**
      * 创建系统所在竖井关系
      *

+ 0 - 3
src/main/java/com/persagy/proxy/relation/controller/RelationSyInSpController.java

@@ -39,9 +39,6 @@ public class RelationSyInSpController {
     @Autowired
     private IAdmRelationService service;
 
-    @Value("${middleware.group.code}")
-    private String groupCode;
-
     @PostMapping("/link-list")
     public AdmResponse create(@RequestBody AdmCreateRequest<SyInSpBase> syInSpBase) {
         List<SyInSpBase> syInSpBases = syInSpBase.getContent();

+ 0 - 3
src/main/java/com/persagy/proxy/relation/controller/RelationTnInSpController.java

@@ -35,9 +35,6 @@ public class RelationTnInSpController {
     @Autowired
     private IAdmRelationService service;
 
-    @Value("${middleware.group.code}")
-    private String groupCode;
-
     /**
      * 创建租户所租用的业务空间关系
      *

+ 0 - 3
src/main/java/com/persagy/proxy/report/controller/AdmRelationController.java

@@ -24,9 +24,6 @@ public class AdmRelationController {
     @Autowired
     private IAdmGraphicTypeService service;
 
-    @Value("${middleware.group.code}")
-    private String groupCode;
-
     /**
      * 创建
      * @param

+ 2 - 6
src/main/java/com/persagy/proxy/report/controller/AdmRelationObjectController.java

@@ -1,13 +1,12 @@
 package com.persagy.proxy.report.controller;
 
-import com.persagy.proxy.relation.model.AdmDtRelation;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
-import com.persagy.proxy.relation.service.IAdmDtRelationService;
 import com.persagy.proxy.adm.utils.AdmContextUtil;
 import com.persagy.proxy.common.entity.InstanceUrlParam;
+import com.persagy.proxy.relation.model.AdmDtRelation;
+import com.persagy.proxy.relation.service.IAdmDtRelationService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -26,9 +25,6 @@ public class AdmRelationObjectController {
     @Autowired
     private IAdmDtRelationService service;
 
-    @Value("${middleware.group.code}")
-    private String groupCode;
-
     /**
      * 创建
      * @param

+ 12 - 18
src/main/java/com/persagy/proxy/report/controller/ComponentStatisticsController.java

@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
-import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmObjectType;
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
 import com.persagy.proxy.adm.constant.SpaceTypeEnum;
@@ -95,10 +94,8 @@ public class ComponentStatisticsController {
 	 */
 	@RequestMapping(value = "/uneq2pe-count")
 	public AdmCountResponse uneq2peCount(HttpServletRequest request) {
-		String groupCode = request.getHeader(AdmCommonConstant.GROUP_CODE_HEADER);
-		String projectId = request.getHeader(AdmCommonConstant.PROJECT_ID_HEADER);
-		
-		long count = this.relationReportService.countObject(groupCode, projectId, AdmObjectType.EQUIPMENT.getIndex(), null);
+		InstanceUrlParam context = AdmContextUtil.toDmpContext();
+		long count = this.relationReportService.countObject(context.getGroupCode(), context.getProjectId(), AdmObjectType.EQUIPMENT.getIndex(), null);
 		return AdmCountResponse.success(count);
 	}
 	
@@ -109,9 +106,8 @@ public class ComponentStatisticsController {
 	 */
 	@RequestMapping(value = "/sp-objecttype-count")
 	public AdmResponse spObjectTypeCount(HttpServletRequest request) {
-		String groupCode = request.getHeader(AdmCommonConstant.GROUP_CODE_HEADER);
-		
-		List<Map<String,Object>> list = this.relationReportService.queryObjectCountByObjInfos(groupCode, null, 
+		InstanceUrlParam context = AdmContextUtil.toDmpContext();
+		List<Map<String,Object>> list = this.relationReportService.queryObjectCountByObjInfos(context.getGroupCode(), null,
 				Sets.newHashSet(AdmObjectType.SPACE.getIndex()), Lists.newArrayList("classCode"));
 		for (Map<String, Object> map : list) {
 //			map.put("name", map.get("classCode"));
@@ -127,9 +123,9 @@ public class ComponentStatisticsController {
 	 */
 	@RequestMapping(value = "/general-sp-functype-count")
 	public AdmResponse generalSpFunctypeCount(HttpServletRequest request) {
-		String groupCode = request.getHeader(AdmCommonConstant.GROUP_CODE_HEADER);
-		
-		List<Map<String,Object>> list = this.relationReportService.queryObjectCountByObjInfos(groupCode, Sets.newHashSet(SpaceTypeEnum.GeneralZone.getCode()), 
+		InstanceUrlParam context = AdmContextUtil.toDmpContext();
+		List<Map<String,Object>> list = this.relationReportService.queryObjectCountByObjInfos(context.getGroupCode(),
+				Sets.newHashSet(SpaceTypeEnum.GeneralZone.getCode()),
 				Sets.newHashSet(AdmObjectType.SPACE.getIndex()), Lists.newArrayList("roomFuncType"));
 		for (Map<String, Object> map : list) {
 			map.put("name", map.get("roomFuncType"));
@@ -144,10 +140,9 @@ public class ComponentStatisticsController {
 	 */
 	@RequestMapping(value = "/tenant2sp-count")
 	public AdmCountResponse tenant2spCount(HttpServletRequest request) {
-		String groupCode = request.getHeader(AdmCommonConstant.GROUP_CODE_HEADER);
-		String projectId = request.getHeader(AdmCommonConstant.PROJECT_ID_HEADER);
-		
-		long count = this.relationReportService.countRelationObject(groupCode, projectId, AdmRelationTypeEnum.TN2SP.getGraphCode(), 
+		InstanceUrlParam context = AdmContextUtil.toDmpContext();
+		long count = this.relationReportService.countRelationObject(context.getGroupCode(), context.getProjectId(),
+				AdmRelationTypeEnum.TN2SP.getGraphCode(),
 				AdmRelationTypeEnum.TN2SP.getRelCode(), null);
 		return AdmCountResponse.success(count);
 	}
@@ -173,9 +168,8 @@ public class ComponentStatisticsController {
 	 */
 	@RequestMapping(value = "/shaft-functype-count")
 	public AdmResponse shaftFunctypeCount(HttpServletRequest request) {
-		String groupCode = request.getHeader(AdmCommonConstant.GROUP_CODE_HEADER);
-		
-		List<Map<String,Object>> list = this.relationReportService.queryObjectCountByObjInfos(groupCode, null, 
+		InstanceUrlParam context = AdmContextUtil.toDmpContext();
+		List<Map<String,Object>> list = this.relationReportService.queryObjectCountByObjInfos(context.getGroupCode(), null,
 				Sets.newHashSet(AdmObjectType.SHAFT.getIndex()), Lists.newArrayList("shaftFuncType"));
 		for (Map<String, Object> map : list) {
 			map.put("name", map.get("shaftFuncType"));

+ 51 - 65
src/main/java/com/persagy/proxy/report/controller/RelationReportController.java

@@ -1,34 +1,12 @@
 package com.persagy.proxy.report.controller;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.RowUtil;
 import cn.hutool.poi.excel.WorkbookUtil;
 import cn.hutool.poi.excel.cell.CellUtil;
-import org.apache.poi.ss.usermodel.*;
-import org.apache.poi.xssf.usermodel.XSSFCell;
-import org.apache.poi.xssf.usermodel.XSSFRow;
-import org.apache.poi.xssf.usermodel.XSSFSheet;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.util.ResourceUtils;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.fastjson.JSONObject;
@@ -36,7 +14,6 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
 import com.persagy.dmp.basic.model.QueryCriteria;
 import com.persagy.dmp.common.context.AppContext;
 import com.persagy.dmp.common.helper.SpringHelper;
@@ -44,26 +21,44 @@ import com.persagy.dmp.define.client.DigitalDefineFacade;
 import com.persagy.dmp.define.entity.ObjectInfoDefine;
 import com.persagy.dmp.define.entity.ObjectTypeDefine;
 import com.persagy.dmp.digital.client.DigitalObjectFacade;
-import com.persagy.dmp.digital.entity.ObjectDigital;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
-import com.persagy.proxy.adm.constant.AdmObjectType;
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
 import com.persagy.proxy.adm.handler.RelationReportHandler;
 import com.persagy.proxy.adm.request.AdmQueryCriteria;
 import com.persagy.proxy.adm.request.AdmResponse;
 import com.persagy.proxy.adm.strategy.RelationObjectContext;
+import com.persagy.proxy.adm.utils.AdmContextUtil;
 import com.persagy.proxy.adm.utils.AdmExcelUtil;
 import com.persagy.proxy.adm.utils.AdmQueryCriteriaHelper;
+import com.persagy.proxy.common.entity.InstanceUrlParam;
 import com.persagy.proxy.report.model.AdmRelationObject;
 import com.persagy.proxy.report.model.EquipmentBindPointExcel;
 import com.persagy.proxy.report.model.EquipmentCountExcel;
 import com.persagy.proxy.report.model.EquipmentExcel;
 import com.persagy.proxy.report.service.IRelationReportService;
-
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.StrUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFCell;
+import org.apache.poi.xssf.usermodel.XSSFRow;
+import org.apache.poi.xssf.usermodel.XSSFSheet;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.util.ResourceUtils;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 报表/模板下载
@@ -81,9 +76,6 @@ public class RelationReportController {
 
 	public static final String EXPORT_SHEET_NAME = "关系维护";
 	
-	@Value("${middleware.group.code}")
-	private String defaultCode;
-	
 	private final RelationReportHandler relationReportHandler;
 	
 	private final RelationObjectContext relationObjectContext;
@@ -98,10 +90,8 @@ public class RelationReportController {
 	 */
 	@RequestMapping("/graphic/query-count")
 	public AdmResponse queryCount(HttpServletRequest request) {
-		String groupCode = request.getHeader(AdmCommonConstant.GROUP_CODE_HEADER);
-		String projectId = request.getHeader(AdmCommonConstant.PROJECT_ID_HEADER);
-		
-		List<JSONObject> relationProjectCal = this.relationReportService.getAllRelationProjectCalTree(groupCode, projectId);
+		InstanceUrlParam context = AdmContextUtil.toDmpContext();
+		List<JSONObject> relationProjectCal = this.relationReportService.getAllRelationProjectCalTree(context.getGroupCode(), context.getProjectId());
 		return AdmResponse.success(relationProjectCal);
 	}
 	
@@ -112,9 +102,8 @@ public class RelationReportController {
 	 */
 	@RequestMapping("/graphic/type/query-count")
 	public AdmResponse countRelationObjects(@RequestParam String type, HttpServletRequest request) {
-		String groupCode = request.getHeader(AdmCommonConstant.GROUP_CODE_HEADER);
-		String projectId = request.getHeader(AdmCommonConstant.PROJECT_ID_HEADER);
-		JSONObject objectNode = this.relationReportService.getRelationProjectCal(groupCode, projectId, type);
+		InstanceUrlParam context = AdmContextUtil.toDmpContext();
+		JSONObject objectNode = this.relationReportService.getRelationProjectCal(context.getGroupCode(), context.getProjectId(), type);
  		return AdmResponse.success(Lists.newArrayList(objectNode));
 	}
 	
@@ -139,8 +128,7 @@ public class RelationReportController {
 	 */
 	@RequestMapping("/graphic/relation_type_project")
 	public AdmResponse queryRelationObjects(@RequestBody AdmQueryCriteria requestCriteria, HttpServletRequest request) {
-		String groupCode = request.getHeader(AdmCommonConstant.GROUP_CODE_HEADER);
-		String projectId = request.getHeader(AdmCommonConstant.PROJECT_ID_HEADER);
+		InstanceUrlParam context = AdmContextUtil.toDmpContext();
 		String filters = requestCriteria.getFilters();
 		
 		
@@ -187,9 +175,9 @@ public class RelationReportController {
 			relObject.put("$in", relCodes);
 			criteria.putPOJO("relCode", relObject);
 		}
-		criteria.put("projectId", projectId);
+		criteria.put("projectId", context.getProjectId());
 		queryCriteria.setCriteria(criteria);
-		List<JSONObject> relationProjectCal = this.relationReportService.getAllRelationProjectCal(queryCriteria, groupCode, projectId);
+		List<JSONObject> relationProjectCal = this.relationReportService.getAllRelationProjectCal(queryCriteria, context.getGroupCode(), context.getProjectId());
 		return AdmResponse.success(relationProjectCal);
 	}
 	
@@ -219,9 +207,9 @@ public class RelationReportController {
 	 */
 	@RequestMapping("/graphic/downloads/eq/not/sp")
 	public void downloadsEqNotSp(@RequestParam(required = false) String projectId, HttpServletRequest request, HttpServletResponse response) {
-		String groupCode = request.getHeader(AdmCommonConstant.GROUP_CODE_HEADER);
+		InstanceUrlParam context = AdmContextUtil.toDmpContext();
 		if (StrUtil.isBlank(projectId)) {
-			projectId = request.getHeader(AdmCommonConstant.PROJECT_ID_HEADER);
+			projectId = context.getProjectId();
 		}
 		try {
             response.setContentType("application/vnd.ms-excel");
@@ -231,7 +219,7 @@ public class RelationReportController {
             String fileName = URLEncoder.encode("equipment", encode);
             response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
             
-            List<EquipmentExcel> equipByNotSpace = this.relationReportHandler.findEquipByNotSpace(groupCode, projectId);
+            List<EquipmentExcel> equipByNotSpace = this.relationReportHandler.findEquipByNotSpace(context.getGroupCode(), projectId);
             EasyExcel.write(response.getOutputStream(), EquipmentExcel.class).sheet("设备").doWrite(equipByNotSpace);
 		} catch(Exception e) {
 			log.error("设备数据导出异常", e);
@@ -249,9 +237,9 @@ public class RelationReportController {
 	 */
 	@RequestMapping("/graphic/downloads/project/binding/point")
 	public void downloadsProjectBindingPoint(@RequestParam(required = false) String projectId, HttpServletRequest request, HttpServletResponse response) {
-		String groupCode = request.getHeader(AdmCommonConstant.GROUP_CODE_HEADER);
+		InstanceUrlParam context = AdmContextUtil.toDmpContext();
 		if (StrUtil.isBlank(projectId)) {
-			projectId = request.getHeader(AdmCommonConstant.PROJECT_ID_HEADER);
+			projectId = context.getProjectId();
 		}
 		try {
             response.setContentType("application/vnd.ms-excel");
@@ -261,7 +249,7 @@ public class RelationReportController {
             String fileName = URLEncoder.encode("设备实例交付", encode);
             response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
             
-            List<EquipmentBindPointExcel> equipmentBindPointExcel = this.relationReportHandler.queryProjectBindPoint(groupCode, projectId);
+            List<EquipmentBindPointExcel> equipmentBindPointExcel = this.relationReportHandler.queryProjectBindPoint(context.getGroupCode(), projectId);
             EasyExcel.write(response.getOutputStream(), EquipmentBindPointExcel.class).sheet(0).doWrite(equipmentBindPointExcel);
 		} catch(Exception e) {
 			log.error("设备数据导出异常", e);
@@ -444,8 +432,10 @@ public class RelationReportController {
 			@RequestParam(required = false) String zoneType, HttpServletRequest request, HttpServletResponse response) {
 		ExcelWriter excelWriter = null;
 		try {
-			String groupCode = request.getHeader(AdmCommonConstant.GROUP_CODE_HEADER);
-			groupCode = StrUtil.isBlank(groupCode) ? defaultCode : groupCode;
+			InstanceUrlParam context = AdmContextUtil.toDmpContext();
+			if(StrUtil.isBlank(projectId)) {
+				projectId = context.getProjectId();
+			}
 			code = StrUtil.isBlank(code) ? "对象ID" : code;
 			
 			response.setContentType("application/vnd.ms-excel");
@@ -453,13 +443,13 @@ public class RelationReportController {
 			response.setCharacterEncoding(encode);
 			response.setHeader("Content-disposition", "attachment;filename=relation-template.xlsx");
 			
-			log.info("下载报表: groupCode[{}], projectId[{}], relType[{}], code[{}]", groupCode, projectId, relType, code);
+			log.info("下载报表: groupCode[{}], projectId[{}], relType[{}], code[{}]", context.getGroupCode(), projectId, relType, code);
 			AdmRelationTypeEnum typeEnum = AdmCommonConstant.RELATION_TYPE_MAP.get(relType);
 			
 			List<AdmRelationObject> relationObjects = null;
 			if (typeEnum != null) {
 				String graphAndRelKey = typeEnum.getGraphCode() + AdmCommonConstant.UNDERLINE + typeEnum.getRelCode();
-				relationObjects = this.relationObjectContext.exportRelationObject(groupCode, projectId, graphAndRelKey);
+				relationObjects = this.relationObjectContext.exportRelationObject(context.getGroupCode(), projectId, graphAndRelKey);
 			}
 			
 			File templateFile = AdmExcelUtil.getTemplateFile("relation-template.xlsx");
@@ -507,11 +497,7 @@ public class RelationReportController {
 			Set<Integer> rowNums = new HashSet<Integer>();
 			// 批量更新数据
 			List<ObjectNode> relationObjects = new ArrayList<ObjectNode>();
-			
-			String groupCode = request.getHeader(AdmCommonConstant.GROUP_CODE_HEADER);
-			groupCode = StrUtil.isBlank(groupCode) ? defaultCode : groupCode;
-			String projectId = request.getHeader(AdmCommonConstant.PROJECT_ID_HEADER);
-			
+			InstanceUrlParam context = AdmContextUtil.toDmpContext();
 			workbook = new XSSFWorkbook(file.getInputStream());
 		    XSSFSheet sheet = workbook.getSheet("关系维护");
 		    // 获取识别码的属性
@@ -535,7 +521,8 @@ public class RelationReportController {
 		    	relationObject.setSlaveId(slaveIdCell == null ? null : slaveIdCell.getStringCellValue());
 		    	
 		    	// 校验数据
-				Object result = this.relationObjectContext.checkRelationObject(relationObject, groupCode, projectId, graphAndRelKey, code, typeEnum);
+				Object result = this.relationObjectContext.checkRelationObject(relationObject, context.getGroupCode(),
+						context.getProjectId(), graphAndRelKey, code, typeEnum);
 				if (result instanceof String) {
 					failurNum++;
 					xssfRow.createCell(16).setCellValue((String)result);
@@ -548,7 +535,8 @@ public class RelationReportController {
 				rowNums.add(i);
 				relationObjects.add(relation);
 				if (relationObjects.size() >= 1000) {
-					boolean objects = this.relationObjectContext.saveRelationObjects(relationObjects, groupCode, projectId, graphAndRelKey);
+					boolean objects = this.relationObjectContext.saveRelationObjects(relationObjects, context.getGroupCode(),
+							context.getProjectId(), graphAndRelKey);
 					if (objects) {
 						successNum += relationObjects.size();
 						for (int rowNum : rowNums) {
@@ -566,7 +554,7 @@ public class RelationReportController {
 			}
 		    // 最后一次遗留数据录入
 		    if (CollectionUtil.isNotEmpty(relationObjects)) {
-		    	boolean objects = this.relationObjectContext.saveRelationObjects(relationObjects, groupCode, projectId, graphAndRelKey);
+		    	boolean objects = this.relationObjectContext.saveRelationObjects(relationObjects, context.getGroupCode(), context.getProjectId(), graphAndRelKey);
 				if (objects) {
 					successNum += relationObjects.size();
 					for (int rowNum : rowNums) {
@@ -582,7 +570,7 @@ public class RelationReportController {
 		    
         	try {
         		// 调用中台存储完成之后,此文件存储至本地
-        		String fileName = projectId + AdmCommonConstant.LINE_THROUGH + relType + AdmCommonConstant.EXCEL_SUFFIX_XLSX;
+        		String fileName = context.getProjectId() + AdmCommonConstant.LINE_THROUGH + relType + AdmCommonConstant.EXCEL_SUFFIX_XLSX;
         		File templateFile = AdmExcelUtil.createTemplateFile(AdmCommonConstant.SERVER_ROOT_PATH + AdmExcelUtil.TEMP_PAHT, fileName);
         		fileOutputStream = new FileOutputStream(templateFile);
         		workbook.write(fileOutputStream);
@@ -844,8 +832,6 @@ public class RelationReportController {
 	 * @return
 	 */
 	private ObjectTypeDefine queryClassList(String groupCode, String projectId, String classCode, String objType) {
-		groupCode = StrUtil.isBlank(groupCode) ? defaultCode : groupCode;
-		
 		ObjectMapper objectMapper = SpringHelper.getBean(ObjectMapper.class);
 		QueryCriteria classCriteria = new QueryCriteria();
 		ObjectNode condition = objectMapper.createObjectNode();

+ 14 - 55
src/main/java/com/persagy/proxy/report/service/impl/RelationReportService.java

@@ -1,17 +1,11 @@
 package com.persagy.proxy.report.service.impl;
 
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import cn.hutool.core.lang.intern.InternUtil;
-import cn.hutool.core.util.NumberUtil;
-import com.persagy.dmp.common.constant.CommonConstant;
-import com.persagy.dmp.digital.entity.ObjectDigital;
-import lombok.SneakyThrows;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.EnumUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.OrderItem;
@@ -24,6 +18,7 @@ import com.google.common.collect.Sets;
 import com.persagy.dmp.basic.dto.GraphParentMes;
 import com.persagy.dmp.basic.dto.RequestData;
 import com.persagy.dmp.basic.model.QueryCriteria;
+import com.persagy.dmp.common.constant.CommonConstant;
 import com.persagy.dmp.common.context.AppContext;
 import com.persagy.dmp.common.helper.SpringHelper;
 import com.persagy.dmp.common.model.response.CommonResult;
@@ -38,21 +33,21 @@ import com.persagy.dmp.define.entity.RelationDefine;
 import com.persagy.dmp.digital.client.DigitalObjectFacade;
 import com.persagy.dmp.digital.client.DigitalRelationFacade;
 import com.persagy.dmp.digital.client.DigitalRelationProjectCalFacade;
+import com.persagy.dmp.digital.entity.ObjectDigital;
 import com.persagy.dmp.digital.entity.ObjectRelation;
 import com.persagy.dmp.digital.entity.ObjectRelationProjectCal;
 import com.persagy.dmp.simple.client.DigitalObjectSimpleFacade;
 import com.persagy.proxy.adm.constant.AdmCommonConstant;
 import com.persagy.proxy.adm.constant.AdmRelationTypeEnum;
 import com.persagy.proxy.adm.constant.SpaceTypeEnum;
-import com.persagy.proxy.report.service.IRelationReportService;
 import com.persagy.proxy.adm.strategy.relationdata.RelationObjectStrategy;
+import com.persagy.proxy.report.service.IRelationReportService;
+import lombok.SneakyThrows;
+import org.springframework.stereotype.Service;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.EnumUtil;
-import cn.hutool.core.util.StrUtil;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 报表/模板下载
@@ -65,13 +60,8 @@ import cn.hutool.core.util.StrUtil;
 @Service
 public class RelationReportService implements IRelationReportService {
 
-	@Value("${middleware.group.code}")
-	private String defaultCode;
-
 	@Override
 	public List<ObjectTypeDefine> queryClassList(String groupCode, String projectId, Set<String> classCodes, Set<String> objTypes, List<OrderItem> orderItems) {
-		groupCode = StrUtil.isBlank(groupCode) ? defaultCode : groupCode;
-		
 		ObjectMapper objectMapper = SpringHelper.getBean(ObjectMapper.class);
 		QueryCriteria classCriteria = new QueryCriteria();
 		ObjectNode condition = objectMapper.createObjectNode();
@@ -99,8 +89,6 @@ public class RelationReportService implements IRelationReportService {
 	
 	@Override
 	public List<Map<String, Object>> queryObjectCountByObjInfos(String groupCode, Set<String> classCodes, Set<String> objTypes, List<String> groups) {
-		groupCode = StrUtil.isBlank(groupCode) ? defaultCode : groupCode;
-		
 		RequestData requestData = new RequestData();
 		requestData.setClassCodes(classCodes);
 		requestData.setObjTypes(objTypes);
@@ -111,8 +99,6 @@ public class RelationReportService implements IRelationReportService {
 	
 	@Override
 	public List<GraphDefine> getGraphDefine(String groupCode, String projectId, String graphCode) {
-		groupCode = StrUtil.isBlank(groupCode) ? defaultCode : groupCode;
-		
 		ObjectMapper objectMapper = SpringHelper.getBean(ObjectMapper.class);
 		QueryCriteria queryCriteria = new QueryCriteria();
 		ObjectNode criteria = objectMapper.createObjectNode();
@@ -127,8 +113,6 @@ public class RelationReportService implements IRelationReportService {
 	
 	@Override
 	public List<RelationDefine> getRelationDefine(String groupCode, String projectId, String graphCode, String relCode) {
-		groupCode = StrUtil.isBlank(groupCode) ? defaultCode : groupCode;
-		
 		ObjectMapper objectMapper = SpringHelper.getBean(ObjectMapper.class);
 		QueryCriteria queryCriteria = new QueryCriteria();
 		ObjectNode criteria = objectMapper.createObjectNode();
@@ -146,8 +130,6 @@ public class RelationReportService implements IRelationReportService {
 
 	@Override
 	public List<JSONObject> getAllRelationProjectCal(QueryCriteria queryCriteria, String groupCode, String projectId) {
-		groupCode = StrUtil.isBlank(groupCode) ? defaultCode : groupCode;
-
 		// 查询出对应项目关系计算数据
 		List<ObjectNode> projectList = DigitalRelationProjectCalFacade.query(groupCode, projectId, AdmCommonConstant.APP_ID, AdmCommonConstant.USER_ID, queryCriteria);
 		if (CollectionUtil.isEmpty(projectList)) {
@@ -201,8 +183,6 @@ public class RelationReportService implements IRelationReportService {
 
 	@Override
 	public List<JSONObject> getAllRelationProjectCalTree(String groupCode, String projectId) {
-		groupCode = StrUtil.isBlank(groupCode) ? defaultCode : groupCode;
-
 		// 获取所有的二级标签
 		QueryCriteria secondCriteria = new QueryCriteria();
 		List<GraphDefine> secondList = DigitalGraphDefineFacade.query(groupCode, projectId, AdmCommonConstant.APP_ID, AdmCommonConstant.USER_ID, secondCriteria);
@@ -273,8 +253,6 @@ public class RelationReportService implements IRelationReportService {
 
 	@Override
 	public JSONObject getRelationProjectCal(String groupCode, String projectId, String relType) {
-		groupCode = StrUtil.isBlank(groupCode) ? defaultCode : groupCode;
-		
 		AdmRelationTypeEnum relationTypeEnum = AdmCommonConstant.RELATION_TYPE_MAP.get(relType);
 		if (relationTypeEnum == null) {
 			return null;
@@ -295,8 +273,6 @@ public class RelationReportService implements IRelationReportService {
 	
 	@Override
 	public ObjectNode getRelationProjectCal(String groupCode, String projectId, String graphCode, String relCode, String zoneType) {
-		groupCode = StrUtil.isBlank(groupCode) ? defaultCode : groupCode;
-		
 		ObjectMapper objectMapper = SpringHelper.getBean(ObjectMapper.class);
 		QueryCriteria queryCriteria = new QueryCriteria();
 		ObjectNode criteria = objectMapper.createObjectNode();
@@ -316,8 +292,6 @@ public class RelationReportService implements IRelationReportService {
 	
 	@Override
 	public long countRelationObject(String groupCode, String projectId, String graphCode, String relCode, String zoneType) {
-		groupCode = StrUtil.isBlank(groupCode) ? defaultCode : groupCode;
-		
 		QueryCriteria queryCriteria = new QueryCriteria();
 		ObjectMapper objectMapper = SpringHelper.getBean(ObjectMapper.class);
 		ObjectNode criteria = objectMapper.createObjectNode();
@@ -335,8 +309,6 @@ public class RelationReportService implements IRelationReportService {
 	
 	@Override
 	public long countObject(String groupCode, String projectId, String classCode, String objType) {
-		groupCode = StrUtil.isBlank(groupCode) ? defaultCode : groupCode;
-		
 		QueryCriteria queryCriteria = new QueryCriteria();
 		ObjectMapper objectMapper = SpringHelper.getBean(ObjectMapper.class);
 		ObjectNode criteria = objectMapper.createObjectNode();
@@ -353,8 +325,6 @@ public class RelationReportService implements IRelationReportService {
 	
 	@Override
 	public List<ObjectNode> getObjectNode(ObjectNode criteria, String groupCode, String projectId, Set<String> ids) {
-		groupCode = StrUtil.isBlank(groupCode) ? defaultCode : groupCode;
-		
 		QueryCriteria queryCriteria = new QueryCriteria();
 		if (criteria == null) {
 			ObjectMapper objectMapper = SpringHelper.getBean(ObjectMapper.class);
@@ -373,8 +343,6 @@ public class RelationReportService implements IRelationReportService {
 	
 	@Override
 	public List<ObjectNode> findObjectNodes(String groupCode, String projectId, String objType, String code, String value) {
-		groupCode = StrUtil.isBlank(groupCode) ? defaultCode : groupCode;
-		
 		if (StrUtil.isBlank(code)) {
 			return null;
 		}
@@ -400,8 +368,6 @@ public class RelationReportService implements IRelationReportService {
 	
 	@Override
 	public ObjectNode getObjectByCodeAndId(String groupCode, String projectId, String graphCode, String relCode, String objFrom, String objTo) {
-		groupCode = StrUtil.isBlank(groupCode) ? defaultCode : groupCode;
-		
 		// 获取出关联对象
 		ObjectMapper objectMapper = SpringHelper.getBean(ObjectMapper.class);
 		
@@ -432,8 +398,6 @@ public class RelationReportService implements IRelationReportService {
 	@Override
 	public List<ObjectNode> queryObjects(ObjectNode criteria, String groupCode, String projectId, Set<String> ids, 
 			Set<String> classCodes, Set<String> objTypes, List<OrderItem> orderItem) {
-		groupCode = StrUtil.isBlank(groupCode) ? defaultCode : groupCode;
-		
 		ObjectMapper objectMapper = SpringHelper.getBean(ObjectMapper.class);
 		QueryCriteria objectCriteria = new QueryCriteria();
 		if (criteria == null) {
@@ -468,8 +432,6 @@ public class RelationReportService implements IRelationReportService {
 	
 	@Override
 	public List<ObjectRelation> findRelationObjects(String groupCode, String projectId, String graphCode, String relCode, Set<String> objFroms, Set<String> objTos) {
-		groupCode = StrUtil.isBlank(groupCode) ? defaultCode : groupCode;
-		
 		// 获取出关联对象
 		ObjectMapper objectMapper = SpringHelper.getBean(ObjectMapper.class);
 		
@@ -503,8 +465,6 @@ public class RelationReportService implements IRelationReportService {
 	
 	@Override
 	public List<ObjectInfoDefine> queryFunidList(String groupCode, String projectId, Set<String> classCodes, String code, String category) {
-		groupCode = StrUtil.isBlank(groupCode) ? defaultCode : groupCode;
-		
 		ObjectMapper objectMapper = SpringHelper.getBean(ObjectMapper.class);
 		QueryCriteria queryCriteria = new QueryCriteria();
 		ObjectNode condition = objectMapper.createObjectNode();
@@ -530,7 +490,6 @@ public class RelationReportService implements IRelationReportService {
 	
 	@Override
 	public boolean createRelationProjectCal(String groupCode, String projectId) throws JsonProcessingException {
-		groupCode = StrUtil.isBlank(groupCode) ? defaultCode : groupCode;
 		// 1.验证是否已经添加过
 		QueryCriteria queryCriteria = new QueryCriteria();
 		queryCriteria.setOnlyCount(true);