fujunling
2023-06-25 f2a97a13efaf924d152b0f1c727005c1e0eef810
历史导入
已修改32个文件
已删除8个文件
已添加26个文件
3736 ■■■■ 文件已修改
Source/UBCS-WEB/src/api/resource/file.js 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/api/template/flowpath.js 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue 140 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/refer/vciWebRefer.vue 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/components/template/SetPersonnel.vue 105 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/views/flow/flowPath.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/views/work/process/leave/handle.vue 352 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/vue.config.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSysIntHeaderDTO.java 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSysIntParamDTO.java 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSystemConfigDTO.java 383 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntHeaderDTO.java 80 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntInfoBseDTO.java 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntParamDTO.java 81 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSysIntHeader.java 60 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSysIntParam.java 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystemConfig.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSysIntHeaderVO.java 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSysIntParamVO.java 54 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSystemConfigVO.java 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntHeaderVO.java 80 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntParamVO.java 81 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleDTO.java 55 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleEdgeDTO.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleLineDTO.java 82 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleLineEventDTO.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleNodeDTO.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEdge.java 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEvent.java 50 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLine.java 103 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLineEvent.java 48 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleNode.java 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleRule.java 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleEdgeVO.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleEventVO.java 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineEventVO.java 62 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineVO.java 100 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleNodeVO.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleVO.java 84 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/constant/CodeTableNameConstant.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingSysIntHeaderMapper.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingSysIntParamMapper.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSysIntHeaderService.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSysIntParamService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java 132 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSysIntHeaderServiceImpl.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSysIntParamServiceImpl.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java 143 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingTaskServiceImpl.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java 82 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingSysIntHeaderWrapper.java 67 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingSysIntParamWrapper.java 69 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingSysIntParamMapper.xml 42 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/LifeCycleController.java 121 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/LifeCycleMapper.java 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/ILifeCycleService.java 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LifeCycleServiceImpl.java 90 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LifeCycleRuleWrapper.java 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Source/UBCS-WEB/src/api/resource/file.js
@@ -16,10 +16,7 @@
  return request({
    url: '/api/ubcs-resource/fileController/deleteFile',
    method: 'delete',
    params: {
      fileOids,
      oids
    }
    data: oids
  })
}
Source/UBCS-WEB/src/api/template/flowpath.js
@@ -64,3 +64,19 @@
    data: params
  })
}
// å±žæ€§åˆ—表左侧
export const getBtnTask = (params) => {
  return request({
    url: '/api/ubcs-flow/vciflow/next',
    method: 'post',
    data: params
  })
}
// æ¨¡æ¿é˜¶æ®µåˆ—表
export const ExamineTask = (params) => {
  return request({
    url: '/api/ubcs-flow/work/complete-task',
    method: 'post',
    data: params
  })
}
Source/UBCS-WEB/src/components/advanced-query/advancedQuery.vue
@@ -82,7 +82,7 @@
                                :value="searchFormArrays[index].fieldValue"
                                :text="item.showField"
                                :display="!item.hidden"
                                @setReferValue="setReferValue">
                                @setReferValue="val=>setReferValue(val,index)">
                            </vci-web-refer>
                        </div>
                    </el-col>
