Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreApplyFormDTO.java
@@ -1,6 +1,7 @@ package com.vci.ubcs.code.dto; import com.vci.ubcs.code.vo.pagemodel.BaseModelVO; import io.swagger.annotations.ApiModelProperty; /** * è®°å½éæå±æ°æ®ç³è¯·id @@ -16,6 +17,11 @@ /*** * éå¢ç¼ç */ private String groupCode; /*** * é误æ è¯ç */ private String code; /*** @@ -34,6 +40,11 @@ * æ¶æ¯ */ private String msg; /** * ç³è¯·åç±»å1:ç³è¯·ï¼2ï¼æ´æ¹ */ private String operationType; public String getCode() { return code; @@ -75,14 +86,32 @@ this.msg = msg; } public String getOperationType() { return operationType; } public void setOperationType(String operationType) { this.operationType = operationType; } public String getGroupCode() { return groupCode; } public void setGroupCode(String groupCode) { this.groupCode = groupCode; } @Override public String toString() { return "DockingPreApplyCodeFormVO{" + "code='" + code + '\'' + return "DockingPreApplyFormDTO{" + "groupCode='" + groupCode + '\'' + ", code='" + code + '\'' + ", content='" + content + '\'' + ", dataOid='" + dataOid + '\'' + ", dataBtmName='" + dataBtmName + '\'' + ", msg='" + msg + '\'' + ", operationType='" + operationType + '\'' + '}'; } } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreClassifyDTO.java
@@ -2,6 +2,8 @@ import com.vci.ubcs.code.vo.pagemodel.BaseModelVO; import java.util.List; /*** * è®°å½éå¢åç±»ä¿¡æ¯ * @author xiejun @@ -29,6 +31,10 @@ * ç¶çº§èç¹ */ private String pid; /** * éå¢åç±»å å«ç模åè§å¾ */ List<DockingPreViewModelDTO> dockingPreViewModelDTOList; public String getClassName() { return className; @@ -62,6 +68,14 @@ this.pid = pid; } public List<DockingPreViewModelDTO> getDockingPreViewModelDTOList() { return dockingPreViewModelDTOList; } public void setDockingPreViewModelDTOList(List<DockingPreViewModelDTO> dockingPreViewModelDTOList) { this.dockingPreViewModelDTOList = dockingPreViewModelDTOList; } @Override public String toString() { return "DockingPreClassifyDTO{" + @@ -69,6 +83,7 @@ ", nodeLink='" + nodeLink + '\'' + ", getNodeLinkName='" + getNodeLinkName + '\'' + ", pid='" + pid + '\'' + ", dockingPreViewModelDTOList=" + dockingPreViewModelDTOList + '}'; } } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreViewModelDTO.java
@@ -1,6 +1,9 @@ package com.vci.ubcs.code.dto; import com.vci.ubcs.code.vo.pagemodel.BaseModelVO; import com.vci.ubcs.code.vo.pagemodel.DockingPreMetaAttrVO; import java.util.List; /** * è®°å½éæéå¢åç±»è§å¾ä¿¡æ¯ @@ -27,7 +30,10 @@ * æ°æ®xinx */ private String impactList; /*** * 模åè§å¾å å«ç屿§ */ private List<DockingPreMetaAttrDTO> dockingPreMetaAttrDTOList; public String getViewName() { return viewName; @@ -53,12 +59,21 @@ this.impactList = impactList; } public List<DockingPreMetaAttrDTO> getDockingPreMetaAttrDTOList() { return dockingPreMetaAttrDTOList; } public void setDockingPreMetaAttrDTOList(List<DockingPreMetaAttrDTO> dockingPreMetaAttrDTOList) { this.dockingPreMetaAttrDTOList = dockingPreMetaAttrDTOList; } @Override public String toString() { return "DockingPreViewModelVO{" + return "DockingPreViewModelDTO{" + "viewName='" + viewName + '\'' + ", sourceClassifyId='" + sourceClassifyId + '\'' + ", impactList='" + impactList + '\'' + ", dockingPreMetaAttrDTOList=" + dockingPreMetaAttrDTOList + '}'; } } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingPreApplyForm.java
@@ -16,11 +16,15 @@ @ApiModel(value = "DockingPreApplyForm", description = "éå¢ç¼ç ç³è¯·åè®°å½å¯¹è±¡") @EqualsAndHashCode public class DockingPreApplyForm extends BaseModel { /*** * éå¢ç¼ç */ @ApiModelProperty(value = "éå¢ç¼ç ") private String groupCode; /*** * é误æ è¯ç */ @ApiModelProperty(value = "é误æ è¯ç ") private String code; /*** @@ -43,4 +47,9 @@ */ @ApiModelProperty(value = "æ¶æ¯") private String msg; /** * ç³è¯·åç±»å1:ç³è¯·ï¼2ï¼æ´æ¹ */ @ApiModelProperty(value = "æ¶æ¯") private String operationType; } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreApplyFormVO.java
@@ -1,5 +1,8 @@ package com.vci.ubcs.code.vo.pagemodel; import io.swagger.annotations.ApiModelProperty; import javax.xml.soap.SAAJResult; /** * è®°å½éæå±æ°æ®ç³è¯·id @@ -15,6 +18,10 @@ /*** * éå¢ç¼ç */ private String groupCode; /*** * é误æ è¯ç */ private String code; /*** Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreClassifyVO.java
@@ -1,5 +1,7 @@ package com.vci.ubcs.code.vo.pagemodel; import java.util.List; /** * è®°å½éæéå¢åç±»ä¿¡æ¯ * @author xiejun @@ -27,6 +29,10 @@ * ç¶çº§èç¹ */ private String pid; /*** * å类模åè§å¾ */ private List<DockingPreViewModelVO> dockingPreViewModelVOList; public String getClassName() { return className; @@ -60,13 +66,22 @@ this.pid = pid; } public List<DockingPreViewModelVO> getDockingPreViewModelVOList() { return dockingPreViewModelVOList; } public void setDockingPreViewModelVOList(List<DockingPreViewModelVO> dockingPreViewModelVOList) { this.dockingPreViewModelVOList = dockingPreViewModelVOList; } @Override public String toString() { return "DockingPreClassifyDTO{" + return "DockingPreClassifyVO{" + "className='" + className + '\'' + ", nodeLink='" + nodeLink + '\'' + ", getNodeLinkName='" + getNodeLinkName + '\'' + ", pid='" + pid + '\'' + ", dockingPreViewModelVOList=" + dockingPreViewModelVOList + '}'; } } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreViewModelVO.java
@@ -1,4 +1,7 @@ package com.vci.ubcs.code.vo.pagemodel; import java.util.List; /** * è®°å½éæéå¢åç±»è§å¾ä¿¡æ¯ * @author xiejun @@ -24,8 +27,10 @@ * æ°æ®xinx */ private String impactList; /*** * 模åè§å¾å å«ç屿§ */ private List<DockingPreMetaAttrVO> dockingPreMetaAttrVOList; public String getViewName() { return viewName; } @@ -50,12 +55,21 @@ this.impactList = impactList; } public List<DockingPreMetaAttrVO> getDockingPreMetaAttrVOList() { return dockingPreMetaAttrVOList; } public void setDockingPreMetaAttrVOList(List<DockingPreMetaAttrVO> dockingPreMetaAttrVOList) { this.dockingPreMetaAttrVOList = dockingPreMetaAttrVOList; } @Override public String toString() { return "DockingPreViewModelVO{" + "viewName='" + viewName + '\'' + ", sourceClassifyId='" + sourceClassifyId + '\'' + ", impactList='" + impactList + '\'' + ", dockingPreMetaAttrVOList=" + dockingPreMetaAttrVOList + '}'; } } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ClassifyVO.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,141 @@ package com.vci.ubcs.code.vo.webserviceModel.coderule; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; @XStreamAlias("classify") public class ClassifyVO { /** * åç±»id */ @XStreamAsAttribute private String id; /*** * åç±»åç§° */ @XStreamAsAttribute private String name; /*** * ç¶èç¹id */ @XStreamAsAttribute private String pid; /*** * åç±»ä»£å· */ @XStreamAsAttribute private String classCode; /*** * æè¿° */ @XStreamAsAttribute private String description; /*** * åç±»é¾æ¥è·¯å¾ */ @XStreamAsAttribute private String fullPathName; /*** * åç±»ç¶æ */ @XStreamAsAttribute private String lcStatus; /*** * è§åid */ @XStreamAsAttribute private String codeRuleId; /*** * æ¯å¦ä¸ºå¶åèç¹ */ @XStreamAsAttribute private boolean isLeaf; public String getId() { return id; } public void setId(String id) { this.id = id; } public String getName() { return name; } public void setName(String name) { this.name = name; } public String getPid() { return pid; } public void setPid(String pid) { this.pid = pid; } public String getClassCode() { return classCode; } public void setClassCode(String classCode) { this.classCode = classCode; } public String getDescription() { return description; } public void setDescription(String description) { this.description = description; } public String getFullPathName() { return fullPathName; } public void setFullPathName(String fullPathName) { this.fullPathName = fullPathName; } public String getLcStatus() { return lcStatus; } public void setLcStatus(String lcStatus) { this.lcStatus = lcStatus; } public String getCodeRuleId() { return codeRuleId; } public void setCodeRuleId(String codeRuleId) { this.codeRuleId = codeRuleId; } public boolean isLeaf() { return isLeaf; } public void setLeaf(boolean leaf) { isLeaf = leaf; } @Override public String toString() { return "ClassifyVO{" + "id='" + id + '\'' + ", name='" + name + '\'' + ", pid='" + pid + '\'' + ", classCode='" + classCode + '\'' + ", description='" + description + '\'' + ", fullPathName='" + fullPathName + '\'' + ", lcStatus='" + lcStatus + '\'' + ", codeRuleId='" + codeRuleId + '\'' + ", isLeaf=" + isLeaf + '}'; } } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/CodeRuleVO.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,5 @@ package com.vci.ubcs.code.vo.webserviceModel.coderule; public class CodeRuleVO { // private String } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/LibraryVO.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,52 @@ package com.vci.ubcs.code.vo.webserviceModel.coderule; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import com.thoughtworks.xstream.annotations.XStreamImplicit; import java.util.List; @XStreamAlias("library ") public class LibraryVO { @XStreamAsAttribute private String id; @XStreamAsAttribute private String name; @XStreamImplicit private List<ClassifyVO>classify; private List<CodeRuleVO> coderule; public String getId() { return id; } public void setId(String id) { this.id = id; } public String getName() { return name; } public void setName(String name) { this.name = name; } public List<ClassifyVO> getClassify() { return classify; } public void setClassify(List<ClassifyVO> classify) { this.classify = classify; } @Override public String toString() { return "LibraryVO{" + "id='" + id + '\'' + ", name='" + name + '\'' + ", classify=" + classify + '}'; } } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/QueryClassifyVO.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,23 @@ package com.vci.ubcs.code.vo.webserviceModel.coderule; public class QueryClassifyVO { /*** * */ private QueryData data; public QueryData getData() { return data; } public void setData(QueryData data) { this.data = data; } @Override public String toString() { return "QueryClassifyVO{" + "data=" + data + '}'; } } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/QueryData.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,45 @@ package com.vci.ubcs.code.vo.webserviceModel.coderule; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import com.vci.ubcs.code.vo.webserviceModel.apply.UserVO; @XStreamAlias("data") public class QueryData { @XStreamAsAttribute private String systemId; private UserVO user; private QueryLibraryVO library ; public QueryLibraryVO getLibrary() { return library; } public void setLibrary(QueryLibraryVO library) { this.library = library; } public String getSystemId() { return systemId; } public void setSystemId(String systemId) { this.systemId = systemId; } public UserVO getUser() { return user; } public void setUser(UserVO user) { this.user = user; } @Override public String toString() { return "QueryData{" + "systemId='" + systemId + '\'' + ", library=" + library + '}'; } } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/QueryLibraryVO.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,39 @@ package com.vci.ubcs.code.vo.webserviceModel.coderule; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import com.thoughtworks.xstream.annotations.XStreamImplicit; import java.util.List; @XStreamAlias("library") public class QueryLibraryVO { @XStreamAsAttribute private String id; @XStreamImplicit private List<String> classifyid; public String getId() { return id; } public void setId(String id) { this.id = id; } public List<String> getClassifyid() { return classifyid; } public void setClassifyid(List<String> classifyid) { this.classifyid = classifyid; } @Override public String toString() { return "LibraryVO{" + "id='" + id + '\'' + ", classifyid=" + classifyid + '}'; } } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultClassifyVO.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,21 @@ package com.vci.ubcs.code.vo.webserviceModel.coderule; public class ResultClassifyVO { private ResultData resultData; public ResultData getResultData() { return resultData; } public void setResultData(ResultData resultData) { this.resultData = resultData; } @Override public String toString() { return "ResultClassifyVO{" + "resultData=" + resultData + '}'; } } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultData.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,45 @@ package com.vci.ubcs.code.vo.webserviceModel.coderule; import com.thoughtworks.xstream.annotations.XStreamAlias; @XStreamAlias("data") public class ResultData { @XStreamAlias("errorid") private String errorid; @XStreamAlias("msg") private String msg; private LibraryVO library ; public LibraryVO getLibrary() { return library; } public void setLibrary(LibraryVO library) { this.library = library; } public String getErrorid() { return errorid; } public void setErrorid(String errorid) { this.errorid = errorid; } public String getMsg() { return msg; } public void setMsg(String msg) { this.msg = msg; } @Override public String toString() { return "ResultData{" + "code='" + errorid + '\'' + ", msg='" + msg + '\'' + ", library=" + library + '}'; } } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/DockingGroupDataVO.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,31 @@ package com.vci.ubcs.code.vo.webserviceModel.group; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; /*** * éå¢ç³è¯·æ¥å£åæ°ä¿¡æ¯ */ @Data public class DockingGroupDataVO { /*** * ç³»ç»æ è¯ */ private String sysName; /** * ä¸å¡æ°æ® */ private List<DockingMainData> mainData; @Override public String toString() { return "DockingGroupDataVO{" + "sysName='" + sysName + '\'' + ", mainData=" + mainData + '}'; } } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/DockingMainData.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,47 @@ package com.vci.ubcs.code.vo.webserviceModel.group; import io.swagger.annotations.ApiModel; import lombok.Data; import java.util.List; @Data public class DockingMainData { /** * ç³è¯·åå· */ private String applyId; /*** * å¯çº§ */ private String secretLevel; /*** * ç³è¯·åä½ä»£ç ï¼å¦131460ï¼ */ private String applyEntId; /*** * ç³è¯·äººåç¼ç ï¼ç¨æ·åï¼å¦85645824ï¼ */ private String createBy; /*** * åç±»åç§° */ private String className; /*** * 模åè§å¾ä¿¡æ¯ */ private List<DockingViewVO> viewInfos; @Override public String toString() { return "DockingMainData{" + "applyId='" + applyId + '\'' + ", secretLevel='" + secretLevel + '\'' + ", applyEntId='" + applyEntId + '\'' + ", createBy='" + createBy + '\'' + ", className='" + className + '\'' + ", viewInfos=" + viewInfos + '}'; } } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/DockingViewVO.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,29 @@ package com.vci.ubcs.code.vo.webserviceModel.group; import lombok.Data; import java.util.List; import java.util.Map; /*** * 模åè§å¾ä¿¡æ¯ */ @Data public class DockingViewVO { /** * 模åè§å¾åç§° */ private String viewName; /** * 屿§å¯¹è±¡ä¿¡æ¯ */ private List<Map<String,Object>> viewValue; @Override public String toString() { return "DockingViewVO{" + "viewName='" + viewName + '\'' + ", viewValue=" + viewValue + '}'; } } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/ResultDataVO.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,15 @@ package com.vci.ubcs.code.vo.webserviceModel.group; import lombok.Data; @Data public class ResultDataVO<T> { /*** * æ¶æ¯ */ private String code; private String msg; private T data; } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/result/DataObjectVO.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,36 @@ package com.vci.ubcs.code.vo.webserviceModel.group.result; public class DataObjectVO { private String msg; private String code; private DataVO data; public String getMsg() { return msg; } public void setMsg(String msg) { this.msg = msg; } public String getCode() { return code; } public void setCode(String code) { this.code = code; } public DataVO getData() { return data; } public void setData(DataVO data) { this.data = data; } } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/result/DataVO.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,28 @@ package com.vci.ubcs.code.vo.webserviceModel.group.result; public class DataVO { private String applyId; private String customCoding; private String formState; public String getApplyId() { return applyId; } public void setApplyId(String applyId) { this.applyId = applyId; } public String getCustomCoding() { return customCoding; } public void setCustomCoding(String customCoding) { this.customCoding = customCoding; } public String getFormState() { return formState; } public void setFormState(String formState) { this.formState = formState; } } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/result/ResultDataObject.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,48 @@ package com.vci.ubcs.code.vo.webserviceModel.group.result; import java.util.List; public class ResultDataObject { /** * ç¶æç 1ï¼æåï¼2ï¼å¤±è´¥ */ private String code; /** * æ¥å£è°ç¨ç»æ æåï¼å¤±è´¥åå */ private String msg; /*** * æ°æ®å¯¹è±¡ */ private List<DataObjectVO> data; public String getCode() { return code; } public void setCode(String code) { this.code = code; } public String getMsg() { return msg; } public void setMsg(String msg) { this.msg = msg; } public List<DataObjectVO> getData() { return data; } public void setData(List<DataObjectVO> data) { this.data = data; } @Override public String toString() { return "ResultDataObject{" + "code='" + code + '\'' + ", msg='" + msg + '\'' + ", data=" + data + '}'; } } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/MdmBtmTypeConstant.java
@@ -5,6 +5,21 @@ */ public class MdmBtmTypeConstant { /** * ç¶æ */ public static final String CODE_STATUS_FILED = "lcstatus"; /** * éå¢ç çåæ®µ */ public static final String CODE_GROUP_FIELD = "groupcode"; /** * åç±»ç主é®å段 */ public static final String CODE_CLASSIFY_OID_FIELD = "codeclsfid"; /** * 主é¢åºåç±» */ @@ -157,17 +172,30 @@ public static final String DOCKING_PRE_JINTEGMAPCONFIG = "jintegmapconifg"; /** * éæå±æ§æ å°å ³ç³»ä¸å¡ç±»å * éæéå¢åç±»ä¸å¡ç±»å */ public static final String DOCKING_PRE_JCLASS = "jclass"; /** * éæå±æ§æ å°å ³ç³»ä¸å¡ç±»å * éæé墿¨¡å屿§ä¸å¡ç±»å */ public static final String DOCKING_PRE_JMETAATRR = "jmetaattr"; /** * éæå±æ§æ å°å ³ç³»ä¸å¡ç±»å * éæå±æ§åå¼èå´å ³ç³»ä¸å¡ç±»å */ public static final String DOCKING_PRE_JRANGE = "jrange"; /** * éæéå¢ç³è¯·åä¸å¡ç±»å */ public static final String DOCKING_PRE_JAPPLYFORM = "japplyform"; /** * éæé墿¨¡å屿§ä¸å¡ç±»å */ public static final String DOCKING_PRE_JVIEWMODEL = "jviewmodel"; } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingPreApplyCodeController.java
@@ -1,14 +1,27 @@ package com.vci.ubcs.code.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.vci.ubcs.code.entity.DockingPreApplyForm; import com.vci.ubcs.code.feign.IMdmInterJtClient; import com.vci.ubcs.code.service.IDockingPreApplyFormService; import com.vci.ubcs.code.service.IDockingPreAttrMappingService; import com.vci.ubcs.code.service.IDockingPreAttrRangeService; import com.vci.ubcs.code.service.IDockingPreClassifyService; import com.vci.ubcs.code.vo.pagemodel.BaseModelVO; import com.vci.ubcs.code.vo.pagemodel.DockingPreApplyFormVO; import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrMappingVO; import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrRangeVO; import com.vci.ubcs.code.wrapper.DockingPreApplyFormWrapper; import com.vci.ubcs.starter.revision.model.BaseModel; import com.vci.ubcs.starter.revision.model.TreeQueryObject; import com.vci.ubcs.starter.web.pagemodel.Tree; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.*; @@ -24,7 +37,7 @@ */ @RestController @AllArgsConstructor @RequestMapping("ubcs-code/DockingPreApplyCode") @RequestMapping("/DockingPreApplyCode") @Api(value = "éå¢å±æ§æ å°é ç½®", tags = "éå¢å±æ§æ å°é ç½®æ¥å£") public class DockingPreApplyCodeController { /** @@ -37,6 +50,20 @@ private final IDockingPreAttrRangeService dockingPreAttrRangeService; /*** * åç±»å±æ§æä¸¾èå´æå¡ */ private final IDockingPreClassifyService dockingPreClassifyService; /*** * 屿§æä¸¾èå´æå¡ */ private final IDockingPreApplyFormService dockingPreApplyFormService; /** * æ ¹æ®ä¸»æ°æ®ç¼ç oidè·åéå¢å±æ§æ å°ä¿¡æ¯ * @param codeClassifyId ä¸»é® @@ -44,9 +71,9 @@ */ @GetMapping("/gridAttrMapping") @ApiOperationSupport(order = 8) @ApiOperation(value = "å类主é®è·åä¸é墿¨¡å屿§æ å°å ³ç³»", notes = "ä¼ å ¥codeClassifyId") public R getDockingAttrMappingsByCodeClassId(String codeClassifyId){ List<DockingPreAttrMappingVO> dockingPreAttrMappingVOList=dockingPreAttrMappingService.getdockingAttrMappingsByCodeclassId(codeClassifyId); @ApiOperation(value = "å类主é®è·åä¸é墿¨¡å屿§æ å°å ³ç³»", notes = "ä¼ å ¥ä¸»æ°æ®:codeClassifyId,éå¢åç±»:sourceClassifyId") public R getDockingAttrMappingsByCodeClassId(String codeClassifyId,String sourceClassifyId){ List<DockingPreAttrMappingVO> dockingPreAttrMappingVOList=dockingPreAttrMappingService.getDockingAttrMappingsByCodeClassifyId(codeClassifyId,sourceClassifyId); return R.data(dockingPreAttrMappingVOList); } @@ -64,11 +91,23 @@ } /** * ç³è¯·åæ¥è¯¢ èªå®ä¹å页 */ @GetMapping("/page") @ApiOperationSupport(order = 3) @ApiOperation(value = "å页", notes = "ä¼ å ¥dockingPreApplyForm") public R<IPage<DockingPreApplyFormVO>> page(DockingPreApplyForm dockingPreApplyForm, Query query) { IPage<DockingPreApplyForm> pages = dockingPreApplyFormService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingPreApplyForm)); return R.data(DockingPreApplyFormWrapper.build().pageVO(pages)); } /** * ä¿å屿§æ å°é ç½®ç»ä»¶ * @param dockingPreAttrMappingVOList 屿§æ å°é ç½®æ°æ®ä¼ è¾å¯¹è±¡ * @return æ§è¡ç»æï¼success为true表示æåï¼msgæ¯å¤±è´¥çæç¤ºä¿¡æ¯ï¼objæ¯æ·»å 宿åçæ¾ç¤ºå¯¹è±¡ */ @PostMapping( "/batchAddSave") @ApiOperationSupport(order = 2) @ApiOperation(value = "ä¿å屿§æ å°é ç½®", notes = "dockingPreAttrMappingVOList") public R batchSave(@Valid @RequestBody List<DockingPreAttrMappingVO> dockingPreAttrMappingVOList){ List<DockingPreAttrMappingVO> dockingPreAttrRangeVOS=new ArrayList<>(); try { @@ -79,4 +118,30 @@ return R.data(dockingPreAttrRangeVOS); } /** * åç §æ éå¢åç±»ï¼æ¯å¦å å«å±æ§ï¼ * @param treeQueryObject æ å½¢æ¥è¯¢å¯¹è±¡ conditionMap åä¸ codeclsfid=ä¸»æ°æ®çåç±»oid * @return 主é¢åºåç±»æ¾ç¤ºæ */ @GetMapping("/referTree") public List<Tree> referTree(@RequestBody TreeQueryObject treeQueryObject) { return dockingPreClassifyService.treeCompanyGroupClassify(treeQueryObject); } /*** * ç³è¯·éå¢ç¼ç * @return */ @PostMapping( "/applyGroupCode") @ApiOperationSupport(order = 2) @ApiOperation(value = "éå¢ç ç³è¯·", notes = "dockingPreAttrMappingVOList") public R applyGroupCode(String oids,String btmName){ List<BaseModelVO> BaseModelVOs=new ArrayList<>(); try { return dockingPreAttrMappingService.applyGroupCode(oids,btmName); }catch (Throwable e){ return R.fail("éå¢ç ç³è¯·å¤±è´¥ï¼"+e.getMessage()); } } } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/IMdmInterJtClient.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,31 @@ package com.vci.ubcs.code.feign; import com.vci.ubcs.code.vo.webserviceModel.group.DockingGroupDataVO; import com.vci.ubcs.code.vo.webserviceModel.group.result.ResultDataObject; import org.springblade.core.tool.api.R; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import javax.validation.constraints.NotNull; /** * ä¸éå¢ç³»ç»éæçè°ç¨å¨ * @author xiejun * @date 2023-5-24 */ @FeignClient(name = "groupCOdeIntegration", url = "${docking.apply.jtInterUrl:http://116.205.176.185:8099}", path = "") public interface IMdmInterJtClient { /** * mdmè°ç¨éå¢mdmç³è¯·éå¢ç¼ç * @param dockingGroupDataVO AO/TOçä¿¡æ¯ * @return æ§è¡ç»æ */ @PostMapping("/externalMainData/receiveAddApply") ResultDataObject receiveAddApply(@NotNull @RequestBody DockingGroupDataVO dockingGroupDataVO); } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/MdmInterJtClient.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,4 @@ package com.vci.ubcs.code.feign; public class MdmInterJtClient { } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreClassifyMapper.java
@@ -1,7 +1,29 @@ package com.vci.ubcs.code.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.vci.ubcs.code.entity.CodeClassify; import com.vci.ubcs.code.entity.DockingPreClassify; import org.apache.ibatis.annotations.Param; import java.util.List; public interface DockingPreClassifyMapper extends BaseMapper<DockingPreClassify> { /** * æ¥æ¾æ å½¢ç»æ * * @param oid åç±»çä¸»é® * @return æ°æ®éå */ List<DockingPreClassify> selectCompanyGroupClassifyVOByTree(@Param("oid") String oid); /** * æ ¡éªæ¯å¦å å«åèç¹ * * @param oid åç±»çä¸»é® * @return true 表示å å« */ Boolean checkHasChild(@Param("oid") String oid); } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreAttrMappingService.java
@@ -3,7 +3,10 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.extension.service.IService; import com.vci.ubcs.code.entity.DockingPreAttrMapping; import com.vci.ubcs.code.vo.pagemodel.BaseModelVO; import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrMappingVO; import org.springblade.core.tool.api.R; import java.util.List; /** @@ -18,7 +21,7 @@ * @param codeClassifyId * @return */ List<DockingPreAttrMappingVO> getdockingAttrMappingsByCodeclassId(String codeClassifyId); List<DockingPreAttrMappingVO> getDockingAttrMappingsByCodeClassifyId(String codeClassifyId,String sourceClassifyId); /** * ä½¿ç¨æ¥è¯¢å°è£ 卿¥æ¥è¯¢ @@ -33,4 +36,13 @@ * @return æ§è¡ç»æï¼success为true表示æåï¼msgæ¯å¤±è´¥çæç¤ºä¿¡æ¯ï¼objæ¯æ·»å 宿åçæ¾ç¤ºå¯¹è±¡ */ public List<DockingPreAttrMappingVO> batchAddSave(List<DockingPreAttrMappingVO> dockingPreAttrMappingDTOS)throws Exception; /*** * ä¸»æ°æ®åéå¢ç³è¯·ç¼ç * @param oids * @param btmName * @return * @throws Exception */ public R applyGroupCode(String oids, String btmName)throws Throwable; } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreClassifyService.java
@@ -2,6 +2,10 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.vci.ubcs.code.entity.DockingPreClassify; import com.vci.ubcs.starter.revision.model.TreeQueryObject; import com.vci.ubcs.starter.web.pagemodel.Tree; import java.util.List; /*** * éå¢åç±»æå¡ @@ -9,4 +13,13 @@ * @date 2022-05-23 */ public interface IDockingPreClassifyService extends IService<DockingPreClassify> { /** * æ¥è¯¢ä¸»é¢åºåç±» æ * @param treeQueryObject æ æ¥è¯¢å¯¹è±¡ * @return 主é¢åºåç±» æ¾ç¤ºæ */ List<Tree> treeCompanyGroupClassify(TreeQueryObject treeQueryObject); } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreMetaAttrService.java
@@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.extension.service.IService; import com.vci.ubcs.code.entity.DockingPreMetaAttr; import com.vci.ubcs.code.vo.pagemodel.DockingPreMetaAttrVO; import java.util.List; @@ -22,4 +23,8 @@ */ public List<DockingPreMetaAttr> selectByWrapper(Wrapper wrapper); /*** * æ ¹æ®viewModelæ¥è¯¢æ¨¡åè§å¾å±æ§ */ List<DockingPreMetaAttrVO> selectDockingPreMetaAttrByViewModelId(String viewModelId); } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreViewModelService.java
@@ -2,6 +2,9 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.vci.ubcs.code.entity.DockingPreViewModel; import com.vci.ubcs.code.vo.pagemodel.DockingPreViewModelVO; import java.util.List; /*** * éå¢å类模åæå¡ @@ -9,4 +12,11 @@ * @date 2023-05-23 */ public interface IDockingPreViewModelService extends IService<DockingPreViewModel> { /** * æ ¹æ®åç±»idæ¥è¯¢åç±»è§å¾ * @param classifyId éå¢åç±»id * @param isContainAttr æ¯å¦æ¥è¯¢å±æ§ï¼trueï¼ æ¯ï¼falseï¼å¦ * @return è¿åå类模åè§å¾éå对象 */ List<DockingPreViewModelVO> selectDockingPreViewModelByClassId(String classifyId, boolean isContainAttr); } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreAttrMappingServiceImpl.java
@@ -1,28 +1,43 @@ package com.vci.ubcs.code.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.vci.ubcs.code.entity.DockingPreAttrMapping; import com.vci.ubcs.code.entity.DockingPreAttrRange; import com.vci.ubcs.code.entity.DockingPreMetaAttr; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.vci.ubcs.code.constant.MdmBtmTypeConstant; import com.vci.ubcs.code.entity.*; import com.vci.ubcs.code.feign.IMdmInterJtClient; import com.vci.ubcs.code.mapper.DockingPreAttrMappingMapper; import com.vci.ubcs.code.service.IDockingPreAttrMappingService; import com.vci.ubcs.code.service.IDockingPreAttrRangeService; import com.vci.ubcs.code.service.IDockingPreMetaAttrService; import com.vci.ubcs.code.service.*; import com.vci.ubcs.code.vo.pagemodel.BaseModelVO; import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrMappingVO; import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrRangeVO; import com.vci.ubcs.code.vo.webserviceModel.group.DockingGroupDataVO; import com.vci.ubcs.code.vo.webserviceModel.group.DockingMainData; import com.vci.ubcs.code.vo.webserviceModel.group.DockingViewVO; import com.vci.ubcs.code.vo.webserviceModel.group.ResultDataVO; import com.vci.ubcs.code.vo.webserviceModel.group.result.DataObjectVO; import com.vci.ubcs.code.vo.webserviceModel.group.result.DataVO; import com.vci.ubcs.code.vo.webserviceModel.group.result.ResultDataObject; import com.vci.ubcs.code.wrapper.DockingPreAttrMappingWrapper; import com.vci.ubcs.code.wrapper.DockingPreAttrRangeWrapper; import com.vci.ubcs.starter.exception.VciBaseException; import com.vci.ubcs.starter.revision.model.BaseModel; import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil; import com.vci.ubcs.starter.web.util.BeanUtilForVCI; import com.vci.ubcs.starter.web.util.VciBaseUtil; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Map; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; /*** @@ -32,31 +47,70 @@ */ @Service public class DockingPreAttrMappingServiceImpl extends ServiceImpl<DockingPreAttrMappingMapper, DockingPreAttrMapping> implements IDockingPreAttrMappingService { @Value("${docking.apply.unitCode:410-MDM}") public String dockingApplyUnitCode; @Autowired(required = false) private IMdmInterJtClient mdmInterJtClient; /*** * éå¢åç±»å±æ§å±æ§æ å°é ç½®æå¡ */ @Autowired(required = false) DockingPreAttrMappingMapper dockingPreAttrMappingMapper; private DockingPreAttrMappingMapper dockingPreAttrMappingMapper; /*** * ä¸å¡æ°æ®å±æ§æå¡ */ @Autowired(required = false) private MdmEngineService mdmEngineService; /*** * éå¢å±æ§æå¡ */ @Autowired(required = false) IDockingPreMetaAttrService dockingPreMetaAttrService; private IDockingPreMetaAttrService dockingPreMetaAttrService; /*** * 屿§åå¼èå´æå¡ */ @Autowired(required = false) IDockingPreAttrRangeService dockingPreAttrRangeService; private IDockingPreAttrRangeService dockingPreAttrRangeService; /*** * éå¢åç±»æå¡ */ @Autowired(required = false) private IDockingPreClassifyService dockingPreClassifyService; /*** * ç³è¯·åæå¡ */ @Autowired(required = false) private IDockingPreApplyFormService dockingPreApplyFormService; /*** * 模åè§å¾åæå¡ */ @Autowired(required = false) private IDockingPreViewModelService dockingPreViewModelService; /*** * æ ¹æ®ä¸»æ°æ®å类主é®è·åå类信æ¯é ç½® * @param codeClassifyId * @return */ @Override public List<DockingPreAttrMappingVO> getdockingAttrMappingsByCodeclassId(String codeClassifyId) { public List<DockingPreAttrMappingVO> getDockingAttrMappingsByCodeClassifyId(String codeClassifyId,String sourceClassifyId) { VciBaseUtil.alertNotNull(codeClassifyId,"ä¸»æ°æ®å类主é®"); //VciBaseUtil.alertNotNull(sourceClassifyId,"éå¢å类主é®"); //é¦å è·åå类模æ¿å±æ§ï¼ç¶åä¸å±æ§é ç½®åæ¯è¾ï¼ä»¥é²è¢«æå¢å 屿§çå¯è½ List<DockingPreMetaAttr> dockingPreMetaAttrList= dockingPreMetaAttrService.selectByWrapper(Wrappers.<DockingPreMetaAttr>query().lambda().eq(DockingPreMetaAttr::getSourceClassifyId,codeClassifyId)); List<DockingPreAttrMapping> dockingPreAttrMappings=this.selectByWrapper(Wrappers.<DockingPreAttrMapping>query().lambda().eq(DockingPreAttrMapping::getSourceClassifyId, codeClassifyId)); List<DockingPreMetaAttr> dockingPreMetaAttrList= dockingPreMetaAttrService.selectByWrapper(Wrappers.<DockingPreMetaAttr>query().lambda().eq(DockingPreMetaAttr::getSourceClassifyId,sourceClassifyId)); List<DockingPreAttrMapping> dockingPreAttrMappings=this.selectByWrapper(Wrappers.<DockingPreAttrMapping>query().lambda().eq(DockingPreAttrMapping::getSourceClassifyId, sourceClassifyId).eq(DockingPreAttrMapping::getTargetClassifyId, codeClassifyId)); Map<String/**屿§ä¸»é®**/, DockingPreAttrMapping> dockingPreAttrMappingMap = dockingPreAttrMappings.stream().filter(cbo -> cbo != null).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getMetaListId(), t -> t)); List<DockingPreAttrMapping> newDockingPreAttrMappingList=new ArrayList<>(); @@ -66,6 +120,7 @@ if(dockingPreAttrMappingMap.containsKey(attrOid)){ dockingPreAttrMapping= dockingPreAttrMappingMap.get(attrOid); }else{ DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreAttrMapping, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM); dockingPreAttrMapping.setMetaListId(dockingPreMetaAttr.getOid());//屿§ä¸»é® dockingPreAttrMapping.setSourceAttrKey(dockingPreMetaAttr.getEnglishName());//è±æåç§° dockingPreAttrMapping.setSourceAttrName(dockingPreMetaAttr.getChineseName());//䏿åç§° @@ -165,6 +220,120 @@ } return dockingPreAttrMappingVOList; } private String code=""; private String msg=""; /*** * åéå¢ç³è¯·éå¢ç * @param oids * @param btmName * @return * @throws Exception */ @Override @Transactional public R applyGroupCode(String oids, String btmName) throws VciBaseException { List<BaseModel> updateCbos=new ArrayList<BaseModel>(); List<DockingPreApplyForm> dockingPreAttrMappings=new ArrayList<>(); VciBaseUtil.alertNotNull(oids,"éæ©çæ°æ®"); VciBaseUtil.alertNotNull(btmName,"ä¸å¡ç±»å"); //List<BaseModelVO> codeWupins=mdmEngineService.listByIds(VciBaseUtil.str2List(oids)); List<BaseModelVO> dataModelList = new ArrayList<>(); if (!CollectionUtils.isEmpty(dataModelList)) { DockingGroupDataVO dockingGroupDataVO = new DockingGroupDataVO(); //ç³è¯·ååç³è¯·åå¯¹è±¡å ³ç³» Map<String, DockingPreApplyForm> addDockingPreApplyFormMap = new HashMap<String, DockingPreApplyForm>(); Map<String, DockingPreApplyForm> editDockingPreApplyFormMap = new HashMap<String, DockingPreApplyForm>(); Map<String, BaseModelVO> baseModelVOMap = new HashMap<String, BaseModelVO>(); //ç»ç»æ°æ® dockingGroupDataVO = queryApplycodeDataObjects(dataModelList, addDockingPreApplyFormMap, editDockingPreApplyFormMap, baseModelVOMap); ResultDataObject resultDataObject = mdmInterJtClient.receiveAddApply(dockingGroupDataVO); code = resultDataObject.getCode(); msg = resultDataObject.getMsg(); if ("1".equals(resultDataObject.getCode())) {//ç»ææ£ç¡®çæ åµ List<DataObjectVO> dataObjectVOList = resultDataObject.getData(); dataObjectVOList.stream().forEach(dataObject -> { boolean isEditDatas = false; String code2 = dataObject.getCode(); DataVO data2 = dataObject.getData(); String applyId = data2.getApplyId();//ç³è¯·åid String customCoding = StringUtils.isBlank(data2.getCustomCoding()) ? "" : data2.getCustomCoding();//éå¢ç 段 msg = dataObject.getMsg(); if (code2.equals("1")) {//ç»ææ£ç¡®çæ åµ if (!"".equals(customCoding)) { isEditDatas = true; } } //éè¦ä¿®æ¹çç³è¯·åæ°æ® if (editDockingPreApplyFormMap.containsKey(applyId)) { DockingPreApplyForm dockingPreApplyForm = editDockingPreApplyFormMap.get(applyId); dockingPreApplyForm.setCode(code2); dockingPreApplyForm.setMsg("ç³è¯·ï¼" + msg); dockingPreApplyForm.setGroupCode(customCoding); ObjectMapper mp = new ObjectMapper(); String writeValueAsString = null; try { writeValueAsString = mp.writeValueAsString(dataObject); dockingPreApplyForm.setContent(writeValueAsString); } catch (JsonProcessingException e) { } } //æ°å¢çç³è¯·åæ°æ® if (addDockingPreApplyFormMap.containsKey(applyId)) { DockingPreApplyForm dockingPreApplyForm = addDockingPreApplyFormMap.get(applyId); dockingPreApplyForm.setCode(code2); dockingPreApplyForm.setMsg("ç³è¯·ï¼" + msg); dockingPreApplyForm.setGroupCode(customCoding); ObjectMapper mp = new ObjectMapper(); String writeValueAsString = null; try { writeValueAsString = mp.writeValueAsString(dataObject); dockingPreApplyForm.setContent(writeValueAsString); } catch (JsonProcessingException e) { } } //妿æéå¢ç åæ´æ°æ°æ® if (isEditDatas) { if (baseModelVOMap.containsKey(applyId)) { BaseModelVO baseModelVO = baseModelVOMap.get(applyId); BaseModel baseModel = new BaseModel(); BeanUtilForVCI.copyDeclaredIgnoreCase(baseModelVO, baseModel); DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel); DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel); baseModelVO.setId(customCoding); updateCbos.add(baseModel);//æ´æ°æ°æ®éå¢code } } }); } else { editDockingPreApplyFormMap.forEach((key, dockingPreApplyForm) -> { dockingPreApplyForm.setCode("2"); dockingPreApplyForm.setMsg("ç³è¯·ï¼" + msg); dockingPreApplyForm.setContent(""); dockingPreApplyForm.setGroupCode(""); DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm); }); addDockingPreApplyFormMap.forEach((key, dockingPreApplyForm) -> { dockingPreApplyForm.setCode("2"); dockingPreApplyForm.setMsg("ç³è¯·ï¼" + msg); dockingPreApplyForm.setContent(""); dockingPreApplyForm.setGroupCode(""); DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM); }); } if (editDockingPreApplyFormMap.size() > 0) { dockingPreAttrMappings.addAll(editDockingPreApplyFormMap.values());//æ·»å ç³è¯·åæ°æ® } if (addDockingPreApplyFormMap.size() > 0) { dockingPreAttrMappings.addAll(addDockingPreApplyFormMap.values());//éè¦ä¿®æ¹çç³è¯·åæ°æ® } //ä¿åè¡¨åæ°æ® dockingPreApplyFormService.saveOrUpdateBatch(dockingPreAttrMappings); //mdmEngineService.saveBatch(updateCbos);//ä¿åæ°æ® } return R.success("ç³è¯·æ¥å£è°ç¨æå"); } /*** * å¯¹è±¡è½¬æ¢ @@ -184,4 +353,237 @@ } return dockingPreAttrMappingVOList; } /** * ç»ç»æ°æ® * */ private DockingGroupDataVO queryApplycodeDataObjects(List<BaseModelVO> codeWupins,Map<String,DockingPreApplyForm> addDockingPreApplyFormMap,Map<String,DockingPreApplyForm> editDockingPreApplyFormMap,Map<String,BaseModelVO> codeWupinMap) throws VciBaseException{ try { String curUserName = AuthUtil.getUser().getUserName(); //ç³è¯·çæ°æ® List<DockingMainData> mainDataList=new ArrayList<DockingMainData>(); for (BaseModelVO dataBusinessObject : codeWupins) { String format = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date()); String codeclsfid = dataBusinessObject.getData().getOrDefault("codeclsfid",""); String btmName = dataBusinessObject.getBtmname(); String oid = dataBusinessObject.getOid(); DockingPreApplyForm dockingPreApplyForm = new DockingPreApplyForm(); String dataOid = dataBusinessObject.getOid(); Map<String, String> conditionsMap = new HashMap<String, String>(); List<DockingPreApplyForm> applyFormObjects = dockingPreApplyFormService.list(Wrappers.<DockingPreApplyForm>query().lambda().eq(DockingPreApplyForm::getDataOid, dataOid).eq(DockingPreApplyForm::getOperationType, "1")); String apllyCode = ""; if (!CollectionUtils.isEmpty(applyFormObjects)) { dockingPreApplyForm = applyFormObjects.get(0); apllyCode = dockingPreApplyForm.getId(); editDockingPreApplyFormMap.put(apllyCode, dockingPreApplyForm);//ç³è¯·ååç³è¯·åå¯¹è±¡å ³ç³» } else { apllyCode = dockingApplyUnitCode + "-" + format; dockingPreApplyForm.setId(apllyCode); dockingPreApplyForm.setName(""); dockingPreApplyForm.setOperationType("2"); dockingPreApplyForm.setDescription(dataBusinessObject.getDescription());//è·åæ°æ®æè¿°ä¿¡æ¯ dockingPreApplyForm.setDataOid(oid); dockingPreApplyForm.setDataBtmName(btmName); addDockingPreApplyFormMap.put(apllyCode, dockingPreApplyForm);//ç³è¯·ååç³è¯·åå¯¹è±¡å ³ç³» } codeWupinMap.put(apllyCode, dataBusinessObject);//ç³è¯·ååå¯¹åºæ°æ®å ³ç³» conditionsMap = new HashMap<String, String>(); conditionsMap.put("jtargetclsfid", codeclsfid);//è§å¾oid List<DockingPreAttrMapping> dockingPreAttrMappingList = this.selectByWrapper(Wrappers.<DockingPreAttrMapping>query().lambda().eq(DockingPreAttrMapping::getTargetClassifyId, codeclsfid)); if (CollectionUtils.isEmpty(dockingPreAttrMappingList)) { throw new Exception("æ ¹æ®æéçæ°æ®ï¼æ²¡ææ¾å°å¯¹åºçéå¢å类设置ï¼è¯·æ ¸å¯¹!"); } String jsourceclsfid = dockingPreAttrMappingList.get(0).getSourceClassifyId(); //è·åæ°æ®æ¨¡ååç±»ä¿¡æ¯ DockingPreClassify dockingPreClassify = dockingPreClassifyService.getById(jsourceclsfid); DockingMainData mainData = new DockingMainData(); mainData.setApplyEntId(dockingApplyUnitCode);//ç³è¯·åä½ä»£ç mainData.setApplyId(apllyCode);//ç³è¯·åå· mainData.setClassName(dockingPreClassify.getGetNodeLinkName());//åç±»åç§° mainData.setCreateBy(curUserName);// mainData.setSecretLevel("å é¨");//å¯çº§ï¼é»è®¤ä¸ºå é¨ mainData.setViewInfos(getviewInfos(dockingPreClassify, dataBusinessObject));//è·åè§å¾æ¨¡å mainDataList.add(mainData); } //æ ¹æ®æ°æ®æ¨¡åï¼ç»ç»æéè¦æ°æ® DockingGroupDataVO postParameters=new DockingGroupDataVO(); postParameters.setSysName("420-CODE");//ç³»ç»æ è¯ postParameters.setMainData(mainDataList);// return postParameters; } catch (Throwable e) { // TODO Auto-generated catch block throw new VciBaseException("æ¥è¯¢æ°æ®åºé"+e); } } /** * è·å模åè§å¾ * @param dockingPreClassify * @param dataBusinessObject * @throws VciBaseException */ private List<DockingViewVO>getviewInfos(DockingPreClassify dockingPreClassify,BaseModelVO dataBusinessObject) throws Throwable{ List<DockingViewVO> viewInfoList=new ArrayList<>(); String jclassOid= dockingPreClassify.getOid(); Map<String,String>conditionsMap=new HashMap<String, String>(); conditionsMap.put("jsourceclsfid",jclassOid); conditionsMap.put("jviewname","ç¼ç è§å¾");//ç³è¯·åªä¼ ç¼ç è§å¾ //æ ¹æ®åç±»æ¥è¯¢æ¨¡åè§å¾å¯¹è±¡ List<DockingPreViewModel> dockingPreViewModels= dockingPreViewModelService.list(Wrappers.<DockingPreViewModel>query().lambda().eq(DockingPreViewModel::getSourceClassifyId,jclassOid).eq(DockingPreViewModel::getViewName,"ç¼ç è§å¾")); for (DockingPreViewModel dockingPreViewModel : dockingPreViewModels) { //ç»ç»æ°æ®å±æ§ä¿¡æ¯ DockingViewVO viewInfo=new DockingViewVO(); viewInfo.setViewName(dockingPreViewModel.getViewName());//è§å¾åç§° viewInfo.setViewValue(getViewValueList(dockingPreViewModel,jclassOid,dataBusinessObject));//è§å¾ viewInfoList.add(viewInfo); } return viewInfoList; } /*** * è·åé ç½®ä¿¡æ¯ * @param dockingPreViewModel * @param jclassOid * @param dataBusinessObject * @return * @throws VciBaseException */ private List<Map<String, Object>> getViewValueList(DockingPreViewModel dockingPreViewModel,String jclassOid,BaseModelVO dataBusinessObject) throws Throwable{ //æé 模åè§å¾æ°æ® List<Map<String, Object>> viewValueList=new ArrayList<Map<String,Object>>(); String oid = dockingPreViewModel.getOid(); Map<String,String> dataValueMap=dataBusinessObject.getData(); String codeClassifyId=dataValueMap.get("codeclsfid"); Map<String,String>conditionsMap=new HashMap<String, String>(); List<DockingPreAttrMapping> dockingPreAttrMappingList = this.selectByWrapper(Wrappers.<DockingPreAttrMapping>query().lambda() .eq(DockingPreAttrMapping::getSourceClassifyId, jclassOid).eq(DockingPreAttrMapping::getTargetClassifyId, codeClassifyId)); if(CollectionUtils.isEmpty(dockingPreAttrMappingList)) { return viewValueList; } Map<String,DockingPreAttrMapping> jintegmappconfigMap=new HashMap<String, DockingPreAttrMapping>(); for (DockingPreAttrMapping businessObject : dockingPreAttrMappingList) { jintegmappconfigMap.put(businessObject.getSourceAttrKey(), businessObject); } List<DockingPreMetaAttr> dockingPreMetaAttrList= dockingPreMetaAttrService.selectByWrapper( Wrappers.<DockingPreMetaAttr>query().lambda().eq(DockingPreMetaAttr::getViewModelId,dockingPreViewModel.getOid()) .eq(DockingPreMetaAttr::getSourceClassifyId,dockingPreViewModel.getSourceClassifyId())); Map<String,Object> viewValueMap=new HashMap<String,Object>(); for (DockingPreMetaAttr dockingPreMetaAttr : dockingPreMetaAttrList) { String jenglishname=dockingPreMetaAttr.getEnglishName();////éå¢é ç½®å±æ§ if(jintegmappconfigMap.containsKey(jenglishname)){ DockingPreAttrMapping dockingPreAttrMapping=jintegmappconfigMap.get(jenglishname); String attrId = dockingPreAttrMapping.getTargetAttrId();//ç¼ç 屿§id String jtargetattrkey = dockingPreAttrMapping.getTargetAttrKey();//ç¼ç 屿§id Object newVaue=null; if(StringUtils.isNotBlank(jtargetattrkey)){ getAttrRange(dockingPreMetaAttr);//è·ååæ®µåå¼èå´ String value=dataValueMap.get(jtargetattrkey)==null?"":dataValueMap.getOrDefault(jtargetattrkey,""); newVaue = getVaue(dockingPreMetaAttr, value); }else{ newVaue = getVaue(dockingPreMetaAttr, ""); } if(newVaue==null||"".equals(newVaue)){ newVaue= dockingPreMetaAttr.getDefaultValue(); } viewValueMap.put(jenglishname, newVaue); } } viewValueList.add(viewValueMap); return viewValueList; } /*** * è·å屿§æä¸¾æ å°é ç½® */ Map<String,Map<String,DockingPreAttrRange>> attrRangeMap=new HashMap<String, Map<String,DockingPreAttrRange>>(); private void getAttrRange(DockingPreMetaAttr jmetaatter) throws Throwable{ String jmetalistoid = jmetaatter.getOid(); if(attrRangeMap.containsKey(jmetalistoid)) { return; } Map<String,String>conditionsMap=new HashMap<String, String>(); conditionsMap.put("jmetalistid", jmetalistoid);//è§å¾oid List<DockingPreAttrRange> dockingPreAttrRangeList = dockingPreAttrRangeService.selectByWrapper(Wrappers.<DockingPreAttrRange>query().lambda().eq(DockingPreAttrRange::getMetaListId, jmetalistoid)); if (CollectionUtils.isEmpty(dockingPreAttrRangeList)) { return; } Map<String, DockingPreAttrRange> rangeMap = new HashMap<String, DockingPreAttrRange>(); rangeMap = dockingPreAttrRangeList.stream().collect(Collectors.toMap(s -> s.getNumTextValue(), t -> t, (o1, o2) -> o2)); attrRangeMap.put(jmetalistoid, rangeMap); } /**** * å¼ç±»åè½¬æ¢ * @param jmetaatter * @param value * @return * @throws Throwable */ private Object getVaue(DockingPreMetaAttr jmetaatter,String value) throws Throwable{ //jmetadatatype å æ°æ®ç±»åï¼1 å符å, 2 æ´å, 3 é¿æ´å, 4 å精度, 5 å精度,6 æ¥æå, 7 æ¶é´å, 8 å¸å°å, 9 æä»¶, 10å¤ååï¼ int jmetadatatype = jmetaatter.getMetaDataType(); String jmetalistoid = jmetaatter.getOid(); Map<String, DockingPreAttrRange> rangeMap=new HashMap<String, DockingPreAttrRange>(); if(attrRangeMap.containsKey(jmetalistoid)){ rangeMap = attrRangeMap.get(jmetalistoid); if(rangeMap.containsKey(value)){ DockingPreAttrRange dockingPreAttrRange = rangeMap.get(value); value=dockingPreAttrRange.getNumText();//å°ç¼ç 屿§åå¼è½¬æ¢æéå¢å¯¹åºçåå¼ } } if(jmetadatatype==1){//1 å符å return StringUtils.isBlank(value)?"":value; }else if(jmetadatatype==2){//2 æ´å return StringUtils.isBlank(value)?null:Integer.parseInt(value); }else if(jmetadatatype==3){//3 é¿æ´å return StringUtils.isBlank(value)?null:Long.parseLong(value); }else if(jmetadatatype==4){//4 å精度, return StringUtils.isBlank(value)?null:Float.parseFloat(value); }else if(jmetadatatype==5){// 5 å精度 return StringUtils.isBlank(value)?null:Double.parseDouble(value); }else if(jmetadatatype==6){//6 æ¥æå SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-mm-dd"); if(StringUtils.isBlank(value)) { return null; }else { try { return simpleDateFormat.parse(value); } catch (ParseException e) { throw new VciBaseException("date", new String[]{"æ¥ææ ¼å¼è½¬æ¢é误"}); } } }else if(jmetadatatype==7){//7 æ¶é´å SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm:ss"); if(StringUtils.isBlank(value)) { return null; }else{ try { return simpleDateFormat.parse(value); } catch (ParseException e) { throw new VciBaseException("date", new String[]{"æ¥ææ ¼å¼è½¬æ¢é误"}); } } }else if(jmetadatatype==8){//8 å¸å°å return value; }else if(jmetadatatype==9){//9 æä»¶, return value; }else if(jmetadatatype==10){//10å¤åå return value;//符å忝ä»ä¹ä¸ä¸å¦ä½å¤ç } return value; } } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreClassifyServiceImpl.java
@@ -1,17 +1,26 @@ package com.vci.ubcs.code.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.vci.ubcs.code.entity.DockingPreAttrRange; import com.vci.ubcs.code.entity.DockingPreClassify; import com.vci.ubcs.code.enumpack.FrameworkDataLCStatus; import com.vci.ubcs.code.mapper.DockingPreClassifyMapper; import com.vci.ubcs.code.service.IDockingPreClassifyService; import com.vci.ubcs.code.service.IDockingPreViewModelService; import com.vci.ubcs.code.vo.pagemodel.DockingPreClassifyVO; import com.vci.ubcs.code.vo.pagemodel.DockingPreViewModelVO; import com.vci.ubcs.code.wrapper.DockingPreClassifyWrapper; import com.vci.ubcs.starter.revision.model.TreeQueryObject; import com.vci.ubcs.starter.revision.model.TreeWrapperOptions; import com.vci.ubcs.starter.revision.service.RevisionModelUtil; import com.vci.ubcs.starter.web.pagemodel.Tree; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.util.Collection; import java.util.Map; import java.util.function.Function; import javax.annotation.Resource; import java.util.*; import static com.vci.ubcs.code.constant.MdmBtmTypeConstant.CODE_CLASSIFY_OID_FIELD; import static com.vci.ubcs.code.service.impl.CodeClassifyServiceImpl.PARENT_FIELD_NAME; /** * éå¢åç±»ä¸å¡æå¡ @@ -19,7 +28,77 @@ * @date 2023-05-23 */ @Service @Slf4j public class DockingPreClassifyServiceImpl extends ServiceImpl<DockingPreClassifyMapper, DockingPreClassify> implements IDockingPreClassifyService { /*** * éå¢åç±»å±æ§ */ @Resource private DockingPreClassifyMapper dockingPreClassifyMapper; /*** * éå¢åç±»å±æ§ */ @Resource private IDockingPreViewModelService dockingPreViewModelService; /** * 对象çæä½ */ @Resource private RevisionModelUtil revisionModelUtil; /*** * éå¢åç±»æ å¯¹è±¡æ¥ *@param treeQueryObject éå¢åç±»æ¥è¯¢å¯¹è±¡ *@return è¿ååç±»æ 对象 */ @Override public List<Tree> treeCompanyGroupClassify(TreeQueryObject treeQueryObject) { log.info("è·åéå¢åç±»æ start..."); Map<String,String> conditionMap= treeQueryObject.getConditionMap(); TreeWrapperOptions treeWrapperOptions = new TreeWrapperOptions(PARENT_FIELD_NAME.toLowerCase(Locale.ROOT)); treeWrapperOptions.copyFromTreeQuery(treeQueryObject); List<DockingPreClassifyVO> dockingPreClassifyVOS= getCompanyGourpClassByParentId(treeQueryObject.getParentOid(),true); List<Tree> tree= revisionModelUtil.doList2Trees(dockingPreClassifyVOS,treeWrapperOptions,(DockingPreClassifyVO s) ->{ //å¯ä»¥å¨è¿éå¤çæ èç¹çæ¾ç¤º return s.getId() + " " + s.getName() + (FrameworkDataLCStatus.DISABLED.getValue().equalsIgnoreCase(s .getLcStatus()) ? (" ãåç¨ã ") : ""); }); Iterator var6 = tree.listIterator(); while(var6.hasNext()){ Tree trees = (Tree) var6.next(); boolean checkHasChild=dockingPreClassifyMapper.checkHasChild(trees.getOid()); //妿䏿¡ä»¶ä¼ è¿æ¥çå¼å¹é çä¸å设置为éä¸ if(conditionMap.containsKey(CODE_CLASSIFY_OID_FIELD)){ trees.setChecked(true); } ; if(checkHasChild){ trees.setLeaf(false); }else{ trees.setLeaf(true); } } log.info("è·åéå¢åç±»æ end..."); return tree; } /*** * æ ¹æ®ç¶åç±»idæ¥è¯¢å±çº§æ æ°æ®å¯¹è±¡éå * @param pid éå¢åç±»çoid * @return è¿åå±çº§æ æ°æ®å¯¹è±¡éå */ private List<DockingPreClassifyVO> getCompanyGourpClassByParentId(String pid,boolean isContainView){ log.info("æ ¹æ®ç¶åç±»pid->"+pid+"æ¥è¯¢å±çº§æ æ°æ®å¯¹è±¡éåstart..."); List<DockingPreClassify> doList =dockingPreClassifyMapper.selectCompanyGroupClassifyVOByTree(pid); List<DockingPreClassifyVO>dockingPreClassifyVOS= DockingPreClassifyWrapper.build().entityVOs(doList); if(isContainView){ dockingPreClassifyVOS.stream().forEach(dockingPreClassifyVO -> { List<DockingPreViewModelVO> dockingViewVOS= dockingPreViewModelService.selectDockingPreViewModelByClassId(dockingPreClassifyVO.getOid(),isContainView); dockingPreClassifyVO.setDockingPreViewModelVOList(dockingViewVOS); }); } log.info("æ ¹æ®ç¶åç±»pid->"+pid+"æ¥è¯¢å±çº§æ æ°æ®å¯¹è±¡éåend..."); return dockingPreClassifyVOS; } } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreMetaAttrServiceImpl.java
@@ -1,11 +1,15 @@ package com.vci.ubcs.code.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.vci.ubcs.code.entity.DockingPreAttrMapping; import com.vci.ubcs.code.entity.DockingPreMetaAttr; import com.vci.ubcs.code.mapper.DockingPreMetaAttrMapper; import com.vci.ubcs.code.service.IDockingPreMetaAttrService; import com.vci.ubcs.code.vo.pagemodel.DockingPreMetaAttrVO; import com.vci.ubcs.code.wrapper.DockingPreMetaAttrWrapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -17,6 +21,7 @@ * @date 2023-05-23 */ @Service @Slf4j public class DockingPreMetaAttrServiceImpl extends ServiceImpl<DockingPreMetaAttrMapper, DockingPreMetaAttr> implements IDockingPreMetaAttrService { @Autowired(required = false) @@ -26,4 +31,18 @@ public List<DockingPreMetaAttr> selectByWrapper(Wrapper wrapper) { return dockingPreMetaAttrMapper.selectList(wrapper); } /*** * æ ¹æ®æ¨¡åè§å¾oidæ¥è¯¢æ°æ® * @param viewModelId * @return è¿å屿§å¯¹è±¡ */ @Override public List<DockingPreMetaAttrVO> selectDockingPreMetaAttrByViewModelId(String viewModelId) { log.info("æ ¹æ®æ¨¡åè§å¾oid"+viewModelId+"æ¥è¯¢æ°æ® star"); List<DockingPreMetaAttr> dockingPreMetaAttrList= selectByWrapper(Wrappers.<DockingPreMetaAttr>query().lambda().eq(DockingPreMetaAttr::getViewModelId,viewModelId)); List<DockingPreMetaAttrVO> dockingPreMetaAttrVOList=DockingPreMetaAttrWrapper.build().entityVOs(dockingPreMetaAttrList); log.info("æ ¹æ®æ¨¡åè§å¾oid"+viewModelId+"æ¥è¯¢æ°æ® end"); return dockingPreMetaAttrVOList; } } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreViewModelServiceImpl.java
@@ -1,10 +1,23 @@ package com.vci.ubcs.code.service.impl; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.vci.ubcs.code.entity.DockingPreMetaAttr; import com.vci.ubcs.code.entity.DockingPreViewModel; import com.vci.ubcs.code.mapper.DockingPreViewModelMapper; import com.vci.ubcs.code.service.IDockingPreMetaAttrService; import com.vci.ubcs.code.service.IDockingPreViewModelService; import com.vci.ubcs.code.vo.pagemodel.DockingPreMetaAttrVO; import com.vci.ubcs.code.vo.pagemodel.DockingPreViewModelVO; import com.vci.ubcs.code.wrapper.DockingPreMetaAttrWrapper; import com.vci.ubcs.code.wrapper.DockingPreViewWrapper; import com.vci.ubcs.starter.web.util.VciBaseUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; /*** * é墿¨¡åæå¡ @@ -12,5 +25,46 @@ * @date 2023-05-23 */ @Service @Slf4j public class DockingPreViewModelServiceImpl extends ServiceImpl<DockingPreViewModelMapper,DockingPreViewModel> implements IDockingPreViewModelService { /*** * éå¢åç±»å±æ§ */ @Resource private DockingPreViewModelMapper dockingPreViewModelMapper; /*** * éå¢åç±»å±æ§æ¥è¯¢æå¡ */ @Resource private IDockingPreMetaAttrService dockingPreMetaAttrService; /** * æ ¹æ®åç±»idæ¥è¯¢åç±»è§å¾ * @param classifyId éå¢åç±»id * @param isContainAttr æ¯å¦æ¥è¯¢å±æ§ï¼trueï¼ æ¯ï¼falseï¼å¦ * @return è¿åå类模åè§å¾éå对象 */ @Override public List<DockingPreViewModelVO> selectDockingPreViewModelByClassId(String classifyId, boolean isContainAttr) { log.info("æ ¹æ®åç±»id->"+classifyId+",æ¥è¯¢åç±»è§å¾statr"); VciBaseUtil.alertNotNull(classifyId,"éå¢å类主é®"); List<DockingPreViewModel> dockingPreViewModels= dockingPreViewModelMapper.selectList(Wrappers.<DockingPreViewModel>query().lambda().eq(DockingPreViewModel::getSourceClassifyId,classifyId)); List<DockingPreViewModelVO> dockingPreViewModelVOS=DockingPreViewWrapper.build().entityVOs(dockingPreViewModels); if(isContainAttr) { dockingPreViewModelVOS.stream().forEach(dockingPreViewModelVO -> { String viewModelVOOid=dockingPreViewModelVO.getOid(); String sourceClassifyId=dockingPreViewModelVO.getSourceClassifyId(); List<DockingPreMetaAttr> dockingPreMetaAttrList=dockingPreMetaAttrService.selectByWrapper(Wrappers.<DockingPreMetaAttr>query().lambda().eq(DockingPreMetaAttr::getSourceClassifyId,sourceClassifyId).eq(DockingPreMetaAttr::getViewModelId,viewModelVOOid)); List<DockingPreMetaAttrVO> dockingPreMetaAttrVOList= DockingPreMetaAttrWrapper.build().entityVOs(dockingPreMetaAttrList); if(!CollectionUtils.isEmpty(dockingPreMetaAttrVOList)) { dockingPreViewModelVO.setDockingPreMetaAttrVOList(dockingPreMetaAttrVOList); } }); } log.info("æ ¹æ®åç±»id->"+classifyId+",æ¥è¯¢åç±»è§å¾end"); return dockingPreViewModelVOS; } } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingLogeWrapper.java
@@ -1,16 +1,67 @@ package com.vci.ubcs.code.wrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.vci.ubcs.code.entity.DockingLog; import com.vci.ubcs.code.vo.pagemodel.DockingLogeVO; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Objects; public class DockingLogeWrapper extends BaseEntityWrapper<DockingLog, DockingLogeVO> { public static DockingLogeWrapper build() { return new DockingLogeWrapper(); } @Override public DockingLogeVO entityVO(DockingLog entity) { DockingLogeVO dockingLogeVO = Objects.requireNonNull(BeanUtil.copy(entity, DockingLogeVO.class)); return dockingLogeVO; } /*** * æ°ç»å¯¹è±¡è½¬æ¢ * @param entitys * @return */ public List<DockingLogeVO> entityVOs(Collection<DockingLog> entitys) { if(CollectionUtils.isEmpty(entitys)) {return new ArrayList<>();} List<DockingLogeVO> vos=new ArrayList<>(); if(!CollectionUtils.isEmpty(entitys)) { entitys.stream().forEach(vo -> { vos.add(entityVO(vo)); }); } return vos; } /*** * æ°ç»å¯¹è±¡è½¬æ¢ * @param vos * @return */ public List<DockingLog> voentitys(Collection<DockingLogeVO> vos) { if(CollectionUtils.isEmpty(vos)) {return new ArrayList<>();} List<DockingLog>entitys =new ArrayList<>(); if(!CollectionUtils.isEmpty(vos)) { vos.stream().forEach(entity -> { entitys.add(voentity(entity)); }); } return entitys; } /*** * æ°ç»å¯¹è±¡è½¬æ¢ * @param vo * @return */ public DockingLog voentity( DockingLogeVO vo) { DockingLog entity = Objects.requireNonNull(BeanUtil.copy(vo, DockingLog.class)); return entity; } } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreApplyFormWrapper.java
@@ -1,10 +1,14 @@ package com.vci.ubcs.code.wrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.vci.ubcs.code.entity.DockingPreApplyForm; import com.vci.ubcs.code.vo.pagemodel.DockingPreApplyFormVO; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Objects; /*** @@ -13,10 +17,54 @@ * @date 2023-05-23 */ public class DockingPreApplyFormWrapper extends BaseEntityWrapper<DockingPreApplyForm, DockingPreApplyFormVO> { public static DockingPreApplyFormWrapper build() { return new DockingPreApplyFormWrapper(); } @Override public DockingPreApplyFormVO entityVO(DockingPreApplyForm entity) { DockingPreApplyFormVO dockingPreApplyFormVO = Objects.requireNonNull(BeanUtil.copy(entity, DockingPreApplyFormVO.class)); return dockingPreApplyFormVO; } /*** * æ°ç»å¯¹è±¡è½¬æ¢ * @param entitys * @return */ public List<DockingPreApplyFormVO> entityVOs(Collection<DockingPreApplyForm> entitys) { if(CollectionUtils.isEmpty(entitys)) {return new ArrayList<>();} List<DockingPreApplyFormVO> vos=new ArrayList<>(); if(!CollectionUtils.isEmpty(entitys)) { entitys.stream().forEach(vo -> { vos.add(entityVO(vo)); }); } return vos; } /*** * æ°ç»å¯¹è±¡è½¬æ¢ * @param vos * @return */ public List<DockingPreApplyForm> voentitys(Collection<DockingPreApplyFormVO> vos) { if(CollectionUtils.isEmpty(vos)) {return new ArrayList<>();} List<DockingPreApplyForm>entitys =new ArrayList<>(); if(!CollectionUtils.isEmpty(vos)) { vos.stream().forEach(entity -> { entitys.add(voentity(entity)); }); } return entitys; } /*** * æ°ç»å¯¹è±¡è½¬æ¢ * @param vo * @return */ public DockingPreApplyForm voentity( DockingPreApplyFormVO vo) { DockingPreApplyForm entity = Objects.requireNonNull(BeanUtil.copy(vo, DockingPreApplyForm.class)); return entity; } } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreAttrMappingWrapper.java
@@ -2,9 +2,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.vci.ubcs.code.entity.DockingPreAttrMapping; import com.vci.ubcs.code.entity.DockingPreAttrRange; import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrMappingVO; import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrRangeVO; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; @@ -31,14 +29,15 @@ /*** * æ°ç»å¯¹è±¡è½¬æ¢ * @param dockingPreAttrMappings * @param entitys * @return */ public List<DockingPreAttrMappingVO> entityVOs(Collection<DockingPreAttrMapping> dockingPreAttrMappings) { public List<DockingPreAttrMappingVO> entityVOs(Collection<DockingPreAttrMapping> entitys) { if(CollectionUtils.isEmpty(entitys)) {return new ArrayList<>();} List<DockingPreAttrMappingVO> dockingPreAttrMappingVOList=new ArrayList<>(); if(!CollectionUtils.isEmpty(dockingPreAttrMappings)) { dockingPreAttrMappings.stream().forEach(dockingPreAttrMapping -> { dockingPreAttrMappingVOList.add(entityVO(dockingPreAttrMapping)); if(!CollectionUtils.isEmpty(entitys)) { entitys.stream().forEach(entity -> { dockingPreAttrMappingVOList.add(entityVO(entity)); }); } return dockingPreAttrMappingVOList; @@ -46,14 +45,15 @@ /*** * æ°ç»å¯¹è±¡è½¬æ¢ * @param dockingPreAttrMappingVOS * @param vos * @return */ public List<DockingPreAttrMapping> voentitys(Collection<DockingPreAttrMappingVO> dockingPreAttrMappingVOS) { public List<DockingPreAttrMapping> voentitys(Collection<DockingPreAttrMappingVO> vos) { if(CollectionUtils.isEmpty(vos)) {return new ArrayList<>();} List<DockingPreAttrMapping> dockingPreAttrMappingList=new ArrayList<>(); if(!CollectionUtils.isEmpty(dockingPreAttrMappingVOS)) { dockingPreAttrMappingVOS.stream().forEach(dockingPreAttrMappingVO -> { dockingPreAttrMappingList.add(voentity(dockingPreAttrMappingVO)); if(!CollectionUtils.isEmpty(vos)) { vos.stream().forEach(vo -> { dockingPreAttrMappingList.add(voentity(vo)); }); } return dockingPreAttrMappingList; Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreAttrRangeWrapper.java
@@ -1,11 +1,8 @@ package com.vci.ubcs.code.wrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.vci.ubcs.code.entity.DockingPreAttrMapping; import com.vci.ubcs.code.entity.DockingPreAttrRange; import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrMappingVO; import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrRangeVO; import com.vci.ubcs.code.vo.pagemodel.DockingPreClassifyVO; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; @@ -32,14 +29,16 @@ /*** * æ°ç»å¯¹è±¡è½¬æ¢ * @param dockingPreAttrRanges * @param entitys * @return */ public List<DockingPreAttrRangeVO> entityVOs(Collection<DockingPreAttrRange> dockingPreAttrRanges) { public List<DockingPreAttrRangeVO> entityVOs(Collection<DockingPreAttrRange> entitys) { if(CollectionUtils.isEmpty(entitys)) {return new ArrayList<>();} List<DockingPreAttrRangeVO> dockingPreAttrRangeVOList=new ArrayList<>(); if(!CollectionUtils.isEmpty(dockingPreAttrRanges)) { dockingPreAttrRanges.stream().forEach(dockingPreAttrRange -> { dockingPreAttrRangeVOList.add(entityVO(dockingPreAttrRange)); if(!CollectionUtils.isEmpty(entitys)) { entitys.stream().forEach(entity -> { dockingPreAttrRangeVOList.add(entityVO(entity)); }); } return dockingPreAttrRangeVOList; @@ -47,14 +46,15 @@ /*** * æ°ç»å¯¹è±¡è½¬æ¢ * @param dockingPreAttrRangeVos * @param vos * @return */ public List<DockingPreAttrRange> voentitys(Collection<DockingPreAttrRangeVO> dockingPreAttrRangeVos) { public List<DockingPreAttrRange> voentitys(Collection<DockingPreAttrRangeVO> vos) { if(CollectionUtils.isEmpty(vos)) {return new ArrayList<>();} List<DockingPreAttrRange> dockingPreAttrRangeList=new ArrayList<>(); if(!CollectionUtils.isEmpty(dockingPreAttrRangeVos)) { dockingPreAttrRangeVos.stream().forEach(dockingPreAttrRangeVO -> { dockingPreAttrRangeList.add(voentity(dockingPreAttrRangeVO)); if(!CollectionUtils.isEmpty(vos)) { vos.stream().forEach(vo -> { dockingPreAttrRangeList.add(voentity(vo)); }); } return dockingPreAttrRangeList; Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreClassifyWrapper.java
@@ -1,11 +1,14 @@ package com.vci.ubcs.code.wrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.vci.ubcs.code.entity.DockingPreClassify; import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrMappingVO; import com.vci.ubcs.code.vo.pagemodel.DockingPreClassifyVO; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Objects; /** *éå¢ç¼ç åç±»å è£ ç±» @@ -14,9 +17,54 @@ * @since 2023-05-23 */ public class DockingPreClassifyWrapper extends BaseEntityWrapper<DockingPreClassify, DockingPreClassifyVO> { public static DockingPreClassifyWrapper build() { return new DockingPreClassifyWrapper(); } @Override public DockingPreClassifyVO entityVO(DockingPreClassify entity) { DockingPreClassifyVO dockingPreClassifyVO = Objects.requireNonNull(BeanUtil.copy(entity, DockingPreClassifyVO.class)); return dockingPreClassifyVO; } /*** * æ°ç»å¯¹è±¡è½¬æ¢ * @param entitys * @return */ public List<DockingPreClassifyVO> entityVOs(Collection<DockingPreClassify> entitys) { if(CollectionUtils.isEmpty(entitys)) {return new ArrayList<>();} List<DockingPreClassifyVO> vos=new ArrayList<>(); if(!CollectionUtils.isEmpty(entitys)) { entitys.stream().forEach(vo -> { vos.add(entityVO(vo)); }); } return vos; } /*** * æ°ç»å¯¹è±¡è½¬æ¢ * @param vos * @return */ public List<DockingPreClassify> voentitys(Collection<DockingPreClassifyVO> vos) { if(CollectionUtils.isEmpty(vos)) {return new ArrayList<>();} List<DockingPreClassify>entitys =new ArrayList<>(); if(!CollectionUtils.isEmpty(vos)) { vos.stream().forEach(entity -> { entitys.add(voentity(entity)); }); } return entitys; } /*** * æ°ç»å¯¹è±¡è½¬æ¢ * @param vo * @return */ public DockingPreClassify voentity( DockingPreClassifyVO vo) { DockingPreClassify entity = Objects.requireNonNull(BeanUtil.copy(vo, DockingPreClassify.class)); return entity; } } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreMetaAttrWrapper.java
@@ -1,12 +1,14 @@ package com.vci.ubcs.code.wrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.vci.ubcs.code.entity.DockingPreMetaAttr; import com.vci.ubcs.code.entity.DockingPreViewModel; import com.vci.ubcs.code.vo.pagemodel.DockingPreMetaAttrVO; import com.vci.ubcs.code.vo.pagemodel.DockingPreViewModelVO; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Objects; /** *éå¢ç¼ç ç³è¯·æ¨¡å屿§å è£ ç±» @@ -15,9 +17,58 @@ * @since 2023-05-23 */ public class DockingPreMetaAttrWrapper extends BaseEntityWrapper<DockingPreMetaAttr, DockingPreMetaAttrVO> { public static DockingPreMetaAttrWrapper build() { return new DockingPreMetaAttrWrapper(); } @Override public DockingPreMetaAttrVO entityVO(DockingPreMetaAttr entity) { DockingPreMetaAttrVO dockingPreMetaAttrVO = Objects.requireNonNull(BeanUtil.copy(entity, DockingPreMetaAttrVO.class)); return dockingPreMetaAttrVO; } /*** * æ°ç»å¯¹è±¡è½¬æ¢ * @param entitys * @return */ public List<DockingPreMetaAttrVO> entityVOs(Collection<DockingPreMetaAttr> entitys) { if(CollectionUtils.isEmpty(entitys)) {return new ArrayList<>();} List<DockingPreMetaAttrVO> vos=new ArrayList<>(); if(!CollectionUtils.isEmpty(entitys)) { entitys.stream().forEach(vo -> { vos.add(entityVO(vo)); }); } return vos; } /*** * æ°ç»å¯¹è±¡è½¬æ¢ * @param vos * @return */ public List<DockingPreMetaAttr> voentitys(Collection<DockingPreMetaAttrVO> vos) { if(CollectionUtils.isEmpty(vos)) {return new ArrayList<>();} List<DockingPreMetaAttr>entitys =new ArrayList<>(); if(!CollectionUtils.isEmpty(vos)) { vos.stream().forEach(entity -> { entitys.add(voentity(entity)); }); } return entitys; } /*** * æ°ç»å¯¹è±¡è½¬æ¢ * @param vo * @return */ public DockingPreMetaAttr voentity( DockingPreMetaAttrVO vo) { DockingPreMetaAttr entity = Objects.requireNonNull(BeanUtil.copy(vo, DockingPreMetaAttr.class)); return entity; } } Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreViewWrapper.java
@@ -1,11 +1,14 @@ package com.vci.ubcs.code.wrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.vci.ubcs.code.entity.DockingPreViewModel; import com.vci.ubcs.code.vo.pagemodel.DockingPreClassifyVO; import com.vci.ubcs.code.vo.pagemodel.DockingPreViewModelVO; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Objects; /** *éå¢ç¼ç ç³è¯·è§å¾å è£ ç±» @@ -14,9 +17,54 @@ * @since 2023-05-23 */ public class DockingPreViewWrapper extends BaseEntityWrapper<DockingPreViewModel, DockingPreViewModelVO> { public static DockingPreViewWrapper build() { return new DockingPreViewWrapper(); } @Override public DockingPreViewModelVO entityVO(DockingPreViewModel entity) { DockingPreViewModelVO dockingPreViewModelVO = Objects.requireNonNull(BeanUtil.copy(entity, DockingPreViewModelVO.class)); return dockingPreViewModelVO; } /*** * æ°ç»å¯¹è±¡è½¬æ¢ * @param entitys * @return */ public List<DockingPreViewModelVO> entityVOs(Collection<DockingPreViewModel> entitys) { if(CollectionUtils.isEmpty(entitys)) {return new ArrayList<>();} List<DockingPreViewModelVO> vos=new ArrayList<>(); if(!CollectionUtils.isEmpty(entitys)) { entitys.stream().forEach(dockingPreAttrRange -> { vos.add(entityVO(dockingPreAttrRange)); }); } return vos; } /*** * æ°ç»å¯¹è±¡è½¬æ¢ * @param vos * @return */ public List<DockingPreViewModel> voentitys(Collection<DockingPreViewModelVO> vos) { if(CollectionUtils.isEmpty(vos)) {return new ArrayList<>();} List<DockingPreViewModel>entitys =new ArrayList<>(); if(!CollectionUtils.isEmpty(vos)) { vos.stream().forEach(entity -> { entitys.add(voentity(entity)); }); } return entitys; } /*** * æ°ç»å¯¹è±¡è½¬æ¢ * @param vo * @return */ public DockingPreViewModel voentity( DockingPreViewModelVO vo) { DockingPreViewModel entity = Objects.requireNonNull(BeanUtil.copy(vo, DockingPreViewModel.class)); return entity; } } Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml
@@ -12,6 +12,10 @@ mybatis-plus: configuration: map-underscore-to-camel-case: false docking: apply: jtInterUrl: http://116.205.176.185:8099 unitCode: 410-MDM ######åºç¨åºæ¬é ç½® #app: Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingLogeMapper.xml
@@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.vci.ubcs.code.mapper.DockingLogeMapper"> <!-- éç¨æ¥è¯¢æ å°ç»æ --> <resultMap id="DockingPreAttrMappingResultMap" type="com.vci.ubcs.code.entity.DockingLog"> <resultMap id="plDockingLogResultMap" type="com.vci.ubcs.code.entity.DockingLog"> <result column="OID" property="oid"/> <result column="REVISIONOID" property="revisionOid"/> <result column="NAMEOID" property="nameOid"/> Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreApplyFormMapper.xml
@@ -33,6 +33,10 @@ <result column="CONTENT" property="content"/> <result column="DATAOID" property="dataOid"/> <result column="DATABTMNAME" property="dataBtmName"/> <result column="MSG" property="msg"/> <result column="MSG" property="msg" /> <result column="OPERATIONTYPE" property="operationType" /> <result column="GROUPCODE" property="groupCode" /> </resultMap> </mapper> Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreAttrMappingMapper.xml
@@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.vci.ubcs.code.mapper.DockingPreAttrMappingMapper"> <!-- éç¨æ¥è¯¢æ å°ç»æ --> <resultMap id="DockingPreAttrMappingResultMap" type="com.vci.ubcs.code.entity.DockingPreAttrMapping"> <resultMap id="plDockingPreAttrMappingResultMap" type="com.vci.ubcs.code.entity.DockingPreAttrMapping"> <result column="OID" property="oid"/> <result column="REVISIONOID" property="revisionOid"/> <result column="NAMEOID" property="nameOid"/> Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreAttrRangeMapper.xml
@@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.vci.ubcs.code.mapper.DockingPreAttrRangeMapper"> <!-- éç¨æ¥è¯¢æ å°ç»æ --> <resultMap id="DockingPreAttrMappingResultMap" type="com.vci.ubcs.code.entity.DockingPreAttrRange"> <resultMap id="plDockingPreAttrRangeResultMap" type="com.vci.ubcs.code.entity.DockingPreAttrRange"> <result column="OID" property="oid"/> <result column="REVISIONOID" property="revisionOid"/> <result column="NAMEOID" property="nameOid"/> Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreClassifyMapper.xml
@@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.vci.ubcs.code.mapper.DockingPreClassifyMapper"> <!-- éç¨æ¥è¯¢æ å°ç»æ --> <resultMap id="DockingPreAttrMappingResultMap" type="com.vci.ubcs.code.entity.DockingPreClassify"> <resultMap id="plDockingClassifyResultMap" type="com.vci.ubcs.code.entity.DockingPreClassify"> <result column="OID" property="oid"/> <result column="REVISIONOID" property="revisionOid"/> <result column="NAMEOID" property="nameOid"/> @@ -34,5 +34,51 @@ <result column="NODELINKNAME" property="getNodeLinkName"/> <result column="PID" property="pid"/> </resultMap> <select id="selectCompanyGroupClassifyVOByTree" resultMap="plDockingClassifyResultMap"> select codeclassify0.OID as oid, codeclassify0.REVISIONOID as revisionoid, codeclassify0.NAMEOID as nameOid, codeclassify0.BTMNAME as btmname, codeclassify0.LASTR as lastr, codeclassify0.FIRSTR as firstr, codeclassify0.LASTV as lastv, codeclassify0.FIRSTV as firstv, codeclassify0.CREATOR as creator, codeclassify0.CREATETIME as createtime, codeclassify0.LASTMODIFIER as lastmodifier, codeclassify0.LASTMODIFYTIME as lastmodifytime, codeclassify0.REVISIONRULE as revisionrule, codeclassify0.VERSIONRULE as versionrule, codeclassify0.REVISIONSEQ as revisionseq, codeclassify0.REVISIONVALUE as revisionvalue, codeclassify0.VERSIONSEQ as versionseq, codeclassify0.VERSIONVALUE as versionvalue, codeclassify0.LCTID as lctid, codeclassify0.LCSTATUS as lcstatus, codeclassify0.OID as oid, codeclassify0.TS as ts, codeclassify0.DESCRIPTION as description, codeclassify0.OWNER as owner, codeclassify0.COPYFROMVERSION as copyfromversion, codeclassify0.ID as id, codeclassify0.NAME as name, codeclassify0.CLASSNAME as classname, codeclassify0.NODELINK as nodelink, codeclassify0.NODELINKNAME as nodelinkname, codeclassify0.PID as pid from PL_CODE_JCLASSIFY codeclassify0 <where> <if test="oid != null and oid != ''"> codeclassify0.pid = '${oid}' </if> <if test="oid = null"> codeclassify0.pid is null </if> </where> order by id asc </select> <select id="checkHasChild" resultType="java.lang.Boolean"> select count(oid) from PL_CODE_JCLASSIFY where pid = #{oid} </select> </mapper> Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreMetaAttrMapper.xml
@@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.vci.ubcs.code.mapper.DockingPreMetaAttrMapper"> <!-- éç¨æ¥è¯¢æ å°ç»æ --> <resultMap id="DockingPreAttrMappingResultMap" type="com.vci.ubcs.code.entity.DockingPreMetaAttr"> <resultMap id="plDockingPreMetaAttrResultMap" type="com.vci.ubcs.code.entity.DockingPreMetaAttr"> <result column="OID" property="oid"/> <result column="REVISIONOID" property="revisionOid"/> <result column="NAMEOID" property="nameOid"/> Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreViewMapper.xml
@@ -2,7 +2,7 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.vci.ubcs.code.mapper.DockingPreViewModelMapper"> <!-- éç¨æ¥è¯¢æ å°ç»æ --> <resultMap id="DockingPreAttrMappingResultMap" type="com.vci.ubcs.code.entity.DockingPreViewModel"> <resultMap id="plDockingPreViewModelResultMap" type="com.vci.ubcs.code.entity.DockingPreViewModel"> <result column="OID" property="oid"/> <result column="REVISIONOID" property="revisionOid"/> <result column="NAMEOID" property="nameOid"/>