自动生成代码：解决 Java 解析数组 的代码有错误，优化数组和对象的解析

TommyLemon · TommyLemon · commit e434794f0780 · 2019-05-19T23:30:15.000+08:00
diff --git a/apijson/CodeUtil.js b/apijson/CodeUtil.js
@@ -1798,9 +1798,9 @@ var CodeUtil = {
     return CodeUtil.parseCode(name, resObj, {
 
       onParseParentStart: function () {
-        if (isSmart) {
-          return depth > 0 ? '' : CodeUtil.getBlank(depth) + 'JSONResponse ' + name + ' = new JSONResponse(resultJson);\n';
-        }
+        // if (isSmart) { //&#23548;&#33268;&#37324;&#38754;&#30340; [] &#31561;&#23383;&#31526;&#20840;&#37117;&#36716;&#25104; List &#31561;&#65292;&#37324;&#38754;&#27599;&#29992;&#19968;&#20010; key &#21462;&#20540;&#37117;&#24471; formatArrayKey &#25110;&#25152;&#26377;&#23545;&#35937;&#31867;&#22411;&#29992; JSONReseponse &#31561;&#65292;&#19981;&#36890;&#29992;
+        //   return depth > 0 ? '' : CodeUtil.getBlank(depth) + 'JSONResponse ' + name + ' = new JSONResponse(resultJson);\n';
+        // }
         return depth > 0 ? '' : CodeUtil.getBlank(depth) + 'JSONObject ' + name + ' = JSON.parseObject(resultJson);\n';
       },
 
@@ -1850,7 +1850,8 @@ var CodeUtil = {
         var innerPadding = '\n' + CodeUtil.getBlank(depth + 1);
         var innerPadding2 = '\n' + CodeUtil.getBlank(depth + 2);
 
-        var k = JSONResponse.getVariableName(key) + (depth <= 0 ? '' : depth);
+        var vn = JSONResponse.getVariableName(key);
+        var k = vn + (depth <= 0 ? '' : depth);
         var itemName = 'item' + (depth <= 0 ? '' : depth);
         //&#36824;&#26377;&#20854;&#23427;&#23383;&#27573;&#20914;&#31361;&#20197;&#21450;for&#24490;&#29615;&#30340;i&#20914;&#31361;&#65292;&#35299;&#20915;&#19981;&#23436;&#30340;&#65292;&#21482;&#33021;&#35753;&#24320;&#21457;&#32773;&#33258;&#24049;&#25277;&#20986;&#20989;&#25968;  var item = StringUtil.addSuffix(k, 'Item');
 
@@ -1859,24 +1860,27 @@ var CodeUtil = {
         var s = '\n' + padding + '{  //' + key + '<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<';
 
         var t = isSmart ? JSONResponse.getTableName(key) : null;
-        var isTable = JSONObject.isTableKey(t);
+        var isTableKey = JSONObject.isTableKey(t);
         if (isTable) {
-          s += innerPadding + 'List<' + t + '> ' + k + ' = ' + name + '.getList("' + key + '", ' + t + '.class);';
+          s += innerPadding + 'List<' + (isTableKey ? t : type) + '> ' + k + ' = ' + name + '.get' + StringUtil.firstCase(vn, true) + '();'
+        }
+        else if (isTableKey) {
+          s += innerPadding + 'List<' + t + '> ' + k + ' = JSON.parseArray(' + name + '.getString("' + key + '"), ' + t + '.class);';
         }
         else {
           s += innerPadding + 'JSONArray ' + k + ' = ' + name + '.getJSONArray("' + key + '");';
         }
         s += innerPadding + 'if (' + k + ' == null) {';
-        s += innerPadding + blank + k + ' = new ' + (isTable ? 'ArrayList<>' : 'JSONArray') + '();';
+        s += innerPadding + blank + k + ' = new ' + (isTable || isTableKey ? 'ArrayList<>' : 'JSONArray') + '();';
         s += innerPadding + '}\n';
 
 
-        s += innerPadding + (isTable ? t : type) + ' ' + itemName + ';';
+        s += innerPadding + (isTableKey ? t : type) + ' ' + itemName + ';';
 
         var indexName = 'i' + (depth <= 0 ? '' : depth);
         s += innerPadding + 'for (int ' + indexName + ' = 0; ' + indexName + ' < ' + k + '.size(); ' + indexName + ' ++) {';
 
-        s += innerPadding2 + itemName + ' = ' + k + '.get' + (isTable || type == 'Object' ? '' : type) + '(' + indexName + ');';
+        s += innerPadding2 + itemName + ' = ' + k + '.get' + (isTable || isTableKey || type == 'Object' ? '' : type) + '(' + indexName + ');';
         s += innerPadding2 + 'if (' + itemName + ' == null) {';
         s += innerPadding2 + blank + 'continue;';
         s += innerPadding2 + '}';
@@ -1885,7 +1889,7 @@ var CodeUtil = {
 
         //&#19981;&#33021;&#29983;&#25104;N&#20010;&#65292;&#20197;&#31532;0&#20010;&#20026;&#20934;&#65292;&#21487;&#33021;&#20250;&#19981;&#20840;&#65292;&#21097;&#19979;&#30340;&#30001;&#24320;&#21457;&#32773;&#33258;&#24049;&#34917;&#20805;&#12290; for (var i = 0; i < value.length; i ++) {
         if (value[0] instanceof Object) {
-          s += CodeUtil.parseJavaResponse(itemName, value[0], depth + 2, isTable, isSmart);
+          s += CodeUtil.parseJavaResponse(itemName, value[0], depth + 2, isTableKey, isSmart);
         }
         // }
 
@@ -1904,18 +1908,21 @@ var CodeUtil = {
         var s = '\n' + padding + '{  //' + key + '<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<';
 
         var t = isSmart ? JSONResponse.getTableName(key) : null;
-        var isTable = JSONObject.isTableKey(t);
+        var isTableKey = JSONObject.isTableKey(t);
         if (isTable) {
+          s += innerPadding + (isTableKey ? t : 'JSONObject') + ' ' + k + ' = ' + name + '.get' + StringUtil.firstCase(k, true) + '();'
+        }
+        else if (isTableKey) {
           s += innerPadding + t + ' ' + k + ' = ' + name + '.getObject("' + key + '", ' + t + '.class);'
         }
         else {
           s += innerPadding + 'JSONObject ' + k + ' = ' + name + '.getJSONObject("' + key + '");'
         }
         s += innerPadding + 'if (' + k + ' == null) {';
-        s += innerPadding + blank + k + ' = new ' + (isTable ? t : 'JSONObject') + '();';
+        s += innerPadding + blank + k + ' = new ' + (isTableKey ? t : 'JSONObject') + '();';
         s += innerPadding + '}\n';
 
-        s += CodeUtil.parseJavaResponse(k, value, depth + 1, isTable, isSmart);
+        s += CodeUtil.parseJavaResponse(k, value, depth + 1, isTableKey, isSmart);
 
         s += padding + '}  //' + key + '>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\n';
 
