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

config/application.properties

@@ -14,8 +14,9 @@ cyrySwitch=false
 JjxxSwitch=false
 #------------------------?????----------------------------
 NewNsydwSwitch=false
-metaImpUserSwitch=false
+metaImpUserSwitch=true
-NewNalarminfoSwitch=true
+NewNalarminfoSwitch=false
-
+metaHandleAlarmSwitch=false
+metaActualUnitUserInfoSwitch=false
 
 

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

@@ -0,0 +1,106 @@
+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 meta_actual_unit_user_info
+ */
+@TableName(value ="meta_actual_unit_user_info")
+@Data
+public class MetaActualUnitUserInfo implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 单位id
+     */
+    private Long unitId;
+
+    /**
+     * 单位名称
+     */
+    private String unitName;
+
+    /**
+     * 员工照片
+     */
+    private String staffPic;
+
+    /**
+     * 员工姓名
+     */
+    private String staffName;
+
+    /**
+     * 员工身份证
+     */
+    private String identityId;
+
+    /**
+     * 联系方式
+     */
+    private String contactInfo;
+
+    /**
+     * 性别
+     */
+    private Integer sex;
+
+    /**
+     * 人员分类
+     */
+    private Integer staffType;
+
+    /**
+     * 人员状态
+     */
+    private Integer staffState;
+
+    /**
+     * 元数据创建时间
+     */
+    private String metaCreateTime;
+
+    /**
+     * 元数据更新时间
+     */
+    private String metaUpdateTime;
+
+    /**
+     * 创建时间
+     */
+    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;
+}

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

@@ -1,5 +1,7 @@
 package com.ssf.mysqloracletest.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -8,23 +10,38 @@ import java.io.Serializable;
  * @TableName v_sy_sydw_cyry
  */
 @Data
+@TableName(value = "v_sy_sydw_cyry")
 public class VSySydwCyryMysql implements Serializable {
     /**
      *
      */
+    @TableField(value = "ID")
     private String ID;
+    @TableField(value = "DWID")
     private String DWID;
+    @TableField(value = "GJ")
     private String GJ;
+    @TableField(value = "ZJLX")
     private String ZJLX;
+    @TableField(value = "ZJHM")
     private String ZJHM;
+    @TableField(value = "XM")
     private String XM;
+    @TableField(value = "XB")
     private String XB;
+    @TableField(value = "MZ")
     private String MZ;
+    @TableField(value = "LXDH")
     private String LXDH;
+    @TableField(value = "ZT")
     private String ZT;
+    @TableField(value = "RYFL")
     private String RYFL;
+    @TableField(value = "YSBZK_RKSJ")
     private String YSBZK_RKSJ;
+    @TableField(value = "YSBZK_GXSJ")
     private String YSBZK_GXSJ;
+    @TableField(value = "DWMC")
     private String DWMC;
 
 }

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

@@ -10,4 +10,6 @@ public interface JcjJjxxViewOracleMapper {
     public int countJjxx();
 
     public List<JcjJjxxViewOracle> getJjxxList(Map map);
+
+    public List<JcjJjxxViewOracle> getRealTimeRecording(String maxTime);
 }

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

@@ -9,4 +9,6 @@ public interface JcjJxxViewMysqlMapper  extends BaseMapper<JcjJjxxViewMysql> {
     public int insertJjxx(JcjJjxxViewMysql bean);
 
     public int updateJjxxByJJBH(JcjJjxxViewMysql bean);
+
+    public JcjJjxxViewMysql selectRecordOrderByRksj();
 }

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

@@ -0,0 +1,18 @@
+package com.ssf.mysqloracletest.mapper;
+
+import com.ssf.mysqloracletest.domain.MetaActualUnitUserInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author 28758
+* @description 针对表【meta_actual_unit_user_info(单位从业人员信息表)】的数据库操作Mapper
+* @createDate 2023-12-02 10:31:32
+* @Entity com.ssf.mysqloracletest.domain.MetaActualUnitUserInfo
+*/
+public interface MetaActualUnitUserInfoMapper extends BaseMapper<MetaActualUnitUserInfo> {
+
+}
+
+
+
+

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

@@ -1,6 +1,5 @@
 package com.ssf.mysqloracletest.mapper;
 
-import com.ssf.mysqloracletest.domain.VSySydwCyryMysql;
 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/service/JcjJjxxViewMysqlService.java

