Bladeren bron

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

liyang 3 jaren geleden
bovenliggende
commit
96779dcfad

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

@@ -7,6 +7,7 @@ import com.persagy.adm.diagram.entity.DiagramType;
 import com.persagy.adm.diagram.frame.BdtpRequest;
 import com.persagy.adm.diagram.service.BdtpDataService;
 import com.persagy.dmp.common.model.response.CommonResult;
+import com.persagy.dmp.common.utils.ResultHelper;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -31,12 +32,12 @@ public class CommonController {
 
 	@GetMapping("equipTypes")
 	public CommonResult<List<ObjectNode>> equipTypes(){
-		return CommonResult.success(bdtpDataService.getEquipTypeList(BdtpRequest.getCurrent(), null));
+		return ResultHelper.single(bdtpDataService.getEquipTypeList(BdtpRequest.getCurrent(), null));
 	}
 
 	@GetMapping("relTypes")
 	public CommonResult<List<Map<String, Object>>> relTypes(){
-		return CommonResult.success(bdtpDataService.getRelTypeTree(BdtpRequest.getCurrent()));
+		return ResultHelper.single(bdtpDataService.getRelTypeTree(BdtpRequest.getCurrent()));
 	}
 
 	@GetMapping("majSys")
@@ -57,13 +58,13 @@ public class CommonController {
 				}
 			}
 		}
-		return CommonResult.success(majList);
+		return ResultHelper.single(majList);
 	}
 
 	@ApiOperation("查询系统图类型列表")
 	@GetMapping("diagramTypes")
 	public CommonResult<List<DiagramType>> diagramTypes(){
-		return CommonResult.success(dataStrategy.getDiagramTypes());
+		return ResultHelper.single(dataStrategy.getDiagramTypes());
 	}
 
 }

+ 7 - 6
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/controller/DemoDiagramController.java

@@ -5,6 +5,7 @@ import com.persagy.adm.diagram.manage.DemoDiagramManager;
 import com.persagy.adm.diagram.manage.Folder;
 import com.persagy.adm.diagram.core.model.Diagram;
 import com.persagy.dmp.common.model.response.CommonResult;
+import com.persagy.dmp.common.utils.ResultHelper;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -32,7 +33,7 @@ public class DemoDiagramController {
 	public CommonResult<List<Folder>> getDiagrams(@RequestParam String projectId,
 												  @RequestParam(required = false) String systemId,
 												  @RequestParam(required = false) String groupCode){
-		return CommonResult.success(diagramManager.getDiagrams(projectId, systemId, groupCode));
+		return ResultHelper.single(diagramManager.getDiagrams(projectId, systemId, groupCode));
 	}
 
 	/**
@@ -48,7 +49,7 @@ public class DemoDiagramController {
 											@RequestParam String projectId,
 											@RequestParam(required = false) String systemId,
 											@RequestParam(required = false) String groupCode){
-		return CommonResult.success(diagramManager.createDiagram(params.get("name"), params.get("type"), projectId, systemId, groupCode));
+		return ResultHelper.single(diagramManager.createDiagram(params.get("name"), params.get("type"), projectId, systemId, groupCode));
 	}
 
 	/**
@@ -58,7 +59,7 @@ public class DemoDiagramController {
 	 */
 	@PostMapping("delDiagram")
 	public CommonResult<Boolean> delDiagram(@RequestBody Map<String, String> params){
-		return CommonResult.success(diagramManager.deleteDiagram(params.get("id")));
+		return ResultHelper.single(diagramManager.deleteDiagram(params.get("id")));
 	}
 
 	/**
@@ -68,7 +69,7 @@ public class DemoDiagramController {
 	 */
 	@PostMapping("setTemplate")
 	public CommonResult<Diagram> setTemplate(@RequestBody EditRequest req){
-		return CommonResult.success(diagramManager.setTemplate(req.getDiagramId(), req.getTemplateId()));
+		return ResultHelper.single(diagramManager.setTemplate(req.getDiagramId(), req.getTemplateId()));
 	}
 
 	/**
@@ -78,7 +79,7 @@ public class DemoDiagramController {
 	 */
 	@PostMapping("loadData")
 	public CommonResult<Diagram> loadData(@RequestBody EditRequest req) {
-		return CommonResult.success(diagramManager.loadData(req.getDiagramId(), true));
+		return ResultHelper.single(diagramManager.loadData(req.getDiagramId(), true));
 	}
 
 	/**
@@ -88,7 +89,7 @@ public class DemoDiagramController {
 	 */
 	@PostMapping("saveDiagram")
 	public CommonResult<Diagram> saveDiagram(@RequestBody EditRequest req) {
-		return CommonResult.success(diagramManager.saveDiagram(req.getDiagram()));
+		return ResultHelper.single(diagramManager.saveDiagram(req.getDiagram()));
 	}
 
 }

