修正循环查询

base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumServiceImpl.java

@@ -2,6 +2,7 @@ package com.mortals.xhx.module.matter.service.impl;
 
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
+import com.mortals.framework.model.PageInfo;
 import com.mortals.xhx.base.system.upload.service.UploadService;
 import com.mortals.xhx.module.matter.model.*;
 import com.mortals.xhx.module.matter.service.MatterDatumFileService;
@@ -14,6 +15,8 @@ import com.mortals.xhx.module.matter.service.MatterDatumService;
 import org.springframework.util.ObjectUtils;
 
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * MatterDatumService
@@ -33,16 +36,26 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
     private UploadService uploadService;
 
 
+    @Override
+    protected void findAfter(MatterDatumEntity params, PageInfo pageInfo, Context context, List<MatterDatumEntity> list) throws AppException {
+        fillSubData(list);
+        super.findAfter(params,pageInfo, context, list);
+    }
     @Override
     protected void findAfter(MatterDatumEntity params, Context context, List<MatterDatumEntity> list) throws AppException {
-
-        list.stream().peek(item->{
-            List<MatterDatumFileEntity> matterDatumFileEntities = matterDatumFileService.find(new MatterDatumFileQuery().datumId(item.getId()));
-            item.setDatumFileList(matterDatumFileEntities);
-        }).count();
+        fillSubData(list);
         super.findAfter(params, context, list);
     }
 
+    private void fillSubData(List<MatterDatumEntity> list) {
+        List<Long> idList = list.stream().map(i -> i.getId()).collect(Collectors.toList());
+        if(ObjectUtils.isEmpty(idList)) return;
+        MatterDatumFileQuery matterDatumFileQuery = new MatterDatumFileQuery();
+        matterDatumFileQuery.setDatumIdList(idList);
+        Map<Long, List<MatterDatumFileEntity>> matterDatumFileListMap = matterDatumFileService.find(matterDatumFileQuery).stream().collect(Collectors.groupingBy(MatterDatumFileEntity::getDatumId));
+        list.forEach(item -> item.setMatterDatumFileList(matterDatumFileListMap.get(item.getId())));
+    }
+
     @Override
     protected void saveBefore(MatterDatumEntity entity, Context context) throws AppException {
         if (!ObjectUtils.isEmpty(entity.getMatterId())) {

base-manager/src/main/resources/sqlmap/module/app/AppMapper.xml

@@ -29,7 +29,7 @@
         <result property="createTime" column="createTime" />
         <result property="updateUserId" column="updateUserId" />
         <result property="updateTime" column="updateTime" />
-<!--        <collection property="appDatasetList" column="id" ofType="AppDatasetEntity" javaType="ArrayList" select="getAppDatasetByAppId"></collection>-->
+        <collection property="appDatasetList" column="id" ofType="AppDatasetEntity" javaType="ArrayList" select="getAppDatasetByAppId"></collection>
     </resultMap>
     <resultMap type="AppDatasetEntity" id="AppDatasetEntity-Map">
         <result property="id" column="id" />
@@ -522,13 +522,13 @@
         <include refid="_orderCols_"/>
     </select>
     <!-- 获取子列表 -->
-<!--    <select id="getAppDatasetByAppId" parameterType="java.lang.Long" resultMap="AppDatasetEntity-Map">
+    <select id="getAppDatasetByAppId" parameterType="java.lang.Long" resultMap="AppDatasetEntity-Map">
         select <include refid="_columns_sub"/>
         from mortals_sys_app_dataset as b
         <trim suffixOverrides="where" suffix="">
             where b.appId = #{id}
         </trim>
-    </select>-->
+    </select>
 
 
 

base-manager/src/test/java/com/mortals/httpclient/app/AppController.http

@@ -19,6 +19,16 @@ client.global.set("SmsSet_id", JSON.parse(response.body).data.id);
 client.global.set("authToken", JSON.parse(response.body).data.token);
 %}
 
+###自助终端应用列表
+POST {{baseUrl}}/app/list
+Content-Type: application/json
+
+{
+  "siteId": 1,
+  "appTypeNotList": [4],
+  "page": 1,
+  "size": -1
+}
 ###自助终端应用列表
 POST http://112.19.80.237:11078/base/app/list
 Content-Type: application/json

base-manager/src/test/java/com/mortals/httpclient/app/AppDatasetController.http

@@ -19,10 +19,7 @@ Content-Type: application/json
 
 {
   "page": 1,
-  "size": 10,
-  "appId": 226,
-  "fieldCode": "top",
-  "fieldValue": "%%"
+  "size": 10
 }
 
 ###自助终端应用数据集列表1