Skip to content

Commit 24f0f2e

Browse files
author
杨利兵
committed
删除replaceFlags功能
1 parent 1433df2 commit 24f0f2e

File tree

6 files changed

+5
-39
lines changed

6 files changed

+5
-39
lines changed

src/main/java/com/yanglb/codegen/core/translator/BaseDdlTranslator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ protected ForeignDetailModel getForeignByDdlDetail(DdlModel model, DdlDetail det
151151
// 外键表
152152
DdlDetail foreignColumnModel = null;
153153

154-
if(foreigns==null || foreigns.length !=2) {
154+
if(foreigns.length != 2) {
155155
result = false;
156156
break;
157157
}
@@ -175,7 +175,7 @@ protected ForeignDetailModel getForeignByDdlDetail(DdlModel model, DdlDetail det
175175
foreignDetailModel.setDdlDetail(detail);
176176
foreignDetailModel.setForeignDdlModel(foreignTableModel);
177177
foreignDetailModel.setForeignDdlDetail(foreignColumnModel);
178-
}while(false);
178+
} while(false);
179179

180180
// 失败时直接抛出异常
181181
if(!result) {

src/main/java/com/yanglb/codegen/core/translator/BaseSqlTranslator.java

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,4 @@ public class BaseSqlTranslator<T> extends BaseTranslator<List<T>> {
2323
// 列引号字符,如:SQL Server为[], MySQL为`等
2424
protected String sqlColumnStart = "\"";
2525
protected String sqlColumnEnd = "\"";
26-
27-
/**
28-
* 取得用于替换的Model
29-
*/
30-
private Object getReplaceModel() {
31-
if(this.model == null || this.model.size() <= 0) return null;
32-
33-
// 只使用第一个Sheet替换
34-
return this.model.get(0);
35-
}
36-
37-
@Override
38-
protected void onAfterTranslate() throws CodeGenException {
39-
super.onAfterTranslate();
40-
41-
// 替换Flag
42-
String data = this.writableModel.getData().toString();
43-
data = this.replaceFlags(data, getReplaceModel());
44-
this.writableModel.setData(new StringBuilder(data));
45-
}
4626
}

src/main/java/com/yanglb/codegen/core/translator/impl/DdlMysqlTranslatorImpl.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,12 +211,10 @@ private String genDdlDetail(DdlDetail detail) {
211211
if (detail.getColLength() != null) {
212212
if (detail.getColPrecision() != null) {
213213
// 长度及精度都有 NUMBER(10,2)
214-
type = String.format("%s(%d, %d)", type, detail.getColLength()
215-
.intValue(), detail.getColPrecision().intValue());
214+
type = String.format("%s(%d, %d)", type, detail.getColLength(), detail.getColPrecision());
216215
} else {
217216
// 只有长度 VARCHAR2(10)
218-
type = String.format("%s(%d)", type, detail.getColLength()
219-
.intValue());
217+
type = String.format("%s(%d)", type, detail.getColLength());
220218
}
221219
} else {
222220
// 暂时忽略这种情况

src/main/java/com/yanglb/codegen/core/translator/impl/MsgAndroidTranslatorImpl.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,7 @@ protected void onTranslate() throws CodeGenException {
5757
sb.append("<?xml version=\"1.0\" encoding=\"utf-8\"?>\r\n" +
5858
Infos.xmlHeader() +
5959
"<resources>\r\n");
60-
61-
// 替换标记
62-
String s = this.replaceFlags(sb.toString(), null);
63-
sb = new StringBuilder(s);
64-
60+
6561
// 用于检查相同的key
6662
Map<String, Boolean> keys = new HashMap<String, Boolean>();
6763
Map<String, List<String>> arrays = new HashMap<String, List<String>>();

src/main/java/com/yanglb/codegen/core/translator/impl/MsgCSTranslatorImpl.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,6 @@ protected void onTranslate() throws CodeGenException {
7474
// 添加 resheader
7575
sb.append(readResource("msg/resx/resheader.txt"));
7676

77-
// 替换标记
78-
String s = this.replaceFlags(sb.toString(), null);
79-
sb = new StringBuilder(s);
80-
8177
// 用于检查相同的key
8278
Map<String, Boolean> keys = new HashMap<String, Boolean>();
8379
for(TableModel tblModel : this.model) {

src/main/java/com/yanglb/codegen/core/translator/impl/MsgIOSTranslatorImpl.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,6 @@ protected void onTranslate() throws CodeGenException {
4646
sb.append(Infos.cHeader());
4747
sb.append("\n");
4848

49-
// 替换标记
50-
String s = this.replaceFlags(sb.toString(), null);
51-
sb = new StringBuilder(s);
52-
5349
// 用于检查相同的key
5450
Map<String, Boolean> keys = new HashMap<String, Boolean>();
5551
for(TableModel tblModel : this.model) {

0 commit comments

Comments
 (0)