|
@@ -1,23 +1,30 @@
|
|
|
package com.persagy.dmp.rwd.digital.controller;
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
+import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.fasterxml.jackson.databind.JsonNode;
|
|
|
+import com.fasterxml.jackson.databind.ObjectMapper;
|
|
|
import com.fasterxml.jackson.databind.node.ArrayNode;
|
|
|
import com.fasterxml.jackson.databind.node.ObjectNode;
|
|
|
+import com.netflix.discovery.CommonConstants;
|
|
|
import com.persagy.dmp.basic.model.QueryCriteria;
|
|
|
+import com.persagy.dmp.basic.model.QueryOperator;
|
|
|
import com.persagy.dmp.basic.utils.JsonNodeUtils;
|
|
|
import com.persagy.dmp.common.constant.CommonConstant;
|
|
|
import com.persagy.dmp.common.constant.ResponseCode;
|
|
|
import com.persagy.dmp.common.context.AppContext;
|
|
|
import com.persagy.dmp.common.exception.BusinessException;
|
|
|
import com.persagy.dmp.common.model.response.CommonResult;
|
|
|
+import com.persagy.dmp.common.utils.JsonHelper;
|
|
|
import com.persagy.dmp.common.utils.ParamCheckUtil;
|
|
|
import com.persagy.dmp.common.utils.ResultHelper;
|
|
|
import com.persagy.dmp.digital.entity.ObjectDigital;
|
|
|
+import com.persagy.dmp.digital.entity.ObjectRelation;
|
|
|
import com.persagy.dmp.mybatis.utils.ConditionUtil;
|
|
|
import com.persagy.dmp.basic.utils.QueryCriteriaHelper;
|
|
|
+import com.persagy.dmp.rwd.basic.constant.DigitalRelCode;
|
|
|
import com.persagy.dmp.rwd.basic.dto.RequestData;
|
|
|
import com.persagy.dmp.rwd.basic.validations.QueryClassCodeVadition;
|
|
|
import com.persagy.dmp.rwd.basic.validations.QueryFloorIdVadition;
|
|
@@ -265,8 +272,64 @@ public class ObjectDigitalController{
|
|
|
requestData.setProjectId(AppContext.getContext().getProjectId());
|
|
|
return service.queryEquipListBySystemId(requestData);
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+ /***
|
|
|
+ * 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:41
|
|
|
+ * Update By lijie 2021/8/30 9:41
|
|
|
+ */
|
|
|
+ @PostMapping("/queryEquipListByConditions")
|
|
|
+ public CommonResult<List<ObjectNode>> queryEquipListByConditions(@RequestBody RequestData requestData) {
|
|
|
+ // 暂时先拼接query接口参数进行查询,后续视情况再单独写逻辑
|
|
|
+ ObjectMapper objectMapper = JsonHelper.objectMapper;
|
|
|
+ QueryCriteria queryCriteria = new QueryCriteria();
|
|
|
+ queryCriteria.setOrders(requestData.getOrders());
|
|
|
+ queryCriteria.setPage(requestData.getPage());
|
|
|
+ queryCriteria.setSize(requestData.getSize());
|
|
|
+ ObjectNode objectNode = objectMapper.createObjectNode();
|
|
|
+ // 专业,系统类,设备类
|
|
|
+ if (StrUtil.isNotBlank(requestData.getClassCode())){
|
|
|
+ ObjectNode classCodeObj = objectMapper.createObjectNode();
|
|
|
+ classCodeObj.put(QueryOperator.LIKE_RIGHT.getIndex(),requestData.getClassCode());
|
|
|
+ objectNode.put(ObjectDigital.CLASS_CODE,classCodeObj);
|
|
|
+ }
|
|
|
+ // 楼层id
|
|
|
+ if (StrUtil.isNotBlank(requestData.getFloorId())){
|
|
|
+ // criteria条件
|
|
|
+ ObjectNode criteriaObj = objectMapper.createObjectNode();
|
|
|
+ criteriaObj.put(ObjectRelation.REL_CODE_HUM, DigitalRelCode.EQ_2_FL.getIndex());
|
|
|
+ criteriaObj.put(ObjectRelation.OBJ_TO_HUM, requestData.getFloorId());
|
|
|
+ objectNode.put(ObjectRelation.RELATION_FROM_HUM,criteriaObj);
|
|
|
+ }
|
|
|
+ // 系统id
|
|
|
+ if (StrUtil.isNotBlank(requestData.getSystemId())){
|
|
|
+ // criteria条件
|
|
|
+ ObjectNode criteriaObj = objectMapper.createObjectNode();
|
|
|
+ criteriaObj.put(ObjectRelation.REL_CODE_HUM, DigitalRelCode.SY_2_EQ.getIndex());
|
|
|
+ criteriaObj.put(ObjectRelation.OBJ_FROM_HUM, requestData.getFloorId());
|
|
|
+ objectNode.put(ObjectRelation.RELATION_TO_HUM,criteriaObj);
|
|
|
+ }
|
|
|
+ // installLocation安装位置
|
|
|
+ if (StrUtil.isNotBlank(requestData.getInstallLocation())){
|
|
|
+ objectNode.put(RequestData.INSTALL_LOCATION_HUM,requestData.getInstallLocation());
|
|
|
+ }
|
|
|
+ // manufacturer生产厂家
|
|
|
+ if (StrUtil.isNotBlank(requestData.getManufacturer())){
|
|
|
+ objectNode.put(RequestData.MANUFACTURER,requestData.getManufacturer());
|
|
|
+ }
|
|
|
+ // equipStatus设备状态
|
|
|
+ if (StrUtil.isNotBlank(requestData.getEquipStatus())){
|
|
|
+ objectNode.put(RequestData.EQUIP_STATUS_HUM,requestData.getEquipStatus());
|
|
|
+ }
|
|
|
+ // warranter维保单位名称
|
|
|
+ if (StrUtil.isNotBlank(requestData.getWarranter())){
|
|
|
+ objectNode.put(RequestData.WARRANTER,requestData.getWarranter());
|
|
|
+ }
|
|
|
+ queryCriteria.setCriteria(objectNode);
|
|
|
+ return query(queryCriteria);
|
|
|
+ }
|
|
|
|
|
|
|
|
|
/**
|