From e973fb747f0d1a382fb9e4cdb20383a0a546ef67 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 03 十二月 2024 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/revision/service/RevisionModelUtil.java | 53 ++++++++++++++++++++++++++++-------------------------
1 files changed, 28 insertions(+), 25 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/revision/service/RevisionModelUtil.java b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/revision/service/RevisionModelUtil.java
index 8f6f784..9859eb5 100644
--- a/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/revision/service/RevisionModelUtil.java
+++ b/Source/plt-web/plt-web-parent/plt-web-base/src/main/java/com/vci/starter/revision/service/RevisionModelUtil.java
@@ -1,13 +1,16 @@
package com.vci.starter.revision.service;
import com.vci.starter.revision.bo.TreeWrapperOptions;
-import com.vci.starter.revision.model.*;
-import com.vci.starter.revision.provider.*;
+import com.vci.starter.revision.model.ReleasedObjDO;
+import com.vci.starter.revision.model.RevisionInfo;
+import com.vci.starter.revision.provider.CommonAnnotationProvider;
+import com.vci.starter.revision.provider.CommonLifeCycleProvider;
+import com.vci.starter.revision.provider.CommonRevisionRuleProvider;
import com.vci.starter.web.annotation.Column;
import com.vci.starter.web.annotation.VciBtmType;
import com.vci.starter.web.annotation.VciColumnDefinition;
-import com.vci.starter.web.constant.RevisionConstant;
import com.vci.starter.web.constant.RegExpConstant;
+import com.vci.starter.web.constant.RevisionConstant;
import com.vci.starter.web.enumpck.DataSecretEnum;
import com.vci.starter.web.enumpck.UserSecretEnum;
import com.vci.starter.web.exception.VciBaseException;
@@ -18,7 +21,6 @@
import com.vci.starter.web.pagemodel.Tree;
import com.vci.starter.web.pagemodel.TreeQueryObject;
import com.vci.starter.web.service.VciSecretServiceI;
-import com.vci.starter.web.util.BeanUtil;
import com.vci.starter.web.util.BeanUtilForVCI;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.util.VciDateUtil;
@@ -30,6 +32,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
+
import java.lang.reflect.Field;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
@@ -195,8 +198,8 @@
baseModel.setLastModifyTime(currentDate);
//
VciBtmType vciBtmType = getBtmTypeAnnotation(baseModel);
- if(StringUtils.isBlank(baseModel.getBtmname()) && vciBtmType!=null){
- baseModel.setBtmname(vciBtmType.name());
+ if(StringUtils.isBlank(baseModel.getBtmName()) && vciBtmType!=null){
+ baseModel.setBtmName(vciBtmType.name());
}
//鑾峰彇鍖呭惈浜哻olumn娉ㄨВ鐨勫睘鎬э紝鍥犱负涓嶅寘鍚繖涓敞瑙ｇ殑鏃跺�欐槸榛樿nullable涓簍rue锛寀nique涓篺alse
List<Field> hasColumnAnnoFields = filterHasColumnAnnoFields(baseModel);
@@ -284,9 +287,9 @@
VciBaseUtil.alertNotNull(dto,"鏁版嵁浼犺緭瀵硅薄",baseModel,"鏁版嵁搴撲腑鐨勬暟鎹璞�");
//鍓嶇鍙兘涓嶄細鎶婇粯璁ょ殑鎵�鏈夊睘鎬т紶閫掕繃鏉ワ紝鎵�浠ュ厛浠庢暟鎹簱涓殑鏁版嵁瀵硅薄鎷疯礉鍒颁复鏃剁殑瀵硅薄涓�
BaseModel tempModel = new BaseModel();
- BeanUtil.convert(baseModel,tempModel);
- BeanUtil.convert(dto,baseModel);
- //BeanUtil.convert(tempModel,baseModel);
+ BeanUtilForVCI.convert(baseModel,tempModel);
+ BeanUtilForVCI.convert(dto,baseModel);
+ //BeanUtilForVCI.convert(tempModel,baseModel);
//涓嶇煡閬撲负鍟ワ紝绐佺劧BeanUtil.convert(tempModel,baseModel);涓嶅ソ浣夸簡
BeanUtilForVCI.copyPropertiesIgnoreCase(tempModel,baseModel);
//涓轰簡闃叉鍓嶇娌℃湁浼犻�掗粯璁ょ殑灞炴�э紝鎵�浠ュ緱鍏堟嫹璐濆埌baseModel涓紝鐒跺悗dto鎷疯礉涓�娆″悗锛屽啀鎶婃暟鎹簱涓嫹璐濆洖鏉ャ��
@@ -344,11 +347,11 @@
wrapperForAddLink(linkModel);
VciBaseUtil.alertNotNull(fromModel,"閾炬帴绫诲瀷from绔�",toModel,"閾炬帴绫诲瀷to绔�");
linkModel.setFoid(fromModel.getOid());
- linkModel.setFbtmname(fromModel.getBtmname());
+ linkModel.setFbtmname(fromModel.getBtmName());
linkModel.setFnameoid(fromModel.getNameOid());
linkModel.setToid(toModel.getOid());
- linkModel.setTbtmname(toModel.getBtmname());
+ linkModel.setTbtmname(toModel.getBtmName());
linkModel.setTnameoid(toModel.getNameOid());
linkModel.setTrevisionoid(toModel.getRevisionOid());
}
@@ -418,7 +421,7 @@
//蹇呴』绠＄悊鐗堟湰鎵嶄細鎵ц鍙戝竷
VciBaseUtil.alertNotNull( baseModel.getOid(), "鏁版嵁瀵硅薄鐨勪富閿�", baseModel.getNameOid(), "瀵硅薄鐨勪富閿�",baseModel.getRevisionOid(),"鐗堟湰鐨勪富閿�");
ReleasedObjDO releasedObjDO = new ReleasedObjDO();
- BeanUtil.convert(baseModel,releasedObjDO);
+ BeanUtilForVCI.convert(baseModel,releasedObjDO);
if(StringUtils.isBlank(releasedObjDO.getBtmName())){
releasedObjDO.setBtmName(btmType.name());
}
@@ -516,7 +519,7 @@
if(StringUtils.isBlank(baseModel.getOwner())) {
baseModel.setOwner(baseModel.getCreator());
}
- baseModel.setBtmname(btmName);
+ baseModel.setBtmName(btmName);
}
/**
@@ -590,12 +593,12 @@
setBtmName(newModel);
VciBaseUtil.alertNotNull(newModel.getCopyFromVersion(),"寮曠敤鑰佺増鏈殑涓婚敭");
if (revisionMapper != null) {
- RevisionInfo oldRevision = revisionMapper.selectByOid(newModel.getCopyFromVersion(),VciBaseUtil.getTableName(newModel.getBtmname()));
+ RevisionInfo oldRevision = revisionMapper.selectByOid(newModel.getCopyFromVersion(),VciBaseUtil.getTableName(newModel.getBtmName()));
if(oldRevision == null || StringUtils.isBlank(oldRevision.getOid()) ){
throw new VciBaseException("鑰佺増鏈湪鏁版嵁搴撲腑涓嶅瓨鍦�");
}
BaseModel oldModel = new BaseModel();
- BeanUtil.convert(oldRevision,oldModel);
+ BeanUtilForVCI.convert(oldRevision,oldModel);
wrapperRevisionModel(oldModel,newModel);
}else{
throw new VciBaseException("娌℃湁鍒濆鍖栫増鏈鍒欑殑鏁版嵁鎿嶄綔灞�,璇峰紑鍙戜汉鍛樻鏌aven鏄惁寮曠敤");
@@ -610,12 +613,12 @@
public void wrapperVersionModel(BaseModel newModel) throws VciBaseException{
VciBaseUtil.alertNotNull(newModel,"鏂扮増娆＄殑鏁版嵁瀵硅薄",newModel.getCopyFromVersion(),"寮曠敤鑰佺増娆＄殑涓婚敭");
if (revisionMapper != null) {
- RevisionInfo oldRevision = revisionMapper.selectByOid(newModel.getCopyFromVersion(),VciBaseUtil.getTableName(newModel.getBtmname()));
+ RevisionInfo oldRevision = revisionMapper.selectByOid(newModel.getCopyFromVersion(),VciBaseUtil.getTableName(newModel.getBtmName()));
if(oldRevision == null || StringUtils.isBlank(oldRevision.getOid()) ){
throw new VciBaseException("鑰佺増娆℃暟鎹湪鏁版嵁搴撲腑涓嶅瓨鍦�");
}
BaseModel oldModel = new BaseModel();
- BeanUtil.convert(oldRevision,oldModel);
+ BeanUtilForVCI.convert(oldRevision,oldModel);
wrapperVersionModel(oldModel,newModel);
}else{
throw new VciBaseException("娌℃湁鍒濆鍖栫増鏈鍒欑殑鏁版嵁鎿嶄綔灞�,璇峰紑鍙戜汉鍛樻鏌aven鏄惁寮曠敤");
@@ -984,7 +987,7 @@
} else {
//娌℃湁杩欎釜锛岄偅灏辩洿鎺ョ敤oldModel鍘昏幏鍙栫増鏈彿
lastRevision = new RevisionInfo();
- BeanUtil.convert(oldModel, lastRevision);
+ BeanUtilForVCI.convert(oldModel, lastRevision);
}
newModel.setRevisionRule(lastRevision.getRevisionRule());
newModel.setVersionRule(lastRevision.getVersionRule());
@@ -1050,7 +1053,7 @@
} else {
//娌℃湁杩欎釜锛岄偅灏辩洿鎺ョ敤oldModel鍘昏幏鍙栫増鏈彿
lastRevision = new RevisionInfo();
- BeanUtil.convert(oldModel, lastRevision);
+ BeanUtilForVCI.convert(oldModel, lastRevision);
}
//鐗堟鍙�,灏辨暟瀛楀拰瀛楁瘝涓ょ
if(oldModel.getVersionValue().matches(RegExpConstant.LETTER)){
@@ -1075,12 +1078,12 @@
*/
private void setBtmName(BaseModel baseModel){
VciBaseUtil.alertNotNull(baseModel,"鏁版嵁瀵硅薄");
- if(StringUtils.isBlank(baseModel.getBtmname())){
+ if(StringUtils.isBlank(baseModel.getBtmName())){
VciBtmType btmType = getBtmTypeAnnotation(baseModel);
if(btmType == null){
throw new VciBaseException("娌℃湁VciBtmType娉ㄨВ锛屾棤娉曞垽鏂笟鍔＄被鍨�");
}
- baseModel.setBtmname(btmType.name());
+ baseModel.setBtmName(btmType.name());
}
}
@@ -1091,8 +1094,8 @@
public void saveOldModel(BaseModel oldModel){
setBtmName(oldModel);
if (revisionMapper != null) {
- revisionMapper.resetLastRevision(oldModel.getNameOid(),VciBaseUtil.getTableName(oldModel.getBtmname()));
- revisionMapper.resetOldRevision(oldModel.getOid(),VciBaseUtil.getTableName(oldModel.getBtmname()));
+ revisionMapper.resetLastRevision(oldModel.getNameOid(),VciBaseUtil.getTableName(oldModel.getBtmName()));
+ revisionMapper.resetOldRevision(oldModel.getOid(),VciBaseUtil.getTableName(oldModel.getBtmName()));
}else{
throw new VciBaseException("娌℃湁鍒濆鍖栫増鏈鍒欑殑鏁版嵁鎿嶄綔灞傦紝璇峰紑鍙戜汉鍛樻鏌aven鏄惁寮曠敤");
}
@@ -1105,8 +1108,8 @@
public void saveOldModelVersion(BaseModel oldModel){
setBtmName(oldModel);
if (revisionMapper != null) {
- revisionMapper.resetLastVersion(oldModel.getNameOid(),oldModel.getRevisionOid(),VciBaseUtil.getTableName(oldModel.getBtmname()));
- revisionMapper.resetOldVersion(oldModel.getOid(),VciBaseUtil.getTableName(oldModel.getBtmname()));
+ revisionMapper.resetLastVersion(oldModel.getNameOid(),oldModel.getRevisionOid(),VciBaseUtil.getTableName(oldModel.getBtmName()));
+ revisionMapper.resetOldVersion(oldModel.getOid(),VciBaseUtil.getTableName(oldModel.getBtmName()));
}else{
throw new VciBaseException("娌℃湁鍒濆鍖栫増鏈鍒欑殑鏁版嵁鎿嶄綔灞傦紝璇峰紑鍙戜汉鍛樻鏌aven鏄惁寮曠敤");
}
--
Gitblit v1.9.3