新增@combine和join的请求注释与自动生成的代码

Author: TommyLemon

apijson/CodeUtil.js

@@ -179,12 +179,16 @@ var CodeUtil = {
 
         const count = isSmart ? (value.count || 0) : 0;
         const page = isSmart ? (value.page || 0) : 0;
+        const query = isSmart ? (value.query || 0) : 0;
+        const join = isSmart ? value.join : null;
 
         log(CodeUtil.TAG, 'parseJava  for  count = ' + count + '; page = ' + page);
 
         if (isSmart) {
           delete value.count;
           delete value.page;
+          delete value.query;
+          delete value.join;
         }
 
         s += CodeUtil.parseJava(key, value, depth + 1, isSmart);
@@ -196,6 +200,8 @@ var CodeUtil = {
         if (isSmart) {
           var prefix = key.substring(0, key.length - 2);
           s += '\n\n'
+            + name + '.setQuery(' + CodeUtil.QUERY_TYPE_CONSTS[query] + ');\n'
+            + name + '.setJoin("' + join + '");\n'
             + parentKey + '.putAll(' + name + '.toArray('
             + count  + ', ' + page + (prefix.length <= 0 ? '' : ', "' + prefix + '"') + '));';
         } else {
@@ -216,6 +222,7 @@ var CodeUtil = {
         const order = isTable ? value['@order'] : null;
         const group = isTable ? value['@group'] : null;
         const having = isTable ? value['@having'] : null;
+        const combine = isTable ? value['@combine'] : null;
         const schema = isTable ? value['@schema'] : null;
         const role = isTable ? value['@role'] : null;
 
@@ -224,6 +231,7 @@ var CodeUtil = {
           delete value['@order'];
           delete value['@group'];
           delete value['@having'];
+          delete value['@combine'];
           delete value['@schema'];
           delete value['@role'];
         }
@@ -236,6 +244,7 @@ var CodeUtil = {
           s = order == null ? s : s + '\n' + name + '.setOrder(' + CodeUtil.getJavaValue(name, key, order) + ');';
           s = group == null ? s : s + '\n' + name + '.setGroup(' + CodeUtil.getJavaValue(name, key, group) + ');';
           s = having == null ? s : s + '\n' + name + '.setHaving(' + CodeUtil.getJavaValue(name, key, having) + ');';
+          s = combine == null ? s : s + '\n' + name + '.setCombine(' + CodeUtil.getJavaValue(name, key, combine) + ');';
           s = schema == null ? s : s + '\n' + name + '.setSchema(' + CodeUtil.getJavaValue(name, key, schema) + ');';
           s = role == null ? s : s + '\n' + name + '.setRole(' + CodeUtil.getJavaValue(name, key, role) + ');';
         }
@@ -802,6 +811,7 @@ var CodeUtil = {
 
   QUERY_TYPES: ['数据', '数量', '全部'],
   QUERY_TYPE_KEYS: [0, 1, 2],
+  QUERY_TYPE_CONSTS: ["JSONRequest.QUERY_TABLE", "JSONRequest.QUERY_TOTAL", "JSONRequest.QUERY_ALL"],
   REQUEST_ROLE_KEYS: ['UNKNOWN', 'LOGIN', 'CONTACT', 'CIRCLE', 'OWNER', 'ADMIN'],
   REQUEST_ROLE: {
     UNKNOWN: '未登录',
@@ -867,7 +877,9 @@ var CodeUtil = {
           return value < 0 ? ' ! 必须 >= 0 ！' : CodeUtil.getComment('分页页码', false, '  ');
         case 'query':
           var query = CodeUtil.QUERY_TYPES[value];
-          return StringUtil.isEmpty(query) ? ' ! value必须是[' + CodeUtil.QUERY_TYPE_KEYS.join() + ']中的一种！' : CodeUtil.getComment('查询内容：' + query, false, '  ');
+          return StringUtil.isEmpty(query) ? ' ! value必须是[' + CodeUtil.QUERY_TYPE_KEYS.join() + ']中的一种！' : CodeUtil.getComment('查询内容：0-数据 1-总数 2-全部', false, '  ');
+        case 'join':
+          return CodeUtil.getType4Request(value) != 'string' ? ' ! value必须是String类型！' : CodeUtil.getComment('多表连接：LEFT JOIN < ，RIGHT JOIN > ，INNER JOIN & | ! ', false, '  ');
       }
       return '';
     }