|
@@ -316,8 +316,8 @@ public class AdmShaftController {
|
|
|
* @throws Exception
|
|
|
*/
|
|
|
@PostMapping("/shaft-zoneSpaceBaseTable-building")
|
|
|
- public AdmResponse queryZoneSpBd( @RequestParam String shaftId,
|
|
|
- @RequestParam String objectType) throws Exception {
|
|
|
+ public AdmResponse queryZoneSpBd(@QueryParam("shaftId") String shaftId,
|
|
|
+ @QueryParam("objectType") String objectType) throws Exception {
|
|
|
if(!StrUtil.isAllNotEmpty(shaftId,AdmContextUtil.toDmpContext().getProjectId())) {
|
|
|
return AdmResponse.failure("必填项:shaftId(竖井id)、projectId(项目id)");
|
|
|
}
|
|
@@ -333,6 +333,7 @@ public class AdmShaftController {
|
|
|
ObjectNode criteria = JsonNodeFactory.instance.objectNode();
|
|
|
ObjectNode relationTO = JsonNodeFactory.instance.objectNode();
|
|
|
relationTO.put("relCode", "Sh2Sp");
|
|
|
+ relationTO.put("graphCode","ArchSubset");
|
|
|
relationTO.put("objFrom", shaftId);
|
|
|
criteria.putPOJO("relationTo", relationTO);
|
|
|
criteria.put("objType", AdmSpace.OBJ_TYPE);
|
|
@@ -374,18 +375,19 @@ public class AdmShaftController {
|
|
|
* @throws Exception
|
|
|
*/
|
|
|
@PostMapping("/un-shaft-zoneSpaceBaseTable")
|
|
|
- public AdmResponse queryUnZoneSp( @RequestParam String shaftId,
|
|
|
+ public AdmResponse queryUnZoneSp(@QueryParam("shaftId") String shaftId,
|
|
|
@RequestBody AdmQueryCriteria request) throws Exception {
|
|
|
// 组装条件
|
|
|
- QueryCriteria queryCriteria = new QueryCriteria();
|
|
|
- if(!StrUtil.isAllNotEmpty(shaftId,AdmContextUtil.toDmpContext().getProjectId())) {
|
|
|
- return AdmResponse.failure("必填项:shaftId(竖井id)、projectId(项目id)");
|
|
|
+ QueryCriteria queryCriteria = AdmQueryCriteriaHelper.toDmpCriteria(request);
|
|
|
+ if(!StrUtil.isNotEmpty(shaftId)) {
|
|
|
+ return AdmResponse.failure("必填项:shaftId(竖井id)");
|
|
|
}
|
|
|
ObjectNode criteria = JsonNodeFactory.instance.objectNode();
|
|
|
ObjectNode relationTO = JsonNodeFactory.instance.objectNode();
|
|
|
ArrayNode arrayNode = relationTO.putObject("objFrom").putArray("$notcontains");
|
|
|
arrayNode.add(shaftId);
|
|
|
relationTO.put("relCode", "Sh2Sp");
|
|
|
+ relationTO.put("graphCode","ArchSubset");
|
|
|
criteria.putPOJO("relationTo", relationTO);
|
|
|
|
|
|
criteria.put("objType", "space");
|