调整月度环比问题

src/main/java/com/ebei/screen/controller/energy/EnergyPlatformController.java

@@ -7,12 +7,11 @@ import com.ebei.screen.service.EnergyPlatformService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.PostConstruct;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author Liu.x
@@ -45,4 +44,23 @@ public class EnergyPlatformController {
     public ResponseBean getAllInOne(@PathVariable String boxId) {
         return energyPlatformService.getAllInOne(boxId);
     }
+
+
+    @ApiOperation("获取能耗大屏数据监控推送")
+    @PostMapping("/dataMonitoringCallback")
+    public ResponseBean dataMonitoringCallback(@RequestBody List<Map> params) {
+        return energyPlatformService.dataMonitoringCallback(params);
+    }
+
+    @ApiOperation("获取能耗大屏报警记录推送")
+    @PostMapping("/alarmRecordCallback")
+    public ResponseBean alarmRecordCallback(@RequestBody List<Map> params) {
+        return energyPlatformService.alarmRecordCallback(params);
+    }
+
+    @ApiOperation("获取能耗大屏设备状态推送")
+    @PostMapping("/deviceStateCallback")
+    public ResponseBean deviceStateCallback(@RequestBody List<Map> params) {
+        return energyPlatformService.deviceStateCallback(params);
+    }
 }

src/main/java/com/ebei/screen/modules/po/Person.java

@@ -1,20 +0,0 @@
-package com.ebei.screen.modules.po;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * @author Levi.u
- * @date 2021/1/13 14:39
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-public class Person {
-    private String pName;
-    private Integer pAge;
-
-}

src/main/java/com/ebei/screen/modules/po/Test.java

@@ -1,29 +0,0 @@
-package com.ebei.screen.modules.po;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.springframework.data.mongodb.core.mapping.Document;
-
-import java.util.List;
-
-/**
- * 测试对象
- *
- * @author Liu.x
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-@Document("test")
-public class Test {
-
-    private String name;
-
-    private int age;
-
-    private List<Person> childs;
-
-}

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

@@ -2,6 +2,9 @@ package com.ebei.screen.service;
 
 import com.ebei.screen.common.response.ResponseBean;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * @author JCM
  * @description
@@ -46,4 +49,27 @@ public interface EnergyPlatformService {
      */
     ResponseBean getAllInOne(String boxId);
 
+    /**
+     * 获取能耗大屏数据监控推送
+     *
+     * @param params
+     * @return
+     */
+    ResponseBean dataMonitoringCallback(List<Map> params);
+
+    /**
+     * 获取能耗大屏报警记录推送
+     *
+     * @param params
+     * @return
+     */
+    ResponseBean alarmRecordCallback(List<Map> params);
+
+    /**
+     * 获取能耗大屏设备状态推送
+     *
+     * @param params
+     * @return
+     */
+    ResponseBean deviceStateCallback(List<Map> params);
 }

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

@@ -311,11 +311,11 @@ public class EbaSystemServiceImpl implements EbaSystemService {
         String messageCode = params.get("messageCode");
         String content = params.get("content");
         List<Map> contentList = LeviUtils.getJsonFieldMany(content, null, Map.class);
-        if(CollUtil.isEmpty(contentList)){
+        if (CollUtil.isEmpty(contentList)) {
             return 200;
         }
-        List<Map> huojing = contentList.stream().filter(x -> ((x.get("AlarmType")==null?-1:(Integer) x.get("AlarmType")) == 1)).collect(Collectors.toList());
-        List<Map> guzhang = contentList.stream().filter(x -> ((x.get("AlarmType")==null?-1:(Integer) x.get("AlarmType")) == 2)).collect(Collectors.toList());
+        List<Map> huojing = contentList.stream().filter(x -> ((x.get("AlarmType") == null ? -1 : (Integer) x.get("AlarmType")) == 1)).collect(Collectors.toList());
+        List<Map> guzhang = contentList.stream().filter(x -> ((x.get("AlarmType") == null ? -1 : (Integer) x.get("AlarmType")) == 2)).collect(Collectors.toList());
         Query query = new Query();
         query.addCriteria(Criteria.where("_id").is(messageCode + "_" + LocalDateTime.now().getYear() + "_" + LocalDateTime.now().getMonthValue()));
         Update update = new Update();

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

@@ -341,4 +341,40 @@ public class EnergyPlatformServiceImpl implements EnergyPlatformService {
         // 封装所有数据
         return ResponseBuilder.ok(Levi.by("boxId", boxId).set("byydgc", byydgc).set("byhxzb", byhxzb).set("ndylhb", monthList).set("brylhb", dayHbList).set("ydylhb", monthHbList));
     }
+
+    /**
+     * 获取能耗大屏数据监控推送
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public ResponseBean dataMonitoringCallback(List<Map> params) {
+        System.out.println(JSON.toJSONString(params));
+        return ResponseBuilder.ok();
+    }
+
+    /**
+     * 获取能耗大屏报警记录推送
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public ResponseBean alarmRecordCallback(List<Map> params) {
+        System.out.println(JSON.toJSONString(params));
+        return ResponseBuilder.ok();
+    }
+
+    /**
+     * 获取能耗大屏设备状态推送
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public ResponseBean deviceStateCallback(List<Map> params) {
+        System.out.println(JSON.toJSONString(params));
+        return ResponseBuilder.ok();
+    }
 }