From ebbd0efdfc7cad7043a0d4620d5f508fbea75683 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 05 七月 2023 09:59:55 +0800
Subject: [PATCH] 发布流程增加参数
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java | 152 +++++++++++++++++---------------------------------
1 files changed, 52 insertions(+), 100 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
index 8db0bd8..10740cd 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
@@ -14,28 +14,33 @@
import com.vci.ubcs.code.enumpack.CodeLevelTypeEnum;
import com.vci.ubcs.code.mapper.CodeClassifyTemplateAttrMapper;
import com.vci.ubcs.code.mapper.CodeClassifyTemplateMapper;
-import com.vci.ubcs.code.mapper.CodeOsbtmtypeattributeMapper;
import com.vci.ubcs.code.service.ICodeClassifyTemplateAttrService;
import com.vci.ubcs.code.service.ICodeTempphaseService;
-import com.vci.ubcs.code.vo.CodeOsbtmtypeattributeVO;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
import com.vci.ubcs.code.wrapper.CodeClassifyTemplateAttrWrapper;
+import com.vci.ubcs.omd.feign.IAttributeClient;
+import com.vci.ubcs.omd.feign.IBtmTypeClient;
+import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
+import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.PatternUtil;
+import com.vci.ubcs.starter.util.UBCSCondition;
import com.vci.ubcs.starter.web.enumpck.VciFieldTypeEnum;
import com.vci.ubcs.starter.web.pagemodel.*;
-import com.vci.ubcs.starter.util.Map2MPJLambdaUtil;
import com.vci.ubcs.starter.web.pagemodel.PageHelper;
+import com.vci.ubcs.starter.web.util.BeanUtil;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import com.vci.ubcs.starter.web.util.VciDateUtil;
import com.vci.ubcs.system.entity.DictBiz;
import com.vci.ubcs.system.feign.IDictBizClient;
+import com.vci.ubcs.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cglib.beans.BeanMap;
import org.springframework.context.annotation.Lazy;
@@ -64,25 +69,27 @@
@Resource
private CodeClassifyTemplateAttrMapper codeClassifyTemplateAttrMapper;
- // @Resource
- // CodeClstempattrMapper codeClstempattrMapper;
- // @Resource
- // ICodeTempphaseService codeTempphaseService;
-
@Resource
IDictBizClient iDictBizClient;
+
@Resource
CodeClassifyTemplateMapper codeClassifyTemplateMapper;
- @Resource
- CodeOsbtmtypeattributeMapper codeOsbtmtypeattributeMapper;
+
@Resource
@Lazy
ICodeTempphaseService codeTempphaseService;
+
/**
* 瀵硅薄鐨勬搷浣�
*/
@Autowired(required = false)
private RevisionModelUtil revisionModelUtil;
+
+ /**
+ * 灞炴�ф湇鍔″璞�
+ */
+ @Resource
+ private IBtmTypeClient btmTypeClient;
/**
* 鏌ヨ鎵�鏈夌殑涓婚搴撳垎绫荤殑妯℃澘灞炴��
@@ -128,7 +135,7 @@
if(conditionMap == null){
conditionMap = new HashMap<String, String>();
}
- return gridCodeClassifyTemplateAttr(Map2MPJLambdaUtil.getMPJLambdaWrapperByMapString(conditionMap, CodeClassifyTemplateAttr.class),pageHelper);
+ return gridCodeClassifyTemplateAttr(UBCSCondition.getMPJLambdaWrapperByMapString(conditionMap, CodeClassifyTemplateAttr.class),pageHelper);
}
@Override
@@ -153,10 +160,10 @@
// conditionMap.put("classifytemplateoid", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(templateOids.toArray(new String[0])) + ")");
// PageHelper pageHelper = new PageHelper(-1);
// pageHelper.addDefaultAsc("orderNum");
- QueryWrapper<CodeClassifyTemplateAttr> wrapper = new QueryWrapper<>();
- wrapper.in("classifytemplateoid",templateOids);
- wrapper.orderByAsc("orderNum");
- List<CodeClassifyTemplateAttr> attrDOS = baseMapper.selectList(wrapper);
+// QueryWrapper<CodeClassifyTemplateAttr> wrapper = new QueryWrapper<>();
+// wrapper.in("classifytemplateoid",templateOids);
+// wrapper.orderByAsc("orderNum");
+ List<CodeClassifyTemplateAttr> attrDOS = baseMapper.selectByClassifytemplateoidRel(VciBaseUtil.toInSql(templateOids.toArray(new String[0])));
// baseMapper.selectByClassifytemplateoid(VciBaseUtil.toInSql(templateOids.toArray(new String[0])));
if(!CollectionUtils.isEmpty(attrDOS)){
@@ -290,34 +297,17 @@
pageHelper = new PageHelper(-1);
}
pageHelper.addDefaultAsc("ordernum");
-// IPage iPage = new IPage();
Query query = new Query();
query.setAscs("ordernum");
-// query.setSize(100);
if(pageHelper.getLimit() != -1){
query.setSize(pageHelper.getLimit());
query.setCurrent(pageHelper.getPage());
}
-// Condition.getPage(query)
- CodeClassifyTemplateAttr codeClstempattrVO = new CodeClassifyTemplateAttr();
-// BeanUtil.toBean(map,codeClstempattrVO);
-// BeanUtil
- BeanMap beanMap = BeanMap.create(codeClstempattrVO);
-
- beanMap.putAll(conditionMap);
-// Condition.getQueryWrapper(
IPage<CodeClassifyTemplateAttr> doList = baseMapper.
- selectPage(Condition.getPage(query), Condition.getQueryWrapper(codeClstempattrVO));
-
-
+ selectPage(Condition.getPage(query), UBCSCondition.getQueryWrapperByMapString(conditionMap,CodeClassifyTemplateAttr.class));
if (!CollectionUtils.isEmpty(doList.getRecords())) {
-// CodeClstempattrEntity codeClstempattrEntity = new CodeClstempattrEntity();
-// BeanUtils.copyProperties(conditionMap, codeClstempattrEntity);
-// List<CodeClstempattrEntity> codeClstempattrEntities = new ArrayList<>();
-// BeanUtils.copyProperties(doList,codeClstempattrEntities);
-// codeClstempattrEntities.addAll(doList);
dataGrid.setData(codeClassifyTemplateAttrDO2VOs(doList.getRecords()));
- dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(baseMapper.selectCount(Condition.getQueryWrapper(codeClstempattrVO)))));
+ dataGrid.setTotal(VciBaseUtil.getInt(String.valueOf(baseMapper.selectCount(UBCSCondition.getQueryWrapperByMapString(conditionMap,CodeClassifyTemplateAttr.class)))));
}
return dataGrid;
}
@@ -408,7 +398,7 @@
throw new VciBaseException("{0}{1}灞炴�х殑鏃堕棿鏍煎紡涓嶇鍚堣姹�",new String[]{codeClassifyTemplateAttrDO.getId(),codeClassifyTemplateAttrDO.getName()});
}
//濡傛灉鏄粍鍚堣鍒欙紝閲岄潰浣跨敤鐨勫睘鎬т笉鑳界己澶憋紝涔熼兘寰楁樉绀�
- String componentrule = codeClassifyTemplateAttrDTO.getComponentrule();
+ String componentrule = codeClassifyTemplateAttrDTO.getComponentRule();
boolean isContainsDynamicParameter = PatternUtil.isContainsDynamicParameter(componentrule);
if(isContainsDynamicParameter){
List<String> userdAttrList = PatternUtil.getKeyListByContent(componentrule);//鍖呭惈鐨勬墍鏈�${xxx}涓殑xxx
@@ -419,7 +409,7 @@
}
//瑕佺湅鐪嬭〃鍗曟槸鍚︽樉绀�
String unFormDisplayAttr = userdAttrList.stream().filter(s -> !VciBaseUtil.getBoolean(attrDTOMap.getOrDefault(s.toLowerCase(Locale.ROOT),
- new CodeClassifyTemplateAttrDTO()).getFormdisplayflag())).collect(Collectors.joining(","));
+ new CodeClassifyTemplateAttrDTO()).getFormDisplayFlag())).collect(Collectors.joining(","));
if(StringUtils.isNotBlank(unFormDisplayAttr)){
throw new VciBaseException("{0}灞炴�ф槸缁勫悎瑙勫垯锛屼絾鏄鍒欓噷鍖呭惈鐨勫睘鎬{1}]鍦ㄥ綋鍓嶆ā鏉夸腑娌℃湁璁剧疆 琛ㄥ崟鏄剧ず ",new String[]{codeClassifyTemplateAttrDO.getName(),unFormDisplayAttr});
}
@@ -427,7 +417,7 @@
}
if(CLASSIFYTEMPLATEOID==null){
- CLASSIFYTEMPLATEOID = codeClassifyTemplateAttrDTO.getClassifytemplateoid();
+ CLASSIFYTEMPLATEOID = codeClassifyTemplateAttrDTO.getClassifyTemplateOid();
}
}
@@ -449,7 +439,7 @@
}
// BatchCBO batchCBOTemplateDelete = new BatchCBO();
if(!CollectionUtils.isEmpty(oids)){
- baseMapper.deleteBatchIds(oids);
+ this.removeBatchByIds(oids);
}
//鍐嶆柊澧�
@@ -511,6 +501,7 @@
}
return isKV;
}
+
public boolean checkKVObj(String kvString){
boolean isKV = true;
try {
@@ -551,7 +542,7 @@
}
//鍒ゆ柇浼犺繃鏉ョ殑鍙傜収閰嶇疆鏄惁鏄痡son鏍煎紡
- if(StringUtils.isNotBlank(codeClassifyTemplateAttrDTO.getReferbtmid())&&!checkKVObj(codeClassifyTemplateAttrDTO.getReferbtmid())){
+ if(StringUtils.isNotBlank(codeClassifyTemplateAttrDTO.getReferBtmId())&&!checkKVObj(codeClassifyTemplateAttrDTO.getReferBtmId())){
throw new VciBaseException("鏋氫妇娉ㄥ叆鏁版嵁鏍煎紡閿欒!");
}
@@ -641,6 +632,7 @@
public CodeClassifyTemplateAttrVO getObjectByOid(String oid) throws VciBaseException{
return codeClassifyTemplateAttrDO2VO(selectByOid(oid));
}
+
/**
* 涓婚敭鏌ヨ鏁版嵁瀵硅薄
* @param oid 涓婚敭
@@ -689,31 +681,16 @@
}
/**
- * 鍙傜収涓婚搴撳垎绫荤殑妯℃澘灞炴�у垪琛�
- * @param conditionMap 鏌ヨ鏉′欢
- * @param pageHelper 鍒嗛〉鍜屾帓搴�
- * @return 涓婚搴撳垎绫荤殑妯℃澘灞炴�ф樉绀哄璞″垪琛紝鐢熸晥鐨勫唴瀹�
- * @throws VciBaseException 鏌ヨ鏉′欢鍜屽垎椤靛嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父
- */
-// @Override
-// public DataGrid<CodeClassifyTemplateAttrVO> refDataGridCodeClassifyTemplateAttr(Map<String, String> conditionMap, PageHelper pageHelper) throws VciBaseException{
-// if(conditionMap == null){
-// conditionMap = new HashMap<String, String>();
-// }
-// return gridCodeClassifyTemplateAttr(conditionMap,pageHelper);
-// }
-
- /**
* 鏌ヨ杩欎釜妯℃澘锛屼笟鍔＄被鍨嬩笅鐨勬墍鏈夋湭閫夋嫨鐨勫睘鎬�
* @param baseQueryObject
* @return
*/
@Override
- public DataGrid<CodeOsbtmtypeattributeVO> codeClassifyTemplateAttrByBtm(BaseQueryObject baseQueryObject){
+ public DataGrid<BtmTypeAttributeVO> codeClassifyTemplateAttrByBtm(BaseQueryObject baseQueryObject){
if(baseQueryObject.getConditionMap() == null){
baseQueryObject.setConditionMap(new HashMap<>());
}
- DataGrid<CodeOsbtmtypeattributeVO> dataGrid=new DataGrid<CodeOsbtmtypeattributeVO>();
+ DataGrid<BtmTypeAttributeVO> dataGrid=new DataGrid<BtmTypeAttributeVO>();
//妯℃澘oid
String templateAttrOid = baseQueryObject.getConditionMap().get("oid");
String name = baseQueryObject.getConditionMap().getOrDefault("name","");
@@ -728,39 +705,21 @@
//鏌ヨ妯℃澘瀵硅薄
CodeClassifyTemplate codeClassifyTemplateDO = codeClassifyTemplateMapper.selectById(templateAttrOid);
-
- //杩欎釜涓氬姟绫诲瀷涓嬬殑鎵�鏈夊睘鎬�
- List<CodeOsbtmtypeattributeVO> boAttrs = (List<CodeOsbtmtypeattributeVO>) codeOsbtmtypeattributeMapper.selectById(codeClassifyTemplateDO.getBtmTypeId());// this.btmService.listAttributeByBtmId(codeClassifyTemplateDO.getBtmTypeId());
-// codeOsbtmtypeattributeMapper.selectById(codeClassifyTemplateDO.getBtmTypeId());
-// BeanUtils.copyProperties(codeOsbtmtypeattributeMapper.selectById(codeClassifyTemplateDO.getBtmTypeId()),boAttrs);
- //鎶婇粯璁ょ殑灞炴�т篃娣诲姞鍒癰oAttrs
- if(boAttrs == null){
- boAttrs = new ArrayList<>();
+ // 娌℃湁妯℃澘瀵硅薄涓嶆墽琛岄�昏緫
+ if(Objects.isNull(codeClassifyTemplateDO)){
+ dataGrid.setData(new ArrayList<>());
+ dataGrid.setTotal(0);
+ return dataGrid;
}
- if(!false){
-// List<CodeOsbtmtypeattributeVO> finalBoAttrs = boAttrs;
-// attributeService.getDefaultAttributeVOs().stream().forEach(attr-> {
-// CodeOsbtmtypeattributeVO attributeVO = new CodeOsbtmtypeattributeVO();
-// BeanUtil.convert(attr, attributeVO);
-// if ("id".equalsIgnoreCase(attributeVO.getId())) {
-// attributeVO.setName("浼佷笟缂栫爜");
-// }
-// if ("name".equalsIgnoreCase(attributeVO.getId())) {
-// attributeVO.setName("闆嗗洟鐮�");
-// }
-// attributeVO.setAttrDataType(attr.getAttributeDataType());
-// attributeVO.setAttributeLength(attr.getAttrLength());
-// attributeVO.setReferBtmTypeId(attr.getBtmTypeId());
-// attributeVO.setReferBtmTypeName(attr.getBtmTypeName());
-// finalBoAttrs.add(attributeVO);
-// });
-// boAttrs = finalBoAttrs;
- Object o = null;
+ //杩欎釜涓氬姟绫诲瀷涓嬬殑鎵�鏈夊睘鎬�
+ R<BtmTypeVO> btmTypeVOR = btmTypeClient.getAllAttributeByBtmId(codeClassifyTemplateDO.getBtmTypeId());
+ if(btmTypeVOR.getCode() != 200){
+ throw new ServiceException("涓氬姟绫诲瀷feign璋冪敤澶辫触锛�");
}
//杩欎釜妯℃澘涓嬪凡缁忔湁鐨勫睘鎬�
-// VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(CodeClassifyTemplateAttrDO.class);
-// queryWrapper.addQueryMap("CLASSIFYTEMPLATEOID",templateAttrOid);
+ // VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(CodeClassifyTemplateAttrDO.class);
+ // queryWrapper.addQueryMap("CLASSIFYTEMPLATEOID",templateAttrOid);
Map<String,Object> condition = new HashMap<>(1);
condition.put("CLASSIFYTEMPLATEOID",templateAttrOid);
List<CodeClassifyTemplateAttr> codeClassifyTemplateAttrDOList = baseMapper.selectByMap(condition);
@@ -771,9 +730,9 @@
}
//杩囨护鎺夊凡缁忓瓨鍦ㄧ殑灞炴��
- List<CodeOsbtmtypeattributeVO> boAttrss = new ArrayList<CodeOsbtmtypeattributeVO>();
+ List<BtmTypeAttributeVO> boAttrss = new ArrayList<BtmTypeAttributeVO>();
- for (CodeOsbtmtypeattributeVO osBtmTypeAttributeVO:boAttrs){
+ for (BtmTypeAttributeVO osBtmTypeAttributeVO:btmTypeVOR.getData().getAttributes()){
if(!btmOids.contains(osBtmTypeAttributeVO.getId())){
//鐪嬬湅鏄笉鏄湁妯＄硦鏌ヨ
boolean inSearch = true;
@@ -799,8 +758,8 @@
* @return
*/
@Override
- public DataGrid<CodeOsbtmtypeattributeVO> codeClassifyTemplateAttrByBtmHave(BaseQueryObject baseQueryObject){
- DataGrid<CodeOsbtmtypeattributeVO> dataGrid=new DataGrid<CodeOsbtmtypeattributeVO>();
+ public DataGrid<BtmTypeAttributeVO> codeClassifyTemplateAttrByBtmHave(BaseQueryObject baseQueryObject){
+ DataGrid<BtmTypeAttributeVO> dataGrid=new DataGrid<BtmTypeAttributeVO>();
//妯℃澘oid
String templateAttrOid = baseQueryObject.getConditionMap().get("oid");
@@ -815,20 +774,13 @@
CodeClassifyTemplate codeClassifyTemplateDO = codeClassifyTemplateMapper.selectById(templateAttrOid);
//杩欎釜涓氬姟绫诲瀷涓嬬殑鎵�鏈夊睘鎬�
- List<CodeOsbtmtypeattributeVO> boAttrs = (List<CodeOsbtmtypeattributeVO>) codeOsbtmtypeattributeMapper.selectById(codeClassifyTemplateDO.getBtmTypeId());//this.btmService.listAttributeByBtmIdHasDefault(codeClassifyTemplateDO.getBtmTypeId());
-// codeOsbtmtypeattributeMapper.selectById(codeClassifyTemplateDO.getBtmTypeId());
-// BeanUtils.copyProperties(codeOsbtmtypeattributeMapper.selectById(codeClassifyTemplateDO.getBtmTypeId()),boAttrs);
+ // TODO 宸插畬鍠�
+ List<BtmTypeAttributeVO> boAttrs = (List<BtmTypeAttributeVO>) btmTypeClient.getAllAttributeByBtmId(codeClassifyTemplateDO.getBtmTypeId());
//杩欎釜妯℃澘涓嬪凡缁忔湁鐨勫睘鎬�
//鎶婇粯璁ょ殑灞炴�т篃娣诲姞鍒癰oAttrs
if(boAttrs == null){
boAttrs = new ArrayList<>();
}
-// VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(CodeClassifyTemplateAttrDO.class);
-// queryWrapper.addQueryMap("CLASSIFYTEMPLATEOID",templateAttrOid);
-
-// Map<String,Object> condition = new HashMap<>(1);
-// condition.put("CLASSIFYTEMPLATEOID",templateAttrOid);
-
QueryWrapper<CodeClassifyTemplateAttr> wrapper=new QueryWrapper<>();
wrapper.eq("CLASSIFYTEMPLATEOID",templateAttrOid);
@@ -839,9 +791,9 @@
}
//杩囨护鎺夐櫎浜嗚嚜韬殑鍒殑灞炴��
- List<CodeOsbtmtypeattributeVO> boAttrss = new ArrayList<CodeOsbtmtypeattributeVO>();
+ List<BtmTypeAttributeVO> boAttrss = new ArrayList<BtmTypeAttributeVO>();
- for (CodeOsbtmtypeattributeVO osBtmTypeAttributeVO:boAttrs){
+ for (BtmTypeAttributeVO osBtmTypeAttributeVO:boAttrs){
if(btmOids.contains(osBtmTypeAttributeVO.getId())){
boAttrss.add(osBtmTypeAttributeVO);
}
--
Gitblit v1.9.3