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

# Conflicts:
#	src/main/java/com/ssf/mysqloracletest/domain/VSySydwmMysql.java
#	src/main/java/com/ssf/mysqloracletest/task/MetaImpUserInfoTask.java
#	src/main/resources/mapper/ZhxfZdrygkRyjbxxViewMysqlMapper.xml

config/application.properties

@@ -7,6 +7,7 @@ syfwSwitch=false
 syrkSwitch=false
 jksbSwitch=false
 
+SwrySwitch=false
 
 cjxxSwitch=false
 zdrySwitch=false
@@ -17,7 +18,7 @@ NewNsydwSwitch=false
 metaImpUserSwitch=false
 NewNalarminfoSwitch=false
 metaHandleAlarmSwitch=false
-metaActualUnitUserInfoSwitch=false
+metaActualUnitUserInfoSwitch=true
 metaActualUserInfoSwitch=true
 actualTimecjxxSwitch=false
 actualTimejjxxSwitch=false

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

@@ -0,0 +1,137 @@
+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 transit_imp_user_record
+ */
+@TableName(value ="transit_imp_user_record")
+@Data
+public class TransitImpUserRecord implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 设备编码
+     */
+    private String deviceCode;
+
+    /**
+     * 经度
+     */
+    private BigDecimal longitude;
+
+    /**
+     * 纬度
+     */
+    private BigDecimal latitude;
+
+    /**
+     * 经过位置
+     */
+    private String deviceAddress;
+
+    /**
+     * 方位
+     */
+    private String orientation;
+
+    /**
+     * 全景图
+     */
+    private String globalPic;
+
+    /**
+     * 人脸图
+     */
+    private String userPic;
+
+    /**
+     * 相似度
+     */
+    private String similarity;
+
+    /**
+     * 姓名
+     */
+    private String ownerName;
+
+    /**
+     * 号码
+     */
+    private String idCard;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+    /**
+     * 过车时间
+     */
+    private Long passTime;
+
+    /**
+     * 过车时间（分区）
+     */
+    private Date partitionField;
+
+    /**
+     * 派出所名称
+     */
+    private String policeStationName;
+
+    /**
+     * 管控依据
+     */
+    private String controlBasis;
+
+    /**
+     * 管控依据备注
+     */
+    private String controlBasisNotes;
+
+    /**
+     * 重点类型名称
+     */
+    private String impUserTypeName;
+
+    /**
+     * 创建时间
+     */
+    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/TransitImpVehicleRecord.java

