Skip to content

S
smart_gov_platform
Commit 8ca670f3 authored by 赵啸非's avatar 赵啸非
Browse files
Options

Revert "修正循环查询" 

This reverts commit 9391ec1d.

# Conflicts:
#	base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppDatasetServiceImpl.java
#	base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumServiceImpl.java
parent 052a0f50
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 64 deletions
base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppDatasetServiceImpl.java
View file @ 8ca670f3
......@@ -23,8 +23,6 @@ import org.springframework.util.ObjectUtils;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
* AppDatasetService
......@@ -39,28 +37,6 @@ public class AppDatasetServiceImpl extends AbstractCRUDServiceImpl<AppDatasetDao
@Autowired
private AppInfoFieldService appInfoFieldService;
@Override
protected void findAfter(AppDatasetEntity params,PageInfo pageInfo, Context context, List<AppDatasetEntity> list) throws AppException {
fillSubData(list);
super.findAfter(params,pageInfo, context, list);
}
@Override
protected void findAfter(AppDatasetEntity entity, Context context, List<AppDatasetEntity> list) throws AppException {
fillSubData(list);
super.findAfter(entity, context, list);
}
private void fillSubData(List<AppDatasetEntity> list) {
List<Long> idList = list.stream().map(i -> i.getId()).collect(Collectors.toList());
AppInfoFieldQuery appInfoFieldQuery = new AppInfoFieldQuery();
appInfoFieldQuery.setDatasetIdList(idList);
Map<Long, List<AppInfoFieldEntity>> appInfoFieldListMap = appInfoFieldService.find(appInfoFieldQuery).stream().collect(Collectors.groupingBy(AppInfoFieldEntity::getDatasetId));
list.forEach(item -> item.setAppInfoFieldList(appInfoFieldListMap.get(item.getId())));
}
@Override
protected void saveAfter(AppDatasetEntity entity, Context context) throws AppException {
if (!ObjectUtils.isEmpty(entity.getAppInfoFieldList())) {
......
base-manager/src/main/java/com/mortals/xhx/module/app/service/impl/AppServiceImpl.java
View file @ 8ca670f3
......@@ -71,12 +71,6 @@ public class AppServiceImpl extends AbstractCRUDServiceImpl<AppDao, AppEntity, L
@Override
protected void findAfter(AppEntity params, PageInfo pageInfo, Context context, List<AppEntity> list) throws AppException {
List<Long> idList = list.stream().map(i -> i.getId()).collect(Collectors.toList());
AppDatasetQuery appDatasetQuery = new AppDatasetQuery();
appDatasetQuery.setAppIdList(idList);
Map<Long, List<AppDatasetEntity>> appDatasetListMap = appDatasetService.find(appDatasetQuery).stream().collect(Collectors.groupingBy(AppDatasetEntity::getAppId));
list.forEach(item -> item.setAppDatasetList(appDatasetListMap.get(item.getId())));
//判断是否存在设备编码。存在 查询设备编码应用黑名单
checkDeviceBlackApp(params, list);
//根据指定的idlist顺序进行排序
......
base-manager/src/main/java/com/mortals/xhx/module/matter/service/impl/MatterDatumServiceImpl.java
View file @ 8ca670f3
......@@ -2,7 +2,6 @@ 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;
......@@ -15,8 +14,6 @@ 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
......@@ -35,23 +32,15 @@ public class MatterDatumServiceImpl extends AbstractCRUDServiceImpl<MatterDatumD
@Autowired
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 {
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());
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())));
list.stream().peek(item->{
List<MatterDatumFileEntity> matterDatumFileEntities = matterDatumFileService.find(new MatterDatumFileQuery().datumId(item.getId()));
item.setDatumFileList(matterDatumFileEntities);
}).count();
super.findAfter(params, context, list);
}
@Override
......
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteMatterServiceImpl.java
View file @ 8ca670f3
......@@ -44,8 +44,6 @@ public class SiteMatterServiceImpl extends AbstractCRUDServiceImpl<SiteMatterDao
@Autowired
private SiteService siteService;
@Override
protected void findAfter(SiteMatterEntity params, PageInfo pageInfo, Context context, List<SiteMatterEntity> list) throws AppException {
......
base-manager/src/main/resources/sqlmap/module/app/AppMapper.xml
View file @ 8ca670f3
......@@ -31,6 +31,13 @@
<result property="updateTime" column="updateTime" />
<!-- <collection property="appDatasetList" column="id" ofType="AppDatasetEntity" javaType="ArrayList" select="getAppDatasetByAppId"></collection>-->
</resultMap>
<resultMap type="AppDatasetEntity" id="AppDatasetEntity-Map">
<result property="id" column="id" />
<result property="appId" column="appId" />
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
</resultMap>
<!-- 表所有列 -->
......
base-manager/src/test/java/com/mortals/httpclient/http-client.env.json
View file @ 8ca670f3
......@@ -33,11 +33,6 @@
"base-pengxi-web": {
"baseUrl": "http://118.122.189.109:11078/base"
},
"base-pengxi-zwweb": {
"baseUrl": "http://10.102.252.13:11078/base"
},
"base-reg-web": {
"baseUrl": "http://8.136.255.30:1129/base"
},
......
base-manager/src/test/java/com/mortals/httpclient/matter/MatterDatumController.http
View file @ 8ca670f3
###事项申请材料列表
POST {{baseUrl}}/matter/datum/interlist
POST {{baseUrl}}/matter/datum/list
Content-Type: application/json
{
"materialName": "%违法%",
"page":1,
"size":10
}
......
smart-gateway/src/main/resources/bootstrap.yml
View file @ 8ca670f3
......@@ -161,15 +161,6 @@ spring:
metadata:
response-timeout: 200000
connect-timeout: 200000
# etl系统
- id: etl-system
#uri: http://192.168.0.98:21080
uri: lb://etl-system
predicates:
- Path=/sysetl/**
metadata:
response-timeout: 200000
connect-timeout: 200000
nacos:
# Nacos 作为注册中心的配置项，对应 NacosDiscoveryProperties 配置类
discovery:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment