|
@@ -198,8 +198,6 @@ public class ObjectDigitalServiceImpl extends ServiceImpl<ObjectDigitalMapper, O
|
|
|
*/
|
|
|
@Override
|
|
|
public CommonResult<List<ObjectDigital>> queryObjectListSuperiorId(RequestData requestData){
|
|
|
- // 1.计算分页参数
|
|
|
- DigitalCommonUtils.computePageParam(requestData);
|
|
|
// 2.当只有项目id时不查询关系,直接根据项目id筛选所有对象
|
|
|
if (StrUtil.isBlank(requestData.getBuildingId())
|
|
|
&& StrUtil.isBlank(requestData.getFloorId())
|
|
@@ -210,7 +208,9 @@ public class ObjectDigitalServiceImpl extends ServiceImpl<ObjectDigitalMapper, O
|
|
|
// 3.1 获取关系code列表
|
|
|
fillSubordinateRelCode(requestData);
|
|
|
// 3.2 调用查询语句查询相关内容
|
|
|
- return analysisQueryResultList(objectDigitalMapper.queryObjectListBySuperiorId(requestData),requestData,false,true);
|
|
|
+ return analysisQueryResultList(objectDigitalMapper
|
|
|
+ .queryObjectListBySuperiorId(DigitalCommonUtils
|
|
|
+ .computePageObject(requestData),requestData),requestData,false,true);
|
|
|
}
|
|
|
/***
|
|
|
* Description: 查询指定楼层下所有指定空间类型的空间
|
|
@@ -222,13 +222,12 @@ public class ObjectDigitalServiceImpl extends ServiceImpl<ObjectDigitalMapper, O
|
|
|
*/
|
|
|
@Override
|
|
|
public CommonResult<List<ObjectDigital>> querySpaceListByFloorIdAndRoomFuncType(RequestData requestData) {
|
|
|
- // 1.计算分页参数
|
|
|
- DigitalCommonUtils.computePageParam(requestData);
|
|
|
// 2.使用Fl2Sp关系查询楼层下的空间
|
|
|
requestData.setRelCode(DigitalRelCode.FL_2_SP.getIndex());
|
|
|
requestData.setObjType(DigitalObjectType.SPACE.getIndex());
|
|
|
requestData.setRelId(requestData.getFloorId());
|
|
|
- List<List<ObjectDigital>> dataResult = objectDigitalMapper.queryObjectListByFloorIdAndRoomFuncType(requestData);
|
|
|
+ Page<ObjectDigital> dataResult = objectDigitalMapper
|
|
|
+ .queryObjectListByFloorIdAndRoomFuncType(DigitalCommonUtils.computePageObject(requestData),requestData);
|
|
|
return commonAnalysisPageResult(dataResult);
|
|
|
}
|
|
|
/***
|
|
@@ -259,11 +258,10 @@ public class ObjectDigitalServiceImpl extends ServiceImpl<ObjectDigitalMapper, O
|
|
|
*/
|
|
|
@Override
|
|
|
public CommonResult<List<ObjectDigital>> queryEquipListByClassCode(RequestData requestData) {
|
|
|
- // 1.计算分页参数
|
|
|
- DigitalCommonUtils.computePageParam(requestData);
|
|
|
// 2.使用Fl2Sp关系查询楼层下的空间
|
|
|
requestData.setObjType(DigitalObjectType.EQUIPMENT.getIndex());
|
|
|
- List<List<ObjectDigital>> dataResult = objectDigitalMapper.queryEquipListByClassCode(requestData);
|
|
|
+ Page<ObjectDigital> dataResult = objectDigitalMapper
|
|
|
+ .queryEquipListByClassCode(DigitalCommonUtils.computePageObject(requestData),requestData);
|
|
|
return commonAnalysisPageResult(dataResult);
|
|
|
}
|
|
|
/***
|
|
@@ -295,8 +293,6 @@ public class ObjectDigitalServiceImpl extends ServiceImpl<ObjectDigitalMapper, O
|
|
|
*/
|
|
|
@Override
|
|
|
public CommonResult<List<ObjectDigital>> querySpaceListByRoomFuncType(RequestData requestData) {
|
|
|
- // 1.计算分页参数
|
|
|
- DigitalCommonUtils.computePageParam(requestData);
|
|
|
// 2.根据空间功能类型查询其下级空间功能类型
|
|
|
List<CodeTableData> codeTableDatas = CodeTableDataFacade
|
|
|
.queryCodeTableDatasByParentCode(AppContext.getContext().getGroupCode(),
|
|
@@ -336,9 +332,8 @@ public class ObjectDigitalServiceImpl extends ServiceImpl<ObjectDigitalMapper, O
|
|
|
*/
|
|
|
@Override
|
|
|
public CommonResult<List<ObjectDigital>> queryObjectListByGraphCodeAndRelCode(RequestData requestData) {
|
|
|
- // 1.计算分页参数
|
|
|
- DigitalCommonUtils.computePageParam(requestData);
|
|
|
- List<List<ObjectDigital>> objList = objectDigitalMapper.queryObjectListByGraphCodeAndRelCode(requestData);
|
|
|
+ Page<ObjectDigital> objList = objectDigitalMapper
|
|
|
+ .queryObjectListByGraphCodeAndRelCode(DigitalCommonUtils.computePageObject(requestData),requestData);
|
|
|
return analysisQueryResultList(objList,requestData,false,false);
|
|
|
}
|
|
|
/***
|
|
@@ -409,38 +404,14 @@ public class ObjectDigitalServiceImpl extends ServiceImpl<ObjectDigitalMapper, O
|
|
|
* @date :2021/8/30 14:15
|
|
|
* Update By lijie 2021/8/30 14:15
|
|
|
*/
|
|
|
- private CommonResult<List<ObjectDigital>> commonAnalysisPageResult(List<List<ObjectDigital>> dataResult) {
|
|
|
- if (CollUtil.isEmpty(dataResult) || dataResult.size()<2){
|
|
|
- return ResultHelper.multi(new ArrayList<>(),0L);
|
|
|
- }
|
|
|
- List<ObjectDigital> objectDigitals = dataResult.get(0);
|
|
|
- if (CollUtil.isEmpty(objectDigitals)){
|
|
|
+ private CommonResult<List<ObjectDigital>> commonAnalysisPageResult(Page<ObjectDigital> dataResult) {
|
|
|
+ List<ObjectDigital> records = dataResult.getRecords();
|
|
|
+ if (CollUtil.isEmpty(records)){
|
|
|
return ResultHelper.multi(new ArrayList<>(),0L);
|
|
|
}
|
|
|
- ObjectDigital pageParam = dataResult.get(1).get(0);
|
|
|
- return ResultHelper.multi(objectDigitals,pageParam.getTotalCount());
|
|
|
+ return ResultHelper.multi(records,dataResult.getTotal());
|
|
|
}
|
|
|
|
|
|
-// /***
|
|
|
-// * Description: 计算分页参数
|
|
|
-// * @param requestData : 请求参数
|
|
|
-// * @return : void
|
|
|
-// * @author : lijie
|
|
|
-// * @date :2021/8/30 10:01
|
|
|
-// * Update By lijie 2021/8/30 10:01
|
|
|
-// */
|
|
|
-// private void computePageParam(RequestData requestData) {
|
|
|
-// if (null==requestData.getPage()){
|
|
|
-// requestData.setPage(1L);
|
|
|
-// }
|
|
|
-// // 默认分页条数,防止大量查询
|
|
|
-// long defaultSize = SpringHelper.getLong(CommonConstant.QUERY_PAGE_SIZE_KEY, CommonConstant.QUERY_DEFAULT_PAGE_SIZE);
|
|
|
-// if (null==requestData.getSize() || requestData.getSize()>defaultSize){
|
|
|
-// requestData.setSize(defaultSize);
|
|
|
-// }
|
|
|
-// requestData.setSkip((requestData.getPage()-1)*requestData.getSize());
|
|
|
-// }
|
|
|
-
|
|
|
/***
|
|
|
* Description: 根据对象id获取下级关系code数组
|
|
|
* @param requestData : 请求参数
|
|
@@ -488,41 +459,37 @@ public class ObjectDigitalServiceImpl extends ServiceImpl<ObjectDigitalMapper, O
|
|
|
*/
|
|
|
private CommonResult<List<ObjectDigital>> queryObjectListByProjectId(RequestData requestData) {
|
|
|
// 1.查询结果集
|
|
|
- List<List<ObjectDigital>> resultList =
|
|
|
- objectDigitalMapper.queryObjectDigitalsByProjectId(requestData,requestData.getSkip(),requestData.getSize());
|
|
|
+ Page<ObjectDigital> resultList =
|
|
|
+ objectDigitalMapper.queryObjectDigitalsByProjectId(DigitalCommonUtils.computePageObject(requestData),requestData);
|
|
|
return analysisQueryResultList(resultList,requestData,true,true);
|
|
|
}
|
|
|
/***
|
|
|
* Description: 解析结果集
|
|
|
- * @param resultList : 结果集
|
|
|
+ * @param pageResult : 结果集
|
|
|
* @param requestData : 请求参数
|
|
|
* @return : com.persagy.dmp.common.model.response.CommonResult<java.util.List<com.persagy.dmp.digital.entity.ObjectDigital>>
|
|
|
* @author : lijie
|
|
|
* @date :2021/8/25 13:16
|
|
|
* Update By lijie 2021/8/25 13:16
|
|
|
*/
|
|
|
- private CommonResult<List<ObjectDigital>> analysisQueryResultList(List<List<ObjectDigital>> resultList,
|
|
|
+ private CommonResult<List<ObjectDigital>> analysisQueryResultList(Page<ObjectDigital> pageResult,
|
|
|
RequestData requestData,
|
|
|
Boolean fillRelFlag,
|
|
|
Boolean fillSpaceFlag) {
|
|
|
- if (CollUtil.isEmpty(resultList)){
|
|
|
- return ResultHelper.multi(new ArrayList<>(),0);
|
|
|
- }
|
|
|
- List<ObjectDigital> pageResult = resultList.get(0);
|
|
|
- List<ObjectDigital> totalCount = resultList.get(1);
|
|
|
- if (CollUtil.isEmpty(pageResult)){
|
|
|
+ List<ObjectDigital> records = pageResult.getRecords();
|
|
|
+ if (CollUtil.isEmpty(records)){
|
|
|
return ResultHelper.multi(new ArrayList<>(),0);
|
|
|
}
|
|
|
if (requestData.isOnlyCount()){
|
|
|
// 只返回数
|
|
|
- return ResultHelper.multi(new ArrayList<>(),totalCount.get(0).getTotalCount());
|
|
|
+ return ResultHelper.multi(new ArrayList<>(),pageResult.getTotal());
|
|
|
}
|
|
|
- fillRelIds(pageResult,fillRelFlag);
|
|
|
+ fillRelIds(records,fillRelFlag);
|
|
|
// 2.过滤信息点
|
|
|
- retainObjInfos(pageResult,requestData.getReturnInfos());
|
|
|
+ retainObjInfos(records,requestData.getReturnInfos());
|
|
|
// 3.处理Fl2Sp的关系,将对应的空间对象的楼层id扔进去
|
|
|
- fillFloorIdIntoSpaceObjFromIds(pageResult,fillSpaceFlag);
|
|
|
- return ResultHelper.multi(pageResult,totalCount.get(0).getTotalCount());
|
|
|
+ fillFloorIdIntoSpaceObjFromIds(records,fillSpaceFlag);
|
|
|
+ return ResultHelper.multi(records,pageResult.getTotal());
|
|
|
}
|
|
|
|
|
|
/***
|