|
@@ -3,8 +3,6 @@ package com.persagy.proxy.object.controller;
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import cn.hutool.json.JSONUtil;
|
|
|
-import com.alibaba.fastjson.JSONObject;
|
|
|
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.fasterxml.jackson.databind.node.ArrayNode;
|
|
|
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
|
|
|
import com.fasterxml.jackson.databind.node.ObjectNode;
|
|
@@ -23,14 +21,13 @@ import com.persagy.proxy.adm.request.AdmQueryCriteria;
|
|
|
import com.persagy.proxy.adm.request.AdmResponse;
|
|
|
import com.persagy.proxy.adm.service.IAdmRelationService;
|
|
|
import com.persagy.proxy.adm.utils.AdmContextUtil;
|
|
|
-import com.persagy.proxy.adm.utils.AdmEntityTransferUtil;
|
|
|
import com.persagy.proxy.adm.utils.AdmQueryCriteriaHelper;
|
|
|
import com.persagy.proxy.adm.utils.ObjectNameUtil;
|
|
|
-import com.persagy.proxy.common.entity.DmpResult;
|
|
|
import com.persagy.proxy.common.entity.RelationDTO;
|
|
|
-import com.persagy.proxy.object.model.*;
|
|
|
-import com.persagy.proxy.object.service.IAdmBuildingService;
|
|
|
-import com.persagy.proxy.object.service.IAdmFloorService;
|
|
|
+import com.persagy.proxy.object.model.AdmEquipment;
|
|
|
+import com.persagy.proxy.object.model.AdmShaft;
|
|
|
+import com.persagy.proxy.object.model.AdmSpace;
|
|
|
+import com.persagy.proxy.object.model.AdmSystem;
|
|
|
import com.persagy.proxy.object.service.IAdmSystemService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
@@ -38,7 +35,9 @@ import org.springframework.web.bind.annotation.*;
|
|
|
import javax.json.JsonObject;
|
|
|
import javax.validation.constraints.NotNull;
|
|
|
import javax.ws.rs.QueryParam;
|
|
|
-import java.util.*;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
|
|
|
/**
|
|
|
* Adm 系统 API
|
|
@@ -223,16 +222,7 @@ public class AdmSystemController {
|
|
|
}
|
|
|
List<AdmSystem> admSystemList = JSONUtil.toList(result.getData().toString(), AdmSystem.class);
|
|
|
service.ensureSpecialValues(AdmContextUtil.toDmpContext(), admSystemList);
|
|
|
- AdmResponse response = AdmResponse.success(admSystemList);
|
|
|
- Long total = result.getCount() == null ? null : result.getCount().longValue();
|
|
|
- if(request.isOnlyCount()){
|
|
|
- response.setTotal(null);
|
|
|
- response.setCount(total);
|
|
|
- }else {
|
|
|
- response.setTotal(total);
|
|
|
- }
|
|
|
- response.setPageNumber(request.getPageNumber());
|
|
|
- response.setPageSize(request.getPageSize());
|
|
|
+ AdmResponse response = AdmResponse.success(admSystemList,request);
|
|
|
return response;
|
|
|
}else {
|
|
|
return service.query(request);
|
|
@@ -295,7 +285,7 @@ public class AdmSystemController {
|
|
|
request.setName(AdmEquipment.OBJ_TYPE);
|
|
|
QueryCriteria queryCriteriaObj = AdmQueryCriteriaHelper.toDmpCriteria(request);
|
|
|
List<ObjectNode> obj = DigitalObjectFacade.query(AdmContextUtil.toDmpContext().getGroupCode(),AdmContextUtil.toDmpContext().getProjectId(), AdmContextUtil.toDmpContext().getAppId(), null, queryCriteriaObj);
|
|
|
- return AdmResponse.success(obj);
|
|
|
+ return AdmResponse.success(obj,request);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -319,7 +309,7 @@ public class AdmSystemController {
|
|
|
request.setName(AdmShaft.OBJ_TYPE);
|
|
|
QueryCriteria queryCriteriaObj = AdmQueryCriteriaHelper.toDmpCriteria(request);
|
|
|
List<ObjectNode> obj = DigitalObjectFacade.query(AdmContextUtil.toDmpContext().getGroupCode(),AdmContextUtil.toDmpContext().getProjectId(), AdmContextUtil.toDmpContext().getAppId(), null, queryCriteriaObj);
|
|
|
- return AdmResponse.success(obj);
|
|
|
+ return AdmResponse.success(obj,request);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -342,7 +332,7 @@ public class AdmSystemController {
|
|
|
request.setName(AdmSpace.OBJ_TYPE);
|
|
|
QueryCriteria queryCriteriaObj = AdmQueryCriteriaHelper.toDmpCriteria(request);
|
|
|
List<ObjectNode> obj = DigitalObjectFacade.query(AdmContextUtil.toDmpContext().getGroupCode(),AdmContextUtil.toDmpContext().getProjectId(), AdmContextUtil.toDmpContext().getAppId(), null, queryCriteriaObj);
|
|
|
- return AdmResponse.success(obj);
|
|
|
+ return AdmResponse.success(obj,request);
|
|
|
}
|
|
|
|
|
|
|
|
@@ -354,7 +344,7 @@ public class AdmSystemController {
|
|
|
* @throws Exception
|
|
|
*/
|
|
|
@PostMapping("/unspace-sys")
|
|
|
- public AdmResponse queryUnSpSy( @QueryParam("type") String type, @QueryParam("spaceId") String spaceId,
|
|
|
+ public AdmResponse queryUnSpSy(@QueryParam("type") String type, @QueryParam("spaceId") String spaceId,
|
|
|
@RequestBody AdmQueryCriteria request) throws Exception {
|
|
|
if(StrUtil.isNotEmpty(type)){
|
|
|
if(StrUtil.isBlank(request.getFilters())){
|
|
@@ -373,7 +363,7 @@ public class AdmSystemController {
|
|
|
request.setName(AdmSystem.OBJ_TYPE);
|
|
|
QueryCriteria queryCriteriaObj = AdmQueryCriteriaHelper.toDmpCriteria(request);
|
|
|
List<ObjectNode> obj = DigitalObjectFacade.query(AdmContextUtil.toDmpContext().getGroupCode(),AdmContextUtil.toDmpContext().getProjectId(), AdmContextUtil.toDmpContext().getAppId(), null, queryCriteriaObj);
|
|
|
- return AdmResponse.success(obj);
|
|
|
+ return AdmResponse.success(obj,request);
|
|
|
}
|
|
|
|
|
|
}
|