Преглед изворни кода

增加bdtp请求参数的统一拦截处理

zhaoyk пре 3 година
родитељ
комит
b3a6d30f64

+ 3 - 3
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/controller/CommonController.java

@@ -30,17 +30,17 @@ public class CommonController {
 
 	@RequestMapping("equipTypes")
 	public CommonResult<List<ObjectNode>> equipTypes(){
-		return CommonResult.success(bdtpDataService.getEquipTypeList(new BdtpRequest(), null));
+		return CommonResult.success(bdtpDataService.getEquipTypeList(BdtpRequest.getCurrent(), null));
 	}
 
 	@RequestMapping("relTypes")
 	public CommonResult<List<Map<String, Object>>> relTypes(){
-		return CommonResult.success(bdtpDataService.getRelTypeTree(new BdtpRequest()));
+		return CommonResult.success(bdtpDataService.getRelTypeTree(BdtpRequest.getCurrent()));
 	}
 
 	@RequestMapping("majSys")
 	public CommonResult<List<ObjectNode>> majSys(){
-		BdtpRequest req = new BdtpRequest();
+		BdtpRequest req = BdtpRequest.getCurrent();
 		List<ObjectNode> majList = bdtpDataService.getMajorList(req);
 		List<ObjectNode> sysList = bdtpDataService.getSystemList(req);
 

+ 3 - 3
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/demo/DemoDataStrategy.java

@@ -349,7 +349,7 @@ public class DemoDataStrategy implements DataStrategy {
 
 	@Override
 	public List<ObjectNode> loadObjectsByType(List<String> equipmentTypes, String projectId, String systemId, String groupCode) {
-		BdtpRequest req = new BdtpRequest();
+		BdtpRequest req = BdtpRequest.getCurrent();
 		req.setProjectId(projectId);
 		req.setGroupCode(groupCode);
 		return dataService.queryObjectsByType(req, equipmentTypes, systemId);
@@ -357,7 +357,7 @@ public class DemoDataStrategy implements DataStrategy {
 
 	@Override
 	public List<ObjectNode> loadRelationsByType(List<String[]> relationTypes, List<String> objectIds, String projectId, String groupCode) {
-		BdtpRequest req = new BdtpRequest();
+		BdtpRequest req = BdtpRequest.getCurrent();
 		req.setProjectId(projectId);
 		req.setGroupCode(groupCode);
 		return dataService.queryRelsByTypeAndObj(req, relationTypes, objectIds);
@@ -365,7 +365,7 @@ public class DemoDataStrategy implements DataStrategy {
 
 	@Override
 	public List<ObjectNode> loadObjectsById(List<String> objectIds, String projectId, String groupCode) {
-		BdtpRequest req = new BdtpRequest();
+		BdtpRequest req = BdtpRequest.getCurrent();
 		req.setProjectId(projectId);
 		req.setGroupCode(groupCode);
 		return dataService.queryObjectsById(req, objectIds);

+ 4 - 0
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/frame/BdtpRequest.java

@@ -16,6 +16,10 @@ public class BdtpRequest {
 
 	private String projectId = "0";
 
+	private BdtpRequest(){
+
+	}
+
 	public static BdtpRequest get(String groupCode, String projectId, String userId){
 		BdtpRequest req = new BdtpRequest();
 		req.setGroupCode(groupCode);

+ 1 - 1
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/manage/DemoDiagramManager.java

@@ -52,7 +52,7 @@ public class DemoDiagramManager {
 			buildDiagram(diagram, true);
 		}
 
-		BdtpRequest req = new BdtpRequest();
+		BdtpRequest req = BdtpRequest.getCurrent();
 //		List<ObjectNode> maj = bdtpDataService.getMajorList(req);
 //		List<ObjectNode> sys = bdtpDataService.getSystemList(req);
 		//TODO debug

+ 1 - 1
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/manage/TemplateManager.java

@@ -57,7 +57,7 @@ public class TemplateManager {
 			buildTemplate(template);
 		}
 
-		BdtpRequest req = new BdtpRequest();
+		BdtpRequest req = BdtpRequest.getCurrent();
 //		List<ObjectNode> maj = bdtpDataService.getMajorList(req);
 //		List<ObjectNode> sys = bdtpDataService.getSystemList(req);
 		//TODO debug