|
@@ -14,7 +14,6 @@ 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;
|
|
@@ -244,7 +243,7 @@ public class ObjectDigitalServiceImpl implements IObjectDigitalService {
|
|
|
requestData.setRelCode(DigitalRelCode.EQ_2_SP.getIndex());
|
|
|
requestData.setObjType(DigitalObjectType.EQUIPMENT.getIndex());
|
|
|
requestData.setRelId(requestData.getSpaceId());
|
|
|
- List<List<ObjectDigital>> dataResult = objectDigitalMapper.queryObjectListBySpaceIdAndClassCode(requestData);
|
|
|
+ List<List<ObjectDigital>> dataResult = objectDigitalMapper.queryObjectListByRelIdAndClassCode(requestData);
|
|
|
return commonAnalysisPageResult(dataResult);
|
|
|
}
|
|
|
/***
|
|
@@ -264,6 +263,25 @@ public class ObjectDigitalServiceImpl implements IObjectDigitalService {
|
|
|
List<List<ObjectDigital>> dataResult = objectDigitalMapper.queryEquipListByClassCode(requestData);
|
|
|
return commonAnalysisPageResult(dataResult);
|
|
|
}
|
|
|
+ /***
|
|
|
+ * 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
|
|
|
+ */
|
|
|
+ @Override
|
|
|
+ public CommonResult<List<ObjectDigital>> queryEquipListBySystemId(RequestData requestData) {
|
|
|
+ // 1.计算分页参数
|
|
|
+ computePageParam(requestData);
|
|
|
+ // 2.使用Sy2Eq关系查询系统下的设备
|
|
|
+ requestData.setRelId(requestData.getSystemId());
|
|
|
+ requestData.setObjType(DigitalObjectType.EQUIPMENT.getIndex());
|
|
|
+ requestData.setRelCode(DigitalRelCode.SY_2_EQ.getIndex());
|
|
|
+ List<List<ObjectDigital>> dataResult = objectDigitalMapper.queryObjectListByRelIdAndClassCode(requestData);
|
|
|
+ return commonAnalysisPageResult(dataResult);
|
|
|
+ }
|
|
|
|
|
|
/***
|
|
|
* Description: 通用处理分页数据方法
|