From 095c79efb36c7fae5672fa0b2481c6b688cba7eb Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 21 七月 2023 17:32:02 +0800
Subject: [PATCH] 提交代码
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java | 4
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeVO.java | 4
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/EnumDTO.java | 7 +
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/RevisionRule.java | 4
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSynonymEntity.java | 4
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEdge.java | 4
Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeKeyAttrRepeat.java | 4
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/StatusDTO.java | 4
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmTypeAttribute.java | 4
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleNode.java | 4
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLineEvent.java | 4
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/Status.java | 4
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/exception/VciBaseException.java | 1
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/EnumItem.java | 4
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleRule.java | 4
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LinkType.java | 4
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LinkTypeDTO.java | 4
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/Enum.java | 4
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LinkTypeAttribute.java | 4
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeAttributeVO.java | 5 +
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java | 4
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferBtmTypeServiceImpl.java | 2
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/RevisionRuleDTO.java | 4
Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue | 16 +-
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/Attribute.java | 4
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml | 50 +--------
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 17 ++-
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/BtmTypeDTO.java | 6 +
Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java | 2
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEvent.java | 4
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/ModifyAttributeInfo.java | 4
Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue | 17 ++-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 6
Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmType.java | 4
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml | 1
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java | 7 +
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java | 4
Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java | 19 ++-
38 files changed, 163 insertions(+), 89 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
index cc7d07c..4f43e79 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/referConfigFormDialog.vue
@@ -319,13 +319,13 @@
prop: "field",
cell: true,
clearable: false,
- blur: (value) => this.updateAttrBlur(value),
+ // blur: (value) => this.updateAttrBlur(value),
},{
label: "鍒楀悕(*)",
prop: "title",
cell: true,
clearable: false,
- blur: (value) => this.updateAttrBlur(value),
+ // blur: (value) => this.updateAttrBlur(value),
},{
label: "瀛楁绫诲瀷(*)",
prop: "fieldTypeText",
@@ -346,7 +346,7 @@
}, {
value: 'textarea', label: '鏂囨湰鍩�'
}],
- blur: (value) => this.updateAttrBlur(value),
+ // blur: (value) => this.updateAttrBlur(value),
},{
label: "鍒楄〃鍙帓搴�",
prop: "sort",
@@ -355,19 +355,19 @@
type:"switch",
width: '80px',
value: true,
- blur: (value) => this.updateAttrBlur(value),
+ // blur: (value) => this.updateAttrBlur(value),
},{
label: "鎺掑簭瀛楁",
prop: "attrSortField",
cell: true,
clearable: false,
- blur: (value) => this.updateAttrBlur(value),
+ // blur: (value) => this.updateAttrBlur(value),
},{
label: "瀛楁瀹藉害",
prop: "width",
cell: true,
clearable: false,
- blur: (value) => this.updateAttrBlur(value),
+ // blur: (value) => this.updateAttrBlur(value),
},{
label: "鍒楀浐瀹氫綅缃�",
prop: "fixedPosition",
@@ -376,13 +376,13 @@
clearable: false,
value: 'noFixed',
dicData: [{value: 'noFixed', label: '涓嶅浐瀹�'}, {value: 'left', label: '宸﹁竟'}, {value: 'right', label: '鍙宠竟'}],
- blur: (value) => this.updateAttrBlur(value),
+ // blur: (value) => this.updateAttrBlur(value),
},{
label: "js鏄剧ず浠ｇ爜",
prop: "templet",
cell: true,
clearable: false,
- blur: (value) => this.updateAttrBlur(value),
+ // blur: (value) => this.updateAttrBlur(value),
},
]
},
diff --git a/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue b/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
index 651e7cc..1f42c86 100644
--- a/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
+++ b/Source/UBCS-WEB/src/views/modeling/BusinessAdd.vue
@@ -78,7 +78,7 @@
<el-tag>{{ row.attrDataTypeText }}</el-tag>
</template>
<template slot="menu" slot-scope="{row,index}">
- <el-button icon="el-icon-edit" size="small" type="text" v-if="!row.$cellEdit" @click="cellEditClick(row)">缂栬緫
+ <el-button icon="el-icon-edit" size="small" type="text" v-if="!row.$cellEdit" @click="cellEditClick(row,index)">缂栬緫
</el-button>
<el-button icon="el-icon-delete" size="small" type="text" v-if="!row.$cellEdit"
@click="removeFormAttrTable(row,index)">绉婚櫎
@@ -536,7 +536,7 @@
if (!this.btmType.attributes) {
this.btmType.attributes = [];
}
- console.log(this.attrRef.selectData);
+ // console.log(this.attrRef.selectData);
this.attrRef.selectData.forEach(item => {
this.btmType.attributes.push({
id: item.id,
@@ -605,15 +605,18 @@
},
// 鍒楄〃缂栬緫
cellEditClick(cell) {
- console.log(cell);
+ // console.log(cell);
cell.$cellEdit = true;
},
// 鍒楄〃缂栬緫淇濆瓨
- cellEditSave(row) {
- this.btmType.attributes[row.$index].name = row.name
- this.btmType.attributes[row.$index].defaultValue = row.defaultValue;
- this.btmType.attributes[row.$index].description = row.description;
+ cellEditSave(row,index) {
+ // console.log("1111111111111111111111")
+ this.btmType.attributes[index].name = row.name
+ this.btmType.attributes[index].defaultValue = row.defaultValue;
+ this.btmType.attributes[index].description = row.description;
row.$cellEdit = false;
+ // console.log(this.btmType.attributes);
+ this.$refs.attrTable.refreshTable();
},
// 鎵撳紑鐗堟湰瑙勫垯鍙傜収
openRevision() {
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeKeyAttrRepeat.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeKeyAttrRepeat.java
index fb917a5..c123391 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeKeyAttrRepeat.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeKeyAttrRepeat.java
@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
@@ -157,6 +158,9 @@
*
*/
@ApiModelProperty(value = "")
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+ )
private Date ts;
/**
* 瑙勫垯鍚嶇О
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSynonymEntity.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSynonymEntity.java
index a958c4a..d02faa7 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSynonymEntity.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/CodeSynonymEntity.java
@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import com.vci.ubcs.starter.constant.CodeTableNameConstant;
@@ -151,6 +152,9 @@
*
*/
@ApiModelProperty(value = "")
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+ )
private Date ts;
/**
* 鎵�灞炶涓氬悕绉�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/BtmTypeDTO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/BtmTypeDTO.java
index 081469a..6bf3c75 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/BtmTypeDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/BtmTypeDTO.java
@@ -1,5 +1,6 @@
package com.vci.ubcs.omd.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
@@ -142,7 +143,10 @@
/**
* 鏃堕棿鎴筹紝鐢ㄤ簬鏍￠獙鏄惁鏈�鏂版暟鎹�
*/
- private Date ts;
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+ )
+ private Date ts;
/**
* 涓氬姟绫诲瀷鎵�灞為鍩�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/EnumDTO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/EnumDTO.java
index aedc1bf..252c933 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/EnumDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/EnumDTO.java
@@ -1,5 +1,7 @@
package com.vci.ubcs.omd.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
import java.util.Date;
import java.util.Map;
@@ -48,7 +50,10 @@
/**
* 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
*/
- private Date ts;
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+ )
+ private Date ts;
/**
* 绫荤殑鍏ㄨ矾寰�
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LinkTypeDTO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LinkTypeDTO.java
index ab03c86..247e102 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LinkTypeDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/LinkTypeDTO.java
@@ -1,5 +1,6 @@
package com.vci.ubcs.omd.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
@@ -76,6 +77,9 @@
/**
* 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
*/
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+ )
private Date ts;
/**
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/RevisionRuleDTO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/RevisionRuleDTO.java
index 4f83e18..71b90ff 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/RevisionRuleDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/RevisionRuleDTO.java
@@ -1,5 +1,6 @@
package com.vci.ubcs.omd.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
@@ -65,5 +66,8 @@
/**
* 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
*/
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+ )
private Date ts;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/StatusDTO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/StatusDTO.java
index b387959..417dff1 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/StatusDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/dto/StatusDTO.java
@@ -1,5 +1,6 @@
package com.vci.ubcs.omd.dto;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
@@ -38,6 +39,9 @@
/**
* 鏃堕棿鎴筹紝鐢ㄤ簬鏍￠獙鏄惁鏈�鏂版暟鎹�
*/
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+ )
private Date ts;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/Attribute.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/Attribute.java
index d808be2..31f92c6 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/Attribute.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/Attribute.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
@@ -170,6 +171,9 @@
* 鏃堕棿鎴�
*/
@ApiModelProperty(value = "鏃堕棿鎴�")
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+ )
private Date ts;
/**
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmType.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmType.java
index ee499c1..ef5a344 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmType.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmType.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -169,6 +170,9 @@
/**
* 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
*/
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+ )
private Date ts;
/**
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmTypeAttribute.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmTypeAttribute.java
index 760b6c1..c4c468a 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmTypeAttribute.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/BtmTypeAttribute.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -138,5 +139,8 @@
/**
* 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
*/
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+ )
private Date ts;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/Enum.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/Enum.java
index 6f48438..1eee1b3 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/Enum.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/Enum.java
@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -58,6 +59,9 @@
*
*/
@ApiModelProperty(value = "")
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+ )
private Date ts;
/**
*
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/EnumItem.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/EnumItem.java
index 4ab81a4..5819ba3 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/EnumItem.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/EnumItem.java
@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -63,6 +64,9 @@
*
*/
@ApiModelProperty(value = "")
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+ )
private Date ts;
/**
*
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEdge.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEdge.java
index 99ae365..0b074e5 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEdge.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEdge.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -97,5 +98,8 @@
/**
* 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
*/
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+ )
private Date ts;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEvent.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEvent.java
index 720f3e5..7dff540 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEvent.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleEvent.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -75,6 +76,9 @@
/**
* 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
*/
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+ )
private Date ts;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLineEvent.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLineEvent.java
index 12ad0ed..30a4935 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLineEvent.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleLineEvent.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -79,6 +80,9 @@
/**
* 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
*/
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+ )
private Date ts;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleNode.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleNode.java
index 7788bca..7afd9fe 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleNode.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleNode.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -95,5 +96,8 @@
/**
* 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
*/
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+ )
private Date ts;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleRule.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleRule.java
index cf42364..8dfa209 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleRule.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LifeCycleRule.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.vci.ubcs.starter.revision.model.BaseModel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -81,6 +82,9 @@
/**
* 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
*/
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+ )
private Date ts;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LinkType.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LinkType.java
index 8744b6a..9f20248 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LinkType.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LinkType.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -113,6 +114,9 @@
/**
* 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
*/
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+ )
private Date ts;
/**
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LinkTypeAttribute.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LinkTypeAttribute.java
index 339579a..3541b43 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LinkTypeAttribute.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/LinkTypeAttribute.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -139,5 +140,8 @@
/**
* 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
*/
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+ )
private Date ts;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/ModifyAttributeInfo.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/ModifyAttributeInfo.java
index eb5a27b..86cd61b 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/ModifyAttributeInfo.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/ModifyAttributeInfo.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -131,6 +132,9 @@
/**
* 鏃堕棿鎴�
*/
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+ )
private Date ts;
/**
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/RevisionRule.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/RevisionRule.java
index fb466bc..c107809 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/RevisionRule.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/RevisionRule.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -102,5 +103,8 @@
/**
* 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
*/
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+ )
private Date ts;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/Status.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/Status.java
index 0bce9c4..547a363 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/Status.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/entity/Status.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -79,6 +80,9 @@
/**
* 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
*/
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+ )
private Date ts;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeAttributeVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeAttributeVO.java
index 7d512f5..44334d2 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeAttributeVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeAttributeVO.java
@@ -1,5 +1,7 @@
package com.vci.ubcs.omd.vo;
+import com.alibaba.fastjson.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.vci.ubcs.omd.entity.BtmTypeAttribute;
import io.swagger.annotations.ApiModel;
import lombok.Data;
@@ -161,5 +163,8 @@
/**
* 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
*/
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+ )
private Date ts;
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeVO.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeVO.java
index 9f56f4b..32820c9 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/vo/BtmTypeVO.java
@@ -1,5 +1,6 @@
package com.vci.ubcs.omd.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.io.Serializable;
@@ -174,6 +175,9 @@
/**
* 鏃堕棿鎴筹紝鏍煎紡鏄痽yyy-MM-dd HH:mm:ss.SSS
*/
+ @JsonFormat(
+ pattern = "yyyy-MM-dd HH:mm:ss.SSS"
+ )
private Date ts;
/**
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/exception/VciBaseException.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/exception/VciBaseException.java
index 16cfcb6..6359740 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/exception/VciBaseException.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/exception/VciBaseException.java
@@ -10,7 +10,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springblade.core.log.exception.ServiceException;
-import org.springframework.web.server.ServerErrorException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
index 205389e..6f30181 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java
@@ -67,14 +67,14 @@
* @param oid 鍒嗙被鐨勪富閿�
* @return 鏁版嵁闆嗗悎
*/
- List<CodeClassify> selectCodeClassifyVOByTree(@Param("oid") String oid);
+ List<CodeClassify> selectCodeClassifyVOByTree(@Param("oid") String oid,@Param("tenantId") String tenantId);
/**
* 鏌ユ壘鏍戝舰缁撴瀯
*
* @return 鏁版嵁闆嗗悎
*/
- List<CodeClassify> selectCodeClassifyDOByTree(@Param("id") String id,@Param("lcstatus") String lcstatus,@Param("parentcodeclassifyoid") String parentcodeclassifyoid);
+ List<CodeClassify> selectCodeClassifyDOByTree(@Param("id") String id,@Param("lcstatus") String lcstatus,@Param("parentcodeclassifyoid") String parentcodeclassifyoid,@Param("tenantId") String tenantId);
/**
* 鏌ヨ鏁版嵁涓嶱L_CODE_KEYATTRREPEAT銆丳L_CODE_RESEMBLERULE銆丳L_CODE_RULE鑱旀煡
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
index b675fa2..59e2b3a 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -53,6 +53,7 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -79,6 +80,9 @@
@Resource
private IBtmTypeClient btmTypeClient;
+
+ @Value("${user-info.tenant-id}")
+ private String tenantId;
/**
* 鏃ュ織
@@ -480,12 +484,12 @@
}
if(StringUtils.isNotBlank(id) || StringUtils.isNotBlank(lcStatus) ){
doList = codeClassifyMapper
- .selectCodeClassifyDOByTree(treeQueryObject.getConditionMap().get("id"),treeQueryObject.getConditionMap().get("lcStatus"),treeQueryObject.getParentOid());
+ .selectCodeClassifyDOByTree(treeQueryObject.getConditionMap().get("id"),treeQueryObject.getConditionMap().get("lcStatus"),treeQueryObject.getParentOid(), AuthUtil.getTenantId().equals(this.tenantId) ? "":AuthUtil.getTenantId());
}else{
- doList =codeClassifyMapper.selectCodeClassifyVOByTree(treeQueryObject.getParentOid());
+ doList =codeClassifyMapper.selectCodeClassifyVOByTree(treeQueryObject.getParentOid(), AuthUtil.getTenantId().equals(this.tenantId) ? "":AuthUtil.getTenantId());
}
List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList);
- TreeWrapperOptions treeWrapperOptions = new TreeWrapperOptions(PARENT_FIELD_NAME.toLowerCase(Locale.ROOT));
+ TreeWrapperOptions treeWrapperOptions = new TreeWrapperOptions(PARENT_FIELD_NAME);
treeWrapperOptions.copyFromTreeQuery(treeQueryObject);
List<Tree> tree= revisionModelUtil.doList2Trees(voList,treeWrapperOptions,(CodeClassifyVO s) ->{
//鍙互鍦ㄨ繖閲屽鐞嗘爲鑺傜偣鐨勬樉绀�
@@ -513,7 +517,7 @@
*/
@Override
public List<CodeClassifyVO> selectCodeClassifyDOByTree(TreeQueryObject treeQueryObject) {
- List<CodeClassify> doList =codeClassifyMapper.selectCodeClassifyVOByTree(treeQueryObject.getParentOid());
+ List<CodeClassify> doList =codeClassifyMapper.selectCodeClassifyVOByTree(treeQueryObject.getParentOid(),AuthUtil.getTenantId());
List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList);
return voList;
}
@@ -544,7 +548,6 @@
List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList);
return voList;
}
-
// /**
// * 鏍规嵁鏍戝舰鏌ヨ瀵硅薄鏉ユ煡璇㈡暟鎹璞�
@@ -939,7 +942,7 @@
Map<String,Object> condition = new HashMap<>(1);
condition.put("pkbtmtype",topClassifyVO.getBtmTypeId());
R<BtmTypeVO> btmTypeDetail = btmTypeClient.getDetail(btmTypeOid);
- if(btmTypeDetail.getCode() != 200){
+ if(!btmTypeDetail.isSuccess()){
throw new ServiceException("涓氬姟绫诲瀷feign鎺ュ彛璋冪敤鍑洪敊");
}
List<BtmTypeAttributeVO> unDefaultAttributes = btmTypeDetail.getData().getAttributes();
@@ -968,7 +971,7 @@
});
}
R<BtmTypeVO> btmTypeVOR = btmTypeClient.getDefaultAttrByBtmId(topClassifyVO.getBtmTypeId());
- if(btmTypeVOR.getCode() != 200){
+ if(!btmTypeVOR.isSuccess()){
throw new ServiceException("涓氬姟绫诲瀷feign鎺ュ彛璋冪敤鍑洪敊");
}
List<BtmTypeAttributeVO> defaultAttrVOS = btmTypeVOR.getData().getAttributes();
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
index 1c251ee..82ae965 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
@@ -712,8 +712,8 @@
return dataGrid;
}
//杩欎釜涓氬姟绫诲瀷涓嬬殑鎵�鏈夊睘鎬�
- R<BtmTypeVO> btmTypeVOR = btmTypeClient.getAllAttributeByBtmId(codeClassifyTemplateDO.getBtmTypeId());
- if(btmTypeVOR.getCode() != 200){
+ R<BtmTypeVO> btmTypeVOR = btmTypeClient.getAllAttributeByBtmOid(codeClassifyTemplateDO.getBtmTypeId());
+ if(!btmTypeVOR.isSuccess()){
throw new ServiceException("涓氬姟绫诲瀷feign璋冪敤閿欒锛�");
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferBtmTypeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferBtmTypeServiceImpl.java
index 62b83ca..c8eb71f 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferBtmTypeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeReferBtmTypeServiceImpl.java
@@ -50,7 +50,7 @@
conditionMap.put("domain", AppConstant.APPLICATION_NAME_CODE);
baseQueryObject.setConditionMap(conditionMap);
R<Page<BtmTypeVO>> btmTypeClientRefPage = btmTypeClient.getRefPage(baseQueryObject);
- if(btmTypeClientRefPage.getCode() != 200){
+ if(!btmTypeClientRefPage.isSuccess()){
throw new ServiceException("涓氬姟绫诲瀷feign鎺ュ彛璋冪敤閿欒");
}
return btmTypeClientRefPage.getData();
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
index 9201f79..088566b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
@@ -162,11 +162,14 @@
*/
@Override
public boolean checkCodeRuleRepeat(CodeRuleDTO codeRuleDTO){
- List<CodeRule> codeRulesList = this.codeRuleMapper.selectList(Wrappers.<CodeRule>query().lambda().eq(CodeRule::getId, codeRuleDTO.getId()));
+ // 鏍规嵁瑙勫垯id鏌ヨ缂栧彿
+ List<CodeRule> codeRulesList = this.codeRuleMapper.selectList(Wrappers.<CodeRule>query()
+ .lambda().eq(CodeRule::getId, codeRuleDTO.getId())
+ .eq(CodeRule::getTenantId,AuthUtil.getTenantId().equals(this.tenantId) ? "":codeRuleDTO.getTenantId()));
if(!codeRulesList.isEmpty()){
return codeRulesList.parallelStream().anyMatch(codeRule -> {
if(StringUtils.isNotBlank(codeRuleDTO.getOid())){
- // 浠ｈ〃鏄慨鏀�
+ // 浠ｈ〃鏄慨鏀癸紝涓嶆槸灏嗙紪鍙蜂慨鏀圭浉鍚岀殑缂栧彿
return !codeRule.getOid().equals(codeRuleDTO.getOid());
}else {
return true;
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 277e6a1..7fc0b61 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
@@ -2024,7 +2024,7 @@
}
R<BtmTypeVO> r = btmTypeClient.getDefaultAttrByBtmId(btmType);
List<BtmTypeAttributeVO> attributes = r.getData().getAttributes();
- if (r.getCode() != 200 || attributes.isEmpty()) {
+ if (!r.isSuccess() || attributes.isEmpty()) {
return false;
}
return attributes.stream().anyMatch(item -> item.getId().equals(selectKey));
@@ -3475,7 +3475,7 @@
//checkReferConfig(referConfigVO);
//浣跨敤涓氬姟绫诲瀷鏌ヨ
R<BtmTypeVO> allAttributeByBtmId = btmTypeClient.getAllAttributeByBtmId(referConfigVO.getReferType());
- if (allAttributeByBtmId.getCode() != 200) {
+ if (!allAttributeByBtmId.isSuccess()) {
throw new ServiceException("涓氬姟绫诲瀷feign鎺ュ彛璋冪敤閿欒锛�");
}
if (Func.isEmpty(allAttributeByBtmId.getData())) {
@@ -3497,7 +3497,7 @@
}
R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(referConfigVO.getReferType()));
- if (listR.getCode() != 200) {
+ if (!listR.isSuccess()) {
throw new ServiceException(Func.isNotBlank(listR.getMsg()) ? listR.getMsg() : "涓氬姟绫诲瀷feign鎺ュ彛璋冪敤閿欒锛�");
}
if (listR.getData().isEmpty()) {
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 c112d85..42ddcd0 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
@@ -2194,7 +2194,7 @@
String tableName ="";
try {
R<BtmTypeVO> r = btmTypeClient.getAllAttributeByBtmId(templateVO.getBtmTypeId());
- if(r.getCode()!=200) {
+ if(!r.isSuccess()) {
throw new Throwable(r.getMsg());
}
BtmTypeVO btmTypeVO = r.getData();
@@ -3302,7 +3302,7 @@
String tableName ="";
try {
R<BtmTypeVO> r = btmTypeClient.getAllAttributeByBtmId(templateVO.getBtmTypeId());
- if(r.getCode()!=200) {
+ if(!r.isSuccess()) {
throw new Throwable(r.getMsg());
}
BtmTypeVO btmTypeVO = r.getData();
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml
index f283218..598f7ba 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml
@@ -23,7 +23,6 @@
map-underscore-to-camel-case: false
call-setters-on-nulls: true
-
#椤跺眰鎵归噺鐢宠閰嶇疆
batchadd:
exportattr:
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
index a022dc6..dce9452 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml
@@ -37,8 +37,8 @@
<result column="CODERULEOID" property="codeRuleOid"/>
<result column="CODEKEYATTRREPEATOID" property="codeKeyAttrRepeatOid"/>
<result column="CODERESEMBLERULEOID" property="codeResembleRuleOid"/>
+ <result column="TENANT_ID" property="tenantId"/>
</resultMap>
-
<select id="selectPlCodeClassifyPage" resultMap="plCodeClassifyResultMap">
select * from PL_CODE_CLASSIFY where is_deleted = 0
@@ -77,6 +77,7 @@
codeclassify0.CODERESEMBLERULEOID as coderesembleruleoid,
codeclassify0.LCSTATUS as lcstatus,
codeclassify0.TS as ts,
+ codeclassify0.TENANT_ID as tenantId ,
coderuleoid.name as codeRuleOidName,
codekeyattrrepeatoid.name as codeKeyAttrRepeatOidName,
coderesembleruleoid.name as codeResembleRuleOidName
@@ -93,6 +94,9 @@
</if>
<if test="oid = null">
codeclassify0.parentcodeclassifyoid is null
+ </if>
+ <if test="tenantId != null and tenantId != ''">
+ codeclassify0.tenant_id = #{tenantId}
</if>
</where>
order by id asc
@@ -169,7 +173,6 @@
select oid,
level from pl_code_classify start with oid= #{oid} connect by prior PARENTCODECLASSIFYOID = oid
</select>
-
<select id="getIdPathToNamePathByParentId" resultMap="plCodeClassifyResultMap">
select codeclassify0.OWNER as owner,
@@ -276,6 +279,7 @@
codeclassify0.CODERESEMBLERULEOID as coderesembleruleoid,
codeclassify0.LCSTATUS as lcstatus,
codeclassify0.TS as ts,
+ codeclassify0.TENANT_ID as tenantId ,
coderuleoid.name as codeRuleOidName,
codekeyattrrepeatoid.name as codeKeyAttrRepeatOidName,
coderesembleruleoid.name as codeResembleRuleOidName
@@ -294,46 +298,8 @@
and codeclassify0.parentcodeclassifyoid is null
and codeclassify0.id = #{id}
</if>
- order by id asc
- </select>
-
- <select id="selectCodeClassifyDOByTree" resultMap="plCodeClassifyResultMap">
- select codeclassify0.OWNER as owner,
- codeclassify0.BTMTYPEID as btmtypeid,
- codeclassify0.CREATOR as creator,
- codeclassify0.CREATETIME as createtime,
- codeclassify0.LASTMODIFIER as lastmodifier,
- codeclassify0.DESCRIPTION as description,
- codeclassify0.ORDERNUM as ordernum,
- codeclassify0.CODERULEOID as coderuleoid,
- codeclassify0.OID as oid,
- codeclassify0.BTMNAME as btmname,
- codeclassify0.BTMTYPENAME as btmtypename,
- codeclassify0.CODEKEYATTRREPEATOID as codekeyattrrepeatoid,
- codeclassify0.PARENTCODECLASSIFYOID as parentcodeclassifyoid,
- codeclassify0.NAME as name,
- codeclassify0.LASTMODIFYTIME as lastmodifytime,
- codeclassify0.ID as id,
- codeclassify0.CODERESEMBLERULEOID as coderesembleruleoid,
- codeclassify0.LCSTATUS as lcstatus,
- codeclassify0.TS as ts,
- coderuleoid.name as codeRuleOidName,
- codekeyattrrepeatoid.name as codeKeyAttrRepeatOidName,
- coderesembleruleoid.name as codeResembleRuleOidName
- from pl_code_classify codeclassify0
- left join pl_code_rule coderuleoid
- on codeclassify0.codeRuleOid = coderuleoid.oid
- left join pl_code_keyattrrepeat codekeyattrrepeatoid
- on codeclassify0.codeKeyAttrRepeatOid = codekeyattrrepeatoid.oid
- left join pl_code_resemblerule coderesembleruleoid
- on codeclassify0.codeResembleRuleOid = coderesembleruleoid.oid
- where codeclassify0.lcstatus = #{lcstatus}
- <if test="parentcodeclassifyoid != null and parentcodeclassifyoid != ''">
- and codeclassify0.parentcodeclassifyoid = #{parentcodeclassifyoid}
- </if>
- <if test="parentcodeclassifyoid == null or parentcodeclassifyoid == ''">
- and codeclassify0.parentcodeclassifyoid is null
- and codeclassify0.id = #{id}
+ <if test="tenantId != null and tenantId != ''">
+ and codeclassify0.tenant_id = #{tenantId}
</if>
order by id asc
</select>
diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java
index 23d8bde..f248f5a 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/BtmTypeServiceImpl.java
@@ -486,8 +486,9 @@
* @return 鎵ц缁撴灉
*/
@Override
- public R submit(BtmTypeDTO btmTypeDTO, boolean autoCreateTable) {
- TransactionStatus transaction = null;
+ @Transactional(rollbackFor = Exception.class)
+ public R submit(BtmTypeDTO btmTypeDTO, boolean autoCreateTable) throws ServiceException {
+ /*TransactionStatus transaction = null;
DefaultTransactionDefinition def = null;
if (autoCreateTable) {
def = new DefaultTransactionDefinition();
@@ -495,7 +496,7 @@
// 浜嬬墿闅旂绾у埆锛屽紑鍚柊浜嬪姟锛岃繖鏍蜂細姣旇緝瀹夊叏浜涖��
transaction = dataSourceTransactionManager.getTransaction(def);
// 鑾峰緱浜嬪姟鐘舵��
- }
+ }*/
checkBtmTypeBeforeSave(btmTypeDTO);
BtmType btmTypeDO = Optional.ofNullable(BeanUtil.copy(btmTypeDTO, BtmType.class)).orElseGet(BtmType::new);
btmTypeDO.setBizDomain(btmTypeDTO.getBizDomain());
@@ -523,7 +524,7 @@
btmTypeVO.setAttributes(afterAttributes);
try {
if (autoCreateTable) {
-// checkTableSame(btmTypeVO);
+ // checkTableSame(btmTypeVO);
R result = DomainRepeater.submitBtmType(btmTypeDTO.getBizDomain(), btmTypeVO);
if (result.isSuccess()){
List<ModifyAttributeInfo> infoList = new ArrayList<>();
@@ -538,15 +539,17 @@
});
modifyAttributeService.saveBatch(ModifyAttributeWrapper.build().listEntityBeforeSave(infoList));
}
- dataSourceTransactionManager.commit(transaction);
+ // dataSourceTransactionManager.commit(transaction);
}else {
- dataSourceTransactionManager.rollback(transaction);
- return R.fail(result.getMsg());
+ // dataSourceTransactionManager.rollback(transaction);
+ // 鍒涘缓琛ㄦ姤閿欙紝鎶涘嚭寮傚父璁╄鏂规硶鍥炴粴
+ throw new VciBaseException(result.getMsg());
+ // return R.fail(result.getMsg());
}
}
} catch (Throwable e) {
if (autoCreateTable) {
- dataSourceTransactionManager.rollback(transaction);
+// dataSourceTransactionManager.rollback(transaction);
throw new VciBaseException(e.getMessage());
}
}
diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
index bd7e58d..36c1966 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/service/impl/UserServiceImpl.java
@@ -555,7 +555,7 @@
public List<Map<String,String>> getByRoleUserList(BladeUser user, String roleName) {
// 鑰冭檻鍒颁竴涓敤鎴峰彲浠ユ嫢鏈夊绉嶈鑹叉潈闄愶紝鑰岀敤鎴峰叧鑱旇鑹叉潈闄愭槸鐢╮ole_id瀛楁鐢ㄩ�楀彿鍒嗛殧瑙掕壊id鐨勶紝鐩存帴閲囩敤瀛愭煡璇㈡潵in鏌ヨ涓嶈兘瀹炵幇锛屾墍浠ュ厛鏌ヨ瑙掕壊id
R<String> roleIds = sysClient.getRoleIds(user.getTenantId(), roleName);
- if(roleIds.getCode() != 200){
+ if(!roleIds.isSuccess()){
throw new ServiceException("绯荤粺鏈嶅姟feign鎺ュ彛璋冪敤閿欒锛�");
}
if(Func.isBlank(roleIds.getData())){
--
Gitblit v1.9.3