新康达设备上报

@@ -257,22 +257,22 @@ public class XinkangdaDeviceReportService {
         }
         }
     }
     }
 
 
-//    private void dataUpload(XkdDeviceInfo info) {
-//        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmssSSS");
-//        String dataBatch = simpleDateFormat.format(new Date());
-//        XkdDeviceData data = new XkdDeviceData();
-//        data.setDeviceId(info.getDeviceId());
-//        data.setDataBatch(dataBatch);
-//        ZonedDateTime now = ZonedDateTime.now();
-//        String iso8601 = now.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME);
-//        data.setCollectionTime(iso8601);
-//        data.setStatus("RUN");
-//        data.setAlarm(false);
-//        data.setAlarmName("无");
-//        data.setEfficiency(78D);
-//
-//        sendDataUpload(data);
-//    }
+    private void dataUpload(XkdDeviceInfo info) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmssSSS");
+        String dataBatch = simpleDateFormat.format(new Date());
+        XkdDeviceData data = new XkdDeviceData();
+        data.setDeviceId(info.getDeviceId());
+        data.setDataBatch(dataBatch);
+        ZonedDateTime now = ZonedDateTime.now();
+        String iso8601 = now.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME);
+        data.setCollectionTime(iso8601);
+        data.setStatus("RUN");
+        data.setAlarm(false);
+        data.setAlarmName("无");
+        data.setEfficiency(78D);
+
+        sendDataUpload(data);
+    }
 
 
     private boolean sendDataUpload(XkdDeviceData data) {
     private boolean sendDataUpload(XkdDeviceData data) {
         String deviceId = data.getDeviceId();
         String deviceId = data.getDeviceId();
@@ -330,7 +330,9 @@ public class XinkangdaDeviceReportService {
 
 
     // 设备注册，只需要执行一次，本地执行完成
     // 设备注册，只需要执行一次，本地执行完成
     public void devicesRegister() {
     public void devicesRegister() {
-        String filePath = "C:\\Users\\PC\\Desktop\\xdkdevice.xlsx";
+//        String filePath = "C:\\Users\\PC\\Desktop\\xdkdevice.xlsx";
+        String filePath = "C:\\Users\\PC\\Desktop\\dcs数据.xlsx";
+
         try (InputStream in = new FileInputStream(new File(filePath));
         try (InputStream in = new FileInputStream(new File(filePath));
              // 使用 WorkbookFactory 自动根据文件格式创建合适的 Workbook
              // 使用 WorkbookFactory 自动根据文件格式创建合适的 Workbook
              Workbook workbook = WorkbookFactory.create(in)) {
              Workbook workbook = WorkbookFactory.create(in)) {
@@ -339,12 +341,12 @@ public class XinkangdaDeviceReportService {
             for (int index = 1; index <= lastRowNum; index++) {
             for (int index = 1; index <= lastRowNum; index++) {
                 Row row = sheet.getRow(index);
                 Row row = sheet.getRow(index);
                 XkdDeviceInfo info = new XkdDeviceInfo();
                 XkdDeviceInfo info = new XkdDeviceInfo();
-                info.setDeviceId(row.getCell(4).getStringCellValue());
-                info.setDeviceName(row.getCell(3).getStringCellValue());
-                info.setDeviceType(row.getCell(5).getStringCellValue());
+                info.setDeviceId(row.getCell(5).getStringCellValue());
+                info.setDeviceName(row.getCell(1).getStringCellValue());
+                info.setDeviceType(row.getCell(6).getStringCellValue());
                 info.setLocation(row.getCell(1).getStringCellValue() + "-" + row.getCell(2).getStringCellValue());
                 info.setLocation(row.getCell(1).getStringCellValue() + "-" + row.getCell(2).getStringCellValue());
                 sendReportDevice(info);
                 sendReportDevice(info);
-//                dataUpload(info);
+                dataUpload(info);
             }
             }
         } catch (Exception e) {
         } catch (Exception e) {
             e.printStackTrace();
             e.printStackTrace();