From 8033eea1502d4cb0a91aa4b86c848ccb00ba8dc0 Mon Sep 17 00:00:00 2001
From: kimi <kimi42345@gmail.com>
Date: 星期五, 13 三月 2020 09:31:46 +0800
Subject: [PATCH] no message
---
src/main/java/com/highdatas/mdm/service/impl/MasterDataServiceImpl.java | 119 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 95 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/highdatas/mdm/service/impl/MasterDataServiceImpl.java b/src/main/java/com/highdatas/mdm/service/impl/MasterDataServiceImpl.java
index 18c90e4..98e53f6 100644
--- a/src/main/java/com/highdatas/mdm/service/impl/MasterDataServiceImpl.java
+++ b/src/main/java/com/highdatas/mdm/service/impl/MasterDataServiceImpl.java
@@ -43,6 +43,8 @@
IMaintainDetailService maintainDetailService;
@Autowired
IFlowsService flowsService;
+ @Autowired
+
@Resource
protected SqlSessionTemplate sqlSessionTemplate;
@Override
@@ -138,12 +140,14 @@
}
public Long getCountByVersion (String maintainId, String tableName,String tableTempName,Integer fromOrderNo, Integer toOrderNo, String whereSegment) {
try{
- String fields = getFields(tableName);
- String Hfields = getFields(tableName, Constant.H);
- String tempFields = getTempFields(tableName);
- String A1fields = getFields(tableName, Constant.A1);
- String A2fields = getFields(tableName, Constant.A2);
- String tempHFields = getTempFields(tableName, Constant.H);
+ Maintain maintain = maintainService.selectById(maintainId);
+
+ String fields = getFields(tableName, maintain);
+ String Hfields = getFields(tableName, Constant.H, maintain);
+ String tempFields = getTempFields(tableName, maintain);
+ String A1fields = getFields(tableName, Constant.A1, maintain);
+ String A2fields = getFields(tableName, Constant.A2, maintain);
+ String tempHFields = getTempFields(tableName, Constant.H, maintain);
if (StringUtils.isEmpty(whereSegment)) {
whereSegment = Constant.WHERE_DEFAULT;
}
@@ -158,12 +162,14 @@
public Long getCountByMaxVersion (String maintainId, String tableName,String tableTempName,Integer fromOrderNo, Integer toOrderNo, String whereSegment) {
try{
- String fields = getFields(tableName);
- String Hfields = getFields(tableName, Constant.H);
- String tempFields = getTempFields(tableName);
- String A1fields = getFields(tableName, Constant.A1);
- String A2fields = getFields(tableName, Constant.A2);
- String tempHFields = getTempFields(tableName, Constant.H);
+ Maintain maintain = maintainService.selectById(maintainId);
+
+ String fields = getFields(tableName, maintain);
+ String Hfields = getFields(tableName, Constant.H, maintain);
+ String tempFields = getTempFields(tableName, maintain);
+ String A1fields = getFields(tableName, Constant.A1, maintain);
+ String A2fields = getFields(tableName, Constant.A2, maintain);
+ String tempHFields = getTempFields(tableName, Constant.H, maintain);
if (StringUtils.isEmpty(whereSegment)) {
whereSegment = Constant.WHERE_DEFAULT;
}
@@ -179,7 +185,13 @@
@Override
public String getFields(String tableName) {
- return getFields(tableName, null);
+ return getFields(tableName, Constant.EMPTY);
+ }
+
+ @Override
+ public String getFields(String tableName, Maintain maintain) {
+
+ return getFields(tableName, null, maintain);
}
private String getCaseWhenFields(String tableName) {
@@ -216,8 +228,38 @@
}
@Override
+ public String getFields(String tableName, String alias, Maintain maintain) {
+ List<SysField> fields = fieldService.getFieldByMaintain(maintain.getId());
+ ContentBuilder contentBuilder = new ContentBuilder(Constant.COMMA);
+ if (!fields.contains(Constant.ID)) {
+ fields.add(new SysField().setField(Constant.ID));
+ }
+
+ for (SysField field : fields) {
+ String fieldName = field.getField();
+ if (fieldName.equalsIgnoreCase(Constant.DEAL)) {
+ //DEAL 涓嶇粰鐪�
+ continue;
+ }
+ if (StringUtils.isEmpty(alias)) {
+ contentBuilder.append(fieldName);
+ } else {
+ contentBuilder.append(MessageFormat.format(Constant.Alias,alias,fieldName));
+ }
+
+ }
+
+ return contentBuilder.toString();
+ }
+
+ @Override
+ public String getTempFields(String tableName, Maintain maintain) {
+ return getTempFields(tableName, null, maintain);
+ }
+
+ @Override
public String getTempFields(String tableName) {
- return getTempFields(tableName, null);
+ return getTempFields(tableName, Constant.EMPTY_Str);
}
@Override
public String getTempFields(String tableName, String alias) {
@@ -225,6 +267,33 @@
ContentBuilder contentBuilder = new ContentBuilder(Constant.COMMA);
for (TableSchemaResult tableSchemaResult : tableField) {
String fieldName = tableSchemaResult.getFieldName();
+ if (fieldName.equalsIgnoreCase(Constant.ID)) {
+ if (StringUtils.isEmpty(alias)) {
+ contentBuilder.append(MessageFormat.format("{0} as id", Constant.STD_ID));
+ } else {
+ contentBuilder.append(MessageFormat.format("{0}.{1} as id", alias, Constant.STD_ID));
+ }
+ continue;
+ }
+ if (StringUtils.isEmpty(alias)) {
+ contentBuilder.append(fieldName);
+ } else {
+ contentBuilder.append(MessageFormat.format(Constant.Alias,alias,fieldName));
+ }
+ }
+ return contentBuilder.toString();
+ }
+
+ @Override
+ public String getTempFields(String tableName, String alias, Maintain maintain) {
+ List<SysField> fields = fieldService.getFieldByMaintain(maintain.getId());
+ ContentBuilder contentBuilder = new ContentBuilder(Constant.COMMA);
+ if (!fields.contains(Constant.ID)) {
+ fields.add(new SysField().setField(Constant.ID));
+ }
+
+ for (SysField field : fields) {
+ String fieldName = field.getField();
if (fieldName.equalsIgnoreCase(Constant.ID)) {
if (StringUtils.isEmpty(alias)) {
contentBuilder.append(MessageFormat.format("{0} as id", Constant.STD_ID));
@@ -282,6 +351,7 @@
@Override
public Result selectListByPageByVersion(String tableName, List<String> fieldList, String whereSegment, Integer pageNo, Integer pageSize, String version, boolean findMax) {
+
Maintain maintainFromVersion = maintainService.getMaintainFromVersion(tableName, version);
Maintain nowVersionMaintain = maintainService.getNowVersion(tableName);
boolean isMax = maintainService.checkdMaxVersion(maintainFromVersion.getId());
@@ -330,12 +400,12 @@
String tempHfields;
if (fieldList == null || fieldList.size() == 0) {
- fields = getFields(tableName);
- Hfields = getFields(tableName,Constant.H);
- A1fields = getFields(tableName,Constant.A1);
- A2fields = getFields(tableName,Constant.A2);
- tempFields = getTempFields(tableName);
- tempHfields = getTempFields(tableName, Constant.H);
+ fields = getFields(tableName, maintainFromVersion);
+ Hfields = getFields(tableName,Constant.H, maintainFromVersion);
+ A1fields = getFields(tableName,Constant.A1, maintainFromVersion);
+ A2fields = getFields(tableName,Constant.A2, maintainFromVersion);
+ tempFields = getTempFields(tableName, maintainFromVersion);
+ tempHfields = getTempFields(tableName, Constant.H, maintainFromVersion);
} else {
fields = fieldList.stream().collect(Collectors.joining(Constant.COMMA));
Hfields = fieldList.stream().map(s -> MessageFormat.format(Constant.Alias,Constant.H, s)).collect(Collectors.joining(Constant.COMMA));
@@ -373,7 +443,7 @@
EntityWrapper<SysField> sysFieldEntityWrapper = new EntityWrapper<>();
sysFieldEntityWrapper.eq("table_name", tableName);
- List<SysField> sysFields = fieldService.selectList(sysFieldEntityWrapper);
+ List<SysField> sysFields = fieldService.getFieldByMaintain(maintainFromVersion.getId());
if (isMax) {
sysFields.add(new SysField().setAlias("鏁版嵁鐘舵��").setField("operate").setVisible(true).setFormat("operate_"));
sysFields.add(new SysField().setAlias("瀹℃壒鐘舵��").setField("status").setVisible(true).setFormat("status_"));
@@ -609,9 +679,10 @@
public Result insert(String tableName, String json) {
try {
- List<TableSchemaResult> tableFieldList = mapper.getTableField(tableName);
- List<String> fieldNameList = tableFieldList.stream().map(TableSchemaResult::getFieldName).collect(Collectors.toList());
- String fields = tableFieldList.stream().map(TableSchemaResult::getFieldName).collect(Collectors.joining(Constant.COMMA));
+ List<SysField> fieldByTable = fieldService.getFieldByTable(tableName);
+
+ List<String> fieldNameList = fieldByTable.stream().map(sysField -> sysField.getField()).collect(Collectors.toList());
+ String fields = fieldByTable.stream().map(sysField -> sysField.getField()).collect(Collectors.joining(Constant.COMMA));
ContentBuilder builder = new ContentBuilder(Constant.COMMA);
Object parse = JSON.parse(json);
--
Gitblit v1.8.0