代码格式化

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

@@ -26,36 +26,36 @@ 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;

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

@@ -26,35 +26,35 @@ import java.util.Date;
  * @Create : 2020-12-25
  **/
 @RestController
-@RequestMapping(value = "/deviceData",method = RequestMethod.POST)
+@RequestMapping(value = "/deviceData", method = RequestMethod.POST)
 public class DeviceIncidentreportController {
     public static Logger logger = LoggerFactory.getLogger(DeviceIncidentreportController.class);
     @Autowired
-    private IDeviceIncidentReportService iDeviceIncidentReportService ;
+    private IDeviceIncidentReportService iDeviceIncidentReportService;
 
-    @RequestMapping(value = "/deviceIncidentReport",method = {RequestMethod.POST,RequestMethod.GET})
-    public String deviceUpAndDown(HttpServletRequest request, HttpServletResponse response){
+    @RequestMapping(value = "/deviceIncidentReport", 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);
             // 保存设备上传数据
             iDeviceIncidentReportService.saveDeviceIncidentReport(deviceUpDataJson);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
 //        return resultStr;

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

@@ -18,36 +18,36 @@ import java.util.Calendar;
 import java.util.Date;
 
 @RestController
-@RequestMapping(value = "/deviceData",method = RequestMethod.POST)
+@RequestMapping(value = "/deviceData", method = RequestMethod.POST)
 public class DeviceUpAndDown {
     public static Logger logger = LoggerFactory.getLogger(DeviceDataController.class);
     @Autowired
-    private IDeviceUpAndDownService iDeviceUpAndDownService ;
+    private IDeviceUpAndDownService iDeviceUpAndDownService;
 
-    @RequestMapping(value = "/deviceUpAndDown",method = {RequestMethod.POST,RequestMethod.GET})
-    public String deviceUpAndDown(HttpServletRequest request, HttpServletResponse response){
+    @RequestMapping(value = "/deviceUpAndDown", 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 deviceUpDataJo = JSONObject.parseObject(result);
             // 保存设备上传数据
             //更改
             iDeviceUpAndDownService.DeviceUpAndDown(deviceUpDataJo);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
         }
 //        return resultStr;

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

@@ -5,7 +5,6 @@ import javax.persistence.*;
 import java.io.Serializable;
 
 
-
 @Entity
 @Table(name = "device_incident_report")
 public class DeviceIncidentReport implements Serializable {

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

@@ -5,7 +5,6 @@ import javax.persistence.*;
 import java.io.Serializable;
 
 
-
 @Entity
 @Table(name = "device_up_and_down")
 public class DeviceUpAndDown implements Serializable {

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

@@ -16,26 +16,20 @@ import java.util.Date;
 public class DateUtil {
 
 
-
-
-
     /**
-     * @Method      : formatLongDate
-     * @Description : 
-     * @Params      : [dateLong]
-     * @Return      : java.lang.String
-     * 
-     * @Author      : ZhuoNing
-     * @Date        : 2021/3/31       
-     * @Time        : 14:58
+     * @Method : formatLongDate
+     * @Description :
+     * @Params : [dateLong]
+     * @Return : java.lang.String
+     * @Author : ZhuoNing
+     * @Date : 2021/3/31
+     * @Time : 14:58
      */
-    public String formatLongDate(long dateLong){
+    public String formatLongDate(long dateLong) {
         Date date = new Date(dateLong);
         java.text.SimpleDateFormat f = new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         return f.format(date);
 
 
-
-
     }
 }