@@ -15,4 +15,6 @@ public interface JcjJjxxViewMysqlService extends IService<JcjJjxxViewMysql>{
 
     public int updateJjxxByJJBH(JcjJjxxViewMysql bean);
 
+    public JcjJjxxViewMysql selectRecordOrderByRksj();
+
 }

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

@@ -15,4 +15,6 @@ public interface JcjJjxxViewOracleService{
     public int countJjxx();
 
     public List<JcjJjxxViewOracle> getJjxxList(Map map);
+
+    public List<JcjJjxxViewOracle> getRealTimeRecording(String maxTime);
 }

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

@@ -0,0 +1,13 @@
+package com.ssf.mysqloracletest.service;
+
+import com.ssf.mysqloracletest.domain.MetaActualUnitUserInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author 28758
+* @description 针对表【meta_actual_unit_user_info(单位从业人员信息表)】的数据库操作Service
+* @createDate 2023-12-02 10:31:32
+*/
+public interface MetaActualUnitUserInfoService extends IService<MetaActualUnitUserInfo> {
+
+}

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

@@ -1,6 +1,7 @@
 package com.ssf.mysqloracletest.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ssf.mysqloracletest.domain.VSySydwCyryMysql;
 import com.ssf.mysqloracletest.domain.VSySydwmMysql;
 import com.ssf.mysqloracletest.domain.VSySydzMysql;
 

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

@@ -34,6 +34,11 @@ public class JcjJjxxViewMysqlServiceImpl extends ServiceImpl<JcjJxxViewMysqlMapp
     public int updateJjxxByJJBH(JcjJjxxViewMysql bean) {
         return jcxxMapper.updateJjxxByJJBH(bean);
     }
+
+    @Override
+    public JcjJjxxViewMysql selectRecordOrderByRksj() {
+        return jcxxMapper.selectRecordOrderByRksj();
+    }
 }
 
 

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

@@ -31,6 +31,11 @@ public class JcjJjxxViewOracleServiceImpl implements JcjJjxxViewOracleService {
     public List<JcjJjxxViewOracle> getJjxxList(Map map) {
         return oracleMapper.getJjxxList(map);
     }
+
+    @Override
+    public List<JcjJjxxViewOracle> getRealTimeRecording(String maxTime) {
+        return oracleMapper.getRealTimeRecording(maxTime);
+    }
 }
 
 

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

@@ -0,0 +1,22 @@
+package com.ssf.mysqloracletest.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ssf.mysqloracletest.domain.MetaActualUnitUserInfo;
+import com.ssf.mysqloracletest.service.MetaActualUnitUserInfoService;
+import com.ssf.mysqloracletest.mapper.MetaActualUnitUserInfoMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author 28758
+* @description 针对表【meta_actual_unit_user_info(单位从业人员信息表)】的数据库操作Service实现
+* @createDate 2023-12-02 10:31:32
+*/
+@Service
+public class MetaActualUnitUserInfoServiceImpl extends ServiceImpl<MetaActualUnitUserInfoMapper, MetaActualUnitUserInfo>
+    implements MetaActualUnitUserInfoService{
+
+}
+
+
+
+

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

@@ -3,8 +3,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;
 import com.ssf.mysqloracletest.service.VSySydwMysqlService;
@@ -20,7 +23,7 @@ import org.springframework.stereotype.Service;
 @Service
 @DS("mysql")
 @RequiredArgsConstructor
