Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/App.vue

@@ -29,7 +29,10 @@
  margin-bottom: 0;
}
.avue-dialog .el-dialog__body {
  margin-bottom: 10px
  margin-bottom: 40px
}
.avue-dialog__footer{
  z-index: 1000;
}
.avue-crud__pagination {
  padding: 10px 0 2px 20px;

 Source/UBCS-WEB/src/components/code-dialog-page/cloneOtherBasicSecDialog.vue

@@ -1,5 +1,6 @@
<template>
  <el-dialog
    :close-on-click-modal="false"
    :visible.sync="cloneOtherCodeRuleSettingBox"
    append-to-body
    class="avue-dialog avue-dialog--top"

 Source/UBCS-WEB/src/components/code-dialog-page/cloneRuleDialog.vue

@@ -1,5 +1,6 @@
<template>
  <el-dialog
      :close-on-click-modal="false"
      :visible.sync="cloneSettingBox"
      append-to-body
      class="avue-dialog avue-dialog--top"

 Source/UBCS-WEB/src/components/code-dialog-page/formulaEditor.vue

@@ -3,6 +3,7 @@
  <el-dialog
    title="公式编辑框"
    append-to-body
    :close-on-click-modal="false"
    :visible.sync="isShowformulaEdit"
    @close="closeFormulaEdit"
    width="75%"

 Source/UBCS-WEB/src/components/code-dialog-page/referBtmTypeCrudDialog.vue

@@ -1,5 +1,6 @@
<template>
    <el-dialog 
        :close-on-click-modal="false"
        title="为【参照引用的业务类型】选取值"
        append-to-body
        :visible.sync="referBtmDialogParams.isShowDialog"

 Source/UBCS-WEB/src/components/code-dialog-page/referConfigCrudDialog.vue

@@ -1,5 +1,6 @@
<template>
    <el-dialog
        :close-on-click-modal="false"
        title="选择参照配置"
        append-to-body
        :visible.sync="isShowReferConfigCrud"

 Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue

@@ -1,6 +1,7 @@
<template>
    <!-- ç¬¬äºŒå±‚对话框,属性码段，公式编辑框弹窗 -->
    <el-dialog
      :close-on-click-modal="false"
      title="参照配置"
      append-to-body
      :visible.sync="isShowReferConfigForm"

 Source/UBCS-WEB/src/components/code-dialog-page/referSelectBtmAttrDialog.vue

@@ -1,5 +1,6 @@
<template>
     <el-dialog 
        :close-on-click-modal="false"
        :title="options.title"
        append-to-body
        :visible.sync="crudParams.isShowDialog"

 Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue

@@ -5,8 +5,8 @@
               :visible.sync="visible"
               top="0"
               class="avue-dialog avue-dialog--top"
               :width="options.width|| '80%'">

               :width="options.width|| '80%'"
               :height="options.height|| 'auto'">
      <avue-crud :option="option"
                 :table-loading="loading"
                 :data="data"
@@ -247,7 +247,7 @@
      this.selectionList.forEach((item,_index) =>{
        if(isMutiValue){
          var valueFieldArray = _that.props.value.split(",");
          valueFieldArray.forEach((_itemField,_indexFiel)=>{
          valueFieldArray.forEach((_itemField,_indexField)=>{
            value.push( (item[_itemField] || item['data'][_itemField]) + (_that.referConfig.valueSep?_that.referConfig.valueSep:' '));
          })
        }else {
@@ -313,14 +313,15 @@
          }
        }
        getList(Object.assign(params,this.params,this.query, query),page.currentPage, page.pageSize, this.url, this.method).then(res => {
          let data=[]
          if(res.data.records){
            this.data = res.data.records
            data = res.data.records
            this.page.total=res.data.total ;
          }else{
            this.data = res.data.data.records;
            data = res.data.data.records;
            this.page.total=res.data.data.total;
          }
          this.data=this.data.map(item => {
          this.data=data.map(item => {
            item.data=item.data || {}
            return {
              ...item

 Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue

@@ -5,7 +5,8 @@
               :visible.sync="visible"
               top="0"
               class="avue-dialog avue-dialog--top"
               :width="options.width|| '80%'">
               :width="options.width|| '80%'"
               :height="options.height|| 'auto'">
      <avue-crud :option="option"
                 :table-loading="loading"
                 :data="data"
@@ -305,7 +306,7 @@
      this.selectionList.forEach((item,_index) =>{
        if(isMutiValue){
          var valueFieldArray = _that.props.value.split(",");
          valueFieldArray.forEach((_itemField,_indexFiel)=>{
          valueFieldArray.forEach((_itemField,_indexField)=>{
            value.push( (item[_itemField] || item['data'][_itemField]) + (_that.referConfig.valueSep?_that.referConfig.valueSep:' '));
          })
        }else {
@@ -371,14 +372,15 @@
          }
        }
        getList(Object.assign(params,this.params,this.query, query),page.currentPage, page.pageSize, this.url).then(res => {
          let data=[]
          if(res.data.records){
            this.data = res.data.records
            data = res.data.records
            this.page.total=res.data.total ;
          }else{
            this.data = res.data.data.records;
            data = res.data.data.records;
            this.page.total=res.data.data.total;
          }
          this.data=this.data.map(item => {
          this.data=data.map(item => {
            item.data=item.data || {}
            return {
              ...item

 Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/config/BladeResourceServerConfiguration.java

@@ -38,6 +38,7 @@
            .antMatchers(
                "/actuator/**",
                "/oauth/captcha",
                "/oauth/passwordFreeLogin",
                "/oauth/logout",
                "/oauth/clear-cache",
                "/oauth/render/**",

 Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/endpoint/BladeTokenEndPoint.java

@@ -32,16 +32,34 @@
import org.springblade.core.tool.support.Kv;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.core.tool.utils.WebUtil;
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;
import org.springframework.security.authentication.InsufficientAuthenticationException;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.oauth2.common.OAuth2AccessToken;
import org.springframework.security.oauth2.common.OAuth2RefreshToken;
import org.springframework.security.oauth2.common.exceptions.InvalidClientException;
import org.springframework.security.oauth2.common.exceptions.InvalidGrantException;
import org.springframework.security.oauth2.common.exceptions.InvalidRequestException;
import org.springframework.security.oauth2.common.exceptions.UnsupportedGrantTypeException;
import org.springframework.security.oauth2.common.util.OAuth2Utils;
import org.springframework.security.oauth2.provider.AuthorizationRequest;
import org.springframework.security.oauth2.provider.ClientDetails;
import org.springframework.security.oauth2.provider.ClientDetailsService;
import org.springframework.security.oauth2.provider.TokenRequest;
import org.springframework.security.oauth2.provider.endpoint.TokenEndpoint;
import org.springframework.security.oauth2.provider.token.TokenStore;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.util.StringUtils;
import org.springframework.web.HttpRequestMethodNotSupportedException;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;

import java.security.Principal;
import java.util.Collections;
import java.util.Map;

import javax.servlet.http.HttpSession;
import java.time.Duration;

 Source/UBCS/ubcs-auth/src/main/java/com/vci/ubcs/auth/endpoint/PwdFreeLoginEndpoint.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,95 @@
//package com.vci.ubcs.auth.endpoint;
//
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.http.HttpStatus;
//import org.springframework.http.ResponseEntity;
//import org.springframework.security.core.Authentication;
//import org.springframework.security.oauth2.common.OAuth2AccessToken;
//import org.springframework.security.oauth2.provider.ClientDetailsService;
//import org.springframework.security.oauth2.provider.OAuth2RequestFactory;
//import org.springframework.security.oauth2.provider.TokenGranter;
//import org.springframework.security.oauth2.provider.TokenRequest;
//import org.springframework.security.oauth2.provider.endpoint.TokenEndpoint;
//import org.springframework.security.oauth2.provider.token.AuthorizationServerTokenServices;
//import org.springframework.stereotype.Component;
//import org.springframework.util.LinkedMultiValueMap;
//import org.springframework.util.MultiValueMap;
//import org.springframework.web.HttpRequestMethodNotSupportedException;
//import org.springframework.web.bind.annotation.PostMapping;
//import org.springframework.web.bind.annotation.RequestMapping;
//import org.springframework.web.bind.annotation.RequestMethod;
//import org.springframework.web.bind.annotation.RequestParam;
//
//import java.util.Map;
//
///**
// * å…å¯†ç™»å½•
// * @author ludc
// * @date 2023/9/12 18:03
// */
//@Component
//public class PwdFreeLoginEndpoint extends TokenEndpoint {
//
//
//    @Autowired
//    private AuthorizationServerTokenServices tokenServices;
//
//    @Autowired
//    private ClientDetailsService clientDetailsService;
//
//    /*@Autowired
//    private OAuth2RequestFactory requestFactory;
//
//    @Autowired
//    private TokenGranter tokenGranter;*/
//
//    @RequestMapping(value = "/oauth/password-free-login",method = RequestMethod.GET)
//    public ResponseEntity<OAuth2AccessToken> getPasswordFreeLogin(@RequestParam Map<String, String> parameters) throws HttpRequestMethodNotSupportedException {
//        return postPasswordFreeLogin(parameters);
//    }
//
//    @RequestMapping(value = "/oauth/password-free-login",method = RequestMethod.POST)
//    public ResponseEntity<OAuth2AccessToken> postPasswordFreeLogin(@RequestParam Map<String, String> parameters) throws HttpRequestMethodNotSupportedException {
//        // åˆ¤æ–­æ˜¯å¦æ»¡è¶³å…å¯†ç™»å½•çš„条件
//        if (isSkipLogin(parameters)) {
//            // ç”Ÿæˆè®¿é—®ä»¤ç‰Œ
//            OAuth2AccessToken accessToken = createAccessToken(parameters);
//            // è¿”回访问令牌
//            return ResponseEntity.ok(accessToken);
//        }
//
//        // ä¸æ»¡è¶³å…å¯†ç™»å½•æ¡ä»¶ï¼Œè¿”回错误信息
//        return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build();
//    }
//
//    private boolean isSkipLogin(Map<String, String> parameters) {
//        // æ ¹æ®å…·ä½“需求判断是否满足免密登录的条件
//        // ä¾‹å¦‚，判断请求参数中是否包含某个特定的标识符
//        return parameters.containsKey("skipLogin");
//    }
//
//    private OAuth2AccessToken createAccessToken(Map<String, String> parameters) throws HttpRequestMethodNotSupportedException {
//        // æž„造请求参数
//        MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
//        for (Map.Entry<String, String> entry : parameters.entrySet()) {
//            params.add(entry.getKey(), entry.getValue());
//        }
//
//        // è°ƒç”¨TokenEndpoint的postAccessToken方法生成访问令牌
//        //return postAccessToken(PrincipalUtils.getPrincipal(), params).getBody();
//        return null;
//    }
//
//    private ResponseEntity<OAuth2AccessToken> postAccessToken(Authentication authentication, MultiValueMap<String, String> parameters) throws HttpRequestMethodNotSupportedException {
//        // æž„造请求
//        // TokenRequest tokenRequest = requestFactory.createTokenRequest(parameters, clientDetailsService.loadClientByClientId("your-client-id"));
//
//        // ç”Ÿæˆè®¿é—®ä»¤ç‰Œ
//        // OAuth2AccessToken accessToken = tokenGranter.grant("password", tokenRequest);
//
//        // è¿”回访问令牌
//        //return ResponseEntity.ok(accessToken);
//        return null;
//    }

//}

 Source/UBCS/ubcs-codeApply/pom.xml

@@ -12,7 +12,9 @@
        <vciplt.version>2022.RELEASE</vciplt.version>
        <old.spring.version>3.2.0.RELEASE</old.spring.version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <java.version>1.8</java.version>
        <java.version>1.7</java.version>
        <maven.compiler.source>7</maven.compiler.source>
        <maven.compiler.target>7</maven.compiler.target>
    </properties>
    <artifactId>ubcs-codeApply</artifactId>
    <dependencies>
@@ -66,4 +68,18 @@
            <url>http://nexus.vci-tech.com:9000/repository/maven-snapshots/</url>
        </snapshotRepository>
    </distributionManagement>
<!--    <build>-->
<!--        <plugins>-->
<!--            <plugin>-->
<!--                <groupId>org.apache.maven.plugins</groupId>-->
<!--                <artifactId>maven-compiler-plugin</artifactId>-->
<!--                <version>3.10.1</version>-->
<!--                <configuration>-->
<!--                    <source>1.7</source>-->
<!--                    <target>1.7</target>-->
<!--                </configuration>-->
<!--            </plugin>-->
<!--        </plugins>-->
<!--    </build>-->

</project>

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410Dialog.java

@@ -32,7 +32,7 @@
    private Map<String, String> attrNameAndValMap = new LinkedHashMap();//存储属性名称（包含内部名称和外部名称）和对应的值
    private String tokenUrl= ConfigUtils.getConfigValue("410.code.token.url","http://127.0.0.1:37000/ubcs-auth/oauth/token");
    private String[] fields;
    private String[] Values;
    private String[] values;
    /**
     * å­˜å‚¨åˆ†ç±»çš„Map,key:分类名称，value：分类值
     */
@@ -50,6 +50,9 @@
    public CodeApplyFor410Dialog(JDialog dialog, String clsfName, String deptName) {
        this(dialog, "pdmUser", clsfName, deptName,new String[]{});
    }
    public CodeApplyFor410Dialog(JDialog dialog, String clsfName, String deptName,String[] fields,String[] values) {
        this(dialog, "pdmUser", clsfName, deptName,new String[]{},fields,values);
    }
    public CodeApplyFor410Dialog(Frame frame, String clsfName, String deptName,String[] fields,String[] values){
        this.setModal(true);
        parentComponet = frame;
@@ -57,7 +60,7 @@
        this.clsfName = clsfName;
        this.deptName = deptName;
        this.fields=fields;
        this.Values=values;
        this.values=values;
        //this.libName = libName;
        init();

@@ -89,6 +92,23 @@
            this.deptName = deptName;
            //    this.libName = libName;

            init();
        } catch (Exception e) {
            e.printStackTrace();
        }
    }

    public CodeApplyFor410Dialog(JDialog dialog, String userName, String clsfName, String deptName, String[] libName,String[] fields,String[] values) {
        super(dialog, true);
        VCISwingUtil.setClientMainFrame(new Frame());
        try {
            this.setModal(true);
            parentComponet = dialog;
            this.userName = userName;
            this.clsfName = clsfName;
            this.deptName = deptName;
            this.fields      = fields;
            this.values      = values;
            init();
        } catch (Exception e) {
            e.printStackTrace();
@@ -152,7 +172,14 @@
    private void bulidPal() throws Exception {
        this.setDefaultCloseOperation(DISPOSE_ON_CLOSE);
        this.setTitle("代码申请");
        mainPal = new CodeApplyPanelFor410(this,tokenUserObject, true, clsfName, deptName,libName);
        Map<String , String> displayValues = new HashMap<>();
        if(fields != null && fields.length > 0 && values !=null && values.length > 0){
            for (int i = 0; i < fields.length; i++) {
                displayValues.put(fields[i] , values[i]);
            }
        }

        mainPal = new CodeApplyPanelFor410(this,tokenUserObject, true, clsfName, deptName,libName,displayValues);

        VCIJPanel btnPal = new VCIJPanel();
        btnPal.add(okBtn);

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410MainPanel.java

@@ -32,7 +32,6 @@
import java.util.*;
import java.util.List;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

public class CodeApplyFor410MainPanel  extends VCIJPanel {

@@ -84,8 +83,12 @@
    private StringBuffer tempStr= new StringBuffer();//可变码段的值;
    private  String  levelRes="";
    private String[] specialSecVals = new String[0];
    private RMDataTransmitObject transmitForRMData = null;
    private RMDataTransmitObject transmitForRMData = new RMDataTransmitObject();
    private CodeRuleVO codeRuleVO=null;
    /**
     * å­˜å‚¨å±žæ€§å’Œå€¼çš„Map,key,用于默认值的显示
     */
    private Map<String,String> displayValues = new HashMap<>();
    /**
     * å±žæ€§ID与属性对应的控件之间的映射MAP
     */
@@ -117,11 +120,12 @@
        this.currentCodeClassifyTemplateVO=currentCodeClassifyTemplateVO;
    }

    public CodeApplyFor410MainPanel(TransmitTreeObject transTreeObject,TokenUserObject tokenUserObject,String deptName,CodeClassifyTemplateVO currentCodeClassifyTemplateVO) {
    public CodeApplyFor410MainPanel(TransmitTreeObject transTreeObject,TokenUserObject tokenUserObject,String deptName,CodeClassifyTemplateVO currentCodeClassifyTemplateVO,Map displayValues) {
        this.transTreeObject = transTreeObject;
        this.tokenUserObject = tokenUserObject;
        this.deptName = deptName;
        this.currentCodeClassifyTemplateVO=currentCodeClassifyTemplateVO;
        this.displayValues = displayValues;
    }

    /**
@@ -163,8 +167,10 @@
                }
            }
        }else{
            VCIOptionPane.showMessage(this,r.getMsg());
        }
            if(!r.getMsg().equals("当前主题库分类，以及它的所有的上级分类都没有设置编码规则")){
                VCIOptionPane.showMessage(this,r.getMsg());
                }
            }
        /**加载规则对应的码段信息**/
        if(codeRuleVO!=null){
            List<CodeBasicSecVO> codeBasicSecVOList=codeRuleVO.getSecVOList();
@@ -590,10 +596,10 @@
                        if(codeClassifyValueList.size()>1) {
                            secCombo.addItem(new CodeClassifyValue());
                        }
                        codeClassifyValueList.stream().forEach(codeClassifyValue -> {
                        for (CodeClassifyValue codeClassifyValue : codeClassifyValueList) {
                            secCombo.addItem(codeClassifyValue);
                            valueOidList.add(codeClassifyValue.getOid());
                        });
                        }
                    }
                    secIdTOListValueOidMap.put(secObj.getOid(),valueOidList);
                    /**代码项下拉事件**/
@@ -632,11 +638,11 @@
                    if(fixedValueVOList.size() >1) {
                        secCombo.addItem(new CodeFixedValue());
                    }
                    fixedValueVOList.stream().forEach(codeFixedValueVO -> {
                    for (CodeFixedValueVO codeFixedValueVO : fixedValueVOList) {
                        CodeFixedValue codeFixedValue=new CodeFixedValue();
                        BeanUtilForVCI.copyPropertiesIgnoreCase(codeFixedValueVO,codeFixedValue);
                        secCombo.addItem(codeFixedValue);
                    });
                    }
                    /**当系统选择的是指定码段值时，组别代号的码段系统不显示 Begin**/
                    /*FixCodeValObject selObj = (FixCodeValObject) secCombo.getSelectedItem();
                    if(isSpecialRuleFlag && (secObj.getName().equals(specialControlSecName) && secValMap.containsKey(selObj.getValue())) || secValMap.containsKey(getControlSecSelectValue())) {
@@ -742,10 +748,16 @@
        transmit.setRmTypeObject(codeClassify);
        if(currentCodeClassifyTemplateVO!=null) {
            transmit.setTemplateId(templateId);
            Map<String, CodeClassifyTemplateAttrVO> tempPropObjMapsByInnerName = currentCodeClassifyTemplateVO.getAttributes().stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
            Map<String, CodeClassifyTemplateAttrVO> tempPropObjMapsByInnerName = new HashMap<>();
            for (CodeClassifyTemplateAttrVO attribute : currentCodeClassifyTemplateVO.getAttributes()) {
                tempPropObjMapsByInnerName.put(attribute.getId().toLowerCase(Locale.ROOT),attribute);
            }
            transmit.setClassifyCode(codeClassify.getId());
            transmit.setTempPropObjMapsByInnerName(tempPropObjMapsByInnerName);
            Map<String, CodeClassifyTemplateAttrVO> tempPropObjsMap = currentCodeClassifyTemplateVO.getAttributes().stream().collect(Collectors.toMap(s -> s.getOid().toLowerCase(Locale.ROOT), t -> t));
            Map<String, CodeClassifyTemplateAttrVO> tempPropObjsMap = new HashMap<>();
            for (CodeClassifyTemplateAttrVO attribute : currentCodeClassifyTemplateVO.getAttributes()) {
                tempPropObjsMap.put(attribute.getOid().toLowerCase(Locale.ROOT),attribute);
            }
            transmit.setTempPropObjsMap(tempPropObjsMap);
            transmit.setTemplateObject(currentCodeClassifyTemplateVO);
            transmit.setTempPropObjsList(this.currentCodeClassifyTemplateVO.getAttributes());
@@ -785,7 +797,7 @@
                if (index >= realAttrs.length) {
                    break;
                }
                CodeClassifyTemplateAttrVO attrObj = realAttrs[index];
                final CodeClassifyTemplateAttrVO attrObj = realAttrs[index];

                /***如果模板配置了引用模板，属性名称列表添加链接进行处理 BEGIN**/
                //ADD BY liujw
@@ -951,10 +963,19 @@
                for (int i = 0; i < objs.length; i++) {
                    objs[i] = new AttrRangObjectWarper(keyValues[i]);
                    model.addElement(objs[i]);

                    specMap.put(objs[i].toString(), comboBoxIndex++);
                }
                cbx.setModel(model);
                if(displayValues.containsKey(attrObj.getId())){
//                    cbx.setSelectedItem(displayValues.get(attrObj.getId()));
//                    cbx.setSelectedIndex(3);
                    for (int i = 0; i < objs.length; i++) {
                        if(objs[i].getKeyValue().getKey().equals(displayValues.get(attrObj.getId()))){
                            cbx.setSelectedIndex(i);
                        }
                    }
                    cbx.setEnabled(false);
                }
                compt = cbx;
            }
        } else if(StringUtils.isNotBlank(attrObj.getReferConfig())){//参照的需要设置成下拉框，并且只读
@@ -968,34 +989,69 @@
            cbx.setModel(model);
            compt = cbx;
        } else { // ä¸å­˜åœ¨å–值范围则按类型生成不同的控件
             if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTBoolean)) { // Boolean类型
             if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTBoolean.toString())) { // Boolean类型
                VCIJComboBox cbx = new VCIJComboBox();
                DefaultComboBoxModel model = new DefaultComboBoxModel();
                model.addElement("0");
                model.addElement("1");
                cbx.setModel(model);
                if(displayValues.containsKey(attrObj.getId())){
                    cbx.setSelectedIndex(Integer.parseInt(displayValues.get(attrObj.getId())));
                    cbx.setEnabled(false);
                    return cbx;
                }
                compt = cbx;
            } else if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTDate)) { // æ—¥æœŸç±»åž‹
                compt = new VCIJCalendarPanel("yyyy-MM-dd",
                    attrObj.getRequireFlag().equals("true"), true, false);
            } else if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTDateTime)) { // æ—¥æœŸç±»åž‹
                 compt = new VCIJCalendarPanel("yyyy-MM-dd HH:mm:ss",
            } else if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTDate.toString())) { // æ—¥æœŸç±»åž‹
                 VCIJCalendarPanel aTrue = new VCIJCalendarPanel("yyyy-MM-dd",
                     attrObj.getRequireFlag().equals("true"), true, false);
             }else if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTTime)) { // æ—¥æœŸç±»åž‹
                 compt = new VCIJCalendarPanel("HH:mm:ss",
                 if(displayValues.containsKey(attrObj.getId())){
                     aTrue.setDateString(displayValues.get(attrObj.getId()));
                     aTrue.setEnabled(false);
                     return aTrue;
                 }
                 compt = aTrue;
            } else if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTDateTime.toString())) { // æ—¥æœŸç±»åž‹
                 VCIJCalendarPanel aTrue = new VCIJCalendarPanel("yyyy-MM-dd HH:mm:ss",
                     attrObj.getRequireFlag().equals("true"), true, false);
                 if(displayValues.containsKey(attrObj.getId())){
                     aTrue.setDateString(displayValues.get(attrObj.getId()));
                     aTrue.setEnabled(false);
                     return aTrue;
                 }
                 compt = aTrue;
             }else if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTTime.toString())) { // æ—¥æœŸç±»åž‹
                 VCIJCalendarPanel aTrue = new VCIJCalendarPanel("HH:mm:ss",
                     attrObj.getRequireFlag().equals("true"), true, false);
                 if(displayValues.containsKey(attrObj.getId())){
                     aTrue.setDateString(displayValues.get(attrObj.getId()));
                     aTrue.setEnabled(false);
                     return aTrue;
                 }
                 compt = aTrue;
             }
             else if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTDouble)||attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTLong)) { // Real类型
             else if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTDouble.toString())||attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTLong.toString())) { // Real类型
                RealTextField txt = new RealTextField("");
                txt.setRequired(attrObj.getRequireFlag().equals("true"));
                if(displayValues.containsKey(attrObj.getId())){
                    txt.setText(displayValues.get(attrObj.getId()));
                    txt.setEditable(false);
                }
                compt = txt;
            } else if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTInteger)) { // Integer类型
            } else if (attrObj.getAttributeDataType().equals(VciFieldTypeEnum.VTInteger.toString())) { // Integer类型
                IntegerTextField txt = new IntegerTextField("");
                txt.setRequired(attrObj.getRequireFlag().equals("true"));
                if(displayValues.containsKey(attrObj.getId())){
                     txt.setText(displayValues.get(attrObj.getId()));
                     txt.setEditable(false);
                }
                compt = txt;
            }
             else{
                 VCIJTextField txt = new VCIJTextField(this,attrObj.getRequireFlag().equals("true"));
                 if(displayValues.containsKey(attrObj.getId())){
                     txt.setText(displayValues.get(attrObj.getId()));
                     txt.setEditable(false);
                 }
                 compt = txt;
                 textCompts.add(txt);
             }
@@ -1153,7 +1209,8 @@
    private void getComptAttrValue( CodeClassifyTemplateAttrVO  tempPropObj, LinkedHashMap<String, JComponent> attrIdToCtrlMaps) {
        Map<String,String> dataMap=new HashMap<>();
        Map<String,String> condtionMap=new HashMap<>();
        attrIdToCtrlMaps.forEach((key,compt)->{
        for(String key: attrIdToCtrlMaps.keySet()){
            JComponent compt = attrIdToCtrlMaps.get(key);
            String value = "";
            if (compt instanceof JTextComponent) {
                value = ((JTextComponent) compt).getText();
@@ -1170,7 +1227,7 @@
            }
            dataMap.put(key,value);
            condtionMap.put("dataMap["+key+"]",value);
        });
        }
        condtionMap.put("componentRuleValue",tempPropObj.getComponentRule());
        Map<String,String> headerMap=new HashMap<>();
        headerMap.put("Blade-Auth",this.tokenUserObject.getAccess_token());
@@ -1263,7 +1320,7 @@
        dialog.setVisible(true);
    }

    private void doSearch(VCIJComboxBox comboxBox,CodeBasicSecVO secObj){
    private void doSearch(final VCIJComboxBox comboxBox, CodeBasicSecVO secObj){
        if(StringUtils.isBlank(secObj.getReferConfig())){
            VCIOptionPane.showMessage(this,"参照配置信息不正确,请核对！");
            return;
@@ -1552,7 +1609,10 @@
        LinkedList<String> listValues = new LinkedList<String>();
        // å„属性的类型
        LinkedList<String> listDataTypes = new LinkedList<String>();
        Map<String,CodeClassifyTemplateAttrVO> codeClassifyTemplateAttrVOMap=transmitForRMData.getTempPropObjsList().stream().collect(Collectors.toMap(s -> s.getId(), t -> t));
        Map<String,CodeClassifyTemplateAttrVO> codeClassifyTemplateAttrVOMap = new HashMap<>();
        for (CodeClassifyTemplateAttrVO codeClassifyTemplateAttrVO : transmitForRMData.getTempPropObjsList()) {
            codeClassifyTemplateAttrVOMap.put(codeClassifyTemplateAttrVO.getId(),codeClassifyTemplateAttrVO);
        }
        Iterator<String> keys = attrIdToCtrlMaps.keySet().iterator();
        JComponent compt = null;
        JComponent firstCompt = null;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyFor410SearchProvider.java

@@ -13,6 +13,7 @@
import com.vci.rmip.code.client.codeapply.Apply410.object.R;
import com.vci.rmip.code.client.codeapply.Apply410.utils.HttpUtil;
import com.vci.rmip.code.client.codeapply.Apply410.utils.ListUtil;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO;
import com.vci.rmip.code.client.codeapply.Apply410.utils.ConfigUtils;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
@@ -36,10 +37,10 @@
        CodeClassifyTemplateVO codeClassifyTemplateVO=this.dialog.getOwnerPanel().getCurrentCodeClassifyTemplateVO();
        if(codeClassifyTemplateVO!=null){
            if(!CollectionUtils.isEmpty(codeClassifyTemplateVO.getAttributes())){
                codeClassifyTemplateVO.getAttributes().stream().forEach(codeClassifyTemplateAttrVO -> {
                for (CodeClassifyTemplateAttrVO codeClassifyTemplateAttrVO : codeClassifyTemplateVO.getAttributes()) {
                    fieldList.add(codeClassifyTemplateAttrVO.getId());
                    nameList.add(codeClassifyTemplateAttrVO.getName());
                });
                }
            }
        }
        fields = fieldList.toArray(new String[]{});
@@ -61,11 +62,11 @@
        String data="";
        for (String field:fields){
            if(defaultDataMap.containsKey(field+"_text")){
                 data=defaultDataMap.getOrDefault(field+"_text","");
                 data=defaultDataMap.get(field+"_text") ;
            }else if(defaultDataMap.containsKey(field+"Text")){
                data=defaultDataMap.getOrDefault(field+"Text","");
                data=defaultDataMap.get(field+"Text") ;
            }else{
                data=defaultDataMap.getOrDefault(field,"");
                data=defaultDataMap.get(field);
            }

            res.setPropertyValue(getColumns()[i++], data);
@@ -108,11 +109,11 @@
        List<Map>  dataList= dataGrid.getData();
        List<BaseModel> hostInfos=new ArrayList<>();
        //List<BaseModel> hostInfos=    ListUtil.listMapParseListObj(dataList, BaseModel.class);
        dataList.stream().forEach(map->{
        for (Map map : dataList) {
            BaseModel baseModel= ListUtil.mapParseJavaBean(map,BaseModel.class);
            baseModel.setData(map);
            hostInfos.add(baseModel);
        });
        }

        //List<BaseModel> hostInfos = (List<BaseModel>) dataList.stream().map(entity -> JSONUtil.toBean(JSONUtil.parseObj(entity), BaseModel.class)).collect(Collectors.toList());


 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410.java

@@ -59,6 +59,10 @@
     * å­˜å‚¨å±žæ€§å’Œå€¼çš„Map,key:属性名称，value：属性值
     */
    private String deptName = null;
    /**
     * å­˜å‚¨å±žæ€§å’Œå€¼çš„Map,key,用于默认值的显示
     */
    private Map displayValues = new HashMap<String,String>();

    private String[] libName = new String[]{};//代码项名称
    private VCIBaseTree leftTree = null;
@@ -78,7 +82,7 @@
     * @param deptName
     * @param libName
     */
    public CodeApplyPanelFor410(CodeApplyFor410Dialog owner , TokenUserObject tokenUserObject, boolean isIntegrate, String clsfName, String deptName, String[] libName){
    public CodeApplyPanelFor410(CodeApplyFor410Dialog owner , TokenUserObject tokenUserObject, boolean isIntegrate, String clsfName, String deptName, String[] libName,Map displayValues){
        this.tokenUserObject = tokenUserObject;
        this.owner =owner;
        rightMainPanel = new CodeApplyFor410MainPanel(transmitTreeObject,tokenUserObject,getCurrentCodeClassifyTemplateVO());
@@ -86,6 +90,7 @@
        this.clsfName = clsfName;
        this.deptName = deptName;
        this.libName = libName;
        this.displayValues = displayValues;
        init();
        initActionListener();
    }
@@ -188,9 +193,9 @@
            VCIOptionPane.showMessage(this,r.getMsg());
        }
        if(!CollectionUtils.isEmpty(codeClassifyList)){
            codeClassifyList.stream().forEach(codeClassify -> {
            for (CodeClassify codeClassify : codeClassifyList) {
                codeItemCombo.addItem(codeClassify);
            });
            }
            codeItemCombo.setSelectedIndex(0);
        }
        initLeftPanel();
@@ -293,7 +298,7 @@
                initBtnStatus(res);
            }
        }
        rightMainPanel = new CodeApplyFor410MainPanel(transmitTreeObject,tokenUserObject,deptName,getCurrentCodeClassifyTemplateVO());
        rightMainPanel = new CodeApplyFor410MainPanel(transmitTreeObject,tokenUserObject,deptName,getCurrentCodeClassifyTemplateVO(),displayValues);
        scrollPane.setViewportView(rightMainPanel);
        rightMainPanel.buildMainPanel(1);
        int location = jspLeftToRight.getDividerLocation();
@@ -358,7 +363,7 @@
        transmitTreeObject.setCurrentTreeNode(selectedTreeNode);
        if(selectedTreeNode.isRoot() && selectedTreeNode.getObj() instanceof String) return;
        scrollPane = new JScrollPane();
        rightMainPanel = new CodeApplyFor410MainPanel(transmitTreeObject,tokenUserObject,deptName,getCurrentCodeClassifyTemplateVO());
        rightMainPanel = new CodeApplyFor410MainPanel(transmitTreeObject,tokenUserObject,deptName,getCurrentCodeClassifyTemplateVO(),displayValues);
        scrollPane.setViewportView(rightMainPanel);
        rightMainPanel.buildMainPanel(1);
        VCIJPanel rightPanel = new VCIJPanel();

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeApplyPanelFor410ActionListener.java

@@ -25,6 +25,7 @@
    private LinkedHashMap<String, Runnable> actionMaps = new LinkedHashMap<String, Runnable>();
    boolean codeAlreadExist = false;
    private String url= ConfigUtils.getConfigValue("410.code.url","http://127.0.0.1:36014/codeApplySwingController");
    private String classifyGroupCode= ConfigUtils.getConfigValue("410.code.codeApply.classifyGroupCode");
    public CodeApplyPanelFor410ActionListener(CodeApplyPanelFor410 owner){
        this.owner = owner;
        this.initActionMap();
@@ -103,12 +104,12 @@
        codeOrderDTO.setTemplateOid(codeClassifyTemplateVO.getOid());
        codeOrderDTO.setCodeRuleOid(codeRuleVO.getOid());
        List<CodeOrderSecDTO> secDTOList=new ArrayList<>();
        keyValueList.stream().forEach(keyValue -> {
        for (KeyValue keyValue : keyValueList) {
            CodeOrderSecDTO codeOrderSecDTO=new CodeOrderSecDTO();
            codeOrderSecDTO.setSecOid(keyValue.getKey());
            codeOrderSecDTO.setSecValue(keyValue.getValue());
            secDTOList.add(codeOrderSecDTO);
        });
        }
        codeOrderDTO.setLcStatus("Released");
        codeOrderDTO.setSecDTOList(secDTOList);
        codeOrderDTO.setData(dataMap);
@@ -119,6 +120,9 @@
        String code="";
        //校验关键属性存在的数据直接返回编码
        R checkKeyAttrOnOrderR= HttpUtil.sendPost(url+"/checkKeyAttrOnOrderFordatas",object.toString(),headerMap);
        //查询当前申请编码的类型
        R checkGroupCode= HttpUtil.sendGet(url+"/checkGroupCode?oid="+codeClassify.getOid()+
            "&classifyGroupCode="+classifyGroupCode,null,headerMap);
        if(checkKeyAttrOnOrderR.isSuccess()){
            List<Map> list=(List)checkKeyAttrOnOrderR.getData();
            if(!CollectionUtils.isEmpty(list)) {
@@ -127,6 +131,15 @@
                this.owner.getApplyTxt().requestFocusInWindow();
                this.owner.getApplyTxt().selectAll();
                this.owner.setAttrNameAndValMap(attrNameAndValMap);
                if(checkGroupCode.isSuccess()){
                    if(checkGroupCode.getData().equals("true")){
                        VCIOptionPane.showMessage(this.owner, "当前分类的企业编码为："+list.get(0).get("GROUPCODE"));
                    }else{
                        VCIOptionPane.showMessage(this.owner, "当前编码分类未找到相应的集团，请检查！！");
                    }
                }else {
                    VCIOptionPane.showMessage(this.owner, "远程调用失败，请重试！");
                }
                return;
            }
        }
@@ -139,6 +152,22 @@
            this.owner.setAttrNameAndValMap(attrNameAndValMap);
        }else{
            VCIOptionPane.showMessage(this.owner,r.getMsg());
        }
        if(checkGroupCode.isSuccess()){
            if(checkGroupCode.getData().equals("false")){
                Map<String,String> applyMap = new HashMap<>();
                applyMap.put("oids",codeClassify.getOid());
                applyMap.put("btmName",codeClassify.getBtmname());
                Object applyGroupCodeData = JSONObject.toJSON(applyMap);
                R applyResult= HttpUtil.sendPost(url+"/DockingPreApplyCode/applyGroupCode",applyGroupCodeData.toString(),headerMap);
                if(!applyResult.isSuccess()){
                    VCIOptionPane.showMessage(this.owner, "集团码申请失败，"+r.getMsg());
                }else{
                    VCIOptionPane.showMessage(this.owner, "保存数据成功，等待集团码申请！");
                }
            }
        }else {
            VCIOptionPane.showMessage(this.owner, "远程调用失败，请注意！");
        }

    }
@@ -161,7 +190,8 @@
        CodeApplyFor410MainPanel rightMainPanel2 = this.owner.getRightMainPanel();
        LinkedHashMap<String, JComponent> attrInnerNameToCtrlMaps = rightMainPanel2.getAttrInnerNameToCtrlMaps();
        if(attrInnerNameToCtrlMaps!=null&&attrInnerNameToCtrlMaps.size()>0){
            attrInnerNameToCtrlMaps.forEach((key,component)->{
            for(String key : attrInnerNameToCtrlMaps.keySet()){
                JComponent component = attrInnerNameToCtrlMaps.get(key);
                if(component instanceof JTextComponent){
                    if(((JTextComponent) component).isEnabled())
                        ((JTextComponent) component).setText("");
@@ -169,7 +199,7 @@
                    if(((VCIJComboBox) component).isEnabled())
                        ((VCIJComboBox) component).setSelectedIndex(0);
                }
            });
            }
        }
        String applyCode = this.owner.getApplyCode();
        if(StringUtils.isBlank(applyCode)) {

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/CodeDataMainPanelDataProvider.java

@@ -20,7 +20,6 @@
import org.apache.commons.collections4.CollectionUtils;

import java.util.*;
import java.util.stream.Collectors;

public class CodeDataMainPanelDataProvider extends AbstractVCIJTableDataProvider<BaseModel> {
    private CodeDataMainPanel ownerPanel;
@@ -37,12 +36,12 @@
        LinkedList<String> nameList = new LinkedList<>();
        LinkedList<String> fieldList = new LinkedList<>();
        List<CodeShowFieldConfigVO> colsList=ownerPanel.getUiFormRefer().getCodeShowFieldConfigVOS();
        colsList.stream().forEach(columns->{
        for (CodeShowFieldConfigVO columns : colsList) {
            String  title= columns.getTitle();
            String field=columns.getField();
            nameList.add(title);
            fieldList.add(field);
        });
        }
        specialColumns = nameList.toArray(new String[]{});
        fields = fieldList.toArray(new String[]{});
        return specialColumns;
@@ -61,7 +60,7 @@
        VCIJTableNode<BaseModel> res = new VCIJTableNode<BaseModel>(model);
        int i=dataColumnStartIndex;
        for (String field:fields){
            String data=defaultDataMap.getOrDefault(field,"");
            String data=defaultDataMap.containsKey(field) ? defaultDataMap.get(field) : "" ;
            res.setPropertyValue(getColumns()[i++], data);
        }
        return res;
@@ -81,19 +80,18 @@
            List<CodeSrchCondConfigVO> codeSrchCondConfigVOS=uiFormRefer.getCodeSrchCondConfigVOS();
            JSONObject jsonObject=new JSONObject();
            if(!CollectionUtils.isEmpty(codeSrchCondConfigVOS)){
                codeSrchCondConfigVOS.stream().forEach(codeSrchCondConfigVO -> {
                for (CodeSrchCondConfigVO codeSrchCondConfigVO : codeSrchCondConfigVOS) {
                    String field=codeSrchCondConfigVO.getFilterField();
                    String value=codeSrchCondConfigVO.getFilterValue();
                    String filterType= codeSrchCondConfigVO.getFilterType();
                    condtionMap.put("conditionMap["+field+"]",value);
                });
                }
            }
            Map<String, String> customCondtionMap=ownerPanel.getCustomCondtionMap();
            if(customCondtionMap!=null&&customCondtionMap.size()>0){
                customCondtionMap.forEach((field, value) -> {
                    condtionMap.put("conditionMap["+field+"]",value);
                });

                for(String field : customCondtionMap.keySet()){
                    condtionMap.put("conditionMap["+field+"]",customCondtionMap.get(field));
                }
            }
            Map<String,String> headerMap=new HashMap<>();
            headerMap.put("Blade-Auth",this.ownerPanel.getTokenUserObject().getAccess_token());
@@ -116,7 +114,10 @@
        List dataList=  iPage.getRecords();
        BaseModel [] baseModels=new BaseModel[]{};
        if(!CollectionUtils.isEmpty(dataList)) {
            List<BaseModel> hostInfos = (List<BaseModel>) dataList.stream().map(entity -> JSONUtil.toBean(JSONUtil.parseObj(entity), BaseModel.class)).collect(Collectors.toList());
            List<BaseModel> hostInfos = new ArrayList<>();
            for (Object entity : dataList) {
                hostInfos.add(JSONUtil.toBean(JSONUtil.parseObj(entity),BaseModel.class));
            }
            baseModels = hostInfos.toArray(new BaseModel[]{});
        }
        return baseModels;

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/RMDataReferTempDialogActionListener.java

@@ -65,8 +65,8 @@
                if(treeNode.getObj() instanceof Tree) {
                    Tree tree =(Tree)treeNode.getObj();
                    Map<String,String> attibuteMap=    tree.getAttributes();
                    String fieldValue=attibuteMap.getOrDefault(valueField,"");
                    String textValue=attibuteMap.getOrDefault(textField,"");
                    String fieldValue=attibuteMap.containsKey(valueField) ? attibuteMap.get(valueField) : "";
                    String textValue=attibuteMap.containsKey(textField) ? attibuteMap.get(textField) : "";
                    KeyValue keyValue=new KeyValue();
                    keyValue.setKey(fieldValue);
                    keyValue.setValue(textValue);
@@ -85,8 +85,8 @@
                BaseModel baseModel=list.get(0);
                Map<String, String> defaultDataMap= VciBaseUtil.objectToMapString(list.get(0));
                defaultDataMap.putAll(baseModel.getData());
                String fieldValue=defaultDataMap.getOrDefault(valueField,"");
                String textValue=defaultDataMap.getOrDefault(textField,"");
                String fieldValue=defaultDataMap.containsKey(valueField) ? defaultDataMap.get(valueField) : "";
                String textValue=defaultDataMap.containsKey(textField) ? defaultDataMap.get(textField) : "";
                KeyValue keyValue=new KeyValue();
                keyValue.setKey(fieldValue);
                keyValue.setValue(textValue);

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/IPage.java

@@ -1,49 +1,48 @@
package com.vci.rmip.code.client.codeapply.Apply410.object;

import java.io.Serializable;
import java.util.List;
import java.util.function.Function;
import java.util.stream.Collectors;

public interface IPage<T> extends Serializable {
    List<OrderItem> orders();

    default boolean optimizeCountSql() {
        return true;
    }
//    default boolean optimizeCountSql() {
//        return true;
//    }

    default boolean optimizeJoinOfCountSql() {
        return true;
    }
//    default boolean optimizeJoinOfCountSql() {
//        return true;
//    }
//
//    default boolean searchCount() {
//        return true;
//    }
//
//    default long offset() {
//        long current = this.getCurrent();
//        return current <= 1L ? 0L : Math.max((current - 1L) * this.getSize(), 0L);
//    }

    default boolean searchCount() {
        return true;
    }
//    default Long maxLimit() {
//        return null;
//    }
//
//    default long getPages() {
//        if (this.getSize() == 0L) {
//            return 0L;
//        } else {
//            long pages = this.getTotal() / this.getSize();
//            if (this.getTotal() % this.getSize() != 0L) {
//                ++pages;
//            }
//
//            return pages;
//        }
//    }

    default long offset() {
        long current = this.getCurrent();
        return current <= 1L ? 0L : Math.max((current - 1L) * this.getSize(), 0L);
    }

    default Long maxLimit() {
        return null;
    }

    default long getPages() {
        if (this.getSize() == 0L) {
            return 0L;
        } else {
            long pages = this.getTotal() / this.getSize();
            if (this.getTotal() % this.getSize() != 0L) {
                ++pages;
            }

            return pages;
        }
    }

    default IPage<T> setPages(long pages) {
        return this;
    }
//    default IPage<T> setPages(long pages) {
//        return this;
//    }

    List<T> getRecords();

@@ -61,11 +60,11 @@

    IPage<T> setCurrent(long current);

    default <R> IPage<T> convert(Function<? super T, ? extends R> mapper) {
        List<T> collect = (List)this.getRecords().stream().map(mapper).collect(Collectors.toList());
        return this.setRecords(collect);
    }
    default String countId() {
        return null;
    }
//    default <R> IPage<T> convert(Function<? super T, ? extends R> mapper) {
//        List<T> collect = (List)this.getRecords().stream().map(mapper).collect(Collectors.toList());
//        return this.setRecords(collect);
//    }
//    default String countId() {
//        return null;
//    }
}

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/OrderItem.java

@@ -1,7 +1,7 @@
package com.vci.rmip.code.client.codeapply.Apply410.object;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;

public class OrderItem {

@@ -18,11 +18,21 @@
    }

    public static List<OrderItem> ascs(String... columns) {
        return (List) Arrays.stream(columns).map(OrderItem::asc).collect(Collectors.toList());
        List<OrderItem> orderItems = new ArrayList<>();
        for (String column : columns) {
            orderItems.add(asc(column));
        }
        return orderItems;
//            (List) Arrays.stream(columns).map(OrderItem::asc).collect(Collectors.toList());
    }

    public static List<OrderItem> descs(String... columns) {
        return (List)Arrays.stream(columns).map(OrderItem::desc).collect(Collectors.toList());
        List<OrderItem> orderItems = new ArrayList<>();
        for (String column : columns) {
            orderItems.add(desc(column));
        }
        return orderItems;
//            (List)Arrays.stream(columns).map(OrderItem::desc).collect(Collectors.toList());
    }

    private static OrderItem build(String column, boolean asc) {

 Source/UBCS/ubcs-codeApply/src/main/java/com/vci/rmip/code/client/codeapply/Apply410/object/Page.java

@@ -3,7 +3,6 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.function.Predicate;

public class Page<T> {
    private static final long serialVersionUID = 8545996863226528798L;
@@ -113,25 +112,25 @@
        return this.maxLimit;
    }

    private String[] mapOrderToArray(Predicate<OrderItem> filter) {
        List<String> columns = new ArrayList(this.orders.size());
        this.orders.forEach((i) -> {
            if (filter.test(i)) {
                columns.add(i.getColumn());
            }
//    private String[] mapOrderToArray(Predicate<OrderItem> filter) {
//        List<String> columns = new ArrayList(this.orders.size());
//        this.orders.forEach((i) -> {
//            if (filter.test(i)) {
//                columns.add(i.getColumn());
//            }
//
//        });
//        return (String[])columns.toArray(new String[0]);
//    }

        });
        return (String[])columns.toArray(new String[0]);
    }

    private void removeOrder(Predicate<OrderItem> filter) {
        for(int i = this.orders.size() - 1; i >= 0; --i) {
            if (filter.test(this.orders.get(i))) {
                this.orders.remove(i);
            }
        }

    }
//    private void removeOrder(Predicate<OrderItem> filter) {
//        for(int i = this.orders.size() - 1; i >= 0; --i) {
//            if (filter.test(this.orders.get(i))) {
//                this.orders.remove(i);
//            }
//        }
//
//    }

    public Page<T> addOrder(OrderItem... items) {
        this.orders.addAll(Arrays.asList(items));

 Source/UBCS/ubcs-codeApply/src/main/resources/properties/conf.properties

@@ -26,5 +26,4 @@
410.code.token.tenantId=000000
410.code.token.authorization=Basic c3dvcmQ6c3dvcmRfc2VjcmV0
410.code.token.contentType=application/x-www-form-urlencoded


410.code.codeApply.classifyGroupCode=wupin#appendix#renyuanku

 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeClassifyValueVO.java

@@ -23,7 +23,7 @@
    /**
    * åˆ†ç±»ç æ®µä¸»é”®æ˜¾ç¤ºæ–‡æœ¬
    */
    private String codeclassifysecoidName;
    private String codeClassifySecOidName;

    /**
    * ç å€¼åºå·
@@ -61,15 +61,15 @@
    /**
     * èŽ·å–分类码段主键显示文本
     */
    public String getCodeclassifysecoidName (){
        return codeclassifysecoidName;
    public String getCodeClassifySecOidName (){
        return codeClassifySecOidName;
    }

    /**
    * è®¾ç½®åˆ†ç±»ç æ®µä¸»é”®æ˜¾ç¤ºæ–‡æœ¬
    */
    public void setCodeclassifysecoidName (String codeclassifysecoidName){
        this.codeclassifysecoidName = codeclassifysecoidName;
    public void setCodeClassifySecOidName (String codeclassifysecoidName){
        this.codeClassifySecOidName = codeclassifysecoidName;
    }
    /**
     * èŽ·å– ç å€¼åºå·
@@ -118,16 +118,16 @@
        this.name = name;
    }


    @Override
    public String toString() {
        return "CodeClassifyValueVO{" +
                "codeClassifySecOid='" + codeClassifySecOid + '\'' +
                ", codeclassifysecoidName='" + codeclassifysecoidName + '\'' +
                ", codeClassifySecOidName='" + codeClassifySecOidName + '\'' +
                ", orderNum=" + orderNum +
                ", parentClassifyValueOid='" + parentClassifyValueOid + '\'' +
                ", id='" + id + '\'' +
                ", name='" + name + '\'' +
                "} " + super.toString();
    }

}

 Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/pagemodel/Tree.java

@@ -207,6 +207,7 @@

    }

    @Override
    public String toString() {
        return "Tree{oid='" + this.oid + '\'' + ", text='" + this.text + '\'' + ", leaf=" + this.leaf + ", showCheckbox=" + this.showCheckbox + ", checked=" + this.checked + ", children=" + this.children + ", icon='" + this.icon + '\'' + ", iconCls='" + this.iconCls + '\'' + ", parentId='" + this.parentId + '\'' + ", parentName='" + this.parentName + '\'' + ", parentBtmName='" + this.parentBtmName + '\'' + ", expanded=" + this.expanded + ", href='" + this.href + '\'' + ", index='" + this.index + '\'' + ", attributes=" + this.attributes + '}';
    }

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/config/AuthenticationInterceptor.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
package com.vci.ubcs.code.config;

import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.ModelAndView;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

/**
 * @author ludc
 * @date 2023/9/12 11:49
 */
public class AuthenticationInterceptor implements HandlerInterceptor {
    @Override
    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
        return HandlerInterceptor.super.preHandle(request, response, handler);
    }

    @Override
    public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
        HandlerInterceptor.super.postHandle(request, response, handler, modelAndView);
    }

    @Override
    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
        HandlerInterceptor.super.afterCompletion(request, response, handler, ex);
    }
}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/config/WebConfig.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,21 @@
package com.vci.ubcs.code.config;

import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

/**
 * webservice接口拦截器
 * @author ludc
 * @date 2023/9/12 11:16
 */
@Configuration
public class WebConfig implements WebMvcConfigurer {

    @Override
    public void addInterceptors(InterceptorRegistry registry) {
        registry.addInterceptor(new AuthenticationInterceptor())
            .addPathPatterns("/api/protected/**");
    }

}

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

@@ -237,4 +237,15 @@
    public R checkKeyAttrOnOrderFordatas(@RequestBody CodeOrderDTO orderDTO) throws Exception {
        return R.data(mdmEngineService.checkKeyAttrOnOrderFordatas(orderDTO));
    }

    /**
     * é›†å›¢/企业码段判断
     * @param parameter ä¼ å…¥æ•°æ® ,classifyGroupCode:配置的中的分类顶节点，oid：选择节点的oid--，nowApplyCode：当前申请编码的分类
     * @return æ‰§è¡Œç»“æžœ
     */
    @GetMapping("/checkGroupCode")
    @VciBusinessLog(operateName = "集团/企业码段判断")
    public R checkGroupCode(Map<String,String> parameter) throws Exception {
        return R.data(mdmEngineService.checkGroupCode(parameter));
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,33 @@
package com.vci.ubcs.code.controller;

import com.vci.ubcs.code.service.IPasswordFreeLoginService;
import io.swagger.annotations.Api;
import org.springblade.core.tool.api.R;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;

/**
 * @author ludc
 * @date 2023/9/12 9:07
 */
@RestController
@RequestMapping("/passwordFree")
@Api(value = "免密登录接口", tags = "免密登录接口")
public class PasswordFreeLoginController {

    @Resource
    private IPasswordFreeLoginService passwordFreeLoginService;

    @GetMapping("/login")
    public R passwordFreeLogin(String account) {
        boolean resBoolean = passwordFreeLoginService.passwordFreeLogin(account);
        return R.status(resBoolean);
    }




}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java

@@ -161,4 +161,12 @@
     * @param classifyList
     */
    void batchUpdateLcStatus(@Param("records") List<CodeClassify> classifyList);

    /**
     * å‘上查询树形结构
     *
     * @param oid åˆ†ç±»çš„主键
     * @return æ•°æ®é›†åˆ
     */
    List<CodeClassify> selectAllParents(@Param("oid") String oid);
}

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyValueMapper.java

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

    List<String> selectAllLevelChildOid(@Param("oid") String oid);

    List<String> selectChildOid(@Param("oid") String oid);

    Long countAllLevelChildOid(@Param("oid") String oid);

    String getClassifyValueStr(@Param("oid") String oid);

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

@@ -454,4 +454,10 @@
     */
    public List<Map>  checkKeyAttrOnOrderFordatas(CodeOrderDTO orderDTO) ;

    }
    /**
     * æ ¹æ®å½“前申请编码的分类，逐层往上校验是否符合属于配置的中的分类子节点的分
     * ç±»ï¼Œå¦‚果符合，则该分类申请的编码为集团码返回true，反之则为企业编码返回false
     * @param parameter ä¼ å…¥æ•°æ®,classifyGroupCode:配置的中的分类顶节点，oid：选择节点的oid
     */
    R checkGroupCode(Map<String, String> parameter);
}

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

@@ -101,7 +101,7 @@
        treeWrapperOptions.copyFromTreeQuery(treeQueryObject);
        return revisionModelUtil.doList2Trees(voList,treeWrapperOptions,(CodeClassifyValueVO s) ->{
            //可以在这里处理树节点的显示
            return s.getId() + " " + s.getName() + (FrameworkDataLCStatus.DISABLED.getValue().equalsIgnoreCase(s
            return s.getId() + " " + (Func.isNotEmpty(s.getName()) ? s.getName():"") + (FrameworkDataLCStatus.DISABLED.getValue().equalsIgnoreCase(s
                .getLcStatus()) ? (" ã€åœç”¨ã€‘ ") : "");
        });
    }
@@ -130,11 +130,15 @@
        BeanUtilForVCI.copyPropertiesIgnoreCase(codeClassifyValueDTO,codeClassifyValueDO);
        //填充一些默认值
        DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyValueDO, MdmBtmTypeConstant.CODE_CLASSIFY_VALUE);
        LambdaQueryWrapper<CodeClassifyValue> wrapper = Wrappers.<CodeClassifyValue>query()
            .lambda().eq(CodeClassifyValue::getCodeClassifySecOid, codeClassifyValueDO.getCodeClassifySecOid());
        if(Func.isEmpty(codeClassifyValueDO.getParentClassifyValueOid())){
            wrapper.isNull(CodeClassifyValue::getParentClassifyValueOid);
        }else{
            wrapper.eq(CodeClassifyValue::getParentClassifyValueOid, codeClassifyValueDO.getParentClassifyValueOid());
        }
        //查询
        List<CodeClassifyValue> existList = codeClassifyValueMapper.selectList(Wrappers.<CodeClassifyValue>query()
            .lambda().eq(CodeClassifyValue::getCodeClassifySecOid, codeClassifyValueDO.getCodeClassifySecOid())
            .eq(CodeClassifyValue::getParentClassifyValueOid, codeClassifyValueDO.getParentClassifyValueOid())
        );
        List<CodeClassifyValue> existList = codeClassifyValueMapper.selectList(wrapper);
        codeClassifyValueDO.setOrderNum(existList.size() + 1);
        boolean resBoolean = codeClassifyValueMapper.insert(codeClassifyValueDO) > 0;
        return resBoolean;
@@ -244,19 +248,17 @@
        VciBaseUtil.alertNotNull(codeClassifyValueDTO,"分类码段的码值数据对象",codeClassifyValueDTO.getOid(),"分类码段的码值的主键");
        CodeClassifyValue codeClassifyValueDO = selectByOid(codeClassifyValueDTO.getOid());
        R baseResult = checkIsCanDeleteForDO(codeClassifyValueDTO,codeClassifyValueDO);
        if(!baseResult.isSuccess()) {
            //找下级的，这个是可以删除的时候R
            List<String> childrenOids = codeClassifyValueMapper.selectAllLevelChildOid(codeClassifyValueDO.getOid().trim());
        if(baseResult.isSuccess()) {
            //先删除下级码值，找下级的，这个是可以删除的时候
            List<String> childrenOids = codeClassifyValueMapper.selectChildOid(codeClassifyValueDO.getOid().trim());
            if (!CollectionUtils.isEmpty(childrenOids)) {
                Collection<Collection<String>> childrenCollections = VciBaseUtil.switchCollectionForOracleIn(childrenOids);
                for(Collection<String> s : childrenCollections){
                    codeClassifyValueMapper.delete(Wrappers.<CodeClassifyValue>query().lambda().eq(CodeClassifyValue::getOid,s));
                    codeClassifyValueMapper.deleteBatchIds(s);
                }
            }
        }else{
            return baseResult;
        }
        //执行删除操作
        //执行删除操作，再删除父的码值
        boolean resBoolean = codeClassifyValueMapper.deleteById(codeClassifyValueDO.getOid()) > 0;
        return R.status(resBoolean);
    }

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

@@ -119,9 +119,6 @@
    @Resource
    private ICodeFixedValueService codeFixedValueService;

    @Resource
    private ICodeClassifyValueService codeClassifyValueService;

    /**
     * åˆ†é¡µæŸ¥è¯¢
     * @param query
@@ -129,7 +126,7 @@
     * @return
     */
    @Override
    public IPage<CodeRuleVO> gridCodeRule(Query query, Map<String,Object> conidtionMap) {
    public IPage<CodeRuleVO> gridCodeRule(Query query, Map<String,Object> conidtionMap) throws VciBaseException {
        //如果等于自己配置的管理组租户id和管理组超管账号，就不需要按照规则所有者来进行查询
        if(!(AuthUtil.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId())
            && AuthUtil.getUserId().toString().equals(nacosConfigCache.getAdminUserInfo().getUserId().toString()))
@@ -170,7 +167,7 @@
     * @return è¿”回false表示未重复
     */
    @Override
    public boolean checkCodeRuleRepeat(CodeRuleDTO codeRuleDTO){
    public boolean checkCodeRuleRepeat(CodeRuleDTO codeRuleDTO)throws VciBaseException {
        LambdaQueryWrapper<CodeRule> wrapper = Wrappers.<CodeRule>query()
            .lambda().eq(CodeRule::getId, codeRuleDTO.getId());
        if(AuthUtil.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId())){
@@ -331,7 +328,7 @@
     * @return true表示已经使用，false表示未被使用
     */
    @Override
    public boolean isAlreadyInUse(String oid) {
    public boolean isAlreadyInUse(String oid) throws VciBaseException {
        Collection<CodeClassifyVO> codeClassifyVOS = listUseRangeInCodeClassify(oid);
        if (codeClassifyVOS.size() > 0) {
            return true;
@@ -347,7 +344,7 @@
     * @return ä¸»é¢˜åº“分类使用到该编码规则的所有集合
     */
    @Override
    public Collection<CodeClassifyVO> listUseRangeInCodeClassify(String oid) {
    public Collection<CodeClassifyVO> listUseRangeInCodeClassify(String oid) throws VciBaseException {
        List<CodeClassify> codeClassifies = codeClassifyServcie.selectByWrapper(Wrappers.<CodeClassify>query().lambda().eq(CodeClassify::getCodeRuleOid, oid));
        return CodeClassifyWrapper.build().listVO(codeClassifies);
    }
@@ -400,7 +397,7 @@
     * @param oidCollections ä¸»é”®çš„集合
     * @return æ•°æ®å¯¹è±¡åˆ—表
     */
    private List<CodeRule> listCodeRuleDOByOidCollections(Collection<String> oidCollections) {
    private List<CodeRule> listCodeRuleDOByOidCollections(Collection<String> oidCollections) throws VciBaseException {
        List<CodeRule> codeRuleDOList = new ArrayList<CodeRule>();
        if (!CollectionUtils.isEmpty(oidCollections)) {
            Collection<Collection<String>> oidCollectionsList = VciBaseUtil.switchCollectionForOracleIn(oidCollections);
@@ -434,7 +431,7 @@
     * @return æ‰§è¡Œç»“æžœ
     */
    @Override
    public R updateStatus(String oid, String update) {
    public R updateStatus(String oid, String update) throws VciBaseException {
        int count = 0;
        //先查询对象
        CodeRule codeRuleDO = selectByOid(oid);
@@ -545,7 +542,7 @@
     * @return è§„则的显示对象
     */
    @Override
    public CodeRuleVO getObjectHasSecByOid(String oid) {
    public CodeRuleVO getObjectHasSecByOid(String oid) throws VciBaseException {
        CodeRule ruleDO = selectByOid(oid);
        return codeRuleDO2VO(ruleDO, true);
    }

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

@@ -746,7 +746,29 @@
        return dataList;
    }

    /**
    /**
     * æ ¹æ®å½“前申请编码的分类，逐层往上校验是否符合属于配置的中的分类子节点的分
     * ç±»ï¼Œå¦‚果符合，则该分类申请的编码为集团码返回true，反之则为企业编码返回false
     * @param parameter ä¼ å…¥æ•°æ®,classifyGroupCode:配置的中的分类顶节点，oid：选择节点的oid
     */
    @Override
    public R checkGroupCode(Map<String, String> parameter) {
        List<CodeClassify> codeClassifyList = classifyService.selectAllLevelParents(parameter.get("oid"));
        Set<String> configGroupCode = Arrays.stream(parameter.get("classifyGroupCode").split("#")).collect(Collectors.toSet());
//        Boolean checkGroupFlag = false;//是否查询到配置的顶层分类中
        for (int i = codeClassifyList.size()-1; i >= 0; i--) {
            if(configGroupCode.contains(codeClassifyList.get(i).getId())){
//                checkGroupFlag = true;
                return R.data("true");
            }
//            if(checkGroupFlag && parameter.get("nowApplyCode").equals(codeClassifyList.get(i).getId())){
//                return R.data(true);
//            }
        }
        return R.data("false");
    }

    /**
     * å°è£…关键属性的查询语句
     *
     * @param value        å½“前的值
@@ -2408,7 +2430,6 @@
        return phaseAttrService.listAttrByTemplateOidAndPhaseId(templateVO.getOid(), phase);
    }


    /**
     * è·¯å¾„上包含当前分类的所有分类信息
     *
@@ -2756,13 +2777,13 @@
            CodeSecTypeEnum.CODE_FIXED_SEC.getValue(),
            CodeSecTypeEnum.CODE_VARIABLE_SEC.getValue(),
            CodeSecTypeEnum.CODE_CLASSIFY_SEC.getValue(),
            CodeSecTypeEnum.CODE_REFER_SEC.getValue()
            CodeSecTypeEnum.CODE_REFER_SEC.getValue(),
            CodeSecTypeEnum.CODE_DATE_SEC.getValue()
        );
        // åªè¯»ç æ®µç±»åž‹
        List<String> readOnlyTypes = Arrays.asList(
            CodeSecTypeEnum.CODE_LEVEL_SEC.getValue(),
            CodeSecTypeEnum.CODE_ATTR_SEC.getValue(),
            CodeSecTypeEnum.CODE_DATE_SEC.getValue()
            CodeSecTypeEnum.CODE_ATTR_SEC.getValue()
        );
        // éšè—ç æ®µç±»åž‹
        /*List<String> hideType = Arrays.asList(
@@ -2846,7 +2867,7 @@
        } else {
            if (CollectionUtils.isEmpty(fullInfoBO.getParentClassifyVOs())) {
                //说明已经是最高层级,
                throw new VciBaseException("当前主题库分类，以及它的所有的上级分类都没有设置编码规则");
                throw new ServiceException("当前主题库分类，以及它的所有的上级分类都没有设置编码规则");
            }
            List<CodeClassifyVO> parentClassifyVOList = fullInfoBO.getParentClassifyVOs().stream().sorted((o1, o2) -> o1.getDataLevel().compareTo(o2.getDataLevel())).collect(Collectors.toList());
            //从最高的level开始获取
@@ -2858,7 +2879,7 @@
                }
            }
            if (StringUtils.isBlank(codeRuleOid)) {
                throw new VciBaseException("当前主题库分类，以及它的所有的上级分类都没有设置编码规则");
                throw new ServiceException("当前主题库分类，以及它的所有的上级分类都没有设置编码规则");
            }
        }
        return ruleService.getObjectHasSecByOid(codeRuleOid);

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

@@ -2329,12 +2329,17 @@
        sb.append(" where 1=1 ");
        sb.append(" and lastr=1 and lastv=1" );
        if(isCodeOrGroupCode) {
            sb.append(" and groupcode in (");
            sb.append(" and ( groupcode in (");
            sb.append(VciBaseUtil.toInSql(codeDataMap.keySet().toArray(new String[0])));
            sb.append(")");
            sb.append(" or id in (");
            sb.append(VciBaseUtil.toInSql(codeDataMap.keySet().toArray(new String[0])));
            sb.append("))");
        }else{
            sb.append(" and id in (");
            sb.append(VciBaseUtil.toInSql(codeDataMap.keySet().toArray(new String[0])));
            sb.append(")");
        }
        sb.append(VciBaseUtil.toInSql(codeDataMap.keySet().toArray(new String[0])));
        sb.append(")");

        List<Map<String,String>> dataMapList=commonsMapper.queryByOnlySqlForMap(sb.toString());
        List<ClientBusinessObject> cboList=    ChangeMapTOClientBusinessObjects(dataMapList);
@@ -2424,7 +2429,7 @@
                    List<CodeAllCode>newCodeAllCodeList= codeAllCodeService.selectByWrapper(Wrappers.<CodeAllCode>query().lambda().eq(CodeAllCode::getCreateCodeOid, cbo.getOid()));
                    log.info("codeCbos size:" + newCodeAllCodeList.size());
                    if (!CollectionUtils.isEmpty(newCodeAllCodeList)) {
                        CodeAllCode codeCbo = codeAllCodeList.get(0);
                        CodeAllCode codeCbo = newCodeAllCodeList.get(0);
                        log.info("codeCbos code:" + codeCbo.getId());
                        codeCbo.setLcStatus(CodeDefaultLC.TASK_BACK.getValue());
                        codeAllCodeList.add(codeCbo);
@@ -2616,7 +2621,21 @@
        //没有限制分类，但是一个模板只可能在一个业务类型里面，所以直接查询这个业务类型即可

        if (!CollectionUtils.isEmpty(conditionMap)) {
            final String[] sql = {"select count(*) from " + VciBaseUtil.getTableName(classifyFullInfo.getTopClassifyVO().getBtmTypeId()) + " t where 1 = 1 "};
            String tableName="";
            R<BtmTypeVO> r = btmTypeClient.getAllAttributeByBtmId(templateVO.getBtmTypeId());
            if(r.isSuccess()) {
                BtmTypeVO btmTypeVO = r.getData();
                if (btmTypeVO != null) {
                    tableName = btmTypeVO.getTableName();

                }
            }
            if (StringUtils.isBlank(tableName)) {
                String errormsg="根据业务类型为查询到相关业务表";
                errorMap.put(orderDTO.getId(),errorMap.getOrDefault(orderDTO.getId(),"")+errormsg);
                return;
            }
            final String[] sql = {"select count(*) from " + tableName + " t where 1 = 1 "};
            conditionMap.forEach((key, value) -> {
                if(StringUtils.isBlank(value)||value.equals(QueryOptionConstant.ISNULL)){
                    sql[0] += " and " + key + " is null ";
@@ -2836,6 +2855,9 @@
            ClientBusinessObject sysDataObject= codeSystemObjectMap.get(code);
            if(isCodeOrGroupCode){
                code=sysDataObject.getAttributeValue("GROUPCODE");
                if(StringUtils.isBlank(code)){
                    code=sysDataObject.getId();
                }
            }
            CodeOrderDTO orderDTO = new CodeOrderDTO();
            if(codeDataMap.containsKey(code)){
@@ -2844,11 +2866,7 @@
                orderDTO.setCodeClassifyOid(codeClassifyVO.getOid());//分类主键
                orderDTO.setOid(sysDataObject.getOid());//数据oid
                orderDTO.setLcStatus(rowDatas.getStatus());//状态
                if(isCodeOrGroupCode){
                    orderDTO.setId(sysDataObject.getId());
                }else{
                    orderDTO.setId(code);
                }
                orderDTO.setId(code);
                orderDTO.setTs(sysDataObject.getTs());
                orderDTO.setBtmname(codeClassifyVO.getBtmname());//业务类型
                orderDTO.setDescription("集成调用:更新");//数据描述

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

@@ -1,8 +1,12 @@
package com.vci.ubcs.code.service.impl;

import com.vci.ubcs.code.service.IPasswordFreeLoginService;
import com.vci.ubcs.code.util.HttpUtils;
import org.apache.commons.collections4.MultiValuedMap;
import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
@@ -13,6 +17,9 @@
import org.springframework.http.HttpMethod;
import org.springframework.web.client.RestTemplate;

import javax.annotation.Resource;
import java.util.List;

/**
 * å…å¯†ç™»å½•æœåŠ¡
 * @author ludc
@@ -21,8 +28,22 @@
@Service
public class PasswordFreeLoginServiceImpl implements IPasswordFreeLoginService {

    private RestTemplate restTemplate;
    // é€šè¿‡æœåŠ¡æ³¨å†Œä¸­å¿ƒèŽ·å–网关的端口号
    @Autowired
    private DiscoveryClient discoveryClient;

    /**
     * èŽ·å–网关端口
     * @return
     */
    public String getGatewayPort() {
        List<ServiceInstance> instances = discoveryClient.getInstances("ubcs-gateway");
        if (!instances.isEmpty()) {
            ServiceInstance gatewayInstance = instances.get(0);
            return String.valueOf(gatewayInstance.getPort());
        }
        return "80";
    }

    /**
     * å…å¯†ç™»å½•
@@ -32,7 +53,7 @@
    @Override
    public boolean passwordFreeLogin(String account) {
        // å…å¯†ç™»å½•æŽ¥å£åœ°å€
        String loginUrl = "http://ubcs-auth/auth/login";
        String loginUrl = "http://localhost:"+this.getGatewayPort()+"/ubcs-auth/oauth/passwordFreeLogin?username=admin&grant_type=captcha&scope=all&type=account";

        // è®¾ç½®è¯·æ±‚头
        HttpHeaders headers = new HttpHeaders();
@@ -42,13 +63,9 @@
        MultiValueMap<String,String> bodyParams = new LinkedMultiValueMap<String,String>();
        bodyParams.add("account",account);

        // åˆ›å»ºè¯·æ±‚实体
        HttpEntity<MultiValueMap<String, String>> requestEntity = new HttpEntity<>(bodyParams, headers);

        // å‘送POST请求
        ResponseEntity<String> responseEntity = restTemplate.exchange(loginUrl, HttpMethod.POST, requestEntity, String.class);
        String responseBody = responseEntity.getBody();

        String responseBody = HttpUtils.post(loginUrl, bodyParams);
        System.out.println(responseBody);
        //拿到响应体将token存入到redis中，以account作为存储的key

        // è§£æžå“åº”体获取令牌

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

@@ -61,10 +61,10 @@
import javax.annotation.Resource;
import java.util.*;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;

import static com.vci.ubcs.code.constant.MdmEngineConstant.DEFAULT_SYNC_ATTR_LIST;
import static com.vci.ubcs.code.constant.MdmEngineConstant.IMPORT_ROW_INDEX;
import static com.vci.ubcs.code.enumpack.CodeSecTypeEnum.CODE_CLASSIFY_SEC;

/***
@@ -359,9 +359,9 @@
        boolean isPersonApplyGroupCode= personAndDeptConfig.isPersonApplyGroupCode();
        String systemCode=personData.getSystemCode();
        List<ResultMdMapping> resultMdMappingList=new ArrayList<>();
        boolean success=true;
        String message="";
        if(isUsedFlag){
            AtomicBoolean success= new AtomicBoolean(true);
            List<PersonMasterData> masterDataList=new ArrayList<>();
            List<String> fields= VciBaseUtil.str2List(personAndDeptConfig.getPersonFields());
            try {
@@ -371,7 +371,7 @@
                masterDataList = personData.getMasterData();
                String personLibrary = personAndDeptConfig.getPersonLibrary();
                if (StringUtils.isBlank(personLibrary)) {
                    success=false;
                    success.set(false);
                    log.info("集成配置缺少人员库节点信息,personLibrary->" + personLibrary);
                    throw  new Throwable("集成配置缺少人员库节点信息,personLibrary->" + personLibrary);
                }
@@ -383,12 +383,12 @@
                log.info("end：分类查询完毕");
                //获取分类模板信息
                if(codeClassifyVO==null || StringUtils.isBlank(codeClassifyVO.getOid())){
                    success=false;
                    success.set(false);
                    throw  new  Throwable ("根据配置分类的分类编号，未获取到分类信息");
                }
                CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(codeClassifyVO.getOid());
                if(templateVO==null||StringUtils.isBlank(templateVO.getOid())){
                    success=false;
                    success.set(false);
                    throw  new  Throwable ("根据传输的分类，未获取MDM系统中对应模板");
                }

@@ -440,10 +440,11 @@
                        deleteDataVOList.add(object);
                    }else{
                        String worker_category=personMasterData.getWorker_category();
                        codeList.add(personMasterData.getLm_code());

                        object.setOperate("create");
                        applyDataVOList.add(object);
                    }
                    codeList.add(personMasterData.getLm_code());
                });

                R<BtmTypeVO> r = btmTypeClient.getAllAttributeByBtmId(templateVO.getBtmTypeId());
@@ -532,10 +533,31 @@
                            orderDTO.setCodeRuleOid(ruleVO.getOid());
                            orderDTO.setSecDTOList(codeOrderSecDTOList);//存储编码
                            orderDTO.setData(rowData.getFiledValue());
                            engineService.addSaveCode(orderDTO);
                            String code=engineService.addSaveCode(orderDTO);
                            if(StringUtils.isNotBlank(code)) {
                                StringBuffer sqlsb = new StringBuffer();
                                sqlsb.append(" select * from ");
                                sqlsb.append(tableName);
                                sqlsb.append(" where 1=1 ");
                                sqlsb.append(" and lastr=1 and lastv=1");
                                sqlsb.append(" and id in (");
                                sqlsb.append(VciBaseUtil.toInSql(code));
                                sqlsb.append(")");
                                List<Map<String, String>> newDataMapList = commonsMapper.queryByOnlySqlForMap(sqlsb.toString());
                                if (!CollectionUtils.isEmpty(newDataMapList)) {
                                    String oid = StringUtils.isBlank(newDataMapList.get(0).get("OID")) ? "" : newDataMapList.get(0).get("OID");
                                    List<String> oidList = new ArrayList<>();
                                    oidList.add(oid);
                                    //如果有申请就去调用申请集团码
                                    if (isPersonApplyGroupCode) {
                                        mdmIOService.sendApplyGroupcode(oidList, templateVO.getBtmTypeId(), sysIntegrationPushTypeEnum.ACCPET_APPCODE.getValue());
                                        success.set(true);
                                        mesg = "数据保存成功，等待申请集团码";
                                    }
                                }
                            }
                        } catch (Exception e) {
                            mesg=e.getMessage();
                            e.getMessage();
                            e.printStackTrace();
                        }finally {
                            XMLResultDataObjectDetailDO x=new XMLResultDataObjectDetailDO();
@@ -547,7 +569,7 @@
                        }
                    });
                    resultDataObjectDetailDOs.addAll(xDOs);
                    boolean finalSuccess1 = success;
                    boolean finalSuccess1 = success.get();
                    String finalMessage1 = message;
                    resultDataObjectDetailDOs.stream().forEach(resultDataObjectDetailDO->{
                        ResultMdMapping resultMdMapping=new ResultMdMapping();
@@ -560,17 +582,12 @@
                        resultMdMappingList.add(resultMdMapping);
                    });
                    log.info("end：申请获取完毕");
                    //如果有申请就去调用申请集团码
                    if(isPersonApplyGroupCode){
                        List<String> oidList=new ArrayList<>();
                        mdmIOService.sendApplyGroupcode(oidList,templateVO.getBtmTypeId(),sysIntegrationPushTypeEnum.ACCPET_APPCODE.getValue());
                    }
                }
            }catch (Throwable e){
                success=false;
                success.set(false);
                message="人员数据接受失败:"+e.getMessage();
                //组织返回结果
                boolean finalSuccess = success;
                boolean finalSuccess = success.get();
                String finalMessage = message;
                masterDataList.stream().forEach(masterData -> {
                    ResultMdMapping resultMdMapping=new ResultMdMapping();
@@ -583,7 +600,7 @@
                });
            }finally {
                resultOrgData.setMessage(message);
                resultOrgData.setSuccess(success);
                resultOrgData.setSuccess(success.get());
                resultOrgData.setMdMappings(resultMdMappingList);
                Object object = JSONObject.toJSON(resultOrgData);
            }
@@ -591,7 +608,7 @@
            String data = JSONObject.toJSONString(personData);
            try {
                //记录日志
                this.saveLogs(systemCode, systemCode, data, resultStr, success, msg, "syncDataForPerson");
                this.saveLogs(systemCode, systemCode, data, resultStr, success.get(), msg, "syncDataForPerson");
            }catch (Throwable e){
                e.printStackTrace();
            }
@@ -609,10 +626,9 @@
    public ResultOrgData syncDataForOrg(OrgData orgData) {
        boolean isUsedFlag= personAndDeptConfig.isUsedFlag();
        ResultOrgData resultOrgData=new ResultOrgData();

        boolean isPersonApplyGroupCode= personAndDeptConfig.isPersonApplyGroupCode();
        List<ResultMdMapping> resultMdMappingList=new ArrayList<>();
        boolean success=true;
        AtomicBoolean success= new AtomicBoolean(true);
        String message="";
        String systemCode="";
        if(isUsedFlag){
@@ -626,7 +642,7 @@
                orgMasterDataList = orgData.getMasterData();
                String personLibrary = personAndDeptConfig.getPersonLibrary();
                if (StringUtils.isBlank(personLibrary)) {
                    success=false;
                    success.set(false);
                    log.info("集成配置缺少人员库节点信息,personLibrary->" + personLibrary);
                    throw  new Throwable("集成配置缺少人员库节点信息,personLibrary->" + personLibrary);
                }
@@ -638,12 +654,12 @@
                log.info("end：分类查询完毕");
                //获取分类模板信息
                if(codeClassifyVO==null || StringUtils.isBlank(codeClassifyVO.getOid())){
                    success=false;
                    success.set(false);
                    throw  new  Throwable ("根据配置分类的分类编号，未获取到分类信息");
                }
                CodeClassifyTemplateVO templateVO = engineService.getUsedTemplateByClassifyOid(codeClassifyVO.getOid());
                if(templateVO==null||StringUtils.isBlank(templateVO.getOid())){
                    success=false;
                    success.set(false);
                    throw  new  Throwable ("根据传输的分类，未获取MDM系统中对应模板");
                }

@@ -653,14 +669,14 @@
                List<String> codeList=new ArrayList<>();
                List<ApplyDataVO> applyDataVOList=new ArrayList<>();
                List<ApplyDataVO> deleteDataVOList=new ArrayList<>();
                orgMasterDataList.stream().forEach(personMasterData -> {
                orgMasterDataList.stream().forEach(orgMasterData -> {
                    ApplyDataVO object=new ApplyDataVO();
                    object.setCode(personMasterData.getMdm_code());//编码
                    object.setCreator(personMasterData.getCreator());//创建者
                    object.setEditor(personMasterData.getModifier());//修改者
                    object.setId(personMasterData.getPk_mdm());//主键
                    object.setCode(orgMasterData.getMdm_code());//编码
                    object.setCreator(orgMasterData.getCreator());//创建者
                    object.setEditor(orgMasterData.getModifier());//修改者
                    object.setId(orgMasterData.getPk_mdm());//主键
                    object.setStatus(CodeDefaultLC.RELEASED.getValue());//状态则需要判断
                    Map<String,String> dataMap= VciBaseUtil.objectToMapString(personMasterData);
                    Map<String,String> dataMap= VciBaseUtil.objectToMapString(orgMasterData);
                    List<ProppertyVO> proppertyVOList=new ArrayList<>();
                    /***
                     * æ ¹æ®é…ç½®æ–‡ä»¶èŽ·å–枚举值
@@ -686,14 +702,15 @@
                    });

                    object.setProp(proppertyVOList);
                    if(personMasterData.getDr()==1){
                    if(orgMasterData.getDr()==1){
                        object.setOperate("delete");//操作类型
                        deleteDataVOList.add(object);
                    }else{
                        codeList.add(personMasterData.getMdm_code());

                        object.setOperate("create");
                        applyDataVOList.add(object);
                    }
                    codeList.add(orgMasterData.getMdm_code());
                });

                R<BtmTypeVO> r = btmTypeClient.getAllAttributeByBtmId(templateVO.getBtmTypeId());
@@ -782,7 +799,29 @@
                            orderDTO.setCodeRuleOid(ruleVO.getOid());
                            orderDTO.setSecDTOList(codeOrderSecDTOList);//存储编码
                            orderDTO.setData(rowData.getFiledValue());
                            engineService.addSaveCode(orderDTO);
                            String code=engineService.addSaveCode(orderDTO);
                            if(StringUtils.isNotBlank(code)) {
                                StringBuffer sqlsb = new StringBuffer();
                                sqlsb.append(" select * from ");
                                sqlsb.append(tableName);
                                sqlsb.append(" where 1=1 ");
                                sqlsb.append(" and lastr=1 and lastv=1");
                                sqlsb.append(" and id in (");
                                sqlsb.append(VciBaseUtil.toInSql(code));
                                sqlsb.append(")");
                                List<Map<String, String>> newDataMapList = commonsMapper.queryByOnlySqlForMap(sqlsb.toString());
                                if (!CollectionUtils.isEmpty(newDataMapList)) {
                                    String oid = StringUtils.isBlank(newDataMapList.get(0).get("OID")) ? "" : newDataMapList.get(0).get("OID");
                                    List<String> oidList = new ArrayList<>();
                                    oidList.add(oid);
                                    //如果有申请就去调用申请集团码
                                    if (isPersonApplyGroupCode) {
                                        mdmIOService.sendApplyGroupcode(oidList, templateVO.getBtmTypeId(), sysIntegrationPushTypeEnum.ACCPET_APPCODE.getValue());
                                        success.set(true);
                                        mesg = "数据保存成功，等待申请集团码";
                                    }
                                }
                            }
                        } catch (Exception e) {
                            mesg=e.getMessage();
                            e.getMessage();
@@ -797,7 +836,7 @@
                        }
                    });
                    resultDataObjectDetailDOs.addAll(xDOs);
                    boolean finalSuccess1 = success;
                    boolean finalSuccess1 = success.get();
                    String finalMessage1 = message;
                    resultDataObjectDetailDOs.stream().forEach(resultDataObjectDetailDO->{
                        ResultMdMapping resultMdMapping=new ResultMdMapping();
@@ -810,17 +849,12 @@
                        resultMdMappingList.add(resultMdMapping);
                    });
                    log.info("end：申请获取完毕");
                    //如果有申请就去调用申请集团码
                    if(isPersonApplyGroupCode){
                        List<String> oidList=new ArrayList<>();
                        mdmIOService.sendApplyGroupcode(oidList,templateVO.getBtmTypeId(),sysIntegrationPushTypeEnum.ACCPET_APPCODE.getValue());
                    }
                }
            }catch (Throwable e){
                success=false;
                success.set(false);
                message="人员数据接受失败:"+e.getMessage();
                //组织返回结果
                boolean finalSuccess = success;
                boolean finalSuccess = success.get();
                String finalMessage = message;
                orgMasterDataList.stream().forEach(masterData -> {
                    ResultMdMapping resultMdMapping=new ResultMdMapping();
@@ -833,7 +867,7 @@
                });
            }finally {
                resultOrgData.setMessage(message);
                resultOrgData.setSuccess(success);
                resultOrgData.setSuccess(success.get());
                resultOrgData.setMdMappings(resultMdMappingList);
                Object object = JSONObject.toJSON(resultOrgData);
            }
@@ -841,7 +875,7 @@
            String data = JSONObject.toJSONString(orgData);
            try {
                //记录日志
                this.saveLogs(systemCode, systemCode, data, resultStr, success, msg, "syncDataForOrg");
                this.saveLogs(systemCode, systemCode, data, resultStr, success.get(), msg, "syncDataForOrg");
            }catch (Throwable e){
                e.printStackTrace();
            }

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

@@ -510,4 +510,11 @@
        </foreach>
        ;END;
    </update>

    <select id="selectAllParents" resultMap="plCodeClassifyResultMap">
        select * from PL_CODE_CLASSIFY p
            start with p.OID =#{oid}
        connect by p.oid = prior p.PARENTCODECLASSIFYOID
    </select>

</mapper>

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

@@ -9,6 +9,9 @@
        CONNECT BY PRIOR PARENTCLASSIFYVALUEOID = OID
    </select>

    <select id="selectChildOid" resultType="java.lang.String">
        select OID from PL_CODE_CLASSIFYVALUE where PARENTCLASSIFYVALUEOID =#{oid}
    </select>

    <select id="countAllLevelChildOid" resultType="java.lang.Long">
        select count(OID) countsize