基础管理

This commit is contained in:
fl 2025-04-22 16:29:55 +08:00
parent 0e974a5dd2
commit 77f95b3e6e
6 changed files with 232 additions and 229 deletions

View File

@ -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);
/**

View File

@ -65,7 +65,7 @@ public class RoleServiceImpl implements RoleService {
}
@Transactional(rollbackFor = Exception.class)
ServerResponse updateRole(Role role, List<Long> permissionIds) {
public ServerResponse updateRole(Role role, List<Long> permissionIds) {
//查询角色名称是否存在
Role r = roleDao.getRole(role.getName());
if (r != null && !Objects.equals(r.getId(), role.getId())) {

View File

@ -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

View File

@ -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: "上级组织",

View File

@ -1,14 +1,14 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<head>
<meta charset="UTF-8">
<link rel="stylesheet" type="text/css" media="screen" href="../../css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" media="screen" href="../../css/font-awesome/css/font-awesome.css">
<link rel="stylesheet" href="../../js/layui-v2.6.8/css/layui.css" media="all">
<link rel="stylesheet" href="../../css/dataForm.css">
</head>
<body>
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
</head>
<body>
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
<form class="layui-form form-horizontal" onsubmit="return false" id="form">
<fieldset>
<div class="layui-form-item" style="margin-top: 2%;">
@ -73,7 +73,7 @@
</fieldset>
</form>
</div>
</div>
<script type="text/javascript" src="../../js/libs/jquery-3.7.0.min.js"></script>
<script type="text/javascript" src="../../js/jq.js"></script>
@ -178,5 +178,5 @@
}
}
</script>
</body>
</body>
</html>

View File

@ -24,21 +24,21 @@
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label"> <i style="padding: 0 10px;">*</i> 状态:</label>
<div class="layui-input-block" >
<input type="radio" id="state_1" name="state" value="1" title="启用" checked>
<input type="radio" id="state_0" name="state" value="0" title="关闭">
</div>
</div>
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label"> <i style="padding: 0 10px;">*</i> 状态:</label>-->
<!-- <div class="layui-input-block" >-->
<!-- <input type="radio" id="state_1" name="state" value="1" title="启用" checked>-->
<!-- <input type="radio" id="state_0" name="state" value="0" title="关闭">-->
<!-- </div>-->
<!-- </div>-->
<div class="layui-form-item">
<label class="layui-form-label"> <i style="padding: 0 10px;">*</i> 角色级别:</label>
<div class="layui-input-block" >
<input type="radio" id="level_1" name="level" value="1" title="公司级" checked>
<input type="radio" id="level_0" name="level" value="0" title="项目部级">
</div>
</div>
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label"> <i style="padding: 0 10px;">*</i> 角色级别:</label>-->
<!-- <div class="layui-input-block" >-->
<!-- <input type="radio" id="level_1" name="level" value="1" title="公司级" checked>-->
<!-- <input type="radio" id="level_0" name="level" value="0" title="项目部级">-->
<!-- </div>-->
<!-- </div>-->
<!--<div class="layui-form-item" style="margin-top: 2%;">
<label class="layui-form-label"><i style="padding: 0 10px;">*</i>角色编码</label>
@ -61,8 +61,6 @@
</div>
</div>-->
<div class="layui-form-item" style="margin-top: 2%;">
<label class="layui-form-label">权限</label>
<div class="layui-input-inline">
@ -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})