Merge branch 'jwy_csdj' of http://47.100.114.196:3001/jwy/aeon_sender into zhczh_c

src/main/java/com/techsor/datacenter/sender/controllers/MainReceiverController.java

@@ -209,6 +209,19 @@ public class MainReceiverController {
         return JsonResponse.buildSuccess(resultJson);
     }
 
+    @RequestMapping(value = "generic/csdj", method = RequestMethod.POST)
+    public JsonResponse csdjProcess(@RequestBody CsdjEntity csdjEntity){
+        logger.info("csdj data:{}", JSON.toJSONString(csdjEntity));
+        //处理数据，转发数据
+        String resultJson="";
+        try{
+            //解析数据
+        }catch (Exception e){
+            logger.error("csdjProcess error", e);
+        }
+        return JsonResponse.buildSuccess(resultJson);
+    }
+
     @RequestMapping(value = "generic/mockJsonData", method = RequestMethod.POST)
     public JsonResponse mockJsonData(@RequestBody ProcessRAWEntity rawEntity){
         logger.warn("Received: "+new Gson().toJson(rawEntity));

src/main/java/com/techsor/datacenter/sender/entitiy/CsdjEntity.java

@@ -0,0 +1,12 @@
+package com.techsor.datacenter.sender.entitiy;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class CsdjEntity implements Serializable {
+    private String terminalId;
+    private String ts;
+    private String data;
+}