Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/data.json
@@ -1,6 +1,6 @@ { "data":{ "systemId": "PDM", "systemId": "ERP", "user": { "userName": "weidy", "trueName": "魏大勇", Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
@@ -169,4 +169,11 @@ * @return 数据集合 */ List<CodeClassify> selectAllParents(@Param("oid") String oid); /*** * 查询当前分类下所有分类信息 * @param oid * @return */ List<CodeClassify> selectAllClassifyByOid(@Param("oid") String oid,@Param("tenantId") String tenantId); } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java
@@ -287,4 +287,11 @@ */ List<CodeClassifyVO> getRMTypeByDescAndLib(String desc,String codeLibName); /** * 根据分类描述备注和库节点查询分类信息 * @param oid * @return */ List<CodeClassifyVO> selectAllClassifyByOid(String oid); } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java
@@ -64,6 +64,8 @@ */ String addSaveCode(CodeOrderDTO orderDTO) throws Exception; String addSaveCodeNotauthUser(CodeOrderDTO orderDTO, boolean authUser) throws Exception; /** * 判断编码的码段是否输入或者选择了码值 * @param ruleVO 规则的显示对象 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -603,6 +603,17 @@ } /*** * 根据oid获取下面所有的分类信息 * @param oid * @return */ public List<CodeClassifyVO> selectAllClassifyByOid(String oid){ List<CodeClassify> codeClassifyList=codeClassifyMapper.selectAllClassifyByOid(oid,AuthUtil.getTenantId()); List<CodeClassifyVO> voList = codeClassifyDO2VOs(codeClassifyList); return voList; } /*** * 根据分类描述备注和库节点查询分类信息 * @param desc * @param codeLibName Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -16,7 +16,6 @@ import com.vci.ubcs.code.enumpack.*; import com.vci.ubcs.code.mapper.CommonsMapper; import com.vci.ubcs.code.service.*; import com.vci.ubcs.code.util.ClientBusinessObject; import com.vci.ubcs.code.vo.CodeKeyAttrRepeatVO; import com.vci.ubcs.code.vo.CodeReferConfigVO; import com.vci.ubcs.code.vo.pagemodel.UITableFieldVO; @@ -57,7 +56,6 @@ import com.vci.ubcs.system.user.feign.IUserClient; import net.logstash.logback.encoder.org.apache.commons.lang3.StringUtils; import oracle.sql.TIMESTAMP; import org.aspectj.apache.bcel.classfile.Code; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springblade.core.cache.utils.CacheUtil; @@ -384,15 +382,34 @@ } codeAllCodeService.updateBatchById(codeCbos); } /** * 申请单一编码 * * @param orderDTO 申请的信息，需要包含属性的内容和码段相关的内容 * @return 返回编码的内容 */ @Override public String addSaveCode(CodeOrderDTO orderDTO) throws Exception { return addSaveCode(orderDTO,true); } /*** * 集成可变码段申请接口 * @param orderDTO 申请的信息，需要包含属性的内容和码段相关的内容 * @return * @throws Exception */ @Override public String addSaveCodeNotauthUser(CodeOrderDTO orderDTO, boolean authUser) throws Exception { return addSaveCode(orderDTO,authUser); } /** * 申请单一编码 * * @param orderDTO 申请的信息，需要包含属性的内容和码段相关的内容 * @return 返回编码的内容 */ @Override public String addSaveCode(CodeOrderDTO orderDTO) throws Exception { private String addSaveCode(CodeOrderDTO orderDTO,boolean authUser) throws Exception { VciBaseUtil.alertNotNull(orderDTO, "编码申请相关的属性和码段的内容都为空", orderDTO.getCodeClassifyOid(), "主题库分类的主键", orderDTO.getTemplateOid(), "模板的主键", orderDTO.getCodeRuleOid(), "编码规则的主键"); CodeClassifyFullInfoBO classifyFullInfo = classifyService.getClassifyFullInfo(orderDTO.getCodeClassifyOid()); @@ -426,9 +443,14 @@ cbo.setCreateTime(new Date()); cbo.setLastModifyTime(new Date()); //cbo.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));、 // 要求显示账号，所以做了更改 cbo.setCreator(String.valueOf(AuthUtil.getUser().getAccount())); cbo.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId())); if(authUser) { // 要求显示账号，所以做了更改 cbo.setCreator(String.valueOf(AuthUtil.getUser().getAccount())); cbo.setLastModifier(String.valueOf(AuthUtil.getUser().getAccount())); }else{ cbo.setCreator(orderDTO.getCreator()); cbo.setLastModifier(orderDTO.getLastModifier()); } cbo.setTenantId(AuthUtil.getTenantId()); if(StringUtils.isNotBlank(orderDTO.getLcStatus())||StringUtils.isNotBlank(orderDTO.getData().get("lcStatus"))){ cbo.setLcStatus(StringUtils.isNotBlank(orderDTO.getLcStatus())?orderDTO.getLcStatus():orderDTO.getData().get("lcStatus")); Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -567,6 +567,9 @@ List<CodeOrderSecDTO> codeOrderSecDTOList=new ArrayList<>(); orderDTO.setCodeClassifyOid(codeClassifyVO.getOid());//分类主键 orderDTO.setTemplateOid(templateVO.getOid()); orderDTO.setCreator(rowData.getCreator()); orderDTO.setLastModifier(rowData.getEditor()); orderDTO.setLcStatus(rowData.getStatus()); if(!CollectionUtils.isEmpty(ruleVO.getSecVOList())) { ruleVO.getSecVOList().stream().forEach(codeBasicSecVO -> { if (codeBasicSecVO.getSecType().equals("codevariablesec")) {//规则之定义为可变码段存储主数据传递过来的数据 @@ -581,7 +584,7 @@ orderDTO.setCodeRuleOid(ruleVO.getOid()); orderDTO.setSecDTOList(codeOrderSecDTOList);//存储编码 orderDTO.setData(rowData.getFiledValue()); String code=engineService.addSaveCode(orderDTO); String code=engineService.addSaveCodeNotauthUser(orderDTO,false); if(StringUtils.isNotBlank(code)) { StringBuffer sqlsb = new StringBuffer(); sqlsb.append(" select * from "); @@ -836,6 +839,9 @@ List<CodeOrderSecDTO> codeOrderSecDTOList=new ArrayList<>(); orderDTO.setCodeClassifyOid(codeClassifyVO.getOid());//分类主键 orderDTO.setTemplateOid(templateVO.getOid()); orderDTO.setCreator(rowData.getCreator()); orderDTO.setLastModifier(rowData.getEditor()); orderDTO.setLcStatus(rowData.getStatus()); if(!CollectionUtils.isEmpty(ruleVO.getSecVOList())) { ruleVO.getSecVOList().stream().forEach(codeBasicSecVO -> { if (codeBasicSecVO.getSecType().equals("codevariablesec")) {//规则之定义为可变码段存储主数据传递过来的数据 @@ -850,7 +856,7 @@ orderDTO.setCodeRuleOid(ruleVO.getOid()); orderDTO.setSecDTOList(codeOrderSecDTOList);//存储编码 orderDTO.setData(rowData.getFiledValue()); String code=engineService.addSaveCode(orderDTO); String code=engineService.addSaveCodeNotauthUser(orderDTO,false); if(StringUtils.isNotBlank(code)) { StringBuffer sqlsb = new StringBuffer(); sqlsb.append(" select * from "); @@ -1288,7 +1294,7 @@ boolean issucess=false; String resultStr = ""; String errorid="0"; msg="成功"; msg = "数据查询成功"; String systemId=""; log.info("查询分类的数据参数:->"+data); log.info("查询分类的数据类型:->"+dataType); @@ -1375,8 +1381,8 @@ TreeQueryObject treeQueryObject=new TreeQueryObject(); treeQueryObject.setParentOid(oid); treeQueryObject.setQueryAllLevel(true); dataCodeClassifyVOList=classifyService.selectCodeClassifyDOByTree(treeQueryObject); dataCodeClassifyVOList.add(CodeClassifyWrapper.build().entityVO(currentCodeClassify[0])); dataCodeClassifyVOList=classifyService.selectAllClassifyByOid(oid);//.selectCodeClassifyDOByTree(treeQueryObject); //dataCodeClassifyVOList.add(CodeClassifyWrapper.build().entityVO(currentCodeClassify[0])); Map<String, CodeClassifyVO> oidCodeclassifyDOMap = dataCodeClassifyVOList.stream().filter(systeDataObject -> systeDataObject != null && StringUtils.isNotBlank(systeDataObject.getOid())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t)); List<PropertyVO> propertyVOS=condtionVO.getPro(); @@ -1453,6 +1459,9 @@ dataObjectVOS.add(dataObjectVO); }); resultDataVO.setObject(dataObjectVOS); }else{ errorid = "0"; msg = "接口参数：classCode 未查询到对应的数据"; } }else{ errorid = "101"; @@ -1463,8 +1472,6 @@ errorid = "101"; msg = "接口参数：library 未查询到对应的库节点信息"; } errorid = "0"; msg = "数据查询成功"; }catch (Throwable e){ e.printStackTrace();; msg="查询数据失败:"+e.getMessage();
