代码提交

 Source/UBCS/service-systemctl-restart.sh

@@ -18,61 +18,85 @@
systemctl restart ubcs-admin.service
echo '---------------ubcs-admin æœåŠ¡é‡å¯å‘½ä»¤æ‰§è¡Œå®Œæ¯•------------------'

sleep 3

echo '--------------ubcs-applyjtcodeservice æœåŠ¡æ­£åœ¨é‡å¯------------'
yes | cp -f ./target/ubcs-applyjtcodeservice.jar /data1/ubcs/ubcs-server/ubcs_applyjtcodeservice/
systemctl restart ubcs-applyjtcodeservice.service
echo '----------ubcs-applyjtcodeservice æœåŠ¡é‡å¯å‘½ä»¤æ‰§è¡Œå®Œæ¯•----------'

sleep 3

echo '-------------------ubcs-auth æœåŠ¡æ­£åœ¨é‡å¯------------------ --'
yes | cp -f ./target/ubcs-auth.jar /data1/ubcs/ubcs-server/ubcs_auth/
systemctl restart ubcs-auth.service
echo '---------------ubcs-auth æœåŠ¡é‡å¯å‘½ä»¤æ‰§è¡Œå®Œæ¯•-------------------'

sleep 3

echo '-------------------ubcs-code æœåŠ¡æ­£åœ¨é‡å¯---------------------'
yes | cp -f ./target/ubcs-code.jar /data1/ubcs/ubcs-server/ubcs_code/
systemctl restart ubcs-code.service
echo '---------------ubcs-code æœåŠ¡é‡å¯å‘½ä»¤æ‰§è¡Œå®Œæ¯•-------------------'

sleep 3

echo '-------------------ubcs-desk æœåŠ¡æ­£åœ¨é‡å¯---------------------'
yes | cp -f ./target/ubcs-desk.jar /data1/ubcs/ubcs-server/ubcs_desk/
systemctl restart ubcs-desk.service
echo '---------------ubcs-desk æœåŠ¡é‡å¯å‘½ä»¤æ‰§è¡Œå®Œæ¯•-------------------'

sleep 3

echo '-------------------ubcs-flow æœåŠ¡æ­£åœ¨é‡å¯--------------------'
yes | cp -f ./target/ubcs-flow.jar /data1/ubcs/ubcs-server/ubcs_flow/
systemctl restart ubcs-flow.service
echo '---------------ubcs-flow æœåŠ¡é‡å¯å‘½ä»¤æ‰§è¡Œå®Œæ¯•------------------'

sleep 3

echo '-------------------ubcs-gateway æœåŠ¡æ­£åœ¨é‡å¯-----------------'
yes | cp -f ./target/ubcs-gateway.jar /data1/ubcs/ubcs-server/ubcs_gateway/
systemctl restart ubcs-gateway.service
echo '---------------ubcs-gateway æœåŠ¡é‡å¯å‘½ä»¤æ‰§è¡Œå®Œæ¯•---------------'

sleep 3

echo '-------------------ubcs-log æœåŠ¡æ­£åœ¨é‡å¯---------------------'
yes | cp -f ./target/ubcs-log.jar /data1/ubcs/ubcs-server/ubcs_log/
systemctl restart ubcs-log.service
echo '---------------ubcs-log æœåŠ¡é‡å¯å‘½ä»¤æ‰§è¡Œå®Œæ¯•-------------------'

sleep 3

echo '-------------------ubcs-omd æœåŠ¡æ­£åœ¨é‡å¯---------------------'
yes | cp -f ./target/ubcs-omd.jar /data1/ubcs/ubcs-server/ubcs_omd/
systemctl restart ubcs-omd.service
echo '---------------ubcs-omd æœåŠ¡é‡å¯å‘½ä»¤æ‰§è¡Œå®Œæ¯•-------------------'

sleep 3

echo '-------------------ubcs-report æœåŠ¡æ­£åœ¨é‡å¯-------------------'
yes | cp -f ./target/ubcs-report.jar /data1/ubcs/ubcs-server/ubcs_report/
systemctl restart ubcs-report.service
echo '---------------ubcs-report æœåŠ¡é‡å¯å‘½ä»¤æ‰§è¡Œå®Œæ¯•-----------------'

sleep 3

echo '-------------------ubcs-resource æœåŠ¡æ­£åœ¨é‡å¯------------------'
yes | cp -f ./target/ubcs-resource.jar /data1/ubcs/ubcs-server/ubcs_resource/
systemctl restart ubcs-resource.service
echo '---------------ubcs-resource æœåŠ¡é‡å¯å‘½ä»¤æ‰§è¡Œå®Œæ¯•----------------'

