From 40b9d02ff969816855a9644b8b2f8d1f5c18c128 Mon Sep 17 00:00:00 2001 From: Angel <1050374295@qq.com> Date: Fri, 8 Dec 2023 14:42:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=8A=B6=E6=80=81=EF=BC=8C?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF---DeviceType=E4=BF=AE?= =?UTF-8?q?=E6=94=B902?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/DevopeDeviceTask.java | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/ssf/mysqloracletest/task/DevopeDeviceTask.java b/src/main/java/com/ssf/mysqloracletest/task/DevopeDeviceTask.java index 87c564d..59985e1 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/DevopeDeviceTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/DevopeDeviceTask.java @@ -90,19 +90,28 @@ public class DevopeDeviceTask { deviceInfo.setDevicePort(null); } // 1--->2:人像卡口 2---->1:车辆卡口 99----->13:热点设备 - if(jksbglMysqlCp.getSblx().equals("1") || jksbglMysqlCp.getSblx().equals("01,47")){ + if (jksbglMysqlCp.getSblx().equals("1") || jksbglMysqlCp.getSblx().equals("01,47")) { deviceInfo.setDeviceType(2); - }else if (jksbglMysqlCp.getSblx().equals("2") || jksbglMysqlCp.getSblx().equals("02,47")){ + deviceStatus.setDeviceType(2); + } else if (jksbglMysqlCp.getSblx().equals("2") || jksbglMysqlCp.getSblx().equals("02,47")) { deviceInfo.setDeviceType(1); - }else if(jksbglMysqlCp.getSblx().equals("13") || jksbglMysqlCp.getSblx().equals("13,47")){ + deviceStatus.setDeviceType(1); + } else if (jksbglMysqlCp.getSblx().equals("13") || jksbglMysqlCp.getSblx().equals("13,47")) { deviceInfo.setDeviceType(99); - }else { + deviceStatus.setDeviceType(99); + } else { deviceInfo.setDeviceType(null); + deviceStatus.setDeviceType(null); } - deviceStatus.setDeviceType(Integer.parseInt(jksbglMysqlCp.getSblx())); deviceInfo.setLongitude(new BigDecimal(jksbglMysqlCp.getSbjd())); deviceInfo.setLatitude(new BigDecimal(jksbglMysqlCp.getSbwd())); - deviceStatus.setIsOnline(Integer.parseInt(jksbglMysqlCp.getSbzt())); + if (jksbglMysqlCp.getSbzt().equals("2")) { + deviceStatus.setIsOnline(1); + } else if (jksbglMysqlCp.getSbzt().equals("1")) { + deviceStatus.setIsOnline(2); + } else { + deviceStatus.setIsOnline(null); + } deviceInfo.setDeviceAddress(jksbglMysqlCp.getAzdz()); boolean a = devopsDeviceInfoService.save(deviceInfo); boolean b = deviceStatusService.save(deviceStatus);