From 9ca0dc6e7833715b875cc9b6b91d5c497b2bae8b Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期三, 30 八月 2023 09:05:45 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/hazardInvestigationSystem into zf

---
 src/main/java/com/gk/hotwork/Controller/ElementManagementController.java |   31 ++++++++++++++++++++++++++++++-
 1 files changed, 30 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/gk/hotwork/Controller/ElementManagementController.java b/src/main/java/com/gk/hotwork/Controller/ElementManagementController.java
index 17937c9..e553252 100644
--- a/src/main/java/com/gk/hotwork/Controller/ElementManagementController.java
+++ b/src/main/java/com/gk/hotwork/Controller/ElementManagementController.java
@@ -57,6 +57,33 @@
         List<ElementTree> elementTreeList = elementManagementService.getElementTree();
         return success(elementTreeList);
     }
+    
+    @ApiOperation("获取检查导则要素树")
+    @PostMapping("/getMenuType1Tree")
+    public Msg getMenuType1Tree() {
+        List<ElementTree> elementTreeList = elementManagementService.getMenuType1Tree();
+        return success(elementTreeList);
+    }
+    
+    
+    @ApiOperation("获取安全标准化要素树")
+    @PostMapping("/getMenuType2Tree")
+    public Msg getMenuType2Tree() {
+        List<ElementTree> elementTreeList = elementManagementService.getMenuType2Tree();
+        return success(elementTreeList);
+    }
+    
+    
+    
+    @ApiOperation("根据所选要素级别获取上级要素列表")
+    @ApiImplicitParams({ @ApiImplicitParam(name = "type",value = "当前要素级别")})
+    @PostMapping("/getSuperElement")
+    public Msg getSuperElement(@RequestBody JSONObject jsonObject) {
+    	Integer type = Integer.valueOf(jsonObject.get("type")==null?"0":jsonObject.get("type").toString());
+    	List<ElementManagement> list = elementManagementService.getSuperElement(type-1);
+        return success(list);
+    }
+    
 
     @ApiOperation("/新增")
     @PostMapping("/add")
@@ -65,7 +92,9 @@
             @ApiImplicitParam(name = "type",value = "要素级别"),
             @ApiImplicitParam(name = "parentId",value = "父级要素"),
             @ApiImplicitParam(name = "remark",value = "要素备注"),
-
+            @ApiImplicitParam(name = "menuType",value = "检查导则"),
+            @ApiImplicitParam(name = "point",value = "得分"),
+            @ApiImplicitParam(name = "weight",value = "权重")
     })
     public Msg add(@RequestBody ElementManagement param) {
         elementManagementService.addOne(param, getUser());

--
Gitblit v1.9.2