From d5fae6385b7f55cb84986b4b7fa341ad1cd9f75f Mon Sep 17 00:00:00 2001
From: zhangxp <zhangxp@chicecm.com>
Date: 星期四, 01 六月 2023 18:31:04 +0800
Subject: [PATCH] 集成接口联调
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
index a71680d..1ed0304 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -19,13 +19,13 @@
import com.vci.ubcs.code.po.CodeClassifyPO;
import com.vci.ubcs.code.service.ICodeClassifyService;
import com.vci.ubcs.code.service.ICodeKeyAttrRepeatService;
+import com.vci.ubcs.code.service.ICodeOsattributeService;
import com.vci.ubcs.code.service.ICodeRuleService;
import com.vci.ubcs.code.vo.CodeOsattributeVO;
import com.vci.ubcs.code.vo.CodeOsbtmtypeVO;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
import com.vci.ubcs.code.vo.pagemodel.CodeKeyAttrRepeatRuleVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
-import com.vci.ubcs.core.log.exception.ServiceException;
import com.vci.ubcs.omd.feign.IBtmTypeClient;
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.starter.bo.WriteExcelData;
@@ -50,11 +50,13 @@
import org.slf4j.LoggerFactory;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.launch.constant.AppConstant;
+import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -86,7 +88,11 @@
@Resource
private IBtmTypeClient btmTypeClient;
-
+ /**
+ * 灞炴�ф湇鍔�
+ */
+// @Autowired
+// private OsAttributeServiceI attributeService;
/**
* 鏃ュ織
@@ -267,7 +273,6 @@
return codeClassifyMapper.checkHasChild(oid.trim());
}
-
/**
* 鍒犻櫎涓婚搴撳垎绫�
* @param codeClassify 涓婚搴撳垎绫绘暟鎹紶杈撳璞★紝oid鍜宼s闇�瑕佷紶杈�
@@ -372,7 +377,6 @@
return codeClassifyDO2VOs(codeClassifyDOList);
}
-
/**
* 浣跨敤涓婚敭闆嗗悎鏌ヨ鏁版嵁瀵硅薄
* @param oidCollections 涓婚敭鐨勯泦鍚�
@@ -391,7 +395,6 @@
}
return codeClassifyList;
}
-
/**
* 鎵归噺鏁版嵁瀵硅薄杞崲涓烘樉绀哄璞�
@@ -907,7 +910,7 @@
condition.put("pkbtmtype",topClassifyVO.getBtmtypeid());
List<CodeOsbtmtypeattributeEntity> unDefaultAttributes = codeOsbtmtypeattributeMapper.selectByMap(condition);
-// List<OsBtmTypeAttributeVO> unDefaultAttributes = btmService. (topClassifyVO.getBtmtypeid());
+ // List<OsBtmTypeAttributeVO> unDefaultAttributes = btmService. (topClassifyVO.getBtmtypeid());
List<CodeOsattributeVO> attributeVOS = new ArrayList<>();
if(!CollectionUtils.isEmpty(unDefaultAttributes)){
unDefaultAttributes.stream().forEach(attr->{
@@ -917,6 +920,7 @@
attributeVO.setAttrlength(Short.valueOf(attr.getAttributelength()));
attributeVO.setBtmtypeid(attr.getReferbtmtypeid());
attributeVO.setBtmtypename(attr.getReferbtmtypename());
+ attributeVO.setAttributedatatypetext(attr.getReferbtmtypename());
boolean add = true;
if(StringUtils.isNotBlank(id) && !attributeVO.getId().contains(id.replace("*",""))){
add = false;
@@ -929,8 +933,8 @@
}
});
}
-// if(!CollectionUtils.isEmpty(attributeService.getDefaultAttributeVOs())){
-// attributeService.getDefaultAttributeVOs().stream().forEach(attr->{
+// if(!CollectionUtils.isEmpty(codeOsattributeService.getDefaultAttributeVOs())){
+// codeOsattributeService.getDefaultAttributeVOs().stream().forEach(attr->{
// boolean add = true;
// if(StringUtils.isNotBlank(id) && !attr.getId().contains(id.replace("*",""))){
// add = false;
@@ -1123,7 +1127,6 @@
}
return fullInfo;
}
-
/**
* 缁熻瀛愯妭鐐圭殑涓暟
--
Gitblit v1.9.3