调整代码

src/main/java/com/ebei/screen/common/util/EbaUtils.java

@@ -165,4 +165,16 @@ public class EbaUtils {
         float result = (nowF - oldF) / oldF;
         return format.format(result);
     }
+
+    /**
+     * 根据ebei项目id获取关联的金鹰项目id
+     *
+     * @param projectId
+     * @return
+     */
+    public static String getProjectId(String projectId) {
+        JSONObject obj = mongoTemplate.findById("relevanceProject", JSONObject.class, "relevanceProject");
+        JSONObject data = obj != null ? obj.getJSONObject("data") : new JSONObject();
+        return data.getString(projectId);
+    }
 }

src/main/java/com/ebei/screen/controller/eba/EbaSystemController.java

@@ -1,6 +1,7 @@
 package com.ebei.screen.controller.eba;
 
 import com.ebei.screen.common.response.ResponseBean;
+import com.ebei.screen.common.util.EbaUtils;
 import com.ebei.screen.service.EbaSystemService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -36,12 +37,14 @@ public class EbaSystemController {
     @ApiOperation("获取实时设备列表 ✔")
     @PostMapping("/getDeviceList/{projectId}")
     public ResponseBean getDeviceList(@PathVariable String projectId) {
+        projectId = EbaUtils.getProjectId(projectId);
         return ebaSystemService.getDeviceList(projectId);
     }
 
     @ApiOperation("获取实时火警和预警 ✔")
     @PostMapping("/getRealTimeList/{projectId}")
     public ResponseBean getRealTimeList(@PathVariable String projectId) {
+        projectId = EbaUtils.getProjectId(projectId);
         return ebaSystemService.getRealTimeList(projectId);
     }
 

src/main/java/com/ebei/screen/controller/yard/YardSystemController.java

@@ -1,8 +1,64 @@
 package com.ebei.screen.controller.yard;
 
+import com.ebei.screen.common.response.ResponseBean;
+import com.ebei.screen.service.YardSystemService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
 /**
  * @author Liu.x
  * @description 车场系统大屏
  */
+@Api(tags = "车场系统大屏")
+@RestController
+@RequestMapping("yard/system")
 public class YardSystemController {
+
+    @Autowired
+    private YardSystemService yardSystemService;
+
+
+    @ApiOperation("车场信息数据推送")
+    @PostMapping("/park/parkInfo")
+    public ResponseBean parkInfo(@RequestBody Map params) {
+        return yardSystemService.parkInfo(params);
+    }
+
+    @ApiOperation("车位信息数据推送")
+    @PostMapping("/park/parkSpace")
+    public ResponseBean parkSpace(@RequestBody Map params) {
+        return yardSystemService.parkSpace(params);
+    }
+
+    @ApiOperation("入场信息数据推送")
+    @PostMapping("/park/parkIn")
+    public ResponseBean parkIn(@RequestBody Map params) {
+        return yardSystemService.parkIn(params);
+    }
+
+    @ApiOperation("出场信息数据推送")
+    @PostMapping("/park/parkOut")
+    public ResponseBean parkOut(@RequestBody Map params) {
+        return yardSystemService.parkOut(params);
+    }
+
+    @ApiOperation("订单信息数据推送")
+    @PostMapping("/park/parkOrder")
+    public ResponseBean parkOrder(@RequestBody Map params) {
+        return yardSystemService.parkOrder(params);
+    }
+
+    @ApiOperation("收费记录数据推送")
+    @PostMapping("/park/parkCharge")
+    public ResponseBean parkCharge(@RequestBody Map params) {
+        return yardSystemService.parkCharge(params);
+    }
+
 }

src/main/java/com/ebei/screen/service/YardSystemService.java

@@ -0,0 +1,62 @@
+package com.ebei.screen.service;
+
+import com.ebei.screen.common.response.ResponseBean;
+
+import java.util.Map;
+
+/**
+ * 车场系统大屏
+ *
+ * @author Levi.u
+ * @date 2021/1/13 14:26
+ */
+public interface YardSystemService {
+
+    /**
+     * 车场信息数据推送
+     *
+     * @param params
+     * @return
+     */
+    ResponseBean parkInfo(Map params);
+
+    /**
+     * 车位信息数据推送
+     *
+     * @param params
+     * @return
+     */
+    ResponseBean parkSpace(Map params);
+
+    /**
+     * 入场信息数据推送
+     *
+     * @param params
+     * @return
+     */
+    ResponseBean parkIn(Map params);
+
+    /**
+     * 出场信息数据推送
+     *
+     * @param params
+     * @return
+     */
+    ResponseBean parkOut(Map params);
+
+    /**
+     * 订单信息数据推送
+     *
+     * @param params
+     * @return
+     */
+    ResponseBean parkOrder(Map params);
+
+    /**
+     * 收费记录数据推送
+     *
+     * @param params
+     * @return
+     */
+    ResponseBean parkCharge(Map params);
+}

src/main/java/com/ebei/screen/service/impl/EbaSystemServiceImpl.java

@@ -269,7 +269,8 @@ public class EbaSystemServiceImpl implements EbaSystemService {
                 query.addCriteria(Criteria.where("_id").is("mobjectList"));
                 Update update = new Update();
                 List<Map> map = LeviUtils.getJsonFieldMany(str, "data.mObjectList", Map.class);
-                JSONObject data = new JSONObject();
+                JSONObject obj = mongoTemplate.findById("mobjectList", JSONObject.class, "ebaAuth");
+                JSONObject data = obj != null ? obj.getJSONObject("data") : new JSONObject();
                 map.forEach(x -> {
                     List<Map> list = (List<Map>) x.get("params");
                     Integer deviceId = (Integer) x.get("deviceId");
@@ -300,9 +301,12 @@ public class EbaSystemServiceImpl implements EbaSystemService {
             if (EbaUtils.isSuccess(str)) {
                 Query query = new Query();
                 query.addCriteria(Criteria.where("_id").is("iotList"));
+                JSONObject obj = mongoTemplate.findById("iotList", JSONObject.class, "ebaAuth");
+                JSONObject data = obj != null ? obj.getJSONObject("data") : new JSONObject();
                 Update update = new Update();
                 List<Map> map = LeviUtils.getJsonFieldMany(str, "data.datas", Map.class);
-                update.set("data", Levi.by(key, map));
+                data.put(key, map);
+                update.set("data", data);
                 mongoTemplate.upsert(query, update, "ebaAuth");
             }
             return str;

src/main/java/com/ebei/screen/service/impl/YardSystemServiceImpl.java

@@ -0,0 +1,87 @@
+package com.ebei.screen.service.impl;
+
+import com.ebei.screen.common.response.ResponseBean;
+import com.ebei.screen.service.YardSystemService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Map;
+
+/**
+ * 车场系统大屏
+ *
+ * @author Levi.u
+ * @date 2021/3/3 11:57
+ */
+@Slf4j
+@Service("yardSystemService")
+@Transactional(rollbackFor = {Exception.class})
+public class YardSystemServiceImpl implements YardSystemService {
+
+    /**
+     * 车场信息数据推送
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public ResponseBean parkInfo(Map params) {
+        return null;
+    }
+
+    /**
+     * 车位信息数据推送
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public ResponseBean parkSpace(Map params) {
+        return null;
+    }
+
+    /**
+     * 入场信息数据推送
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public ResponseBean parkIn(Map params) {
+        return null;
+    }
+
+    /**
+     * 出场信息数据推送
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public ResponseBean parkOut(Map params) {
+        return null;
+    }
+
+    /**
+     * 订单信息数据推送
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public ResponseBean parkOrder(Map params) {
+        return null;
+    }
+
+    /**
+     * 收费记录数据推送
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public ResponseBean parkCharge(Map params) {
+        return null;
+    }
+}

src/main/resources/application.yml

@@ -21,4 +21,5 @@ cn:
       - /eba/system/realTimeCallback
       - /energy/platform/dataMonitoringCallback
       - /energy/platform/alarmRecordCallback
-      - /energy/platform/deviceStateCallback
+      - /energy/platform/deviceStateCallback
+      - /