From d9df19afd4965a58b8628887a4756bd61b74e992 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 14 十二月 2023 16:43:03 +0800
Subject: [PATCH] 代码提交
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java | 1
/dev/null | 108 ------------------------------------
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java | 5 +
Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java | 4
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 6 +
Source/UBCS/service-systemctl-restart.sh | 24 ++++++++
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/toolmodel/DateConverter.java | 5 +
7 files changed, 38 insertions(+), 115 deletions(-)
diff --git a/Source/UBCS/service-systemctl-restart.sh b/Source/UBCS/service-systemctl-restart.sh
index dd610e8..8993e66 100644
--- a/Source/UBCS/service-systemctl-restart.sh
+++ b/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
diff --git a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java b/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java
index 03010fc..79608d3 100644
--- a/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/constant/LauncherConstant.java
+++ b/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 鍦板潃
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/toolmodel/DateConverter.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/toolmodel/DateConverter.java
index 9e280ef..1f98cc3 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/toolmodel/DateConverter.java
+++ b/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) : "";
}
+
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java
index 418809c..077354c 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/MdmEngineService.java
+++ b/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 涓氬姟鏁版嵁涓婚敭
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index 3bb6a3e..d744a7a 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/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);
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
index 973d396..93f901d 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
+++ b/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)) {
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeWupinMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeWupinMapper.xml
deleted file mode 100644
index 124812f..0000000
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeWupinMapper.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.vci.ubcs.code.mapper.CodeWupinMapper">
-
- <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
- <resultMap id="codeWupinResultMap" type="com.vci.ubcs.code.entity.CodeWupin">
- <result column="OID" property="oid"/>
- <result column="REVISIONOID" property="revisionOid"/>
- <result column="NAMEOID" property="nameOid"/>
- <result column="BTMNAME" property="btmname"/>
- <result column="LASTR" property="lastR"/>
- <result column="FIRSTR" property="firstR"/>
- <result column="LASTV" property="lastV"/>
- <result column="FIRSTV" property="firstV"/>
- <result column="CREATOR" property="creator"/>
- <result column="CREATETIME" property="createTime"/>
- <result column="LASTMODIFIER" property="lastModifier"/>
- <result column="LASTMODIFYTIME" property="lastModifyTime"/>
- <result column="REVISIONRULE" property="revisionRule"/>
- <result column="VERSIONRULE" property="versionRule"/>
- <result column="REVISIONSEQ" property="revisionSeq"/>
- <result column="REVISIONVALUE" property="revisionValue"/>
- <result column="VERSIONSEQ" property="versionSeq"/>
- <result column="VERSIONVALUE" property="versionValue"/>
- <result column="LCTID" property="lctid"/>
- <result column="LCSTATUS" property="lcStatus"/>
- <result column="TS" property="ts"/>
- <result column="ID" property="id"/>
- <result column="NAME" property="name"/>
- <result column="DESCRIPTION" property="description"/>
- <result column="OWNER" property="owner"/>
- <result column="CHECKINBY" property="checkinby"/>
- <result column="CHECKINTIME" property="checkintime"/>
- <result column="CHECKOUTBY" property="checkoutby"/>
- <result column="CHECKOUTTIME" property="checkouttime"/>
- <result column="COPYFROMVERSION" property="copyFromVersion"/>
- <result column="CODECLSFID" property="codeclsfid"/>
- <result column="CODECLSFPATH" property="codeclsfpath"/>
- <result column="CODETEMPLATEOID" property="codetemplateoid"/>
- <result column="MATERIALCLASSIFY" property="materialclassify"/>
- <result column="MATERIALID" property="materialid"/>
- <result column="TUHAO" property="tuhao"/>
- <result column="PINPAI" property="pinpai"/>
- <result column="MORENGONGYS" property="morengongys"/>
- <result column="XIEYIJIAGE" property="xieyijiage"/>
- <result column="HESUANPICI" property="hesuanpici"/>
- <result column="BEIZHUSHUOMING" property="beizhushuoming"/>
- <result column="MATERIALTYPE" property="materialtype"/>
- <result column="MATERIALNAME" property="materialname"/>
- <result column="RUANJIANBANBEN" property="ruanjianbanben"/>
- <result column="QITACHICUN" property="qitachicun"/>
- <result column="MORENCAIGOUY" property="morencaigouy"/>
- <result column="YUMAILEIXING" property="yumaileixing"/>
- <result column="CHUANGJIANGONGSI" property="chuangjiangongsi"/>
- <result column="CAIGOUWL" property="caigouwl"/>
- <result column="WULIAOXINGZHI" property="wuliaoxingzhi"/>
- <result column="XIEYIBIANHAO" property="xieyibianhao"/>
- <result column="CAIZHI" property="caizhi"/>
- <result column="CHUKUFANGSHI" property="chukufangshi"/>
- <result column="SHIFOUPIHAOGUANLI" property="shifoupihaoguanli"/>
- <result column="KUCUNWL" property="kucunwl"/>
- <result column="XINGHAOGUIGE" property="xinghaoguige"/>
- <result column="DUIWAIGUIGE" property="duiwaiguige"/>
- <result column="ZHIBAOQI" property="zhibaoqi"/>
- <result column="CAIGOUTIQIANQI" property="caigoutiqianqi"/>
- <result column="HESUANFENLEI" property="hesuanfenlei"/>
- <result column="XIAOSHOUWL" property="xiaoshouwl"/>
- <result column="CHANGJIAXINGHAO" property="changjiaxinghao"/>
- <result column="ZUIXIAOQIDING" property="zuixiaoqiding"/>
- <result column="JILIANGDW" property="jiliangdw"/>
- <result column="ZHILIANGBZ" property="zhiliangbz"/>
- <result column="FIRSTFL" property="firstfl"/>
- <result column="SECONDFL" property="secondfl"/>
- <result column="THRIFL" property="thrifl"/>
- <result column="OLDCODE" property="oldcode"/>
- <result column="SECRETGRADE" property="secretGrade"/>
- <result column="BAOZHUANGGUIGE" property="baozhuangguige"/>
- <result column="PASSING" property="passing"/>
- <result column="XBJ" property="xbj"/>
- <result column="XBXKXS" property="xbxkxs"/>
- <result column="XFJJSTJ" property="xfjjstj"/>
- <result column="XGZCCDGCD" property="xgzccdgcd"/>
- <result column="XXNDJ" property="xxndj"/>
- <result column="XZJMC" property="xzjmc"/>
- <result column="ZJXH" property="zjxh"/>
- <result column="CLPH" property="clph"/>
- <result column="BMCL" property="bmcl"/>
- <result column="CPXS" property="cpxs"/>
- <result column="XBZJBMC" property="xbzjbmc"/>
- <result column="XWLWWMC" property="xwlwwmc"/>
- <result column="JJZYQ" property="jjzyq"/>
- <result column="JSBMC" property="jsbmc"/>
- <result column="JSBXH" property="jsbxh"/>
- <result column="JSCCJ" property="jsccj"/>
- <result column="JSSXT" property="jssxt"/>
- <result column="JSZGL" property="jszgl"/>
- <result column="JZL" property="jzl"/>
- <result column="JZRXX" property="jzrxx"/>
- <result column="JZXZB" property="jzxzb"/>
- </resultMap>
-
-
- <select id="selectCodeWupinPage" resultMap="codeWupinResultMap">
- select * from PL_CODE_WUPIN where is_deleted = 0
- </select>
-
-
-</mapper>
--
Gitblit v1.9.3