版本回退

huimv-test-platform/huimv-ctwing/src/main/java/com/huimv/devicedata/controller/DeviceDataController.java

@@ -5,14 +5,14 @@ import com.huimv.devicedata.service.IDeviceDataService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.BufferedReader;
-import java.io.IOException;
 import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
 import java.util.Calendar;
 import java.util.Date;
 
@@ -25,70 +25,40 @@ import java.util.Date;
  * @Create : 2020-12-25
  **/
 @RestController
-@RequestMapping(value = "/deviceData", method = RequestMethod.POST)
+@RequestMapping(value = "/deviceData",method = RequestMethod.POST)
 public class DeviceDataController {
     public static Logger logger = LoggerFactory.getLogger(DeviceDataController.class);
     @Autowired
     private IDeviceDataService deviceDataService;
 
-    @RequestMapping(value = "/deviceChange", method = {RequestMethod.POST, RequestMethod.GET})
-    public String deviceUpAndDown(HttpServletRequest request, HttpServletResponse response) {
+    @RequestMapping(value = "/deviceChange",method = {RequestMethod.POST,RequestMethod.GET})
+    public String deviceUpAndDown(HttpServletRequest request, HttpServletResponse response){
         long startTime = Calendar.getInstance().getTimeInMillis();
         Date startDate = new Date(startTime);
         java.text.SimpleDateFormat f = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        logger.info("开始接收时间：" + f.format(startDate));
+        logger.info("开始接收时间："+f.format(startDate));
 
         StringBuffer resultStr = new StringBuffer("");
-        try {
-            BufferedReader br = new BufferedReader(new InputStreamReader(request.getInputStream(), "utf-8"));
+        try{
+            BufferedReader br = new BufferedReader(new InputStreamReader(request.getInputStream(),"utf-8"));
             StringBuffer sb = new StringBuffer("");
             String temp;
-            while ((temp = br.readLine()) != null) {
+            while ((temp = br.readLine()) != null){
                 sb.append(temp);
             }
             br.close();
             //真正接收到的数据
             String result = sb.toString();
-            System.out.println("接收到数据result>>" + result);
+            System.out.println("接收到数据result>>"+result);
 //          result = "{'upPacketSN':-1,'upDataSN':-1,'topic':'v1/up/ad19','timestamp':1617172207604,'tenantId':'2000031842','serviceId':12,'protocol':'lwm2m','productId':'15039192','payload':{'VER':1,'TIME':15,'TEMP':201,'STC':94,'RSSI':18,'HUMI':564,'BAT':3600},'messageType':'dataReport','deviceType':'','deviceId':'488200bd80e14a97826c95834dee135e','assocAssetId':'','IMSI':'undefined','IMEI':'864333043632975'}";
             JSONObject deviceUpDataJson = JSONObject.parseObject(result);
             // 保存设备上传数据
             deviceDataService.saveDeviceChangedUpData(deviceUpDataJson);
-        } catch (Exception e) {
+        }catch (Exception e){
             e.printStackTrace();
         }
 //        return resultStr;
 
         return "200";
     }
-
-
-    /**
-     * 设备命令响应Controller
-     *
-     * @param request
-     * @param response
-     * @return
-     */
-    @RequestMapping("/deviceResponse")
-    public String deviceResponse(HttpServletRequest request, HttpServletResponse response) {
-        try {
-            //字符缓冲流接收数据
-            BufferedReader br = new BufferedReader(new InputStreamReader(request.getInputStream(), StandardCharsets.UTF_8));
-            StringBuilder sb = new StringBuilder();
-            String lineData;
-            while ((lineData = br.readLine()) != null) {
-                sb.append(lineData);
-            }
-            br.close();
-            String result = sb.toString();
-            System.out.println("设备指令响应通知数据-->" + result);
-            JSONObject deviceResponseData = JSONObject.parseObject(result);
-            deviceDataService.saveDeviceResponseData(deviceResponseData);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return "200";
-
-    }
 }

huimv-test-platform/huimv-ctwing/src/main/java/com/huimv/devicedata/entity/DeviceUpdataEntity.java

@@ -8,12 +8,10 @@ import java.io.Serializable;
 public class DeviceUpdataEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
-
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "id", nullable = false)
     private Integer id;
-
     @Column(name = "product_id")
     private String productId;
 

huimv-test-platform/huimv-ctwing/src/main/java/com/huimv/devicedata/repo/DeviceResponseEntityRepository.java

@@ -1,7 +1,6 @@
 package com.huimv.devicedata.repo;
 
 import com.huimv.devicedata.entity.DeviceResponseEntity;
-import com.huimv.devicedata.entity.DeviceUpdataEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

huimv-test-platform/huimv-ctwing/src/main/java/com/huimv/devicedata/utils/DateUtil.java

@@ -15,6 +15,10 @@ import java.util.Date;
 @Component
 public class DateUtil {
 
+
+
+
+
     /**
      * @Method      : formatLongDate
      * @Description : 
@@ -29,5 +33,9 @@ public class DateUtil {
         Date date = new Date(dateLong);
         java.text.SimpleDateFormat f = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         return f.format(date);
+
+
+
+
     }
 }