@@ -0,0 +1,142 @@
+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 transit_imp_vehicle_record
+ */
+@TableName(value ="transit_imp_vehicle_record")
+@Data
+public class TransitImpVehicleRecord implements Serializable {
+    /**
+     * 主键
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 设备编码
+     */
+    private String deviceCode;
+
+    /**
+     * 经度
+     */
+    private BigDecimal longitude;
+
+    /**
+     * 纬度
+     */
+    private BigDecimal latitude;
+
+    /**
+     * 经过位置
+     */
+    private String deviceAddress;
+
+    /**
+     * 方位
+     */
+    private String orientation;
+
+    /**
+     * 车牌号码
+     */
+    private String plateNo;
+
+    /**
+     * 全景图
+     */
+    private String globalPic;
+
+    /**
+     * 车牌图
+     */
+    private String platePic;
+
+    /**
+     * 人像图
+     */
+    private String userPic;
+
+    /**
+     * 车主姓名
+     */
+    private String ownerName;
+
+    /**
+     * 证件号码
+     */
+    private String idCard;
+
+    /**
+     * 联系电话
+     */
+    private String phone;
+
+    /**
+     * 过车时间
+     */
+    private Long passTime;
+
+    /**
+     * 过车时间（分区）
+     */
+    private Date partitionField;
+
+    /**
+     * 派出所名称
+     */
+    private String policeStationName;
+
+    /**
+     * 管控依据
+     */
+    private String controlBasis;
+
+    /**
+     * 管控依据备注
+     */
+    private String controlBasisNotes;
+
+    /**
+     * 重点类型名称
+     */
+    private String impUserTypeName;
+
+    /**
+     * 创建时间
+     */
+    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/VSwryGjxxOracle.java

@@ -0,0 +1,33 @@
+package com.ssf.mysqloracletest.domain;
+
+import lombok.Data;
+
+@Data
+public class VSwryGjxxOracle {
+
+    private String GJXXID;
+    private String GJLX;
+    private String KEY1;
+    private String VALUE1;
+    private String KEY2;
+    private String VALUE2;
+    private String KEY3;
+    private String VALUE3;
+    private String KEY4;
+    private String VALUE4;
+    private String KEY5;
+    private String VALUE5;
+    private String KEY6;
+    private String VALUE6;
+    private String KEY7;
+    private String VALUE7;
+    private String GJSJ;
+    private String RYWKSJ;
+    private String ZDRYSFZH;
+    private String ZDRYXM;
+    private String KEY8;
+    private String VALUE8;
+    private String DWBH;
+    private String JDZB;
+    private String WDZB;
+}

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

@@ -43,5 +43,6 @@ public class VSySydwCyryMysql implements Serializable {
     private String YSBZK_GXSJ;
     @TableField(value = "DWMC")
     private String DWMC;
+    private String status;
 
 }

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

@@ -151,5 +151,7 @@ public class VSySyfwMysql  {
     private String YSBZK_GXSJ;
     @TableField(value = "STATUS")
     private String STATUS;
+
+
 }
 

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

@@ -1,138 +1,143 @@
 package com.ssf.mysqloracletest.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 @Data
+@TableName(value = "v_sy_syfw")
 public class VSySyfwOracle {
-    private String ZJLID;
 
+    @TableField(value = "ZJLID")
+    private String ZJLID;
+    @TableField(value = "YSXTJRZJ")
     private String YSXTJRZJ;
-
+    @TableField(value = "XXSC_PDBZ")
     private String XXSC_PDBZ;
-
+    @TableField(value = "DAH")
     private String DAH;
-
+    @TableField(value = "JCWH")
     private String JCWH;
-
+    @TableField(value = "FWID")
     private String FWID;
-
+    @TableField(value = "FWLX")
     private String FWLX;
-
+    @TableField(value = "FWDZ")
     private String FWDZ;
-
+    @TableField(value = "FWXZ")
     private String FWXZ;
-
+    @TableField(value = "FWLB")
     private String FWLB;
-
+    @TableField(value = "FWJG")
     private String FWJG;
-
+    @TableField(value = "FJS")
     private String FJS;
-
+    @TableField(value = "MJ")
     private String MJ;
-
+    @TableField(value = "CZYT")
     private String CZYT;
-
+    @TableField(value = "DJRQ")
     private String DJRQ;
-    //姓名
+    @TableField(value = "XM")
     private String XM;
-
+    @TableField(value = "SFZH")
     private String SFZH;
-
+    @TableField(value = "XB")
     private String XB;
-
+    @TableField(value = "HJDQX")
     private String HJDQX;
-
+    @TableField(value = "HJDXZ")
     private String HJDXZ;
-
+    @TableField(value = "XZDQX")
     private String XZDQX;
-
+    @TableField(value = "XZDXZ")
     private String XZDXZ;
-
+    @TableField(value = "DWMC")
     private String DWMC;
-
+    @TableField(value = "DWXZ")
     private String DWXZ;
-
+    @TableField(value = "LXDH")
     private String LXDH;
-
+    @TableField(value = "LRRID")
     private String LRRID;
-
+    @TableField(value = "LRR")
     private String LRR;
-
+    @TableField(value = "LRSJ")
     private String LRSJ;
-
+    @TableField(value = "XGRID")
     private String XGRID;
-
+    @TableField(value = "XGRXM")
     private String XGRXM;
-
+    @TableField(value = "XGSJ")
     private String XGSJ;
-
+    @TableField(value = "TBBS")
     private String TBBS;
-
+    @TableField(value = "TBSJ")
     private String TBSJ;
-
+    @TableField(value = "MEMO")
     private String MEMO;
-
+    @TableField(value = "BZ")
     private String BZ;
-
+    @TableField(value = "DQRQ")
     private String DQRQ;
-
+    @TableField(value = "SJFWID")
     private String SJFWID;
-
+    @TableField(value = "DYHCODE")
     private String DYHCODE;
-
+    @TableField(value = "PCSDM")
     private String PCSDM;
-
+    @TableField(value = "JWQID")
     private String JWQID;
-
+    @TableField(value = "SSYS")
     private String SSYS;
-
+    @TableField(value = "SNO")
     private String SNO;
-
+    @TableField(value = "ZXRQ")
     private String ZXRQ;
-
+    @TableField(value = "ZXYY")
     private String ZXYY;
-
+    @TableField(value = "LKBZDZID")
     private String LKBZDZID;
-
+    @TableField(value = "LKBZDZMC")
     private String LKBZDZMC;
-
+    @TableField(value = "FWZT")
     private String FWZT;
-
+    @TableField(value = "CZFWBM")
     private String CZFWBM;
-
+    @TableField(value = "CZFWQM")
     private String CZFWQM;
-
+    @TableField(value = "TBMEMO")
     private String TBMEMO;
-
+    @TableField(value = "SFCZ")
     private String SFCZ;
-
+    @TableField(value = "JZLX")
     private String JZLX;
-
+    @TableField(value = "FWDJ")
     private String FWDJ;
-
+    @TableField(value = "ZDFW")
     private String ZDFW;
-
+    @TableField(value = "ZDRY")
     private String ZDRY;
-
+    @TableField(value = "SFQZ")
     private String SFQZ;
-
+    @TableField(value = "ZJLX")
     private String ZJLX;
-
+    @TableField(value = "ZFLX")
     private String ZFLX;
-
+    @TableField(value = "CWS")
     private String CWS;
-
+    @TableField(value = "CZRZJLX")
     private String CZRZJLX;
-
+    @TableField(value = "CZRZJHM")
     private String CZRZJHM;
-
+    @TableField(value = "CZRXM")
     private String CZRXM;
-
+    @TableField(value = "CZRLXDH")
     private String CZRLXDH;
-
+    @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/ZhxfZdrygkRyjbxxViewMysql.java

@@ -123,4 +123,6 @@ public class ZhxfZdrygkRyjbxxViewMysql implements Serializable {
     @TableField(value = "status")
     private String status;
 
+    private String status;
+
 }

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

@@ -0,0 +1,18 @@
+package com.ssf.mysqloracletest.mapper;
+
+import com.ssf.mysqloracletest.domain.TransitImpUserRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author 28758
+* @description 针对表【transit_imp_user_record(涉稳列管人员人脸抓拍记录表)】的数据库操作Mapper
+* @createDate 2023-12-05 16:27:16
+* @Entity com.ssf.mysqloracletest.domain.TransitImpUserRecord
+*/
+public interface TransitImpUserRecordMapper extends BaseMapper<TransitImpUserRecord> {
+
+}
+
+
+
+

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

@@ -0,0 +1,18 @@
+package com.ssf.mysqloracletest.mapper;
+
+import com.ssf.mysqloracletest.domain.TransitImpVehicleRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author 28758
+* @description 针对表【transit_imp_vehicle_record(重点人车辆记录表)】的数据库操作Mapper
+* @createDate 2023-12-05 16:27:27
+* @Entity com.ssf.mysqloracletest.domain.TransitImpVehicleRecord
+*/
+public interface TransitImpVehicleRecordMapper extends BaseMapper<TransitImpVehicleRecord> {
+
+}
+
+
+
+

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

@@ -0,0 +1,29 @@
+package com.ssf.mysqloracletest.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ssf.mysqloracletest.domain.JcjJjxxViewOracle;
+import com.ssf.mysqloracletest.domain.VSwryGjxxOracle;
+import com.ssf.mysqloracletest.domain.VSySydwCyryOracle;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author 28758
+* @description 针对表【v_sy_sydw_cyry】的数据库操作Mapper
+* @createDate 2023-11-29 20:30:59
+* @Entity com.ssf.mysqloracletest.domain.VSySydwCyry
+*/
+@Mapper
+public interface VSwryGjxxOracleMapper extends BaseMapper<VSwryGjxxOracle> {
+    public int countSwry();
+
+    public List<VSwryGjxxOracle> getSwryList(Map map);
+
+    public List<VSwryGjxxOracle> getRealTimeRecording(String maxTime);
+}
+
+
+
+

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

@@ -18,6 +18,8 @@ public interface VSySydwMysqlMapper extends BaseMapper<VSySydwmMysql> {
     public int insertVSySydw(VSySydwmMysql bean);
 
     public int updateVSySydwById(VSySydwmMysql bean);
+
+    public int  countSydw();
 }
 
 

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

@@ -0,0 +1,13 @@
+package com.ssf.mysqloracletest.service;
+
+import com.ssf.mysqloracletest.domain.TransitImpUserRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author 28758
+* @description 针对表【transit_imp_user_record(涉稳列管人员人脸抓拍记录表)】的数据库操作Service
+* @createDate 2023-12-05 16:27:16
+*/
+public interface TransitImpUserRecordService extends IService<TransitImpUserRecord> {
+
+}

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

@@ -0,0 +1,13 @@
+package com.ssf.mysqloracletest.service;
+
+import com.ssf.mysqloracletest.domain.TransitImpVehicleRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author 28758
+* @description 针对表【transit_imp_vehicle_record(重点人车辆记录表)】的数据库操作Service
+* @createDate 2023-12-05 16:27:27
+*/
+public interface TransitImpVehicleRecordService extends IService<TransitImpVehicleRecord> {
+
+}

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

@@ -0,0 +1,21 @@
+package com.ssf.mysqloracletest.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ssf.mysqloracletest.domain.JcjJjxxViewOracle;
+import com.ssf.mysqloracletest.domain.VSwryGjxxOracle;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author 28758
+* @description 针对表【v_sy_sydw_Swry】的数据库操作Service
+* @createDate 2023-11-29 20:30:59
+*/
+public interface VSySwryGjxxOracleService extends IService<VSwryGjxxOracle> {
+    public int countSwry();
+
+    public List<VSwryGjxxOracle> getSwryList(Map map);
+
+    public List<VSwryGjxxOracle> getRealTimeRecording(String maxTime);
+}

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

@@ -12,7 +12,7 @@ import com.ssf.mysqloracletest.domain.ZhxfZdrygkRyjbxxViewMysql;
 public interface VSySydwCyryMysqlService extends IService<VSySydwCyryMysql> {
     public VSySydwCyryMysql selectCyryById(String id);
 
-    public int insertCyry(VSySydwCyryMysql syrk);
+    public int insertCyry(VSySydwCyryMysql cyry);
 
-    public int updateCyryById(VSySydwCyryMysql syrk);
+    public int updateCyryById(VSySydwCyryMysql cyry);
 }

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

@@ -16,4 +16,5 @@ public interface VSySydwMysqlService extends IService<VSySydwmMysql> {
     public int insertVSySydw(VSySydwmMysql sydw);
 
     public int updateVSySydwById(VSySydwmMysql sydw);
+    public int countSydw();
 }

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

@@ -0,0 +1,22 @@
+package com.ssf.mysqloracletest.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ssf.mysqloracletest.domain.TransitImpUserRecord;
+import com.ssf.mysqloracletest.service.TransitImpUserRecordService;
+import com.ssf.mysqloracletest.mapper.TransitImpUserRecordMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author 28758
+* @description 针对表【transit_imp_user_record(涉稳列管人员人脸抓拍记录表)】的数据库操作Service实现
+* @createDate 2023-12-05 16:27:16
+*/
+@Service
+public class TransitImpUserRecordServiceImpl extends ServiceImpl<TransitImpUserRecordMapper, TransitImpUserRecord>
+    implements TransitImpUserRecordService{
+
+}
+
+
+
+

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

@@ -0,0 +1,22 @@
+package com.ssf.mysqloracletest.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ssf.mysqloracletest.domain.TransitImpVehicleRecord;
+import com.ssf.mysqloracletest.service.TransitImpVehicleRecordService;
+import com.ssf.mysqloracletest.mapper.TransitImpVehicleRecordMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author 28758
+* @description 针对表【transit_imp_vehicle_record(重点人车辆记录表)】的数据库操作Service实现
+* @createDate 2023-12-05 16:27:27
+*/
+@Service
+public class TransitImpVehicleRecordServiceImpl extends ServiceImpl<TransitImpVehicleRecordMapper, TransitImpVehicleRecord>
+    implements TransitImpVehicleRecordService{
+
+}
+
+
+
+

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

@@ -0,0 +1,46 @@
+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.JcjCjxxViewOracle;
+import com.ssf.mysqloracletest.domain.VSwryGjxxOracle;
+import com.ssf.mysqloracletest.mapper.VSwryGjxxOracleMapper;
+import com.ssf.mysqloracletest.service.VSySwryGjxxOracleService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author 28758
+* @description 针对表【swry】的数据库操作Service实现
+* @createDate 2023-11-29 20:30:59
+*/
+@Service
+@DS("oracleSydz")
+public class VSwryGjxxOracleServiceImpl extends ServiceImpl<VSwryGjxxOracleMapper, VSwryGjxxOracle>
+    implements VSySwryGjxxOracleService {
+
+    @Resource
+    private VSwryGjxxOracleMapper oracleMapper;
+
+    @Override
+    public int countSwry() {
+        return oracleMapper.countSwry();
+    }
+
+    @Override
+    public List<VSwryGjxxOracle> getSwryList(Map map) {
+        return oracleMapper.getSwryList(map);
+    }
+
+    @Override
+    public List<VSwryGjxxOracle> getRealTimeRecording(String time) {
+        return oracleMapper.getRealTimeRecording(time);
+    }
+}
+
+
+
+

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

@@ -41,6 +41,11 @@ public class VSySydwMysqlServiceImpl extends ServiceImpl<VSySydwMysqlMapper, VSy
     public int updateVSySydwById(VSySydwmMysql sydw) {
         return vSySydwMysqlMapper.updateVSySydwById(sydw);
     }
+
+    @Override
+    public int countSydw() {
+        return vSySydwMysqlMapper.countSydw();
+    }
 }
 
 

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

@@ -171,14 +171,14 @@ public class JcjCjxxTask {
                 JcjCjxxViewMysql sBean = new JcjCjxxViewMysql();
                 BeanUtils.copyProperties(cjxx, sBean);
                 //确定一个数据是否唯一
-                JcjCjxxViewMysql checkcjxx = cjxxMysqlService.selectCjxxById(cjxx.getCJBH());
+                JcjCjxxViewMysql checkcjxx = cjxxMysqlService.selectCjxxById(cjxx.getJJBH());
 
                 if (checkcjxx == null) {
                     cjxxMysqlService.insertCjxx(sBean);
-                    logger.info("cjxx-" + cjxx.getCJBH() + ":插入成功");
+                    logger.info("cjxx-" + cjxx.getJJBH() + ":插入成功");
                 } else {
                     cjxxMysqlService.updateCjxxById(sBean);
-                    logger.info("cjxx-" + cjxx.getCJBH() + ":更新成功");
+                    logger.info("cjxx-" + cjxx.getJJBH() + ":更新成功");
                 }
 
             }

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

@@ -77,7 +77,7 @@ public class MetaHandleAlarmTask {
                             List<JcjCjxxViewMysql> list = jcjCjxxViewMysqlService.lambdaQuery().list();
                             for (JcjCjxxViewMysql cjxx : list) {
                                 MetaHandleAlarmInfo metaHandleAlarmInfo = new MetaHandleAlarmInfo();
-                                metaHandleAlarmInfo.setAlarmCode(cjxx.getCJBH());
+                                metaHandleAlarmInfo.setAlarmCode(cjxx.getJJBH());
                                 metaHandleAlarmInfo.setHandleAlarmUnit(cjxx.getCJDWMC());
                                 metaHandleAlarmInfo.setHandleAlarmTime(cjxx.getCJSJ());
                                 metaHandleAlarmInfo.setHandleAlarmContent(cjxx.getCLJGNR());
@@ -86,15 +86,15 @@ public class MetaHandleAlarmTask {
                                 metaHandleAlarmInfo.setHandleAlarmUserCode(cjxx.getCJR());
                                 metaHandleAlarmInfo.setHandleAlarmResult(cjxx.getCJJGMC());
                                 //确定一个数据是否唯一
-                                MetaHandleAlarmInfo one = metaHandleAlarmInfoService.lambdaQuery().eq(MetaHandleAlarmInfo::getAlarmCode, cjxx.getCJBH()).one();
+                                MetaHandleAlarmInfo one = metaHandleAlarmInfoService.lambdaQuery().eq(MetaHandleAlarmInfo::getAlarmCode, cjxx.getJJBH()).one();
                                 if (one == null) {
                                     metaHandleAlarmInfoService.save(metaHandleAlarmInfo);
-                                    logger.info("cjxx-" + cjxx.getCJBH() + ":插入成功");
+                                    logger.info("cjxx-" + cjxx.getJJBH() + ":插入成功");
                                 } else {
                                     UpdateWrapper<MetaHandleAlarmInfo> metaHandleAlarmInfoUpdateWrapper = new UpdateWrapper<>();
-                                    metaHandleAlarmInfoUpdateWrapper.eq("alarm_code", cjxx.getCJBH());
+                                    metaHandleAlarmInfoUpdateWrapper.eq("alarm_code", cjxx.getJJBH());
                                     metaHandleAlarmInfoService.update(metaHandleAlarmInfo,metaHandleAlarmInfoUpdateWrapper);
-                                    logger.info("cjxx-" + cjxx.getCJBH() + ":更新成功");
+                                    logger.info("cjxx-" + cjxx.getJJBH() + ":更新成功");
                                 }
                             }
                         } catch (Exception e) {

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

@@ -7,17 +7,15 @@ import com.ssf.mysqloracletest.domain.VSySyfwMysql;
 import com.ssf.mysqloracletest.service.MetaRentalHousingInfoService;
 import com.ssf.mysqloracletest.service.VSySyfwMysqlService;
 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;
@@ -25,133 +23,175 @@ import java.util.concurrent.Executors;
 @Component
 public class RentalHousingTask {
     private static final Logger logger = LoggerFactory.getLogger(RentalHousingTask.class);
-
     @Resource
     private VSySyfwMysqlService syfwMysqlService;
-
     @Resource
     private MetaRentalHousingInfoService rentalHousingInfoService;
 
-    final int oncesCounts = NumKit.checkInt(ConfigParam.oncesCounts) == 0 ? 10000 : NumKit.checkInt(ConfigParam.oncesCounts);
-
-    private boolean rentalhouseTag = false;
 
     @Scheduled(initialDelay = 100, fixedDelay = 3000)
     public void transRentalHouse() {
-        if (rentalhouseTag) {
-            return;
-        }
 
         if (!"true".equals(ConfigParam.RentalHouseSwitch)) {
             return;
         }
 
         try {
-            int countRentalHouse = syfwMysqlService.countSyfw();
-            logger.info("countRentalHouse:" + countRentalHouse);
+            QueryWrapper<VSySyfwMysql> queryWrapper = new QueryWrapper<>();
+            queryWrapper.isNull("STATUS");
+            Page<VSySyfwMysql> page = new Page<>(1, 1000);
+            List<VSySyfwMysql> resultList = syfwMysqlService.page(page, queryWrapper).getRecords();
 
-            if (countRentalHouse > 0) {
-                rentalhouseTag = true;
+            CountDownLatch latch = new CountDownLatch(resultList.size());
+            ExecutorService SyfwPool = Executors.newFixedThreadPool(5);
 
-                int count = countRentalHouse / oncesCounts;
-                CountDownLatch latch = new CountDownLatch(count);
-                ExecutorService RentalHousePool = Executors.newFixedThreadPool(5);
+            for (VSySyfwMysql bean: resultList) {
+                SyfwPool.submit(() -> {
+                   cleanSyfw(bean);
+                   logger.info("清洗完成");
+                   latch.countDown();
+                });
+            }
 
-                for (int i = 0; i <= count; i++) {
-                    Map HouseMap = new HashMap();
-                    HouseMap.put("rowStart", i * oncesCounts);
-                    HouseMap.put("rowEnd", (i + 1) * oncesCounts);
-                    RentalHousePool.submit(() -> {
             try {
-                            //List<VSySyfwMysql> RentalHouses = syfwMysqlService.lambdaQuery().isNull(VSySyfwMysql::getSTATUS).list();
-                            // 创建分页参数
-                            Page<VSySyfwMysql> page = new Page<>(1, 1000);
-                            // 构建查询条件
-                            QueryWrapper<VSySyfwMysql> queryWrapper = new QueryWrapper<>();
-                            queryWrapper.isNull("STATUS");
-                            // 进行分页查询
-                            syfwMysqlService.page(page, queryWrapper);
-                            // 获取分页查询结果
-                            List<VSySyfwMysql> rentalHouses = page.getRecords();
-                            if (rentalHouses == null) {
-                                return;
+                //Wait for all threads to complete
+                latch.await();
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+            //关闭线程池
+            SyfwPool.shutdown();
+        } catch (Exception e) {
+            logger.info(StringKit.getTrace(e));
         }
-                            for (VSySyfwMysql House : rentalHouses) {
+    }
+
+    private void cleanSyfw(VSySyfwMysql bean) {
+        VSySyfwMysql syfwMysqlCp = new VSySyfwMysql();
+        try {
+            BeanUtils.copyProperties(bean, syfwMysqlCp);
             MetaRentalHousingInfo metaRentalHousingInfo = new MetaRentalHousingInfo();
             //rental_housing_address出租房屋地址<-----FWDZ房屋地址
-                                metaRentalHousingInfo.setRentalHousingAddress(House.getFWDZ());
+            metaRentalHousingInfo.setRentalHousingAddress(syfwMysqlCp.getFWDZ());
             //homeowner房主<-----XM
-                                metaRentalHousingInfo.setHomeowner(House.getXM());
+            metaRentalHousingInfo.setHomeowner(syfwMysqlCp.getXM());
             //homeowner_id_card房主身份证<-----SFZH
-                                metaRentalHousingInfo.setHomeownerIdCard(House.getSFZH());
+            metaRentalHousingInfo.setHomeownerIdCard(syfwMysqlCp.getSFZH());
             //homeowner_house_hold_register房主户籍地区县<-----HJDQX户籍辖区
-                                metaRentalHousingInfo.setHomeownerHouseHoldRegister(House.getHJDQX());
+            metaRentalHousingInfo.setHomeownerHouseHoldRegister(syfwMysqlCp.getHJDQX());
             //homeowner_house_hold_address户籍地址详情<-----HJDXZ户籍地详址
-                                metaRentalHousingInfo.setHomeownerHouseHoldAddress(House.getHJDXZ());
+            metaRentalHousingInfo.setHomeownerHouseHoldAddress(syfwMysqlCp.getHJDXZ());
             //homeowner_habitation_register房主现居住地区县<-----XZDQX现住地辖区
-                                metaRentalHousingInfo.setHomeownerHabitationRegister(House.getXZDQX());
+            metaRentalHousingInfo.setHomeownerHabitationRegister(syfwMysqlCp.getXZDQX());
             //homeowner_habitation_address房主现居住地<-----XZDXZ现住地详址
-                                metaRentalHousingInfo.setHomeownerHabitationAddress(House.getXZDXZ());
+            metaRentalHousingInfo.setHomeownerHabitationAddress(syfwMysqlCp.getXZDXZ());
             //homeowner_phone房主联系方式<-----LXDH联系电话
-                                metaRentalHousingInfo.setHomeownerPhone(House.getLXDH());
+            metaRentalHousingInfo.setHomeownerPhone(syfwMysqlCp.getLXDH());
             //state_flag表示状态:0有效，1无效<-----BZ
-                                metaRentalHousingInfo.setStateFlag(Integer.parseInt(House.getBZ()));
+            metaRentalHousingInfo.setStateFlag(Integer.parseInt(syfwMysqlCp.getBZ()));
             //rental_housing_end_date出租房到期时间<-----DQRQ
-                                metaRentalHousingInfo.setRentalHousingEndDate(House.getDQRQ());
+            metaRentalHousingInfo.setRentalHousingEndDate(syfwMysqlCp.getDQRQ());
             //police_station_code派出所代码<-----PCSDM
-                                metaRentalHousingInfo.setPoliceStationCode(House.getPCSDM());
+            metaRentalHousingInfo.setPoliceStationCode(syfwMysqlCp.getPCSDM());
             //police_district_code警务区编码<-----JWQID
-                                metaRentalHousingInfo.setPoliceDistrictCode(House.getJWQID());
+            metaRentalHousingInfo.setPoliceDistrictCode(syfwMysqlCp.getJWQID());
             //floating_population_standard_address_id流动人口标准地址id<-----LKBZDZID
-                                metaRentalHousingInfo.setFloatingPopulationStandardAddressId(House.getLKBZDZID());
+            metaRentalHousingInfo.setFloatingPopulationStandardAddressId(syfwMysqlCp.getLKBZDZID());
             //floating_population_standard_address流动人口标准地址<-----LKBZDZMC
-                                metaRentalHousingInfo.setFloatingPopulationStandardAddress(House.getLKBZDZMC());
+            metaRentalHousingInfo.setFloatingPopulationStandardAddress(syfwMysqlCp.getLKBZDZMC());
             //rental_housing_status出租房状态<-----FWZT
-                                metaRentalHousingInfo.setRentalHousingStatus(Integer.parseInt(House.getFWZT()));
+            metaRentalHousingInfo.setRentalHousingStatus(Integer.parseInt(syfwMysqlCp.getFWZT()));
             //is_rental_housing是否出租<-----SFCZ（Y,N）
-                                metaRentalHousingInfo.setIsRentalHousing(Integer.parseInt(House.getSFCZ()));
+            try {
+                if ("Y".equals(syfwMysqlCp.getSFCZ())) {
+                    metaRentalHousingInfo.setIsRentalHousing(1);
+                } else if ("N".equals(syfwMysqlCp.getSFCZ())) {
+                    metaRentalHousingInfo.setIsRentalHousing(0);
+                } else {
+                    // 处理其他情况，如果有的话
+                    metaRentalHousingInfo.setIsRentalHousing(null);
+                }
+            } catch (NumberFormatException e) {
+                // 处理转换异常
+                System.err.println("无法将字符串转换为整数：" + e.getMessage());
+            }
+
             //residential_type居住类型<-----JZLX
-                                metaRentalHousingInfo.setResidentialType(Integer.parseInt(House.getJZLX()));
+            if (syfwMysqlCp.getJZLX() != null) {
+                metaRentalHousingInfo.setResidentialType(Integer.parseInt(syfwMysqlCp.getJZLX()));
+            } else {
+                metaRentalHousingInfo.setResidentialType(null);
+            }
             //rental_housing_grade房屋等级<-----FWDJ
-                                metaRentalHousingInfo.setRentalHousingGrade(Integer.parseInt(House.getFWDJ()));
+            if (syfwMysqlCp.getFWDJ() != null) {
+                metaRentalHousingInfo.setRentalHousingGrade(Integer.parseInt(syfwMysqlCp.getFWDJ()));
+            } else {
+                metaRentalHousingInfo.setRentalHousingGrade(null);
+            }
+
             //imp_rental_housing重点房屋<-----ZDFW
-                                metaRentalHousingInfo.setImpRentalHousing(Integer.parseInt(House.getZDFW()));
+            if (syfwMysqlCp.getZDFW() != null) {
+                if (syfwMysqlCp.getZDFW().equals("21")) {
+                    metaRentalHousingInfo.setImpRentalHousing(21);
+                } else if (syfwMysqlCp.getZDFW().equals("22")) {
+                    metaRentalHousingInfo.setImpRentalHousing(22);
+                }
+            } else {
+                metaRentalHousingInfo.setImpRentalHousing(null);
+            }
             //imp_user_rental_housing重点人员<-----ZDRY
-                                metaRentalHousingInfo.setImpUserRentalHousing(Integer.parseInt(House.getZDRY()));
+            if (syfwMysqlCp.getZDRY() != null) {
+                if (syfwMysqlCp.getZDRY().equals("27")) {
+                    metaRentalHousingInfo.setImpUserRentalHousing(27);
+                } else if (syfwMysqlCp.getZDRY().equals("35")) {
+                    metaRentalHousingInfo.setImpUserRentalHousing(35);
+                }
+            } else {
+                metaRentalHousingInfo.setImpUserRentalHousing(null);
+            }
+
             //is_group_rental_housing是否群租房<-----SFQZ
-                                metaRentalHousingInfo.setIsGroupRentalHousing(Integer.parseInt(House.getSFQZ()));
+            try {
+                if ("Y".equals(syfwMysqlCp.getSFQZ())) {
+                    metaRentalHousingInfo.setIsGroupRentalHousing(1);
+                } else if ("N".equals(syfwMysqlCp.getSFQZ())) {
+                    metaRentalHousingInfo.setIsGroupRentalHousing(0);
+                } else {
+                    metaRentalHousingInfo.setIsGroupRentalHousing(null);
+                }
+            } catch (NumberFormatException e) {
+                // 处理转换异常
+                System.err.println("无法将字符串转换为整数：" + e.getMessage());
+            }
+
             //rental_housing_type住房类型<-----ZFLX
-                                metaRentalHousingInfo.setRentalHousingType(Integer.parseInt(House.getZFLX()));
+            if (syfwMysqlCp.getZFLX() != null) {
+                metaRentalHousingInfo.setRentalHousingType(Integer.parseInt(syfwMysqlCp.getZFLX()));
+            } else {
+                metaRentalHousingInfo.setRentalHousingType(null);
+            }
             //renting_house_user_name租房人姓名<----- CZRXM
-                                metaRentalHousingInfo.setRentingHouseUserName(House.getCZRXM());
+            metaRentalHousingInfo.setRentingHouseUserName(syfwMysqlCp.getCZRXM());
             //renting_house_user_phone租房人联系方式<-----CZRLXDH
-                                metaRentalHousingInfo.setRentingHouseUserPhone(House.getCZRLXDH());
+            metaRentalHousingInfo.setRentingHouseUserPhone(syfwMysqlCp.getCZRLXDH());
             //renting_house_user_id_card租房人证件号码<-----CZRZJHM
-                                metaRentalHousingInfo.setRentingHouseUserIdCard(House.getCZRZJHM());
-                                //将STATUS设成1
-                                House.setSTATUS("1");
-                                logger.info("插入成功");
-                            }
-                        } catch (Exception e) {
-                            logger.info("rentalHouses"+ StringKit.getTrace(e));
-                        }
-                        latch.countDown();
-                    });
-                    logger.info("rentalhouseTag数据总理:" + countRentalHouse + "," + "当前处理下标:" + HouseMap.get("rowStart") + "/" + HouseMap.get("rowEnd"));
-                }
+            metaRentalHousingInfo.setRentingHouseUserIdCard(syfwMysqlCp.getCZRZJHM());
+            boolean b = rentalHousingInfoService.save(metaRentalHousingInfo);
 
-                try {
-                    //Wait for all threads to complete
-                    latch.await();
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-                //关闭线程池
-                RentalHousePool.shutdown();
+            if (b) {
+                syfwMysqlCp.setSTATUS("1");
+                syfwMysqlService.updateVSySyfwById(syfwMysqlCp);
+                logger.info("状态修改为：1");
             }
         } catch (Exception e) {
             logger.info(StringKit.getTrace(e));
+            syfwMysqlCp.setSTATUS("2");
+            syfwMysqlService.updateVSySyfwById(syfwMysqlCp);
+            logger.info("状态修改为：2");
         }
     }
+
 }
 
+
+

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

@@ -0,0 +1,181 @@
+package com.ssf.mysqloracletest.task;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.ssf.mysqloracletest.domain.TransitImpUserRecord;
+import com.ssf.mysqloracletest.domain.TransitImpVehicleRecord;
+import com.ssf.mysqloracletest.domain.VSwryGjxxOracle;
+import com.ssf.mysqloracletest.service.TransitImpUserRecordService;
+import com.ssf.mysqloracletest.service.TransitImpVehicleRecordService;
+import com.ssf.mysqloracletest.service.VSySwryGjxxOracleService;
+import com.ssf.mysqloracletest.utils.ConfigParam;
+import com.ssf.mysqloracletest.utils.NumKit;
+import com.ssf.mysqloracletest.utils.StringKit;
+
+import lombok.RequiredArgsConstructor;
+import oracle.sql.TRANSDUMP;
+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.text.SimpleDateFormat;
+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
+@RequiredArgsConstructor
+public class VSwryGjxxTask {
+
+    private static final Logger logger = LoggerFactory.getLogger(VSwryGjxxTask.class);
+
+
+    String pattern = "yyyyMMddHHmmss";
+
+    SimpleDateFormat dateFormat = new SimpleDateFormat(pattern);
+
+
+
+    private final VSySwryGjxxOracleService vSySwryGjxxOracleService;
+
+    private final TransitImpUserRecordService transitImpUserRecordService;
+
+    private final TransitImpVehicleRecordService transitImpVehicleRecordService;
+
+    final int oncesCounts = NumKit.checkInt(ConfigParam.oncesCounts) == 0 ? 1000 : NumKit.checkInt(ConfigParam.oncesCounts);
+
+    private boolean SwryTag = false;
+
+    /**
+     * 连云港 对接海康平台获取人员基础数据
+     * //
+     */
+    @Scheduled(initialDelay = 100, fixedDelay = 3000)
+    public void transSwry() {
+
+        if (SwryTag) {
+            return;
+        }
+
+        if (!"true".equals(ConfigParam.SwrySwitch)) {
+            return;
+        }
+
+
+        try {
+            int countSwry = vSySwryGjxxOracleService.countSwry();
+            logger.info("countSwry:" + countSwry);
+
+            logger.info("countSwry:" + countSwry);
+            if (countSwry > 0) {
+
+                SwryTag = true;
+
+                int count = countSwry / oncesCounts;
+                CountDownLatch latch = new CountDownLatch(count);
+                ExecutorService SwryPool = Executors.newFixedThreadPool(50);
+
+                for (int i = 0; i <= count; i++) {
+                    Map SwryMap = new HashMap();
+                    SwryMap.put("rowStart", i * oncesCounts);
+                    SwryMap.put("rowEnd", (i + 1) * oncesCounts);
+                    SwryPool.submit(() -> {
+                        try {
+                            List<VSwryGjxxOracle> Swrys = vSySwryGjxxOracleService.getSwryList(SwryMap);
+                            for (VSwryGjxxOracle swry : Swrys) {
+                                if ("02".equals(swry.getGJLX())){
+                                    TransitImpVehicleRecord transitImpVehicleRecord = new TransitImpVehicleRecord();
+                                    transitImpVehicleRecord.setDeviceCode(swry.getVALUE3());
+                                    transitImpVehicleRecord.setLongitude(NumKit.checkBigDecimal(swry.getJDZB()));
+                                    transitImpVehicleRecord.setLatitude(NumKit.checkBigDecimal(swry.getWDZB()));
+                                    transitImpVehicleRecord.setDeviceAddress(swry.getVALUE1());
+                                    transitImpVehicleRecord.setPlateNo(swry.getVALUE2());
+                                    transitImpVehicleRecord.setGlobalPic(swry.getVALUE5());
+                                    transitImpVehicleRecord.setUserPic(swry.getVALUE4());
+                                    transitImpVehicleRecord.setOwnerName(swry.getZDRYXM());
+                                    transitImpVehicleRecord.setIdCard(swry.getZDRYSFZH());
+                                    transitImpVehicleRecord.setPassTime(NumKit.checkLong(swry.getRYWKSJ()));
+                                    transitImpVehicleRecord.setPartitionField(dateFormat.parse(swry.getRYWKSJ()));
+                                    TransitImpVehicleRecord one = transitImpVehicleRecordService.lambdaQuery().eq(TransitImpVehicleRecord::getGlobalPic, swry.getVALUE5()).one();
+                                    if (one==null){
+                                        boolean save = transitImpVehicleRecordService.save(transitImpVehicleRecord);
+                                        if (save) {
+                                            logger.info("Swry-" + swry.getGJXXID() + ":插入成功");
+                                        }
+                                    }else {
+                                        UpdateWrapper<TransitImpVehicleRecord> transitImpVehicleRecordUpdateWrapper = new UpdateWrapper<>();
+                                        transitImpVehicleRecordUpdateWrapper.eq("global_pic",swry.getVALUE5());
+                                        boolean update = transitImpVehicleRecordService.update(transitImpVehicleRecord, transitImpVehicleRecordUpdateWrapper);
+                                        if (update) {
+                                            logger.info("Swry-" + swry.getGJXXID() + ":更新成功");
+                                        }
+                                    }
+
+                                }
+                                if ("03".equals(swry.getGJSJ())){
+                                    TransitImpUserRecord transitImpUserRecord = new TransitImpUserRecord();
+                                    transitImpUserRecord.setDeviceCode(swry.getVALUE6());
+                                    transitImpUserRecord.setLongitude(NumKit.checkBigDecimal(swry.getJDZB()));
+                                    transitImpUserRecord.setLatitude(NumKit.checkBigDecimal(swry.getWDZB()));
+                                    transitImpUserRecord.setDeviceAddress(swry.getVALUE1());
+                                    transitImpUserRecord.setGlobalPic(swry.getVALUE4());
+                                    transitImpUserRecord.setUserPic(swry.getVALUE3());
+                                    transitImpUserRecord.setSimilarity(swry.getVALUE2());
+                                    transitImpUserRecord.setOwnerName(swry.getZDRYXM());
+                                    transitImpUserRecord.setIdCard(swry.getZDRYSFZH());
+                                    transitImpUserRecord.setPassTime(NumKit.checkLong(swry.getRYWKSJ()));
+                                    transitImpUserRecord.setPartitionField(dateFormat.parse(swry.getRYWKSJ()));
+                                    TransitImpUserRecord one = transitImpUserRecordService.lambdaQuery().eq(TransitImpUserRecord::getGlobalPic,swry.getVALUE4()).one();
+                                    if (one==null) {
+                                        boolean save = transitImpUserRecordService.save(transitImpUserRecord);
+                                        if (save) {
+                                            logger.info("Swry-" + swry.getGJXXID() + ":插入成功");
+                                        }
+                                    }else {
+                                        UpdateWrapper<TransitImpUserRecord> transitImpUserRecordUpdateWrapper = new UpdateWrapper<>();
+                                        transitImpUserRecordUpdateWrapper.eq("global_pic",swry.getVALUE4());
+                                        boolean update = transitImpUserRecordService.update(transitImpUserRecord, transitImpUserRecordUpdateWrapper);
+                                        if (update) {
+                                            logger.info("Swry-" + swry.getGJXXID() + ":更新成功");
+                                        }
+                                    }
+
+                                }
+
+                            }
+                        } catch (Exception e) {
+                            logger.info("Swrys:" + StringKit.getTrace(e));
+                        }
+                        latch.countDown();
+                    });
+                    logger.info("SwryMap数据总量:" + countSwry + "," + "当前处理下标:" + SwryMap.get("rowStart") + "/" + SwryMap.get("rowEnd"));
+                }
+
+                try {
+                    // Wait for all threads to complete
+                    latch.await();
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+                // 关闭线程池
+                SwryPool.shutdown();
+            }
+
+        } catch (Exception e) {
+            logger.info(StringKit.getTrace(e));
+        }
+    }
+
+
+
+
+}

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

@@ -14,6 +14,7 @@ public class ConfigParam {
 
     public static String syfwSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("syfwSwitch"));
     public static String syrkSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("syrkSwitch"));
+    public static String SwrySwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("SwrySwitch"));
 
     public static String jksbSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("jksbSwitch"));
     public static String cjxxSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("cjxxSwitch"));
@@ -36,8 +37,8 @@ public class ConfigParam {
     //CJ实时数据开关
     public static String actualTimecjxxSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("actualTimecjxxSwitch"));
     public static String actualTimejjxxSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("actualTimejjxxSwitch"));
-//rentalHouse数据清洗开关
-public static String RentalHouseSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("RentalHouseSwitch"));
+    //rentalHouse数据清洗开关
+    public static String RentalHouseSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("RentalHouseSwitch"));
 
     public static String metaRealEstateInfoSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("metaRealEstateInfoSwitch"));
 

