|
@@ -3,7 +3,6 @@ package com.persagy.proxy.object.service.impl;
|
|
|
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.ObjectMapper;
|
|
|
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
|
|
@@ -32,7 +31,6 @@ import com.persagy.proxy.object.service.IAdmFloorService;
|
|
|
import com.persagy.proxy.object.service.IAdmSystemService;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.util.ArrayList;
|
|
@@ -113,17 +111,19 @@ public class AdmSystemServiceImpl extends AbstractAdmBaseServiceImpl<AdmSystem>
|
|
|
return;
|
|
|
}
|
|
|
if (criteria.has("floorId")){
|
|
|
- // 有建筑id过滤
|
|
|
- ObjectMapper objectMapper = SpringHelper.getBean(ObjectMapper.class);
|
|
|
- ObjectNode relationFrom = objectMapper.createObjectNode();
|
|
|
- relationFrom.put("graphCode", GraphCodeEnum.MechInArch.name());
|
|
|
- relationFrom.put("relCode", RelCodeEnum.Sy2Fl.name());
|
|
|
- relationFrom.set("objTo",criteria.get("floorId"));
|
|
|
- criteria.set("relationFrom",relationFrom);
|
|
|
- criteria.remove("floorId");
|
|
|
- if (criteria.has("buildingId"))
|
|
|
- criteria.remove("buildingId");
|
|
|
- return;
|
|
|
+ // 有楼层id过滤
|
|
|
+ if(!criteria.get("floorId").toString().contains("$null")){
|
|
|
+ ObjectMapper objectMapper = SpringHelper.getBean(ObjectMapper.class);
|
|
|
+ ObjectNode relationFrom = objectMapper.createObjectNode();
|
|
|
+ relationFrom.put("graphCode", GraphCodeEnum.MechInArch.name());
|
|
|
+ relationFrom.put("relCode", RelCodeEnum.Sy2Fl.name());
|
|
|
+ relationFrom.set("objTo",criteria.get("floorId"));
|
|
|
+ criteria.set("relationFrom",relationFrom);
|
|
|
+ criteria.remove("floorId");
|
|
|
+ if (criteria.has("buildingId"))
|
|
|
+ criteria.remove("buildingId");
|
|
|
+ return;
|
|
|
+ }
|
|
|
}
|
|
|
if (criteria.has("buildingId")){
|
|
|
// 有建筑id过滤
|
|
@@ -131,7 +131,11 @@ public class AdmSystemServiceImpl extends AbstractAdmBaseServiceImpl<AdmSystem>
|
|
|
ObjectNode relationFrom = objectMapper.createObjectNode();
|
|
|
relationFrom.put("graphCode", GraphCodeEnum.MechInArch.name());
|
|
|
relationFrom.put("relCode", RelCodeEnum.Sy2Bd.name());
|
|
|
- relationFrom.set("objTo",criteria.get("buildingId"));
|
|
|
+ if(!criteria.get("buildingId").toString().contains("$null")) {
|
|
|
+ relationFrom.set("objTo", criteria.get("buildingId"));
|
|
|
+ }else{
|
|
|
+ relationFrom.put("$bindFlag", false);
|
|
|
+ }
|
|
|
criteria.set("relationFrom",relationFrom);
|
|
|
criteria.remove("buildingId");
|
|
|
}
|