Skip to content

Commit 09dfa5e

Browse files
author
杨利兵
committed
添加CSharp资源文件生成时重复key检查功能。
1 parent 19b7647 commit 09dfa5e

File tree

4 files changed

+34
-30
lines changed

4 files changed

+34
-30
lines changed

‎src/com/yanglb/utilitys/codegen/core/translator/impl/MsgCSTranslatorImpl.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,13 @@
1515
*/
1616
package com.yanglb.utilitys.codegen.core.translator.impl;
1717

18+
import java.util.HashMap;
1819
import java.util.Map;
1920

2021
import com.yanglb.utilitys.codegen.core.model.TableModel;
2122
import com.yanglb.utilitys.codegen.core.translator.BaseMsgTranslator;
2223
import com.yanglb.utilitys.codegen.exceptions.CodeGenException;
24+
import com.yanglb.utilitys.codegen.utility.MsgUtility;
2325
import com.yanglb.utilitys.codegen.utility.StringUtility;
2426

2527
public class MsgCSTranslatorImpl extends BaseMsgTranslator {
@@ -50,6 +52,8 @@ protected void onTranslate() throws CodeGenException {
5052
String s = this.replaceFlags(sb.toString(), null);
5153
sb = new StringBuilder(s);
5254

55+
// 用于检查相同的key
56+
Map<String, Boolean> keys = new HashMap<String, Boolean>();
5357
for(TableModel tblModel : this.model) {
5458
// 添加Sheet注释
5559
sb.append(String.format(" \r\n"));
@@ -58,6 +62,8 @@ protected void onTranslate() throws CodeGenException {
5862
for(Map<String, String> itm : tblModel.toList()) {
5963
String id = itm.get("id");
6064
if(StringUtility.isNullOrEmpty(id)) continue;
65+
if (keys.containsKey(id)) throw new CodeGenException(String.format(MsgUtility.getString("E_013"), id));
66+
keys.put(id, true);
6167

6268
// 对字符串进行转换
6369
String value = this.convert2CSCode(itm.get(this.msgLang));

‎src/conf/i18n.xlsx‎

121 Bytes
Binary file not shown.

‎src/conf/message.properties‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
# \u56FD\u9645\u5316\u8D44\u6E90
2-
3-
# \u9519\u8BEF\u4FE1\u606F
4-
E_001=\u8F6C\u6362%s\u5C5E\u6027\u5931\u8D25\uFF1A%s
5-
E_002=\u6CA1\u6709%s\u5B57\u6BB5\uFF0C\u8BF7\u68C0\u67E5Excel\u6A21\u677F\u662F\u5426\u6B63\u786E\u3002
6-
E_003=\u6240\u6307\u5B9A\u7684Excel\u4E2D\u6CA1\u6709\u8981\u751F\u6210\u7684\u4EE3\u7801\u3002
7-
E_004=%s \u4E0D\u5B58\u5728\u3002
8-
E_005=Excel\u8BFB\u53D6\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5Excel\u683C\u5F0F\u662F\u5426\u6B63\u786E\u3002
9-
E_006=\u65E0\u6CD5\u8BBF\u95EE%s.%s\u5C5E\u6027\u7684\u503C: \r\n%s
10-
E_007=\u5199\u5165\u6587\u4EF6\u5931\u8D25\uFF1A%s
11-
E_008=\u8F93\u51FA\u6587\u4EF6\u5DF2\u7ECF\u5B58\u5728\uFF0C\u4E14\u662F\u4E00\u4E2A\u76EE\u5F55\u4E0D\u53EF\u7EE7\u7EED\u751F\u6210\u3002\r\n%s
12-
E_009=\u65E0\u6CD5\u521B\u5EFA\u8F93\u51FA\u6587\u4EF6\u76EE\u5F55\u3002\r\n%s
13-
E_010=\u6682\u4E0D\u652F\u6301\u6B64\u79CD\u7C7B\u578B\u7684\u4EE3\u7801\u751F\u6210\u3002
14-
E_011=\u65E0\u6CD5\u521B\u5EFA(%s)\uFF1A%s
15-
E_012=-- \u5916\u952E\u540D\u592A\u957F\u5DF2\u622A\u65AD\uFF08%s\uFF09\r\n
1+
# \u9519\u8bef\u4fe1\u606f
2+
E_001=\u8f6c\u6362%s\u5c5e\u6027\u5931\u8d25\uff1a%s
3+
E_002=\u6ca1\u6709%s\u5b57\u6bb5\uff0c\u8bf7\u68c0\u67e5Excel\u6a21\u677f\u662f\u5426\u6b63\u786e\u3002
4+
E_003=\u6240\u6307\u5b9a\u7684Excel\u4e2d\u6ca1\u6709\u8981\u751f\u6210\u7684\u4ee3\u7801\u3002
5+
E_004=%s \u4e0d\u5b58\u5728\u3002
6+
E_005=Excel\u8bfb\u53d6\u5931\u8d25\uff0c\u8bf7\u68c0\u67e5Excel\u683c\u5f0f\u662f\u5426\u6b63\u786e\u3002
7+
E_006=\u65e0\u6cd5\u8bbf\u95ee%s.%s\u5c5e\u6027\u7684\u503c: \r\n%s
8+
E_007=\u5199\u5165\u6587\u4ef6\u5931\u8d25\uff1a%s
9+
E_008=\u8f93\u51fa\u6587\u4ef6\u5df2\u7ecf\u5b58\u5728\uff0c\u4e14\u662f\u4e00\u4e2a\u76ee\u5f55\u4e0d\u53ef\u7ee7\u7eed\u751f\u6210\u3002\r\n%s
10+
E_009=\u65e0\u6cd5\u521b\u5efa\u8f93\u51fa\u6587\u4ef6\u76ee\u5f55\u3002\r\n%s
11+
E_010=\u6682\u4e0d\u652f\u6301\u6b64\u79cd\u7c7b\u578b\u7684\u4ee3\u7801\u751f\u6210\u3002
12+
E_011=\u65e0\u6cd5\u521b\u5efa(%s)\uff1a%s
13+
E_012=-- \u5916\u952e\u540d\u592a\u957f\u5df2\u622a\u65ad\uff08%s\uff09\r\n
14+
E_013=\u8d44\u6e90ID\u3010%s\u3011\u91cd\u590d\uff0c\u8bf7\u68c0\u67e5\u3002

‎src/conf/message_zh_cn.properties‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
1-
# \u56FD\u9645\u5316\u8D44\u6E90
2-
3-
# \u9519\u8BEF\u4FE1\u606F
4-
E_001=\u8F6C\u6362%s\u5C5E\u6027\u5931\u8D25\uFF1A%s
5-
E_002=\u6CA1\u6709%s\u5B57\u6BB5\uFF0C\u8BF7\u68C0\u67E5Excel\u6A21\u677F\u662F\u5426\u6B63\u786E\u3002
6-
E_003=\u6240\u6307\u5B9A\u7684Excel\u4E2D\u6CA1\u6709\u8981\u751F\u6210\u7684\u4EE3\u7801\u3002
7-
E_004=%s \u4E0D\u5B58\u5728\u3002
8-
E_005=Excel\u8BFB\u53D6\u5931\u8D25\uFF0C\u8BF7\u68C0\u67E5Excel\u683C\u5F0F\u662F\u5426\u6B63\u786E\u3002
9-
E_006=\u65E0\u6CD5\u8BBF\u95EE%s.%s\u5C5E\u6027\u7684\u503C: \r\n%s
10-
E_007=\u5199\u5165\u6587\u4EF6\u5931\u8D25\uFF1A%s
11-
E_008=\u8F93\u51FA\u6587\u4EF6\u5DF2\u7ECF\u5B58\u5728\uFF0C\u4E14\u662F\u4E00\u4E2A\u76EE\u5F55\u4E0D\u53EF\u7EE7\u7EED\u751F\u6210\u3002\r\n%s
12-
E_009=\u65E0\u6CD5\u521B\u5EFA\u8F93\u51FA\u6587\u4EF6\u76EE\u5F55\u3002\r\n%s
13-
E_010=\u6682\u4E0D\u652F\u6301\u6B64\u79CD\u7C7B\u578B\u7684\u4EE3\u7801\u751F\u6210\u3002
14-
E_011=\u65E0\u6CD5\u521B\u5EFA(%s)\uFF1A%s
15-
E_012=-- \u5916\u952E\u540D\u592A\u957F\u5DF2\u622A\u65AD\uFF08%s\uFF09\r\n
1+
# \u9519\u8bef\u4fe1\u606f
2+
E_001=\u8f6c\u6362%s\u5c5e\u6027\u5931\u8d25\uff1a%s
3+
E_002=\u6ca1\u6709%s\u5b57\u6bb5\uff0c\u8bf7\u68c0\u67e5Excel\u6a21\u677f\u662f\u5426\u6b63\u786e\u3002
4+
E_003=\u6240\u6307\u5b9a\u7684Excel\u4e2d\u6ca1\u6709\u8981\u751f\u6210\u7684\u4ee3\u7801\u3002
5+
E_004=%s \u4e0d\u5b58\u5728\u3002
6+
E_005=Excel\u8bfb\u53d6\u5931\u8d25\uff0c\u8bf7\u68c0\u67e5Excel\u683c\u5f0f\u662f\u5426\u6b63\u786e\u3002
7+
E_006=\u65e0\u6cd5\u8bbf\u95ee%s.%s\u5c5e\u6027\u7684\u503c: \r\n%s
8+
E_007=\u5199\u5165\u6587\u4ef6\u5931\u8d25\uff1a%s
9+
E_008=\u8f93\u51fa\u6587\u4ef6\u5df2\u7ecf\u5b58\u5728\uff0c\u4e14\u662f\u4e00\u4e2a\u76ee\u5f55\u4e0d\u53ef\u7ee7\u7eed\u751f\u6210\u3002\r\n%s
10+
E_009=\u65e0\u6cd5\u521b\u5efa\u8f93\u51fa\u6587\u4ef6\u76ee\u5f55\u3002\r\n%s
11+
E_010=\u6682\u4e0d\u652f\u6301\u6b64\u79cd\u7c7b\u578b\u7684\u4ee3\u7801\u751f\u6210\u3002
12+
E_011=\u65e0\u6cd5\u521b\u5efa(%s)\uff1a%s
13+
E_012=-- \u5916\u952e\u540d\u592a\u957f\u5df2\u622a\u65ad\uff08%s\uff09\r\n
14+
E_013=\u8d44\u6e90ID\u3010%s\u3011\u91cd\u590d\uff0c\u8bf7\u68c0\u67e5\u3002

0 commit comments

Comments
 (0)