david 2 лет назад
Родитель
Сommit
a7d506cd3c

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


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

@@ -346,14 +346,14 @@ public class ApiDao {
             if (id.length() > 0) {
                 bindValue.put("id", id);
                 String updateSql = " UPDATE `roma_permissions` SET `parent_id`=:parentId,`object_type`=:objectType," +
-                        "`object_id`=:objectId,`is_menu`=:isMenu,`permission_sort`=:permissionSort," +
+                        "`object_id`=:objectId,`is_dir`=:isMenu,`permission_sort`=:permissionSort," +
                         "`permissions_icon`=:permissionsIcon,`is_enable`=:isEnable,`created_at`=:createdAt," +
                         "`menu_name`=:menuName,`is_visible`=:isVisible,`permission_describe`=:permissionDescribe " +
                         " WHERE id=:id ";
                 Integer updateRet = namedParameterJdbcTemplate.update(updateSql, bindValue);
                 return updateRet;
             } else {
-                String insertAql = " INSERT INTO `roma_permissions` (`parent_id`,`object_type`,`object_id`,`is_menu`," +
+                String insertAql = " INSERT INTO `roma_permissions` (`parent_id`,`object_type`,`object_id`,`is_dir`," +
                         "`permission_sort`,`permissions_icon`,`is_enable`,`created_at`,`menu_name`,`is_visible`,`permission_describe`)" +
                         " VALUES (:parentId,:objectType,:objectId,:isMenu,:permissionSort,:permissionsIcon,:isEnable,:createdAt," +
                         ":menuName,:isVisible,:permissionDescribe)  ";

+ 0 - 4
src/main/java/com/roma/romaapi/dao/DbApiDao.java

@@ -54,16 +54,12 @@ public class DbApiDao {
 
     // 查询数据--多条数据使用
     public List<Map<String, Object>> dbCustomQueryForList(String sql, Map<String, Object> bindValue){
-        System.out.println("sql-----"+sql);
-        System.out.println("bindvalue------------"+bindValue);
         List<Map<String, Object>> resMap2 = namedParameterJdbcTemplate.queryForList(sql, bindValue);
         return  resMap2;
     }
 
     // 执行增删改语句
     public Integer dbUpdate(String sql, Map<String, Object> bindValue){
-        System.out.println("sql-----"+sql);
-        System.out.println("bindvalue------------"+bindValue);
         Integer row = namedParameterJdbcTemplate.update(sql, bindValue);
         return  row;
     }

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

@@ -41,7 +41,7 @@ public class PageDao {
           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 ";
+                  "WHERE `rp`.`is_enable`=1   and `rp`.`object_type`='page'    ORDER BY `rp`.`permission_sort` ASC ";
         List<Map<String, Object>> resMap2 = namedParameterJdbcTemplate.queryForList(sql, paramMap);
 
         return resMap2;
@@ -51,7 +51,7 @@ public class PageDao {
     public List<Map<String, Object>> getAllMenuForList(){
         Map<String, Object> paramMap = new HashMap<>();
         String sql = " SELECT  `rp`.`is_enable`,`rp`.`id`,`rp`.`parent_id`,`rp`.`permissions_icon`,`rp`.`object_type`," +
-                "`rp`.`object_id`,`rp`.`is_menu`,`rp`.`permission_sort`,`rp`.`menu_name` FROM `roma_permissions` AS `rp` " +
+                "`rp`.`object_id`,`rp`.`is_dir`,`rp`.`permission_sort`,`rp`.`menu_name` FROM `roma_permissions` AS `rp` " +
                 "WHERE  1=1  ORDER BY `rp`.`permission_sort` ASC";
         List<Map<String, Object>> resMap2 = namedParameterJdbcTemplate.queryForList(sql, paramMap);
 
@@ -62,7 +62,7 @@ public class PageDao {
     public List<Map<String, Object>> getPageMenuForList(){
         Map<String, Object> paramMap = new HashMap<>();
         String sql = " SELECT  `pd`.`page_code`,`pd`.`page_name`,`rp`.`is_enable`,`rp`.`id`,`rp`.`parent_id`,`rp`.`permissions_icon`,`rp`.`object_type`," +
-                "`rp`.`object_id`,`rp`.`is_menu`,`rp`.`permission_sort`,`rp`.`menu_name` FROM `roma_permissions` AS `rp` " +
+                "`rp`.`object_id`,`rp`.`is_dir`,`rp`.`permission_sort`,`rp`.`menu_name` FROM `roma_permissions` AS `rp` " +
                 " LEFT JOIN `page_details` as `pd` ON `pd`.`id`=`rp`.`object_id` " +
                 "WHERE 1=1 ORDER BY `rp`.`permission_sort` ASC";
         List<Map<String, Object>> resMap2 = namedParameterJdbcTemplate.queryForList(sql, paramMap);

+ 1 - 1
src/main/resources/application.properties

@@ -1 +1 @@
-#服务
server.port=8056
server.servlet.session.timeout=600

#数据库
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://172.19.152.218:3306/lowcode?serverTimezone=UTC&tinyInt1isBit=false&transformedBitIsBoolean=false
spring.datasource.username = root
spring.datasource.password = mypass

#redis
spring.redis.database=0
spring.redis.password=
#spring.redis.password=name:password
spring.redis.port=6379
spring.redis.host=127.0.0.1
spring.redis.timeout=5000

## 文件上传地址
upload.path = D:/javaupload
+#服务
server.port=8056
server.servlet.session.timeout=600

#数据库
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.url = jdbc:mysql://172.27.121.115:3306/lowcode?serverTimezone=UTC&tinyInt1isBit=false&transformedBitIsBoolean=false
spring.datasource.username = root
spring.datasource.password = mypass

#redis
spring.redis.database=0
spring.redis.password=
#spring.redis.password=name:password
spring.redis.port=6379
spring.redis.host=127.0.0.1
spring.redis.timeout=5000

## 文件上传地址
upload.path = D:/javaupload