diff --git a/src/main/java/com/bonus/digitalSignage/system/dao/RoleDao.java b/src/main/java/com/bonus/digitalSignage/system/dao/RoleDao.java index 7118bd0..49653c6 100644 --- a/src/main/java/com/bonus/digitalSignage/system/dao/RoleDao.java +++ b/src/main/java/com/bonus/digitalSignage/system/dao/RoleDao.java @@ -24,7 +24,7 @@ public interface RoleDao { * @return */ @Options(useGeneratedKeys = true, keyProperty = "id") - @Insert("insert into sys_role(role_name, role_code,remarks,org_id,state, create_time, update_time,del_flag,level) values(#{name},#{roleCode}, #{remarks},#{orgId},#{state}, now(),now(),0,#{level})") + @Insert("insert into sys_role(role_name, role_code, remarks, org_id, create_time, update_time, del_flag) values(#{name}, #{roleCode}, #{remarks}, #{orgId}, now(), now(), 0)") int save(Role role); @@ -55,7 +55,7 @@ public interface RoleDao { * @param role * @return */ - @Update("update sys_role t set t.role_name = #{name},t.role_code = #{roleCode}, t.remarks = #{remarks},org_id=#{orgId},state=#{state}, update_time = now(),level=#{level} where t.role_id = #{id}") + @Update("update sys_role t set t.role_name = #{name},t.role_code = #{roleCode}, t.remarks = #{remarks},org_id=#{orgId}, update_time = now() where t.role_id = #{id}") int update(Role role); /** diff --git a/src/main/java/com/bonus/digitalSignage/system/service/impl/RoleServiceImpl.java b/src/main/java/com/bonus/digitalSignage/system/service/impl/RoleServiceImpl.java index 83aef66..631fd8f 100644 --- a/src/main/java/com/bonus/digitalSignage/system/service/impl/RoleServiceImpl.java +++ b/src/main/java/com/bonus/digitalSignage/system/service/impl/RoleServiceImpl.java @@ -65,7 +65,7 @@ public class RoleServiceImpl implements RoleService { } @Transactional(rollbackFor = Exception.class) - ServerResponse updateRole(Role role, List permissionIds) { + public ServerResponse updateRole(Role role, List permissionIds) { //查询角色名称是否存在 Role r = roleDao.getRole(role.getName()); if (r != null && !Objects.equals(r.getId(), role.getId())) { diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index a37c226..39a9a75 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -18,10 +18,15 @@ mybatis.mapper-locations=classpath:mappers/*/*Mapper.xml mybatis.type-aliases-package=com.bonus.digitalSignage.*.vo #redis config -spring.redis.host=192.168.0.7 -spring.redis.port=16379 -spring.redis.database=6 -spring.redis.password=Bonus@admin123! +#spring.redis.host=192.168.0.7 +#spring.redis.port=16379 +#spring.redis.database=6 +#spring.redis.password=Bonus@admin123! + +spring.redis.host=127.0.0.1 +spring.redis.port=6379 +spring.redis.password= + # \u65E5\u5FD7 logging.config=classpath:logback-boot.xml log.level.root=info diff --git a/src/main/resources/static/js/system/role.js b/src/main/resources/static/js/system/role.js index a5b34f5..b049148 100644 --- a/src/main/resources/static/js/system/role.js +++ b/src/main/resources/static/js/system/role.js @@ -6,28 +6,28 @@ layui.use(['form', 'layer', 'table', 'laydate'], function () { table = layui.table; layui.form.render(); pages(1, 10, 1); - form.on('switch(is-state)', function (obj) { - console.log(obj); - let url = dataUrl + "/roles/updateEnableState"; - let params = { - 'id': this.value, - 'state': obj.elem.checked ? 1 : 0 - } - params={ - encryptedData:encryptCBC(JSON.stringify(params)) - } - ajaxRequest(url, "POST", params, true, function () {}, function (result) { - console.log(result) - reloadData(); - if (result.status === 200) { - parent.layer.msg(result.data, {icon: 1}) - } else if (result.status === 204) { - parent.layer.alert(result.msg, {icon: 2}) - } - }, function (xhr) { - error(xhr) - }); - }); + // form.on('switch(is-state)', function (obj) { + // console.log(obj); + // let url = dataUrl + "/roles/updateEnableState"; + // let params = { + // 'id': this.value, + // 'state': obj.elem.checked ? 1 : 0 + // } + // params={ + // encryptedData:encryptCBC(JSON.stringify(params)) + // } + // ajaxRequest(url, "POST", params, true, function () {}, function (result) { + // console.log(result) + // reloadData(); + // if (result.status === 200) { + // parent.layer.msg(result.data, {icon: 1}) + // } else if (result.status === 204) { + // parent.layer.alert(result.msg, {icon: 2}) + // } + // }, function (xhr) { + // error(xhr) + // }); + // }); }) function pages(pageNum, pageSize, typeNum) { @@ -135,7 +135,7 @@ function initTable(dataList, limit, page) { unresize: true, align: "center" }, - {field: "state", title: "状态", align: "center", templet: '#is-state'}, + // {field: "state", title: "状态", align: "center", templet: '#is-state'}, /*{ field: "orgName", title: "上级组织", diff --git a/src/main/resources/static/pages/menu/addMenu.html b/src/main/resources/static/pages/menu/addMenu.html index d4434c8..8955728 100644 --- a/src/main/resources/static/pages/menu/addMenu.html +++ b/src/main/resources/static/pages/menu/addMenu.html @@ -1,182 +1,182 @@ - - - - - - - - -
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- -
-
-
- - -
-
-
+ + + + + + + + +
+ +
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+
+
+ + +
+
+
-
- -
+
+ +
- - - - - - - - - - + + + + + + + + + - + initParentMenuSelect(); + function add() { + $('#formSubmit').trigger('click') + } + function saveData() { + $('#form').bootstrapValidator(); + var bootstrapValidator = $("#form").data('bootstrapValidator'); + bootstrapValidator.validate(); + if(!bootstrapValidator.isValid()){ + return; + } + + var formdata = $("#form").serializeObject(); + console.log(formdata) + var params={ + encryptedData:encryptCBC(JSON.stringify(formdata)) + } + let url = dataUrl + "/permissions/add"; + ajaxRequest(url, "POST", params, true, function () {}, function (result) { + console.log(result) + if (result.status === 200) { + layer.msg("添加成功", {shift: -1, time: 1000}, function(){ + closePage(1) + }); + } else { + layer.alert(result.msg, {icon: 2}) + } + }, function (xhr) { + error(xhr) + }); + } + + function selectCss(){ + layer.open({ + type: 2, + title: "样式", + area: ['800px', '400px'], + maxmin: true, + shadeClose: true, + content: ['icon.html'] + }); + } + function closePage(type) { + let index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引 + parent.layer.close(index); //再执行关闭 + if (type === 1) { + parent.getMenuTree() + } + } + + \ No newline at end of file diff --git a/src/main/resources/static/pages/role/addRole.html b/src/main/resources/static/pages/role/addRole.html index ff7a36e..4e11808 100644 --- a/src/main/resources/static/pages/role/addRole.html +++ b/src/main/resources/static/pages/role/addRole.html @@ -24,21 +24,21 @@ -
- -
- - -
-
+ + + + + + + -
- -
- - -
-
+ + + + + + + - -
@@ -142,18 +140,18 @@ $("#roleCode").val(result.data.roleCode); $("#remarks").val(result.data.remarks); // $('#orgId').val(result.data.orgId); - console.log("result.data.state",result.data.state); - if (result.data.state === 1) { - document.getElementById('state_1').checked = true; - } else if (result.data.state === 0) { - document.getElementById('state_0').checked = true; - } - console.log("result.data.level",result.data.level) - if (result.data.level === 1) { - document.getElementById('level_1').checked = true; - } else if (result.data.level === 0) { - document.getElementById('level_0').checked = true; - } + // console.log("result.data.state",result.data.state); + // if (result.data.state === 1) { + // document.getElementById('state_1').checked = true; + // } else if (result.data.state === 0) { + // document.getElementById('state_0').checked = true; + // } + // console.log("result.data.level",result.data.level) + // if (result.data.level === 1) { + // document.getElementById('level_1').checked = true; + // } else if (result.data.level === 0) { + // document.getElementById('level_0').checked = true; + // } layui.form.render(); } else if (result.status === 500) { layer.alert(result.msg, {icon: 2})