From 82b5ca0a1c0fa2b3902b7c5b8792386e07b5f19b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 05 九月 2023 23:23:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/data.vue | 2
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSysIntParam.java | 2
Source/UBCS-WEB/src/views/code/code.vue | 11
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/UITableFieldVO.java | 13 +
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java | 14
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingLog.java | 145 +++++++++++++-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/SysIntegrationLogTypeEnum.java | 145 ++++++++++++++
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 1
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingLogeVO.java | 14 +
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/mapper/DdlDmMapper.java | 2
Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlMapperProcessor.java | 2
Source/UBCS-WEB/src/views/docking/task.vue | 4
Source/UBCS-WEB/src/views/docking/loge.vue | 16 +
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java | 4
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSysIntHeader.java | 2
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 5
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingLogeWrapper.java | 5
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/constant/MdmEnumIdConstant.java | 4
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingLogeDTO.java | 151 ++++++--------
20 files changed, 422 insertions(+), 122 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index ee649ed..ce67db7 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -206,6 +206,7 @@
showField: formItem.showField || formItem.field,
field: formItem.field,
fieldMap:formItem.fieldMap || {fieldMapKey:'id'},
+
placeholder: formItem.inputTip,
options: formItem.referConfig
}
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index dcdfb1b..9f31ce4 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -84,7 +84,7 @@
import FormTemplate from "./FormTemplate";
import ResembleQuery from "./ResembleQuery";
export default {
- name: "FormTemplateDialog",
+ name: "FormTemplateDialog",
components: { ResembleQuery, FormTemplate },
props: {
visible: {
diff --git a/Source/UBCS-WEB/src/views/code/code.vue b/Source/UBCS-WEB/src/views/code/code.vue
index fdf2ce5..697ae5e 100644
--- a/Source/UBCS-WEB/src/views/code/code.vue
+++ b/Source/UBCS-WEB/src/views/code/code.vue
@@ -944,8 +944,6 @@
:key="item.itemValue"
:label="item.itemName"
:value="item.itemValue"
- label="宸﹁ˉ浣�"
- value="codeattrsec"
>
</el-option>
</el-select>
@@ -1230,8 +1228,7 @@
<el-form-item
:label-width="rightFormLabelWidth"
label="缂栫爜琛ヤ綅鏂瑰紡:"
- required
- >
+ required>
<el-select
v-model="form.codeFillType"
:disabled="basicSecOnlyRead"
@@ -1458,6 +1455,7 @@
import { mapGetters } from "vuex";
import { getByRoleUserList } from "@/api/system/user";
import func from "@/util/func";
+import logeVue from '../docking/loge.vue';
export default {
data() {
@@ -3481,8 +3479,7 @@
serialStart:
row != null && row.serialStart != "" ? row.serialStart : 1, //娴佹按鍙疯捣濮嬪��
serialStep: row != null && row.serialStep != "" ? row.serialStep : 1, //娴佹按鐨勬闀�
- codeFillType:
- row != null && row.codeFillType != ""
+ codeFillType: row != null && row.codeFillType != ""
? row.codeFillType
: "code_fill_left", //缂栫爜琛ヤ綅鏂瑰紡
// codeFillSeparatorSelect: row!=null&&row.codeFillSeparatorSelect != '' ? row.codeFillSeparatorSelect:0, //琛ヤ綅鏃剁殑瀛楃锛岄�変腑鐨勪笅鎷夋鐨勪笅鏍�
@@ -3505,6 +3502,8 @@
? row.customCodeSerialClass
: "", //鑷畾涔夋祦姘寸畻娉�
});
+ console.log(this.form);
+ console.log(this.enumParam.codeFillType);
this.loadCodeFillType();
this.loadCodeFillSeparator();
} else if (this.form.secType === "codelevelsec") {
diff --git a/Source/UBCS-WEB/src/views/docking/data.vue b/Source/UBCS-WEB/src/views/docking/data.vue
index 57b670f..61e3788 100644
--- a/Source/UBCS-WEB/src/views/docking/data.vue
+++ b/Source/UBCS-WEB/src/views/docking/data.vue
@@ -97,7 +97,7 @@
sortable:true,
// width: 150,
formatter: function (row, column) {
- if (row.sendType === 'Released') {
+ if (row.sendType === 'Enabled') {
return '鍙戝竷';
} else if (row.sendType === 'TakeBack') {
return '鍥炴敹';
diff --git a/Source/UBCS-WEB/src/views/docking/loge.vue b/Source/UBCS-WEB/src/views/docking/loge.vue
index d5ca13c..b672067 100644
--- a/Source/UBCS-WEB/src/views/docking/loge.vue
+++ b/Source/UBCS-WEB/src/views/docking/loge.vue
@@ -69,14 +69,15 @@
prop: 'classifyId',
search: true,
sortable:true,
- width: 250
+ width: 230
},
{
label: '鍒嗙被鍚嶇О',
prop: 'classifyName',
search: true,
sortable:true,
- overHidden: true
+ overHidden: true,
+ width: 150
},
{
label: '闆嗘垚绯荤粺缂栧彿',
@@ -88,6 +89,13 @@
{
label: '闆嗘垚绯荤粺鍚嶇О',
prop: 'systemName',
+ search: true,
+ sortable:true,
+ width: 150
+ },
+ {
+ label: '绫诲瀷',
+ prop: 'type',
search: true,
sortable:true,
width: 150
@@ -121,7 +129,7 @@
},
{
label: '鏄惁鎺ㄩ�佹垚鍔�',
- prop: 'interFaceStatus',
+ prop: 'interfaceStatus',
search: true,
sortable:true,
width: 120,
@@ -135,7 +143,7 @@
value: "key"
},
formatter : function (row, column) {
- return row.interFaceStatus == 'true' || row.interFaceStatus == '1' ? '<i class="el-icon-check" style="color: limegreen;font-size: 20px;font-weight: 800"></i>' : '<i class="el-icon-close" style="color: red;font-size: 20px;font-weight: 800"></i>'
+ return row.interfaceStatus == 'true' || row.interfaceStatus == '' ? '<i class="el-icon-check" style="color: limegreen;font-size: 20px;font-weight: 800"></i>' : '<i class="el-icon-close" style="color: red;font-size: 20px;font-weight: 800"></i>'
}
},
]
diff --git a/Source/UBCS-WEB/src/views/docking/task.vue b/Source/UBCS-WEB/src/views/docking/task.vue
index 176cb9b..9ca5fc5 100644
--- a/Source/UBCS-WEB/src/views/docking/task.vue
+++ b/Source/UBCS-WEB/src/views/docking/task.vue
@@ -102,12 +102,12 @@
width: 150
},
{
- label: '鏁版嵁鎯呭喌',
+ label: '鎺ㄩ�佺被鍨�',
prop: 'sendType',
sortable:true,
width: 100,
formatter: function (row, column) {
- if (row.sendType === 'Released') {
+ if (row.sendType === 'Enabled') {
return '鍙戝竷';
} else if (row.sendType === 'TakeBack') {
return '鍥炴敹';
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingLogeDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingLogeDTO.java
index f97519c..824061f 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingLogeDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingLogeDTO.java
@@ -19,32 +19,32 @@
/**
* 鎺ュ彛鐘舵��
*/
- private String interfacestatus;
+ private String interfaceStatus;
/**
* 鍙傛暟
*/
- private String paramstring;
+ private String paramString;
/**
* 杩斿洖
*/
- private String returnstring;
+ private String returnString;
/**
* 绯荤粺缂栧彿
*/
- private String systemcode;
+ private String systemCode;
/**
* 绯荤粺鍚嶇О
*/
- private String systemname;
+ private String systemName;
/**
* 绯荤粺id
*/
- private String systemoid;
+ private String systemOid;
/**
* 鎺ュ彛绫诲瀷
@@ -52,9 +52,19 @@
private String type;
/**
+ * 鎺ュ彛绫诲瀷鏄剧ず鍊�
+ */
+ private String typeText;
+
+ /**
* 杩旇繕鎻愮ず
*/
private String msg;
+
+ /**
+ * 浼犻�抶ml
+ */
+ private String sendXml;
public String getMsg() {
return msg;
@@ -64,116 +74,91 @@
this.msg = msg;
}
- /**
- * 鑾峰彇 鎺ュ彛鐘舵��
- */
- public String getInterfacestatus (){
- return interfacestatus;
+ public String getInterfaceStatus() {
+ return interfaceStatus;
}
- /**
- * 璁剧疆 鎺ュ彛鐘舵��
- */
- public void setInterfacestatus (String interfacestatus){
- this.interfacestatus = interfacestatus;
+ public void setInterfaceStatus(String interfaceStatus) {
+ this.interfaceStatus = interfaceStatus;
}
- /**
- * 鑾峰彇 鍙傛暟
- */
- public String getParamstring (){
- return paramstring;
+ public String getParamString() {
+ return paramString;
}
- /**
- * 璁剧疆 鍙傛暟
- */
- public void setParamstring (String paramstring){
- this.paramstring = paramstring;
+ public void setParamString(String paramString) {
+ this.paramString = paramString;
}
- /**
- * 鑾峰彇 杩斿洖
- */
- public String getReturnstring (){
- return returnstring;
+ public String getReturnString() {
+ return returnString;
}
- /**
- * 璁剧疆 杩斿洖
- */
- public void setReturnstring (String returnstring){
- this.returnstring = returnstring;
+ public void setReturnString(String returnString) {
+ this.returnString = returnString;
}
- /**
- * 鑾峰彇 绯荤粺缂栧彿
- */
- public String getSystemcode (){
- return systemcode;
+ public String getSystemCode() {
+ return systemCode;
}
- /**
- * 璁剧疆 绯荤粺缂栧彿
- */
- public void setSystemcode (String systemcode){
- this.systemcode = systemcode;
+ public void setSystemCode(String systemCode) {
+ this.systemCode = systemCode;
}
- /**
- * 鑾峰彇 绯荤粺鍚嶇О
- */
- public String getSystemname (){
- return systemname;
+ public String getSystemName() {
+ return systemName;
}
- /**
- * 璁剧疆 绯荤粺鍚嶇О
- */
- public void setSystemname (String systemname){
- this.systemname = systemname;
+ public void setSystemName(String systemName) {
+ this.systemName = systemName;
}
- /**
- * 鑾峰彇 绯荤粺id
- */
- public String getSystemoid (){
- return systemoid;
+ public String getSystemOid() {
+ return systemOid;
}
- /**
- * 璁剧疆 绯荤粺id
- */
- public void setSystemoid (String systemoid){
- this.systemoid = systemoid;
+ public void setSystemOid(String systemOid) {
+ this.systemOid = systemOid;
}
- /**
- * 鑾峰彇 鎺ュ彛绫诲瀷
- */
- public String getType (){
+ public String getType() {
return type;
}
- /**
- * 璁剧疆 鎺ュ彛绫诲瀷
- */
- public void setType (String type){
+ public void setType(String type) {
this.type = type;
}
+ public String getTypeText() {
+ return typeText;
+ }
+
+ public void setTypeText(String typeText) {
+ this.typeText = typeText;
+ }
+
+ public String getSendXml() {
+ return sendXml;
+ }
+
+ public void setSendXml(String sendXml) {
+ this.sendXml = sendXml;
+ }
@Override
public String toString() {
return "DockingLogeDTO{" +
- "interfacestatus='" + interfacestatus + '\'' +
- ", paramstring='" + paramstring + '\'' +
- ", returnstring='" + returnstring + '\'' +
- ", systemcode='" + systemcode + '\'' +
- ", systemname='" + systemname + '\'' +
- ", systemoid='" + systemoid + '\'' +
- ", type='" + type + '\'' +
- ", msg='" + msg + '\'' +
- '}';
+ "interfaceStatus='" + interfaceStatus + '\'' +
+ ", paramString='" + paramString + '\'' +
+ ", returnString='" + returnString + '\'' +
+ ", systemCode='" + systemCode + '\'' +
+ ", systemName='" + systemName + '\'' +
+ ", systemOid='" + systemOid + '\'' +
+ ", type='" + type + '\'' +
+ ", typeText='" + typeText + '\'' +
+ ", msg='" + msg + '\'' +
+ ", sendXml='" + sendXml + '\'' +
+ '}';
}
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingLog.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingLog.java
index eefa7c8..775e066 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingLog.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingLog.java
@@ -1,5 +1,6 @@
package com.vci.ubcs.code.entity;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
import com.vci.ubcs.starter.revision.model.BaseModel;
@@ -22,81 +23,199 @@
/**
* 绯荤粺id
*/
- @ApiModelProperty(value = "鏁版嵁搴撹〃鐨勫悕绉�")
+ @ApiModelProperty(value = "绯荤粺id")
private String systemOid;
/**
* 绯荤粺缂栧彿
*/
- @ApiModelProperty(value = "鏁版嵁搴撹〃鐨勫悕绉�")
+ @ApiModelProperty(value = "绯荤粺缂栧彿")
private String systemCode;
/**
* 绯荤粺鍚嶇О
*/
- @ApiModelProperty(value = "鏁版嵁搴撹〃鐨勫悕绉�")
+ @ApiModelProperty(value = "绯荤粺鍚嶇О")
private String systemName;
/**
* 鍒嗙被oid
*/
- @ApiModelProperty(value = "鏁版嵁搴撹〃鐨勫悕绉�")
+ @ApiModelProperty(value = "鍒嗙被oid")
private String classifyOid;
/**
* 鍒嗙被id
*/
- @ApiModelProperty(value = "鏁版嵁搴撹〃鐨勫悕绉�")
+ @ApiModelProperty(value = "鍒嗙被id")
private String classifyId;
/**
* 鍒嗙被name
*/
- @ApiModelProperty(value = "鏁版嵁搴撹〃鐨勫悕绉�")
+ @ApiModelProperty(value = "鍒嗙被name")
private String classifyName;
/**
* 鍞竴鏍囪瘑
*/
- @ApiModelProperty(value = "鏁版嵁搴撹〃鐨勫悕绉�")
+ @ApiModelProperty(value = "鍞竴鏍囪瘑")
private String uniqueCode;
/**
* 鎺ュ彛绫诲瀷锛氭帹閫佹帴鍙�/鏌ヨ鎺ュ彛,鏆傛椂涓嶇敤
*/
- @ApiModelProperty(value = "鏁版嵁搴撹〃鐨勫悕绉�")
+ @ApiModelProperty(value = "鎺ュ彛绫诲瀷锛氭帹閫佹帴鍙�/鏌ヨ鎺ュ彛,鏆傛椂涓嶇敤")
private String type;
+ /***
+ * 鎺ュ彛绫诲瀷鏄剧ず鍊�
+ */
+ @ApiModelProperty(value = "鎺ュ彛绫诲瀷锛氭帹閫佹帴鍙�/鏌ヨ鎺ュ彛,鏆傛椂涓嶇敤")
+ @TableField(exist = false)
+ private String typeText;
/**
* 杩旇繕鎻愮ず
*/
- @ApiModelProperty(value = "鏁版嵁搴撹〃鐨勫悕绉�")
+ @ApiModelProperty(value = "杩旇繕鎻愮ず")
private String msg;
/**
* 鍙傛暟锛氶�氱煡鎺ュ彛鏄垜浠紶鍑虹殑鍙傛暟/鏌ヨ鎺ュ彛鏄埆浜轰紶鍏ョ殑鍙傛暟
*/
- @ApiModelProperty(value = "鏁版嵁搴撹〃鐨勫悕绉�")
+ @ApiModelProperty(value = "鍙傛暟")
private String paramString;
/**
* 浼犻�抶ml
*/
- @ApiModelProperty(value = "鏁版嵁搴撹〃鐨勫悕绉�")
+ @ApiModelProperty(value = "浼犻�抶ml")
private String sendXml;
/**
* 杩斿洖锛氶�氱煡鎺ュ彛鏄垜浠敹鍒扮殑鍙嶉锛屾煡璇㈡帴鍙ｆ槸鍒汉鏀跺埌鐨勫弽棣�
*/
- @ApiModelProperty(value = "鏁版嵁搴撹〃鐨勫悕绉�")
+ @ApiModelProperty(value = "杩斿洖")
private String returnString;
/**
* 鎺ュ彛鐘舵�侊細鎴愬姛/澶辫触
*/
- @ApiModelProperty(value = "鏁版嵁搴撹〃鐨勫悕绉�")
+ @ApiModelProperty(value = "鎺ュ彛鐘舵��")
private String interfaceStatus;
+ public String getSystemOid() {
+ return systemOid;
+ }
+
+ public void setSystemOid(String systemOid) {
+ this.systemOid = systemOid;
+ }
+
+ public String getSystemCode() {
+ return systemCode;
+ }
+
+ public void setSystemCode(String systemCode) {
+ this.systemCode = systemCode;
+ }
+
+ public String getSystemName() {
+ return systemName;
+ }
+
+ public void setSystemName(String systemName) {
+ this.systemName = systemName;
+ }
+
+ public String getClassifyOid() {
+ return classifyOid;
+ }
+
+ public void setClassifyOid(String classifyOid) {
+ this.classifyOid = classifyOid;
+ }
+
+ public String getClassifyId() {
+ return classifyId;
+ }
+
+ public void setClassifyId(String classifyId) {
+ this.classifyId = classifyId;
+ }
+
+ public String getClassifyName() {
+ return classifyName;
+ }
+
+ public void setClassifyName(String classifyName) {
+ this.classifyName = classifyName;
+ }
+
+ public String getUniqueCode() {
+ return uniqueCode;
+ }
+
+ public void setUniqueCode(String uniqueCode) {
+ this.uniqueCode = uniqueCode;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getTypeText() {
+ return typeText;
+ }
+
+ public void setTypeText(String typeText) {
+ this.typeText = typeText;
+ }
+
+ public String getMsg() {
+ return msg;
+ }
+
+ public void setMsg(String msg) {
+ this.msg = msg;
+ }
+
+ public String getParamString() {
+ return paramString;
+ }
+
+ public void setParamString(String paramString) {
+ this.paramString = paramString;
+ }
+
+ public String getSendXml() {
+ return sendXml;
+ }
+
+ public void setSendXml(String sendXml) {
+ this.sendXml = sendXml;
+ }
+
+ public String getReturnString() {
+ return returnString;
+ }
+
+ public void setReturnString(String returnString) {
+ this.returnString = returnString;
+ }
+
+ public String getInterfaceStatus() {
+ return interfaceStatus;
+ }
+
+ public void setInterfaceStatus(String interfaceStatus) {
+ this.interfaceStatus = interfaceStatus;
+ }
+
@Override
public String toString() {
return "DockingLogeDO{" +
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSysIntHeader.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSysIntHeader.java
index 70efd0f..4d25156 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSysIntHeader.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSysIntHeader.java
@@ -54,7 +54,7 @@
* 鏄惁浣跨敤
*/
@ApiModelProperty(value = "閰嶇疆涓婚敭")
- @TableField(exist = true)
+ @TableField(exist = false)
private String usedFlagText;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSysIntParam.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSysIntParam.java
index 9b8d9b8..fea4ea4 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSysIntParam.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingSysIntParam.java
@@ -52,7 +52,7 @@
* 鏄惁浣跨敤鏄剧ず鍊�
*/
@ApiModelProperty(value = "鏄惁浣跨敤鏄剧ず鍊�")
- @TableField(exist = true)
+ @TableField(exist = false)
private String usedFlagText;
@Override
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingLogeVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingLogeVO.java
index 218f09c..248b1d9 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingLogeVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingLogeVO.java
@@ -70,6 +70,11 @@
*/
private String type;
/**
+ * 鎺ュ彛绫诲瀷鏄剧ず鍊�
+ */
+ private String typeText;
+
+ /**
* 浼犻�抶ml
*/
private String sendXml;
@@ -133,6 +138,14 @@
public void setSystemOid(String systemOid) {
this.systemOid = systemOid;
+ }
+
+ public String getTypeText() {
+ return typeText;
+ }
+
+ public void setTypeText(String typeText) {
+ this.typeText = typeText;
}
/**
@@ -203,6 +216,7 @@
", systemName='" + systemName + '\'' +
", systemOid='" + systemOid + '\'' +
", type='" + type + '\'' +
+ ", typeText='" + typeText + '\'' +
", sendXml='" + sendXml + '\'' +
", msg='" + msg + '\'' +
'}';
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/UITableFieldVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/UITableFieldVO.java
index a6de794..8378cd4 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/UITableFieldVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/UITableFieldVO.java
@@ -145,6 +145,11 @@
private String queryField;
/**
+ * 鍒楄〃鏄惁鏄剧ず鐨勫瓧娈�
+ */
+ private String tableDisplayFlag;
+
+ /**
* 鍙傜収鐨勪俊鎭�
*/
private UIFormReferVO referConfig;
@@ -169,6 +174,14 @@
return dateFormate;
}
+ public void setTableDisplayFlag(String tableDisplayFlag) {
+ this.tableDisplayFlag = tableDisplayFlag;
+ }
+
+ public String getTableDisplayFlag() {
+ return tableDisplayFlag;
+ }
+
public void setDateFormate(String dateFormate) {
this.dateFormate = dateFormate;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/constant/MdmEnumIdConstant.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/constant/MdmEnumIdConstant.java
index 8b56a63..b6b2664 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/constant/MdmEnumIdConstant.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/web/constant/MdmEnumIdConstant.java
@@ -76,4 +76,8 @@
*/
public static final String SYS_INTEGRATION_PUSH_TYPE="sysIntegrationPushType";
+ /***
+ * 绯荤粺鎺ュ彛绫诲瀷
+ */
+ public static final String SYS_INTEGRATION_LOG_TYPE="sysIntegrationLogType";
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/SysIntegrationLogTypeEnum.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/SysIntegrationLogTypeEnum.java
new file mode 100644
index 0000000..635c733
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/enumpack/SysIntegrationLogTypeEnum.java
@@ -0,0 +1,145 @@
+package com.vci.ubcs.code.enumpack;
+import com.vci.ubcs.starter.annotation.VciEnum;
+import com.vci.ubcs.starter.web.constant.MdmEnumIdConstant;
+import com.vci.ubcs.starter.web.enumpck.BaseEnum;
+
+@VciEnum(name = MdmEnumIdConstant.SYS_INTEGRATION_LOG_TYPE,text = "绯荤粺闆嗘垚鏃ュ織鎺ュ彛绫诲瀷",description = "")
+public enum SysIntegrationLogTypeEnum implements BaseEnum {
+ /**
+ * 鏁版嵁鎺ㄩ��
+ */
+ TYPE_PUSH_DATA("pushData","鏁版嵁鎺ㄩ��"),
+ /**
+ * 鍒嗙被鎺ㄩ��
+ */
+ TYPE_PUSH_CLASSIFY("pushClassifyData","鍒嗙被鎺ㄩ��"),
+ /***
+ * 缂栫爜鐢宠
+ */
+ TYPE_ACCPET_APPCODE("applyCode","缂栫爜鐢宠"),
+
+ /***
+ * 缂栫爜缁存姢
+ */
+ TYPE_ACCPET_EDITCODE("syncEditData","缂栫爜缁存姢"),
+
+
+ /***
+ * 鍒嗙被鏌ヨ
+ */
+ TYPE_ACCPET_QUERYCLAFILY("queryClassify","鍒嗙被鏌ヨ"),
+ /***
+ * 鍚紪鐮佽鍒欑殑鍒嗙被鏌ヨ
+ */
+ TYPE_ACCPET_QUERYCLAFILYRULE("queryClassifyRule","鍚紪鐮佽鍒欑殑鍒嗙被鏌ヨ"),
+
+ /***
+ * 鏁版嵁鏌ヨ
+ */
+ TYPE_ACCPET_QUERYDATA("queryData","鏁版嵁鏌ヨ");
+
+ /**
+ * 鏋氫妇鐨勫��
+ */
+ private String value;
+
+ /**
+ * 鏋氫妇鏄剧ず鏂囨湰
+ */
+ private String text;
+
+ /**
+ * 鑾峰彇鏋氫妇鍊�
+ *
+ * @return 鏋氫妇鍊�
+ */
+ @Override
+ public String getValue() {
+ return value;
+ }
+
+ /**
+ * 璁剧疆鏋氫妇鍊�
+ *
+ * @param value 鏋氫妇鍊�
+ */
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ /**
+ * 鑾峰彇鏋氫妇鏄剧ず鏂囨湰
+ *
+ * @return 鏄剧ず鏂囨湰
+ */
+ @Override
+ public String getText() {
+ return text;
+ }
+
+ /**
+ * 璁剧疆鏄剧ず鏂囨湰
+ *
+ * @param text 鏄剧ず鏂囨湰
+ */
+ public void setText(String text) {
+ this.text = text;
+ }
+
+ /**
+ * 鏋勯�犲嚱鏁�
+ *
+ * @param value 鍊�
+ * @param text 鏄剧ず鏂囨湰
+ */
+ private SysIntegrationLogTypeEnum(String value, String text) {
+ this.value = value;
+ this.text = text;
+ }
+
+ /**
+ * 鏍规嵁鍚嶇О鑾峰彇瀵瑰簲鐨勬灇涓惧��
+ *
+ * @param text 鍚嶇О
+ * @return 鏋氫妇鍊�
+ */
+ public static String getValueByText(String text) {
+ for (SysIntegrationLogTypeEnum wenum : SysIntegrationLogTypeEnum.values()) {
+ if (wenum.getText().equalsIgnoreCase(text)) {
+ return wenum.getValue();
+ }
+ }
+ return "";
+ }
+
+ /**
+ * 鏍规嵁鏋氫妇鍊艰幏鍙栧悕绉�
+ *
+ * @param value 鏋氫妇鍊�
+ * @return 鍚嶇О
+ */
+ public static String getTextByValue(String value) {
+ for (SysIntegrationLogTypeEnum wenum : SysIntegrationLogTypeEnum.values()) {
+ if (wenum.getValue().equalsIgnoreCase(value)) {
+ return wenum.getText();
+ }
+ }
+ return "";
+ }
+
+ /**
+ * 鏍规嵁鏋氫妇鍊艰幏鍙栨灇涓惧璞�
+ *
+ * @param value 鏋氫妇鍊�
+ * @return 鏋氫妇瀵硅薄锛屼笉瀛樺湪鏃跺�欒繑鍥瀗ull
+ */
+ public static SysIntegrationLogTypeEnum forValue(String value) {
+ for (SysIntegrationLogTypeEnum wenum : SysIntegrationLogTypeEnum.values()) {
+ if (wenum.getValue().equalsIgnoreCase(value)) {
+ return wenum;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
index 97f1620..d46f33c 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
@@ -234,7 +234,10 @@
dockingTask.setClassifyName(classifyname);//鏁版嵁鎵�鍦ㄥ垎绫诲悕绉�
dockingTask.setSendType(sendtype);//鏁版嵁鎺ㄩ�佺被鍨�
dockingTask.setDataOid(dataoid);
-
+ dockingTask.setCreateTime(new Date());
+ dockingTask.setLastModifyTime(new Date());
+ dockingTask.setCreator("sysAdmin");
+ dockingTask.setLastModifier("sysAdmin");
//intinfo
dockingTask.setSysInfoOid(sysIntInfoVOi.getOid());//intinfo鐨刼id
dockingTask.setSystemOid(sysIntInfoVOi.getSysBaseOid());//绯荤粺oid
@@ -307,7 +310,7 @@
sendString = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + xStream.toXML(nodeDataDTO);
}
//璋冪敤鎺ュ彛
- callInterface(sendString,dockingSystemConfig,dockingTask);
+ callInterface(sendString,dockingSystemConfig,dockingTask,"pushClassifyData");
}catch (Throwable e){
e.printStackTrace();
}finally {
@@ -393,7 +396,7 @@
sendString = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" + xStream.toXML(nodeDataDTO);
}
//璋冪敤鎺ュ彛
- callInterface(sendString,dockingSystemConfig, dockingTask);
+ callInterface(sendString,dockingSystemConfig, dockingTask,"pushData");
}catch (Throwable e){
e.printStackTrace();
}finally {
@@ -407,7 +410,7 @@
* @param dockingTask
* @throws Throwable
*/
- private void callInterface(String sendString , DockingSystemConfig dockingSystemConfig,DockingTask dockingTask) throws Throwable{
+ private void callInterface(String sendString , DockingSystemConfig dockingSystemConfig,DockingTask dockingTask,String operation) throws Throwable{
String paramString = "";
String backString = "";
@@ -537,7 +540,7 @@
dockingLogeDO.setParamString(paramString);
dockingLogeDO.setReturnString(backString);
dockingLogeDO.setInterfaceStatus(isSend?"true":"false");
- dockingLogeDO.setType(DATA_LOGE_OUT);
+ dockingLogeDO.setType(operation);
dockingLogeDO.setMsg(msg);
log.error("闆嗘垚鎺ㄩ�佹暟鎹�,systemcode:"+dockingTask.getSystemCode()+",systemname:"+dockingTask.getSystemName()+",url:"+url+",param:"+paramString+",e:"+msg);
dockingLogeService.save(dockingLogeDO);
@@ -545,6 +548,7 @@
//鍏ㄩ兘鎺ユ敹鎴愬姛鐨勬儏鍐典笅,淇敼dockingtask sendflag涓哄凡鍙戦��
if(isSend) {
dockingTask.setSendFlag(MdmDuckingConstant.SEND_FLAG_TRUE);
+ dockingTask.setLastModifyTime(new Date());
dockingTaskService.updateById(dockingTask);
}
}
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 19fb609..8b89e4e 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
@@ -560,7 +560,9 @@
} else {
//璇存槑鏄嚜琛岄厤缃殑
//鍓嶇蹇呴』瑕佷紶閫掑皬鍐欑殑灞炴��
- value = orderDTO.getData().getOrDefault(attrId, "");
+ String orDefault = orderDTO.getData().getOrDefault(attrId, "");
+ value = Func.isBlank(orDefault) ? orderDTO.getData()
+ .getOrDefault(attrId.toUpperCase(Locale.ROOT), ""):orDefault;
}
return value;
}
@@ -1327,6 +1329,7 @@
}
fieldVO.setOptionJsMap(eventJsMap);
fieldVO.setStyle(attrVO.getTableDisplayStyle());
+ fieldVO.setTableDisplayFlag(attrVO.getTableDisplayFlag());
//鍒楄〃閲屼笉鍏佽鐩存帴缂栬緫
fieldVO.setDateFormate(attrVO.getCodeDateFormat());
return fieldVO;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
index e3a1fe8..f225f70 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -879,7 +879,7 @@
resultStr = object.toString();
}
try { //璁板綍鏃ュ織
- this.saveLogs(systemId, systemId, data, resultStr, issucess, msg, "queryClassify");
+ this.saveLogs(systemId, systemId, data, resultStr, issucess, msg, "queryData");
}catch (Throwable e){
e.printStackTrace();
}
@@ -1331,7 +1331,7 @@
}
try {
//璁板綍鏃ュ織
- this.saveLogs(systemId, systemId, data, resultStr, issucess, msg, "queryClassify");
+ this.saveLogs(systemId, systemId, data, resultStr, issucess, msg, "queryClassifyRule");
}catch (Throwable e){
e.printStackTrace();
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingLogeWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingLogeWrapper.java
index 93c2774..f4015eb 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingLogeWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingLogeWrapper.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.vci.ubcs.code.entity.DockingLog;
+import com.vci.ubcs.code.enumpack.SysIntegrationLogTypeEnum;
import com.vci.ubcs.code.vo.pagemodel.DockingLogeVO;
import org.springblade.core.mp.support.BaseEntityWrapper;
import org.springblade.core.tool.utils.BeanUtil;
@@ -18,6 +19,7 @@
@Override
public DockingLogeVO entityVO(DockingLog entity) {
+ entity.setTypeText(SysIntegrationLogTypeEnum.getTextByValue(entity.getType()));
DockingLogeVO dockingLogeVO = Objects.requireNonNull(BeanUtil.copy(entity, DockingLogeVO.class));
return dockingLogeVO;
}
@@ -33,6 +35,7 @@
List<DockingLogeVO> vos=new ArrayList<>();
if(!CollectionUtils.isEmpty(entitys)) {
entitys.stream().forEach(vo -> {
+ vo.setTypeText(SysIntegrationLogTypeEnum.getTextByValue(vo.getType()));
vos.add(entityVO(vo));
});
}
@@ -49,6 +52,7 @@
List<DockingLog>entitys =new ArrayList<>();
if(!CollectionUtils.isEmpty(vos)) {
vos.stream().forEach(entity -> {
+ entity.setTypeText(SysIntegrationLogTypeEnum.getTextByValue(entity.getType()));
entitys.add(voentity(entity));
});
}
@@ -61,6 +65,7 @@
* @return
*/
public DockingLog voentity( DockingLogeVO vo) {
+ vo.setTypeText(SysIntegrationLogTypeEnum.getTextByValue(vo.getType()));
DockingLog entity = Objects.requireNonNull(BeanUtil.copy(vo, DockingLog.class));
return entity;
}
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/mapper/DdlDmMapper.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/mapper/DdlDmMapper.java
index e19a148..fe85517 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/mapper/DdlDmMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/mapper/DdlDmMapper.java
@@ -17,7 +17,7 @@
* @param columnName 鍒楀悕绉�
* @return 鍙楀奖鍝嶇殑琛屾暟
*/
- @Update("alter table ${tableName} DROP COLUMN ${columnName}")
+ @Update("alter table ${tableName} DROP COLUMN \"${columnName}\"")
@Override
int dropTableColumn(@Param("tableName")String tableName, @Param("columnName")String columnName);
diff --git a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlMapperProcessor.java b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlMapperProcessor.java
index 94a78d2..296c988 100644
--- a/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlMapperProcessor.java
+++ b/Source/UBCS/ubcs-service/ubcs-ddl/src/main/java/com/vci/ubcs/ddl/processor/ddl/DdlMapperProcessor.java
@@ -152,6 +152,6 @@
* @return 鍙楀奖鍝嶇殑琛屾暟
*/
public int dropTableColumn(String tableName,String columnName){
- return mapper.dropTableColumn(tableName,columnName);
+ return mapper.dropTableColumn(tableName,columnName.toUpperCase());
}
}
--
Gitblit v1.9.3