From a45481497905e36dfbc9c07cc66639c389648c03 Mon Sep 17 00:00:00 2001 From: Guo XIn <371864209@qq.com> Date: Mon, 3 Jul 2023 11:16:26 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=AE=E5=BD=95=E8=A1=A8=E3=80=81=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=B1=BB=E3=80=81=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE=E5=AF=86=E7=BA=A7=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dbsql/update/update202306.sql | 5 +- .../controller/BianmuIndexController.java | 2 + .../resources/static/css/common/contianer.css | 65 +++++++++++++------ .../shandan/bianmu/entity/DirectoryVo.java | 6 ++ .../static/js/business/directory/dirCommon.js | 22 +++++-- 5 files changed, 75 insertions(+), 25 deletions(-) diff --git a/dbsql/update/update202306.sql b/dbsql/update/update202306.sql index 888be7d..6311235 100644 --- a/dbsql/update/update202306.sql +++ b/dbsql/update/update202306.sql @@ -1,3 +1,6 @@ -- 用户表增加涉密级别字段 alter table BIANMU.SYS_USER add SECRET_LEVEL integer default 0 not null; -comment on column BIANMU.SYS_USER.SECRET_LEVEL is '涉密级别'; \ No newline at end of file +comment on column BIANMU.SYS_USER.SECRET_LEVEL is '涉密级别'; +-- 目录表增加数据密级字段 +alter table BIANMU.B_DIRECTORY add SECRET_LEVEL integer default 0 not null; +comment on column BIANMU.B_DIRECTORY.SECRET_LEVEL is '数据密级'; \ No newline at end of file diff --git a/shandan-bianmu/src/main/java/com/keyware/shandan/bianmu/controller/BianmuIndexController.java b/shandan-bianmu/src/main/java/com/keyware/shandan/bianmu/controller/BianmuIndexController.java index e7e9148..ce147c8 100644 --- a/shandan-bianmu/src/main/java/com/keyware/shandan/bianmu/controller/BianmuIndexController.java +++ b/shandan-bianmu/src/main/java/com/keyware/shandan/bianmu/controller/BianmuIndexController.java @@ -7,6 +7,7 @@ import com.keyware.shandan.system.entity.SysUser; import com.keyware.shandan.system.service.SysRoleService; import com.keyware.shandan.system.service.SysUserService; import com.keyware.shandan.system.utils.MenuUtil; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -25,6 +26,7 @@ import java.util.Set; * @author Administrator * @since 2021/6/17 */ +@Slf4j @RestController @RequestMapping("/") public class BianmuIndexController { diff --git a/shandan-common/src/main/resources/static/css/common/contianer.css b/shandan-common/src/main/resources/static/css/common/contianer.css index 96ebafc..f8666b0 100644 --- a/shandan-common/src/main/resources/static/css/common/contianer.css +++ b/shandan-common/src/main/resources/static/css/common/contianer.css @@ -108,8 +108,9 @@ cite button.tag-item { margin-top: 0; margin-left: 10px; } -.layui-checkbox-disabled.layui-form-checked[lay-skin=primary] i{ - border-color: #c2c2c2!important; + +.layui-checkbox-disabled.layui-form-checked[lay-skin=primary] i { + border-color: #c2c2c2 !important; background-color: #c2c2c2; } @@ -119,26 +120,32 @@ cite button.tag-item { justify-content: space-between; align-items: center; } + .permis-item { margin-top: 10px; padding-left: 15px; } -.permis-item .line{ + +.permis-item .line { flex: 0.9; height: 0; border-bottom: 1px dashed #CCC; } -.permis-item label{ + +.permis-item label { align-self: center } -.permis-ops .layui-form-checkbox[lay-skin=primary]{ + +.permis-ops .layui-form-checkbox[lay-skin=primary] { margin-top: 0; padding-left: 25px; } -.permis-item .layui-form-checkbox{ + +.permis-item .layui-form-checkbox { margin-top: 0; } -.label-set-component{ + +.label-set-component { display: flex; flex-direction: row; align-items: center; @@ -146,7 +153,8 @@ cite button.tag-item { flex-wrap: wrap; border-bottom: 1px inset #efefef; } -.label-type{ + +.label-type { padding: 5px; border: 1px solid gray; border-radius: 5px; @@ -155,46 +163,65 @@ cite button.tag-item { min-width: fit-content; margin: 5px 0; } -.label-type:hover{color: #0C0C0C} -.data-container{ + +.label-type:hover { + color: #0C0C0C +} + +.data-container { } -.arrow{ + +.arrow { margin: 5px; color: #a3a3a3 } -.new-data, .choose-data, .new-data:hover, .choose-data:hover{ + +.new-data, .choose-data, .new-data:hover, .choose-data:hover { cursor: pointer; border-color: #009688; color: #009688; } -.choose-data, .clear-data{ + +.choose-data, .clear-data { cursor: pointer; - border:0; + border: 0; margin-left: 5px } -.clear-data, .clear-data:hover{ + +.clear-data, .clear-data:hover { color: #cfcfcf; } -.label-layer{ +.label-layer { display: flex; flex-direction: column; } -.label-tree{ + +.label-tree { flex: 1 } -.label-btns{ + +.label-btns { display: flex; flex-direction: row; justify-content: flex-end; padding: 10px 20px; border-top: 1px solid #f0f0f0; } -.add-other{ + +.add-other { margin: 0; padding: 0; position: absolute; left: 10px; top: 10px; } + +.layui-form-radio { + margin: 0 10px 0 0; +} + +.layui-form-radio > i { + margin-right: 5px; +} \ No newline at end of file diff --git a/shandan-system/src/main/java/com/keyware/shandan/bianmu/entity/DirectoryVo.java b/shandan-system/src/main/java/com/keyware/shandan/bianmu/entity/DirectoryVo.java index 8cf61d6..67abf19 100644 --- a/shandan-system/src/main/java/com/keyware/shandan/bianmu/entity/DirectoryVo.java +++ b/shandan-system/src/main/java/com/keyware/shandan/bianmu/entity/DirectoryVo.java @@ -60,6 +60,12 @@ public class DirectoryVo extends BaseEntity { @TableField("DIRECTORY_TYPE") private DirectoryType directoryType; + /** + * 数据密级 + */ + @TableField("SECRET_LEVEL") + private Integer secretLevel; + /** * 资源ID * 当目录类型为DIRECTORY时，该字段值为null diff --git a/shandan-system/src/main/resources/static/js/business/directory/dirCommon.js b/shandan-system/src/main/resources/static/js/business/directory/dirCommon.js index f9f9778..07c6396 100644 --- a/shandan-system/src/main/resources/static/js/business/directory/dirCommon.js +++ b/shandan-system/src/main/resources/static/js/business/directory/dirCommon.js @@ -1,5 +1,5 @@ let layer, orgTree, gtable, globalTree, tag, listPage, form, element; -layui.use(['layer', 'orgTree', 'gtable', 'globalTree', 'tag', 'listPage', 'form', 'element'], function () { +layui.use(['layer', 'orgTree', 'gtable', 'globalTree', 'tag', 'listPage', 'form', 'element', 'dict'], function () { layer = layui.layer; orgTree = layui.orgTree; gtable = layui.gtable; @@ -36,9 +36,14 @@ function openDirectoryEditLayer(data, callback, view) { - + +
+ +
+
${data.owner || user.userName} @@ -113,9 +118,9 @@ function openDirectoryEditLayer(data, callback, view) {
- ${data.createUserName} - - + ${data.createUserName || user.userName} + +
`, @@ -131,6 +136,13 @@ function openDirectoryEditLayer(data, callback, view) { style: 'border: 1px solid #d3d3d3;', click: dirOwnerChangeCallback }); + layui.dict.render(); + if(!data || !data.secretLevel){ + data['secretLevel'] = 0; + } + layui.dict.setData('dict-secret-level', data) + $('div.dict-component').css({'margin-top': '5px', 'width': '380px', 'margin-left': '4px'}) + // 目录成员管理事件 $('#memberManageBtn').on('click', () => { let formVal = form.val('directoryEditForm');