+ 6 - 5
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/controller/LegendController.java

@@ -4,6 +4,7 @@ import com.persagy.adm.diagram.frame.EditRequest;
 import com.persagy.adm.diagram.core.model.legend.Legend;
 import com.persagy.adm.diagram.manage.LegendManager;
 import com.persagy.dmp.common.model.response.CommonResult;
+import com.persagy.dmp.common.utils.ResultHelper;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -21,27 +22,27 @@ public class LegendController {
 	@ApiOperation("按照系统代码,查询图例列表")
 	@GetMapping("getLegends")
 	public CommonResult<List<Legend>> getLegends(@RequestParam String sys){
-		return CommonResult.success(legendManager.getLegends(sys));
+		return ResultHelper.single(legendManager.getLegends(sys));
 	}
 
 	@PostMapping("saveLegend")
 	public CommonResult<Legend> saveLegend(@RequestBody EditRequest req){
-		return CommonResult.success(legendManager.saveLegend(req.getLegend(), req.getSys()));
+		return ResultHelper.single(legendManager.saveLegend(req.getLegend(), req.getSys()));
 	}
 
 	@PostMapping("delLegend")
 	public CommonResult<Boolean> delLegend(@RequestBody EditRequest req){
-		return CommonResult.success(legendManager.deleteLegend(req.getCurrentCompId(), req.getSys()));
+		return ResultHelper.single(legendManager.deleteLegend(req.getCurrentCompId(), req.getSys()));
 	}
 
 //	@RequestMapping("fixRel")
 //	public CommonResult<Boolean> fixRel(){
-//		return CommonResult.success(legendManager.fixRel());
+//		return ResultHelper.single(legendManager.fixRel());
 //	}
 
 	@RequestMapping("fixDiagramType")
 	public CommonResult<Boolean> fixDiagramType(){
-		return CommonResult.success(legendManager.fixDiagramType());
+		return ResultHelper.single(legendManager.fixDiagramType());
 	}
 
 }

+ 16 - 15
adm-business/adm-diagram/src/main/java/com/persagy/adm/diagram/controller/TemplateController.java

@@ -5,6 +5,7 @@ import com.persagy.adm.diagram.frame.EditRequest;
 import com.persagy.adm.diagram.manage.Folder;
 import com.persagy.adm.diagram.manage.TemplateManager;
 import com.persagy.dmp.common.model.response.CommonResult;
