Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/api/code/codeApply.js

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,27 @@
import request from '@/router/axios';

//编码申请树
export const getAuthTree = (params) => {
  return request({
    url: '/api/ubcs-code/codeApplyWebManagementController/getAuthTree',
    method: 'get',
    params:{
      ...params
    }
  })
}
//编码申请控件
export const getUsedTemplateByClassifyOid = (params) => {
  return request({
    url: '/api/ubcs-code/codeApplySwingController/getUsedTemplateByClassifyOid',
    method: 'get',
    params
  })
}
export function getCodeRule(params) {
  return request({
    url: 'api/ubcs-code/mdmEngineController/getCodeRuleByClassifyOid',
    method: 'get',
    params
  })
}

 Source/UBCS-WEB/src/components/Master/MasterTree.vue

@@ -170,6 +170,7 @@
      try {
        // console.log(data)
        this.TreeValue=data.label.split(" ")[0].trim();
        console.log('TreeValue',this.TreeValue)
        this.$emit('TreeValue',this.TreeValue)
        this.nodeClickList = data;
        this.tableHeadDataFateher = []

 Source/UBCS-WEB/src/views/code/codeApply.vue

@@ -1,10 +1,316 @@
<template>
  <p>编码申请</p>
    <el-row>
      <el-col :span="4">
        <basic-container>
          <avue-tree ref="tree"
                     v-model="form"
                     :data="TreeData"
                     :option="TreeOption"
                     style="height: calc(100vh - 150px)"
                     @node-click="nodeClick">
          </avue-tree>
        </basic-container>
      </el-col>
      <el-col :span="20">
        <basic-container>
          <div style="height: calc(100vh - 150px)">
            <FormTemplate
              key="masterForm" data-key="masterForm"
              v-bind="$attrs"
              :type="type"
              :TreeValue="TreeValue"
              :eventList="eventList"
              ref="FormTemplate"
              @getFormData="getFormData"
            ></FormTemplate>
            <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
              <el-tab-pane label="码值申请" name="codeApply" v-if="showCodeApply">
                <FormTemplate
                  key="codeApplyForm" data-key="codeApplyForm"
                  secDTOListv-bind="$attrs"
                  :type="type"
                  :selfColumnType="selfColumnType"
                  :selfColumnConfig="selfColumnConfig"
                  ref="CodeApply"
                  @getFormData="getCodeApplyFormData"
                  @referConfigDataUpdate="referConfigDataUpdate"
                ></FormTemplate>
              </el-tab-pane>
            </el-tabs>
          </div>
        </basic-container>
      </el-col>
    </el-row>
</template>

<script>
import {getAuthTree,getUsedTemplateByClassifyOid,getCodeRule} from '@/api/code/codeApply.js'

export default {
name: "codeApply"
  name: "codeApply",
  components: { FormTemplate: () => import('@/components/FormTemplate/FormTemplate') },
  data() {
    return {
      codeClassifyOid:'',
      type:'add',
      TreeValue:'',
      dialogVisible:true,
      setForm:{},
      secVOList: [],
      codeRuleOid: "",
      activeName: "codeApply",
      showCodeApply: false,
      eventList:[],
      form: {},
      TreeData:[],
      TreeOption: {
        defaultExpandAll: false,
        addBtn: false,
      },
      //新增类型
      selfColumnType: {
        codefixedsec: "combox",//固定码段
        codeclassifysec: "refer",//分类码段
        codevariablesec: "text",//可变码段
        coderefersec: "refer",//引用码段
        codeattrsec: "text",
        codelevelsec: "text",
        codedatesec: "date"
      },
      selfColumnConfig: {
        function: {
          required: this.isRequired,
          dicData: this.getOptionList,
          type: this.getType,
          referConfig: this.getReferConfig,
          readOnly: this.getDisabled,
        },
        exchange: {
          text: "name",
          field: "oid",
          prop: "oid",
          showField: "name",
          parentClassifySecOid: "parentClassifySecOid",
          label: "name",
          maxlength: "codeSecLength",
          data: "fixedValueVOList",
          dateFormate: "codeDateFormatStr"
        },
        directVoluation: {
          search: true,
          props: {
            label: "id",
            value: "id",
          },
        },
      },
    }
  },
  created() {
    this.getTreeData()
  },
  methods:{
    getFormData(form) {
      this.form = form;
    },
    //定义一个修改数据属性名的方法
    ModifyProperties(obj, oldName, newName) {
      for (let key in obj) {
        if (key === oldName) {
          obj[newName] = obj[key];
          delete obj[key];
        }
        if (typeof obj[key] === 'object') {
          this.ModifyProperties(obj[key], oldName, newName);
        }
      }
    },
    getTreeData(){
      getAuthTree({
        'library': 'XH',
        'systemOid': '061261BF-2736-4589-12F7-0DFA79121222',
        'systemId': '02'
      }).then(res => {
        // console.log(res);
        this.TreeData=res.data;
        this.ModifyProperties(this.TreeData, 'name', 'label');
        // console.log( this.codeClassifyOid)

      });
    },
    nodeClick(row){
      // console.log(row)
      this.TreeValue=row.text.split(" ")[0].trim();
      this.codeClassifyOid = row.oid;
      getUsedTemplateByClassifyOid({ 'codeClassifyOid': this.codeClassifyOid,templateOid:' 97e979919a1f1dca67290e85fee22688' }).then((res) => {
        console.log('===res',res)
        if (res.data.code === 200) {
          this.$nextTick(() => {
            this.eventList=res.data.data.attributes
            // this.$refs.FormTemplate.$emit('eventList',  res.data.templateVO.attributes);
            if (Object.keys(this.setForm).length > 0) {
              this.$refs.FormTemplate.form = this.setForm;
            }
          });
        }
      })
        .catch(() => {
          this.loading = false;
        });
      this.getCodeRule()
    },
    getCodeRule() {
      let that = this;
      getCodeRule({codeClassifyOid: that.codeClassifyOid}).then((res) => {
        if (res.data && res.data.code === 200) {
          that.codeRuleOid = res.data.data.oid;
          const typeList = [
            //属性码段 åªè¯»
            "codeattrsec",
            //可变码段
            "codevariablesec",
            //固定码段
            "codefixedsec",
            //分类码段
            "codeclassifysec",
            //日期码段 åªè¯»
            "codedatesec",
            //引用码段
            "coderefersec",
            //层级码段 åªè¯»
            "codelevelsec",
            //流水码段 éšè—
          ];
          that.secVOList = (res.data.data.secVOList || []).filter((item) =>
            typeList.includes(item.secType)
          );
          if (that.secVOList.length > 0 && that.type === "add") {
            that.showCodeApply = true;
            that.activeName = "codeApply";
            this.$nextTick(() => {
              that.$refs.CodeApply.templateRender(that.secVOList, this.TreeValue);
            });
          } else {
            that.showCodeApply = false;
          }
        }
      });
    },
    getType(item) {
      return this.selfColumnType[item.sectype];
    },
    isRequired(item) {
      return item.nullableFlag != "true";
    },
    getOptionList(item) {
      if (
        Array.isArray(item.fixedValueVOList) &&
        item.fixedValueVOList.length > 0
      ) {
        const configAttr = {
          key: "id",
          value: "id",
        };
        const optionList = item.fixedValueVOList.map((item) => {
          for (const key in configAttr) {
            if (Object.hasOwnProperty.call(configAttr, key)) {
              const element = configAttr[key];
              item[key] = item[element];
            }
          }
          return item;
        });
        return optionList;
      } else {
        return [];
      }
    },
    getReferConfig(item) {
      let params = {};
      if (item.secType == "codeclassifysec") {
        //分类码段
        params = {
          isMuti: false,
          type: "grid",
          tableConfig: {
            limit: -1,
            cols: [
              {
                field: "id",
                title: "英文名称",
                sort: true,
                width: 150,
              },
              {
                field: "name",
                title: "中文名称",
                sort: true,
                width: 150,
              },
              {
                field: "description",
                title: "描述",
                width: 250,
              },
            ],
            queryColumns: [
              {
                field: "id",
                title: "英文名称",
              },
              {
                field: "name",
                title: "中文名称",
              },
            ],
          },
          url: "api/ubcs-code/ubcs-code/mdmEngineController/listCodeClassifyValueBySecOid",
          extraParams: {
            classifySecOid: item.oid,
            parentClassifyValueOid: item.parentClassifySecOid
              ? this.codeApplyForm[item.parentClassifySecOid]
              : "",
          },
        };
      } else if (item.secType == "coderefersec") {
        //引用码段
        params = JSON.parse(item.referValueInfo);
      }
      return params;
    },
    getDisabled(item) {
      if (item.secType === "codeclassifysec") {
        if (item.parentClassifySecOid) {
          if (!this.codeApplyForm[item.parentClassifySecOid]) {
            return true;
          } else {
            return false;
          }
        }
      }
    },
    // å‚照组件数据变更
    referConfigDataUpdate(data) {
      const { field } = data;
      let childItems=[];
      this.secVOList = this.secVOList.map((item) => {
        if (item.parentClassifySecOid === field) {
          this.$refs.CodeApply.form[item.oid] = undefined;
          this.$refs.CodeApply.form[item.name] = undefined;
          item.readOnly=false;
          item.referConfig.extraParams.parentClassifyValueOid=data.value;
          item.referConfig.reloadData = true;
          childItems.push(item)
        }
        return item;
      });
      //this.$refs.CodeApply.templateRender(this.secVOList,this.TreeValue);
      this.$refs.CodeApply.changeChildItem(childItems);
    },
    getCodeApplyFormData(codeApplyForm) {
      this.codeApplyForm = codeApplyForm;
    },
  }
}
</script>


 Source/UBCS-WEB/src/views/docking/infoForm.vue

@@ -233,6 +233,7 @@
  components: { vciWebRefer },
  data() {
    return {
      referUrl:'/api/ubcs-code/dockingManagement/gridDockingSystem',
      showSubmitDialog: false,
      //接口类型下拉
      interfaceTypeList: [{

 Source/UBCS-WEB/src/views/integration/systemInfo.vue

@@ -40,7 +40,7 @@

      <div slot="footer" class="dialog-footer" style="height: 50px;line-height: 50px">
        <el-button icon="el-icon-plus" size="small" type="primary" @click="empower">授 æƒ</el-button>
        <el-button icon="el-icon-close" size="small" type="danger">重 ç½®</el-button>
        <el-button icon="el-icon-close" size="small" type="danger" @click="resetting">重 ç½®</el-button>
      </div>
    </el-dialog>
  </basic-container>
@@ -140,6 +140,11 @@
  created() {
  },
  methods: {
    //重置
    resetting(){
      this.$refs.tree.setCheckedKeys([])
      // console.log(this.ParentList)
    },
    empower() {
      batchAddSave(this.checkAll.oid, this.checkAll.id, this.ParentList).then(res => {
        // console.log(res.data)
@@ -151,76 +156,66 @@
    },
    //分类授权多选回调
    checkChange(row, checked) {
      // this.ParentList=[]
      // console.log('row',row)
      if (checked) {
        if (!row.parentId) {
          const parentRecord = {
            oid: row.oid,
            classifyId: row.attributes.classifyId,
            classifyOid: row.attributes.classifyOid,
            classParentOid: row.parentId,
          };
          this.ParentList.push(parentRecord);
          // å¦‚æžœrow的children不为空 ç»§ç»­å¾ªçŽ¯children中的每个对象
          if (row.children && row.children.length > 0) {
            for (let child of row.children) {
              const childRecord = {
                oid: child.oid,
                classifyId: child.attributes.classifyId,
                classifyOid: child.attributes.classifyOid,
                classParentOid: child.parentId,
              };
              this.ParentList.push(childRecord);
              // å¦‚果子对象的children不为空 ç»§ç»­å¾ªçŽ¯èŽ·å–数据
              if (child.children && child.children.length > 0) {
                for (let subChild of child.children) {
                  const subRecord = {
                    oid: subChild.oid,
                    classifyId: subChild.attributes.classifyId,
                    classifyOid: subChild.attributes.classifyOid,
                    classParentOid: subChild.parentId,
                  };
                  this.ParentList.push(subRecord);
                }
              }
            }
          }
        }
        this.addAllChildren(row.children);
        this.addToParentList(row);
        // å‹¾é€‰è¡Œæ—¶å°†æ‰€æœ‰èŠ‚点添加到ParentList中
      } else {
        // å–消勾选的节点是父节点
        if (!row.parentId) {
          // æ‰¾åˆ°çˆ¶èŠ‚点在ParentList中的索引
          const parentIndex = this.ParentList.findIndex(item => item.oid === row.oid);
          if (parentIndex !== -1) {
            const parentOid = this.ParentList[parentIndex].classifyOid;

            // æŸ¥æ‰¾æ‰€æœ‰éœ€è¦åˆ é™¤çš„子节点的索引
            const childIndexes = this.ParentList.reduce((indexes, item, index) => {
              if (item.classParentOid === parentOid && item.classifyOid !== parentOid) {
                indexes.push(index);
              }
              return indexes;
            }, []);

            // ä»ŽåŽå¾€å‰åˆ é™¤å­èŠ‚点的数据，保证索引的正确性
            for (let i = childIndexes.length - 1; i >= 0; i--) {
              this.ParentList.splice(childIndexes[i], 1);
            }

            // åˆ é™¤çˆ¶èŠ‚点的数据
            this.ParentList.splice(parentIndex, 1);
          }
        } else {
          // å–消勾选的节点是子节点
          const childIndex = this.ParentList.findIndex(item => item.oid === row.oid);
          if (childIndex !== -1) {
            // åˆ é™¤å­èŠ‚点的数据
            this.ParentList.splice(childIndex, 1);
          }
        this.removeAllChildren(row.children);
        this.removeFromParentList(row);
        // å–消勾选将所有节点添加从ParentList中移除
      }
      // console.table(this.ParentList);
    },
    //子节点添加
    addAllChildren(children) {
      for (let child of children) {
        this.addToParentList(child);
        // å°†å­èŠ‚点添加到 ParentList ä¸­
        if (child.children && child.children.length > 0) {
          this.addAllChildren(child.children);
        }
      }
      console.log('this.ParentList',this.ParentList);
    },
    //子节点移除
    removeAllChildren(children) {
      for (let child of children) {
        this.removeFromParentList(child);
        // å°†å­èŠ‚点从 ParentList ä¸­ç§»é™¤
        if (child.children && child.children.length > 0) {
          this.removeAllChildren(child.children);
        }
      }
    },
    //当前父节点添加
    addToParentList(item) {
      const classifyOid = item.attributes.classifyOid;
      if (!this.isClassifyOidExists(classifyOid)) {
        const record = {
          oid: item.oid,
          classifyId: item.attributes.classifyId,
          classifyOid: classifyOid,
        };
        this.ParentList.push(record);
      }
    },
    //当前父节点移除
    removeFromParentList(item) {
      const classifyOid = item.attributes.classifyOid;
      if (this.isClassifyOidExists(classifyOid)) {
        const index = this.findIndexByClassifyOid(classifyOid);
        if (index !== -1) {
          this.ParentList.splice(index, 1);
        }
      }
    },
    //判重-ParentList
    isClassifyOidExists(classifyOid) {
      return this.ParentList.some(item => item.classifyOid === classifyOid);
    },
    //查找index位置
    findIndexByClassifyOid(classifyOid) {
      return this.ParentList.findIndex(item => item.classifyOid === classifyOid);
    },
    //分类授权
    classifyHandler(row) {

 Source/UBCS-WEB/src/views/modeling/cycle.vue

@@ -436,12 +436,13 @@
        ...newRowData,
        ...flowData,
      };
      debugger;

      console.log('params',params)
      this.submitLoading = true;
      let APIFun = API.add;
      if (this.type === "edit") {
        APIFun = API.edit;
        this.$delete(params, "id");
        // this.$delete(params, "id");
      }
      APIFun(params)
        .then((res) => {

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/datapush/data/NodeObjectDTO.java

@@ -8,6 +8,8 @@

@XStreamAlias("object")
public class NodeObjectDTO {
    @XStreamAsAttribute
    private String  itemid="" ;
    @XStreamAsAttribute
   private String  code="" ;
    @XStreamAsAttribute
@@ -58,14 +60,23 @@
        this.pro = pro;
    }

    @Override
    public String toString() {
        return "NodeObjectDTO{" +
                "code='" + code + '\'' +
                ", status='" + status + '\'' +
                ", library='" + library + '\'' +
                ", classCode='" + classCode + '\'' +
                ", pro=" + pro +
                '}';
    }
    public String getItemid() {
        return itemid;
    }

    public void setItemid(String itemid) {
        this.itemid = itemid;
    }

    @Override
    public String toString() {
        return "NodeObjectDTO{" +
            "itemid='" + itemid + '\'' +
            ", code='" + code + '\'' +
            ", status='" + status + '\'' +
            ", library='" + library + '\'' +
            ", classCode='" + classCode + '\'' +
            ", pro=" + pro +
            '}';
    }
}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java

@@ -175,8 +175,7 @@
     */
    @PostMapping("/test")
    public String test(@RequestParam("dataString")String dataString, @RequestParam("dataType")String dataType,HttpServletRequest request){
        String result="tttt";
        String result="{\"data\": {\"object\": {\"code\": \"0201040133\",\"oid\": \"0000001\",\"erroid\": \"0\",\"msg\": \"测试成功\"}}}";
        return result;
    }

}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java

@@ -43,6 +43,7 @@

import javax.annotation.Resource;
import java.util.*;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;

import static com.vci.ubcs.code.constant.MdmDuckingConstant.*;
@@ -59,8 +60,8 @@
public class CodeDuckingSyncServiceImpl implements ICodeDuckingSyncService {
    @Value("${dataSyncPush.dataParamName:xmlData}")
    public String DATA_PARAM_NAME;


    @Value("${dataSyncPush.dataId:itemid}")
    private String itemId;
    @Resource
    private  MdmEngineService  mdmEngineServiceI;

@@ -336,6 +337,7 @@
                //表示是主数据
                CodeClassifyTemplateVO codeClassifyTemplateVO = mdmEngineServiceI.getUsedTemplateByClassifyOid(classifyoid);
                R<List<Map<String, String>>> r = mdmEngineServiceI.getDataByOid(btmoid, codeClassifyTemplateVO.getOid());

                List<CodeClassifyTemplateAttrVO> attrVOS = codeClassifyTemplateVO.getAttributes();
                Map<String/**英文名称**/, String/**中文名称**/> attrIdNameMap = attrVOS.stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t.getName(), (o1, o2) -> o2));
                Map<String, String> data = new HashMap<>();
@@ -347,7 +349,12 @@
                }
                List<NodeProDTO> nodeProDTOS = new ArrayList<>();
                Map<String, String> finalData = data;
                AtomicReference<String> newItemId= new AtomicReference<>("");
                attrIdNameMap.keySet().forEach(field -> {
                    if(field.toLowerCase(Locale.ROOT).equals(itemId.toLowerCase(Locale.ROOT))){
                        String Value = finalData.get(field);
                        newItemId.set(Value);
                    }
                    String outName = attrIdNameMap.get(field);
                    if (finalData.containsKey(field)) {
                        String Value = finalData.get(field);
@@ -381,6 +388,7 @@
                nodeObjectDTO.setCode(code);//设置编码
                nodeObjectDTO.setClassCode(classCodeLeves[0]);
                nodeObjectDTO.setStatus(data.get("lcstatus"));
                nodeObjectDTO.setItemid(newItemId.get());
                nodeObjectDTO.setLibrary(classCodeLeves[classCodeLeves.length - 1]);
                nodeObjectDTO.setPro(nodeProDTOS);
                List<NodeObjectDTO> nodeObjectDTOS = new ArrayList<>();
@@ -506,7 +514,6 @@
            }
            ResultNodeDataDTO resultNodeDataDTO=resultJsonDTO.getData();
            resultNodeObjectDTOS=resultNodeDataDTO.getObject();

        }catch (Throwable e){
            msg="调用接口失败:"+e.getMessage();
            e.printStackTrace();

 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SystemClassifyRoleMapper.xml

@@ -86,7 +86,6 @@
                      from PL_CODE_SYSTEM_CLASSIFY_ROLE
                               start with classifyid = #{library}
            and SYSTEMID=#{systemId}
            and SYSTEMOID = #{systemOid}
        connect by prior classifyoid = classparentoid)
    </select>