Browse Source

增加角色列表,page列表和添加,编辑功能

david 2 years ago
parent
commit
111cc1f3b6

BIN
out/artifacts/roma_api_jar/roma-api.jar


+ 21 - 0
src/main/java/com/roma/romaapi/controller/ApiController.java

@@ -96,6 +96,25 @@ public class ApiController {
         return CustomResponse.formatResponse(ret);
     }
 
+    // 获取指定页面page_details表数据
+    @RequestMapping("/api/pageDetail")
+    public Map pageDetail(HttpServletRequest request, @RequestBody String data){
+        Map maps = commonUtil.analysisRequestParams(request, data); // 参数
+        Map detailInfo = apiService.pageDetailById(maps);
+
+        return detailInfo;
+    }
+
+    // 页面管理-新增页面
+    @RequestMapping("/api/pageSave")
+    public Map pageSave(HttpServletRequest request, @RequestBody String data) {
+        Map maps = commonUtil.analysisRequestParams(request, data); // 参数
+
+        Map ret = apiService.addPage(maps);
+
+        return CustomResponse.formatResponse(ret);
+    }
+
     // 权限管理-添加权限-获取所有页面,选择关联页面
     @RequestMapping("/api/sqlList")
     public Map sqlDetailsList(){
@@ -146,6 +165,8 @@ public class ApiController {
         return CustomResponse.formatResponse(ret);
     }
 
+
+
     // 用户管理-获取全部用户
 
     // 用户分配角色

+ 21 - 0
src/main/java/com/roma/romaapi/dao/ApiDao.java

@@ -94,4 +94,25 @@ public class ApiDao {
 
         return row;
     }
+
+    // 添加page_details表数据
+    public Integer addPageDetails(Map<String, Object> bindValue, String editId) {
+        String sql = "";
+        if (editId.length()==0) {
+            sql = " INSERT INTO `page_details` (`page_name`,`page_code`,`page_json`,`created_at`,`is_enable`," +
+                    "`front_path`,`page_description`)  VALUES (:pageName,:pageCode,:pageJson,:createdAt,:isEnable,:frontPath,:pageDesc)  ";
+            KeyHolder keyHolder = new GeneratedKeyHolder();
+            Integer row = namedParameterJdbcTemplate.update(sql, new MapSqlParameterSource(bindValue), keyHolder);
+            int k = keyHolder.getKey().intValue();
+
+            return k;
+        } else {
+            bindValue.put("id", editId);
+            sql = " UPDATE `page_details` SET `page_name`=:pageName,`page_code`=:pageCode,`page_json`=:pageJson,`is_enable`=:isEnable," +
+                    "`front_path`=:frontPath,`page_description`=:pageDesc WHERE id=:id";
+            Integer row = namedParameterJdbcTemplate.update(sql, bindValue);
+
+            return row;
+        }
+    }
 }

+ 1 - 7
src/main/java/com/roma/romaapi/dao/PageDao.java

