From b64dfe0172b04830bd16c3aa5757fa87d291057f Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期四, 01 四月 2021 09:16:29 +0800
Subject: [PATCH] 合并代码 并且解决冲突
---
service-api/src/main/java/com/java110/api/listener/parkingArea/UpdateParkingAreaListener.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/listener/parkingArea/UpdateParkingAreaListener.java b/service-api/src/main/java/com/java110/api/listener/parkingArea/UpdateParkingAreaListener.java
index 5458e7f..66699d8 100644
--- a/service-api/src/main/java/com/java110/api/listener/parkingArea/UpdateParkingAreaListener.java
+++ b/service-api/src/main/java/com/java110/api/listener/parkingArea/UpdateParkingAreaListener.java
@@ -1,13 +1,16 @@
package com.java110.api.listener.parkingArea;
+import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.api.bmo.parkingArea.IParkingAreaBMO;
+import com.java110.api.bmo.parkingAreaAttr.IParkingAreaAttrBMO;
import com.java110.api.listener.AbstractServiceApiPlusListener;
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
import com.java110.core.event.service.api.ServiceDataFlowEvent;
import com.java110.utils.constant.ServiceCodeParkingAreaConstant;
import com.java110.utils.util.Assert;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
@@ -21,6 +24,9 @@
@Autowired
private IParkingAreaBMO parkingAreaBMOImpl;
+ @Autowired
+ private IParkingAreaAttrBMO parkingAreaAttrBMOImpl;
+
@Override
protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
@@ -29,12 +35,34 @@
Assert.hasKeyAndValue(reqJson, "communityId", "蹇呭～锛岃濉啓灏忓尯淇℃伅");
Assert.hasKeyAndValue(reqJson, "typeCd", "蹇呭～锛岃閫夋嫨鍋滆溅鍦虹被鍨�");
+ Assert.judgeAttrValue(reqJson);
+
}
@Override
protected void doSoService(ServiceDataFlowEvent event, DataFlowContext context, JSONObject reqJson) {
parkingAreaBMOImpl.updateParkingArea(reqJson, context);
+
+ if (!reqJson.containsKey("attrs")) {
+ return;
+ }
+
+ JSONArray attrs = reqJson.getJSONArray("attrs");
+ if (attrs.size() < 1) {
+ return;
+ }
+
+ JSONObject attr = null;
+ for (int attrIndex = 0; attrIndex < attrs.size(); attrIndex++) {
+ attr = attrs.getJSONObject(attrIndex);
+ attr.put("communityId", reqJson.getString("communityId"));
+ if (!attr.containsKey("attrId") || attr.getString("attrId").startsWith("-") || StringUtil.isEmpty(attr.getString("attrId"))) {
+ parkingAreaAttrBMOImpl.addParkingAreaAttr(attr, context);
+ continue;
+ }
+ parkingAreaAttrBMOImpl.updateParkingAreaAttr(attr, context);
+ }
}
@Override
--
Gitblit v1.8.0