From d97fedd09ef0d768fe97f803b6568dbb96f74071 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期四, 15 六月 2023 11:09:59 +0800
Subject: [PATCH] 1、主要完成密级服务的编写
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index 9280f3a..097b294 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -24,10 +24,9 @@
import com.vci.ubcs.code.vo.pagemodel.*;
import com.vci.ubcs.omd.constant.BtmTypeLcStatusConstant;
import com.vci.ubcs.omd.entity.BtmTypeAttribute;
-import com.vci.ubcs.omd.feign.IAttributeClient;
-import com.vci.ubcs.omd.feign.IBtmTypeClient;
-import com.vci.ubcs.omd.feign.IEnumClient;
-import com.vci.ubcs.omd.feign.IRevisionRuleClient;
+import com.vci.ubcs.omd.cache.EnumCache;
+import com.vci.ubcs.omd.feign.*;
+import com.vci.ubcs.omd.utils.VciOmdUtil;
import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.omd.vo.EnumVO;
@@ -108,8 +107,6 @@
@Resource
private CodeClstemplateServiceImpl templateService;
- @Resource
- private IAttributeClient attributeClient;
/**
* 鐢熸垚缂栫爜鐨勬湇鍔�
@@ -127,6 +124,11 @@
*/
@Resource
ISysClient iSysClient;
+ /**
+ * 绯荤粺鐨勬湇鍔�
+ */
+ @Resource
+ private IWebSecretClient secretService;
/**
* 鐢ㄦ埛鏈嶅姟
*/
@@ -853,9 +855,7 @@
}
int secret = VciBaseUtil.getInt(String.valueOf(cbo.getSecretGrade()));
- //鍚庣画鐪嬪瘑绾ф湇鍔℃槸鍚﹀彲鐢�
-// if (secret == 0 || !secretService.checkDataSecret(secret)) {
- if (secret == 0 ) {
+ if (secret == 0 || !secretService.checkDataSecret(secret).getData()) {
Integer userSecret = VciBaseUtil.getCurrentUserSecret();
// cbo.setAttributeValue(SECRET_FIELD, String.valueOf((userSecret == null || userSecret == 0) ? UserSecretEnum.NONE.getValue() : userSecret));
cbo.setSecretGrade(userSecret == null || userSecret == 0 ? UserSecretEnum.NONE.getValue() : userSecret);
@@ -1245,8 +1245,8 @@
fieldVO.setComboxKey(fieldVO.getField() + "_data");
}
} else {
-// List<KeyValue> osEnumItemVOList= enumService.getEnum(attrVO.getEnumId());
-// fieldVO.setData(osEnumItemVOList);
+ List<KeyValue> osEnumItemVOList= VciOmdUtil.enumsToListKeyVale(EnumCache.getList(attrVO.getEnumId()));
+ fieldVO.setData(osEnumItemVOList);
}
}
//鐪嬫槸鍚︽湁鍙傜収
@@ -1748,7 +1748,7 @@
if (attrVOMap.keySet().contains("secretgrade")) {
Integer userSecret = VciBaseUtil.getCurrentUserSecret();
if (userSecret == null || userSecret == 0) {
-// userSecret = secretService.getMinUserSecret();
+ userSecret = secretService.getMinUserSecret().getData();
}
whereSql += " and ( t.secretGrade <= " + userSecret + ") ";
}
@@ -2970,12 +2970,11 @@
@Override
public MdmUIInfoVO getUIInfoByClassifyOid(String codeClassifyOid, String functionId) {
VciBaseUtil.alertNotNull(codeClassifyOid, "涓婚搴撳垎绫讳富閿�");
+
MdmUIInfoVO uiInfoVO = getTableDefineByTemplateVO(getUsedTemplateByClassifyOid(codeClassifyOid));
uiInfoVO.setLeaf(classifyService.countChildrenByClassifyOid(codeClassifyOid) == 0);
if (StringUtils.isNotBlank(functionId) && !"~".equalsIgnoreCase(functionId)) {
List<Menu> buttonVOS = iSysClient.getMenuButtonByType(uiInfoVO.getTemplateVO().getBtmTypeId()).getData();
-
- //鍔熻兘鎸夐挳鏈嶅姟杩樻湭瀹炵幇锛岀瓑瀹炵幇浜嗭紝鍦ㄨ繘琛岃皟鐢�
// List<SmOperationVO> operationVOS = operationService.listButtonByFunctionId(functionId);
// if (operationVOS == null) {
// operationVOS = new ArrayList<>();
--
Gitblit v1.9.3