Source/UBCS-WEB/src/components/Tree/classifyTreeform.vue
@@ -333,36 +333,33 @@ } }, watch:{ nodeClickList:{ handler(newval,oldval){ console.log('newVal',newval,oldval) }, deep:true, immediate:true }, TreeFlag:{ handler(newval,oldval){ console.log('æ ç¶æ',newval,oldval) }, deep:true, immediate:true } }, created() { }, methods: { submits(form,done){ TreeEditSave(this.loneTreeNewForm).then(res=>{ this.$message.success('ä¿®æ¹æå'); this.Editclose() this.$emit('referTreeForm'); this.$emit('flushed'); done() }) if(this.TreeFlag){ TreeEditSave(this.loneTreeNewForm).then(res=>{ this.$message.success('ä¿®æ¹æå'); this.Editclose() this.$emit('referTreeForm'); this.$emit('flushed'); done() }) }else { this.loneTreeNewForm.btmTypeName=''; this.loneTreeNewForm.btmTypeId=''; TreeEditSave(this.loneTreeNewForm).then(res=>{ this.$message.success('ä¿®æ¹æå'); this.Editclose() this.$emit('referTreeForm'); this.$emit('flushed'); done() }) } }, error(err) { this.$message.success('请æ¥çæ§å¶å°'); console.log(err) this.$message.success(err); }, //ç¼ç è§åæ¥è¯¢ SelectFindeHandler(){ @@ -399,7 +396,6 @@ this.$set(this.loneTreeNewForm,'coderuleoidName',this.masterName) this.$set(this.loneTreeNewForm,'coderuleoid',this.masterOid) this.$emit('MasterHandler',this.loneTreeNewForm) // console.log(this.loneTreeNewForm) } }, //ç¼ç å¤é @@ -407,7 +403,6 @@ this.masterSelectList=row; this.masterName=row[0].name; this.masterOid=row[0].oid; // console.log('oid',this.oid) }, //ç¼ç æ¥å£ MasterdefaultRend(masterParameter){ @@ -437,7 +432,6 @@ this.$set(this.loneTreeNewForm,'codekeyattrrepeatoidName',this.KeyName) this.$set(this.loneTreeNewForm,'codekeyattrrepeatoid',this.KeyOid) this.$emit('MasterHandler',this.loneTreeNewForm) console.log(this.loneTreeNewForm) } }, //å ³é®å±æ§æ¥è¯¢ @@ -516,7 +510,6 @@ this.simSelectList=row; this.simName=row[0].name; this.simOid=row[0].oid; console.log('oid',this.oid) }, //ç¸ä¼¼é¡¹é¡¹æ¥å£ simdefaultRend(){ @@ -574,7 +567,6 @@ //ä¸å¡ç±»åæ¥å£ btmdefaultRend(masterParameter){ referDataGrid({valueField:'id',isMuti:'false',...masterParameter}).then(res=>{ // console.log(res) this.BtmData=res.data.data.records }) } Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -749,7 +749,6 @@ this.$set(this.TreeAddform,'codeRuleOidName',this.masterName) this.$set(this.TreeAddform,'codeRuleOid',this.masterOid) this.$emit('MasterHandler',this.loneTreeNewForm) console.log(this.loneTreeNewForm) } }, //ç¼ç æ¥å£ @@ -777,7 +776,6 @@ this.KeySelectLIst=[] this.$set(this.TreeAddform,'codeKeyAttrRepeatOidName',this.KeyName) this.$set(this.TreeAddform,'codeKeyAttrRepeatOid',this.KeyOid) console.log(this.TreeAddform) } }, //å ³é®å±æ§æ¥è¯¢ @@ -856,7 +854,6 @@ this.simSelectList=row; this.simName=row[0].name; this.simOid=row[0].oid; console.log('oid',this.oid) }, //ç¸ä¼¼é¡¹é¡¹æ¥å£ simdefaultRend(){ @@ -973,7 +970,6 @@ const data = this.TreeAddform; // data.btmtypename= this.TreeList.btmtypename this.$set(data, "parentCodeClassifyOid", this.nodeClickList.oid); console.log("data", data); TreeSave(data) .then(() => { this.$message({ @@ -1058,7 +1054,6 @@ }); } else { this.TreeEditFormVisible = true; console.log(this.TreeList) } }, //æ å·æ° @@ -1149,7 +1144,6 @@ this.codeClassifyOid = item.codeclassifyoid return item.codeclassifyoid == this.nodeClickList.oid } console.log('Formlist',this.Formlist) }) }).catch(res => { this.$message.error(res) @@ -1242,7 +1236,6 @@ }); }) } console.log('123',this.codeClassifyOid) }, //模æ¿ç®¡çä¿®æ¹ CrudRowUpdata(row,index,done) { Source/UBCS-WEB/src/views/modeling/Business.vue
@@ -82,7 +82,7 @@ <i :class="icons.revisionRule"></i> çæ¬è§å </template> {{ obj.revisionRuleName }} {{ obj.revisionRuleName + '(' + obj.revisionRuleId + ')' }} </el-descriptions-item> <el-descriptions-item :labelStyle="descriptionOption.labelStyle" :contentStyle="descriptionOption.contentStyle"> @@ -90,7 +90,7 @@ <i :class="icons.lifeCycle"></i> çå½å¨æ </template> {{ obj.lifeCycleId }} {{ obj.lifeCycleName + '(' + obj.lifeCycleId + ')' }} </el-descriptions-item> <el-descriptions-item :labelStyle="descriptionOption.labelStyle" :contentStyle="descriptionOption.contentStyle"> Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
@@ -32,7 +32,7 @@ </el-input> </el-form-item> <el-form-item label="çå½å¨æ" label-width="100px"> <el-input v-model="btmType.lifeCycleId" :prefix-icon="icons.lifeCycle"> <el-input v-model="btmType.lifeCycleName" :prefix-icon="icons.lifeCycle" class="lifeCycle" @focus="openLifeCycle" clearable @clear="clearLifeCycle"> <i slot="suffix" class="el-input__icon el-icon-search"></i> </el-input> </el-form-item> @@ -118,7 +118,10 @@ :data="revisionRef.data" :page.sync="revisionRef.page" ref="revisionRef" @row-click="revisionClick"> @row-click="revisionClick" v-loading="revisionRef.loading" @search-change="searchRevisionRule" @search-reset="clearSearchRevisionRule"> <template slot="radio" slot-scope="{row}"> <el-radio v-model="revisionRef.selectRow" @@ -131,7 +134,37 @@ <el-button @click="cancelRevision">åæ¶</el-button> </div> </el-dialog> <!-- çå½å¨æçåç § --> <el-dialog title="è¯·éæ©çå½å¨æ" :visible.sync="lifeCycleRef.visible" append-to-body width="80%"> <avue-crud class="lifeCycleRef" :option="lifeCycleRef.option" :data="lifeCycleRef.data" :page.sync="lifeCycleRef.page" ref="lifeCycleRef" @row-click="lifeCycleClick" v-loading="lifeCycleRef.loading" @search-change="searchLifeCycle" @search-reset="clearSearchLifeCycle"> <template slot="radio" slot-scope="{row}"> <el-radio v-model="lifeCycleRef.selectRow" :label="row.$index"> </el-radio> </template> </avue-crud> <div slot="footer" class="dialog-footer"> <el-button type="primary" @click="confirmLifeCycle">ç¡®å®</el-button> <el-button @click="cancelLifeCycle">åæ¶</el-button> </div> </el-dialog> </el-dialog> </template> @@ -140,6 +173,7 @@ import {add, update} from '@/api/omd/btmType'; import {queryPage} from '@/api/omd/OmdAttribute'; import {getPage} from '@/api/omd/revisionRule'; import {getList} from '@/api/modeling/cycle'; export default { name: 'BusinessAdd', @@ -287,6 +321,71 @@ currentPage: 1, pageSize: 10 }, loading: false, selectRow: '', searchKey: null, option: { height: 360, addBtn: false, refreshBtn: false, columnBtn: false, menu: false, border: true, reserveSelection: true, searchMenuSpan: 8, searchShowBtn: false, highlightCurrentRow: true, column: [{ label: 'éæ©', prop: 'radio', width: 60, hide: false }, { label: 'è±æåç§°', prop: 'id', search: true }, { label: "䏿åç§°", prop: "name", search: true, }, { label: "è·³è·å符", prop: "skipCode" }, { label: "åå§å¼", prop: "startCode" }, { label: "æ¥é¿", prop: "serialStep" }, { label: "åç¼", prop: "prefixCode" }, { label: "åç¼", prop: "suffixCode" }, { label: "æè¿°", prop: "description", type: "textarea" } ] }, }, lifeCycleRef: { visible: false, page: { currentPage: 1, pageSize: 10 }, loading: false, selectRow: '', searchKey: null, option: { @@ -506,22 +605,48 @@ row.$cellEdit = false; }, // æå¼çæ¬è§ååç § async openRevision() { await getPage().then(res => { openRevision() { this.revisionRef.visible = true; this.revisionRuleOnLoad(); }, // çæ¬åç §å表çé»è®¤æ¥è¯¢æ¹æ³ revisionRuleOnLoad(){ this.revisionRef.loading = true; getPage().then(res => { this.revisionRef.data = res.data.data.records; }); this.revisionRef.visible = true; setTimeout(() => { this.revisionRef.loading = false; }, 600) this.$nextTick(() => { this.$refs.revisionRef.refreshTable(); }); }, // æå¼çæ¬è§ååç § openLifeCycle() { this.lifeCycleRef.visible = true; this.lifeCycleOnLoad(); }, // çå½å¨æå表çé»è®¤æ¥è¯¢æ¹æ³ lifeCycleOnLoad(){ this.lifeCycleRef.loading = true; getList().then(res => { this.lifeCycleRef.data = res.data.data.records; }); setTimeout(() => { this.lifeCycleRef.loading = false; }, 600) this.$nextTick(() => { this.$refs.lifeCycleRef.refreshTable(); }); }, // å ³éçæ¬è§ååç §å¼¹çª closeRevisionDialog() { this.revisionRef.visible = false; }, // çæ¬è§ååç §å表æ£ç´¢ revisionRefSearch() { }, // çæ¬è§åéä¸äºä»¶ revisionChange() { // å ³éçå½å¨æåç §å¼¹çª closeLifeCycleDialog() { this.lifeCycleRef.visible = false; }, // 确认éä¸çæ¬è§å confirmRevision() { @@ -531,11 +656,24 @@ this.btmType.inputRevisionFlag = false; this.cancelRevision(); }, // 确认éä¸çå½å¨æ confirmLifeCycle() { this.btmType.lifeCycleFlag = true; this.btmType.lifeCycleId = this.lifeCycleRef.selectData.id; this.btmType.lifeCycleName = this.lifeCycleRef.selectData.name; this.cancelLifeCycle(); }, // åæ¶éä¸çæ¬è§å cancelRevision() { this.revisionRef.selectRow = ''; this.revisionRef.selectData = {}; this.closeRevisionDialog(); }, // åæ¶éä¸çå½å¨æ cancelLifeCycle() { this.lifeCycleRef.selectRow = ''; this.lifeCycleRef.selectData = {}; this.closeLifeCycleDialog(); }, // çæ¬è§ååé revisionClick(row) { @@ -545,15 +683,90 @@ name: row.name, }; }, // çå½å¨æåé lifeCycleClick(row) { this.lifeCycleRef.selectRow = row.$index; this.lifeCycleRef.selectData = { id: row.id, name: row.name, }; }, // åæ¶çæ¬è§å clearRevision() { this.$delete(this.btmType, 'revisionFlag'); this.$delete(this.btmType, 'revisionRuleId'); this.$delete(this.btmType, 'revisionRuleName'); this.$delete(this.btmType, 'inputRevisionFlag'); }, // åæ¶çå½å¨æ clearLifeCycle() { this.$delete(this.btmType, 'lifeCycleFlag'); this.$delete(this.btmType, 'lifeCycleId'); this.$delete(this.btmType, 'lifeCycleName'); }, // 表åéç½® resetForm() { this.btmType = {}; this.$refs.form.resetFields(); }, /** * æç´¢çæ¬è§å * @param params æç´¢æ¡è¾å ¥å¼ {id: '',name: ''} ç´æ¥è·åå°±è¡ * @param done æ§è¡å®æåçåè° */ searchRevisionRule(params,done){ let condition = {}; if (params.id){ condition['id_like'] = params.id; } if (params.name){ condition['name_like'] = params.name; } this.revisionRef.loading = true; getPage(this.revisionRef.page.currentPage,this.revisionRef.page.pageSize,condition).then(res => { this.revisionRef.data = res.data.data.records; }); setTimeout(() => { done(); this.revisionRef.loading = false; }, 600); this.$nextTick(() => { this.$refs.revisionRef.refreshTable(); }); }, /** * æç´¢çå½å¨æ * @param params æç´¢æ¡è¾å ¥å¼ * @param done æ§è¡å®æåçåè° */ searchLifeCycle(params,done){ let condition = {}; if (params.id){ condition['id_like'] = params.id; } if (params.name){ condition['name_like'] = params.name; } this.lifeCycleRef.loading = true; getList(this.lifeCycleRef.page.currentPage,this.lifeCycleRef.page.pageSize,condition).then(res => { this.lifeCycleRef.data = res.data.data.records; }); setTimeout(() => { done(); this.lifeCycleRef.loading = false; }, 600); this.$nextTick(() => { this.$refs.lifeCycleRef.refreshTable(); }); }, // åæ¶çæ¬è§åæç´¢ clearSearchRevisionRule(item){ this.revisionRuleOnLoad(); }, // åæ¶çå½å¨ææç´¢ clearSearchLifeCycle(item){ this.lifeCycleOnLoad(); console.log(item); } } } @@ -569,6 +782,10 @@ display: none !important; } .lifeCycleRef > .el-card:nth-of-type(2) > .el-card__body > .avue-crud__menu { display: none !important; } .btmTypeForm > .el-form-item > .el-form-item__content > .el-input > .el-input__inner { width: 200px; } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/classify/NodeClassifyDTO.java
@@ -1,44 +1,44 @@ package com.vci.ubcs.code.dto.datapush.classify; //import com.thoughtworks.xstream.annotations.XStreamAlias; //import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; //@XStreamAlias("classify") @XStreamAlias("classify") public class NodeClassifyDTO { /** * åç±»id */ //@XStreamAsAttribute @XStreamAsAttribute private String id; /*** * åç±»åç§° */ //@XStreamAsAttribute @XStreamAsAttribute private String name; /*** * ç¶èç¹id */ // @XStreamAsAttribute @XStreamAsAttribute private String pid; /*** * åç±»ä»£å· */ //@XStreamAsAttribute @XStreamAsAttribute private String classCode; /*** * æè¿° */ //@XStreamAsAttribute @XStreamAsAttribute private String description; /*** * åç±»é¾æ¥è·¯å¾ */ //@XStreamAsAttribute @XStreamAsAttribute private String fullPathName; /*** * åç±»ç¶æ */ //@XStreamAsAttribute @XStreamAsAttribute private String lcStatus; public String getId() { Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/classify/NodeDataDTO.java
@@ -1,8 +1,8 @@ package com.vci.ubcs.code.dto.datapush.classify; //import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAlias; //@XStreamAlias("data") @XStreamAlias("data") public class NodeDataDTO { private NodeLibraryDTO library; Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/classify/NodeLibraryDTO.java
@@ -1,14 +1,20 @@ package com.vci.ubcs.code.dto.datapush.classify; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import com.thoughtworks.xstream.annotations.XStreamImplicit; import java.util.List; //@XStreamAlias("library") @XStreamAlias("library") public class NodeLibraryDTO { //@XStreamAsAttribute @XStreamAsAttribute private String id; //@XStreamAsAttribute @XStreamAsAttribute private String name; //@XStreamImplicit @XStreamAsAttribute private String classCode; @XStreamImplicit private List<NodeClassifyDTO> classify; public String getId() { @@ -35,12 +41,21 @@ this.classify = classify; } @Override public String toString() { return "NodeLibraryDTO{" + "id='" + id + '\'' + ", name='" + name + '\'' + ", classify=" + classify + '}'; } public String getClassCode() { return classCode; } public void setClassCode(String classCode) { this.classCode = classCode; } @Override public String toString() { return "NodeLibraryDTO{" + "id='" + id + '\'' + ", name='" + name + '\'' + ", classCode='" + classCode + '\'' + ", classify=" + classify + '}'; } } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/NodeJosnDTO.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,21 @@ package com.vci.ubcs.code.dto.datapush.data; public class NodeJosnDTO { private NodedataDTO data; public NodedataDTO getData() { return data; } public void setData(NodedataDTO data) { this.data = data; } @Override public String toString() { return "NodeJosnDTO{" + "data=" + data + '}'; } } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/NodeObjectDTO.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,71 @@ package com.vci.ubcs.code.dto.datapush.data; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import com.thoughtworks.xstream.annotations.XStreamImplicit; import java.util.List; @XStreamAlias("object") public class NodeObjectDTO { @XStreamAsAttribute private String code="" ; @XStreamAsAttribute private String status="" ; @XStreamAsAttribute private String library=""; @XStreamAsAttribute private String classCode=""; @XStreamImplicit private List<NodeProDTO> pro; public String getCode() { return code; } public void setCode(String code) { this.code = code; } public String getStatus() { return status; } public void setStatus(String status) { this.status = status; } public String getLibrary() { return library; } public void setLibrary(String library) { this.library = library; } public String getClassCode() { return classCode; } public void setClassCode(String classCode) { this.classCode = classCode; } public List<NodeProDTO> getPro() { return pro; } public void setPro(List<NodeProDTO> pro) { this.pro = pro; } @Override public String toString() { return "NodeObjectDTO{" + "code='" + code + '\'' + ", status='" + status + '\'' + ", library='" + library + '\'' + ", classCode='" + classCode + '\'' + ", pro=" + pro + '}'; } } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/NodeProDTO.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,47 @@ package com.vci.ubcs.code.dto.datapush.data; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; @XStreamAlias("pro") public class NodeProDTO { @XStreamAsAttribute private String filedName; @XStreamAsAttribute private String outname; @XStreamAsAttribute private String filedValue; public String getFiledName() { return filedName; } public void setFiledName(String filedName) { this.filedName = filedName; } public String getOutname() { return outname; } public void setOutname(String outname) { this.outname = outname; } public String getFiledValue() { return filedValue; } public void setFiledValue(String filedValue) { this.filedValue = filedValue; } @Override public String toString() { return "NodeProDTO{" + "filedName='" + filedName + '\'' + ", outname='" + outname + '\'' + ", filedValue='" + filedValue + '\'' + '}'; } } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/NodedataDTO.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,27 @@ package com.vci.ubcs.code.dto.datapush.data; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamImplicit; import java.util.List; @XStreamAlias("data") public class NodedataDTO { @XStreamImplicit private List<NodeObjectDTO> object; public List<NodeObjectDTO> getObject() { return object; } public void setObject(List<NodeObjectDTO> object) { this.object = object; } @Override public String toString() { return "NodedataDTO{" + "object=" + object + '}'; } } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/data.json
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,137 @@ { "data": { "object": { "code": "0201040133", "status": "Released", "library": "wupin", "classCode": "020104", "pro": [ { "filedName": "xbj", "outname": "æ è®°" }, { "filedName": "xinghaoguige", "outname": "è§æ ¼", "filedValue": "M4" }, { "filedName": "lastmodifier", "outname": "æåä¿®æ¹äºº", "filedValue": "weidy(é大å)" }, { "filedName": "cpxs", "outname": "产ååå¼" }, { "filedName": "secondfl", "outname": "äºçº§ç®¡çåç±»", "filedValue": "ç´§åºä»¶" }, { "filedName": "clph", "outname": "ææçå·", "filedValue": "HB1-24321" }, { "filedName": "thrifl", "outname": "ä¸çº§ç®¡çåç±»", "filedValue": "èºé" }, { "filedName": "xbzjbmc", "outname": "æ å级å«åç§°" }, { "filedName": "firstfl", "outname": "ä¸çº§ç®¡çåç±»", "filedValue": "æ åä»¶" }, { "filedName": "xgzccdgcd", "outname": "å ³æ³¨å°ºå¯¸çå ¬å·®å¸¦" }, { "filedName": "zjxh", "outname": "åä»¶åºå·" }, { "filedName": "bmcl", "outname": "表é¢å¤ç", "filedValue": "çµé" }, { "filedName": "id", "outname": "ç©æç¼ç ", "filedValue": "0201040133" }, { "filedName": "createtime", "outname": "å建æ¶é´", "filedValue": "2022-12-23 17:12:50.635" }, { "filedName": "creator", "outname": "å建人", "filedValue": "weidy(é大å)" }, { "filedName": "xwlwwmc", "outname": "ç©å夿åç§°" }, { "filedName": "xxndj", "outname": "æ§è½ç级" }, { "filedName": "xzjmc", "outname": "åä»¶åç§°" }, { "filedName": "beizhushuoming", "outname": "夿³¨è¯´æ" }, { "filedName": "revisionvalue", "outname": "çæ¬", "filedValue": "1" }, { "filedName": "name", "outname": "ç©å䏿åç§°", "filedValue": "åå头èºé1" }, { "filedName": "xfjjstj", "outname": "éå ææ¯æ¡ä»¶" }, { "filedName": "xbxkxs", "outname": "ä¿é©ååå¼", "filedValue": "æ " }, { "filedName": "lastmodifytime", "outname": "æåä¿®æ¹æ¶é´", "filedValue": "2022-12-23 17:12:50.635" }, { "filedName": "zhiliangbz", "outname": "æ åå·", "filedValue": "HB1-2431-M4*512" }, { "filedName": "materialclassify", "outname": "æå±å类代å·", "filedValue": "020104" }, { "filedName": "lcstatus", "outname": "ç¶æ", "filedValue": "Released" } ] } } } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/result.json
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,10 @@ { "data": { "object": { "code": "0201040133", "oid": "0000001", "erroid": "0", "msg": "æµè¯æå" } } } Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/result/ResultNodeDataDTO.java
@@ -1,14 +1,14 @@ package com.vci.ubcs.code.dto.datapush.result; //import com.thoughtworks.xstream.annotations.XStreamAlias; //import com.thoughtworks.xstream.annotations.XStreamImplicit; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamImplicit; import java.util.List; //@XStreamAlias("data") @XStreamAlias("data") public class ResultNodeDataDTO { //@XStreamImplicit @XStreamImplicit private List<ResultNodeObjectDTO> object; public List<ResultNodeObjectDTO> getObject() { Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/result/ResultNodeObjectDTO.java
@@ -1,29 +1,29 @@ package com.vci.ubcs.code.dto.datapush.result; //import com.thoughtworks.xstream.annotations.XStreamAlias; //import com.thoughtworks.xstream.annotations.XStreamAsAttribute; import com.thoughtworks.xstream.annotations.XStreamAlias; import com.thoughtworks.xstream.annotations.XStreamAsAttribute; //@XStreamAlias("object") @XStreamAlias("object") public class ResultNodeObjectDTO { /*** * æ°æ®ç¼ç */ //@XStreamAsAttribute @XStreamAsAttribute private String code; /*** * æ°æ®oid */ //@XStreamAsAttribute @XStreamAsAttribute private String oid; /*** * é误æ è¯ */ //@XStreamAsAttribute @XStreamAsAttribute private String erroid; /*** * éè¯¯ä¿¡æ¯ */ //@XStreamAsAttribute @XStreamAsAttribute private String msg; public String getCode() { Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystemConfig.java
@@ -286,7 +286,7 @@ /*** * æ¨éç±»å 1:æ°æ®æ¨é,2åç±»æ¨éï¼é»è®¤æ°æ®æ¨é,3:ç¼ç ç³è¯·,4:ç¼ç æ´æ¹ï¼æ´æ¹ãç¶æï¼åæ¶ï¼,5:åç±»æ¥è¯¢,6:å«è§åä¿¡æ¯çåç±»æ¥è¯¢,7:æ°æ®æ¥è¯¢ */ @ApiModelProperty(value = "æ¨éç±»å 1:æ°æ®æ¨é,2åç±»æ¨éï¼é»è®¤æ°æ®æ¨é,3:ç¼ç ç³è¯·,4:ç¼ç æ´æ¹ï¼æ´æ¹ãç¶æï¼åæ¶ï¼,5:åç±»æ¥è¯¢,6:å«è§åä¿¡æ¯çåç±»æ¥è¯¢,7:æ°æ®æ¥è¯¢") @ApiModelProperty(value = "æ¨éç±»å 1:æ°æ®æ¨é,2åç±»æ¨é,3:ç¼ç ç³è¯·,4:ç¼ç æ´æ¹(ç¶æï¼åæ¶),5:åç±»æ¥è¯¢,6:å«è§åä¿¡æ¯çåç±»æ¥è¯¢,7:æ°æ®æ¥è¯¢") private String pushType; /*** * æ¨éç±»åæ¾ç¤ºå¼ Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/sysIntegrationPushTypeEnum.java
@@ -8,13 +8,37 @@ @VciEnum(name = MdmEnumIdConstant.SYS_INTEGRATION_PUSH_TYPE,text = "ç³»ç»æ¥å£æ¨éæ¹å¼",description = "") public enum sysIntegrationPushTypeEnum implements BaseEnum { /** * åç±»æ¨éæ¹å¼ * æ°æ®æ¨é */ JSON("1","æ°æ®æ¨é"), PUSHTYPE_DATA("1","æ°æ®æ¨é"), /** * Xmlæ ¼å¼ * åç±»æ¨é */ XML("2","åç±»æ¨é"); PUSHTYPE_CLASSIFY("2","åç±»æ¨é"), /*** * ç¼ç ç³è¯· */ ACCPET_APPCODE("3","ç¼ç ç³è¯·"), /*** * ç¼ç ç»´æ¤ */ ACCPET_EDITCODE("4","ç¼ç ç»´æ¤"), /*** * åç±»æ¥è¯¢ */ ACCPET_QUERYCLAFILY("5","åç±»æ¥è¯¢"), /*** * å«ç¼ç è§åçåç±»æ¥è¯¢ */ ACCPET_QUERYCLAFILYRULE("6","å«ç¼ç è§åçåç±»æ¥è¯¢"), /*** * æ°æ®æ¥è¯¢ */ ACCPET_QUERYDATA("7","æ°æ®æ¥è¯¢"); /** * æä¸¾çå¼ Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
@@ -2,19 +2,44 @@ import com.alibaba.cloud.commons.lang.StringUtils; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.io.xml.DomDriver; import com.vci.ubcs.code.constant.MdmDuckingConstant; import com.vci.ubcs.code.dto.datapush.classify.JsonRootDataDTO; import com.vci.ubcs.code.dto.datapush.classify.NodeClassifyDTO; import com.vci.ubcs.code.dto.datapush.classify.NodeDataDTO; import com.vci.ubcs.code.dto.datapush.classify.NodeLibraryDTO; import com.vci.ubcs.code.dto.datapush.data.NodeJosnDTO; import com.vci.ubcs.code.dto.datapush.data.NodeObjectDTO; import com.vci.ubcs.code.dto.datapush.data.NodeProDTO; import com.vci.ubcs.code.dto.datapush.data.NodedataDTO; import com.vci.ubcs.code.dto.datapush.result.ResultJsonDTO; import com.vci.ubcs.code.dto.datapush.result.ResultNodeDataDTO; import com.vci.ubcs.code.dto.datapush.result.ResultNodeObjectDTO; import com.vci.ubcs.code.entity.*; import com.vci.ubcs.code.service.*; import com.vci.ubcs.starter.web.constant.QueryOptionConstant; import com.vci.ubcs.code.util.HttpUtils; import com.vci.ubcs.code.util.WsErpClientUtil; import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO; import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO; import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO; import com.vci.ubcs.starter.web.enumpck.UserSecretEnum; import com.vci.ubcs.starter.web.pagemodel.SessionInfo; import com.vci.ubcs.starter.web.util.VciBaseUtil; import com.vci.ubcs.starter.web.util.VciQueryWrapperForDO; import com.vci.ubcs.starter.web.util.WebUtil; import lombok.extern.slf4j.Slf4j; import org.springblade.core.redis.cache.BladeRedis; import org.springblade.core.tool.api.R; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import javax.annotation.Resource; import java.util.*; @@ -32,10 +57,15 @@ @Service @Slf4j public class CodeDuckingSyncServiceImpl implements ICodeDuckingSyncService { @Value("${dataSyncPush.dataParamName:xmlData}") public String DATA_PARAM_NAME; @Resource private IDockingSystemService dockingSystemService; private MdmEngineService mdmEngineServiceI; @Resource private IDockingLogeService dockingLogeService; @Resource private IDockingDataService dockingDataService; @Resource @@ -44,26 +74,78 @@ private IDockingSystemConfigService dockingSystemConfigService; @Resource private ICodeClassifyService codeClassifyService; /*** * resdisç¼åæå¡ */ @Resource private BladeRedis bladeRedis; @Resource private IDockingSysIntParamService dockingSysIntParamService; @Resource private IDockingSysIntHeaderService dockingSysIntHeaderService; @Override public void DockingDataSyncScheduing() { // insertCache2(); // insertCache2(); initPushDataTaks(1); //sendpushDataForService(); sendpushDataForService(); } /*** * */ @Override public void DockingClassSyncScheduing() { initPushDataTaks(2);//åç±»æ¨é sendpushClsfForService(); } /*** * æå¨åæ¥ * @param oids * @return */ @Transactional(rollbackFor = Throwable.class) @Override public R sendData(String oids) { return null; VciBaseUtil.alertNotNull(oids,"ç³»ç»éæåºç¡ä¿¡æ¯æ°æ®å¯¹è±¡",oids,"ç³»ç»éæåºç¡ä¿¡æ¯ç主é®"); List<String> dockingTaskOidList=new ArrayList<>(); dockingTaskOidList= VciBaseUtil.str2List(oids); List<DockingTask> newDockingTasks= this.dockingTaskService.listByIds(dockingTaskOidList); Map<String,List<DockingTask>> typeDockingTaskMap=new HashMap<>(); newDockingTasks.stream().forEach(newDockingTaskDO->{ String btmId=newDockingTaskDO.getBtmId(); if(btmId.equalsIgnoreCase(DOCKING_DEFAULT_CLASSIFY.toLowerCase(Locale.ROOT))){ List<DockingTask> dockingTaskList= typeDockingTaskMap.get(DOCKING_DEFAULT_CLASSIFY.toLowerCase(Locale.ROOT)); if(CollectionUtils.isEmpty(dockingTaskList)){ dockingTaskList=new ArrayList<>(); } dockingTaskList.add(newDockingTaskDO); typeDockingTaskMap.put(DOCKING_DEFAULT_CLASSIFY.toLowerCase(Locale.ROOT),dockingTaskList); }else{ List<DockingTask> dockingTaskDOList= typeDockingTaskMap.get("data"); if(CollectionUtils.isEmpty(dockingTaskDOList)){ dockingTaskDOList=new ArrayList<>(); } dockingTaskDOList.add(newDockingTaskDO); typeDockingTaskMap.put("data",dockingTaskDOList); } }); typeDockingTaskMap.keySet().forEach(type->{ List<DockingTask> DockingTaskList=typeDockingTaskMap.get(type); if(!CollectionUtils.isEmpty(DockingTaskList)){ if(type.equalsIgnoreCase(DOCKING_DEFAULT_CLASSIFY.toLowerCase(Locale.ROOT))){ this.sendpushClsfForService(DockingTaskList); }else{ this.sendpushDataForService(DockingTaskList); } } }); return R.success("æå¨æ¨é宿,è¯·æ ¸å¯¹æ¯å¦æ¨éæå"); } @@ -72,7 +154,7 @@ * @param type */ private void initPushDataTaks(int type){ //initSysadmin(); initSysadmin(); List<DockingSystemConfig> dockingSystemConfigList = dockingSystemConfigService.list( Wrappers.<DockingSystemConfig>query().lambda().eq(DockingSystemConfig::getUsedFlag,"true") @@ -172,6 +254,337 @@ } } /*** * åéåç±»æ°æ® */ private void sendpushClsfForService(List<DockingTask> dockingTaskList){ //æ¯ä¸ªtask便¬¡æ§è¡æ¨é for (DockingTask dockingTask:dockingTaskList){ //æ¯ä¸ªtaskä¸ä¸ªäºå¡ï¼å¼å¯ String paramString=""; String sendString=""; String backString=""; //æ¥è¯¢ç³»ç»æ¥å£ä¿¡æ¯,ip method,dataType String systeminfooid = dockingTask.getSysInfoOid();//sysininfo çoid try { //æ¥è¯¢è¦æ¨éçæ°æ® String btmoid = dockingTask.getBtmOid();//æ°æ®btmid JsonRootDataDTO jsonRootDataDTO=new JsonRootDataDTO(); CodeClassify codeClassify=codeClassifyService.getById(btmoid); List<NodeClassifyDTO>nodeClassifyDTOList=new ArrayList<>(); NodeClassifyDTO nodeClassifyDTO=new NodeClassifyDTO(); nodeClassifyDTO.setClassCode(codeClassify.getId());//åç±»ä»£å· nodeClassifyDTO.setDescription(codeClassify.getDescription());//åç±»æè¿° nodeClassifyDTO.setFullPathName(codeClassify.getPath());//å ¨è·¯å¾ nodeClassifyDTO.setLcStatus(codeClassify.getLcStatus());//ç¶æ // CodeClassifyDO parentClassDo=codeClassifyDaoI.selectByPrimaryKey(codeClassifyDO.getParentCodeClassifyOid()); nodeClassifyDTO.setPid(codeClassify.getParentCodeClassifyOid());//ç¶idèç¹ nodeClassifyDTO.setId(codeClassify.getOid());//åç±»oid nodeClassifyDTO.setName(codeClassify.getName());//åç±»åç§° nodeClassifyDTOList.add(nodeClassifyDTO); NodeLibraryDTO nodeLibraryDTO=new NodeLibraryDTO(); CodeClassifyVO rootClassify=codeClassifyService.getTopClassifyVO(btmoid); nodeLibraryDTO.setClassify(nodeClassifyDTOList); nodeLibraryDTO.setId(rootClassify.getOid()); nodeLibraryDTO.setName(rootClassify.getName()); nodeLibraryDTO.setClassCode(rootClassify.getId()); NodeDataDTO nodeDataDTO=new NodeDataDTO(); nodeDataDTO.setLibrary(nodeLibraryDTO); jsonRootDataDTO.setData(nodeDataDTO); //æ¥è¯¢æ¨éæ¥å£åæ° DockingSystemConfig dockingSystemConfig = dockingSystemConfigService.getById(systeminfooid); String paramType = dockingSystemConfig.getParamType();//xml/json if(paramType.equals(DATATYPE_JSON)){ Object object = JSONObject.toJSON(jsonRootDataDTO); sendString = object.toString(); }else{ //ç»ç»è¿åæ¥å£ä¿¡æ¯ XStream xStream = new XStream(new DomDriver()); xStream.processAnnotations(NodeDataDTO.class); xStream.autodetectAnnotations(true); sendString = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + xStream.toXML(nodeDataDTO); } //è°ç¨æ¥å£ callInterface(sendString,dockingSystemConfig,dockingTask); }catch (Throwable e){ e.printStackTrace(); }finally { //æ¯ä¸ä¸ªtaskä¸ä¸ªäºç© } } } /*** * åéç¼ç ä¸»æ°æ® */ private void sendpushDataForService (List<DockingTask> dockingTaskS){ //æ¯ä¸ªtask便¬¡æ§è¡æ¨é for (DockingTask dockingTask:dockingTaskS){ //æ¯ä¸ªtaskä¸ä¸ªäºå¡ï¼å¼å¯ String paramString=""; String sendString=""; String backString=""; try { //æ¥è¯¢ç³»ç»æ¥å£ä¿¡æ¯,ip method,dataType String systeminfooid = dockingTask.getSysInfoOid();//sysininfo çoid String classifyoid = dockingTask.getClassifyOid(); //æ¥è¯¢è¦æ¨éçæ°æ® String btmoid = dockingTask.getBtmOid();//æ°æ®btmid //表示æ¯ä¸»æ°æ® CodeClassifyTemplateVO codeClassifyTemplateVO = mdmEngineServiceI.getUsedTemplateByClassifyOid(classifyoid); R<List<Map<String, String>>> r = mdmEngineServiceI.getDataByOid(btmoid, codeClassifyTemplateVO.getOid()); List<CodeClassifyTemplateAttrVO> attrVOS = codeClassifyTemplateVO.getAttributes(); Map<String/**è±æåç§°**/, String/**䏿åç§°**/> attrIdNameMap = attrVOS.stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t.getName(), (o1, o2) -> o2)); Map<String, String> data = new HashMap<>(); if (r == null) { JSONObject josni = bladeRedis.get(DOCKING_CACHE2_DELETE + btmoid); data = (Map) josni; } else { data = r.getData().get(0); } List<NodeProDTO> nodeProDTOS = new ArrayList<>(); Map<String, String> finalData = data; attrIdNameMap.keySet().forEach(field -> { String outName = attrIdNameMap.get(field); if (finalData.containsKey(field)) { String Value = finalData.get(field); NodeProDTO nodeProDTO = new NodeProDTO(); nodeProDTO.setFiledName(field); nodeProDTO.setOutname(outName); nodeProDTO.setFiledValue(Value); nodeProDTOS.add(nodeProDTO); } }); String[] classCodeLeves = dockingTask.getClassifyId().split(","); NodeJosnDTO nodeJosnDTO = new NodeJosnDTO(); NodedataDTO nodeDataDTO = new NodedataDTO(); NodeObjectDTO nodeObjectDTO = new NodeObjectDTO(); nodeObjectDTO.setCode(dockingTask.getId());//设置ç¼ç nodeObjectDTO.setClassCode(classCodeLeves[0]); nodeObjectDTO.setStatus(data.get("lcstatus")); nodeObjectDTO.setLibrary(classCodeLeves[classCodeLeves.length - 1]); nodeObjectDTO.setPro(nodeProDTOS); List<NodeObjectDTO> nodeObjectDTOS = new ArrayList<>(); nodeObjectDTOS.add(nodeObjectDTO); nodeDataDTO.setObject(nodeObjectDTOS); nodeJosnDTO.setData(nodeDataDTO); //æ¥è¯¢æ¨éæ¥å£åæ° DockingSystemConfig dockingSystemConfig = dockingSystemConfigService.getById(systeminfooid); String paramType = dockingSystemConfig.getParamType();//xml/json if (paramType.equals(DATATYPE_JSON)) { Object object = JSONObject.toJSON(nodeJosnDTO); sendString = object.toString(); } else { //ç»ç»è¿åæ¥å£ä¿¡æ¯ XStream xStream = new XStream(new DomDriver()); xStream.processAnnotations(NodedataDTO.class); xStream.autodetectAnnotations(true); sendString = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + xStream.toXML(nodeDataDTO); } //è°ç¨æ¥å£ callInterface(sendString,dockingSystemConfig, dockingTask); }catch (Throwable e){ e.printStackTrace(); }finally { } } } /*** * è°ç¨æ¥å£ * @param sendString * @param dockingSystemConfig * @param dockingTask * @throws Throwable */ private void callInterface(String sendString , DockingSystemConfig dockingSystemConfig,DockingTask dockingTask) throws Throwable{ String paramString = ""; String backString = ""; String msg=""; String url = dockingSystemConfig.getRequestUrl();//url List<ResultNodeObjectDTO> resultNodeObjectDTOS =new ArrayList<>(); try { boolean usedFlag= dockingSystemConfig.getUsedFlag().equals("true")?true:false; if(!usedFlag){ throw new Throwable("æ¥å£å·²ç»åç¨ï¼"); } String type = dockingSystemConfig.getInterfaceType().toLowerCase(Locale.ROOT);//get/post/webserver/corba String paramType = dockingSystemConfig.getParamType();//xml/json String returnType = dockingSystemConfig.getReturnType();//xml/json String requestmethod= dockingSystemConfig.getRequestMethod(); String interfaceFunction = dockingSystemConfig.getInterfaceFunction();//ä¸»è¦æ¯webserviceçæ¹æ³å String namespace = dockingSystemConfig.getNamespace();//namespace String soapaction = dockingSystemConfig.getSoapAction();//soapaction String targName = dockingSystemConfig.getTargetName();//targName String cxfaxis = dockingSystemConfig.getCxfAxis();//webserviceæ¯cxf/axis //æ¥è¯¢param List<DockingSysIntParam> dockingSysIntParamList = dockingSysIntParamService.list(Wrappers.<DockingSysIntParam>query().lambda().eq(DockingSysIntParam::getInfoOid,dockingSystemConfig.getOid())); //æ¥è¯¢header List<DockingSysIntHeader> dockingSysIntHeaderList = dockingSysIntHeaderService.list(Wrappers.<DockingSysIntHeader>query().lambda().eq(DockingSysIntHeader::getInfoOid,dockingSystemConfig.getOid())); if(type.equals(URLTYPE_HTTP)) { if (requestmethod.equals(URLTYPE_GET)) {//GETè¯·æ± String sendurl = url + "?" + DATA_PARAM_NAME + "=" + sendString; //æ¼æ¥param for (DockingSysIntParam dockingSysIntParam : dockingSysIntParamList) { sendurl = sendurl + "&" + dockingSysIntParam.getParamKey() + "=" + dockingSysIntParam.getParamValue(); } paramString = sendurl; backString = HttpUtils.get(sendurl); } else if (requestmethod.equals(URLTYPE_POST)) {//POSTè¯·æ± MultiValueMap<String, String> params = new LinkedMultiValueMap<>(); for (DockingSysIntParam dockingSysIntParam : dockingSysIntParamList) { params.add(dockingSysIntParam.getParamKey(), dockingSysIntParam.getParamValue()); } params.add(DATA_PARAM_NAME,sendString); paramString = params.toString(); MultiValueMap<String, String> headers = new LinkedMultiValueMap<>(); for (DockingSysIntHeader dockingSysIntHeader : dockingSysIntHeaderList) { headers.add(dockingSysIntHeader.getHeaderKey(), dockingSysIntHeader.getHeaderValue()); } backString = HttpUtils.post(url, params, headers); } if(backString.startsWith("\"")){ backString=backString.substring(backString.indexOf("\"")+1); } if(backString.endsWith("\"")){ backString=backString.substring(0,backString.lastIndexOf("\"")); } if(backString.contains("\n")){ String res="\n"; backString= backString.replaceAll(res,""); } if(backString.contains("\\")){ String res="\\\\\""; backString= backString.replaceAll(res,"\"").trim(); } }else if (type.equals(URLTYPE_WEBSERVICE)) {//webserverè¯·æ± MultiValueMap<String, String> params = new LinkedMultiValueMap<>(); for (DockingSysIntParam dockingSysIntParam : dockingSysIntParamList) { params.add(dockingSysIntParam.getParamKey(), dockingSysIntParam.getParamValue()); } paramString = sendString; MultiValueMap<String, String> headers = new LinkedMultiValueMap<>(); for (DockingSysIntHeader dockingSysIntHeader : dockingSysIntHeaderList) { headers.add(dockingSysIntHeader.getHeaderKey(), dockingSysIntHeader.getHeaderValue()); } backString = WsErpClientUtil.sendMsg(url, namespace, soapaction, interfaceFunction, targName, sendString, 10000); } else {//corbaæ¥å£ //paramString=sendString; // backString = jacorbClient.getBOFactoryService().sendCode(sendString); } ResultJsonDTO resultJsonDTO = new ResultJsonDTO(); if(returnType.equals(DATATYPE_JSON)){ resultJsonDTO =JSONObject.toJavaObject(JSONObject.parseObject(backString), ResultJsonDTO.class); }else { //ç»ç»è¿åæ¥å£ä¿¡æ¯ XStream xStream = new XStream(new DomDriver()); xStream.processAnnotations(ResultNodeDataDTO.class); xStream.autodetectAnnotations(true); ResultNodeDataDTO resultNodeDataDTO = (ResultNodeDataDTO) xStream.fromXML(backString); resultJsonDTO.setData(resultNodeDataDTO); } ResultNodeDataDTO resultNodeDataDTO=resultJsonDTO.getData(); resultNodeObjectDTOS=resultNodeDataDTO.getObject(); }catch (Throwable e){ msg="è°ç¨æ¥å£å¤±è´¥:"+e.getMessage(); e.printStackTrace(); log.error("è°ç¨æ¥å£å¤±è´¥:"+e); // throw new Throwable("è°ç¨æ¥å£å¤±è´¥:"+e); ResultNodeObjectDTO resultNodeObjectDTO=new ResultNodeObjectDTO(); resultNodeObjectDTO.setErroid("1"); resultNodeObjectDTO.setMsg(msg); resultNodeObjectDTO.setCode(dockingSystemConfig.getPushType().equalsIgnoreCase("2")?dockingTask.getClassifyId():dockingTask.getId()); resultNodeObjectDTO.setOid(dockingTask.getBtmOid()); resultNodeObjectDTOS.add(resultNodeObjectDTO); }finally { boolean isSend = false; for (ResultNodeObjectDTO resultNodeObjectDTO:resultNodeObjectDTOS){ String erroid = resultNodeObjectDTO.getErroid(); msg = resultNodeObjectDTO.getMsg(); if("0".equals(erroid)){ isSend = true; }else if("1".equals(erroid)){ isSend=false; }else{ isSend=false; } DockingLog dockingLogeDO = new DockingLog(); String oid=VciBaseUtil.getPk(); dockingLogeDO.setOid(oid); dockingLogeDO.setSystemCode(dockingTask.getSystemCode()); dockingLogeDO.setSystemName(dockingTask.getSystemName()); dockingLogeDO.setSystemOid(dockingTask.getSystemOid()); dockingLogeDO.setClassifyOid(dockingTask.getClassifyOid()); dockingLogeDO.setClassifyId(dockingTask.getClassifyId()); dockingLogeDO.setClassifyName(dockingTask.getClassifyName()); dockingLogeDO.setId(dockingTask.getId()); dockingLogeDO.setUniqueCode(dockingTask.getUniqueCode()); dockingLogeDO.setParamString(paramString); dockingLogeDO.setReturnString(backString); dockingLogeDO.setInterfaceStatus(isSend?"true":"false"); dockingLogeDO.setType(DATA_LOGE_OUT); dockingLogeDO.setMsg(msg); log.error("éææ¨éæ°æ®,systemcode:"+dockingTask.getSystemCode()+",systemname:"+dockingTask.getSystemName()+",url:"+url+",param:"+paramString+",e:"+msg); dockingLogeService.save(dockingLogeDO); } //å ¨é½æ¥æ¶æåçæ åµä¸,ä¿®æ¹dockingtask sendflag为已åé if(isSend) { dockingTask.setSendFlag(MdmDuckingConstant.SEND_FLAG_TRUE); dockingTaskService.updateById(dockingTask); } } } /*** * æ¥è¯¢éè¦éæçä¸å¡æ°æ®ä»»å¡ */ private void sendpushDataForService (){ initSysadmin(); //æ¥è¯¢åªäºä»»å¡è¿æ²¡ææ§è¡å®æ //VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(DockingTaskDO.class); //queryWrapper.addQueryMap("sendFlag",MdmDuckingConstant.SEND_FLAG_FALSE); // queryWrapper.addQueryMap("btmId", QueryOptionConstant.NOTIN + "(" + VciBaseUtil.toInSql(DOCKING_DEFAULT_CLASSIFY.toUpperCase(Locale.ROOT)) + ")"); //æ ¹æ®ç±»å廿¥è¯¢éè¦éæçåç±»æè æ°æ® LambdaQueryWrapper<DockingTask> queryWrapper = Wrappers.<DockingTask>lambdaQuery(); queryWrapper.eq(DockingTask::getSendFlag,MdmDuckingConstant.SEND_FLAG_FALSE); queryWrapper.notIn(DockingTask::getBtmId,DOCKING_DEFAULT_CLASSIFY.toLowerCase(Locale.ROOT)); List<DockingTask> dockingTaskDOS = dockingTaskService.list(queryWrapper); sendpushDataForService(dockingTaskDOS); } /*** * æ¥è¯¢éè¦éæçç¶åç±»ä»»å¡ */ private void sendpushClsfForService(){ initSysadmin(); /* //æ¥è¯¢åªäºä»»å¡è¿æ²¡ææ§è¡å®æ VciQueryWrapperForDO queryWrapper = new VciQueryWrapperForDO(DockingTaskDO.class); queryWrapper.addQueryMap("sendFlag",MdmDuckingConstant.SEND_FLAG_FALSE); queryWrapper.addQueryMap("btmId",DOCKING_DEFAULT_CLASSIFY.toUpperCase(Locale.ROOT)); List<DockingTaskDO> dockingTaskDOS = dockingTaskDaoI.selectByWrapper(queryWrapper);*/ //æ ¹æ®ç±»å廿¥è¯¢éè¦éæçåç±»æè æ°æ® LambdaQueryWrapper<DockingTask> queryWrapper = Wrappers.<DockingTask>lambdaQuery(); queryWrapper.eq(DockingTask::getSendFlag,MdmDuckingConstant.SEND_FLAG_FALSE); queryWrapper.eq(DockingTask::getBtmId,DOCKING_DEFAULT_CLASSIFY.toLowerCase(Locale.ROOT)); List<DockingTask> dockingTaskDOS = dockingTaskService.list(queryWrapper); sendpushClsfForService(dockingTaskDOS); } public void initSysadmin(){ SessionInfo sessionInfo = new SessionInfo(); sessionInfo.setUserId("sysAdmin"); sessionInfo.setUserName("ç³»ç»ç®¡çå"); sessionInfo.setIp(WebUtil.getLocalIp()); sessionInfo.setUserOid("193C026F-7DB8-27B4-F383-4E8BE083FB07"); sessionInfo.setUserSecret(UserSecretEnum.PRIVACY.getValue()+""); WebUtil.setSessionInfo(sessionInfo); } /** * dockingdataæ ¹æ®oidä¿®æ¹sendflag * @param oid Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -2,15 +2,19 @@ import com.alibaba.cloud.commons.lang.StringUtils; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.io.xml.DomDriver; import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO; import com.vci.ubcs.code.constant.MdmDuckingConstant; import com.vci.ubcs.code.dto.CodeOrderDTO; import com.vci.ubcs.code.dto.CodeOrderSecDTO; import com.vci.ubcs.code.entity.*; import com.vci.ubcs.code.enumpack.CodeDefaultLC; import com.vci.ubcs.code.enumpack.CodeSecTypeEnum; import com.vci.ubcs.code.enumpack.SysIntegrationDataFlowTypeEnum; import com.vci.ubcs.code.enumpack.sysIntegrationPushTypeEnum; import com.vci.ubcs.code.mapper.CommonsMapper; import com.vci.ubcs.code.service.*; import com.vci.ubcs.code.util.ClientBusinessObject; @@ -52,6 +56,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.stream.Collectors; import static com.vci.ubcs.code.constant.MdmDuckingConstant.DOCKING_DEFAULT_CLASSIFY; import static com.vci.ubcs.code.constant.MdmEngineConstant.DEFAULT_SYNC_ATTR_LIST; import static com.vci.ubcs.code.constant.MdmEngineConstant.IMPORT_ROW_INDEX; import static com.vci.ubcs.code.enumpack.CodeSecTypeEnum.CODE_CLASSIFY_SEC; @@ -101,6 +106,9 @@ @Resource private MdmIOService mdmIOService; @Resource private IDockingSystemConfigService dockingSystemConfigService; @Autowired private ICodeClassifyValueService codeClassifyValueService; @@ -156,6 +164,12 @@ } ClassfysVO classfysVO = interParameterVO.getData().getClassifys(); systemId = interParameterVO.getData().getSystemId(); //æ ¡éªæ¯å¦é ç½® boolean checkPass= checkIspass(systemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_APPCODE.getValue()); if(!checkPass){ errorid="101"; throw new Throwable("ç³»ç»æ è¯ä¸ºã"+systemId+"ã,"+sysIntegrationPushTypeEnum.ACCPET_APPCODE.getText()+"æ¥å£é 置已åç¨æè æªé ç½®ï¼è¯·èç³»ç¼ç 管çåï¼"); } UserVO userVo = interParameterVO.getData().getUser(); List<ClassfyVO> classVOList = classfysVO.getClassify(); InterParameterVO finalInterParameterVO = interParameterVO; @@ -323,6 +337,15 @@ } ClassfysVO classfysVO = interParameterVO.getData().getClassifys(); systemId = interParameterVO.getData().getSystemId(); //æ ¡éªæ¯å¦é ç½® boolean checkPass= checkIspass(systemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_EDITCODE.getValue()); if(!checkPass){ errorid="101"; throw new Throwable("ç³»ç»æ è¯ä¸ºã"+systemId+"ã,"+sysIntegrationPushTypeEnum.ACCPET_EDITCODE.getText()+"æ¥å£é 置已åç¨æè æªé ç½®ï¼è¯·èç³»ç¼ç 管çåï¼"); } UserVO userVo = interParameterVO.getData().getUser(); List<ClassfyVO> classVOList = classfysVO.getClassify(); InterParameterVO finalInterParameterVO = interParameterVO; @@ -474,6 +497,14 @@ String libId= libraryVO.getId(); List<String> classifyIdList= libraryVO.getClassifyid(); List<CodeClassifyVO> codeClassifyVOS =new ArrayList<>(); //æ ¡éªæ¯å¦é ç½® boolean checkPass= checkIspass(systemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_QUERYCLAFILY.getValue()); if(!checkPass){ errorid="101"; throw new Throwable("ç³»ç»æ è¯ä¸ºã"+systemId+"ã,"+sysIntegrationPushTypeEnum.ACCPET_QUERYCLAFILY.getText()+"æ¥å£é 置已åç¨æè æªé ç½®ï¼è¯·èç³»ç¼ç 管çåï¼"); } //è¿æ¯è´¦å·ä¿¡æ¯ //è¿æ¯è´¦å·ä¿¡æ¯ if(userVo!=null) { @@ -635,7 +666,12 @@ msg = "æ¥å£åæ°ï¼library 为null"; throw new Throwable(msg); } //æ ¡éªæ¯å¦é ç½® boolean checkPass= checkIspass(systemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_QUERYDATA.getValue()); if(!checkPass){ errorid="101"; throw new Throwable("ç³»ç»æ è¯ä¸ºã"+systemId+"ã,"+sysIntegrationPushTypeEnum.ACCPET_QUERYDATA.getText()+"æ¥å£é 置已åç¨æè æªé ç½®ï¼è¯·èç³»ç¼ç 管çåï¼"); } //å ç®ç§°æ¯å¦æå ³è模æ¿ï¼ææ¨¡æ¿è¦å å é¤ List<CodeClassify> libIdDos =classifyService.selectByWrapper(Wrappers.<CodeClassify>query().lambda().eq(CodeClassify::getId,library)); @@ -820,6 +856,13 @@ String libId= libraryVO.getId(); List<String> classifyIdList= libraryVO.getClassifyid(); List<CodeClassifyVO> codeClassifyVOS =new ArrayList<>(); //æ ¡éªæ¯å¦é ç½® boolean checkPass= checkIspass(systemId, SysIntegrationDataFlowTypeEnum.ACCEPT.getValue(), sysIntegrationPushTypeEnum.ACCPET_QUERYCLAFILYRULE.getValue()); if(!checkPass){ errorid="101"; throw new Throwable("ç³»ç»æ è¯ä¸ºã"+systemId+"ã,"+sysIntegrationPushTypeEnum.ACCPET_QUERYCLAFILYRULE.getText()+"æ¥å£é 置已åç¨æè æªé ç½®ï¼è¯·èç³»ç¼ç 管çåï¼"); } //è¿æ¯è´¦å·ä¿¡æ¯ //è¿æ¯è´¦å·ä¿¡æ¯ if(userVo!=null) { @@ -1303,5 +1346,20 @@ return resultStr; } /*** * æ ¡éªæ¯å¦åäºé ç½® * @param systemId,ç³»ç»æ è¯ * @param type:æ¥å£ç±»å * @param operationType:æ¥å£æä½ç±»å * @return */ private boolean checkIspass(String systemId,String type,String operationType){ //æ ¹æ®ç±»å廿¥è¯¢éè¦éæçåç±»æè æ°æ® LambdaQueryWrapper<DockingSystemConfig> queryWrapper = Wrappers.<DockingSystemConfig>lambdaQuery(); queryWrapper.eq(DockingSystemConfig::getUsedFlag, MdmDuckingConstant.SEND_FLAG_TRUE); queryWrapper.eq(DockingSystemConfig::getSysBaseId,systemId); queryWrapper.eq(DockingSystemConfig::getDataFlowType,type); queryWrapper.eq(DockingSystemConfig::getPushType,operationType); return dockingSystemConfigService.count(queryWrapper)>0?true:false; } } Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java
@@ -10,7 +10,7 @@ import com.vci.ubcs.omd.constant.BtmTypeConstant; import com.vci.ubcs.omd.constant.BtmTypeFieldConstant; import com.vci.ubcs.omd.dto.BtmAndLinkTypeDdlDTO; import com.vci.ubcs.omd.entity.Attribute; import com.vci.ubcs.omd.entity.*; import com.vci.ubcs.omd.repeater.DomainRepeater; import com.vci.ubcs.omd.service.*; import com.vci.ubcs.omd.vo.*; @@ -19,9 +19,6 @@ import com.vci.ubcs.starter.web.constant.OmdRegExpConstant; import com.vci.ubcs.omd.dto.BtmTypeDTO; import com.vci.ubcs.omd.dto.BtmTypeLinkAttributesDTO; import com.vci.ubcs.omd.entity.BtmType; import com.vci.ubcs.omd.entity.BtmTypeAttribute; import com.vci.ubcs.omd.entity.ModifyAttributeInfo; import com.vci.ubcs.omd.mapper.BtmTypeMapper; import com.vci.ubcs.starter.exception.VciBaseException; import com.vci.ubcs.starter.web.enumpck.BooleanEnum; @@ -85,6 +82,12 @@ */ @Autowired private IAttributeService attributeService; /** * çå½å¨æçæå¡ */ @Autowired private ILifeCycleService lifeCycleService; /** * 表ååç¼ @@ -617,13 +620,14 @@ if (btmTypeDTO.isLifeCycleFlag()){ // éè¦æ§å¶çå½å¨æ //æ£æ¥ä½¿ç¨ççå½å¨ææ¯å¦åå¨ // if (StringUtils.isNotBlank(btmTypeDTO.getLifeCycleId()) // && !FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE.equalsIgnoreCase(btmTypeDTO.getLifeCycleId())) { // if (lifeCycleServiceI.checkLifeCycleExist(btmTypeDTO.getLifeCycleId())) { // throw new VciBaseException("çå½å¨æ{0}[{1}]å¨ç³»ç»ä¸ä¸åå¨ï¼è¯·å æ¥è¯", // new Object[]{btmTypeDTO.getLifeCycleId(), btmTypeDTO.getLifeCycleName()}); // } // } if (StringUtils.isNotBlank(btmTypeDTO.getLifeCycleId()) // && !FrameWorkLcStatusConstant.EMTYPE_LIFE_CYCLE.equalsIgnoreCase(btmTypeDTO.getLifeCycleId()) ) { if (lifeCycleService.getOne(Wrappers.<LifeCycleRule>query().lambda().eq(LifeCycleRule::getId,btmTypeDTO.getLifeCycleId())) == null) { throw new VciBaseException("çå½å¨æ{0}[{1}]å¨ç³»ç»ä¸ä¸åå¨ï¼è¯·å æ¥è¯", new Object[]{btmTypeDTO.getLifeCycleId(), btmTypeDTO.getLifeCycleName()}); } } // if (StringUtils.isNotBlank(btmTypeDTO.getSubLifeCycleId())) { // if (lifeCycleServiceI.checkLifeCycleExist(btmTypeDTO.getSubLifeCycleId())) { // throw new VciBaseException("å¤ç¨çå½å¨æ{0}[{1}]ä¸å ¶ä¸ææäºå¨ç³»ç»ä¸ä¸åå¨ï¼è¯·å æ¥è¯",