+import com.persagy.dmp.common.utils.ResultHelper;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -23,63 +24,63 @@ public class TemplateController {
     @ApiOperation("查询模板列表")
     @GetMapping("getTemplates")
     public CommonResult<List<Folder>> getTemplates(){
-        return CommonResult.success(templateManager.getTemplates());
+        return ResultHelper.single(templateManager.getTemplates());
     }
 
     @ApiOperation("按系统图类型查询模板列表")
     @GetMapping("getTemplatesByType")
     public CommonResult<List<DiagramTemplate>> getTemplatesByType(@RequestParam String diagramType){
-        return CommonResult.success(templateManager.getTemplates(diagramType));
+        return ResultHelper.single(templateManager.getTemplates(diagramType));
     }
 
     @PostMapping("newTemplate")
     public CommonResult<DiagramTemplate> newTemplate(@RequestBody Map<String, String> params){
-        return CommonResult.success(templateManager.createTemplate(params.get("name"), params.get("type")));
+        return ResultHelper.single(templateManager.createTemplate(params.get("name"), params.get("type")));
     }
 
     @PostMapping("delTemplate")
     public CommonResult<Boolean> delTemplate(@RequestBody Map<String, String> params){
-        return CommonResult.success(templateManager.deleteTemplate(params.get("id")));
+        return ResultHelper.single(templateManager.deleteTemplate(params.get("id")));
     }
 
     @PostMapping("editTemplateInfo")
     public CommonResult<Boolean> editTemplateInfo(@RequestBody Map<String, String> params){
-        return CommonResult.success(templateManager.editTemplateInfo(params.remove("id"), params));
+        return ResultHelper.single(templateManager.editTemplateInfo(params.remove("id"), params));
     }
 
     @PostMapping("addCon")
     public CommonResult<DiagramTemplate> addCon(@RequestBody EditRequest params){
-        return CommonResult.success(templateManager.addCon(params.getNewCompId(), params.getCurrentCompId(), params.getTemplateId()));
+        return ResultHelper.single(templateManager.addCon(params.getNewCompId(), params.getCurrentCompId(), params.getTemplateId()));
     }
 
     @PostMapping("delCon")
     public CommonResult<DiagramTemplate> delCon(@RequestBody EditRequest params){
-        return CommonResult.success(templateManager.delCon(params.getCurrentCompId(), params.getTemplateId()));
+        return ResultHelper.single(templateManager.delCon(params.getCurrentCompId(), params.getTemplateId()));
     }
 
     @PostMapping("moveCon")
     public CommonResult<DiagramTemplate> moveCon(@RequestBody EditRequest params){
-        return CommonResult.success(templateManager.moveCon(params.getCurrentCompId(), params.getTemplateId(), params.getMoveOffset()));
+        return ResultHelper.single(templateManager.moveCon(params.getCurrentCompId(), params.getTemplateId(), params.getMoveOffset()));
     }
 
     @PostMapping("addMainPipe")
     public CommonResult<DiagramTemplate> addMainPipe(@RequestBody EditRequest params){
-        return CommonResult.success(templateManager.addMainPipe(params.getLines(), params.getTemplateId()));
+        return ResultHelper.single(templateManager.addMainPipe(params.getLines(), params.getTemplateId()));
     }
 
     @PostMapping("delLine")
     public CommonResult<DiagramTemplate> delLine(@RequestBody EditRequest params){
-        return CommonResult.success(templateManager.delMainPipe(params.getCurrentCompId(), params.getTemplateId()));
+        return ResultHelper.single(templateManager.delMainPipe(params.getCurrentCompId(), params.getTemplateId()));
     }
 
     @PostMapping("modifyCon")
     public CommonResult<DiagramTemplate> modifyCon(@RequestBody EditRequest params){
-        return CommonResult.success(templateManager.modifyCon(params.getTemplatePropsData(), params.getCurrentCompId(), params.getTemplateId()));
+        return ResultHelper.single(templateManager.modifyCon(params.getTemplatePropsData(), params.getCurrentCompId(), params.getTemplateId()));
     }
 
     @PostMapping("modifyMainPipe")
     public CommonResult<DiagramTemplate> modifyMainPipe(@RequestBody EditRequest params){
-        return CommonResult.success(templateManager.modifyMainPipe(params.getTemplatePropsData(), params.getCurrentCompId(), params.getTemplateId()));
+        return ResultHelper.single(templateManager.modifyMainPipe(params.getTemplatePropsData(), params.getCurrentCompId(), params.getTemplateId()));
     }
 
     /**
@@ -87,7 +88,7 @@ public class TemplateController {
      */
     @PostMapping("modifyFilter")
     public CommonResult<DiagramTemplate> modifyFilter(@RequestBody EditRequest params){
-        return CommonResult.success(templateManager.modifyFilter(params.getDataFilter(), params.getCurrentCompId(), params.getTemplateId()));
+        return ResultHelper.single(templateManager.modifyFilter(params.getDataFilter(), params.getCurrentCompId(), params.getTemplateId()));
     }
 
     /**
@@ -95,7 +96,7 @@ public class TemplateController {
      */
     @PostMapping("modifyPack")
     public CommonResult<DiagramTemplate> modifyPack(@RequestBody EditRequest params){
-        return CommonResult.success(templateManager.modifyPack(params.getEquipPack(), params.getCurrentCompId(), params.getTemplateId()));
+        return ResultHelper.single(templateManager.modifyPack(params.getEquipPack(), params.getCurrentCompId(), params.getTemplateId()));
     }
 
     /**
@@ -103,7 +104,7 @@ public class TemplateController {
      */
     @PostMapping("modifyDynGroup")
     public CommonResult<DiagramTemplate> modifyDynGroup(@RequestBody EditRequest params){
-        return CommonResult.success(templateManager.modifyDynGroup(params.getDynGroup(), params.getCurrentCompId(), params.getTemplateId()));
+        return ResultHelper.single(templateManager.modifyDynGroup(params.getDynGroup(), params.getCurrentCompId(), params.getTemplateId()));
     }
 
 }