Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/main/java/com/ssf/mysqloracletest/mapper/VSySydwMysqlMapper.java
#	src/main/java/com/ssf/mysqloracletest/service/VSySydwMysqlService.java
#	src/main/java/com/ssf/mysqloracletest/service/impl/VSySydwMysqlServiceImpl.java

src/main/java/com/ssf/mysqloracletest/domain/JcjCjxxViewMysql.java

@@ -1,14 +1,9 @@
 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 lombok.Data;
 
 import java.io.Serializable;
 
-import lombok.Data;
-
 /**
  * @TableName jcj_cjxx_view
  */

src/main/java/com/ssf/mysqloracletest/domain/VSySydwmMysql.java

@@ -16,116 +16,139 @@ public class VSySydwmMysql {
     /**
      *
      */
+    @TableField(value = "ZJLID")
     private String ZJLID;
 
     /**
      *
      */
+    @TableField(value = "YSXTJRZJ")
     private String YSXTJRZJ;
 
     /**
      *
      */
+    @TableField(value = "XXSC_PDBZ")
     private String XXSC_PDBZ;
 
     /**
      *
      */
+    @TableField(value = "ID")
     private String ID;
 
     /**
      *
      */
+    @TableField(value = "DWMC")
     private String DWMC;
 
     /**
      *
      */
+    @TableField(value = "DZ")
     private String DZ;
 
     /**
      *
      */
+    @TableField(value = "LXDH")
     private String LXDH;
 
     /**
      *
      */
+    @TableField(value = "FJBM")
     private String FJBM;
 
     /**
      *
      */
+    @TableField(value = "FJMC")
     private String FJMC;
 
     /**
      *
      */
+    @TableField(value = "PCSBM")
     private String PCSBM;
 
     /**
      *
      */
+    @TableField(value = "PCSMC")
     private String PCSMC;
 
     /**
      *
      */
+    @TableField(value = "JWQBM")
     private String JWQBM;
 
     /**
      *
      */
+    @TableField(value = "JWQMC")
     private String JWQMC;
 
     /**
      *
      */
+    @TableField(value = "SZQY")
     private String SZQY;
 
     /**
      *
      */
+    @TableField(value = "DWZT")
     private String DWZT;
 
     /**
      *
      */
+    @TableField(value = "X")
     private String X;
 
     /**
      *
      */
+    @TableField(value = "Y")
     private String Y;
 
     /**
      *
      */
+    @TableField(value = "DWLXMC")
     private String DWLXMC;
 
     /**
      *
      */
+    @TableField(value = "FRZJHM")
     private String FRZJHM;
 
     /**
      *
      */
+    @TableField(value = "FRXM")
     private String FRXM;
 
     /**
      *
      */
+    @TableField(value = "CDC_JYM")
     private String CDC_JYM;
 
     /**
      *
      */
+    @TableField(value = "YSBZK_RKSJ")
     private String YSBZK_RKSJ;
 
     /**
      *
      */
+    @TableField(value = "YSBZK_GXSJ")
     private String YSBZK_GXSJ;
 
 

src/main/java/com/ssf/mysqloracletest/domain/VSySydzMysql.java

@@ -3,6 +3,7 @@ package com.ssf.mysqloracletest.domain;
 import lombok.Data;
 
 @Data
+
 public class VSySydzMysql {
 
     /**

src/main/java/com/ssf/mysqloracletest/mapper/TJksbglMysqlMapper.java

@@ -1,6 +1,5 @@
 package com.ssf.mysqloracletest.mapper;
 
-import com.ssf.mysqloracletest.domain.TJksbglMysql;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ssf.mysqloracletest.domain.TJksbglMysql;
 import org.apache.ibatis.annotations.Mapper;
@@ -12,7 +11,7 @@ import org.apache.ibatis.annotations.Mapper;
 * @Entity com.ssf.mysqloracletest.domain.TJksbgl
 */
 @Mapper
-public interface TJksbglMysqlMapper {
+public interface TJksbglMysqlMapper  extends BaseMapper<TJksbglMysql>{
     public TJksbglMysql selectTJksbglById(String id);
 
     public int insertTJksbgl(TJksbglMysql bean);

src/main/java/com/ssf/mysqloracletest/mapper/TJksbglOracleMapper.java

@@ -1,5 +1,7 @@
 package com.ssf.mysqloracletest.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ssf.mysqloracletest.domain.TJksbglMysql;
 import com.ssf.mysqloracletest.domain.TJksbglOracle;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -13,7 +15,7 @@ import java.util.Map;
  * @Entity com.ssf.mysqloracletest.domain.TJksbgl
  */
 @Mapper
-public interface TJksbglOracleMapper {
+public interface TJksbglOracleMapper extends BaseMapper<TJksbglOracle> {
     public int countJKsb();
 
     public List<TJksbglOracle> getJKsbList(Map map);

src/main/java/com/ssf/mysqloracletest/mapper/VSySydwMysqlMapper.java

@@ -1,6 +1,5 @@
 package com.ssf.mysqloracletest.mapper;
 
-import com.ssf.mysqloracletest.domain.VSySydwCyryOracle;
 import com.ssf.mysqloracletest.domain.VSySydwmMysql;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ssf.mysqloracletest.domain.VSySydzMysql;

src/main/java/com/ssf/mysqloracletest/mapper/VSySydwOracleMapper.java

@@ -1,5 +1,7 @@
 package com.ssf.mysqloracletest.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ssf.mysqloracletest.domain.VSySydwmMysql;
 import com.ssf.mysqloracletest.domain.VSySydwmOracle;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -13,7 +15,7 @@ import java.util.Map;
 * @Entity com.ssf.mysqloracletest.domain.VSySydw
 */
 @Mapper
-public interface VSySydwOracleMapper {
+public interface VSySydwOracleMapper extends BaseMapper<VSySydwmOracle> {
 
     public int countSydw();
 

src/main/java/com/ssf/mysqloracletest/mapper/VSySydzMysqlMapper.java

@@ -1,11 +1,13 @@
 package com.ssf.mysqloracletest.mapper;
 
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ssf.mysqloracletest.domain.VSySydwmOracle;
 import com.ssf.mysqloracletest.domain.VSySydzMysql;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
-public interface VSySydzMysqlMapper {
+public interface VSySydzMysqlMapper extends BaseMapper<VSySydzMysql> {
 
     public VSySydzMysql selectVSySydzById(String id);
 

src/main/java/com/ssf/mysqloracletest/mapper/VSySydzOracleMapper.java

@@ -1,6 +1,8 @@
 package com.ssf.mysqloracletest.mapper;
 
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ssf.mysqloracletest.domain.VSySydzMysql;
 import com.ssf.mysqloracletest.domain.VSySydzOracle;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -8,7 +10,7 @@ import java.util.List;
 import java.util.Map;
 
 @Mapper
-public interface VSySydzOracleMapper {
+public interface VSySydzOracleMapper extends BaseMapper<VSySydzOracle> {
     public int countSydz();
 
     public List<VSySydzOracle> getSydzList(Map map);

src/main/java/com/ssf/mysqloracletest/mapper/VSySyfwMysqlMapper.java

@@ -1,5 +1,7 @@
 package com.ssf.mysqloracletest.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ssf.mysqloracletest.domain.VSySydzOracle;
 import com.ssf.mysqloracletest.domain.VSySyfwMysql;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -11,7 +13,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @since 2023-11-28 16:03:25
  */
 @Mapper
-public interface VSySyfwMysqlMapper {
+public interface VSySyfwMysqlMapper extends BaseMapper<VSySyfwMysql> {
 
     public VSySyfwMysql selectVSySyfwById(String id);
 

src/main/java/com/ssf/mysqloracletest/mapper/VSySyfwOracleMapper.java

@@ -1,5 +1,7 @@
 package com.ssf.mysqloracletest.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ssf.mysqloracletest.domain.VSySyfwMysql;
 import com.ssf.mysqloracletest.domain.VSySyfwOracle;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -7,7 +9,7 @@ import java.util.List;
 import java.util.Map;
 
 @Mapper
-public interface VSySyfwOracleMapper {
+public interface VSySyfwOracleMapper extends BaseMapper<VSySyfwOracle> {
     public int countSyfw();
 
     public List<VSySyfwOracle> getSyfwList(Map map);

src/main/java/com/ssf/mysqloracletest/service/TJksbglMysqlService.java

@@ -1,15 +1,16 @@
 package com.ssf.mysqloracletest.service;
 
+
 import com.ssf.mysqloracletest.domain.TJksbglMysql;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.ssf.mysqloracletest.domain.VSySydzMysql;
+
 
 /**
 * @author 10503
 * @description 针对表【t_jksbgl】的数据库操作Service
 * @createDate 2023-11-28 21:07:14
 */
-public interface TJksbglMysqlService  {
+public interface TJksbglMysqlService  extends IService<TJksbglMysql>  {
 
     public TJksbglMysql selectTJksbglById(String id);
 

src/main/java/com/ssf/mysqloracletest/service/TJksbglOracleService.java

@@ -13,7 +13,7 @@ import java.util.Map;
 * @description 针对表【t_jksbgl】的数据库操作Service
 * @createDate 2023-11-28 21:07:14
 */
-public interface TJksbglOracleService {
+public interface TJksbglOracleService extends IService<TJksbglOracle> {
     public int countJKsb();
 
     public List<TJksbglOracle> getJKsbList(Map map);

src/main/java/com/ssf/mysqloracletest/service/VSySydwOracleService.java

@@ -1,5 +1,6 @@
 package com.ssf.mysqloracletest.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ssf.mysqloracletest.domain.VSySydwmOracle;
 import com.ssf.mysqloracletest.domain.VSySydzOracle;
 
@@ -11,7 +12,7 @@ import java.util.Map;
 * @description 针对表【v_sy_sydw】的数据库操作Service
 * @createDate 2023-11-29 22:43:38
 */
-public interface VSySydwOracleService {
+public interface VSySydwOracleService extends IService<VSySydwmOracle> {
     public int countSydw();
 
     public List<VSySydwmOracle> getSydwList(Map map);

src/main/java/com/ssf/mysqloracletest/service/VSySydzMysqlService.java

@@ -1,8 +1,9 @@
 package com.ssf.mysqloracletest.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ssf.mysqloracletest.domain.VSySydzMysql;
 
-public interface VSySydzMysqlService {
+public interface VSySydzMysqlService extends IService<VSySydzMysql> {
 
     public VSySydzMysql selectVSySydzById(String id);
 

src/main/java/com/ssf/mysqloracletest/service/VSySydzOracleService.java

@@ -1,11 +1,12 @@
 package com.ssf.mysqloracletest.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ssf.mysqloracletest.domain.VSySydzOracle;
 
 import java.util.List;
 import java.util.Map;
 
-public interface VSySydzOracleService {
+public interface VSySydzOracleService extends IService<VSySydzOracle> {
 
     public int countSydz();
 

src/main/java/com/ssf/mysqloracletest/service/VSySyfwMysqlService.java

@@ -1,6 +1,7 @@
 package com.ssf.mysqloracletest.service;
 
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ssf.mysqloracletest.domain.VSySyfwMysql;
 
 /**
@@ -9,7 +10,7 @@ import com.ssf.mysqloracletest.domain.VSySyfwMysql;
  * @author makejava
  * @since 2023-11-28 16:03:26
  */
-public interface VSySyfwMysqlService {
+public interface VSySyfwMysqlService extends IService<VSySyfwMysql> {
     public VSySyfwMysql selectVSySyfwById(String id);
 
     public int insertVSySyfw(VSySyfwMysql syfw);

src/main/java/com/ssf/mysqloracletest/service/VSySyfwOracleService.java

@@ -1,12 +1,13 @@
 package com.ssf.mysqloracletest.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ssf.mysqloracletest.domain.VSySyfwOracle;
 
 import java.util.List;
 import java.util.Map;
 
 
-public interface VSySyfwOracleService {
+public interface VSySyfwOracleService extends IService<VSySyfwOracle> {
     public int countSyfw();
 
     public List<VSySyfwOracle> getSyfwList(Map map);

src/main/java/com/ssf/mysqloracletest/service/impl/TJksbglMysqlServiceImpl.java

@@ -1,10 +1,13 @@
 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.TJksbglMysql;
-import com.ssf.mysqloracletest.domain.VSySydzMysql;
+
+
 import com.ssf.mysqloracletest.mapper.TJksbglMysqlMapper;
-import com.ssf.mysqloracletest.mapper.VSySydzMysqlMapper;
+
 import com.ssf.mysqloracletest.service.TJksbglMysqlService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -13,7 +16,7 @@ import org.springframework.stereotype.Service;
 @Service
 @DS("mysql")
 @RequiredArgsConstructor
-public class TJksbglMysqlServiceImpl implements TJksbglMysqlService {
+public class TJksbglMysqlServiceImpl extends ServiceImpl<TJksbglMysqlMapper, TJksbglMysql> implements TJksbglMysqlService {
     private final TJksbglMysqlMapper tjksbglMysqlMapper;
 
     @Override

src/main/java/com/ssf/mysqloracletest/service/impl/TJksbglOracleServiceImpl.java

@@ -1,7 +1,10 @@
 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.TJksbglMysql;
 import com.ssf.mysqloracletest.domain.TJksbglOracle;
+import com.ssf.mysqloracletest.mapper.TJksbglMysqlMapper;
 import com.ssf.mysqloracletest.mapper.TJksbglOracleMapper;
 import com.ssf.mysqloracletest.service.TJksbglOracleService;
 import org.springframework.stereotype.Service;
@@ -17,7 +20,7 @@ import java.util.Map;
 */
 @Service
 @DS("oracleSydz")
-public class TJksbglOracleServiceImpl implements TJksbglOracleService {
+public class TJksbglOracleServiceImpl extends ServiceImpl<TJksbglOracleMapper, TJksbglOracle>  implements TJksbglOracleService {
     @Resource
     private TJksbglOracleMapper oracleMapper;
 

src/main/java/com/ssf/mysqloracletest/service/impl/VSySydwMysqlServiceImpl.java

@@ -2,8 +2,11 @@ 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.VSySydwCyryOracle;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ssf.mysqloracletest.domain.VSySydwCyryMysql;
 import com.ssf.mysqloracletest.domain.VSySydwmMysql;
+import com.ssf.mysqloracletest.mapper.VSySydwCyryOracleMapper;
 import com.ssf.mysqloracletest.mapper.VSySydwCyryMysqlMapper;
 import com.ssf.mysqloracletest.mapper.VSySydwMysqlMapper;
 import com.ssf.mysqloracletest.mapper.VSySyfwMysqlMapper;
@@ -20,7 +23,7 @@ import org.springframework.stereotype.Service;
 @Service
 @DS("mysql")
 @RequiredArgsConstructor
-public class VSySydwMysqlServiceImpl extends ServiceImpl<VSySydwMysqlMapper, VSySydwmMysql> implements VSySydwMysqlService {
+public class VSySydwMysqlServiceImplextends extends ServiceImpl<VSySydwMysqlMapper, VSySydwmMysql>  implements VSySydwMysqlService {
 
     private final VSySydwMysqlMapper vSySydwMysqlMapper;
 

src/main/java/com/ssf/mysqloracletest/service/impl/VSySydwOracleServiceImpl.java

@@ -1,8 +1,10 @@
 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.VSySydwmMysql;
 import com.ssf.mysqloracletest.domain.VSySydwmOracle;
+import com.ssf.mysqloracletest.mapper.VSySydwMysqlMapper;
 import com.ssf.mysqloracletest.mapper.VSySydwOracleMapper;
 import com.ssf.mysqloracletest.mapper.VSySydzOracleMapper;
 import com.ssf.mysqloracletest.service.VSySydwMysqlService;
@@ -20,7 +22,7 @@ import java.util.Map;
  */
 @Service
 @DS("oracleSydz")
-public class VSySydwOracleServiceImpl implements VSySydwOracleService {
+public class VSySydwOracleServiceImpl extends ServiceImpl<VSySydwOracleMapper, VSySydwmOracle> implements VSySydwOracleService {
     @Resource
     private VSySydwOracleMapper vSySydwOracleMapper;
 

src/main/java/com/ssf/mysqloracletest/service/impl/VSySydzMysqlServiceImpl.java

@@ -1,7 +1,10 @@
 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.VSySydwmOracle;
 import com.ssf.mysqloracletest.domain.VSySydzMysql;
+import com.ssf.mysqloracletest.mapper.VSySydwOracleMapper;
 import com.ssf.mysqloracletest.mapper.VSySydzMysqlMapper;
 import com.ssf.mysqloracletest.service.VSySydzMysqlService;
 import lombok.RequiredArgsConstructor;
@@ -10,7 +13,7 @@ import org.springframework.stereotype.Service;
 @Service
 @DS("mysql")
 @RequiredArgsConstructor
-public class VSySydzMysqlServiceImpl implements VSySydzMysqlService {
+public class VSySydzMysqlServiceImpl extends ServiceImpl<VSySydzMysqlMapper, VSySydzMysql> implements VSySydzMysqlService {
 
     private final VSySydzMysqlMapper sySydzMysqlMapper;
 

src/main/java/com/ssf/mysqloracletest/service/impl/VSySydzOracleServiceImpl.java

@@ -1,7 +1,10 @@
 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.VSySydzMysql;
 import com.ssf.mysqloracletest.domain.VSySydzOracle;
+import com.ssf.mysqloracletest.mapper.VSySydzMysqlMapper;
 import com.ssf.mysqloracletest.mapper.VSySydzOracleMapper;
 import com.ssf.mysqloracletest.service.VSySydzOracleService;
 import lombok.RequiredArgsConstructor;
@@ -13,7 +16,7 @@ import java.util.Map;
 
 @Service
 @DS("oracleSydz")
-public class VSySydzOracleServiceImpl implements VSySydzOracleService {
+public class VSySydzOracleServiceImpl  extends ServiceImpl<VSySydzOracleMapper, VSySydzOracle> implements VSySydzOracleService {
 
     @Resource
     private VSySydzOracleMapper oracleMapper;

src/main/java/com/ssf/mysqloracletest/service/impl/VSySyfwMysqlServiceImpl.java

@@ -3,7 +3,10 @@ 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.VSySydzOracle;
 import com.ssf.mysqloracletest.domain.VSySyfwMysql;
+import com.ssf.mysqloracletest.mapper.VSySydzOracleMapper;
 import com.ssf.mysqloracletest.mapper.VSySyfwMysqlMapper;
 import com.ssf.mysqloracletest.mapper.VSySyfwMysqlMapper;
 import lombok.RequiredArgsConstructor;
@@ -19,7 +22,7 @@ import com.ssf.mysqloracletest.service.VSySyfwMysqlService;
 @Service
 @DS("mysql")
 @RequiredArgsConstructor
-public class VSySyfwMysqlServiceImpl implements VSySyfwMysqlService {
+public class VSySyfwMysqlServiceImpl extends ServiceImpl<VSySyfwMysqlMapper, VSySyfwMysql> implements VSySyfwMysqlService {
 
     private final VSySyfwMysqlMapper sySyfwMysqlMapper;
 

src/main/java/com/ssf/mysqloracletest/service/impl/VSySyfwOracleServiceImpl.java

@@ -1,7 +1,10 @@
 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.VSySyfwMysql;
 import com.ssf.mysqloracletest.domain.VSySyfwOracle;
+import com.ssf.mysqloracletest.mapper.VSySyfwMysqlMapper;
 import com.ssf.mysqloracletest.mapper.VSySyfwOracleMapper;
 import com.ssf.mysqloracletest.service.VSySyfwOracleService;
 import org.springframework.stereotype.Service;
@@ -12,7 +15,7 @@ import java.util.Map;
 
 @Service
 @DS("oracleSydz")
-public class VSySyfwOracleServiceImpl implements VSySyfwOracleService {
+public class VSySyfwOracleServiceImpl extends ServiceImpl<VSySyfwOracleMapper, VSySyfwOracle> implements VSySyfwOracleService {
 
     @Resource
     private VSySyfwOracleMapper oracleMapper;

src/main/java/com/ssf/mysqloracletest/task/AlarmInfoTask.java

@@ -1,6 +1,7 @@
 package com.ssf.mysqloracletest.task;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.ssf.mysqloracletest.domain.JcjJjxxViewMysql;
 import com.ssf.mysqloracletest.domain.MetaAlarmInfo;
 import com.ssf.mysqloracletest.service.JcjJjxxViewMysqlService;
@@ -114,12 +115,12 @@ public class AlarmInfoTask {
                                     alarmInfo.setLatitude(null);
                                 }
                                 //确定一个数据是否唯一
-                                MetaAlarmInfo one = alarmInfoService.lambdaQuery().eq(MetaAlarmInfo::getId, Njjxx.getJJBH()).one();
+                                MetaAlarmInfo one = alarmInfoService.lambdaQuery().eq(MetaAlarmInfo::getAlarmCode, Njjxx.getJJBH()).one();
                                 if (one == null) {
                                     alarmInfoService.save(alarmInfo);
                                     logger.info("Njjxx-" + Njjxx.getJJBH() + ":插入成功");
                                 } else {
-                                    alarmInfoService.update(new QueryWrapper<>(alarmInfo));
+                                    alarmInfoService.update(alarmInfo,new UpdateWrapper<>(alarmInfo));
                                     logger.info("Njjxx-" + Njjxx.getJJBH() + ":更新成功");
                                 }
                             }

src/main/java/com/ssf/mysqloracletest/task/JcjCjxxTask.java

@@ -126,8 +126,6 @@ public class JcjCjxxTask {
         } catch (Exception e) {
             logger.info(StringKit.getTrace(e));
         }
-
-
     }
     private static String getFolderPath(String picpath) {
         String floderPath;
@@ -144,4 +142,32 @@ public class JcjCjxxTask {
     }
 
 
+
+    /**
+     *
+     * 功能描述:  接入出警信息实时数据
+     *
+     * @param:
+     * @return: 
+     * @auther: cyfeng
+     * @date: 2023/12/2 14:31
+     */
+    @Scheduled(initialDelay = 100, fixedDelay = 3000)
+    public void transcjxxNow() {
+
+        try {
+
+            //1  去mysql查出当前最大时间
+
+            //2  用得到的最大时间去oracle 查询大于这个时间的记录
+
+            //3  解析入库
+
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+
+
+    }
+
 }

src/main/java/com/ssf/mysqloracletest/task/JcjJjxxTask.java

@@ -1,115 +1,115 @@
-package com.ssf.mysqloracletest.task;
-
-import com.ssf.mysqloracletest.domain.JcjJjxxViewMysql;
-import com.ssf.mysqloracletest.domain.JcjJjxxViewOracle;
-import com.ssf.mysqloracletest.service.JcjJjxxViewMysqlService;
-import com.ssf.mysqloracletest.service.JcjJjxxViewOracleService;
-import com.ssf.mysqloracletest.utils.ConfigParam;
-import com.ssf.mysqloracletest.utils.NumKit;
-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.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;
-
-/**
- *  用户数据接入
- */
-@Component
-public class JcjJjxxTask {
-
-    private static final Logger logger = LoggerFactory.getLogger(JcjJjxxTask.class);
-
-    @Resource
-    private JcjJjxxViewMysqlService jcjJjxxViewMysqlService;
-
-    @Resource
-    private JcjJjxxViewOracleService jcjJjxxViewOracleService;
-
-    final int oncesCounts = NumKit.checkInt(ConfigParam.oncesCounts) == 0 ? 1000 : NumKit.checkInt(ConfigParam.oncesCounts);
-
-    private boolean JjxxTag = false;
-
-    /**
-     * 连云港 对接海康平台获取人员基础数据
-     * //
-     */
-    @Scheduled(initialDelay = 100, fixedDelay = 3000)
-    public void transJjxx() {
-
-        if (JjxxTag) {
-            return;
-        }
-
-        if (!"true".equals(ConfigParam.JjxxSwitch)) {
-            return;
-        }
-
-
-        try {
-            int countJjxx = jcjJjxxViewOracleService.countJjxx();
-            logger.info("countJjxx:" + countJjxx);
-
-            logger.info("countJjxx:" + countJjxx);
-            if (countJjxx > 0) {
-
-                JjxxTag = true;
-
-                int count = countJjxx / oncesCounts;
-                CountDownLatch latch = new CountDownLatch(count);
-                ExecutorService JjxxPool = Executors.newFixedThreadPool(50);
-
-                for (int i = 0; i <= count; i++) {
-                    Map JjxxMap = new HashMap();
-                    JjxxMap.put("rowStart", i * oncesCounts);
-                    JjxxMap.put("rowEnd", (i + 1) * oncesCounts);
-                    JjxxPool.submit(() -> {
-                        try {
-                            List<JcjJjxxViewOracle> Jjxxs = jcjJjxxViewOracleService.getJjxxList(JjxxMap);
-                            for (JcjJjxxViewOracle Jjxx : Jjxxs) {
-                                JcjJjxxViewMysql sBean = new JcjJjxxViewMysql();
-                                BeanUtils.copyProperties(Jjxx, sBean);
-                                //确定一个数据是否唯一
-                                JcjJjxxViewMysql checkJjxx = jcjJjxxViewMysqlService.selectJcjJxxByJJBH(Jjxx.getJJBH());
-                                if (checkJjxx == null) {
-                                    jcjJjxxViewMysqlService.insertJjxx(sBean);
-                                    logger.info("Jjxx-" + Jjxx.getJJBH() + ":插入成功");
-                                } else {
-                                    jcjJjxxViewMysqlService.updateJjxxByJJBH(sBean);
-                                    logger.info("Jjxx-" + Jjxx.getJJBH() + ":更新成功");
-                                }
-                            }
-                        } catch (Exception e) {
-                            logger.info("Jjxxs:" + StringKit.getTrace(e));
-                        }
-                        latch.countDown();
-                    });
-                    logger.info("JjxxMap数据总量:" + countJjxx + "," + "当前处理下标:" + JjxxMap.get("rowStart") + "/" + JjxxMap.get("rowEnd"));
-                }
-
-                try {
-                    // Wait for all threads to complete
-                    latch.await();
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-                // 关闭线程池
-                JjxxPool.shutdown();
-            }
-
-        } catch (Exception e) {
-            logger.info(StringKit.getTrace(e));
-        }
-    }
-
-
-}
+//package com.ssf.mysqloracletest.task;
+//
+//import com.ssf.mysqloracletest.domain.JcjJjxxViewMysql;
+//import com.ssf.mysqloracletest.domain.JcjJjxxViewOracle;
+//import com.ssf.mysqloracletest.service.JcjJjxxViewMysqlService;
+//import com.ssf.mysqloracletest.service.JcjJjxxViewOracleService;
+//import com.ssf.mysqloracletest.utils.ConfigParam;
+//import com.ssf.mysqloracletest.utils.NumKit;
+//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.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;
+//
+///**
+// *  用户数据接入
+// */
+//@Component
+//public class JcjJjxxTask {
+//
+//    private static final Logger logger = LoggerFactory.getLogger(JcjJjxxTask.class);
+//
+//    @Resource
+//    private JcjJjxxViewMysqlService jcjJjxxViewMysqlService;
+//
+//    @Resource
+//    private JcjJjxxViewOracleService jcjJjxxViewOracleService;
+//
+//    final int oncesCounts = NumKit.checkInt(ConfigParam.oncesCounts) == 0 ? 1000 : NumKit.checkInt(ConfigParam.oncesCounts);
+//
+//    private boolean JjxxTag = false;
+//
+//    /**
+//     * 连云港 对接海康平台获取人员基础数据
+//     * //
+//     */
+//    @Scheduled(initialDelay = 100, fixedDelay = 3000)
+//    public void transJjxx() {
+//
+//        if (JjxxTag) {
+//            return;
+//        }
+//
+//        if (!"true".equals(ConfigParam.JjxxSwitch)) {
+//            return;
+//        }
+//
+//
+//        try {
+//            int countJjxx = jcjJjxxViewOracleService.countJjxx();
+//            logger.info("countJjxx:" + countJjxx);
+//
+//            logger.info("countJjxx:" + countJjxx);
+//            if (countJjxx > 0) {
+//
+//                JjxxTag = true;
+//
+//                int count = countJjxx / oncesCounts;
+//                CountDownLatch latch = new CountDownLatch(count);
+//                ExecutorService JjxxPool = Executors.newFixedThreadPool(50);
+//
+//                for (int i = 0; i <= count; i++) {
+//                    Map JjxxMap = new HashMap();
+//                    JjxxMap.put("rowStart", i * oncesCounts);
+//                    JjxxMap.put("rowEnd", (i + 1) * oncesCounts);
+//                    JjxxPool.submit(() -> {
+//                        try {
+//                            List<JcjJjxxViewOracle> Jjxxs = jcjJjxxViewOracleService.getJjxxList(JjxxMap);
+//                            for (JcjJjxxViewOracle Jjxx : Jjxxs) {
+//                                JcjJjxxViewMysql sBean = new JcjJjxxViewMysql();
+//                                BeanUtils.copyProperties(Jjxx, sBean);
+//                                //确定一个数据是否唯一
+//                                JcjJjxxViewMysql checkJjxx = jcjJjxxViewMysqlService.selectJcjJxxByJJBH(Jjxx.getJJBH());
+//                                if (checkJjxx == null) {
+//                                    jcjJjxxViewMysqlService.insertJjxx(sBean);
+//                                    logger.info("Jjxx-" + Jjxx.getJJBH() + ":插入成功");
+//                                } else {
+//                                    jcjJjxxViewMysqlService.updateJjxxByJJBH(sBean);
+//                                    logger.info("Jjxx-" + Jjxx.getJJBH() + ":更新成功");
+//                                }
+//                            }
+//                        } catch (Exception e) {
+//                            logger.info("Jjxxs:" + StringKit.getTrace(e));
+//                        }
+//                        latch.countDown();
+//                    });
+//                    logger.info("JjxxMap数据总量:" + countJjxx + "," + "当前处理下标:" + JjxxMap.get("rowStart") + "/" + JjxxMap.get("rowEnd"));
+//                }
+//
+//                try {
+//                    // Wait for all threads to complete
+//                    latch.await();
+//                } catch (InterruptedException e) {
+//                    e.printStackTrace();
+//                }
+//                // 关闭线程池
+//                JjxxPool.shutdown();
+//            }
+//
+//        } catch (Exception e) {
+//            logger.info(StringKit.getTrace(e));
+//        }
+//    }
+//
+//
+//}

src/main/java/com/ssf/mysqloracletest/task/UnitInfoTask.java

@@ -1,6 +1,7 @@
 package com.ssf.mysqloracletest.task;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.ssf.mysqloracletest.domain.MetaActualUnitInfo;
 import com.ssf.mysqloracletest.domain.VSySydwmMysql;
 import com.ssf.mysqloracletest.service.MetaActualUnitInfoService;
@@ -119,7 +120,7 @@ public class UnitInfoTask {
                                     metaActualUnitInfoService.save(unitInfo);
                                     logger.info("Nsydw-" + Nsydw.getID() + ":插入成功");
                                 } else {
-                                    metaActualUnitInfoService.update(new QueryWrapper<>(unitInfo));
+                                    metaActualUnitInfoService.update(unitInfo,new UpdateWrapper<>(unitInfo));
                                     logger.info("Nsydw-" + Nsydw.getID() + ":更新成功");
                                 }
                             }

src/main/resources/mapper/JcjCjxxViewMapperMysql.xml

@@ -445,4 +445,11 @@
         where CJBH = #{CJBH}
     </update>
 
+
+    <select id="selectRecordOrderByRksj" parameterType="java.lang.String" resultMap="BaseResultMap">
+        select *
+        from jcj_cjxx_view order by ws_rksj desc limit 1;
+    </select>
+
+
 </mapper>

src/main/resources/mapper/JcjCjxxViewMapperOracle.xml

@@ -122,4 +122,8 @@
                 WHERE t2.rn <![CDATA[ >= ]]> ${rowStart}
         </select>
 
+
+        <select id="getRealTimeRecording" parameterType="java.util.Map" resultMap="BaseResultMap">
+                SELECT * FROM SYX_JWPT.JCJ_CJXX_VIEW where WS_RKSJ >#{maxTime}
+        </select>
 </mapper>

src/main/resources/mapper/JcjJjxxViewMysqlMapper.xml

@@ -544,4 +544,11 @@
         where JJBH = #{JJBH}
     </update>
 
+
+
+    <select id="selectRecordOrderByRksj" parameterType="java.lang.String" resultMap="BaseResultMap">
+        select *
+        from jcj_jjxx_view order by ws_rksj desc limit 1;
+    </select>
+
 </mapper>

src/main/resources/mapper/JcjJjxxViewOracleMapper.xml

@@ -145,4 +145,8 @@
         FROM (SELECT ROWNUM rn, t1.* FROM (SELECT * FROM SYX_JWPT.JCJ_JJXX_VIEW) t1 WHERE ROWNUM<![CDATA[ <= ]]> ${rowEnd}) t2
         WHERE t2.rn <![CDATA[ >= ]]> ${rowStart}
     </select>
+
+    <select id="getRealTimeRecording" parameterType="java.util.Map" resultMap="JjxxResultMap">
+        SELECT * FROM SYX_JWPT.JCJ_JJXX_VIEW where WS_RKSJ >#{maxTime}
+    </select>
 </mapper>