[appengine] 智能表单查询接口不返回内置表单 (#86)

Author: reeeborn33

app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/condition/FormQueryCondition.java

@@ -11,6 +11,8 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 /**
  * 为Form提供查询条件
  *
@@ -35,4 +37,6 @@ public class FormQueryCondition {
     private String id;
 
     private String createBy;
+
+    private List<String> excludeNames;
 }

app-builder/jane/plugins/aipp-plugin/src/main/java/modelengine/fit/jober/aipp/service/impl/AppBuilderFormServiceImpl.java

@@ -24,6 +24,7 @@
 import modelengine.fit.jober.aipp.service.UploadedFileManageService;
 import modelengine.fit.jober.common.RangedResultSet;
 import modelengine.fitframework.annotation.Component;
+import modelengine.fitframework.annotation.Value;
 import modelengine.fitframework.log.Logger;
 import modelengine.fitframework.util.StringUtils;
 
@@ -75,11 +76,15 @@ public class AppBuilderFormServiceImpl implements AppBuilderFormService {
 
     private final UploadedFileManageService uploadedFileManageService;
 
+    private final List<String> excludeNames;
+
     public AppBuilderFormServiceImpl(AppBuilderFormRepository formRepository, AippFormCreateConfig aippFormCreateConfig,
-            UploadedFileManageService uploadedFileManageService) {
+            UploadedFileManageService uploadedFileManageService,
+            @Value("${app-engine.form.exclude-names}") List<String> excludeNames) {
         this.formRepository = formRepository;
         this.aippFormCreateConfig = aippFormCreateConfig;
         this.uploadedFileManageService = uploadedFileManageService;
+        this.excludeNames = excludeNames;
     }
 
     @Override
@@ -171,6 +176,7 @@ public RangedResultSet<AppBuilderFormDto> query(long pageNum, int pageSize, Stri
                 .offset(offset)
                 .limit(pageSize)
                 .name(name)
+                .excludeNames(excludeNames)
                 .build();
         long total = this.formRepository.countWithCondition(cond);
         List<AppBuilderFormDto> result = this.formRepository.selectWithCondition(cond)

app-builder/jane/plugins/aipp-plugin/src/main/resources/application-prod.yml

@@ -46,6 +46,8 @@ app-engine:
     path: smart_form
     temporary-path: smart_form/temporary
     group-name: 60000
+    exclude-names:
+    - '表单'
   file:
     upload:
       maxStorageRatio: 0.9

app-builder/jane/plugins/aipp-plugin/src/main/resources/mapper/AppBuilderFormMapper.xml

@@ -110,6 +110,12 @@
         <if test="cond.name != null">
             and name LIKE '%' || #{cond.name} || '%'
         </if>
+        <if test="cond.excludeNames != null and cond.excludeNames.size() > 0">
+            and name NOT IN
+            <foreach item="excludeName" collection="cond.excludeNames" open="(" separator="," close=")">
+                #{excludeName}
+            </foreach>
+        </if>
         ORDER BY update_at DESC, create_at DESC
         <if test="cond.offset != null and cond.limit != null">
             LIMIT #{cond.limit} OFFSET #{cond.offset}
@@ -122,11 +128,23 @@
         <if test="cond.tenantId != null">
             and tenant_id = #{cond.tenantId}
         </if>
+        <if test="cond.createBy != null">
+            and create_by = #{cond.createBy}
+        </if>
         <if test="cond.type != null">
             and type = #{cond.type}
         </if>
+        <if test="cond.id != null">
+            and id = #{cond.id}
+        </if>
         <if test="cond.name != null">
             and name LIKE '%' || #{cond.name} || '%'
         </if>
+        <if test="cond.excludeNames != null and cond.excludeNames.size() > 0">
+            and name NOT IN
+            <foreach item="excludeName" collection="cond.excludeNames" open="(" separator="," close=")">
+                #{excludeName}
+            </foreach>
+        </if>
     </select>
 </mapper>

app-builder/jane/plugins/aipp-plugin/src/test/java/modelengine/fit/jober/aipp/service/AppBuilderFormServiceImplTest.java

@@ -75,7 +75,7 @@ void before() {
         this.aippFormCreateConfig = new AippFormCreateConfig();
         this.aippFormCreateConfig.setMaximumNum(400L);
         this.appBuilderFormService = new AppBuilderFormServiceImpl(this.appBuilderFormRepository,
-                this.aippFormCreateConfig, this.uploadedFileManageService);
+                this.aippFormCreateConfig, this.uploadedFileManageService, null);
     }
 
     @Test