From 97b59d94639a84941c00309ff95fafdbd3ccda20 Mon Sep 17 00:00:00 2001 From: Angel <1050374295@qq.com> Date: Fri, 8 Dec 2023 15:35:23 +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=B903?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/DevopeDeviceTask.java | 20 +++++++++++-------- .../task/MetaActualUnitUserInfoTask.java | 9 --------- .../task/MetaHandleAlarmTask.java | 7 ------- .../task/SydzToEstateInfoTask.java | 4 ---- 4 files changed, 12 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/ssf/mysqloracletest/task/DevopeDeviceTask.java b/src/main/java/com/ssf/mysqloracletest/task/DevopeDeviceTask.java index 59985e1..acbef5e 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/DevopeDeviceTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/DevopeDeviceTask.java @@ -75,6 +75,7 @@ public class DevopeDeviceTask { BeanUtils.copyProperties(bean, jksbglMysqlCp); DevopsDeviceInfo deviceInfo = new DevopsDeviceInfo(); DevopsDeviceStatus deviceStatus = new DevopsDeviceStatus(); + TJksbglMysql jksbglMysql = jksbglMysqlService.selectTJksbglById(jksbglMysqlCp.getSbbh()); deviceInfo.setDeviceName(jksbglMysqlCp.getSbmc()); deviceStatus.setDeviceName(jksbglMysqlCp.getSbmc()); deviceInfo.setGbsChannelNo(jksbglMysqlCp.getSbbh()); @@ -90,24 +91,27 @@ public class DevopeDeviceTask { deviceInfo.setDevicePort(null); } // 1--->2:人像卡口 2---->1:车辆卡口 99----->13:热点设备 - if (jksbglMysqlCp.getSblx().equals("1") || jksbglMysqlCp.getSblx().equals("01,47")) { + if (jksbglMysql.getSblx().equals("01")) { deviceInfo.setDeviceType(2); deviceStatus.setDeviceType(2); - } else if (jksbglMysqlCp.getSblx().equals("2") || jksbglMysqlCp.getSblx().equals("02,47")) { + } else if (jksbglMysql.getSblx().equals("02")) { deviceInfo.setDeviceType(1); deviceStatus.setDeviceType(1); - } else if (jksbglMysqlCp.getSblx().equals("13") || jksbglMysqlCp.getSblx().equals("13,47")) { + } else if (jksbglMysql.getSblx().equals("13")) { + deviceInfo.setDeviceType(99); + deviceStatus.setDeviceType(99); + } else if (jksbglMysql.getSblx().equals("01,47")) { + deviceInfo.setDeviceType(2); + deviceStatus.setDeviceType(2); + } else if (jksbglMysql.getSblx().equals("13,47")) { deviceInfo.setDeviceType(99); deviceStatus.setDeviceType(99); - } else { - deviceInfo.setDeviceType(null); - deviceStatus.setDeviceType(null); } deviceInfo.setLongitude(new BigDecimal(jksbglMysqlCp.getSbjd())); deviceInfo.setLatitude(new BigDecimal(jksbglMysqlCp.getSbwd())); - if (jksbglMysqlCp.getSbzt().equals("2")) { + if (jksbglMysqlCp.getSbzt().equals("02")) { deviceStatus.setIsOnline(1); - } else if (jksbglMysqlCp.getSbzt().equals("1")) { + } else if (jksbglMysqlCp.getSbzt().equals("01")) { deviceStatus.setIsOnline(2); } else { deviceStatus.setIsOnline(null); diff --git a/src/main/java/com/ssf/mysqloracletest/task/MetaActualUnitUserInfoTask.java b/src/main/java/com/ssf/mysqloracletest/task/MetaActualUnitUserInfoTask.java index d9efc3c..ed08f3b 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/MetaActualUnitUserInfoTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/MetaActualUnitUserInfoTask.java @@ -1,16 +1,12 @@ package com.ssf.mysqloracletest.task; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ssf.mysqloracletest.domain.JcjCjxxViewMysql; import com.ssf.mysqloracletest.domain.MetaActualUnitUserInfo; -import com.ssf.mysqloracletest.domain.MetaHandleAlarmInfo; import com.ssf.mysqloracletest.domain.VSySydwCyryMysql; import com.ssf.mysqloracletest.service.MetaActualUnitUserInfoService; import com.ssf.mysqloracletest.service.VSySydwCyryMysqlService; import com.ssf.mysqloracletest.utils.ConfigParam; -import com.ssf.mysqloracletest.utils.NumKit; import com.ssf.mysqloracletest.utils.StringKit; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; @@ -19,13 +15,8 @@ import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import javax.annotation.Resource; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.concurrent.CountDownLatch; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; /** * 用户数据接入 diff --git a/src/main/java/com/ssf/mysqloracletest/task/MetaHandleAlarmTask.java b/src/main/java/com/ssf/mysqloracletest/task/MetaHandleAlarmTask.java index 267121e..2200256 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/MetaHandleAlarmTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/MetaHandleAlarmTask.java @@ -1,16 +1,12 @@ package com.ssf.mysqloracletest.task; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ssf.mysqloracletest.domain.JcjCjxxViewMysql; import com.ssf.mysqloracletest.domain.MetaHandleAlarmInfo; -import com.ssf.mysqloracletest.domain.VJwtSyfw; import com.ssf.mysqloracletest.service.JcjCjxxViewMysqlService; import com.ssf.mysqloracletest.service.MetaHandleAlarmInfoService; -import com.ssf.mysqloracletest.service.MetaImpUserInfoService; import com.ssf.mysqloracletest.utils.ConfigParam; -import com.ssf.mysqloracletest.utils.NumKit; import com.ssf.mysqloracletest.utils.StringKit; import lombok.RequiredArgsConstructor; import org.slf4j.Logger; @@ -19,10 +15,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; -import javax.annotation.Resource; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/src/main/java/com/ssf/mysqloracletest/task/SydzToEstateInfoTask.java b/src/main/java/com/ssf/mysqloracletest/task/SydzToEstateInfoTask.java index b713f58..1414a3c 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/SydzToEstateInfoTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/SydzToEstateInfoTask.java @@ -1,11 +1,7 @@ package com.ssf.mysqloracletest.task; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ssf.mysqloracletest.domain.MetaRealEstateInfo; -import com.ssf.mysqloracletest.domain.VJwtSyfw; import com.ssf.mysqloracletest.domain.VSySydzMysql; -import com.ssf.mysqloracletest.service.JwtSyfwService; import com.ssf.mysqloracletest.service.MetaRealEstateInfoService; import com.ssf.mysqloracletest.service.VSySydzMysqlService; import com.ssf.mysqloracletest.utils.ConfigParam;