Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ClassifyVO.java
@@ -47,6 +47,11 @@ private String codeRuleId; /*** * 规则id */ @XStreamAsAttribute private CodeRuleVO codeRuleVO; /*** * 是否为叶子节点 */ @XStreamAsAttribute Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/CodeRuleVO.java
@@ -1,5 +1,8 @@ package com.vci.ubcs.code.vo.webserviceModel.coderule; import com.vci.ubcs.code.dto.CodeRuleDTO; public class CodeRuleVO { // private String } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory; import org.springblade.core.cache.utils.CacheUtil; import org.springblade.core.launch.constant.AppConstant; import com.vci.ubcs.core.log.exception.ServiceException; 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; Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -55,8 +55,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springblade.core.cache.utils.CacheUtil; import org.springblade.core.launch.constant.AppConstant; import com.vci.ubcs.core.log.exception.ServiceException; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.DateUtil; @@ -2077,9 +2075,9 @@ .append(SPACE) .append(QueryOptionConstant.EQUAL) .append(SPACE) .append("'") .append(value) .append("'"); //.append("'") .append(value); // .append("'"); } sql.append(SPACE); return sql.toString(); Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
@@ -3850,8 +3850,8 @@ }else{ if (!CollectionUtils.isEmpty(conditionMap)) { Map<String, String> andConditionMap = new HashMap<>(); andConditionMap.put("islastr", "1"); andConditionMap.put("islastv", "1"); andConditionMap.put("lastr", "1"); andConditionMap.put("lastv", "1"); conditionMap.putAll(andConditionMap); PageHelper pageHelper = new PageHelper(-1); pageHelper.addDefaultDesc("id"); Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -655,7 +655,7 @@ propertyVOS.stream().forEach(propertyVO -> { sb.append( " and "+propertyVO.getFiledName()+"='"+propertyVO.getFiledValue()+"'"); }); sb.append(" and islastr=1 and islastv=1" ); sb.append(" and lastr=1 and lastv=1" ); sb.append(" and codeclsfid in (" + VciBaseUtil.toInSql(oidCodeclassifyDOMap.keySet().toArray(new String[0])) +")"); sb.append(" and Lcstatus in (" + VciBaseUtil.toInSql(statusList.toArray(new String[]{})) +")"); List<Map<String,String>> newDataList= commonsMapper.queryByOnlySqlForMap(sb.toString()); @@ -752,6 +752,7 @@ log.info("查询分类的数据类型:->"+dataType); ResultClassifyVO resultClassifyVO =new ResultClassifyVO(); List<ClassifyVO> classifyVOList=new ArrayList<>(); ResultData resultData=new ResultData(); try { if (StringUtils.isBlank(data)) { errorid = "101"; @@ -806,21 +807,44 @@ treeQueryObject.setQueryAllLevel(true); codeClassifyVOS=classifyService.selectCodeClassifyDOByTree(treeQueryObject); } LibraryVO libraryVo=new LibraryVO(); libraryVo.setId(libId); libraryVo.setName(""); if(!CollectionUtils.isEmpty(codeClassifyVOS)){ errorid = "0"; msg="成功!"; codeClassifyVOS.stream().forEach(codeClassifyDO -> { ClassifyVO classifyVO=new ClassifyVO(); classifyVO.setId(codeClassifyDO.getOid()); classifyVO.setLcStatus(codeClassifyDO.getLcStatus()); classifyVO.setClassCode(codeClassifyDO.getId()); classifyVO.setDescription(codeClassifyDO.getDescription()); classifyVO.setName(codeClassifyDO.getName()); classifyVO.setPid(codeClassifyDO.getParentcodeclassifyoid()); classifyVO.setFullPathName(codeClassifyDO.getPath()); classifyVOList.add(classifyVO); }); libraryVo.setClassify(classifyVOList); }else{ errorid = "100"; msg="未查询到相关的分类信息"; } issucess=true; resultData.setLibrary(libraryVo); }catch (Throwable e){ e.printStackTrace();; msg="查询分类失败:"+e.getMessage(); }finally { // resultData.setErrorid(errorid); // resultData.setMsg(msg); // resultClassifyVO.setResultData(resultData); resultData.setErrorid(errorid); resultData.setMsg(msg); resultClassifyVO.setResultData(resultData); } if(dataType.equals("xml")){ //组织返回接口信息 XStream xStream = new XStream(new DomDriver()); xStream.processAnnotations(XMLResultSystemVO.class); xStream.autodetectAnnotations(true); //resultStr = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + xStream.toXML(resultData); resultStr = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + xStream.toXML(resultData); }else{ Object object = JSONObject.toJSON(resultClassifyVO);