@@ -189,66 +189,76 @@
        },
        // å¯¹è¯æ¡†å†…容渲染配置
        options(){
            // å°†options配置赋值到data中的option中,避免深浅拷贝的问题所以需要转json之后再赋值
            const data = JSON.stringify(this.options);
            this.initOptions = JSON.parse(data);
            //console.log(this.initOptions);
            if(this.initOptions.length > 0){
                this.initOptions.forEach((item,index) => {
                if(item.fieldType==='combox') {
                    let enumCach = JSON.parse(localStorage.getItem(item.comboxKey));
                    if(enumCach != null) {
                        item.data = enumCach;
                    }else {
                        getDictionary({code: item.comboxKey}).then(res=>{
                            item.data = res.data.data;
                            localStorage.setItem(item.comboxKey,JSON.stringify(res.data.data));
                        })
                    }
                }else if(item.fieldType==='refer'){
                    this.$set(item,"referConfigData",{
                        title: item.title,
                        showField: item.showField || item.field,
                        field: item.field,
                        placeholder: item.inputTip || '',
                        options: Object.assign(item.referConfig,{width:'100%'}),
                    })
                    //console.log(item.referConfigData.options);
                    //console.log(item);
                }
                // TODO: è¿™å„¿ä¿®æ”¹ä¸€ä¸‹å‚照的查询条件
                let conditions = [];
                if(item.fieldType==='text'){
                    conditions = this.searchConditions;
                }else if (item.fieldType==='combox'){
                    conditions = this.dateConditions;
                }else if (item.fieldType==='datetime') {
                    conditions = this.switchSearchConditions;
                }else {
                    conditions = this.referSearchConditions;
                }
                // console.log(conditions);
                this.$set(item,"conditions",conditions)
                let add = {
                    queryField: String(item.queryField),
                    condition: item.fieldType==='text' ? String("_like"):String("_equal"),
                    fieldValue: item.fieldType==='truefalse' ? Boolean(false):String(''),
                }
                this.searchFormArrays.push(add)
            });
            }
            //console.log(this.initOptions);
            //console.log(this.searchFormArrays);
            this.initData();
        }
    },
    methods: {
        initData(){
             // å°†options配置赋值到data中的option中,避免深浅拷贝的问题所以需要转json之后再赋值
            const data = JSON.stringify(this.options);
            this.initOptions = JSON.parse(data);
            //console.log(this.initOptions);
                if(this.initOptions.length > 0){
                    let array = [];
                    this.initOptions.forEach((item,index) => {
                        if(item.fieldType==='combox') {
                            let enumCach = JSON.parse(localStorage.getItem(item.comboxKey));
                            if(enumCach != null) {
                                item.data = enumCach;
                            }else {
                                getDictionary({code: item.comboxKey}).then(res=>{
                                    item.data = res.data.data;
                                    localStorage.setItem(item.comboxKey,JSON.stringify(res.data.data));
                                })
                            }
                        }else if(item.fieldType==='refer'){
                            this.$set(item,"referConfigData",{
                                title: item.title,
                                showField: item.showField || item.field,
                                field: item.field,
                                placeholder: item.inputTip || '',
                                options: Object.assign(item.referConfig,{width:"80%"}),
                            })
                            //console.log(item.referConfigData.options);
                            //console.log(item);
                        }
                        // TODO: è¿™å„¿ä¿®æ”¹ä¸€ä¸‹å‚照的查询条件
                        let conditions = [];
                        if(item.fieldType==='text'){
                            conditions = this.searchConditions;
                        }else if (item.fieldType==='combox'){
                            conditions = this.dateConditions;
                        }else if (item.fieldType==='datetime') {
                            conditions = this.switchSearchConditions;
                        }else {
                            conditions = this.referSearchConditions;
                        }
                        // console.log(conditions);
                        this.$set(item,"conditions",conditions)
                        let add = {
                            queryField: String(item.queryField),
                            condition: item.fieldType==='text' ? String("_like"):String("_equal"),
                            fieldValue: item.fieldType==='truefalse' ? Boolean(false):String(''),
                        }
                        array.push(add)
                    });
                    this.searchFormArrays = array;
            }
            //console.log(this.initOptions);
            //console.log(this.searchFormArrays);
        },
        /** ä¸ºå‚照类型时值选择之后的处理 */
        setReferValue(data){
            // if(data.field) {
            // }
            console.log(data);
        setReferValue(data,index){
            // console.log(index);
            if(data.field) {
                this.searchFormArrays[index][data.fieldValue] = data.value || '';
                this.initOptions[index][data.showField] = data.text || '';
            }
            // console.log(this.initOptions[index][data.showField]);
            // console.log(data);
        },
        // å±žæ€§åˆ‡æ¢æ—¶æŸ¥è¯¢æ¡ä»¶å’ŒæŸ¥è¯¢å€¼ä¹Ÿéœ€è¦å¯¹è¾“入框进行切换
@@ -284,22 +294,7 @@
        },
        // é‡ç½®å½“前界面的输入框
        resetInput(){
            const data = JSON.stringify(this.options);
            this.initOptions = JSON.parse(data);
            if(this.initOptions.length > 0){
                let array = [];
                this.initOptions.forEach((item,index) => {
                let add = {
                    queryField: String(item.queryField),
                    condition:item.fieldType=='text' ? String("_like"):String("_equal"),
                    fieldValue: item.fieldType=='truefalse' ? Boolean(false):String(''),
                }
                array.push(add)
            });
                this.searchFormArrays = array;
            }
            //console.log(this.initOptions);
            //console.log(this.searchFormArrays);
            this.initData();
        },
        // æ¢å¤é¡µé¢
        recoverPage(){
@@ -395,6 +390,5 @@
    .grid-content > .el-date-editor.el-input, .el-date-editor.el-input__inner{
        width: 100%;
    }
</style>
Source/UBCS-WEB/src/components/refer/vciWebRefer.vue
@@ -22,9 +22,15 @@
      title:''
    };
  },
  created() {},
  created() {
    if (!this.referConfig.options) {
      this.referConfig.options = {
        isMuti: false
      }
    }
  },
  mounted() {
    console.log(this.referConfig.options);
    //console.log(this.referConfig.options);
    var title = this.referConfig.title || '';
    title = title.replace(":", "");
    title = title ? ('为【' + title + '】选取值') : ('为【' + this.referConfig.showField + '】选取值');
Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue
@@ -5,7 +5,8 @@
               :visible.sync="visible"
               top="0"
               class="avue-dialog avue-dialog--top"
               :width="referConfig.options.width|| '80%'">
               :width="options.width|| '80%'">
      <avue-crud :option="option"
                 :table-loading="loading"
                 :data="data"
@@ -22,7 +23,6 @@
      </avue-crud>
      <div class="avue-dialog__footer">
        <div class="avue-dialog__footer--left valueInfo">{{ valueInfo }}</div>
        {{ this.referConfig.options.width }}
        <el-button @click="visible=false">取 æ¶ˆ</el-button>
        <el-button @click="setValue" type="primary">ç¡® å®š</el-button>
      </div>
@@ -43,7 +43,7 @@
  data() {
    return {
      visible: false,
      options: this.referConfig.options,
      options: this.referConfig.options||{},
      isMuti: ("true" == this.referConfig.options.isMuti || this.referConfig.options.isMuti == true || this.referConfig.options.muti == true) ? true : false,
      props: {
        value: this.referConfig.valueField || this.referConfig.options.valueField || 'oid',
@@ -84,7 +84,7 @@
    console.log('referConfig:')
    console.log(this.referConfig)
  },
  mounted() {
  mounted() {
    if(this.referConfig.options.page){
      this.page.pageSize=this.referConfig.options.page.limit || this.referConfig.options.page.pageSize;
      this.page.currentPage=this.referConfig.options.page.page || this.referConfig.options.page.currentPage;
@@ -272,13 +272,13 @@
        var query={}
        if (this.query) {
          for (var key in this.query) {
            query['conditionMap["' + key + '"]'] = this.query[key];
            query['conditionMap["' + key + '"]'] = '*'+this.query[key]+'*';
            query[key]='*'+this.query[key]+'*';
          }
        }
        getList(Object.assign(params,this.params, query,this.query),page.currentPage, page.pageSize, this.url).then(res => {
          const data = res.data;
          this.page.total = data.total;
          this.data = data.data;
        getList(Object.assign(params,this.params,this.query, query),page.currentPage, page.pageSize, this.url).then(res => {
          this.data = res.data.records;
          this.page.total=res.data.total
          this.loading = false;
          this.selectionClear();
        });
Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue
@@ -5,7 +5,7 @@
               :visible.sync="visible"
               top="0"
               class="avue-dialog avue-dialog--top"
               :width="referConfig.options.width|| '80%'">
               :width="options.width|| '80%'">
      <avue-crud :option="option"
                 :table-loading="loading"
                 :data="data"
@@ -45,7 +45,7 @@
  data() {
    return {
      visible: false,
      options: this.referConfig.options,
      options: this.referConfig.options || {},
      isMuti: ("true" == this.referConfig.options.isMuti || this.referConfig.options.isMuti == true || this.referConfig.options.muti == true) ? true : false,
      props: {
        value: this.referConfig.valueField || this.referConfig.options.valueField || 'oid',
@@ -330,13 +330,13 @@
        var query={}
        if (this.query) {
          for (var key in this.query) {
            query['conditionMap["' + key + '"]'] = this.query[key];
            query['conditionMap["' + key + '"]'] = '*'+this.query[key]+'*';
            query[key]='*'+this.query[key]+'*';
          }
        }
        getList(Object.assign(params,this.params, query,this.query),page.currentPage, page.pageSize, this.url).then(res => {
          const data = res.data;
          this.page.total = data.total;
          this.data = data.data;
        getList(Object.assign(params,this.params,this.query, query),page.currentPage, page.pageSize, this.url).then(res => {
          this.data = res.data.records;
          this.page.total=res.data.total
          this.loading = false;
          this.selectionClear();
        });
Source/UBCS-WEB/src/components/template/SetPersonnel.vue
@@ -52,7 +52,9 @@
            typeof: String,
            default: '流程审批'
        },
        // å‚数:选择的id,多个以数组方式传递:['id','id'],模板id,模板用途,流程名字,流程模板
        // å‚数:选择的id,多个以数组方式传递:['id','id'],模板id,模板用途,流程名字,流程模板,
        // flowTemplate:
        // vars:object格式,名字为vars,里面key键值,自己随意
        parameter: {
            typeof: Object,
            default: () => { }
@@ -73,14 +75,22 @@
    watch: {
        visible(n) {
            this.dialogVisible = n;
            if(n){
              this.apiInit()
              this.apiDict()
            if (n) {
                this.apiInit()
                this.apiDict()
            }
        },
        dialogVisible(n) {
            this.$emit('update:visible', n)
        },
        users:{
            handler(val){
                console.log('监听users',val)
                this.collectParam.flowTaskUsers = val
            },
            deep:true,
            immediate:true
        }
    },
    data() {
        return {
@@ -111,6 +121,7 @@
                processName: this.parameter[this.parameterKeys.flowTemplate],
                topName: this.title,
                ids: this.parameter[this.parameterKeys.ids],
                vars:this.parameter['vars']
            }
        },
        userIndex(arr1) {
@@ -125,9 +136,10 @@
                const { modelKey, templateId, modelName } = response.data.data.flow
                let flowTaskUsers = response.data.data.user
                this.collectParam = { modelKey, templateId, flowTaskUsers: flowTaskUsers }
                this.users = response.data.data.user
                console.log(this.collectParam)
                this.saveParam = { ...this.saveParam, modelKey, templateId, modelName }
                this.handleClickTag(this.tags[0])
                if (this.tags.length !== 0) this.handleClickTag(this.tags[0])
            }
        },
        async apiDict() {
@@ -154,12 +166,11 @@
                this.collectParam = { ...this.collectParam, name: value }
                console.log(this.collectParam)
                const response = await personnelCollect(this.collectParam)
                Console.log(response)
                console.log(response)
                if (response.status === 200) {
                    this.$nextTick(() => {
                        this.apiInit()
                    })
                    console.log(response)
                }
            }).catch(() => {
@@ -179,44 +190,61 @@
        },
        async apiSave() {
            try {
                if(this.collectParam.flowTaskUsers.length ===0){
                const len = this.collectParam.flowTaskUsers.length
                console.log(this.collectParam.flowTaskUsers)
                console.log(len == 0)
                console.log(len != this.initFrom.length)
                if (len == 0 && len != this.initFrom.length) {
                    this.$message({
                    type: "error",
                    message: "请选择节点!"
                });
                } else {
                    const response = await personnelSave({...this.saveParam,flowTaskUsers:this.collectParam.flowTaskUsers})
                if (response.status === 200) {
                    console.log(response)
                    this.$message({
                        type: 'success',
                        message: response.data.msg
                        type: "error",
                        message: "请选择节点!"
                    });
                    this.done()
                } else {
                    const {modelKey,modelName,processDesc,processName,templateId,topName,vars} = this.saveParam
                    const vals= {modelKey,modelName,processDesc,processName,templateId,topName,...vars}
                    const response = await personnelSave({ variables:vals, flowTaskUsers: this.collectParam.flowTaskUsers, })
                    if (response.status === 200) {
                        console.log(response)
                        this.$message({
                            type: 'success',
                            message: response.data.msg
                        });
                        this.done()
                    }
                }
                }
            } catch {
                console.error('接口调用失败')
            }
        },
        handleClickTag(event) {
            console.log(event)
            console.log('tasks', this.collectParam)
            const flowTaskUsers = event.flowTaskUsers//collet.flowTaskUsers
            let tasks =  this.collectParam.flowTaskUsers;//user
            for(let i=0;i<tasks.length;i++){
                let thisFlowTaskUsers = tasks[i];
                console.log('thisFlowTaskUsers',thisFlowTaskUsers)
                for(let j=0;j<flowTaskUsers.length;j++){
                    let thisFflowTaskUsers = flowTaskUsers[j];
                    if(thisFlowTaskUsers.taskId==thisFflowTaskUsers.taskId){
                        thisFlowTaskUsers['userName']=thisFflowTaskUsers.userName;
                        thisFlowTaskUsers['userId']=thisFflowTaskUsers.userId;
            console.log(event.flowTaskUsers)
            console.log(this.collectParam.flowTaskUsers)
            let flowTaskUsers = this.collectParam.flowTaskUsers
            this.collectParam.flowTaskUsers = flowTaskUsers.map((item, index) => {
                for (let i = 0; i < event.flowTaskUsers.length; i++) {
                    if (item.taskId == event.flowTaskUsers[i].taskId) {
                        item['userName'] = event.flowTaskUsers[i]['userName']
                        item['userId'] = event.flowTaskUsers[i]['userId']
                    }
                }
            }
            console.log(this.collectParam)
                return item
            })
            this.users =  this.collectParam.flowTaskUsers
            // const flowTaskUsers = event.flowTaskUsers//collet.flowTaskUsers
            // let tasks = this.collectParam.flowTaskUsers;//user
            // for (let i = 0; i < tasks.length; i++) {
            //     let thisFlowTaskUsers = tasks[i];
            //     for (let j = 0; j < flowTaskUsers.length; j++) {
            //         let thisFflowTaskUsers = flowTaskUsers[j];
            //         if (thisFlowTaskUsers.taskId == thisFflowTaskUsers.taskId) {
            //             thisFlowTaskUsers['userName'] = thisFflowTaskUsers.userName;
            //             thisFlowTaskUsers['userId'] = thisFflowTaskUsers.userId;
            //         }
            //     }
            // }
            // this.collectParam.flowTaskUsers = {...this.collectParam.flowTaskUsers,userId,userName}
        },
        handleCloseTag(event) {
            console.log(event)
@@ -225,9 +253,10 @@
        handleSelect(event, index) {
            const res = this.typeName.find(item => item.userId === event)
            const { userName } = res
            let users = { ... this.collectParam.flowTaskUsers[index], userName }
            console.log(users)
            this.users[index] = users
            console.log(this.users)
            this.$set(this.users, index, { ... this.collectParam.flowTaskUsers[index], userName })
            // this.users[index] = { ... this.collectParam.flowTaskUsers[index], userName }
            console.log(this.users)
        },
        done() {
            this.dialogVisible = false
Source/UBCS-WEB/src/views/flow/flowPath.vue
@@ -23,7 +23,11 @@
                ids:['0000','22222222'],
                code:'8b5e2017-990f-454a-9c39-4c4eeeb57553',
                type:'PUBLIC',
                template:'模板template'
                template:'模板template',
                vars:{
                    name:'111',
                    sex:'222'
                }
            },
            props:{
                flowTemplate:'template',
Source/UBCS-WEB/src/views/work/process/leave/handle.vue
@@ -1,169 +1,219 @@
<template>
  <basic-container>
    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
      <el-row type="flex" class="row-bg" justify="end">
        <el-form-item>
          <el-button type="primary" @click="handleAgree">同意</el-button>
          <el-button type="danger" @click="handleDisagree">驳回</el-button>
          <el-button @click="handleCancel">关闭</el-button>
        </el-form-item>
      </el-row>
      <el-card shadow="hover">
        <div slot="header">
          <span>审批信息</span>
        </div>
        <el-form-item label="申请人">
          <el-input :disabled="true" v-model="form.flow.assigneeName"/>
        </el-form-item>
        <el-row>
          <el-col :span="12">
            <el-form-item label="开始时间">
              <el-input :disabled="true" v-model="form.startTime"/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item label="结束时间">
              <el-input :disabled="true" v-model="form.endTime"/>
            </el-form-item>
          </el-col>
        </el-row>
        <el-form-item label="请假理由">
          <el-input :disabled="true" type="textarea" v-model="form.reason"/>
        </el-form-item>
        <el-form-item label="批复意见">
          <el-input type="textarea" v-model="form.comment"/>
        </el-form-item>
      </el-card>
      <el-card shadow="hover">
        <div slot="header">
          <span>流程信息</span>
        </div>
        <el-row type="flex" class="row-bg">
          <el-timeline>
            <el-timeline-item :key="flow.id" :timestamp="flow.createTime" v-for="flow in flowList" placement="top">
    <div class="dialogwarp">
      <div class="dialogwarp_tab">
        <el-card class="dialogwarp_tab_card">
          <el-tabs v-model="activeName" @tab-click="handleClick">
            <el-tab-pane label="业务数据信息" name="first">
            </el-tab-pane>
            <el-tab-pane label="流程跟踪" name="second">
              <avue-crud :data="flowList" :option="option" ref="crud">
              </avue-crud>
              <el-card shadow="hover">
                <p>{{flow.assigneeName}} åœ¨ [{{flow.createTime}}] å¼€å§‹å¤„理 [{{flow.historyActivityName}}] çŽ¯èŠ‚</p>
                <p v-if="flow.historyActivityDurationTime!==''">任务历时 [{{flow.historyActivityDurationTime}}]</p>
                <p v-if="flow.comment!==''">批复意见: [{{flow.comment}}]</p>
                <p v-if="flow.endTime!==''">结束时间: [{{flow.endTime}}]</p>
                <div slot="header">
                  <span>流程跟踪</span>
                </div>
                <el-row class="row-bg">
                  <flow-design :is-display="true" :process-instance-id="processInstanceId"></flow-design>
                </el-row>
              </el-card>
            </el-timeline-item>
          </el-timeline>
        </el-row>
      </el-card>
      <el-card shadow="hover">
        <div slot="header">
          <span>流程跟踪</span>
        </div>
        <el-row class="row-bg">
          <flow-design :is-display="true" :process-instance-id="processInstanceId"></flow-design>
        </el-row>
      </el-card>
    </el-form>
            </el-tab-pane>
          </el-tabs>
        </el-card>
      </div>
      <div class="dialogwarp_card">
        <el-card class="box-card">
          <div slot="header" class="clearfix">
            <span>当前任务:</span>
            <span>{{ title }}</span>
          </div>
          <div style="width: 100%;">
            <p>请在下方输入您的审批意见:</p>
            <el-input type="textarea" :rows="4" placeholder="请输入内容" show-word-limit v-model="opinionVal">
            </el-input>
          </div>
          <div style="width: 100%;">
            <p>审批意见附件:</p>
            <el-upload drag action="https://jsonplaceholder.typicode.com/posts/" multiple style="width: 100%;">
              <i class="el-icon-upload"></i>
              <div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
            </el-upload>
          </div>
          <div style="width: 100%;">
            <p>已上传审批文件:</p>
            <el-card class="box-card">
              <el-table :data="tableData" stripe style="width: 100%">
                <el-table-column prop="date" label="文件名">
                </el-table-column>
                <el-table-column prop="name" label="上传人  ">
                </el-table-column>
                <el-table-column prop="address" label="操作">
                </el-table-column>
              </el-table>
            </el-card>
          </div>
          <div style="margin-top: 20px;">
            <!-- <el-button type="primary" size="mini" @click="handelRefuse">不同意</el-button>
            <el-button v-if="!isRefuse" type="primary" size="mini" @click="handelAgree">同意</el-button>
             <el-button v-if="!isAgree" type="primary" size="mini" @click="handelRefuse">不同意</el-button> -->
            <el-button type="primary" size="mini" @click="handelExecute(item)" v-for="(item, index) in btnList"
              :key="index">{{ item.toName === '同意' ? item.toName : `${item.toName}到${item.taskName}` }}</el-button>
            <!-- <el-button v-if="isRefuse" type="primary" size="mini" @click="handelExecute">执行</el-button> -->
          </div>
        </el-card>
      </div>
    </div>
  </basic-container>
</template>
<script>
  import {historyFlowList, leaveDetail} from "@/api/work/process";
  import {completeTask} from "@/api/work/work";
import { historyFlowList } from "@/api/work/process";
import { getBtnTask, ExamineTask } from '@/api/template/flowpath.js'
import { validatenull } from '@/util/validate'
  export default {
    data() {
      return {
        taskId: '',
        businessId: '',
        processInstanceId: '',
        src: '',
        flowList: [],
        form: {
          flow: {
            assigneeName: '',
          },
          startTime: '',
          endTime: '',
          reason: '',
          comment: '',
        },
      }
    },
    created() {
export default {
  data() {
    return {
      taskId: '',
      businessId: '',
      processInstanceId: '',
      src: '',
      flowList: [],
      btnList: [],
      opinionVal: '',
      activeName: 'first',
      option: {
        menu: false,
        addBtn: false,
        refreshBtn: false,
        columnBtn: false,
        index: true,
        header: false,
        stripe: true,
        indexLabelClassName: '序号',
        column: [
          { label: '任务名称', prop: 'historyActivityName', minWidth: 120 },
          { label: '执行操作', prop: 'sex', minWidth: 80 },
          { label: '任务开始时间', prop: 'createTime', minWidth: 140 },
          { label: '审批意见', prop: 'comment', minWidth: 220, overHidden: true },
          { label: '执行人', prop: 'assigneeName', minWidth: 80 },
          { label: '任务完成时间', prop: 'endTime', minWidth: 140 },
          { label: '已上传审批文件', prop: 'sex', minWidth: 220, overHidden: true },
        ]
      },
    }
  },
  created() {
    this.init();
  },
  beforeRouteUpdate(to, from, next) {
    // åœ¨å½“前路由改变,但是该组件被复用时调用
    // ä¸¾ä¾‹æ¥è¯´ï¼Œå¯¹äºŽä¸€ä¸ªå¸¦æœ‰åŠ¨æ€å‚æ•°çš„è·¯å¾„ /foo/:id,在 /foo/1 å’Œ /foo/2 ä¹‹é—´è·³è½¬çš„æ—¶å€™
    // ç”±äºŽä¼šæ¸²æŸ“同样的 Foo ç»„件,因此组件实例会被复用。而这个钩子就会在这个情况下被调用
    // å¯ä»¥è®¿é—®ç»„件实例 `this`
    if (to.fullPath !== from.fullPath) {
      next();
      this.init();
    }
  },
  methods: {
    init() {
      this.taskId = this.$route.params.taskId;
      this.processInstanceId = this.$route.params.processInstanceId;
      this.businessId = this.$route.params.businessId;
      historyFlowList(this.processInstanceId).then(res => {
        const data = res.data;
        if (data.success) {
          this.flowList = data.data;
        }
      })
      this.apiGetBtnTask(this.processInstanceId)
    },
    beforeRouteUpdate(to, from, next) {
      // åœ¨å½“前路由改变,但是该组件被复用时调用
      // ä¸¾ä¾‹æ¥è¯´ï¼Œå¯¹äºŽä¸€ä¸ªå¸¦æœ‰åŠ¨æ€å‚æ•°çš„è·¯å¾„ /foo/:id,在 /foo/1 å’Œ /foo/2 ä¹‹é—´è·³è½¬çš„æ—¶å€™
      // ç”±äºŽä¼šæ¸²æŸ“同样的 Foo ç»„件,因此组件实例会被复用。而这个钩子就会在这个情况下被调用
      // å¯ä»¥è®¿é—®ç»„件实例 `this`
      if (to.fullPath !== from.fullPath) {
        next();
        this.init();
    async apiGetBtnTask(id) {
      const response = await getBtnTask({ processInstanceId: id })
      const res = response.data
      if (res.success) {
        console.log(res)
        this.btnList = res.data.toTasks
      }
    },
    methods: {
      init() {
        this.taskId = this.$route.params.taskId;
        this.processInstanceId = this.$route.params.processInstanceId;
        this.businessId = this.$route.params.businessId;
        historyFlowList(this.processInstanceId).then(res => {
          const data = res.data;
          if (data.success) {
            this.flowList = data.data;
          }
        })
        leaveDetail(this.businessId).then(res => {
          const data = res.data;
          if (data.success) {
            this.form = data.data;
          }
        })
      },
      handleAgree() {
        if (!this.form.comment) {
          this.$message.warning('请先填写批复意见');
          return;
        }
        const params = {
          taskId: this.taskId,
          processInstanceId: this.processInstanceId,
          flag: 'ok',
          comment: this.form.comment,
        };
        completeTask(params).then(res => {
          const data = res.data;
          if (data.success) {
            this.$message.success(data.msg);
            this.$router.$avueRouter.closeTag();
            this.$router.push({path: `/work/start`});
          } else {
            this.$message.error(data.msg || '提交失败');
          }
        })
      },
      handleDisagree() {
        if (!this.form.comment) {
          this.$message.warning('请先填写批复意见');
          return;
        }
        const params = {
          taskId: this.taskId,
          processInstanceId: this.processInstanceId,
          comment: this.form.comment,
        };
        completeTask(params).then(res => {
          const data = res.data;
          if (data.success) {
            this.$message.success(data.msg);
            this.$router.$avueRouter.closeTag();
            this.$router.push({path: `/work/start`});
          } else {
            this.$message.error(data.msg || '提交失败');
          }
        })
      },
      handleCancel() {
    async apiExamineTask(param) {
      const response = await ExamineTask(param)
      const res = response.data
      if (res.success) {
        this.$message.success(res.msg);
        this.$router.$avueRouter.closeTag();
        this.$router.push({path: `/work/start`});
        this.$router.push({ path: `/work/todo` });
      } else {
        this.$message.error(res.msg || '提交失败');
      }
    },
    handelExecute(event) {
      console.log(event)
      const { toName, conditionKey, conditionValue } = event
      let param = {
        comment: this.opinionVal || '同意',
        flag: 'ok',
        processInstanceId: this.processInstanceId,
        taskId: this.taskId,
      }
      if (!validatenull(conditionKey) && !validatenull(conditionValue)) {
        param = {
          ...param, variables: {
            [conditionKey]: conditionValue
          }
        }
      }
      if (toName === '驳回') {
        if (!this.opinionVal) {
          this.$alert(`当处理方式为${toName}时,需要填写审批意见`, '提示信息', {
            confirmButtonText: '确定',
          }).then(() => {
          });
        } else this.apiExamineTask(param)
      } else this.apiExamineTask(param)
    }
  }
}
</script>
<style lang="scss" scoped>
.dialogwarp {
  display: -webkit-box;
  display: -ms-flexbox;
  display: flex;
  justify-content: space-between;
  height: 70vh;
  &_tab {
    width: 79%;
    &_card {
      width: 100%;
      height: 100%;
    }
  }
  &_card {
    // margin-left: 20px;
    width: 20%;
  }
}
::v-deep(.el-upload) {
  width: 100%;
  height: 120px;
}
::v-deep(.el-upload-dragger) {
  width: 100%;
  height: 120px;
}
::v-deep(.el-upload-dragger .el-icon-upload) {
  margin: 15px 0 16px;
}
</style>
Source/UBCS-WEB/vue.config.js
@@ -27,7 +27,7 @@
      '/api': {
        //本地服务接口地址
        // target: 'http://localhost:37000',
        target: 'http://192.168.1.46:37000',
        // target: 'http://192.168.1.46:37000',
        //target: 'http://192.168.1.46:37000',
        // target: 'http://dev.vci-tech.com:37000',
        // target: 'http://192.168.1.104:37000',
@@ -35,7 +35,7 @@
        //target: 'http://192.168.3.7:37000',
        //target: 'http://dev.vci-tech.com:37000',
        //target: 'http://192.168.1.51:37000/',
        // target:'http://192.168.1.104:37000',
        target:'http://192.168.1.104:37000',
        //远程演示服务地址,可用于直接启动项目
        // target: 'https://saber.bladex.vip/api',
        ws: true,
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSysIntHeaderDTO.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,57 @@
package com.vci.ubcs.code.dto;
import com.vci.ubcs.starter.revision.model.BaseModel;
import lombok.Data;
/**
 * ç³»ç»Ÿé›†æˆæŽ¥å£çš„认证数据传输对象
 *
 * @author xiejun
 * @date 2023-06-21
 */
@Data
public class DockingSysIntHeaderDTO extends BaseModel {
    /**
     * ç¦æ­¢ä¿®æ”¹è¿™ä¸ªå€¼
     */
    private static final long serialVersionUID = 4615707117695864945L;
    /**
     * SysIntInfoDO çš„oid
     */
    private String infoOid;
    /**
     * å‚æ•°key
     */
    private String headerKey;
    /**
     * å‚æ•°value
     */
    private String headerValue;
    /**
     * æ˜¯å¦ä½¿ç”¨
     */
    private String usedFlag;
    /***
     * æ˜¯å¦ä½¿ç”¨æ˜¾ç¤ºæ–‡æœ¬
     */
    private String usedFlagText;
    @Override
    public String toString() {
        return "DockingSysIntHeaderDTO{" +
            "infoOid='" + infoOid + '\'' +
            ", headerKey='" + headerKey + '\'' +
            ", headerValue='" + headerValue + '\'' +
            ", usedFlag='" + usedFlag + '\'' +
            ", usedFlagText='" + usedFlagText + '\'' +
            '}';
    }
}
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSysIntParamDTO.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,57 @@
package com.vci.ubcs.code.dto;
import com.vci.ubcs.starter.revision.model.BaseModel;
import lombok.Data;
/**
 * ç³»ç»Ÿé›†æˆæŽ¥å£çš„认证数据传输对象
 *
 * @author weidy
 * @date 2022-04-11
 */
@Data
public class DockingSysIntParamDTO extends BaseModel {
    /**
     * ç¦æ­¢ä¿®æ”¹è¿™ä¸ªå€¼
     */
    private static final long serialVersionUID = 4615707120661255093L;
    /**
     * SysIntInfoDO çš„oid
     */
    private String infoOid;
    /**
     * å‚æ•°key
     */
    private String paramkey;
    /**
     * å‚æ•°value
     */
    private String paramvalue;
    /**
     * æ˜¯å¦ä½¿ç”¨
     */
    private String usedflag;
    /***
     * æ˜¯å¦ä½¿ç”¨æ˜¾ç¤ºæ–‡æœ¬
     */
    private String usedFlagText;
    @Override
    public String toString() {
        return "DockingSysIntParamDTO{" +
            "infoOid='" + infoOid + '\'' +
            ", paramkey='" + paramkey + '\'' +
            ", paramvalue='" + paramvalue + '\'' +
            ", usedflag='" + usedflag + '\'' +
            ", usedFlagText='" + usedFlagText + '\'' +
            '}';
    }
}
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingSystemConfigDTO.java
@@ -1,9 +1,10 @@
package com.vci.ubcs.code.dto;
import com.vci.ubcs.code.vo.pagemodel.SysIntHeaderVO;
import com.vci.ubcs.code.vo.pagemodel.SysIntParamVO;
import com.vci.ubcs.code.vo.pagemodel.DockingSysIntHeaderVO;
import com.vci.ubcs.code.vo.pagemodel.DockingSysIntParamVO;
import com.vci.ubcs.starter.revision.model.BaseModel;
import lombok.Data;
import java.util.List;
@@ -13,6 +14,7 @@
 * @author lihang
 * @date 2022-03-07
 */
@Data
public class DockingSystemConfigDTO extends BaseModel {
    /**
@@ -245,381 +247,12 @@
    /***
     * å‚数信息对象
     */
    private List<SysIntParamVO> sysIntParamVOs;
    private List<DockingSysIntParamDTO> sysIntParamDTOS;
    /***
     * header信息对象
     */
    private List<SysIntHeaderVO> sysIntHeaderVOs;
    public String getAuthorityOid() {
        return authorityOid;
    }
    public void setAuthorityOid(String authorityOid) {
        this.authorityOid = authorityOid;
    }
    public String getAuthorityOidName() {
        return authorityOidName;
    }
    public void setAuthorityOidName(String authorityOidName) {
        this.authorityOidName = authorityOidName;
    }
    public String getAuthorityType() {
        return authorityType;
    }
    public void setAuthorityType(String authorityType) {
        this.authorityType = authorityType;
    }
    public String getAuthorityTypeText() {
        return authorityTypeText;
    }
    public void setAuthorityTypeText(String authorityTypeText) {
        this.authorityTypeText = authorityTypeText;
    }
    public String getUserAccount() {
        return userAccount;
    }
    public void setUserAccount(String userAccount) {
        this.userAccount = userAccount;
    }
    public String getUserCode() {
        return userCode;
    }
    public void setUserCode(String userCode) {
        this.userCode = userCode;
    }
    public String getToken() {
        return token;
    }
    public void setToken(String token) {
        this.token = token;
    }
    public String getInterfaceFunction() {
        return interfaceFunction;
    }
    public void setInterfaceFunction(String interfaceFunction) {
        this.interfaceFunction = interfaceFunction;
    }
    @Override
    public String getDescription() {
        return description;
    }
    @Override
    public void setDescription(String description) {
        this.description = description;
    }
    public String getInterfaceType() {
        return interfaceType;
    }
    public void setInterfaceType(String interfaceType) {
        this.interfaceType = interfaceType;
    }
    public String getInterfaceTypeText() {
        return interfaceTypeText;
    }
    public void setInterfaceTypeText(String interfaceTypeText) {
        this.interfaceTypeText = interfaceTypeText;
    }
    public String getParamType() {
        return paramType;
    }
    public void setParamType(String paramType) {
        this.paramType = paramType;
    }
    public String getParamTypeText() {
        return paramTypeText;
    }
    public void setParamTypeText(String paramTypeText) {
        this.paramTypeText = paramTypeText;
    }
    public String getRequestMethod() {
        return requestMethod;
    }
    public void setRequestMethod(String requestMethod) {
        this.requestMethod = requestMethod;
    }
    public String getRequestMethodText() {
        return requestMethodText;
    }
    public void setRequestMethodText(String requestMethodText) {
        this.requestMethodText = requestMethodText;
    }
    public String getClassifyOid() {
        return classifyOid;
    }
    public void setClassifyOid(String classifyOid) {
        this.classifyOid = classifyOid;
    }
    public String getUsedFlag() {
        return usedFlag;
    }
    public void setUsedFlag(String usedFlag) {
        this.usedFlag = usedFlag;
    }
    public String getSysBaseOid() {
        return sysBaseOid;
    }
    public void setSysBaseOid(String sysBaseOid) {
        this.sysBaseOid = sysBaseOid;
    }
    public String getSysBaseId() {
        return sysBaseId;
    }
    public void setSysBaseId(String sysBaseId) {
        this.sysBaseId = sysBaseId;
    }
    public String getSysBaseName() {
        return sysBaseName;
    }
    public void setSysBaseName(String sysBaseName) {
        this.sysBaseName = sysBaseName;
    }
    public String getRequestUrl() {
        return requestUrl;
    }
    public void setRequestUrl(String requestUrl) {
        this.requestUrl = requestUrl;
    }
    public String getReturnType() {
        return returnType;
    }
    public void setReturnType(String returnType) {
        this.returnType = returnType;
    }
    public String getReturnTypeText() {
        return returnTypeText;
    }
    public void setReturnTypeText(String returnTypeText) {
        this.returnTypeText = returnTypeText;
    }
    public String getSourceSystemOid() {
        return sourceSystemOid;
    }
    public void setSourceSystemOid(String sourceSystemOid) {
        this.sourceSystemOid = sourceSystemOid;
    }
    public String getSourceSysName() {
        return sourceSysName;
    }
    public void setSourceSysName(String sourceSysName) {
        this.sourceSysName = sourceSysName;
    }
    public String getSourceSysId() {
        return sourceSysId;
    }
    public void setSourceSysId(String sourceSysId) {
        this.sourceSysId = sourceSysId;
    }
    public String getSourceSystemOidName() {
        return sourceSystemOidName;
    }
    public void setSourceSystemOidName(String sourceSystemOidName) {
        this.sourceSystemOidName = sourceSystemOidName;
    }
    public String getTargetSystemOid() {
        return targetSystemOid;
    }
    public void setTargetSystemOid(String targetSystemOid) {
        this.targetSystemOid = targetSystemOid;
    }
    public String getTargetSysName() {
        return targetSysName;
    }
    public void setTargetSysName(String targetSysName) {
        this.targetSysName = targetSysName;
    }
    public String getTargetSysId() {
        return targetSysId;
    }
    public void setTargetSysId(String targetSysId) {
        this.targetSysId = targetSysId;
    }
    public String getTargetSystemOidName() {
        return targetSystemOidName;
    }
    public void setTargetSystemOidName(String targetSystemOidName) {
        this.targetSystemOidName = targetSystemOidName;
    }
    public String getClassPath() {
        return classPath;
    }
    public void setClassPath(String classPath) {
        this.classPath = classPath;
    }
    public String getDataFlowType() {
        return dataFlowType;
    }
    public void setDataFlowType(String dataFlowType) {
        this.dataFlowType = dataFlowType;
    }
    public String getDataFlowTypeText() {
        return dataFlowTypeText;
    }
    public void setDataFlowTypeText(String dataFlowTypeText) {
        this.dataFlowTypeText = dataFlowTypeText;
    }
    public String getBtmTypeId() {
        return btmTypeId;
    }
    public void setBtmTypeId(String btmTypeId) {
        this.btmTypeId = btmTypeId;
    }
    public String getBtmTypeName() {
        return btmTypeName;
    }
    public void setBtmTypeName(String btmTypeName) {
        this.btmTypeName = btmTypeName;
    }
    public String getNamespace() {
        return namespace;
    }
    public void setNamespace(String namespace) {
        this.namespace = namespace;
    }
    public String getSoapAction() {
        return soapAction;
    }
    public void setSoapAction(String soapAction) {
        this.soapAction = soapAction;
    }
    public String getCxfAxis() {
        return cxfAxis;
    }
    public void setCxfAxis(String cxfAxis) {
        this.cxfAxis = cxfAxis;
    }
    public String getTargetName() {
        return targetName;
    }
    public void setTargetName(String targetName) {
        this.targetName = targetName;
    }
    public String getPushType() {
        return pushType;
    }
    public void setPushType(String pushType) {
        this.pushType = pushType;
    }
    public String getPushTypeText() {
        return pushTypeText;
    }
    public void setPushTypeText(String pushTypeText) {
        this.pushTypeText = pushTypeText;
    }
    public String getClassifyId() {
        return classifyId;
    }
    public void setClassifyId(String classifyId) {
        this.classifyId = classifyId;
    }
    public String getClassifyName() {
        return classifyName;
    }
    public void setClassifyName(String classifyName) {
        this.classifyName = classifyName;
    }
    public List<SysIntParamVO> getSysIntParamVOs() {
        return sysIntParamVOs;
    }
    public void setSysIntParamVOs(List<SysIntParamVO> sysIntParamVOs) {
        this.sysIntParamVOs = sysIntParamVOs;
    }
    public List<SysIntHeaderVO> getSysIntHeaderVOs() {
        return sysIntHeaderVOs;
    }
    private List<DockingSysIntHeaderDTO> sysIntHeaderDTOS;
    public void setSysIntHeaderVOs(List<SysIntHeaderVO> sysIntHeaderVOs) {
        this.sysIntHeaderVOs = sysIntHeaderVOs;
    }
    @Override
    public String toString() {
@@ -668,8 +301,8 @@
            ", pushTypeText='" + pushTypeText + '\'' +
            ", classifyId='" + classifyId + '\'' +
            ", classifyName='" + classifyName + '\'' +
            ", sysIntParamVOs=" + sysIntParamVOs +
            ", sysIntHeaderVOs=" + sysIntHeaderVOs +
            ", sysIntParamDTOS=" + sysIntParamDTOS +
            ", sysIntHeaderDTOS=" + sysIntHeaderDTOS +
            '}';
    }
}
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntHeaderDTO.java
ÎļþÒÑɾ³ý
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntInfoBseDTO.java
ÎļþÒÑɾ³ý
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/SysIntParamDTO.java
ÎļþÒÑɾ³ý
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSysIntHeader.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,60 @@
package com.vci.ubcs.code.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/****
 * æŽ¥å£å¤´åè®®
 */
@Data
@TableName(CodeTableNameConstant.PL_CODE_SYSINTPAREMTER)
@ApiModel(value = "DockingSysIntHeader", description = "集成接口-接口头协议对象")
@EqualsAndHashCode(callSuper = true)
public class DockingSysIntHeader extends BaseModel {
    /**
     * ç¦æ­¢ä¿®æ”¹è¿™ä¸ªå€¼
     */
    private static final long serialVersionUID = 4615707117938037102L;
    /**
     * SysIntInfoDO çš„oid
     */
    @ApiModelProperty(value = "配置主键")
    private String infoOid;
    /**
     * å‚æ•°key
     */
    @ApiModelProperty(value = "配置主键")
    private String headerKey;
    /**
     * å‚æ•°value
     */
    @ApiModelProperty(value = "配置主键")
    @TableField(value = "headeralue")
    private String headerValue;
    /**
     * æ˜¯å¦ä½¿ç”¨
     */
    @ApiModelProperty(value = "配置主键")
    private String usedFlag;
    /**
     * æ˜¯å¦ä½¿ç”¨
     */
    @ApiModelProperty(value = "配置主键")
    @TableField(exist = true)
    private String usedFlagText;
}
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSysIntParam.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,66 @@
package com.vci.ubcs.code.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
/**
 * ç³»ç»Ÿé›†æˆæŽ¥å£çš„参数对象
 *
 * @author weidy
 * @date 2022-04-11
 */
@Data
@TableName(CodeTableNameConstant.PL_CODE_SYSINTPAREMTER)
@ApiModel(value = "DockingSysIntParam", description = "集成接口-接口的参数对象")
@EqualsAndHashCode(callSuper = true)
public class DockingSysIntParam  extends BaseModel {
    /**
     * ç¦æ­¢ä¿®æ”¹è¿™ä¸ªå€¼
     */
    private static final long serialVersionUID = 4615707118871819648L;
    /**
     * SysIntInfoDO çš„oid
     */
    @ApiModelProperty(value = "接口配置主键")
    private String infoOid;
    /**
     * å‚æ•°key
     */
    @ApiModelProperty(value = "参数key")
    private String paramKey;
    /**
     * å‚æ•°value
     */
    @ApiModelProperty(value = "参数value")
    private String paramValue;
    /**
     * æ˜¯å¦ä½¿ç”¨
     */
    @ApiModelProperty(value = "是否使用")
    private String usedFlag;
    /**
     * æ˜¯å¦ä½¿ç”¨æ˜¾ç¤ºå€¼
     */
    @ApiModelProperty(value = "是否使用显示值")
    @TableField(exist = true)
    private String usedFlagText;
    @Override
    public String toString() {
        return "DockingSysIntParamVO{" +
            "infoOid='" + infoOid + '\'' +
            ", paramKey='" + paramKey + '\'' +
            ", paramValue='" + paramValue + '\'' +
            '}';
    }
}
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSystemConfig.java
@@ -2,16 +2,12 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.code.vo.pagemodel.SysIntHeaderVO;
import com.vci.ubcs.code.vo.pagemodel.SysIntParamVO;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.List;
/***
 * é›†æˆæŽ¥å£-集成接口管理对象
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSysIntHeaderVO.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,55 @@
package com.vci.ubcs.code.vo.pagemodel;
import com.vci.ubcs.starter.revision.model.BaseModel;
import lombok.Data;
/**
 * ç³»ç»Ÿé›†æˆæŽ¥å£çš„认证显示对象
 *
 * @author weidy
 * @date 2022-04-11
 */
@Data
public class DockingSysIntHeaderVO extends BaseModel {
    /**
     * ç¦æ­¢ä¿®æ”¹è¿™ä¸ªå€¼
     */
    private static final long serialVersionUID = 4615707117938037102L;
    /**
     * SysIntInfoDO çš„oid
     */
    private String infoOid;
    /**
     * å‚æ•°key
     */
    private String headerKey;
    /**
     * å‚æ•°value
     */
    private String headerValue;
    /**
     * æ˜¯å¦ä½¿ç”¨
     */
    private String usedFlag;
    /***
     * æ˜¯å¦ä½¿ç”¨æ˜¾ç¤ºæ–‡æœ¬
     */
    private String usedFlagText;
    @Override
    public String toString() {
        return "DockingSysIntHeaderVO{" +
            "infoOid='" + infoOid + '\'' +
            ", headerKey='" + headerKey + '\'' +
            ", headerValue='" + headerValue + '\'' +
            ", usedFlag='" + usedFlag + '\'' +
            ", usedFlagText='" + usedFlagText + '\'' +
            '}';
    }
}
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSysIntParamVO.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,54 @@
package com.vci.ubcs.code.vo.pagemodel;
import com.vci.ubcs.starter.revision.model.BaseModel;
import lombok.Data;
/**
 * ç³»ç»Ÿé›†æˆæŽ¥å£çš„认证显示对象
 *
 * @author xiejun
 * @date 2023-06-21
 */
@Data
public class DockingSysIntParamVO extends BaseModel {
    /**
     * ç¦æ­¢ä¿®æ”¹è¿™ä¸ªå€¼
     */
    private static final long serialVersionUID = 4615707118871819648L;
    /**
     * SysIntInfoDO çš„oid
     */
    private String infoOid;
    /**
     * å‚æ•°key
     */
    private String paramKey;
    /**
     * å‚æ•°value
     */
    private String paramValue;
    /***
     * æ˜¯å¦ä½¿ç”¨
     */
    private String usedFlag;
    /***
     * æ˜¯å¦ä½¿ç”¨æ˜¾ç¤ºæ–‡æœ¬
     */
    private String usedFlagText;
    @Override
    public String toString() {
        return "DockingSysIntParamVO{" +
            "infoOid='" + infoOid + '\'' +
            ", paramKey='" + paramKey + '\'' +
            ", paramValue='" + paramValue + '\'' +
            ", usedFlag='" + usedFlag + '\'' +
            ", usedFlagText='" + usedFlagText + '\'' +
            '}';
    }
}
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingSystemConfigVO.java
@@ -241,11 +241,11 @@
    /***
     * å‚数信息对象
     */
    private List<SysIntParamVO> sysIntParamVOs;
    private List<DockingSysIntParamVO> sysIntParamVOs;
    /***
     * header信息对象
     */
    private List<SysIntHeaderVO> sysIntHeaderVOs;
    private List<DockingSysIntHeaderVO> sysIntHeaderVOs;
    public String getAuthorityOid() {
@@ -602,19 +602,19 @@
        this.classifyName = classifyName;
    }
    public List<SysIntParamVO> getSysIntParamVOs() {
    public List<DockingSysIntParamVO> getSysIntParamVOs() {
        return sysIntParamVOs;
    }
    public void setSysIntParamVOs(List<SysIntParamVO> sysIntParamVOs) {
    public void setSysIntParamVOs(List<DockingSysIntParamVO> sysIntParamVOs) {
        this.sysIntParamVOs = sysIntParamVOs;
    }
    public List<SysIntHeaderVO> getSysIntHeaderVOs() {
    public List<DockingSysIntHeaderVO> getSysIntHeaderVOs() {
        return sysIntHeaderVOs;
    }
    public void setSysIntHeaderVOs(List<SysIntHeaderVO> sysIntHeaderVOs) {
    public void setSysIntHeaderVOs(List<DockingSysIntHeaderVO> sysIntHeaderVOs) {
        this.sysIntHeaderVOs = sysIntHeaderVOs;
    }
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntHeaderVO.java
ÎļþÒÑɾ³ý
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/SysIntParamVO.java
ÎļþÒÑɾ³ý
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleDTO.java
@@ -1,5 +1,6 @@
package com.vci.ubcs.omd.dto;
import com.vci.ubcs.omd.entity.LifeCycleRule;
import lombok.Data;
import java.util.Date;
@@ -11,56 +12,20 @@
 * @date 2019/10/14 17:28
 */
@Data
public class LifeCycleDTO implements java.io.Serializable {
public class LifeCycleDTO extends LifeCycleRule {
    /**
     * ç¦æ­¢ä¿®æ”¹è¿™ä¸ªå€¼
     */
    private static final long serialVersionUID = -2896532706167604421L;
    /**
     * ä¸»é”®
     */
    private String oid;
    /**
     * èŠ‚ç‚¹
     */
    private List<LifeCycleNodeDTO> nodes;
    /**
     * ç”Ÿå‘½å‘¨æœŸç¼–号
     */
    private String id;
    /**
     * ç”Ÿå‘½å‘¨æœŸåç§°
     */
    private String name;
    /**
     * æè¿°
     */
    private String description;
    /**
     * èµ·å§‹çŠ¶æ€
     */
    private String startStatus;
    /**
     * èµ·å§‹çŠ¶æ€åç§°
     */
    private String startStatusName;
    /**
     * åœ¨æ‰«æçš„æ—¶å€™è®°å½•这个生命周期对应的类全路径
     */
    private String classFullName;
    /**
     * æ—¶é—´æˆ³ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss.SSS
     */
    private Date ts;
    /**
     * åŒ…含的连接线
     */
    private List<LifeCycleLineDTO> lineDTOList;
    /**
     * è¾¹ç•Œå’Œè¿žæŽ¥çº¿
     */
    private List<LifeCycleEdgeDTO> edges;
}
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleEdgeDTO.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package com.vci.ubcs.omd.dto;
import com.vci.ubcs.omd.entity.LifeCycleEdge;
import lombok.Data;
import java.util.List;
/**
 * ç”Ÿå‘½å‘¨æœŸå›¾ä¸Šçš„连接线等内容
 * @author weidy
 * @date 2023/6/15
 */
@Data
public class LifeCycleEdgeDTO extends LifeCycleEdge {
    /**
     * äº‹ä»¶
     */
    private List<LifeCycleLineEventDTO> events;
}
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleLineDTO.java
ÎļþÒÑɾ³ý
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleLineEventDTO.java
@@ -1,5 +1,6 @@
package com.vci.ubcs.omd.dto;
import com.vci.ubcs.omd.entity.LifeCycleLineEvent;
import lombok.Data;
import java.util.Date;
@@ -10,35 +11,12 @@
 * @date 2019/10/14 17:47
 */
@Data
public class LifeCycleLineEventDTO implements java.io.Serializable {
public class LifeCycleLineEventDTO extends LifeCycleLineEvent {
    /**
     * ç¦æ­¢ä¿®æ”¹è¿™ä¸ªå€¼
     */
    private static final long serialVersionUID = 6860210157516359420L;
    /**
     * ä¸»é”®
     */
    private String oid;
    /**
     * æ‰€å±žç”Ÿå‘½å‘¨æœŸè¿žæŽ¥çº¿ä¸»é”®
     */
    private String pkLifeCycleLine;
    /**
     * äº‹ä»¶çš„全路径
     */
    private String eventFullName;
    /**
     * äº‹ä»¶çš„名称
     */
    private String eventShowName;
    /**
     * æ—¶é—´æˆ³ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss.SSS
     */
    private Date ts;
}
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LifeCycleNodeDTO.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package com.vci.ubcs.omd.dto;
import com.alibaba.fastjson.annotation.JSONField;
import com.vci.ubcs.omd.entity.LifeCycleNode;
import lombok.Data;
/**
 * ç”Ÿå‘½å‘¨æœŸçš„节点的数据传输对象
 * @author weidy
 * @date 2023/6/15
 */
@Data
public class LifeCycleNodeDTO extends LifeCycleNode {
    /**
     * åºåˆ—化
     */
    private static final long serialVersionUID = -5906341589798877268L;
}
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEdge.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,63 @@
package com.vci.ubcs.omd.entity;
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
/**
 * ç”Ÿå‘½å‘¨æœŸçš„图的边界内容
 * @author weidy
 * @date 2023/6/15
 */
@Data
@TableName("pl_omd_life_cycle_edge")
@ApiModel(value = "生命周期的图的边界内容", description = "生命周期边界内容")
public class LifeCycleEdge extends BaseModel {
    /**
     * åºåˆ—化
     */
    private static final long serialVersionUID = -8998234372457685057L;
    /**
     * æ¥æºçŠ¶æ€
     */
    private String source;
    /**
     * æ¥æºçŠ¶æ€è¾¹ç•Œ
     */
    private String sourceAnchor;
    /**
     * ç›®æ ‡çŠ¶æ€
     */
    private String target;
    /**
     * ç›®æ ‡çŠ¶æ€è¾¹ç•Œ
     */
    private String targetAnchor;
    /**
     * çº¿çš„类型
     */
    private String shape;
    /**
     * è¿žæŽ¥çº¿çš„名称
     */
    private String name;
    /**
     * æŽ’序号
     */
    @JSONField(name = "index")
    private Integer indexNO;
    /**
     * æ‰€å±žç”Ÿå‘½å‘¨æœŸ
     */
    private String lifeCycleOid;
}
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEvent.java
@@ -1,12 +1,11 @@
package com.vci.ubcs.omd.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import java.util.Date;
/**
 * ç”Ÿå‘½å‘¨æœŸäº‹ä»¶é›†åˆ
@@ -17,18 +16,12 @@
@Data
@TableName("pl_omd_life_cycle_event")
@ApiModel(value = "生命周期事件集合", description = "生命周期事件集合")
public class LifeCycleEvent implements java.io.Serializable{
public class LifeCycleEvent extends BaseModel {
    /**
     * ç¦æ­¢ä¿®æ”¹è¿™ä¸ªå€¼
     */
    private static final long serialVersionUID = 6950469551222671511L;
    /**
     * ä¸»é”®
     */
    @TableId
    private String oid;
    /**
     * äº‹ä»¶çš„全路径
@@ -45,40 +38,9 @@
     */
    private String description;
    /**
     * ä¸šåŠ¡ç±»åž‹åç§°
     */
    private String btmname;
    /**
     * æ‹¥æœ‰è€…
     */
    private String owner;
    /**
     * åˆ›å»ºäºº
     */
    private String creator;
    /**
     * åˆ›å»ºæ—¶é—´
     */
    private Date createTime;
    /**
     * æœ€åŽä¿®æ”¹äºº
     */
    private String lastModifier;
    /**
     * æœ€åŽä¿®æ”¹æ—¶é—´ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss
     */
    private Date lastModifyTime;
    /**
     * æ—¶é—´æˆ³ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss.SSS
     */
    private Date ts;
    /**
     * æ‰€å±žé¢†åŸŸ
     */
    private String domain;
}
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLine.java
ÎļþÒÑɾ³ý
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLineEvent.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -17,22 +18,17 @@
@Data
@TableName("pl_omd_life_cycle_line_event")
@ApiModel(value = "生命周期状态连接线", description = "生命周期状态连接线")
public class LifeCycleLineEvent implements java.io.Serializable{
public class LifeCycleLineEvent extends BaseModel {
    /**
     * ç¦æ­¢ä¿®æ”¹è¿™ä¸ªå€¼
     */
    private static final long serialVersionUID = -842247029575668650L;
    /**
     * ä¸»é”®
     */
    @TableId
    private String oid;
    /**
     * æ‰€å±žç”Ÿå‘½å‘¨æœŸè¿žæŽ¥çº¿ä¸»é”®
     */
    private String pkLifeCycleLine;
    private String pkLifeCycleEdge;
    /**
     * äº‹ä»¶çš„全路径
@@ -49,40 +45,10 @@
     */
    private Integer orderNum;
    /**
     * æ‰€å±žé¢†åŸŸ
     */
    private String domain;
    /**
     * ä¸šåŠ¡ç±»åž‹åç§°
     */
    private String btmname;
    /**
     * æ‹¥æœ‰è€…
     */
    private String owner;
    /**
     * åˆ›å»ºäºº
     */
    private String creator;
    /**
     * åˆ›å»ºæ—¶é—´
     */
    private Date createTime;
    /**
     * æœ€åŽä¿®æ”¹äºº
     */
    private String lastModifier;
    /**
     * æœ€åŽä¿®æ”¹æ—¶é—´ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss
     */
    private Date lastModifyTime;
    /**
     * æ—¶é—´æˆ³ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss.SSS
     */
    private Date ts;
}
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleNode.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,64 @@
package com.vci.ubcs.omd.entity;
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
/**
 * @author weidy
 * @date 2023/6/15
 */
@Data
@TableName("pl_omd_life_cycle_node")
@ApiModel(value = "生命周期的节点内容", description = "生命周期节点")
public class LifeCycleNode extends BaseModel {
    /**
     * èŠ‚ç‚¹çš„å°ºå¯¸
     */
    @JSONField(name = "size")
    private String boxSize;
    /**
     * é¢œè‰²çš„æ˜¾ç¤º
     */
    private String color;
    /**
     * æ˜¾ç¤ºåç§°
     */
    private String name;
    /**
     * çŠ¶æ€æ ‡è¯†
     */
    private String id;
    /**
     * x轴的坐标
     */
    private String x;
    /**
     * y轴的坐标
     */
    private String y;
    /**
     * æŽ’序号
     */
    @JSONField(name = "index")
    private Integer indexNO;
    /**
     * çº¿çš„类型
     */
    private String shape;
    /**
     * æ‰€å±žç”Ÿå‘½å‘¨æœŸ
     */
    private String lifeCycleOid;
}
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleRule.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -17,18 +18,13 @@
@Data
@TableName("pl_omd_life_cycle_rule")
@ApiModel(value = "生命周期规则", description = "生命周期规则")
public class LifeCycleRule implements java.io.Serializable {
public class LifeCycleRule extends BaseModel {
    /**
     * ç¦æ­¢ä¿®æ”¹è¿™ä¸ªå€¼
     */
    private static final long serialVersionUID = 1476717511843047292L;
    /**
     * ä¸»é”®
     */
    @TableId
    private String oid;
    /**
     * ç”Ÿå‘½å‘¨æœŸç¼–号
@@ -54,44 +50,5 @@
     * èµ·å§‹çŠ¶æ€åç§°
     */
    private String startStatusName;
    /**
     * ç±»çš„全路径
     */
    private String classFullName;
    /**
     * ä¸šåŠ¡ç±»åž‹åç§°
     */
    private String btmName;
    /**
     * æ‹¥æœ‰è€…
     */
    private String owner;
    /**
     * åˆ›å»ºäºº
     */
    private String creator;
    /**
     * åˆ›å»ºæ—¶é—´
     */
    private Date createTime;
    /**
     * æœ€åŽä¿®æ”¹äºº
     */
    private String lastModifier;
    /**
     * æœ€åŽä¿®æ”¹æ—¶é—´ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss
     */
    private Date lastModifyTime;
    /**
     * æ—¶é—´æˆ³ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss.SSS
     */
    private Date ts;
}
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleEdgeVO.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,20 @@
package com.vci.ubcs.omd.vo;
import com.vci.ubcs.omd.entity.LifeCycleEdge;
import lombok.Data;
import java.util.List;
/**
 * ç”Ÿå‘½å‘¨æœŸè¿žæŽ¥çº¿
 * @author weidy
 * @date 2023/6/15
 */
@Data
public class LifeCycleEdgeVO extends LifeCycleEdge {
    /**
     * äº‹ä»¶
     */
    private List<LifeCycleLineEventVO> events;
}
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleEventVO.java
@@ -1,5 +1,6 @@
package com.vci.ubcs.omd.vo;
import com.vci.ubcs.omd.entity.LifeCycleEvent;
import lombok.Data;
import java.util.Date;
@@ -10,65 +11,11 @@
 * @date 2023/4/3
 */
@Data
public class LifeCycleEventVO implements java.io.Serializable{
public class LifeCycleEventVO extends LifeCycleEvent {
    /**
     * ç¦æ­¢ä¿®æ”¹è¿™ä¸ªå€¼
     */
    private static final long serialVersionUID = 8503381504954264216L;
    /**
     * ä¸»é”®
     */
    private String oid;
    /**
     * äº‹ä»¶çš„全路径
     */
    private String eventFullName;
    /**
     * äº‹ä»¶çš„名称
     */
    private String eventShowName;
    /**
     * äº‹ä»¶æè¿°
     */
    private String description;
    /**
     * ä¸šåŠ¡ç±»åž‹åç§°
     */
    private String btmname;
    /**
     * æ‹¥æœ‰è€…
     */
    private String owner;
    /**
     * åˆ›å»ºäºº
     */
    private String creator;
    /**
     * åˆ›å»ºæ—¶é—´
     */
    private Date createTime;
    /**
     * æœ€åŽä¿®æ”¹äºº
     */
    private String lastModifier;
    /**
     * æœ€åŽä¿®æ”¹æ—¶é—´ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss
     */
    private Date lastModifyTime;
    /**
     * æ—¶é—´æˆ³ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss.SSS
     */
    private Date ts;
}
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineEventVO.java
@@ -1,6 +1,7 @@
package com.vci.ubcs.omd.vo;
import com.vci.ubcs.omd.entity.LifeCycleLineEvent;
import lombok.Data;
import java.util.Date;
@@ -11,70 +12,11 @@
 * @date 2023/4/3
 */
@Data
public class LifeCycleLineEventVO implements java.io.Serializable{
public class LifeCycleLineEventVO extends LifeCycleLineEvent {
    /**
     * ç¦æ­¢ä¿®æ”¹è¿™ä¸ªå€¼
     */
    private static final long serialVersionUID = 216430078444875215L;
    /**
     * ä¸»é”®
     */
    private String oid;
    /**
     * æ‰€å±žç”Ÿå‘½å‘¨æœŸè¿žæŽ¥çº¿ä¸»é”®
     */
    private String pkLifeCycleLine;
    /**
     * äº‹ä»¶çš„全路径
     */
    private String eventFullName;
    /**
     * äº‹ä»¶çš„名称
     */
    private String eventShowName;
    /**
     * æŽ’序号
     */
    private Integer orderNum;
    /**
     * ä¸šåŠ¡ç±»åž‹åç§°
     */
    private String btmname;
    /**
     * æ‹¥æœ‰è€…
     */
    private String owner;
    /**
     * åˆ›å»ºäºº
     */
    private String creator;
    /**
     * åˆ›å»ºæ—¶é—´
     */
    private Date createTime;
    /**
     * æœ€åŽä¿®æ”¹äºº
     */
    private String lastModifier;
    /**
     * æœ€åŽä¿®æ”¹æ—¶é—´ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss
     */
    private Date lastModifyTime;
    /**
     * æ—¶é—´æˆ³ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss.SSS
     */
    private Date ts;
}
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleLineVO.java
ÎļþÒÑɾ³ý
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleNodeVO.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package com.vci.ubcs.omd.vo;
import com.vci.ubcs.omd.entity.LifeCycleNode;
import lombok.Data;
/**
 * ç”Ÿå‘½å‘¨æœŸèŠ‚ç‚¹çš„æ˜¾ç¤ºå¯¹è±¡
 * @author weidy
 * @date 2023/6/15
 */
@Data
public class LifeCycleNodeVO extends LifeCycleNode {
    /**
     * åºåˆ—化
     */
    private static final long serialVersionUID = -3685497665145192869L;
}
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/LifeCycleVO.java
@@ -1,5 +1,6 @@
package com.vci.ubcs.omd.vo;
import com.vci.ubcs.omd.entity.LifeCycleRule;
import lombok.Data;
import java.util.Date;
@@ -11,85 +12,20 @@
 * @date 2023/4/3
 */
@Data
public class LifeCycleVO implements java.io.Serializable{
public class LifeCycleVO extends LifeCycleRule {
    /**
     * ç¦æ­¢ä¿®æ”¹è¿™ä¸ªå€¼
     */
    private static final long serialVersionUID = 5567711696707791107L;
    /**
     * ä¸»é”®
     */
    private String oid;
    /**
     * èŠ‚ç‚¹
     */
    private List<LifeCycleNodeVO> nodes;
    /**
     * ç”Ÿå‘½å‘¨æœŸç¼–号
     */
    private String id;
    /**
     * ç”Ÿå‘½å‘¨æœŸåç§°
     */
    private String name;
    /**
     * æè¿°
     */
    private String description;
    /**
     * ç±»çš„全路径
     */
    private String classFullName;
    /**
     * èµ·å§‹çŠ¶æ€
     */
    private String startStatus;
    /**
     * èµ·å§‹çŠ¶æ€åç§°
     */
    private String startStatusName;
    /**
     * ä¸šåŠ¡ç±»åž‹åç§°
     */
    private String btmname;
    /**
     * æ‹¥æœ‰è€…
     */
    private String owner;
    /**
     * åˆ›å»ºäºº
     */
    private String creator;
    /**
     * åˆ›å»ºæ—¶é—´
     */
    private Date createTime;
    /**
     * æœ€åŽä¿®æ”¹äºº
     */
    private String lastModifier;
    /**
     * æœ€åŽä¿®æ”¹æ—¶é—´ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss
     */
    private Date lastModifyTime;
    /**
     * æ—¶é—´æˆ³ï¼Œæ ¼å¼æ˜¯yyyy-MM-dd HH:mm:ss.SSS
     */
    private Date ts;
    /**
     * åŒ…含连接线
     */
    private List<LifeCycleLineVO> lines;
    /**
     * è¿žæŽ¥çº¿
     */
    private List<LifeCycleEdgeVO> edges;
}
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/constant/CodeTableNameConstant.java
@@ -122,4 +122,10 @@
     */
    public static final String PL_CODE_SYSINTINFO = "PL_CODE_SYSINTINFO";
    /**
     * é›†æˆæŽ¥å£-集成接口管理对象
     * platformbtm_sysintparemter
     */
    public static final String PL_CODE_SYSINTPAREMTER = "PL_CODE_SYSINTPAREMTER";
}
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
@@ -96,13 +96,16 @@
        try {
            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            baseModel.setOid(dataMap.getOrDefault("OID",""));
            String createTime=dataMap.getOrDefault("CREATETIME","");
            Object createTimeObj=dataMap.getOrDefault("CREATETIME","");
            String createTime= createTimeObj.toString();
            baseModel.setCreateTime(chageStringToDate(createTime));
            baseModel.setNameOid(dataMap.getOrDefault("NAMEOID",""));
            String lastModifyTime=dataMap.getOrDefault("LASTMODIFYTIME","");
            Object lastModifyTimeObj=dataMap.getOrDefault("LASTMODIFYTIME","");
            String lastModifyTime= lastModifyTimeObj.toString();
            baseModel.setLastModifyTime(chageStringToDate(lastModifyTime));
            String ts=dataMap.getOrDefault("TS","");
            Object tsObj=dataMap.getOrDefault("TS","");
            String ts= tsObj.toString();
            baseModel.setTs(chageStringToDate(ts));
            baseModel.setRevisionOid(dataMap.getOrDefault("REVISIONOID",""));
            //用户id
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.code.dto.DockingSystemConfigDTO;
import com.vci.ubcs.code.dto.DockingSystemDTO;
import com.vci.ubcs.code.entity.CodeRule;
import com.vci.ubcs.code.entity.DockingSystem;
@@ -51,7 +52,7 @@
     * @param dockingSystem åŸºç¡€æŸ¥è¯¢å¯¹è±¡ï¼ŒåŒ…含查询条件,分页,排序等
     *@return ç³»ç»Ÿé›†æˆçš„系统信息显示对象列表
     */
    @GetMapping("/gridSysIntBase")
    @GetMapping("/gridDockingSystem")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "dockingSystem")
    public R<IPage<DockingSystemVO>> page(DockingSystem dockingSystem, Query query) {
@@ -64,8 +65,8 @@
     * @param dockingSystemDTO ç³»ç»Ÿé›†æˆçš„系统信息数据传输对象
     * @return æ‰§è¡Œç»“果,success为true表示成功,msg是失败的提示信息,obj是添加完成后的显示对象
     */
    @PostMapping( "/addSave")
    public  R<DockingSystemVO> addSave(@RequestBody DockingSystemDTO dockingSystemDTO){
    @PostMapping( "/addSaveDockingSystem")
    public  R<DockingSystemVO> addSaveDockingSystem(@RequestBody DockingSystemDTO dockingSystemDTO){
        boolean res= dockingSystemService.addSave(dockingSystemDTO);
        return  R.status(res);
    }
@@ -76,8 +77,8 @@
     * @param dockingSystemDTO ç³»ç»Ÿé›†æˆçš„系统信息数据传输对象
     * @return æ‰§è¡Œç»“果,success为true表示成功,msg是失败的提示信息,obj是添加完成后的显示对象
     */
    @PutMapping("/editSave")
    public R<DockingSystemVO> editSave(@RequestBody DockingSystemDTO dockingSystemDTO){
    @PutMapping("/editSaveDockingSystem")
    public R<DockingSystemVO> editSaveDockingSystem(@RequestBody DockingSystemDTO dockingSystemDTO){
        DockingSystemVO dockingSystemVO = dockingSystemService.editSave(dockingSystemDTO);
        return R.data(dockingSystemVO);
    }
@@ -102,12 +103,26 @@
     * @param DockingSystemConfig åŸºç¡€æŸ¥è¯¢å¯¹è±¡ï¼ŒåŒ…含查询条件,分页,排序等
     * @return ç³»ç»Ÿé›†æˆåŸºç¡€ä¿¡æ¯æ˜¾ç¤ºå¯¹è±¡åˆ—表
     */
    @GetMapping("/gridSysIntInfo")
    @GetMapping("/gridSystemConfig")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "分页", notes = "DockingSystemConfig")
    public R<IPage<DockingSystemConfigVO>> gridSysIntInfo(DockingSystemConfig DockingSystemConfig, Query query){
    public R<IPage<DockingSystemConfigVO>> gridSystemConfig(DockingSystemConfig DockingSystemConfig, Query query){
        IPage<DockingSystemConfig> pages = dockingSystemConfigService.page(Condition.getPage(query), Condition.getQueryWrapper(DockingSystemConfig));
        return R.data(DockingSystemConfigWrapper.build().pageVO(pages));
    }
    /**
     * å¢žåŠ  ç³»ç»Ÿé›†æˆåŸºç¡€ä¿¡æ¯
     * @param systemConfigDTO ç³»ç»Ÿé›†æˆåŸºç¡€ä¿¡æ¯æ•°æ®ä¼ è¾“对象
     * @return æ‰§è¡Œç»“果,success为true表示成功,msg是失败的提示信息,obj是添加完成后的显示对象
     */
    @PostMapping( "/addSaveSystemConfig")
    public R addSaveSystemConfig(@RequestBody DockingSystemConfigDTO systemConfigDTO){
        try {
            boolean res =  dockingSystemConfigService.addSave(systemConfigDTO);
            return R.success("保存成功!");
        }catch (Throwable e){
            return R.fail("保存失败!");
        }
    }
}
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.alibaba.nacos.common.utils.StringUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vci.ubcs.code.dto.CodeDeleteBatchDTO;
import com.vci.ubcs.code.dto.CodeOrderDTO;
import com.vci.ubcs.code.dto.CodeOrderSecDTO;
@@ -10,6 +11,7 @@
import com.vci.ubcs.code.service.MdmEngineService;
import com.vci.ubcs.code.service.MdmIOService;
import com.vci.ubcs.code.vo.pagemodel.*;
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.starter.annotation.VciBusinessLog;
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
@@ -693,8 +695,8 @@
     * @return æ‰§è¡Œçš„结果
     */
    @GetMapping("/defaultReferDataGrid")
    public DataGrid defaultReferDataGrid(UIFormReferVO referConfigVO, PageHelper pageHelper){
        return engineService.referDataGrid(referConfigVO,pageHelper);
    public Page<BtmTypeVO>  defaultReferDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject){
        return engineService.referDataGrid(referConfigVO,baseQueryObject);
    }
    /**
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingSysIntHeaderMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
package com.vci.ubcs.code.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.vci.ubcs.code.entity.DockingSysIntHeader;
public interface DockingSysIntHeaderMapper extends BaseMapper<DockingSysIntHeader> {
}
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingSysIntParamMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
package com.vci.ubcs.code.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.vci.ubcs.code.entity.DockingSysIntParam;
public interface DockingSysIntParamMapper extends BaseMapper<DockingSysIntParam> {
}
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSysIntHeaderService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,7 @@
package com.vci.ubcs.code.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.vci.ubcs.code.entity.DockingSysIntHeader;
public interface IDockingSysIntHeaderService extends IService<DockingSysIntHeader> {
}
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSysIntParamService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,8 @@
package com.vci.ubcs.code.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.vci.ubcs.code.entity.DockingSysIntParam;
public interface IDockingSysIntParamService extends IService<DockingSysIntParam> {
}
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java
@@ -1,8 +1,9 @@
package com.vci.ubcs.code.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.vci.ubcs.code.entity.DockingSystem;
import com.vci.ubcs.code.dto.DockingSystemConfigDTO;
import com.vci.ubcs.code.entity.DockingSystemConfig;
import com.vci.ubcs.code.vo.pagemodel.DockingSystemVO;
/***
 * ç³»ç»ŸæŽ¥å£ç®¡ç†-接口配置服务
@@ -10,4 +11,20 @@
 * @date 2023-06-01
 */
public interface IDockingSystemConfigService extends IService<DockingSystemConfig> {
    /**
     * å¢žåŠ  ç³»ç»Ÿé›†æˆçš„æŽ¥å£ç®¡ç†ä¿¡æ¯
     * @param dockingSystemConfigDTO ç³»ç»Ÿé›†æˆçš„系统信息数据传输对象
     * @return æ‰§è¡Œç»“果,success为true表示成功,msg是失败的提示信息,obj是添加完成后的显示对象
     */
    public boolean addSave(DockingSystemConfigDTO dockingSystemConfigDTO);
    /**
     * ä¿®æ”¹ ç³»ç»Ÿé›†æˆçš„æŽ¥å£ç®¡ç†ä¿¡æ¯
     * @param dockingSystemConfigDTO ç³»ç»Ÿé›†æˆçš„系统信息数据传输对象
     * @return æ‰§è¡Œç»“果,success为true表示成功,msg是失败的提示信息,obj是添加完成后的显示对象
     */
    DockingSystemVO editSave(DockingSystemConfigDTO dockingSystemConfigDTO);
    boolean deleteDataById(String oids);
}
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java
@@ -1,6 +1,7 @@
package com.vci.ubcs.code.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
import com.vci.ubcs.code.bo.CodeTemplateAttrSqlBO;
@@ -11,15 +12,13 @@
import com.vci.ubcs.code.vo.CodeKeyAttrRepeatVO;
import com.vci.ubcs.code.vo.pagemodel.UITableFieldVO;
import com.vci.ubcs.code.vo.pagemodel.*;
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.web.pagemodel.*;
import com.vci.ubcs.starter.web.util.VciQueryWrapperForDO;
import org.springblade.core.tool.api.R;
import java.beans.IntrospectionException;
import java.lang.reflect.InvocationTargetException;
import java.sql.SQLException;
import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -400,10 +399,9 @@
    /**
     * é»˜è®¤åˆ—表
     * @param referConfigVO
     * @param pageHelper
     * @return
     */
    DataGrid referDataGrid(UIFormReferVO referConfigVO, PageHelper pageHelper);
    Page<BtmTypeVO> referDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject);
    /**
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
@@ -1,10 +1,18 @@
package com.vci.ubcs.code.service.impl;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.vci.ubcs.code.entity.DockingSystem;
import com.vci.ubcs.code.service.ICodeDuckingSyncService;
import com.vci.ubcs.code.service.IDockingSystemService;
import lombok.extern.slf4j.Slf4j;
import org.springblade.core.tool.api.R;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.util.*;
import java.util.stream.Collectors;
/*
@@ -17,9 +25,16 @@
@Slf4j
public class CodeDuckingSyncServiceImpl implements ICodeDuckingSyncService {
    @Resource
    private  IDockingSystemService dockingSystemService;
    @Override
    public void DockingDataSyncScheduing() {
// insertCache2();
        initPushDataTaks(1);
        //sendpushDataForService();
    }
@@ -32,5 +47,122 @@
    public R sendData(String oids) {
        return null;
    }
    /***
     * æŸ¥è¯¢redis中数据,对比后插入dockingtask
     * @param type
     */
    private void initPushDataTaks(int type){
//        //initSysadmin();
//        //sysintinfo查询要推送的主题库和相关系统信息
//        Map<String, String> conditionMap = new HashMap<>();
//        conditionMap.put("usedflag","true");
//        conditionMap.put("pushType",type==2?"2":"1") ;//2是代表分类推送,1是代表数据推送
//
//        Wrappers wrappers=new Wrappers();
//
//        List<DockingSystem> sysIntInfoVOList = dockingSystemService.list(Wrappers.query().lambda().eq());
//        if(CollectionUtils.isEmpty(sysIntInfoVOList)){
//            String title=type==2?"分类推送":"数据推送";
//            log.info("info->所有集成系统,未查询到相关的【"+title+"】的接口配置信息,配置");
//            return;
//        }
//        Map<String ,List<DockingSystem>> sysIntInfoDOMap = new HashMap<String ,List<DockingSystem>>();//key=classifyoid,value=list<map>
//        for (SysIntInfoDO sysIntInfoVOi:sysIntInfoVOList){
//            List<SysIntInfoDO> SysIntInfoVOListi = sysIntInfoDOMap.get(sysIntInfoVOi.getClassifyoid());
//            if(SysIntInfoVOListi==null){
//                SysIntInfoVOListi = new ArrayList<SysIntInfoDO>();
//            }
//            SysIntInfoVOListi.add(sysIntInfoVOi);
//            sysIntInfoDOMap.put(sysIntInfoVOi.getClassifyoid(),SysIntInfoVOListi);
//        }
//        //根据类型去查询需要集成的分类或者数据
//        VciQueryWrapperForDO queryWrapperForDO = new VciQueryWrapperForDO(DockingDataDO.class);
//        queryWrapperForDO.addQueryMap("sendflag","false");
//        if(type==2){
//            queryWrapperForDO.addQueryMap("btmTypeId",DOCKING_DEFAULT_CLASSIFY.toLowerCase(Locale.ROOT));
//        }else {
//            queryWrapperForDO.addQueryMap("btmTypeId", QueryOptionConstant.NOTIN + "(" + VciBaseUtil.toInSql(DOCKING_DEFAULT_CLASSIFY.toLowerCase(Locale.ROOT)) + ")");
//        }
//        List<DockingDataDO> dataList = dockingDataDaoI.selectByWrapper(queryWrapperForDO);
//
//        for (DockingDataDO mapi:dataList){
//            WebUtil.setPersistence(false);
//            BatchCBO batchCBO = new BatchCBO();
//            String dataoid = mapi.getOid();//data对象的oid
//            String classifyoid = mapi.getClassifyoid();
//            String id = mapi.getId();
//            String uniquecode = mapi.getUniquecode();
//            String btmid = mapi.getBtmid();
//            String btmoid = mapi.getBtmoid();
//            String sendtype = mapi.getSendtype();
//            String classifyid = mapi.getClassifyid();
//            String classifyname = mapi.getClassifyname();
//            String curentClassOid=null;
//            if(type==2){
//                curentClassOid=btmoid;
//            }else{
//                curentClassOid=classifyoid;
//            }
//            List<SysIntInfoDO> effectiveSysIntInfoVOs=new ArrayList<>();
//            //根据当前数据的id,查询获取哪些系统需要做集成
//            List<CodeClassifyDO> parentLeveDO= codeClassifyDaoI.selectAllLevelParentByOid(curentClassOid);
//            if(CollectionUtils.isEmpty(parentLeveDO)){
//                continue;//说明这个分类被删掉了,不做处理
//            }
//            Map<String, CodeClassifyDO> oidCodeclassifyDOMap = parentLeveDO.stream().filter(codeClassifyDO -> codeClassifyDO != null && StringUtils.isNotBlank(codeClassifyDO.getOid())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getOid(), t -> t));
//
//            oidCodeclassifyDOMap.keySet().forEach(oid->{
//                if(sysIntInfoDOMap.containsKey(oid)){
//                    List<SysIntInfoDO> sysIntInfoDOS= sysIntInfoDOMap.get(oid);
//                    effectiveSysIntInfoVOs.addAll(sysIntInfoDOS);
//                }
//            });
//            //如果校验的系统接口信息不存在,则数据不不往信息里推送
//            if(CollectionUtils.isEmpty(effectiveSysIntInfoVOs)){
//                continue;
//            }
//            List<DockingTaskDO> dockingTaskDO_insert = new ArrayList<DockingTaskDO>();
//            for (SysIntInfoDO sysIntInfoVOi:effectiveSysIntInfoVOs){
//                DockingTaskDO dockingTaskDO = new DockingTaskDO();
//                dockingTaskDO.setOid(redisService.getUUIDEveryDay());
//                dockingTaskDO.setSendflag(SEND_FLAG_FALSE);
//                dockingTaskDO.setId(id);//编码
//                dockingTaskDO.setUniquecode(uniquecode);
//                dockingTaskDO.setBtmoid(btmoid);//数据oid
//                dockingTaskDO.setBtmid(btmid);//数据业务类型id
//                dockingTaskDO.setClassifyid(classifyid);//数据在分类id
//                dockingTaskDO.setClassifyoid(classifyoid);//数据所在分类oid
//                dockingTaskDO.setClassifyname(classifyname);//数据所在分类名称
//                dockingTaskDO.setSendtype(sendtype);//数据推送类型
//                dockingTaskDO.setDataoid(dataoid);
//
//                //intinfo
//                dockingTaskDO.setSysinfooid(sysIntInfoVOi.getOid());//intinfo的oid
//                dockingTaskDO.setSystemoid(sysIntInfoVOi.getSysbaseoid());//系统oid
//                dockingTaskDO.setSystemcode(sysIntInfoVOi.getSysbaseid());//系统编码
//                dockingTaskDO.setSystemname(sysIntInfoVOi.getSysbasename());//系统name
//                dockingTaskDO_insert.add(dockingTaskDO);
//            }
//
//            BatchCBO bi = null;
//            if(dockingTaskDO_insert.size()!=0) {
//                bi = dockingTaskDaoI.batchInsert(dockingTaskDO_insert);
//                batchCBO.copyFromOther(bi);
//            }
//            WebUtil.setPersistence(true);
//            boService.persistenceBatch(batchCBO);
//            //dockingTaskDaoI.updateByPrimaryKey方法报错了,所以手写了这个
//            boolean u = updateDockingDatasSendFlag(dataoid,SEND_FLAG_TRUE);
//            if(!u){
//                log.error("集成data分解任务失败!dataoid:"+dataoid);
//                continue;
//            }
//
//        }
    }
}
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSysIntHeaderServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
package com.vci.ubcs.code.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.code.entity.DockingSysIntHeader;
import com.vci.ubcs.code.mapper.DockingSysIntHeaderMapper;
import com.vci.ubcs.code.service.IDockingSysIntHeaderService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@Slf4j
@Service
public class DockingSysIntHeaderServiceImpl  extends ServiceImpl<DockingSysIntHeaderMapper, DockingSysIntHeader> implements IDockingSysIntHeaderService {
}
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSysIntParamServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,13 @@
package com.vci.ubcs.code.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.code.entity.DockingSysIntParam;
import com.vci.ubcs.code.mapper.DockingSysIntParamMapper;
import com.vci.ubcs.code.service.IDockingSysIntParamService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@Slf4j
@Service
public class DockingSysIntParamServiceImpl extends ServiceImpl<DockingSysIntParamMapper, DockingSysIntParam> implements IDockingSysIntParamService {
}
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
@@ -1,23 +1,156 @@
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.constant.MdmBtmTypeConstant;
import com.vci.ubcs.code.dto.DockingSysIntHeaderDTO;
import com.vci.ubcs.code.dto.DockingSystemConfigDTO;
import com.vci.ubcs.code.dto.DockingSysIntParamDTO;
import com.vci.ubcs.code.entity.DockingSysIntHeader;
import com.vci.ubcs.code.entity.DockingSysIntParam;
import com.vci.ubcs.code.entity.DockingSystem;
import com.vci.ubcs.code.entity.DockingSystemConfig;
import com.vci.ubcs.code.enumpack.SysIntegrationRequestTypeEnum;
import com.vci.ubcs.code.mapper.DockingSysIntHeaderMapper;
import com.vci.ubcs.code.mapper.DockingSysIntParamMapper;
import com.vci.ubcs.code.mapper.DockingSystemConfigMapper;
import com.vci.ubcs.code.mapper.DockingSystemMapper;
import com.vci.ubcs.code.service.IDockingSysIntHeaderService;
import com.vci.ubcs.code.service.IDockingSysIntParamService;
import com.vci.ubcs.code.service.IDockingSystemConfigService;
import com.vci.ubcs.code.vo.pagemodel.DockingSysIntHeaderVO;
import com.vci.ubcs.code.vo.pagemodel.DockingSystemVO;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import java.util.Collection;
import java.util.Map;
import java.util.function.Function;
import java.util.*;
/***
 * ç³»ç»ŸæŽ¥å£ç®¡ç†-接口配置服务
 * @author xiejun
 * @date 2023-06-01
 */
@Slf4j
@Service
public class DockingSystemConfigServiceImpl extends ServiceImpl<DockingSystemConfigMapper, DockingSystemConfig> implements IDockingSystemConfigService{
    /***
     * é›†æˆç³»ç»Ÿç®¡ç†æœåŠ¡
     */
    @Autowired(required = false)
    private DockingSystemConfigMapper dockingSystemConfigMapper;
    /***
     * é›†æˆæŽ¥å£-集成接口管理参数服务
     */
    @Autowired(required = false)
    private IDockingSysIntParamService dockingSysIntParamService;
    /***
     * é›†æˆæŽ¥å£-集成接口管理参数服务
     */
    @Autowired(required = false)
    private IDockingSysIntHeaderService dockingSysIntHeaderService;
    /***
     * é›†æˆæŽ¥å£-集成系统服务
     */
    @Autowired(required = false)
    private DockingSystemMapper dockingSystemMapper;
    /**
     * å¯¹è±¡çš„æ“ä½œ
     */
    @Autowired
    private RevisionModelUtil revisionModelUtil;
    /**
     * å¢žåŠ ç³»ç»Ÿé›†æˆçš„æŽ¥å£ç®¡ç†ä¿¡æ¯
     * @param dockingSystemConfigDTO ç³»ç»Ÿé›†æˆçš„系统信息数据传输对象
     * @return æ‰§è¡Œç»“果,success为true表示成功,msg是失败的提示信息,obj是添加完成后的显示对象
     */
    @Transactional(rollbackFor = Exception.class)
    @Override
    public boolean addSave(DockingSystemConfigDTO dockingSystemConfigDTO) {
        log.info(" å¢žåŠ ç³»ç»Ÿé›†æˆçš„æŽ¥å£ç®¡ç†ä¿¡æ¯:"+dockingSystemConfigDTO.toString());
        VciBaseUtil.alertNotNull(dockingSystemConfigDTO, "需要添加的数据对象");
        checkColumnNotNull(dockingSystemConfigDTO);
        String sourcesystemoid = dockingSystemConfigDTO.getSourceSystemOid();
        DockingSystem dockingSystem = dockingSystemMapper.selectById(sourcesystemoid);
        dockingSystemConfigDTO.setSysBaseOid(sourcesystemoid);
        dockingSystemConfigDTO.setSysBaseId(dockingSystem.getId());
        dockingSystemConfigDTO.setSysBaseName(dockingSystem.getName());
        dockingSystemConfigDTO.setUsedFlag("true");//设置默认启用状态
        //将DTO转换为DO
        DockingSystemConfig dockingSystemConfig = new DockingSystemConfig();
        revisionModelUtil.copyFromDTOIgnore(dockingSystemConfigDTO,dockingSystemConfig);
        List<DockingSysIntParamDTO> sysIntParamDTOList=  dockingSystemConfigDTO.getSysIntParamDTOS();
        List<DockingSysIntParam> sysIntParamList=new ArrayList<>();
        if(!CollectionUtils.isEmpty(sysIntParamDTOList)) {
            sysIntParamDTOList.stream().forEach(sysIntParamDTO -> {
                DockingSysIntParam sysIntParamDO = new DockingSysIntParam();
                sysIntParamDTO.setInfoOid(dockingSystemConfigDTO.getOid());
                BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntParamDTO, sysIntParamDO);
                DefaultAttrAssimtUtil.addDefaultAttrAssimt(sysIntParamDO,MdmBtmTypeConstant.SYS_INT_PARAMTERY);
                sysIntParamList.add(sysIntParamDO);
            });
        }
        List<DockingSysIntHeaderDTO> sysIntHeaderDTOs= dockingSystemConfigDTO.getSysIntHeaderDTOS();
        List<DockingSysIntHeader> sysIntHeaderList = new ArrayList<>();
        if(!CollectionUtils.isEmpty(sysIntHeaderDTOs)) {
            sysIntHeaderDTOs.stream().forEach(sysIntHeaderDTO -> {
                DockingSysIntHeader dockingSysIntHeader = new DockingSysIntHeader();
                sysIntHeaderDTO.setInfoOid(dockingSystemConfigDTO.getOid());
                BeanUtilForVCI.copyPropertiesIgnoreCase(sysIntHeaderDTO, dockingSysIntHeader);
                DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingSysIntHeader,MdmBtmTypeConstant.SYS_INT_HEADER);
                sysIntHeaderList.add(dockingSysIntHeader);
            });
        }
        dockingSysIntParamService.saveBatch(sysIntParamList);
        dockingSysIntHeaderService.saveBatch(sysIntHeaderList);
        DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingSystemConfig,MdmBtmTypeConstant.SYS_INT_INFO);
        dockingSystemConfigMapper.insert(dockingSystemConfig);
        return true;
    }
    @Override
    public DockingSystemVO editSave(DockingSystemConfigDTO dockingSystemDTO) {
        return null;
    }
    @Override
    public boolean deleteDataById(String oids) {
        return false;
    }
    /**
     * ç³»ç»Ÿé›†æˆæŽ¥å£åŸºç¡€ä¿¡æ¯Null字段检验
     * @param dockingSystemConfigDTO ç³»ç»Ÿé›†æˆåŸºç¡€ä¿¡æ¯æ•°æ®ä¼ è¾“对象
     * @throws VciBaseException å‚数为空,唯一项,必输项不通过时会抛出异常
     */
    private void checkColumnNotNull(DockingSystemConfigDTO  dockingSystemConfigDTO) throws VciBaseException {
        if (SysIntegrationRequestTypeEnum.HTTP.getValue().equals(dockingSystemConfigDTO.getInterfaceType())){
            VciBaseUtil.alertNotNull(dockingSystemConfigDTO.getRequestUrl(),"HTTP接口的请求地址",dockingSystemConfigDTO.getRequestMethod(),"HTTP接口的请求方式");
        }
        if (SysIntegrationRequestTypeEnum.WEB_SERVICE.getValue().equals(dockingSystemConfigDTO.getInterfaceType())){
            VciBaseUtil.alertNotNull(dockingSystemConfigDTO.getInterfaceFunction(),"WebService的接口函数");
        }
        if (SysIntegrationRequestTypeEnum.CLASSPATH.getValue().equals(dockingSystemConfigDTO.getInterfaceType())){
            VciBaseUtil.alertNotNull(dockingSystemConfigDTO.getClassPath(),"类路径");
        }
    }
}
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingTaskServiceImpl.java
@@ -1,9 +1,7 @@
package com.vci.ubcs.code.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.code.entity.CodeClassifyValue;
import com.vci.ubcs.code.entity.DockingTask;
import com.vci.ubcs.code.mapper.CodeClassifyValueMapper;
import com.vci.ubcs.code.mapper.DockingTaskMapper;
import com.vci.ubcs.code.service.IDockingTaskService;
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
@@ -55,6 +56,7 @@
import org.slf4j.LoggerFactory;
import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.launch.constant.AppConstant;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DateUtil;
@@ -77,7 +79,6 @@
import java.time.ZonedDateTime;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import static com.vci.ubcs.code.constant.FrameWorkLangCodeConstant.DATA_OID_NOT_EXIST;
@@ -138,6 +139,15 @@
     */
    @Autowired
    private FormulaServiceImpl formulaService;
    /**
     *  å¯¹omd中提供的feign接口进行调用,以及处理相关逻辑
     */
    @Autowired
    ICodeReferBtmTypeService codeReferBtmTypeService;
    /**
     * ç›¸ä¼¼é¡¹æŸ¥è¯¢è§„则
@@ -1729,9 +1739,9 @@
                String field = UBCSSqlKeyword.getColumn(key, "_like");
                if (referFieldMap.containsKey(field)) {
                    //说明还是参照里面的,我们默认这种情况下都是字符串吧,因为参照的属性不一定用的平台的属性池里的,所以大部分情况下,显示的属性都是字符串吧
                    return referFieldMap.get(field) + SPACE + "LIKE" + SPACE + "%" + value + "%)" + SPACE;
                    return referFieldMap.get(field) + SPACE + "LIKE" + SPACE + "'%" + value + "%'" + SPACE;
                } else {
                    return (field.contains(".") ? "" : "t.") + field + SPACE + "LIKE " + "%" + getStringValueInWhere(field, value, attrVOMap) + "%)" + SPACE;
                    return (field.contains(".") ? "" : "t.") + field + SPACE + "LIKE " + "'%" + getStringValueInWhere(field, value, attrVOMap) + "%'" + SPACE;
                }
            } else if (key.endsWith("_notequal")) {
                String field = UBCSSqlKeyword.getColumn(key, "_notequal");
@@ -1849,9 +1859,9 @@
            }else if(key.endsWith("_equal")) {
                String field = UBCSSqlKeyword.getColumn(key, "_equal");
                if (referFieldMap.containsKey(field)) {
                    return referFieldMap.get(field) + SPACE + "= " + value + SPACE;
                    return referFieldMap.get(field) + SPACE + "= '" + value + "'" + SPACE;
                } else {
                    return (field.contains(".") ? "" : "t.") + field + SPACE + "= " + getStringValueInWhere(field, value, attrVOMap) + SPACE;
                    return (field.contains(".") ? "" : "t.") + field + SPACE + "= '" + getStringValueInWhere(field, value, attrVOMap) + "'"  + SPACE;
                }
            }else {
                if (referFieldMap.containsKey(key)) {
@@ -1914,7 +1924,7 @@
            }
            if (field.contains(".") && attrVOMap != null && attrVOMap.containsKey(field.split("\\.")[0].toLowerCase(Locale.ROOT))) {
                //是参照
                return "'" + value + "'";
                return value;
            } else {
                return value;
            }
@@ -1938,13 +1948,13 @@
                    || VciFieldTypeEnum.VTInteger.equals(fieldTypeEnum)) {
                    return value;
                } else {
                    return "'" + value + "'";
                    return value;
                }
            } else {
                if ((value.startsWith("(") && value.endsWith(")")) || (value.startsWith("'") && value.endsWith("'"))) {
                    return value;
                }
                return "'" + value + "'";
                return value;
            }
        }
@@ -3349,52 +3359,33 @@
     * èŽ·å–å‚ç…§çš„ä¿¡æ¯
     *
     * @param referConfigVO å‚照的配置
     * @param pageHelper    åˆ†é¡µçš„工具
     * @return åˆ—表数据
     */
    @Override
    public DataGrid referDataGrid(UIFormReferVO referConfigVO, PageHelper pageHelper) {
    public Page<BtmTypeVO> referDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject) {
//        checkReferConfig(referConfigVO);
        //使用业务类型查询
        R<BtmTypeVO> allAttributeByBtmId = btmTypeClient.getAllAttributeByBtmId(referConfigVO.getReferType());
        BtmTypeVO btmTypeVO = allAttributeByBtmId.getData();
        if (referConfigVO.getWhere() == null) {
            referConfigVO.setWhere(new HashMap<>());
        }
        /**
         * åŠ ä¸ŠæŸ¥è¯¢æœ€æ–°ç‰ˆæ¬¡
         */
        Map<String, String> conditionMap = new HashMap<>();
        conditionMap.put("lastr", "1");
        conditionMap.put("lastv", "1");
        referConfigVO.getWhere().putAll(conditionMap);
        if (VciBaseUtil.containsKeyUnCaseForMap(referConfigVO.getWhere(), VciQueryWrapperForDO.LC_STATUS_FIELD) &&
        baseQueryObject.getConditionMap().put("lastr", "1");
        baseQueryObject.getConditionMap().put("lastv", "1");
        if (VciBaseUtil.containsKeyUnCaseForMap(baseQueryObject.getConditionMap(), VciQueryWrapperForDO.LC_STATUS_FIELD) &&
            BtmTypeLcStatusConstant.FRAME_WORK_LIFE_CYCLE_NAME.equalsIgnoreCase(btmTypeVO.getLifeCycleId())) {
            referConfigVO.getWhere().put(VciQueryWrapperForDO.LC_STATUS_FIELD, FrameworkDataLCStatus.ENABLED.getValue());
            baseQueryObject.getConditionMap().put(VciQueryWrapperForDO.LC_STATUS_FIELD, FrameworkDataLCStatus.ENABLED.getValue());
        }
        if (VciBaseUtil.containsKeyUnCaseForMap(referConfigVO.getWhere(), VciQueryWrapperForDO.LC_STATUS_FIELD) &&
        if (VciBaseUtil.containsKeyUnCaseForMap(baseQueryObject.getConditionMap(), VciQueryWrapperForDO.LC_STATUS_FIELD) &&
            BtmTypeLcStatusConstant.RELEASE_LIFE_CYCLE.equalsIgnoreCase(btmTypeVO.getLifeCycleId())) {
            referConfigVO.getWhere().put(VciQueryWrapperForDO.LC_STATUS_FIELD, CodeDefaultLC.RELEASED.getValue());
            baseQueryObject.getConditionMap().put(VciQueryWrapperForDO.LC_STATUS_FIELD, CodeDefaultLC.RELEASED.getValue());
        }
        BaseQueryObject baseQueryObject = new BaseQueryObject();
        Map<String, String> where = referConfigVO.getWhere();
        where.put("domain", AppConstant.APPLICATION_NAME_CODE);
        baseQueryObject.setConditionMap(where);
        baseQueryObject.setPage(pageHelper.getPage());
        baseQueryObject.setSort(pageHelper.getSort());
        baseQueryObject.setLimit(pageHelper.getLimit());
        baseQueryObject.setOrder(pageHelper.getOrder());
        R<List<BtmTypeVO>> ref = btmTypeClient.getRef(baseQueryObject);
        DataGrid<BtmTypeVO> btmTypeVODataGrid = new DataGrid<>();
        List<BtmTypeVO> data = ref.getData();
        btmTypeVODataGrid.setData(data);
        btmTypeVODataGrid.setCode(ref.getCode());
        btmTypeVODataGrid.setLimit(pageHelper.getLimit());
        btmTypeVODataGrid.setMsg(ref.getMsg());
        btmTypeVODataGrid.setSort(pageHelper.getSort());
        btmTypeVODataGrid.setOrder(pageHelper.getOrder());
        btmTypeVODataGrid.setPage(pageHelper.getPage());
        return btmTypeVODataGrid;
        baseQueryObject.getConditionMap().put("domain", AppConstant.APPLICATION_NAME_CODE);
        R<Page<BtmTypeVO>> refPage = btmTypeClient.getRefPage(baseQueryObject);
        if(refPage.getCode() != 200){
            throw new ServiceException("业务类型feign接口调用错误");
        }
        return refPage.getData();
    }
    /**
@@ -3477,6 +3468,17 @@
    }
    @Override
    public boolean checkUnAttrUnEdit(String attrName) {
        return  (VciQueryWrapperForDO.OID_FIELD.equalsIgnoreCase(attrName)
                ||"ts".equalsIgnoreCase(attrName)
                || "lastmodifier".equalsIgnoreCase(attrName)
                || "lastmodifytime".equalsIgnoreCase(attrName)
                || "createtime".equalsIgnoreCase(attrName)
                || "checkintime".equalsIgnoreCase(attrName)
                ||"checkouttime".equalsIgnoreCase(attrName));
    }
    private String getTableName(String refertype){
        if ("codeclassify".equals(refertype)){
            return "pl_code_classify";
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
@@ -1895,9 +1895,30 @@
        getFieldIndexMap(titleRowData, attrNameIdMap, fieldIndexMap);
        Map<String, String> cboOidMap = new HashMap<>();
        cboOidMap.put("id", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(codeDataMap.keySet().toArray(new String[0])) + ")");
        R<BtmTypeVO>  r= btmTypeClient.getDetail(templateVO.getBtmTypeId());
        BtmTypeVO btmTypeVO =r.getData();
        String tableName=btmTypeVO.getTableName();
        String tableName ="";
        try {
            R<BtmTypeVO> r = btmTypeClient.getAllAttributeByBtmId(templateVO.getBtmTypeId());
            if(r.getCode()!=200) {
                throw new Throwable(r.getMsg());
            }
            BtmTypeVO btmTypeVO = r.getData();
            if (btmTypeVO == null) {
                throw new Throwable("根据业务类型未查询到业务类型对象!");
            }
            tableName = btmTypeVO.getTableName();
            if (StringUtils.isBlank(tableName)) {
                throw new Throwable("根据业务类型未查询到业务类型相关联的表");
            }
        }catch (Throwable e){
            log.error("查询业务对象表"+e);
            XMLResultDataObjectDetailDO xmlResultDataObjectDetailDO=new XMLResultDataObjectDetailDO();
            xmlResultDataObjectDetailDO.setErrorid("103");
            xmlResultDataObjectDetailDO.setMsg("查询业务对象表"+e);
            xmlResultDataObjectDetailDO.setId("");
            xmlResultDataObjectDetailDO.setCode("");
            resultDataObjectDetailDOs.add(xmlResultDataObjectDetailDO);
            return;
        }
        StringBuffer sb=new StringBuffer();
        sb.append(" select * from ");
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingSysIntHeaderWrapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,67 @@
package com.vci.ubcs.code.wrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.vci.ubcs.code.entity.DockingSysIntHeader;
import com.vci.ubcs.code.vo.pagemodel.DockingSysIntHeaderVO;
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 DockingSysIntHeaderWrapper extends BaseEntityWrapper<DockingSysIntHeader, DockingSysIntHeaderVO> {
    public static DockingSysIntHeaderWrapper build() {
        return new DockingSysIntHeaderWrapper();
    }
    @Override
    public DockingSysIntHeaderVO entityVO(DockingSysIntHeader entity) {
        DockingSysIntHeaderVO vo = Objects.requireNonNull(BeanUtil.copy(entity, DockingSysIntHeaderVO.class));
        return vo;
    }
    /***
     * æ•°ç»„对象转换
     * @param entitys
     * @return
     */
    public List<DockingSysIntHeaderVO> entityVOs(Collection<DockingSysIntHeader> entitys) {
        if(CollectionUtils.isEmpty(entitys)) {
            return new ArrayList<>();
        }
        List<DockingSysIntHeaderVO> vos=new ArrayList<>();
        if(!CollectionUtils.isEmpty(entitys)) {
            entitys.stream().forEach(DockingSystem -> {
                vos.add(entityVO(DockingSystem));
            });
        }
        return vos;
    }
    /***
     * æ•°ç»„对象转换
     * @param vos
     * @return
     */
    public List<DockingSysIntHeader> voentitys(Collection<DockingSysIntHeaderVO> vos) {
        if(CollectionUtils.isEmpty(vos)) {return new ArrayList<>();}
        List<DockingSysIntHeader>entitys =new ArrayList<>();
        if(!CollectionUtils.isEmpty(vos)) {
            vos.stream().forEach(entity -> {
                entitys.add(voentity(entity));
            });
        }
        return entitys;
    }
    /***
     * æ•°ç»„对象转换
     * @param vo
     * @return
     */
    public DockingSysIntHeader voentity(DockingSysIntHeaderVO vo) {
        DockingSysIntHeader entity = Objects.requireNonNull(BeanUtil.copy(vo, DockingSysIntHeader.class));
        return entity;
    }
}
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingSysIntParamWrapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,69 @@
package com.vci.ubcs.code.wrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.vci.ubcs.code.entity.DockingSysIntParam;
import com.vci.ubcs.code.vo.pagemodel.DockingSysIntParamVO;
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 DockingSysIntParamWrapper extends BaseEntityWrapper<DockingSysIntParam, DockingSysIntParamVO> {
    public static DockingSysIntParamWrapper build() {
        return new DockingSysIntParamWrapper();
    }
    @Override
    public DockingSysIntParamVO entityVO(DockingSysIntParam entity) {
        DockingSysIntParamVO vo = Objects.requireNonNull(BeanUtil.copy(entity, DockingSysIntParamVO.class));
        return vo;
    }
    /***
     * æ•°ç»„对象转换
     * @param entitys
     * @return
     */
    public List<DockingSysIntParamVO> entityVOs(Collection<DockingSysIntParam> entitys) {
        if(CollectionUtils.isEmpty(entitys)) {
            return new ArrayList<>();
        }
        List<DockingSysIntParamVO> vos=new ArrayList<>();
        if(!CollectionUtils.isEmpty(entitys)) {
            entitys.stream().forEach(DockingSystem -> {
                vos.add(entityVO(DockingSystem));
            });
        }
        return vos;
    }
    /***
     * æ•°ç»„对象转换
     * @param vos
     * @return
     */
    public List<DockingSysIntParam> voentitys(Collection<DockingSysIntParamVO> vos) {
        if(CollectionUtils.isEmpty(vos)) {return new ArrayList<>();}
        List<DockingSysIntParam>entitys =new ArrayList<>();
        if(!CollectionUtils.isEmpty(vos)) {
            vos.stream().forEach(entity -> {
                entitys.add(voentity(entity));
            });
        }
        return entitys;
    }
    /***
     * æ•°ç»„对象转换
     * @param vo
     * @return
     */
    public DockingSysIntParam voentity(DockingSysIntParamVO vo) {
        DockingSysIntParam entity = Objects.requireNonNull(BeanUtil.copy(vo, DockingSysIntParam.class));
        return entity;
    }
}
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingSysIntParamMapper.xml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<!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.DockingSysIntParamMapper">
    <!-- é€šç”¨æŸ¥è¯¢æ˜ å°„结果 -->
    <resultMap id="plDockingSysIntParamResultMap" type="com.vci.ubcs.code.entity.DockingSysIntParam">
        <result column="OID" property="oid"/>
        <result column="REVISIONOID" property="revisionOid"/>
        <result column="NAMEOID" property="nameOid"/>
        <result column="BTMNAME" property="btmname"/>
        <result column="LASTR" property="lastR"/>
        <result column="FIRSTR" property="firstR"/>
        <result column="LASTV" property="lastV"/>
        <result column="FIRSTV" property="firstV"/>
        <result column="CREATOR" property="creator"/>
        <result column="CREATETIME" property="createTime"/>
        <result column="LASTMODIFIER" property="lastModifier"/>
        <result column="LASTMODIFYTIME" property="lastModifyTime"/>
        <result column="REVISIONRULE" property="revisionRule"/>
        <result column="VERSIONRULE" property="versionRule"/>
        <result column="REVISIONSEQ" property="revisionSeq"/>
        <result column="REVISIONVALUE" property="revisionValue"/>
        <result column="VERSIONSEQ" property="versionSeq"/>
        <result column="VERSIONVALUE" property="versionValue"/>
        <result column="LCTID" property="lctid"/>
        <result column="LCSTATUS" property="lcStatus"/>
        <result column="TS" property="ts"/>
        <result column="ID" property="id"/>
        <result column="NAME" property="name"/>
        <result column="DESCRIPTION" property="description"/>
        <result column="OWNER" property="owner"/>
        <result column="COPYFROMVERSION" property="copyFromVersion"/>
        <result column="INFOOID" property="infoOid"/>
        <result column="PARAMKEY" property="paramKey"/>
        <result column="PARAMVALUE" property="paramValue"/>
        <result column="USEDFLAG" property="usedFlag"/>
        <result column="tenant_id" property="tenantId"/>
        <result column="tenant_id" property="tenantId"/>
    </resultMap>
</mapper>
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/LifeCycleController.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,121 @@
package com.vci.ubcs.omd.controller;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import com.vci.ubcs.omd.dto.LifeCycleDTO;
import com.vci.ubcs.omd.entity.LifeCycleRule;
import com.vci.ubcs.omd.service.ILifeCycleService;
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.omd.vo.LifeCycleVO;
import com.vci.ubcs.omd.wrapper.LifeCycleRuleWrapper;
import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.BeanUtil;
import org.springframework.web.bind.annotation.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * ç”Ÿå‘½å‘¨æœŸçš„æŽ§åˆ¶å™¨
 * @author weidy
 * @date 2023/6/15
 */
@RestController
@RequestMapping("/lifeCycle")
@AllArgsConstructor
@Api(value = "生命周期控制器",tags = "生命周期接口")
public class LifeCycleController {
    /**
     * ç”Ÿå‘½å‘¨æœŸçš„æœåŠ¡
     */
    private final ILifeCycleService lifeCycleService;
    /**
     * åˆ†é¡µæŸ¥è¯¢
     */
    @GetMapping("page")
    @ApiOperationSupport(order = 2)
    @ApiOperation(value = "分页查询生命周期",notes = "分页查询生命周期")
    public R<IPage<LifeCycleVO>> page(BaseQueryObject baseQueryObject){
        Map<String, String> conditionMap = baseQueryObject.getConditionMap();
        if (conditionMap == null){
            conditionMap = new HashMap<>();
        }
        return R.data(lifeCycleService.listLife(conditionMap,baseQueryObject.getPageHelper()));
    }
    /**
     * æŸ¥çœ‹è¯¦æƒ…
     */
    @GetMapping("/detail")
    @ApiOperationSupport(order = 1)
    @ApiOperation(value = "查看详情", notes = "生命周期")
    public R<LifeCycleVO> detail(LifeCycleDTO lifeCycleDTO){
        LifeCycleRule lifeCycleRule = lifeCycleService.getOne(Condition.getQueryWrapper(BeanUtil.copy(lifeCycleDTO, LifeCycleRule.class)));
        return R.data(LifeCycleRuleWrapper.build().entityVO(lifeCycleRule));
    }
    /**
     * æ–°å¢žæˆ–修改
     */
    @PostMapping("/submit")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "新增或修改",notes = "传入生命周期页面对象")
    public R<LifeCycleVO> submit(@RequestBody LifeCycleDTO lifeCycleDTO){
        return R.data(lifeCycleService.addSave(lifeCycleDTO));
    }
    /**
     * æ–°å¢žæˆ–修改
     */
    @PostMapping("/batch-submit")
    @ApiOperationSupport(order = 3)
    @ApiOperation(value = "新增或修改",notes = "传入状态池页面对象")
    public R<List<LifeCycleVO>> batchSubmit(@RequestBody List<LifeCycleDTO> lifeCycleDTOs){
        return R.data(lifeCycleService.batchAddSave(lifeCycleDTOs));
    }
    /**
     * åˆ é™¤
     */
    @PostMapping("/remove")
    @ApiOperationSupport(order = 4)
    @ApiOperation(value = "逻辑删除", notes = "传入主键")
    public R remove(@RequestBody LifeCycleDTO lifeCycleDTO){
        lifeCycleService.delete(lifeCycleDTO);
        return R.status(true);
    }
    /**
     * æ‰¹é‡åˆ é™¤
     */
    @PostMapping("/batch-remove")
    @ApiOperationSupport(order = 5)
    @ApiOperation(value = "批量删除",notes = "传入主键")
    public R batchRemove(@RequestBody List<LifeCycleDTO> lifeCycleDTOs){
        lifeCycleService.batchDelete(lifeCycleDTOs);
        return R.status(true);
    }
    /**
     * æŸ¥çœ‹åº”用范围
     * @param lifeCycleDTO ç”Ÿå‘½å‘¨æœŸçš„传输对象
     * @return ä¸šåŠ¡ç±»åž‹çš„æ˜¾ç¤ºå¯¹è±¡
     */
    @GetMapping("/listUses")
    @ApiOperationSupport(order = 6)
    @ApiOperation(value = "查看应用范围",notes = "传入主键")
    public R<List<BtmTypeVO>> listUses(LifeCycleDTO lifeCycleDTO){
        return R.data(lifeCycleService.listUses(lifeCycleDTO));
    }
}
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/LifeCycleMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,18 @@
package com.vci.ubcs.omd.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.vci.ubcs.omd.entity.LifeCycleRule;
import com.vci.ubcs.omd.entity.Status;
import java.util.Collection;
import java.util.List;
/**
 * ç”Ÿå‘½å‘¨æœŸçš„æ•°æ®æ“ä½œå±‚
 *
 * @author weidy
 * @date 2023/6/20
 */
public interface LifeCycleMapper extends BaseMapper<LifeCycleRule> {
}
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/ILifeCycleService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,61 @@
package com.vci.ubcs.omd.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.vci.ubcs.omd.dto.LifeCycleDTO;
import com.vci.ubcs.omd.entity.LifeCycleRule;
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.omd.vo.LifeCycleVO;
import com.vci.ubcs.starter.web.pagemodel.PageHelper;
import java.util.List;
import java.util.Map;
/**
 * ç”Ÿå‘½å‘¨æœŸçš„æœåŠ¡
 * @author weidy
 * @date 2023/6/15
 */
public interface ILifeCycleService extends IService<LifeCycleRule> {
    /**
     * èŽ·å–ç”Ÿå‘½å‘¨æœŸåˆ—è¡¨
     * @param conditionMap æŸ¥è¯¢æ¡ä»¶
     * @param pageHelper åˆ†é¡µ
     * @return ç”Ÿå‘½å‘¨æœŸçš„æ˜¾ç¤ºå¯¹è±¡
     */
    IPage<LifeCycleVO> listLife(Map<String, String> conditionMap, PageHelper pageHelper);
    /**
     * æ·»åŠ ä¿å­˜
     * @param lifeCycleDTO æ•°æ®ä¼ è¾“对象
     * @return æ·»åŠ åŽçš„æ˜¾ç¤ºå¯¹è±¡
     */
    LifeCycleVO addSave(LifeCycleDTO lifeCycleDTO);
    /**
     * æ‰¹é‡æ·»åР内容
     * @param lifeCycleDTOs æ•°æ®ä¼ è¾“对象
     * @return æ·»åŠ åŽçš„æ˜¾ç¤ºå¯¹è±¡
     */
    List<LifeCycleVO> batchAddSave(List<LifeCycleDTO> lifeCycleDTOs);
    /**
     * åˆ é™¤ç”Ÿå‘½å‘¨æœŸ
     * @param lifeCycleDTO æ•°æ®ä¼ è¾“对象
     */
    void delete(LifeCycleDTO lifeCycleDTO);
    /**
     * æ‰¹é‡åˆ é™¤ç”Ÿå‘½å‘¨æœŸ
     * @param lifeCycleDTOs æ•°æ®ä¼ è¾“对象列表
     */
    void batchDelete(List<LifeCycleDTO> lifeCycleDTOs);
    /**
     * æ˜¾ç¤ºå¼•用范围
     * @param lifeCycleDTO ç”Ÿå‘½å‘¨æœŸçš„æ•°æ®ä¼ è¾“对象
     * @return ä¸šåŠ¡ç±»åž‹
     */
    List<BtmTypeVO> listUses(LifeCycleDTO lifeCycleDTO);
}
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/LifeCycleServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,90 @@
package com.vci.ubcs.omd.service.impl;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.omd.dto.LifeCycleDTO;
import com.vci.ubcs.omd.entity.LifeCycleRule;
import com.vci.ubcs.omd.mapper.LifeCycleMapper;
import com.vci.ubcs.omd.service.ILifeCycleService;
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.omd.vo.LifeCycleVO;
import com.vci.ubcs.starter.web.pagemodel.PageHelper;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
 * ç”Ÿå‘½å‘¨æœŸçš„æœåŠ¡
 * @author weidy
 * @date 2023/6/20
 */
@Service
public class LifeCycleServiceImpl  extends ServiceImpl<LifeCycleMapper, LifeCycleRule> implements ILifeCycleService{
    /**
     * èŽ·å–ç”Ÿå‘½å‘¨æœŸåˆ—è¡¨
     *
     * @param conditionMap æŸ¥è¯¢æ¡ä»¶
     * @param pageHelper   åˆ†é¡µ
     * @return ç”Ÿå‘½å‘¨æœŸçš„æ˜¾ç¤ºå¯¹è±¡
     */
    @Override
    public IPage<LifeCycleVO> listLife(Map<String, String> conditionMap, PageHelper pageHelper) {
        return null;
    }
    /**
     * æ·»åŠ ä¿å­˜
     *
     * @param lifeCycleDTO æ•°æ®ä¼ è¾“对象
     * @return æ·»åŠ åŽçš„æ˜¾ç¤ºå¯¹è±¡
     */
    @Override
    public LifeCycleVO addSave(LifeCycleDTO lifeCycleDTO) {
        return null;
    }
    /**
     * æ‰¹é‡æ·»åР内容
     *
     * @param lifeCycleDTOs æ•°æ®ä¼ è¾“对象
     * @return æ·»åŠ åŽçš„æ˜¾ç¤ºå¯¹è±¡
     */
    @Override
    public List<LifeCycleVO> batchAddSave(List<LifeCycleDTO> lifeCycleDTOs) {
        return null;
    }
    /**
     * åˆ é™¤ç”Ÿå‘½å‘¨æœŸ
     *
     * @param lifeCycleDTO æ•°æ®ä¼ è¾“对象
     */
    @Override
    public void delete(LifeCycleDTO lifeCycleDTO) {
    }
    /**
     * æ‰¹é‡åˆ é™¤ç”Ÿå‘½å‘¨æœŸ
     *
     * @param lifeCycleDTOs æ•°æ®ä¼ è¾“对象列表
     */
    @Override
    public void batchDelete(List<LifeCycleDTO> lifeCycleDTOs) {
    }
    /**
     * æ˜¾ç¤ºå¼•用范围
     *
     * @param lifeCycleDTO ç”Ÿå‘½å‘¨æœŸçš„æ•°æ®ä¼ è¾“对象
     * @return ä¸šåŠ¡ç±»åž‹
     */
    @Override
    public List<BtmTypeVO> listUses(LifeCycleDTO lifeCycleDTO) {
        return null;
    }
}
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/wrapper/LifeCycleRuleWrapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,46 @@
package com.vci.ubcs.omd.wrapper;
import com.vci.ubcs.omd.entity.LifeCycleRule;
import com.vci.ubcs.omd.vo.LifeCycleVO;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
/**
 * Description:状态池的包装类
 *
 * @author LiHang
 * @date 2023/5/23
 */
public class LifeCycleRuleWrapper extends BaseEntityWrapper<LifeCycleRule, LifeCycleVO> {
    public static LifeCycleRuleWrapper build() {
        return new LifeCycleRuleWrapper();
    }
    @Override
    public LifeCycleVO entityVO(LifeCycleRule entity) {
        LifeCycleVO vo = BeanUtil.copy(entity, LifeCycleVO.class);
        //这里处理枚举相关的
        return vo;
    }
    public List<LifeCycleVO> listEntityVO(List<LifeCycleRule> LifeCycleRuleList){
        return Optional.ofNullable(LifeCycleRuleList).orElseGet(ArrayList::new).stream().map(this::entityVO).collect(Collectors.toList());
    }
    public List<LifeCycleRule> batchCopyVO2DO(List<LifeCycleVO> LifeCycleVOList) {
        return Optional.ofNullable(LifeCycleVOList).orElseGet(ArrayList::new).stream().map(this::copyVO2DO).collect(Collectors.toList());
    }
    private LifeCycleRule copyVO2DO(LifeCycleVO LifeCycleVO) {
        LifeCycleRule LifeCycleRule = BeanUtil.copy(LifeCycleVO, LifeCycleRule.class);
        return LifeCycleRule;
    }
}