src/main/resources/mapper/VSwryGjxxOracleMapper.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ssf.mysqloracletest.mapper.VSwryGjxxOracleMapper">
+
+    <select id="countSwry" resultType="int">
+        select count(*)
+        from SYX_JWSZPT.V_SWRY_GJXX
+    </select>
+
+    <resultMap id="BaseResultMap" type="com.ssf.mysqloracletest.domain.VSwryGjxxOracle">
+            <result property="GJXXID" column="GJXXID" jdbcType="VARCHAR"/>
+            <result property="GJLX" column="GJLX" jdbcType="VARCHAR"/>
+            <result property="KEY1" column="KEY1" jdbcType="VARCHAR"/>
+            <result property="VALUE1" column="VALUE1" jdbcType="VARCHAR"/>
+            <result property="KEY2" column="KEY2" jdbcType="VARCHAR"/>
+            <result property="VALUE2" column="VALUE2" jdbcType="VARCHAR"/>
+            <result property="KEY3" column="KEY3" jdbcType="VARCHAR"/>
+            <result property="VALUE3" column="VALUE3" jdbcType="VARCHAR"/>
+            <result property="KEY4" column="KEY4" jdbcType="VARCHAR"/>
+            <result property="VALUE4" column="VALUE4" jdbcType="VARCHAR"/>
+            <result property="KEY5" column="KEY5" jdbcType="VARCHAR"/>
+            <result property="VALUE5" column="VALUE5" jdbcType="VARCHAR"/>
+            <result property="KEY6" column="KEY6" jdbcType="VARCHAR"/>
+            <result property="VALUE6" column="VALUE6" jdbcType="VARCHAR"/>
+            <result property="KEY7" column="KEY7" jdbcType="VARCHAR"/>
+            <result property="VALUE7" column="VALUE7" jdbcType="VARCHAR"/>
+            <result property="GJSJ" column="GJSJ" jdbcType="VARCHAR"/>
+            <result property="RYWKSJ" column="RYWKSJ" jdbcType="VARCHAR"/>
+            <result property="ZDRYSFZH" column="ZDRYSFZH" jdbcType="VARCHAR"/>
+            <result property="ZDRYXM" column="ZDRYXM" jdbcType="VARCHAR"/>
+            <result property="KEY8" column="KEY8" jdbcType="VARCHAR"/>
+            <result property="VALUE8" column="VALUE8" jdbcType="VARCHAR"/>
+            <result property="DWBH" column="DWBH" jdbcType="VARCHAR"/>
+            <result property="JDZB" column="JDZB" jdbcType="VARCHAR"/>
+            <result property="WDZB" column="WDZB" jdbcType="VARCHAR"/>
+
+
+    </resultMap>
+
+    <select id="getSwryList" parameterType="java.util.Map" resultMap="BaseResultMap">
+        SELECT t2.*
+        FROM (SELECT ROWNUM rn, t1.* FROM (SELECT * FROM SYX_JWSZPT.V_SWRY_GJXX) t1 WHERE ROWNUM<![CDATA[ <= ]]> ${rowEnd}) t2
+        WHERE t2.rn <![CDATA[ >= ]]> ${rowStart}
+    </select>
+
+    <select id="getRealTimeRecording" parameterType="java.util.Map" resultMap="BaseResultMap">
+        SELECT * FROM SYX_JWSZPT.V_SWRY_GJXX where GJSJ >#{maxTime}
+    </select>
+
+</mapper>