@@ -35,17 +35,11 @@ public class PageDao {
     // 获取全部菜单项
     public List<Map<String, Object>> getMenuForList(){
         Map<String, Object> paramMap = new HashMap<>();
-//        paramMap.put("type_menu", "menu");
-//        paramMap.put("type_dir", "dir");
-//        String sql = " SELECT  `rp`.`id`,`rp`.`parent_id`,`rp`.`icon`,`rp`.`type`,`rp`.`value` AS `path`,`pd`.`front_path` AS `url`,`rp`.`display_name` AS `label` " +
-//                "FROM `roma_permissions` AS `rp` LEFT JOIN `page_details` AS `pd` ON `pd`.`id`=`rp`.`page_id` " +
-//                "WHERE `rp`.`is_enable`=1 AND (`rp`.`type`=:type_menu OR `rp`.`type`=:type_dir )  ORDER BY `rp`.`sort` ASC ";
-          String sql= " SELECT  `rp`.`id`,`rp`.`parent_id`,`rp`.`permissions_icon` as `icon`,`rp`.`object_type`," +
+          String sql= " SELECT  `rp`.`is_visible`,`rp`.`id`,`rp`.`parent_id`,`rp`.`permissions_icon` as `icon`,`rp`.`object_type`," +
                   "`rp`.`object_id`,`pd`.`page_code` AS `path`,`pd`.`front_path` AS `url`,`rp`.`menu_name` AS `label` " +
                   "FROM `roma_permissions` AS `rp` LEFT JOIN `page_details` AS `pd` ON `pd`.`id`=`rp`.`object_id` " +
                   "WHERE `rp`.`is_enable`=1   and `rp`.`is_menu`=1   ORDER BY `rp`.`permission_sort` ASC ";
         List<Map<String, Object>> resMap2 = namedParameterJdbcTemplate.queryForList(sql, paramMap);
-        System.out.println("==========================="+resMap2);
 
         return resMap2;
     }

+ 47 - 5
src/main/java/com/roma/romaapi/service/ApiService.java

@@ -217,13 +217,55 @@ public class ApiService {
         return retInfo;
     }
 
-//    public List pageList() {
-//        List<Map<String, Object>> pageList = pageDao.getAllPageList(); // 获取全部页面数据
-//
-//        return  pageList;
-//    }
+    // 编辑page,获取page单条数据详情
+    public Map pageDetailById(Map params) {
+        String id = params.get("id").toString();
+        Map info = apiDao.getDetailsInfoByIdAndType("page_details", id);
 
+        return info;
+    }
 
+    // 添加page_details表数据
+    public Map addPage(Map maps) {
+        String pageDesc = "";
+        String frontPath = maps.get("front_path").toString();
+        String isEnable = maps.get("is_enable").toString();
+        String pageCode = maps.get("page_code").toString();
+        String pageName = maps.get("page_name").toString();
+        String pageJson = maps.get("page_json").toString();
+//        if (maps.containsKey("role_desc")) {
+//            roleDesc = maps.get("role_desc").toString();
+//        }
+        if(maps.containsKey("page_desc")) {
+            pageDesc = maps.get("page_desc").toString();
+        } else if(maps.containsKey("page_description")){
+            pageDesc = maps.get("page_description").toString();
+        }
+        // 通过是否存在id,判读是新增还是修改
+        String editId = "";
+        if (maps.containsKey("id")) {
+            editId = maps.get("id").toString();
+        }
+        String createdAt = commonUtil.getNowYYMMDDHHIISS();
+        Map<String, Object> addPagePamars = new HashMap<>();
+        addPagePamars.put("frontPath", frontPath);
+        addPagePamars.put("isEnable", isEnable);
+        addPagePamars.put("pageCode", pageCode);
+        addPagePamars.put("pageDesc", pageDesc);
+        addPagePamars.put("pageName", pageName);
+        addPagePamars.put("pageJson", pageJson);
+        if (editId.length()==0) {
+            // 如果不存在说明是新增
+            addPagePamars.put("createdAt", createdAt);
+        }
+        // 添加Page
+        Integer pageId = apiDao.addPageDetails(addPagePamars, editId);
+        Map retInfo = new HashMap<>();
+        if(pageId <= 0){
+            retInfo.put("sysErrorCode", "500");
+        }
+        return retInfo;
+    }
 
     // 转换tree结构数据
     private List<Map<String, Object>> treeMenu(List<Map<String, Object>> renderMenu){

+ 3 - 3
src/main/java/com/roma/romaapi/service/PageService.java

@@ -39,11 +39,11 @@ public class PageService {
             tempMap.put("label", (String) map.get("label"));
             tempMap.put("icon", (String) map.get("icon"));
             boolean visible = true;
-            if (!map.containsKey("visible")) {
+            if (!map.containsKey("is_visible")) {
             } else {
-                Object objectVisible = map.get("visible");
+                Object objectVisible = map.get("is_visible");
                 String stringVisible = objectVisible.toString();
-                visible = stringVisible.equals("0") || stringVisible.equals("1");
+                visible = stringVisible.equals("1");
             }
             tempMap.put("visible", visible);
             switch (menuType) {