-public class VSySydwMysqlServiceImpl extends ServiceImpl<VSySydwMysqlMapper, VSySydwmMysql> implements VSySydwMysqlService {
+public class VSySydwMysqlServiceImpl extends ServiceImpl<VSySydwMysqlMapper, VSySydwmMysql>  implements VSySydwMysqlService {
 
     private final VSySydwMysqlMapper vSySydwMysqlMapper;
 

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

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

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

@@ -0,0 +1,139 @@
+package com.ssf.mysqloracletest.task;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.ssf.mysqloracletest.domain.MetaActualUnitUserInfo;
+import com.ssf.mysqloracletest.domain.MetaImpUserInfo;
+import com.ssf.mysqloracletest.domain.VSySydwCyryMysql;
+import com.ssf.mysqloracletest.service.MetaActualUnitUserInfoService;
+import com.ssf.mysqloracletest.service.MetaImpUserInfoService;
+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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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 MetaActualUnitUserInfoTask {
+
+    private static final Logger logger = LoggerFactory.getLogger(MetaActualUnitUserInfoTask.class);
+
+    @Resource
+    private VSySydwCyryMysqlService vSySydwCyryMysqlService;
+
+    @Resource
+    private MetaActualUnitUserInfoService metaActualUnitUserInfoService;
+
+    final int oncesCounts = NumKit.checkInt(ConfigParam.oncesCounts) == 0 ? 1000 : NumKit.checkInt(ConfigParam.oncesCounts);
+
+    private boolean cyryTag = false;
+
+    /**
+     * 连云港 对接海康平台获取人员基础数据
+     * //
+     */
+    @Scheduled(initialDelay = 100, fixedDelay = 3000)
+    public void transcyry() {
+
+        if (cyryTag) {
+            return;
+        }
+
+        if (!"true".equals(ConfigParam.metaActualUnitUserInfoSwitch)) {
+            return;
+        }
+
+
+        try {
+            int countcyry = vSySydwCyryMysqlService.count();
+            logger.info("countcyry:" + countcyry);
+
+            if (countcyry > 0) {
+
+                cyryTag = true;
+
+                int count = countcyry / oncesCounts;
+                CountDownLatch latch = new CountDownLatch(count);
+                ExecutorService cyryPool = Executors.newFixedThreadPool(50);
+
+                for (int i = 0; i <= count; i++) {
+                    Map cyryMap = new HashMap();
+                    cyryMap.put("rowStart", i * oncesCounts);
+                    cyryMap.put("rowEnd", (i + 1) * oncesCounts);
+                    cyryPool.submit(() -> {
+                        try {
+                            List<VSySydwCyryMysql> list = vSySydwCyryMysqlService.lambdaQuery().list();
+                            for (VSySydwCyryMysql cyry : list) {
+                                MetaActualUnitUserInfo metaActualUnitUserInfo = new MetaActualUnitUserInfo();
+                                if (cyry.getDWID()!=null) {
+                                    metaActualUnitUserInfo.setUnitId(Long.parseLong(cyry.getDWID()));
+                                }
+                                metaActualUnitUserInfo.setUnitName(cyry.getDWMC());
+                                metaActualUnitUserInfo.setStaffName(cyry.getXM());
+                                metaActualUnitUserInfo.setIdentityId(cyry.getZJHM());
+                                metaActualUnitUserInfo.setContactInfo(cyry.getLXDH());
+                                if (cyry.getXB()!=null) {
+                                    metaActualUnitUserInfo.setSex(Integer.parseInt(cyry.getXB()));
+                                }
+                                if (cyry.getRYFL()!=null) {
+                                    metaActualUnitUserInfo.setStaffType(Integer.parseInt(cyry.getRYFL()));
+                                }
+                                if ("Y".equals(cyry.getZT())){
+                                    metaActualUnitUserInfo.setStaffState(1);
+                                }else if ("N".equals(cyry.getZT())){
+                                    metaActualUnitUserInfo.setStaffState(2);
+                                }
+                                metaActualUnitUserInfo.setMetaCreateTime(cyry.getYSBZK_RKSJ());
+                                metaActualUnitUserInfo.setMetaUpdateTime(cyry.getYSBZK_GXSJ());
+                                //确定一个数据是否唯一
+                                MetaActualUnitUserInfo one = metaActualUnitUserInfoService.lambdaQuery().eq(MetaActualUnitUserInfo::getIdentityId, cyry.getZJHM())
+                                        .eq(MetaActualUnitUserInfo::getStaffType, cyry.getRYFL()).one();
+                                if (one == null) {
+                                    metaActualUnitUserInfoService.save(metaActualUnitUserInfo);
+                                    logger.info("cyry-" + cyry.getZJHM() + ":插入成功");
+                                } else {
+                                    UpdateWrapper<MetaActualUnitUserInfo> metaActualUnitUserInfoUpdateWrapper = new UpdateWrapper<>();
+                                    metaActualUnitUserInfoUpdateWrapper.eq("identity_id", cyry.getZJHM());
+                                    metaActualUnitUserInfoUpdateWrapper.eq("staff_type", cyry.getRYFL());
+                                    metaActualUnitUserInfoService.update(metaActualUnitUserInfo,metaActualUnitUserInfoUpdateWrapper);
+                                    logger.info("cyry-" + cyry.getZJHM() + ":更新成功");
+                                }
+                            }
+                        } catch (Exception e) {
+                            logger.info("cyrys:" + e.getMessage());
+                        }
+                        latch.countDown();
+                    });
+                    logger.info("cyryMap数据总量:" + countcyry + "," + "当前处理下标:" + cyryMap.get("rowStart") + "/" + cyryMap.get("rowEnd"));
+                }
+
+                try {
+                    // Wait for all threads to complete
+                    latch.await();
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+                // 关闭线程池
+                cyryPool.shutdown();
+            }
+
+        } catch (Exception e) {
+            logger.info(StringKit.getTrace(e));
+        }
+    }
+
+
+}

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

@@ -91,7 +91,9 @@ public class MetaHandleAlarmTask {
                                     metaHandleAlarmInfoService.save(metaHandleAlarmInfo);
                                     logger.info("cjxx-" + cjxx.getCJBH() + ":插入成功");
                                 } else {
-                                    metaHandleAlarmInfoService.update(metaHandleAlarmInfo,new UpdateWrapper<>(metaHandleAlarmInfo));
+                                    UpdateWrapper<MetaHandleAlarmInfo> metaHandleAlarmInfoUpdateWrapper = new UpdateWrapper<>();
+                                    metaHandleAlarmInfoUpdateWrapper.eq("alarm_code", cjxx.getCJBH());
+                                    metaHandleAlarmInfoService.update(metaHandleAlarmInfo,metaHandleAlarmInfoUpdateWrapper);
                                     logger.info("cjxx-" + cjxx.getCJBH() + ":更新成功");
                                 }
                             }

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

@@ -1,5 +1,7 @@
 package com.ssf.mysqloracletest.task;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.ssf.mysqloracletest.domain.MetaImpUserInfo;
 import com.ssf.mysqloracletest.domain.ZhxfZdrygkRyjbxxViewMysql;
@@ -78,9 +80,22 @@ public class MetaImpUserInfoTask {
                                 MetaImpUserInfo metaImpUserInfo = new MetaImpUserInfo();
                                 metaImpUserInfo.setUserName(zdry.getXM());
                                 metaImpUserInfo.setIdCard(zdry.getZJHM());
-                                metaImpUserInfo.setSex(Integer.parseInt(zdry.getXB()));
+                                if (zdry.getXB()!=null) {
+                                    metaImpUserInfo.setSex(Integer.parseInt(zdry.getXB()));
+                                }
                                 metaImpUserInfo.setPhone(zdry.getSJHM());
-                                metaImpUserInfo.setImpUserType(zdry.getZDRRYLBBJ());
+                                String s = "000000";
+                                if (zdry.getZDRYXL()!=null && !zdry.getZDRYXL().contains(",")){
+                                    String substring = zdry.getZDRYXL().substring(0, 4);
+                                    substring=substring+ s;
+                                    metaImpUserInfo.setImpUserType(substring);
+                                }else if (zdry.getZDRYXL().contains(",")){
+                                    String[] split = zdry.getZDRYXL().split(",");
+                                    String substring = split[0].substring(0, 4);
+                                    String substring1 = split[1].substring(0, 4);
+                                    substring = substring+s+","+substring1+s;
+                                    metaImpUserInfo.setImpUserType(substring);
+                                }
                                 metaImpUserInfo.setImpUserSubType(zdry.getZDRYXL());
                                 metaImpUserInfo.setHouseHoldRegister(zdry.getHJDQH());
                                 metaImpUserInfo.setHouseHoldAddress(zdry.getHJDXZ());
@@ -94,7 +109,9 @@ public class MetaImpUserInfoTask {
                                     metaImpUserInfoService.save(metaImpUserInfo);
                                     logger.info("zdry-" + zdry.getZJHM() + ":插入成功");
                                 } else {
-                                    metaImpUserInfoService.update(metaImpUserInfo,new UpdateWrapper<>(metaImpUserInfo));
+                                    UpdateWrapper<MetaImpUserInfo> metaImpUserInfoUpdateWrapper = new UpdateWrapper<>();
+                                    metaImpUserInfoUpdateWrapper.eq("id_card", zdry.getZJHM());
+                                    metaImpUserInfoService.update(metaImpUserInfo,metaImpUserInfoUpdateWrapper);
                                     logger.info("zdry-" + zdry.getZJHM() + ":更新成功");
                                 }
                             }

src/main/java/com/ssf/mysqloracletest/utils/ConfigParam.java

@@ -26,6 +26,7 @@ public class ConfigParam {
 
     public static String metaImpUserSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("metaImpUserSwitch"));
     public static String metaHandleAlarmSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("metaHandleAlarmSwitch"));
+    public static String metaActualUnitUserInfoSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("metaActualUnitUserInfoSwitch"));
 
     //将数据洗进 --->业务表的开关----------------------------------------------------------------------------------------------------------
     public static String NewNsydwSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("NewNsydwSwitch"));