src/main/resources/mapper/VSySydwCyryMysqlMapper.xml

@@ -19,9 +19,11 @@
         <result property="YSBZK_RKSJ" column="YSBZK_RKSJ" jdbcType="VARCHAR"/>
         <result property="YSBZK_GXSJ" column="YSBZK_GXSJ" jdbcType="VARCHAR"/>
         <result property="DWMC" column="DWMC" jdbcType="VARCHAR"/>
+        <result property="status" column="status" jdbcType="VARCHAR"/>
     </resultMap>
 
 
+
     <select id="selectVSyCyryById" parameterType="java.lang.String" resultMap="BaseResultMap">
         select *
         from v_sy_sydw_cyry
@@ -47,6 +49,7 @@
             <if test="YSBZK_RKSJ != null   and YSBZK_RKSJ != '' ">YSBZK_RKSJ,</if>
             <if test="YSBZK_GXSJ != null   and YSBZK_GXSJ != '' ">YSBZK_GXSJ,</if>
             <if test="DWMC       != null   and DWMC       != '' ">DWMC ,</if>
+            <if test="status       != null   and status       != '' ">status ,</if>
 
 
         </trim>
@@ -65,6 +68,7 @@
             <if test="YSBZK_RKSJ != null   and YSBZK_RKSJ != '' ">#{YSBZK_RKSJ},</if>
             <if test="YSBZK_GXSJ != null   and YSBZK_GXSJ != '' ">#{YSBZK_GXSJ},</if>
             <if test="DWMC       != null   and DWMC       != '' ">#{DWMC      },</if>
