From 76d6be342552a015f8e99ae675af96f1d12983b6 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 23 七月 2020 15:20:53 +0800
Subject: [PATCH] 优化巡检点为空问题
---
service-api/src/main/java/com/java110/api/listener/inspectionPoint/ListInspectionPointsListener.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/inspectionPoint/ListInspectionPointsListener.java b/service-api/src/main/java/com/java110/api/listener/inspectionPoint/ListInspectionPointsListener.java
index 5aab4a6..c145635 100644
--- a/service-api/src/main/java/com/java110/api/listener/inspectionPoint/ListInspectionPointsListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/inspectionPoint/ListInspectionPointsListener.java
@@ -1,21 +1,22 @@
package com.java110.api.listener.inspectionPoint;
import com.alibaba.fastjson.JSONObject;
+import com.aliyuncs.utils.StringUtils;
import com.java110.api.listener.AbstractServiceApiListener;
-import com.java110.intf.community.ICommunityInnerServiceSMO;
-import com.java110.intf.community.IInspectionInnerServiceSMO;
-import com.java110.intf.community.IRoomInnerServiceSMO;
-import com.java110.intf.community.IUnitInnerServiceSMO;
+import com.java110.core.annotation.Java110Listener;
+import com.java110.core.context.DataFlowContext;
+import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.dto.RoomDto;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.inspectionPoint.InspectionDto;
import com.java110.dto.unit.FloorAndUnitDto;
+import com.java110.intf.community.ICommunityInnerServiceSMO;
+import com.java110.intf.community.IInspectionInnerServiceSMO;
+import com.java110.intf.community.IRoomInnerServiceSMO;
+import com.java110.intf.community.IUnitInnerServiceSMO;
import com.java110.utils.constant.ServiceCodeInspectionPointConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
-import com.java110.core.annotation.Java110Listener;
-import com.java110.core.context.DataFlowContext;
-import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.vo.api.inspectionPoint.ApiInspectionPointDataVo;
import com.java110.vo.api.inspectionPoint.ApiInspectionPointVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -79,16 +80,17 @@
@Override
protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
- if(reqJson.containsKey("relationship")){
- queryRelationship(event,context,reqJson);
- }else{
- queryCommon(event,context,reqJson);
+ if (reqJson.containsKey("relationship")) {
+ queryRelationship(event, context, reqJson);
+ } else {
+ queryCommon(event, context, reqJson);
}
}
/**
* 鍏崇郴鏌ヨ
+ *
* @param event
* @param context
* @param reqJson
@@ -121,6 +123,7 @@
/**
* 鏅�氭煡璇�
+ *
* @param event
* @param context
* @param reqJson
@@ -171,6 +174,9 @@
for (ApiInspectionPointDataVo inspectionPoint : inspectionPoints) {
if (!"2000".equals(inspectionPoint.getLocationTypeCd()) && !"3000".equals(inspectionPoint.getLocationTypeCd())) {
+ if (StringUtils.isEmpty(inspectionPoint.getLocationObjId())) {
+ continue;
+ }
communityIds.add(inspectionPoint.getLocationObjId());
inspectionPointDataVo.add(inspectionPoint);
}
--
Gitblit v1.8.0