设备状态，设备信息---DeviceType修改03

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);

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;
 
 /**
  * 用户数据接入

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;

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;