+            <if test="status       != null   and status       != '' ">#{status},</if>
 
         </trim>
     </insert>
@@ -86,6 +90,7 @@
             <if test="YSBZK_RKSJ != null   and YSBZK_RKSJ != '' ">YSBZK_RKSJ=#{YSBZK_RKSJ},</if>
             <if test="YSBZK_GXSJ != null   and YSBZK_GXSJ != '' ">YSBZK_GXSJ=#{YSBZK_GXSJ},</if>
             <if test="DWMC       != null   and DWMC       != '' ">DWMC =#{DWMC      },</if>
+            <if test="status       != null   and status       != '' ">status =#{status},</if>
 
         </trim>
         where ID = #{ID}

src/main/resources/mapper/VSySydwMysqlMapper.xml

@@ -28,6 +28,7 @@
         <result property="CDC_JYM" column="CDC_JYM" jdbcType="VARCHAR"/>
         <result property="YSBZK_RKSJ" column="YSBZK_RKSJ" jdbcType="VARCHAR"/>
         <result property="YSBZK_GXSJ" column="YSBZK_GXSJ" jdbcType="VARCHAR"/>
+        <result property="STATUS" column="STATUS" jdbcType="VARCHAR"/>
     </resultMap>
 
     <select id="selectVSySydwByZJLID" parameterType="java.lang.String" resultMap="BaseResultMap">
