|
@@ -12,8 +12,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.fasterxml.jackson.databind.JsonNode;
|
|
|
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
|
|
|
import com.fasterxml.jackson.databind.node.ObjectNode;
|
|
|
+import com.persagy.dmp.common.constant.CommonConstant;
|
|
|
import com.persagy.dmp.common.constant.ValidEnum;
|
|
|
import com.persagy.dmp.common.context.AppContext;
|
|
|
+import com.persagy.dmp.common.helper.SpringHelper;
|
|
|
import com.persagy.dmp.common.model.entity.BaseEntity;
|
|
|
import com.persagy.dmp.common.model.response.CommonResult;
|
|
|
import com.persagy.dmp.common.utils.ResultHelper;
|
|
@@ -211,6 +213,62 @@ public class ObjectDigitalServiceImpl implements IObjectDigitalService {
|
|
|
return analysisQueryResultList(objectDigitalMapper.queryObjectListBySuperiorId(requestData),requestData,false);
|
|
|
}
|
|
|
/***
|
|
|
+ * Description: 查询指定楼层下所有指定空间类型的空间
|
|
|
+ * @param requestData : 请求参数
|
|
|
+ * @return : com.persagy.dmp.common.model.response.CommonResult<java.util.List<com.persagy.dmp.digital.entity.ObjectDigital>>
|
|
|
+ * @author : lijie
|
|
|
+ * @date :2021/8/30 9:54
|
|
|
+ * Update By lijie 2021/8/30 9:54
|
|
|
+ */
|
|
|
+ @Override
|
|
|
+ public CommonResult<List<ObjectDigital>> querySpaceListByFloorIdAndRoomFuncType(RequestData requestData) {
|
|
|
+ // 1.计算分页参数
|
|
|
+ computePageParam(requestData);
|
|
|
+ // 2.使用Fl2Sp关系查询楼层下的空间
|
|
|
+ requestData.setRelCode(DigitalRelCode.FL_2_SP.getIndex());
|
|
|
+ requestData.setObjType(DigitalObjectType.SPACE.getIndex());
|
|
|
+ List<List<ObjectDigital>> dataResult = objectDigitalMapper.queryObjectListByFloorIdAndRoomFuncType(requestData);
|
|
|
+ return commonAnalysisPageResult(dataResult);
|
|
|
+ }
|
|
|
+ /***
|
|
|
+ * Description: 通用处理分页数据方法
|
|
|
+ * @param dataResult : 分页数据
|
|
|
+ * @return : com.persagy.dmp.common.model.response.CommonResult<java.util.List<com.persagy.dmp.digital.entity.ObjectDigital>>
|
|
|
+ * @author : lijie
|
|
|
+ * @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)){
|
|
|
+ return ResultHelper.multi(new ArrayList<>(),0L);
|
|
|
+ }
|
|
|
+ ObjectDigital pageParam = dataResult.get(1).get(0);
|
|
|
+ return ResultHelper.multi(objectDigitals,pageParam.getTotalCount());
|
|
|
+ }
|
|
|
+
|
|
|
+ /***
|
|
|
+ * 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);
|
|
|
+ }
|
|
|
+ if (null==requestData.getSize()){
|
|
|
+ requestData.setSize(SpringHelper.getLong(CommonConstant.QUERY_PAGE_SIZE_KEY, CommonConstant.QUERY_DEFAULT_PAGE_SIZE));
|
|
|
+ }
|
|
|
+ requestData.setSkip((requestData.getPage()-1)*requestData.getSize());
|
|
|
+ }
|
|
|
+
|
|
|
+ /***
|
|
|
* Description: 根据对象id获取下级关系code数组
|
|
|
* @param requestData : 请求参数
|
|
|
* @return : void
|