diff --git a/src/main/java/com/ssf/mysqloracletest/domain/DevopsDeviceInfo.java b/src/main/java/com/ssf/mysqloracletest/domain/DevopsDeviceInfo.java new file mode 100644 index 0000000..9a73144 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/domain/DevopsDeviceInfo.java @@ -0,0 +1,197 @@ +package com.ssf.mysqloracletest.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Date; +import lombok.Data; + +/** + * 智能设备信息表 + * @TableName devops_device_info + */ +@TableName(value ="devops_device_info") +@Data +public class DevopsDeviceInfo implements Serializable { + /** + * 主键 + */ + @TableId(type = IdType.AUTO) + private Long id; + + /** + * 场所编码 + */ + private String placeCode; + + /** + * 场所名称 + */ + private String placeName; + + /** + * 设备名称 + */ + private String deviceName; + + /** + * 设备编码 + */ + private String deviceCode; + + /** + * 通道国标编码 + */ + private String gbsChannelNo; + + /** + * 设备类型 + */ + private Integer deviceType; + + /** + * 设备能力集 + */ + private String structuredCameraType; + + /** + * 安装位置 + */ + private String deviceAddress; + + /** + * 设备方位 + */ + private Integer orientation; + + /** + * 设备SN编号 + */ + private String deviceSn; + + /** + * 设备品牌 + */ + private String deviceBrand; + + /** + * 设备ip + */ + private String deviceIp; + + /** + * 设备端口 + */ + private Integer devicePort; + + /** + * 设备MAC + */ + private String deviceMac; + + /** + * 设备IMEI + */ + private String deviceImei; + + /** + * 设备经度 + */ + private BigDecimal longitude; + + /** + * 设备纬度 + */ + private BigDecimal latitude; + + /** + * U3D经度 + */ + private BigDecimal u3dLongitude; + + /** + * U3D纬度 + */ + private BigDecimal u3dLatitude; + + /** + * 设备高度 + */ + private String deviceHeight; + + /** + * 设备厂家 + */ + private String manufactor; + + /** + * 设备登陆帐号 + */ + private String account; + + /** + * 设备登陆密码 + */ + private String password; + + /** + * 进出方向 + */ + private Integer direction; + + /** + * RTSP流地址 + */ + private String rtspAddress; + + /** + * 是否卡口设备 + */ + private Integer isDoorwayVideo; + + /** + * 商汤region_id + */ + private String stRegionId; + + /** + * 商汤camera_idx + */ + private String stCameraIdx; + + /** + * 通道号 + */ + private Integer channelNo; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 创建者 + */ + private Integer createBy; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 更新者 + */ + private Integer updateBy; + + /** + * 0:不活跃,1:活跃 + */ + private Integer isActive; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/ssf/mysqloracletest/domain/DevopsDeviceStatus.java b/src/main/java/com/ssf/mysqloracletest/domain/DevopsDeviceStatus.java new file mode 100644 index 0000000..17099e5 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/domain/DevopsDeviceStatus.java @@ -0,0 +1,101 @@ +package com.ssf.mysqloracletest.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + +/** + * 设备状态信息表 + * @TableName devops_device_status + */ +@TableName(value ="devops_device_status") +@Data +public class DevopsDeviceStatus implements Serializable { + /** + * 主键 + */ + @TableId(type = IdType.AUTO) + private Long id; + + /** + * 场所编码 + */ + private String placeCode; + + /** + * 场所名称 + */ + private String placeName; + + /** + * 设备编码 + */ + private String deviceCode; + + /** + * 通道国标编码 + */ + private String gbsChannelNo; + + /** + * 设备名称 + */ + private String deviceName; + + /** + * 设备ip + */ + private String deviceIp; + + /** + * 设备类型 + */ + private Integer deviceType; + + /** + * 心跳时间 + */ + private Long heartbeatTime; + + /** + * 是否在线 + */ + private Integer isOnline; + + /** + * 是否存在告警 + */ + private Integer isAlarm; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 创建者 + */ + private Integer createBy; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 更新者 + */ + private Integer updateBy; + + /** + * 0:不活跃,1:活跃 + */ + private Integer isActive; + + @TableField(exist = false) + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/src/main/java/com/ssf/mysqloracletest/domain/TJksbglMysql.java b/src/main/java/com/ssf/mysqloracletest/domain/TJksbglMysql.java index 38c4795..a78c5df 100644 --- a/src/main/java/com/ssf/mysqloracletest/domain/TJksbglMysql.java +++ b/src/main/java/com/ssf/mysqloracletest/domain/TJksbglMysql.java @@ -16,7 +16,7 @@ import lombok.Data; @TableName(value = "t_jksbgl") public class TJksbglMysql { /** - * + * */ @TableField(value = "id") private String id; @@ -46,25 +46,25 @@ public class TJksbglMysql { private String macdz; /** - * + * */ @TableField(value = "sbdk") private String sbdk; /** - * + * */ @TableField(value = "jkdwlx") private String jkdwlx; /** - * + * */ @TableField(value = "sblx") private String sblx; /** - * + * */ @TableField(value = "sbxs") private String sbxs; @@ -82,312 +82,313 @@ public class TJksbglMysql { private String ywbq; /** - * + * */ @TableField(value = "jcc") private String jcc; /** - * + * */ @TableField(value = "sbjd") private String sbjd; /** - * + * */ @TableField(value = "sbwd") private String sbwd; /** - * + * */ @TableField(value = "azdz") private String azdz; /** - * + * */ @TableField(value = "cjfx") private String cjfx; /** - * + * */ @TableField(value = "sbzt") private String sbzt; /** - * + * */ @TableField(value = "ssgajg") private String ssgajg; /** - * + * */ @TableField(value = "jrfs") private String jrfs; /** - * + * */ @TableField(value = "wlbs") private String wlbs; /** - * + * */ @TableField(value = "sbcs") private String sbcs; /** - * + * */ @TableField(value = "azsj") private String azsj; /** - * + * */ @TableField(value = "ssbmhy") private String ssbmhy; /** - * + * */ @TableField(value = "dwlx") private String dwlx; /** - * + * */ @TableField(value = "djrxm") private String djrxm; /** - * + * */ @TableField(value = "djrsfzh") private String djrsfzh; /** - * + * */ @TableField(value = "djrdwdm") private String djrdwdm; /** - * + * */ @TableField(value = "djrdwmc") private String djrdwmc; /** - * + * */ @TableField(value = "djsj") private String djsj; /** - * + * */ @TableField(value = "jrsjl") private String jrsjl; /** - * + * */ @TableField(value = "zrsjl") private String zrsjl; /** - * + * */ @TableField(value = "j30tsjl") private String j30tsjl; /** - * + * */ @TableField(value = "j30tjl") private String j30tjl; /** - * + * */ @TableField(value = "zxzpsj") private String zxzpsj; /** - * + * */ @TableField(value = "zxrksj") private String zxrksj; /** - * + * */ @TableField(value = "j7tsjl") private String j7tsjl; /** - * + * */ @TableField(value = "sfzdryj") private String sfzdryj; /** - * + * */ @TableField(value = "glytbh") private String glytbh; /** - * + * */ @TableField(value = "glksbh") private String glksbh; /** - * + * */ @TableField(value = "sfsdryj") private String sfsdryj; /** - * + * */ @TableField(value = "sbid") private String sbid; /** - * + * */ @TableField(value = "sbjc") private String sbjc; /** - * + * */ @TableField(value = "gldl") private String gldl; /** - * + * */ @TableField(value = "dllx") private String dllx; /** - * + * */ @TableField(value = "cjqy") private String cjqy; /** - * + * */ @TableField(value = "cjfxlx") private String cjfxlx; /** - * + * */ @TableField(value = "sbsybh") private String sbsybh; /** - * + * */ @TableField(value = "sbbabh") private String sbbabh; /** - * + * */ @TableField(value = "sbbazt") private String sbbazt; /** - * + * */ @TableField(value = "sbbzmc") private String sbbzmc; /** - * + * */ @TableField(value = "lkldmc") private String lkldmc; /** - * + * */ @TableField(value = "lklddm") private String lklddm; /** - * + * */ @TableField(value = "glxmmc") private String glxmmc; /** - * + * */ @TableField(value = "glxmid") private String glxmid; /** - * + * */ @TableField(value = "jczq") private String jczq; /** - * + * */ @TableField(value = "jckk") private String jckk; /** - * + * */ @TableField(value = "zpfx") private String zpfx; /** - * + * */ @TableField(value = "gldw") private String gldw; /** - * + * */ @TableField(value = "lxr") private String lxr; /** - * + * */ @TableField(value = "lxdh") private String lxdh; /** - * + * */ @TableField(value = "sfjsbryj") private String sfjsbryj; /** - * + * */ @TableField(value = "sfzzrkyj") private String sfzzrkyj; - + @TableField(value = "status") + private String status; } \ No newline at end of file diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/DevopsDeviceInfoMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/DevopsDeviceInfoMapper.java new file mode 100644 index 0000000..5ed8089 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/mapper/DevopsDeviceInfoMapper.java @@ -0,0 +1,20 @@ +package com.ssf.mysqloracletest.mapper; + +import com.ssf.mysqloracletest.domain.DevopsDeviceInfo; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** +* @author 10503 +* @description 针对表【devops_device_info(智能设备信息表)】的数据库操作Mapper +* @createDate 2023-12-02 17:42:39 +* @Entity com.ssf.mysqloracletest.domain.DevopsDeviceInfo +*/ +@Mapper +public interface DevopsDeviceInfoMapper extends BaseMapper { + +} + + + + diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/DevopsDeviceStatusMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/DevopsDeviceStatusMapper.java new file mode 100644 index 0000000..ba5b840 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/mapper/DevopsDeviceStatusMapper.java @@ -0,0 +1,20 @@ +package com.ssf.mysqloracletest.mapper; + +import com.ssf.mysqloracletest.domain.DevopsDeviceStatus; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; + +/** +* @author 10503 +* @description 针对表【devops_device_status(设备状态信息表)】的数据库操作Mapper +* @createDate 2023-12-07 17:19:14 +* @Entity com.ssf.mysqloracletest.domain.DevopsDeviceStatus +*/ +@Mapper +public interface DevopsDeviceStatusMapper extends BaseMapper { + +} + + + + diff --git a/src/main/java/com/ssf/mysqloracletest/service/DevopsDeviceInfoService.java b/src/main/java/com/ssf/mysqloracletest/service/DevopsDeviceInfoService.java new file mode 100644 index 0000000..a920e52 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/service/DevopsDeviceInfoService.java @@ -0,0 +1,13 @@ +package com.ssf.mysqloracletest.service; + +import com.ssf.mysqloracletest.domain.DevopsDeviceInfo; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author 10503 +* @description 针对表【devops_device_info(智能设备信息表)】的数据库操作Service +* @createDate 2023-12-02 17:42:39 +*/ +public interface DevopsDeviceInfoService extends IService { + +} diff --git a/src/main/java/com/ssf/mysqloracletest/service/DevopsDeviceStatusService.java b/src/main/java/com/ssf/mysqloracletest/service/DevopsDeviceStatusService.java new file mode 100644 index 0000000..75ba0d4 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/service/DevopsDeviceStatusService.java @@ -0,0 +1,13 @@ +package com.ssf.mysqloracletest.service; + +import com.ssf.mysqloracletest.domain.DevopsDeviceStatus; +import com.baomidou.mybatisplus.extension.service.IService; + +/** +* @author 10503 +* @description 针对表【devops_device_status(设备状态信息表)】的数据库操作Service +* @createDate 2023-12-07 17:19:14 +*/ +public interface DevopsDeviceStatusService extends IService { + +} diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/DevopsDeviceInfoServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/DevopsDeviceInfoServiceImpl.java new file mode 100644 index 0000000..9b5fb68 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/DevopsDeviceInfoServiceImpl.java @@ -0,0 +1,23 @@ +package com.ssf.mysqloracletest.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ssf.mysqloracletest.domain.DevopsDeviceInfo; +import com.ssf.mysqloracletest.service.DevopsDeviceInfoService; +import com.ssf.mysqloracletest.mapper.DevopsDeviceInfoMapper; +import org.springframework.stereotype.Service; + +/** +* @author 10503 +* @description 针对表【devops_device_info(智能设备信息表)】的数据库操作Service实现 +* @createDate 2023-12-02 17:42:39 +*/ +@Service +@DS("mysql") +public class DevopsDeviceInfoServiceImpl extends ServiceImpl implements DevopsDeviceInfoService{ + +} + + + + diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/DevopsDeviceStatusServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/DevopsDeviceStatusServiceImpl.java new file mode 100644 index 0000000..399f0db --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/DevopsDeviceStatusServiceImpl.java @@ -0,0 +1,24 @@ +package com.ssf.mysqloracletest.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ssf.mysqloracletest.domain.DevopsDeviceStatus; +import com.ssf.mysqloracletest.service.DevopsDeviceStatusService; +import com.ssf.mysqloracletest.mapper.DevopsDeviceStatusMapper; +import org.springframework.stereotype.Service; + +/** +* @author 10503 +* @description 针对表【devops_device_status(设备状态信息表)】的数据库操作Service实现 +* @createDate 2023-12-07 17:19:14 +*/ +@Service +@DS("mysql") +public class DevopsDeviceStatusServiceImpl extends ServiceImpl + implements DevopsDeviceStatusService{ + +} + + + + diff --git a/src/main/java/com/ssf/mysqloracletest/task/DevopeDeviceTask.java b/src/main/java/com/ssf/mysqloracletest/task/DevopeDeviceTask.java new file mode 100644 index 0000000..acbef5e --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/task/DevopeDeviceTask.java @@ -0,0 +1,135 @@ +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.DevopsDeviceInfo; +import com.ssf.mysqloracletest.domain.DevopsDeviceStatus; +import com.ssf.mysqloracletest.domain.TJksbglMysql; +import com.ssf.mysqloracletest.service.DevopsDeviceInfoService; +import com.ssf.mysqloracletest.service.DevopsDeviceStatusService; +import com.ssf.mysqloracletest.service.TJksbglMysqlService; +import com.ssf.mysqloracletest.utils.ConfigParam; +import com.ssf.mysqloracletest.utils.StringKit; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.math.BigDecimal; +import java.util.List; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + +@Component +public class DevopeDeviceTask { + private static final Logger logger = LoggerFactory.getLogger(RentalHousingTask.class); + @Resource + private TJksbglMysqlService jksbglMysqlService; + @Resource + private DevopsDeviceInfoService devopsDeviceInfoService; + @Resource + private DevopsDeviceStatusService deviceStatusService; + + @Scheduled(initialDelay = 100, fixedDelay = 3000) + public void transDevopeDevice() { + if (!"true".equals(ConfigParam.DevopeDeviceSwitch)) { + return; + } + + try { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.isNull("STATUS"); + Page page = new Page<>(1, 1000); + List resultList = jksbglMysqlService.page(page, queryWrapper).getRecords(); + + CountDownLatch latch = new CountDownLatch(resultList.size()); + ExecutorService DevicePool = Executors.newFixedThreadPool(5); + + for (TJksbglMysql bean : resultList) { + DevicePool.submit(() -> { + cleanJksbInfo(bean); + logger.info("清洗完成"); + latch.countDown(); + }); + } + + try { + //Wait for all threads to complete + latch.await(); + } catch (InterruptedException e) { + e.printStackTrace(); + } + //关闭线程池 + DevicePool.shutdown(); + } catch (Exception e) { + logger.info(StringKit.getTrace(e)); + } + } + + private void cleanJksbInfo(TJksbglMysql bean) { + TJksbglMysql jksbglMysqlCp = new TJksbglMysql(); + try { + 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()); + deviceStatus.setGbsChannelNo(jksbglMysqlCp.getSbbh()); + deviceInfo.setDeviceIp(jksbglMysqlCp.getIpdz()); + deviceStatus.setDeviceIp(jksbglMysqlCp.getIpdz()); + deviceInfo.setDeviceMac(jksbglMysqlCp.getMacdz()); + deviceInfo.setDeviceSn(jksbglMysqlCp.getId()); + deviceStatus.setDeviceCode(jksbglMysqlCp.getId()); + if (jksbglMysqlCp.getSbdk() != null && !jksbglMysqlCp.getSbdk().isEmpty()) { + deviceInfo.setDevicePort(Integer.parseInt(jksbglMysqlCp.getSbdk())); + } else { + deviceInfo.setDevicePort(null); + } + // 1--->2:人像卡口 2---->1:车辆卡口 99----->13:热点设备 + if (jksbglMysql.getSblx().equals("01")) { + deviceInfo.setDeviceType(2); + deviceStatus.setDeviceType(2); + } else if (jksbglMysql.getSblx().equals("02")) { + deviceInfo.setDeviceType(1); + deviceStatus.setDeviceType(1); + } 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); + } + deviceInfo.setLongitude(new BigDecimal(jksbglMysqlCp.getSbjd())); + deviceInfo.setLatitude(new BigDecimal(jksbglMysqlCp.getSbwd())); + if (jksbglMysqlCp.getSbzt().equals("02")) { + deviceStatus.setIsOnline(1); + } else if (jksbglMysqlCp.getSbzt().equals("01")) { + deviceStatus.setIsOnline(2); + } else { + deviceStatus.setIsOnline(null); + } + deviceInfo.setDeviceAddress(jksbglMysqlCp.getAzdz()); + boolean a = devopsDeviceInfoService.save(deviceInfo); + boolean b = deviceStatusService.save(deviceStatus); + + if (a && b) { + jksbglMysqlCp.setStatus("1"); + jksbglMysqlService.updateTJksbglById(jksbglMysqlCp); + logger.info("状态修改为:1"); + } + } catch (Exception e) { + logger.info(StringKit.getTrace(e)); + jksbglMysqlCp.setStatus("2"); + jksbglMysqlService.updateTJksbglById(jksbglMysqlCp); + logger.info("状态修改为:2"); + } + } +} 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; diff --git a/src/main/java/com/ssf/mysqloracletest/utils/ConfigParam.java b/src/main/java/com/ssf/mysqloracletest/utils/ConfigParam.java index 21785ab..1d63d41 100644 --- a/src/main/java/com/ssf/mysqloracletest/utils/ConfigParam.java +++ b/src/main/java/com/ssf/mysqloracletest/utils/ConfigParam.java @@ -42,6 +42,8 @@ public class ConfigParam { public static String RentalHouseSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("RentalHouseSwitch")); public static String metaRealEstateInfoSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("metaRealEstateInfoSwitch")); + public static String DevopeDeviceSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("DevopeDeviceSwitch")); + public static String sydzToEstateInfoSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("sydzToEstateInfoSwitch")); diff --git a/src/main/resources/mapper/TJksbglMysqlMapper.xml b/src/main/resources/mapper/TJksbglMysqlMapper.xml index 4577107..85536ee 100644 --- a/src/main/resources/mapper/TJksbglMysqlMapper.xml +++ b/src/main/resources/mapper/TJksbglMysqlMapper.xml @@ -67,6 +67,7 @@ +