@@ -41,29 +42,31 @@
             keyProperty="id">
         insert into v_sy_sydw
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test=" ZJLID      != null   and  ZJLID      != '' "> ZJLID     ,</if>
-            <if test=" YSXTJRZJ   != null   and  YSXTJRZJ   != '' "> YSXTJRZJ  ,</if>
-            <if test=" XXSC_PDBZ  != null   and  XXSC_PDBZ  != '' "> XXSC_PDBZ ,</if>
-            <if test=" ID         != null   and  ID         != '' "> ID        ,</if>
-            <if test=" DWMC       != null   and  DWMC       != '' "> DWMC      ,</if>
-            <if test=" DZ         != null   and  DZ         != '' "> DZ        ,</if>
-            <if test=" LXDH       != null   and  LXDH       != '' "> LXDH      ,</if>
-            <if test=" FJBM       != null   and  FJBM       != '' "> FJBM      ,</if>
-            <if test=" FJMC       != null   and  FJMC       != '' "> FJMC      ,</if>
-            <if test=" PCSBM      != null   and  PCSBM      != '' "> PCSBM     ,</if>
-            <if test=" PCSMC      != null   and  PCSMC      != '' "> PCSMC     ,</if>
-            <if test=" JWQBM      != null   and  JWQBM      != '' "> JWQBM     ,</if>
-            <if test=" JWQMC      != null   and  JWQMC      != '' "> JWQMC     ,</if>
-            <if test=" SZQY       != null   and  SZQY       != '' "> SZQY      ,</if>
-            <if test=" DWZT       != null   and  DWZT       != '' "> DWZT      ,</if>
-            <if test=" X          != null   and  X          != '' "> X         ,</if>
-            <if test=" Y          != null   and  Y          != '' "> Y         ,</if>
-            <if test=" DWLXMC     != null   and  DWLXMC     != '' "> DWLXMC    ,</if>
-            <if test=" FRZJHM     != null   and  FRZJHM     != '' "> FRZJHM    ,</if>
-            <if test=" FRXM       != null   and  FRXM       != '' "> FRXM      ,</if>
-            <if test=" CDC_JYM    != null   and  CDC_JYM    != '' "> CDC_JYM   ,</if>
-            <if test=" YSBZK_RKSJ != null   and  YSBZK_RKSJ != '' "> YSBZK_RKSJ,</if>
-            <if test=" YSBZK_GXSJ != null   and  YSBZK_GXSJ != '' "> YSBZK_GXSJ,</if>
+            <if test=" ZJLID      != null   and  ZJLID      != '' ">ZJLID ,</if>
+            <if test=" YSXTJRZJ   != null   and  YSXTJRZJ   != '' ">YSXTJRZJ ,</if>
+            <if test=" XXSC_PDBZ  != null   and  XXSC_PDBZ  != '' ">XXSC_PDBZ ,</if>
+            <if test=" ID         != null   and  ID         != '' ">ID ,</if>
+            <if test=" DWMC       != null   and  DWMC       != '' ">DWMC ,</if>
+            <if test=" DZ         != null   and  DZ         != '' ">DZ ,</if>
+            <if test=" LXDH       != null   and  LXDH       != '' ">LXDH ,</if>
+            <if test=" FJBM       != null   and  FJBM       != '' ">FJBM ,</if>
+            <if test=" FJMC       != null   and  FJMC       != '' ">FJMC ,</if>
+            <if test=" PCSBM      != null   and  PCSBM      != '' ">PCSBM ,</if>
+            <if test=" PCSMC      != null   and  PCSMC      != '' ">PCSMC ,</if>
+            <if test=" JWQBM      != null   and  JWQBM      != '' ">JWQBM ,</if>
+            <if test=" JWQMC      != null   and  JWQMC      != '' ">JWQMC ,</if>
+            <if test=" SZQY       != null   and  SZQY       != '' ">SZQY ,</if>
+            <if test=" DWZT       != null   and  DWZT       != '' ">DWZT ,</if>
+            <if test=" X          != null   and  X          != '' ">X ,</if>
+            <if test=" Y          != null   and  Y          != '' ">Y ,</if>
+            <if test=" DWLXMC     != null   and  DWLXMC     != '' ">DWLXMC ,</if>
+            <if test=" FRZJHM     != null   and  FRZJHM     != '' ">FRZJHM ,</if>
+            <if test=" FRXM       != null   and  FRXM       != '' ">FRXM ,</if>
+            <if test=" CDC_JYM    != null   and  CDC_JYM    != '' ">CDC_JYM ,</if>
+            <if test=" YSBZK_RKSJ != null   and  YSBZK_RKSJ != '' ">YSBZK_RKSJ,</if>
+            <if test=" YSBZK_GXSJ != null   and  YSBZK_GXSJ != '' ">YSBZK_GXSJ,</if>
+            <if test=" STATUS != null   and  STATUS != '' ">STATUS,</if>
+
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="ZJLID      != null   and ZJLID      != '' ">#{ZJLID     },</if>
@@ -89,6 +92,7 @@
             <if test="CDC_JYM    != null   and CDC_JYM    != '' ">#{CDC_JYM   },</if>
             <if test="YSBZK_RKSJ != null   and YSBZK_RKSJ != '' ">#{YSBZK_RKSJ},</if>
             <if test="YSBZK_GXSJ != null   and YSBZK_GXSJ != '' ">#{YSBZK_GXSJ},</if>