sleep 3

echo '-------------------ubcs-system æœåŠ¡æ­£åœ¨é‡å¯---------------------'
yes | cp -f ./target/ubcs-system.jar /data1/ubcs/ubcs-server/ubcs_system/
systemctl restart ubcs-system.service
echo '---------------ubcs-system æœåŠ¡é‡å¯å‘½ä»¤æ‰§è¡Œå®Œæ¯•-------------------'

sleep 3

echo '--------------------ubcs-user æœåŠ¡æ­£åœ¨é‡å¯----------------------'
yes | cp -f ./target/ubcs-user.jar /data1/ubcs/ubcs-server/ubcs_user/
systemctl restart ubcs-user.service

 Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java

@@ -40,8 +40,8 @@
    /**
     * nacos dev åœ°å€
     */
    //String NACOS_DEV_ADDR = "dev.vci-tech.com:38848";
    String NACOS_DEV_ADDR = "127.0.0.1:8848";
    String NACOS_DEV_ADDR = "dev.vci-tech.com:38848";
    //String NACOS_DEV_ADDR = "127.0.0.1:8848";

    /**
     * nacos prod åœ°å€

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

@@ -140,7 +140,7 @@
        return text.substring(0, text.lastIndexOf(".")) + "." + nano;
    }

    public static void main(String[] args) {
    /*public static void main(String[] args) {
        List<String> list = new ArrayList<String>() {
            {
                this.add("2020-11-12 12:12:03");
@@ -175,7 +175,7 @@
            }

        });
    }
    }*/

    public String getAsText(String dateFormat) {
        Date value = this.getValue();
@@ -185,4 +185,5 @@

        return value != null ? (new SimpleDateFormat(dateFormat)).format(value) : "";
    }

}

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

@@ -245,7 +245,6 @@
     */
    R batchUpdateCode(List<CodeOrderDTO> orderDTOList);


    /**
     * æ ‡è®°æµç¨‹ä¸­ä¸šåŠ¡æ•°æ®æ˜¯å¦é€šè¿‡
     * @param oid ä¸šåŠ¡æ•°æ®ä¸»é”®

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

@@ -88,6 +88,8 @@
import java.beans.PropertyDescriptor;
import java.lang.reflect.Method;
import java.math.BigDecimal;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.ZonedDateTime;
@@ -4196,7 +4198,7 @@
        bo.setFirstV("1");
        bo.setLastV("1");
        bo.setRevisionRule(listR.getData().get(0).getRevisionRuleId());
        bo.setVersionRule("".equals(listR.getData().get(0).getVersionRule())?"0":listR.getData().get(0).getVersionRule());
        bo.setVersionRule("".equals(listR.getData().get(0).getVersionRule())?"1":listR.getData().get(0).getVersionRule());
        if (StringUtils.isNotBlank(listR.getData().get(0).getRevisionRuleId())) {
            R<List<RevisionRuleVO>> revisionRuleVO = revisionRuleClient
                    .selectByIdCollection(Collections.singletonList(listR.getData().get(0).getRevisionRuleId().toLowerCase()));
@@ -4217,7 +4219,7 @@
        bo.setId("");
        bo.setName("");
        bo.setDescription("");
        bo.setOwner("1");
        bo.setOwner(AuthUtil.getUser().getUserId().toString());
//        bo.setCheckinby(userName);
        bo.setCopyFromVersion("");
//        this.initTypeAttributeValue(bo,btmTypeVO);

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

@@ -3614,6 +3614,11 @@
        rowDataList.stream().forEach(rowData -> {
            ClientBusinessObject cbo=new ClientBusinessObject();
            DefaultAttrAssimtUtil.addDefaultAttrAssimt(cbo, classifyFullInfo.getTopClassifyVO().getBtmTypeId());
            R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(classifyFullInfo.getTopClassifyVO().getBtmTypeId()));
            if(!listR.isSuccess() || listR.getData().size() == 0){
                throw new VciBaseException("传入业务类型未查询到相应表单，请检查！");
            }
            cbo.setRevisionRule("".equals(listR.getData().get(0).getVersionRule())?"1":listR.getData().get(0).getVersionRule());
            rowData.getData().forEach((index,value)->{
                    String field = fieldIndexMap.get(index);
                if (StringUtils.isBlank(field)) {

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

ÎļþÒÑɾ³ý