|
@@ -1,6 +1,6 @@
|
|
|
package com.persagy.dmp.rwd.edit.service;
|
|
|
|
|
|
-import cn.hutool.json.JSONObject;
|
|
|
+import com.alibaba.fastjson.JSONObject;
|
|
|
import com.fasterxml.jackson.databind.node.ArrayNode;
|
|
|
import com.fasterxml.jackson.databind.node.ObjectNode;
|
|
|
import com.persagy.common.criteria.CriteriaUtils;
|
|
@@ -11,7 +11,6 @@ import com.persagy.common.web.MapResponse;
|
|
|
import com.persagy.common.web.PagedResponse;
|
|
|
import com.persagy.dmp.rwd.edit.config.web.UserUtils;
|
|
|
import com.persagy.dmp.rwd.edit.entity.*;
|
|
|
-import com.persagy.dmp.rwd.edit.entity.dto.ClassDefChangeRecordDTO;
|
|
|
import com.persagy.dmp.rwd.edit.entity.dto.FuncidDefChangeRecordDTO;
|
|
|
import com.persagy.dmp.rwd.edit.enumeration.EnumOperationType;
|
|
|
import com.persagy.dmp.rwd.edit.enumeration.EnumVersionState;
|
|
@@ -19,17 +18,16 @@ import com.persagy.dmp.rwd.edit.model.DtDataModel;
|
|
|
import com.persagy.dmp.rwd.edit.repository.FuncidDefChangeRecordRepository;
|
|
|
import com.persagy.dmp.rwd.edit.repository.FuncidDefRepository;
|
|
|
import com.persagy.dmp.rwd.enums.FuncidDataType;
|
|
|
-import com.persagy.dmp.rwd.enums.ObjType;
|
|
|
import com.persagy.dmp.rwd.model.ClassDefModel;
|
|
|
import com.persagy.dmp.rwd.model.FuncidDefModel;
|
|
|
import com.querydsl.core.types.dsl.BooleanExpression;
|
|
|
import io.micrometer.core.instrument.util.StringUtils;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.beanutils.BeanMap;
|
|
|
+import org.apache.commons.lang.ObjectUtils;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
-
|
|
|
import javax.transaction.Transactional;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
@@ -174,10 +172,10 @@ public class FuncidDefChangeRecordService {
|
|
|
}
|
|
|
param.setOrigCode(funcidDef.getOrigCode());
|
|
|
param.setName(funcidDef.getName());
|
|
|
- if (param.getAliasCode() == null) {
|
|
|
+ if (StringUtils.isEmpty(param.getAliasCode())) {
|
|
|
param.setAliasCode(funcidDef.getAliasCode());
|
|
|
}
|
|
|
- if (param.getAliasName() == null) {
|
|
|
+ if (StringUtils.isEmpty(param.getAliasName())) {
|
|
|
param.setAliasName(funcidDef.getAliasName());
|
|
|
}
|
|
|
param.setClassCode(funcidDef.getClassCode());
|
|
@@ -185,19 +183,20 @@ public class FuncidDefChangeRecordService {
|
|
|
param.setType(funcidDef.getType());
|
|
|
param.setGroupCode(funcidDef.getGroupCode());
|
|
|
param.setProjectId(funcidDef.getProjectId());
|
|
|
- if (param.getFirstTag() == null) {
|
|
|
+
|
|
|
+ if (StringUtils.isEmpty(param.getFirstTag())) {
|
|
|
param.setFirstTag(funcidDef.getFirstTag());
|
|
|
}
|
|
|
- if (param.getSecondTag() == null) {
|
|
|
+ if (StringUtils.isEmpty(param.getFirstTag())) {
|
|
|
param.setSecondTag(funcidDef.getSecondTag());
|
|
|
}
|
|
|
- if(param.getPriority() == null){
|
|
|
+ if(StringUtils.isEmpty(param.getPriority())){
|
|
|
param.setPriority(funcidDef.getPriority());
|
|
|
}
|
|
|
- if(param.getInputMode() == null){
|
|
|
+ if(StringUtils.isEmpty(param.getInputMode())){
|
|
|
param.setInputMode(funcidDef.getInputMode());
|
|
|
}
|
|
|
- if(param.getUnit() == null){
|
|
|
+ if(StringUtils.isEmpty(param.getUnit())){
|
|
|
param.setUnit(funcidDef.getUnit());
|
|
|
}
|
|
|
param.setDataType(funcidDef.getDataType());
|
|
@@ -617,27 +616,35 @@ public class FuncidDefChangeRecordService {
|
|
|
List<JSONObject> operationContentAfter = new ArrayList<>();
|
|
|
Set<?> keySets = Collections.unmodifiableSet(beforeParamMap.keySet());
|
|
|
for (Map.Entry<?, ?> afterEntry : afterParamMap.entrySet()) {
|
|
|
- Object afterValue = afterEntry.getValue();
|
|
|
- if(afterValue == null || "class".equals(afterEntry.getKey()) || "".equals(afterValue.toString())){
|
|
|
+ if(!keySets.contains(afterEntry.getKey()) || "id".equals(afterEntry.getKey()) || "version".equals(afterEntry.getKey())
|
|
|
+ ||"class".equals(afterEntry.getKey()) ){
|
|
|
continue;
|
|
|
}
|
|
|
+ Object afterValue = afterEntry.getValue();
|
|
|
Object beforeValue = beforeParamMap.get(afterEntry.getKey());
|
|
|
- if(!keySets.contains(afterEntry.getKey())){
|
|
|
+ if(ObjectUtils.equals(afterValue,beforeValue)){
|
|
|
continue;
|
|
|
}
|
|
|
JSONObject object = new JSONObject();
|
|
|
- if(beforeValue == null || (beforeValue!=null && !afterValue.toString().equals(beforeValue.toString()))){
|
|
|
- //变更前
|
|
|
- object.put(afterEntry.getKey().toString(),beforeValue);
|
|
|
- operationContentBefore.add(object);
|
|
|
- //变更后
|
|
|
- object = new JSONObject();
|
|
|
- object.put(afterEntry.getKey().toString(),afterEntry.getValue());
|
|
|
- operationContentAfter.add(object);
|
|
|
+ //变更前
|
|
|
+ if(beforeValue ==null){
|
|
|
+ object.put(afterEntry.getKey().toString(),"");
|
|
|
+ }else{
|
|
|
+ object.put(afterEntry.getKey().toString(),beforeValue.toString());
|
|
|
+ }
|
|
|
+ operationContentBefore.add(object);
|
|
|
+
|
|
|
+ //变更后
|
|
|
+ object =new JSONObject();
|
|
|
+ if(afterValue ==null){
|
|
|
+ object.put(afterEntry.getKey().toString(),"");
|
|
|
+ }else{
|
|
|
+ object.put(afterEntry.getKey().toString(),afterValue.toString());
|
|
|
}
|
|
|
+ operationContentAfter.add(object);
|
|
|
}
|
|
|
- param.setOperationContentBefore(operationContentBefore.toString());
|
|
|
- param.setOperationContentAfter(operationContentAfter.toString());
|
|
|
+ param.setOperationContentBefore(operationContentBefore);
|
|
|
+ param.setOperationContentAfter(operationContentAfter);
|
|
|
}
|
|
|
}
|
|
|
|