+            <if test="STATUS != null   and STATUS != '' ">#{STATUS},</if>
         </trim>
     </insert>
 
@@ -118,8 +122,13 @@
             <if test="CDC_JYM    != null   and CDC_JYM    != '' ">CDC_JYM = #{CDC_JYM   },</if>
             <if test="YSBZK_RKSJ != null   and YSBZK_RKSJ != '' ">YSBZK_RKSJ = #{YSBZK_RKSJ},</if>
             <if test="YSBZK_GXSJ != null   and YSBZK_GXSJ != '' ">YSBZK_GXSJ = #{YSBZK_GXSJ},</if>
+            <if test="STATUS != null   and STATUS != '' ">STATUS = #{STATUS},</if>
         </trim>
         where ZJLID = #{ZJLID}
     </update>
 
+    <select id="countSydw" resultType="int">
+        select count(*)
+        from v_sy_sydw limit 1
+    </select>
 </mapper>

src/main/resources/mapper/VSySyfwMysqlMapper.xml

@@ -223,7 +223,8 @@
             <if test="CDC_JYM != null   and CDC_JYM != '' ">#{CDC_JYM},</if>
             <if test="YSBZK_RKSJ != null   and YSBZK_RKSJ != '' ">#{YSBZK_RKSJ},</if>
             <if test="YSBZK_GXSJ != null   and YSBZK_GXSJ != '' ">#{YSBZK_GXSJ},</if>
-c        </trim>
+            <if test="STATUS != null   and STATUS != '' ">#{STATUS},</if>
+        </trim>
     </insert>
 
     <update id="updateVSySyfwById" parameterType="com.ssf.mysqloracletest.domain.VSySyfwMysql">
@@ -297,14 +298,13 @@ c        </trim>
             <if test="YSBZK_RKSJ != null   and YSBZK_RKSJ != '' ">YSBZK_RKSJ=#{YSBZK_RKSJ},</if>
             <if test="YSBZK_GXSJ != null   and YSBZK_GXSJ != '' ">YSBZK_GXSJ=#{YSBZK_GXSJ},</if>
             <if test="STATUS != null   and STATUS != '' ">STATUS=#{STATUS},</if>
-
         </trim>
         where ZJLID = #{ZJLID}
     </update>
 
     <select id="countSyfw" resultType="int">
         select count(*)
-        from V_SY_SYFW
+        from V_SY_SYFW limit 1
     </select>
 
 </mapper>