From 4ed693f48d1435de7a6333df17c2b34154731429 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 05 七月 2023 22:26:27 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
springboot/src/main/java/com/java110/boot/smo/impl/ApiCallBackInnerServiceSMOImpl.java | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/springboot/src/main/java/com/java110/boot/smo/impl/ApiCallBackInnerServiceSMOImpl.java b/springboot/src/main/java/com/java110/boot/smo/impl/ApiCallBackInnerServiceSMOImpl.java
index 9582c29..746c297 100644
--- a/springboot/src/main/java/com/java110/boot/smo/impl/ApiCallBackInnerServiceSMOImpl.java
+++ b/springboot/src/main/java/com/java110/boot/smo/impl/ApiCallBackInnerServiceSMOImpl.java
@@ -2,18 +2,45 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.boot.websocket.ParkingAreaWebsocket;
+import com.java110.boot.websocket.ParkingBoxWebsocket;
+import com.java110.dto.parking.ParkingBoxAreaDto;
import com.java110.intf.api.IApiCallBackInnerServiceSMO;
+import com.java110.intf.community.IParkingBoxAreaV1InnerServiceSMO;
import com.java110.utils.exception.SMOException;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
+import java.util.List;
+
@RestController
public class ApiCallBackInnerServiceSMOImpl implements IApiCallBackInnerServiceSMO {
+
+ @Autowired
+ private IParkingBoxAreaV1InnerServiceSMO parkingBoxAreaV1InnerServiceSMOImpl;
+
@Override
public int webSentParkingArea(@RequestBody JSONObject reqJson) {
JSONObject param = JSONObject.parseObject(reqJson.toString());
try {
- ParkingAreaWebsocket.sendInfo(param.toJSONString(), param.getString("extBoxId"));
+ ParkingBoxWebsocket.sendInfo(param.toJSONString(), param.getString("extBoxId"));
+
+ } catch (Exception e) {
+ throw new SMOException(e.getMessage());
+ }
+
+ ParkingBoxAreaDto parkingBoxAreaDto = new ParkingBoxAreaDto();
+ parkingBoxAreaDto.setBoxId(reqJson.getString("extBoxId"));
+ parkingBoxAreaDto.setDefaultArea(ParkingBoxAreaDto.DEFAULT_AREA_TRUE);
+
+ List<ParkingBoxAreaDto> parkingBoxAreaDtos = parkingBoxAreaV1InnerServiceSMOImpl.queryParkingBoxAreas(parkingBoxAreaDto);
+
+ if(parkingBoxAreaDtos == null || parkingBoxAreaDtos.size()<1){
+ return 1;
+ }
+
+ try {
+ ParkingAreaWebsocket.sendInfo(param.toJSONString(), parkingBoxAreaDtos.get(0).getPaId());
} catch (Exception e) {
throw new SMOException(e.getMessage());
}
--
Gitblit v1.8.0