From 854d5da8045159663cf51a84df243451ff0a6ee8 Mon Sep 17 00:00:00 2001 From: fengchunyu Date: Tue, 5 Dec 2023 15:16:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E6=9C=89=E4=BA=BA=E5=91=98=E6=B8=85?= =?UTF-8?q?=E6=B4=97=E5=88=B0=E4=B8=9A=E5=8A=A1=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/application.properties | 4 +- .../mysqloracletest/domain/VSySyrkMysql.java | 48 ++- .../domain/VillageActualUserInfo.java | 239 ++++++++++++ .../mapper/JcjJxxViewMysqlMapper.java | 1 - .../mapper/MetaActualUnitUserInfoMapper.java | 2 + .../mapper/MetaActualUserInfoMapper.java | 2 + .../mapper/MetaAlarmInfoMapper.java | 2 + .../mapper/MetaHandleAlarmInfoMapper.java | 2 + .../mapper/MetaImpUserInfoMapper.java | 2 + .../mapper/VJwtSyfwMapper.java | 2 + .../mapper/VillageActualUserInfoMapper.java | 60 +++ .../service/VillageActualUserInfoService.java | 52 +++ .../impl/MetaActualUnitInfoServiceImpl.java | 2 + .../MetaActualUnitUserInfoServiceImpl.java | 2 + .../impl/MetaActualUserInfoServiceImpl.java | 2 + .../impl/MetaAlarmInfoServiceImpl.java | 2 + .../impl/MetaHandleAlarmInfoServiceImpl.java | 2 + .../impl/MetaImpUserInfoServiceImpl.java | 2 + .../impl/MetaRealEstateInfoServiceImpl.java | 2 + .../MetaRentalHousingInfoServiceImpl.java | 1 + .../service/impl/VJwtSyfwServiceImpl.java | 9 +- .../VillageActualUserInfoServiceImpl.java | 158 ++++++++ .../task/MetaActualUnitUserInfoTask.java | 100 ++--- .../task/MetaActualUserInfoTask.java | 177 ++++----- .../task/MetaHandleAlarmTask.java | 2 +- .../task/MetaImpUserInfoTask.java | 111 +++--- .../task/MetaRealEstateInfoTask.java | 10 +- .../task/RentalHousingTask.java | 2 +- src/main/resources/application.yml | 2 +- .../resources/mapper/VSySyrkMysqlMapper.xml | 4 + .../mapper/VillageActualUserInfoMapper.xml | 342 ++++++++++++++++++ 31 files changed, 1118 insertions(+), 230 deletions(-) create mode 100644 src/main/java/com/ssf/mysqloracletest/domain/VillageActualUserInfo.java create mode 100644 src/main/java/com/ssf/mysqloracletest/mapper/VillageActualUserInfoMapper.java create mode 100644 src/main/java/com/ssf/mysqloracletest/service/VillageActualUserInfoService.java create mode 100644 src/main/java/com/ssf/mysqloracletest/service/impl/VillageActualUserInfoServiceImpl.java create mode 100644 src/main/resources/mapper/VillageActualUserInfoMapper.xml diff --git a/config/application.properties b/config/application.properties index f83ed4f..be9743e 100644 --- a/config/application.properties +++ b/config/application.properties @@ -18,11 +18,11 @@ metaImpUserSwitch=false NewNalarminfoSwitch=false metaHandleAlarmSwitch=false metaActualUnitUserInfoSwitch=false -metaActualUserInfoSwitch=false +metaActualUserInfoSwitch=true actualTimecjxxSwitch=false actualTimejjxxSwitch=false RentalHouseSwitch=false -metaRealEstateInfoSwitch=true +metaRealEstateInfoSwitch=false diff --git a/src/main/java/com/ssf/mysqloracletest/domain/VSySyrkMysql.java b/src/main/java/com/ssf/mysqloracletest/domain/VSySyrkMysql.java index 4c80a99..47ddf44 100644 --- a/src/main/java/com/ssf/mysqloracletest/domain/VSySyrkMysql.java +++ b/src/main/java/com/ssf/mysqloracletest/domain/VSySyrkMysql.java @@ -1,60 +1,104 @@ package com.ssf.mysqloracletest.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import java.io.Serializable; /** - * * @TableName v_sy_syrk */ @Data +@TableName(value = "v_sy_syrk") public class VSySyrkMysql implements Serializable { /** - * + * */ + @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 = "RYFJID") private String RYFJID; + @TableField(value = "RYID") private String RYID; + @TableField(value = "SFZH") private String SFZH; + @TableField(value = "XM") private String XM; + @TableField(value = "XB") private String XB; + @TableField(value = "MZ") private String MZ; + @TableField(value = "HYZK") private String HYZK; + @TableField(value = "WHCD") private String WHCD; + @TableField(value = "CSRQ") private String CSRQ; + @TableField(value = "SJHM") private String SJHM; + @TableField(value = "LXDH") private String LXDH; + @TableField(value = "HJSSXQ") private String HJSSXQ; + @TableField(value = "HJDXZ") private String HJDXZ; + @TableField(value = "XJZDXZ") private String XJZDXZ; + @TableField(value = "RYLX") private String RYLX; + @TableField(value = "PCSDM") private String PCSDM; + @TableField(value = "PCSMC") private String PCSMC; + @TableField(value = "CJWHDM") private String CJWHDM; + @TableField(value = "CJWHMC") private String CJWHMC; + @TableField(value = "JWQDM") private String JWQDM; + @TableField(value = "JWQMC") private String JWQMC; + @TableField(value = "WGDM") private String WGDM; + @TableField(value = "WGMC") private String WGMC; + @TableField(value = "JZWID") private String JZWID; + @TableField(value = "FJID") private String FJID; + @TableField(value = "FJDM") private String FJDM; + @TableField(value = "XQID") private String XQID; + @TableField(value = "STS") private String STS; + @TableField(value = "CR_ID") private String CR_ID; + @TableField(value = "CR_MC") private String CR_MC; + @TableField(value = "CR_DT") private String CR_DT; + @TableField(value = "CH_ID") private String CH_ID; + @TableField(value = "CH_MC") private String CH_MC; + @TableField(value = "CH_DT") private String CH_DT; + @TableField(value = "CDC_JYM") private String CDC_JYM; + @TableField(value = "YSBZK_RKSJ") private String YSBZK_RKSJ; + @TableField(value = "YSBZK_GXSJ") private String YSBZK_GXSJ; + @TableField(value = "status") + private String status; } \ No newline at end of file diff --git a/src/main/java/com/ssf/mysqloracletest/domain/VillageActualUserInfo.java b/src/main/java/com/ssf/mysqloracletest/domain/VillageActualUserInfo.java new file mode 100644 index 0000000..d9047d4 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/domain/VillageActualUserInfo.java @@ -0,0 +1,239 @@ +package com.ssf.mysqloracletest.domain; + +import lombok.Data; + +/** + * TODO + * + * @author dinosuar + * @version 1.0 + * @String 2021/2/24 15:04 + **/ +@Data +public class VillageActualUserInfo { + + + /** + * 主键 + */ + private Long id; + + /** + * 公安部-记录唯一标识 + */ + // @Excel(name = "公安部-记录唯一标识") + private String gaRecordId; + + /** + * 建筑物ID + */ + // @Excel(name = "建筑物ID") + private String buildingId; + + /** + * 人员房屋ID + */ + // @Excel(name = "人员房屋ID") + private String userHomeId; + + /** + * 源数据实有人口ID + */ + // @Excel(name = "源数据实有人口ID") + private String actualUserId; + + /** + * 记录唯一ID + */ + // @Excel(name = "记录唯一ID") + private String recordId; + + /** + * 网格代码 + */ + // @Excel(name = "网格代码") + private String gridCode; + + /** + * 网格名称 + */ + // @Excel(name = "网格名称") + private String gridName; + + /** + * 房屋ID + */ + // @Excel(name = "房屋ID") + private String homeId; + + /** + * 房屋代码 + */ + // @Excel(name = "房屋代码") + private String homeCode; + + /** + * 警务区编码 + */ + // @Excel(name = "警务区编码") + private String policeDistrictCode; + + /** + * 警务区名称 + */ + // @Excel(name = "警务区名称") + private String policeDistrict; + + /** + * 派出所名称 + */ + // @Excel(name = "派出所名称") + private String policeStationName; + + /** + * 派出所代码 + */ + // @Excel(name = "派出所代码") + private String policeStationCode; + + /** + * 人员类别 + */ + // @Excel(name = "人员类别") + private String personCategory; + + /** + * 姓名 + */ + // @Excel(name = "姓名") + private String userName; + + /** + * 证件号码 + */ + // @Excel(name = "证件号码") + private String idcard; + + /** + * 手机号码 + */ + // @Excel(name = "手机号码") + private String phone; + + /** + * 联系电话 + */ + // @Excel(name = "联系电话") + private String landline; + + /** + * 性别 + */ + // @Excel(name = "性别") + private String sex; + + /** + * 民族 + */ + // @Excel(name = "民族") + private String nation; + + /** + * 婚姻状况 + */ + // @Excel(name = "婚姻状况") + private String marriage; + + /** + * 学历 + */ + // @Excel(name = "学历") + private String education; + + /** + * 出生日期 + */ + // @JsonFormat(pattern = "yyyy-MM-dd") + // @Excel(name = "出生日期", width = 30, StringFormat = "yyyy-MM-dd") + private String birthday; + + /** + * 户籍 + */ + // @Excel(name = "户籍") + private String houseHoldRegister; + + /** + * 户籍地址 + */ + // @Excel(name = "户籍地址") + private String houseHoldAddress; + + /** + * 实际居住地 + */ + // @Excel(name = "实际居住地") + private String habitation; + + /** + * 社区/村编码 + */ + // @Excel(name = "社区/村编码") + private String blockCode; + + /** + * 社区/村名称 + */ + // @Excel(name = "社区/村名称") + private String blockName; + + /** + * 数据有效状态 + */ + // @Excel(name = "数据有效状态") + private String dateStatus; + + /** + * 0:不活跃,1:活跃 + */ + // @Excel(name = "0:不活跃,1:活跃") + private String isactive; + + /** + * 扩展字段c1 + */ + // @Excel(name = "扩展字段c1") + private String c1; + private String c1New; + + /** + * 扩展字段c2 + */ + // @Excel(name = "扩展字段c2") + private String c2; + + /** + * 扩展字段c3 + */ + // @Excel(name = "扩展字段c3") + private String c3; + + /** + * 扩展字段c4 + */ + // @Excel(name = "扩展字段c4") + private String c4; + + /** + * 扩展字段c5 + */ + // @Excel(name = "扩展字段c5") + private String c5; + private String createtimeV; + private String updatetimeV; + private String picStatus; + private String userPic; + + + +} diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/JcjJxxViewMysqlMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/JcjJxxViewMysqlMapper.java index 6b031a2..5337d69 100644 --- a/src/main/java/com/ssf/mysqloracletest/mapper/JcjJxxViewMysqlMapper.java +++ b/src/main/java/com/ssf/mysqloracletest/mapper/JcjJxxViewMysqlMapper.java @@ -5,7 +5,6 @@ import com.ssf.mysqloracletest.domain.JcjJjxxViewMysql; import org.apache.ibatis.annotations.Mapper; @Mapper - public interface JcjJxxViewMysqlMapper extends BaseMapper { public JcjJjxxViewMysql selectJcjJxxByJJBH(String JJBH); diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/MetaActualUnitUserInfoMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/MetaActualUnitUserInfoMapper.java index b19e241..5d67d6a 100644 --- a/src/main/java/com/ssf/mysqloracletest/mapper/MetaActualUnitUserInfoMapper.java +++ b/src/main/java/com/ssf/mysqloracletest/mapper/MetaActualUnitUserInfoMapper.java @@ -2,6 +2,7 @@ package com.ssf.mysqloracletest.mapper; import com.ssf.mysqloracletest.domain.MetaActualUnitUserInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; /** * @author 28758 @@ -9,6 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @createDate 2023-12-02 10:31:32 * @Entity com.ssf.mysqloracletest.domain.MetaActualUnitUserInfo */ +@Mapper public interface MetaActualUnitUserInfoMapper extends BaseMapper { } diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/MetaActualUserInfoMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/MetaActualUserInfoMapper.java index 19f1725..ef05e4e 100644 --- a/src/main/java/com/ssf/mysqloracletest/mapper/MetaActualUserInfoMapper.java +++ b/src/main/java/com/ssf/mysqloracletest/mapper/MetaActualUserInfoMapper.java @@ -2,6 +2,7 @@ package com.ssf.mysqloracletest.mapper; import com.ssf.mysqloracletest.domain.MetaActualUserInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; /** * @author 28758 @@ -9,6 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @createDate 2023-12-02 17:31:50 * @Entity com.ssf.mysqloracletest.domain.MetaActualUserInfo */ +@Mapper public interface MetaActualUserInfoMapper extends BaseMapper { } diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/MetaAlarmInfoMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/MetaAlarmInfoMapper.java index 9cca00b..d6a6387 100644 --- a/src/main/java/com/ssf/mysqloracletest/mapper/MetaAlarmInfoMapper.java +++ b/src/main/java/com/ssf/mysqloracletest/mapper/MetaAlarmInfoMapper.java @@ -2,6 +2,7 @@ package com.ssf.mysqloracletest.mapper; import com.ssf.mysqloracletest.domain.MetaAlarmInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; /** * @author 10503 @@ -9,6 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @createDate 2023-12-01 14:48:34 * @Entity com.ssf.mysqloracletest.domain.MetaAlarmInfo */ +@Mapper public interface MetaAlarmInfoMapper extends BaseMapper { } diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/MetaHandleAlarmInfoMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/MetaHandleAlarmInfoMapper.java index 18522da..d35213d 100644 --- a/src/main/java/com/ssf/mysqloracletest/mapper/MetaHandleAlarmInfoMapper.java +++ b/src/main/java/com/ssf/mysqloracletest/mapper/MetaHandleAlarmInfoMapper.java @@ -2,6 +2,7 @@ package com.ssf.mysqloracletest.mapper; import com.ssf.mysqloracletest.domain.MetaHandleAlarmInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; /** * @author 28758 @@ -9,6 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @createDate 2023-12-01 19:02:18 * @Entity com.ssf.mysqloracletest.domain.MetaHandleAlarmInfo */ +@Mapper public interface MetaHandleAlarmInfoMapper extends BaseMapper { } diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/MetaImpUserInfoMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/MetaImpUserInfoMapper.java index 93421a3..ded08cf 100644 --- a/src/main/java/com/ssf/mysqloracletest/mapper/MetaImpUserInfoMapper.java +++ b/src/main/java/com/ssf/mysqloracletest/mapper/MetaImpUserInfoMapper.java @@ -2,6 +2,7 @@ package com.ssf.mysqloracletest.mapper; import com.ssf.mysqloracletest.domain.MetaImpUserInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Mapper; /** * @author 28758 @@ -9,6 +10,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @createDate 2023-12-01 16:43:42 * @Entity com.ssf.mysqloracletest.domain.MetaImpUserInfo */ +@Mapper public interface MetaImpUserInfoMapper extends BaseMapper { } diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/VJwtSyfwMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/VJwtSyfwMapper.java index ad77513..4860367 100644 --- a/src/main/java/com/ssf/mysqloracletest/mapper/VJwtSyfwMapper.java +++ b/src/main/java/com/ssf/mysqloracletest/mapper/VJwtSyfwMapper.java @@ -2,6 +2,7 @@ package com.ssf.mysqloracletest.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ssf.mysqloracletest.domain.VJwtSyfw; +import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -11,6 +12,7 @@ import java.util.List; * @author ruoyi * @date 2023-12-04 */ +@Mapper public interface VJwtSyfwMapper extends BaseMapper { /** * 查询【请填写功能名称】 diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/VillageActualUserInfoMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/VillageActualUserInfoMapper.java new file mode 100644 index 0000000..6dfb27f --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/mapper/VillageActualUserInfoMapper.java @@ -0,0 +1,60 @@ +package com.ssf.mysqloracletest.mapper; + +import com.ssf.mysqloracletest.domain.VillageActualUserInfo; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 文章内容 + * + * @author chglee + * @email 1992lcg@163.com + * @date 2017-10-03 16:17:48 + */ +@Mapper +public interface VillageActualUserInfoMapper { + + /** + * + */ + public VillageActualUserInfo selectVillageActualUserInfoById(Long id); + + public VillageActualUserInfo selectVillageActualUserInfoByIdcard(String idcard); + + /** + * + */ + public List selectVillageActualUserInfoList(VillageActualUserInfo bean); + + public List selectVillageActualUserInfoListAndPicExists(VillageActualUserInfo bean); + + /** + * + */ + public int insertVillageActualUserInfo(VillageActualUserInfo bean); + + /** + * + */ + public int updateVillageActualUserInfo(VillageActualUserInfo bean); + + public int updateVillageActualUserInfoByIdcard(VillageActualUserInfo bean); + + /** + * + */ + public int deleteVillageActualUserInfoById(Long id); + + public int deleteVillageActualUserInfoByUpdatetime(VillageActualUserInfo bean); + + /** + * 批量删除形体抓拍记录 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteVillageActualUserInfoByIds(Long[] ids); + + +} diff --git a/src/main/java/com/ssf/mysqloracletest/service/VillageActualUserInfoService.java b/src/main/java/com/ssf/mysqloracletest/service/VillageActualUserInfoService.java new file mode 100644 index 0000000..cb0a8c3 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/service/VillageActualUserInfoService.java @@ -0,0 +1,52 @@ +package com.ssf.mysqloracletest.service; + +import com.ssf.mysqloracletest.domain.VillageActualUserInfo; + +import java.util.List; + +/** + * 文章内容 + * + * @author chglee + * @email 1992lcg@163.com + * @date 2017-09-09 10:03:34 + */ +public interface VillageActualUserInfoService { + + /** + * + */ + public VillageActualUserInfo selectVillageActualUserInfoById(Long id); + + /** + * + */ + public List selectVillageActualUserInfoList(VillageActualUserInfo villageActualUserInfo); + + public List selectVillageActualUserInfoListAndPicExists(VillageActualUserInfo villageActualUserInfo); + + + /** + * + */ + public int insertVillageActualUserInfo(VillageActualUserInfo villageActualUserInfo); + + /** + * + */ + public int updateVillageActualUserInfo(VillageActualUserInfo villageActualUserInfo); + + /** + * + */ + public int deleteVillageActualUserInfoByIds(Long[] ids); + + /** + * + */ + public int deleteVillageActualUserInfoById(Long id); + + public int deleteVillageActualUserInfoByUpdatetime(VillageActualUserInfo bean); + + +} diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/MetaActualUnitInfoServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/MetaActualUnitInfoServiceImpl.java index e7a4cfb..da7dc85 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/impl/MetaActualUnitInfoServiceImpl.java +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/MetaActualUnitInfoServiceImpl.java @@ -1,5 +1,6 @@ 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.MetaActualUnitInfo; import com.ssf.mysqloracletest.mapper.MetaActualUnitInfoMapper; @@ -15,6 +16,7 @@ import org.springframework.stereotype.Service; */ @Service @RequiredArgsConstructor +@DS("mysql") public class MetaActualUnitInfoServiceImpl extends ServiceImpl implements MetaActualUnitInfoService { } diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/MetaActualUnitUserInfoServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/MetaActualUnitUserInfoServiceImpl.java index c17bdef..563421f 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/impl/MetaActualUnitUserInfoServiceImpl.java +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/MetaActualUnitUserInfoServiceImpl.java @@ -1,5 +1,6 @@ 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.MetaActualUnitUserInfo; import com.ssf.mysqloracletest.service.MetaActualUnitUserInfoService; @@ -12,6 +13,7 @@ import org.springframework.stereotype.Service; * @createDate 2023-12-02 10:31:32 */ @Service +@DS("mysql") public class MetaActualUnitUserInfoServiceImpl extends ServiceImpl implements MetaActualUnitUserInfoService{ diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/MetaActualUserInfoServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/MetaActualUserInfoServiceImpl.java index 6fa48ad..1ce3f76 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/impl/MetaActualUserInfoServiceImpl.java +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/MetaActualUserInfoServiceImpl.java @@ -1,5 +1,6 @@ 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.MetaActualUserInfo; import com.ssf.mysqloracletest.service.MetaActualUserInfoService; @@ -12,6 +13,7 @@ import org.springframework.stereotype.Service; * @createDate 2023-12-02 17:31:50 */ @Service +@DS("mysql") public class MetaActualUserInfoServiceImpl extends ServiceImpl implements MetaActualUserInfoService{ diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/MetaAlarmInfoServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/MetaAlarmInfoServiceImpl.java index dfee80d..20dfca5 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/impl/MetaAlarmInfoServiceImpl.java +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/MetaAlarmInfoServiceImpl.java @@ -1,5 +1,6 @@ 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.MetaAlarmInfo; import com.ssf.mysqloracletest.service.MetaAlarmInfoService; @@ -14,6 +15,7 @@ import org.springframework.stereotype.Service; */ @Service @RequiredArgsConstructor +@DS("mysql") public class MetaAlarmInfoServiceImpl extends ServiceImpl implements MetaAlarmInfoService{ } diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/MetaHandleAlarmInfoServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/MetaHandleAlarmInfoServiceImpl.java index 1ed979b..27e5fec 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/impl/MetaHandleAlarmInfoServiceImpl.java +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/MetaHandleAlarmInfoServiceImpl.java @@ -1,5 +1,6 @@ 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.MetaHandleAlarmInfo; import com.ssf.mysqloracletest.service.MetaHandleAlarmInfoService; @@ -12,6 +13,7 @@ import org.springframework.stereotype.Service; * @createDate 2023-12-01 19:02:18 */ @Service +@DS("mysql") public class MetaHandleAlarmInfoServiceImpl extends ServiceImpl implements MetaHandleAlarmInfoService{ diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/MetaImpUserInfoServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/MetaImpUserInfoServiceImpl.java index c3c2c29..a75204d 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/impl/MetaImpUserInfoServiceImpl.java +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/MetaImpUserInfoServiceImpl.java @@ -1,5 +1,6 @@ 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.MetaImpUserInfo; import com.ssf.mysqloracletest.service.MetaImpUserInfoService; @@ -12,6 +13,7 @@ import org.springframework.stereotype.Service; * @createDate 2023-12-01 16:43:42 */ @Service +@DS("mysql") public class MetaImpUserInfoServiceImpl extends ServiceImpl implements MetaImpUserInfoService{ diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/MetaRealEstateInfoServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/MetaRealEstateInfoServiceImpl.java index 084198d..0176857 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/impl/MetaRealEstateInfoServiceImpl.java +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/MetaRealEstateInfoServiceImpl.java @@ -1,6 +1,7 @@ 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.MetaRealEstateInfo; import com.ssf.mysqloracletest.mapper.MetaRealEstateInfoMapper; @@ -14,6 +15,7 @@ import org.springframework.stereotype.Service; * @since 2023-12-05 09:24:09 */ @Service +@DS("mysql") public class MetaRealEstateInfoServiceImpl extends ServiceImpl implements MetaRealEstateInfoService { @Override diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/MetaRentalHousingInfoServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/MetaRentalHousingInfoServiceImpl.java index 0e9cc5b..497fe2c 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/impl/MetaRentalHousingInfoServiceImpl.java +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/MetaRentalHousingInfoServiceImpl.java @@ -13,6 +13,7 @@ import org.springframework.stereotype.Service; * @createDate 2023-12-04 10:11:22 */ @Service +@DS("mysql") public class MetaRentalHousingInfoServiceImpl extends ServiceImpl implements MetaRentalHousingInfoService{ diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/VJwtSyfwServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/VJwtSyfwServiceImpl.java index edb8f21..c568dca 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/impl/VJwtSyfwServiceImpl.java +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/VJwtSyfwServiceImpl.java @@ -1,12 +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.VJwtSyfw; import com.ssf.mysqloracletest.mapper.VJwtSyfwMapper; import com.ssf.mysqloracletest.service.JwtSyfwService; -import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.List; /** @@ -16,12 +17,12 @@ import java.util.List; * @date 2023-12-04 */ @Service -@RequiredArgsConstructor +@DS("mysql") public class VJwtSyfwServiceImpl extends ServiceImpl implements JwtSyfwService { - - private final VJwtSyfwMapper vJwtSyfwMapper; + @Resource + private VJwtSyfwMapper vJwtSyfwMapper; /** diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/VillageActualUserInfoServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/VillageActualUserInfoServiceImpl.java new file mode 100644 index 0000000..b6d6bcb --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/VillageActualUserInfoServiceImpl.java @@ -0,0 +1,158 @@ +package com.ssf.mysqloracletest.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.ssf.mysqloracletest.domain.VillageActualUserInfo; +import com.ssf.mysqloracletest.mapper.VillageActualUserInfoMapper; +import com.ssf.mysqloracletest.service.VillageActualUserInfoService; +import com.ssf.mysqloracletest.utils.ConfigParam; +import com.ssf.mysqloracletest.utils.StringKit; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.io.File; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.List; + + +/** + * 形体抓拍记录Service业务层处理 + * + * @author ruoyi + * @date 2023-04-17 + */ +@Service +@DS("mysqlSy") +public class VillageActualUserInfoServiceImpl implements VillageActualUserInfoService { + + private static final Logger logger = LoggerFactory.getLogger(VillageActualUserInfoServiceImpl.class); + + @Resource + private VillageActualUserInfoMapper ActualUserInfoDao; + + /** + * + */ + @Override + public VillageActualUserInfo selectVillageActualUserInfoById(Long id) { + VillageActualUserInfo v = ActualUserInfoDao.selectVillageActualUserInfoById(id); + return v; + } + + /** + * + */ + public VillageActualUserInfo selectVillageActualUserInfoByIdcard(String idcard) { + VillageActualUserInfo v = ActualUserInfoDao.selectVillageActualUserInfoByIdcard(idcard); + return v; + } + + /** + * + */ + @Override + public List selectVillageActualUserInfoList(VillageActualUserInfo villageActualUserInfo) { + List list = ActualUserInfoDao.selectVillageActualUserInfoList(villageActualUserInfo); + return list; + } + + /** + * + */ + @Override + public List selectVillageActualUserInfoListAndPicExists(VillageActualUserInfo villageActualUserInfo) { + List list = ActualUserInfoDao.selectVillageActualUserInfoListAndPicExists(villageActualUserInfo); + return list; + } + + /** + * + */ + @Override + public int insertVillageActualUserInfo(VillageActualUserInfo villageActualUserInfo) { + return ActualUserInfoDao.insertVillageActualUserInfo(villageActualUserInfo); + } + + public int saveOrUpdate(VillageActualUserInfo villageActualUserInfo) { + try { + String idcard = StringKit.toString(villageActualUserInfo.getIdcard()); + VillageActualUserInfo bean = selectVillageActualUserInfoByIdcard(idcard); + int res = 0; + if (bean == null) { + villageActualUserInfo.setC1("1"); + res = ActualUserInfoDao.insertVillageActualUserInfo(villageActualUserInfo); + } else { + VillageActualUserInfo beanUp = new VillageActualUserInfo(); + BeanUtils.copyProperties(villageActualUserInfo, beanUp); + updateVillageActualUserInfoByIdcard(beanUp); + } + return res; + } catch (Exception e) { + logger.info(StringKit.getTrace(e)); + return 0; + } + } + + /** + * + */ + @Override + public int updateVillageActualUserInfo(VillageActualUserInfo villageActualUserInfo) { + return ActualUserInfoDao.updateVillageActualUserInfo(villageActualUserInfo); + } + + public int updateVillageActualUserInfoByIdcard(VillageActualUserInfo bean) { + VillageActualUserInfo beanCheck = selectVillageActualUserInfoByIdcard(bean.getIdcard()); + + String versionCheck = StringKit.toString(beanCheck.getC1()); + String c1 = "".equals(StringKit.toString(bean.getC1())) ? "1" : bean.getC1(); + int version = Integer.valueOf(c1); + bean.setC1(StringKit.toString(version)); + bean.setC1New(StringKit.toString(version + 1)); + if ("".equals(versionCheck) || c1.equals(versionCheck)) { + return ActualUserInfoDao.updateVillageActualUserInfoByIdcard(bean); + } + return 0; + } + + /** + * + */ + @Override + public int deleteVillageActualUserInfoByIds(Long[] ids) { + return ActualUserInfoDao.deleteVillageActualUserInfoByIds(ids); + } + + /** + * + */ + @Override + public int deleteVillageActualUserInfoById(Long id) { + return ActualUserInfoDao.deleteVillageActualUserInfoById(id); + } + + @Override + public int deleteVillageActualUserInfoByUpdatetime(VillageActualUserInfo bean) { + return ActualUserInfoDao.deleteVillageActualUserInfoByUpdatetime(bean); + } + + + private static String getFolderPath(String picpath) { + String floderPath; + Date date = new Date(); + SimpleDateFormat simpleDate = new SimpleDateFormat("yyyyMMdd"); + String day = simpleDate.format(date); + floderPath = picpath + ConfigParam.seq + "userinfo" + ConfigParam.seq + day + ConfigParam.seq; + File fileFloderPath = new File(floderPath); + //创建文件夹 + if (!fileFloderPath.exists()) { + fileFloderPath.mkdirs(); + } + return floderPath; + } + + +} diff --git a/src/main/java/com/ssf/mysqloracletest/task/MetaActualUnitUserInfoTask.java b/src/main/java/com/ssf/mysqloracletest/task/MetaActualUnitUserInfoTask.java index a62ac3d..04239ec 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/MetaActualUnitUserInfoTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/MetaActualUnitUserInfoTask.java @@ -2,10 +2,8 @@ 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; @@ -19,12 +17,9 @@ 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 { @@ -66,68 +61,53 @@ public class MetaActualUnitUserInfoTask { 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 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 metaActualUnitUserInfoUpdateWrapper = new UpdateWrapper<>(); - metaActualUnitUserInfoUpdateWrapper.eq("identity_id", cyry.getZJHM()); - metaActualUnitUserInfoUpdateWrapper.eq("staff_type", cyry.getRYFL()); - metaActualUnitUserInfoService.update(metaActualUnitUserInfo,metaActualUnitUserInfoUpdateWrapper); - logger.info("cyry-" + cyry.getZJHM() + ":更新成功"); - } + try { + List 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 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(); - }); + } catch (Exception e) { + logger.info("cyrys:" + e.getMessage()); + } 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) { diff --git a/src/main/java/com/ssf/mysqloracletest/task/MetaActualUserInfoTask.java b/src/main/java/com/ssf/mysqloracletest/task/MetaActualUserInfoTask.java index 974dd94..805c058 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/MetaActualUserInfoTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/MetaActualUserInfoTask.java @@ -1,19 +1,26 @@ package com.ssf.mysqloracletest.task; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ssf.mysqloracletest.domain.MetaActualUserInfo; +import com.ssf.mysqloracletest.domain.MetaRealEstateInfo; import com.ssf.mysqloracletest.domain.VSySyrkMysql; +import com.ssf.mysqloracletest.domain.VillageActualUserInfo; import com.ssf.mysqloracletest.service.MetaActualUserInfoService; +import com.ssf.mysqloracletest.service.MetaRealEstateInfoService; import com.ssf.mysqloracletest.service.VSySyrkMysqlService; +import com.ssf.mysqloracletest.service.VillageActualUserInfoService; import com.ssf.mysqloracletest.utils.ConfigParam; import com.ssf.mysqloracletest.utils.NumKit; import com.ssf.mysqloracletest.utils.StringKit; +import lombok.RequiredArgsConstructor; import org.slf4j.Logger; 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; @@ -25,111 +32,113 @@ import java.util.concurrent.Executors; * 用户数据接入 */ @Component +@RequiredArgsConstructor public class MetaActualUserInfoTask { private static final Logger logger = LoggerFactory.getLogger(MetaActualUserInfoTask.class); - @Resource - private VSySyrkMysqlService vSySyrkMysqlService; + private final VSySyrkMysqlService vSySyrkMysqlService; + private final VillageActualUserInfoService actualUserInfoService; - @Resource - private MetaActualUserInfoService metaActualUserInfoService; + private final MetaActualUserInfoService metaActualUserInfoService; - final int oncesCounts = NumKit.checkInt(ConfigParam.oncesCounts) == 0 ? 1000 : NumKit.checkInt(ConfigParam.oncesCounts); + private final MetaRealEstateInfoService estateInfoService; - private boolean syrkTag = false; /** - * 连云港 对接海康平台获取人员基础数据 - * // + * 清洗实有人口 */ @Scheduled(initialDelay = 100, fixedDelay = 3000) - public void transsyrk() { - - if (syrkTag) { - return; - } + public void transMetaActualUserInfo() { if (!"true".equals(ConfigParam.metaActualUserInfoSwitch)) { return; } + logger.info("syrk Scheduled start"); + try { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.isNull("status"); + Page page = new Page<>(1, 1000); + List resultList = vSySyrkMysqlService.page(page, queryWrapper).getRecords(); + + logger.info("VSySyrkMysql size:" + resultList.size()); + + CountDownLatch latch = new CountDownLatch(resultList.size()); + ExecutorService syrkPool = Executors.newFixedThreadPool(20); + for (VSySyrkMysql bean : resultList) { + syrkPool.submit(() -> { + cleansyrk(bean); + latch.countDown(); + }); + } + try { + // Wait for all threads to complete + latch.await(); + } catch (InterruptedException e) { + e.printStackTrace(); + } + // 关闭线程池 + syrkPool.shutdown(); + } catch (Exception e) { + logger.info(StringKit.getTrace(e)); + } + } + private void cleansyrk(VSySyrkMysql bean) { + logger.info("VSySyrkMysql thread start;" + bean.getSFZH()); + VSySyrkMysql beanCp = new VSySyrkMysql(); try { - int countsyrk = vSySyrkMysqlService.count(); - logger.info("countsyrk:" + countsyrk); - - if (countsyrk > 0) { - - syrkTag = true; - - int count = countsyrk / oncesCounts; - CountDownLatch latch = new CountDownLatch(count); - ExecutorService syrkPool = Executors.newFixedThreadPool(50); - - for (int i = 0; i <= count; i++) { - Map syrkMap = new HashMap(); - syrkMap.put("rowStart", i * oncesCounts); - syrkMap.put("rowEnd", (i + 1) * oncesCounts); - syrkPool.submit(() -> { - try { - List list = vSySyrkMysqlService.lambdaQuery().list(); - for (VSySyrkMysql syrk : list) { - MetaActualUserInfo metaActualUserInfo = new MetaActualUserInfo(); - metaActualUserInfo.setUserName(syrk.getXM()); - metaActualUserInfo.setIdCard(syrk.getSFZH()); - if (syrk.getXB() != null) { - metaActualUserInfo.setSex(Integer.parseInt(syrk.getXB())); - } - metaActualUserInfo.setPhone(syrk.getSJHM()); - metaActualUserInfo.setLandline(syrk.getLXDH()); - if (syrk.getRYLX() != null) { - metaActualUserInfo.setActualUserType(Integer.parseInt(syrk.getRYLX())); - } - metaActualUserInfo.setHouseHoldRegister(syrk.getHJSSXQ()); - metaActualUserInfo.setHouseHoldAddress(syrk.getHJDXZ()); - metaActualUserInfo.setHabitationAddress(syrk.getXJZDXZ()); - metaActualUserInfo.setPoliceStationCode(syrk.getPCSDM()); - metaActualUserInfo.setPoliceStationName(syrk.getPCSMC()); - metaActualUserInfo.setPoliceDistrictCode(syrk.getJWQDM()); - metaActualUserInfo.setPoliceDistrictName(syrk.getJWQMC()); - metaActualUserInfo.setManagementStatus(syrk.getSTS()); - metaActualUserInfo.setHomeId(syrk.getFJID()); - metaActualUserInfo.setHomeCode(syrk.getFJDM()); -// metaActualUserInfo.setAccountNumber(); - metaActualUserInfo.setMetaCreateTime(syrk.getYSBZK_RKSJ()); - metaActualUserInfo.setMetaUpdateTime(syrk.getYSBZK_GXSJ()); - MetaActualUserInfo one = metaActualUserInfoService.lambdaQuery().eq(MetaActualUserInfo::getIdCard, syrk.getSFZH()).one(); - if (one == null) { - metaActualUserInfoService.save(metaActualUserInfo); - logger.info("syrk-" + syrk.getSFZH() + ":插入成功"); - } else { - UpdateWrapper metaActualUserInfoUpdateWrapper = new UpdateWrapper<>(); - metaActualUserInfoUpdateWrapper.eq("id_card",syrk.getSFZH()); - metaActualUserInfoService.update(metaActualUserInfo, metaActualUserInfoUpdateWrapper); - logger.info("syrk-" + syrk.getSFZH() + ":更新成功"); - } - } - } catch (Exception e) { - logger.info("syrks:" + e.getMessage()); - } - latch.countDown(); - }); - logger.info("syrkMap数据总量:" + countsyrk + "," + "当前处理下标:" + syrkMap.get("rowStart") + "/" + syrkMap.get("rowEnd")); - } - - try { - // Wait for all threads to complete - latch.await(); - } catch (InterruptedException e) { - e.printStackTrace(); - } - // 关闭线程池 - syrkPool.shutdown(); + BeanUtils.copyProperties(bean, beanCp); + + VillageActualUserInfo userInfoPara = new VillageActualUserInfo(); + userInfoPara.setIdcard(StringKit.toString(beanCp.getSFZH())); + List actualUserInfos = actualUserInfoService.selectVillageActualUserInfoList(userInfoPara); + + String userPic = ""; + if(actualUserInfos!=null && actualUserInfos.size()>0){ + userPic = StringKit.toString(actualUserInfos.get(0).getUserPic()); } + MetaActualUserInfo actualUserInfo = new MetaActualUserInfo(); + actualUserInfo.setUserPic(userPic); + actualUserInfo.setUserName(StringKit.toString(beanCp.getXM())); + actualUserInfo.setIdCard(StringKit.toString(beanCp.getSFZH())); + actualUserInfo.setSex(NumKit.checkInt(beanCp.getXB())); + actualUserInfo.setPhone(StringKit.toString(beanCp.getSJHM())); + actualUserInfo.setLandline(StringKit.toString(beanCp.getLXDH())); + actualUserInfo.setActualUserType(NumKit.checkInt(beanCp.getRYLX())); + actualUserInfo.setHouseHoldRegister(StringKit.toString(beanCp.getHJSSXQ())); + actualUserInfo.setHouseHoldAddress(StringKit.toString(beanCp.getHJDXZ())); + actualUserInfo.setHabitationAddress(StringKit.toString(beanCp.getXJZDXZ())); + actualUserInfo.setPoliceStationCode(StringKit.toString(beanCp.getPCSDM())); + actualUserInfo.setPoliceStationName(StringKit.toString(beanCp.getPCSMC())); + actualUserInfo.setPoliceDistrictCode(StringKit.toString(beanCp.getJWQDM())); + actualUserInfo.setPoliceDistrictName(StringKit.toString(beanCp.getJWQMC())); + actualUserInfo.setManagementStatus(StringKit.toString(beanCp.getSTS())); + + // 构造查询条件 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("real_estate_address", StringKit.toString(beanCp.getXJZDXZ())); + MetaRealEstateInfo estateInfo = estateInfoService.getOne(queryWrapper); + + if(estateInfo !=null){ + actualUserInfo.setHomeId(StringKit.toString(estateInfo.getId())); + } + actualUserInfo.setHomeCode(StringKit.toString(beanCp.getFJDM())); +// actualUserInfo.setAccountNumber(); + actualUserInfo.setMetaCreateTime(StringKit.toString(beanCp.getYSBZK_RKSJ())); + actualUserInfo.setMetaUpdateTime(StringKit.toString(beanCp.getYSBZK_GXSJ())); + boolean b = metaActualUserInfoService.save(actualUserInfo); + + if (b) { + beanCp.setStatus("1"); + vSySyrkMysqlService.updateVSySyrkById(beanCp); + } } catch (Exception e) { logger.info(StringKit.getTrace(e)); + beanCp.setStatus("2"); + vSySyrkMysqlService.updateVSySyrkById(beanCp); } } diff --git a/src/main/java/com/ssf/mysqloracletest/task/MetaHandleAlarmTask.java b/src/main/java/com/ssf/mysqloracletest/task/MetaHandleAlarmTask.java index 6639c75..4bfb72b 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/MetaHandleAlarmTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/MetaHandleAlarmTask.java @@ -66,7 +66,7 @@ public class MetaHandleAlarmTask { int count = countcjxx / oncesCounts; CountDownLatch latch = new CountDownLatch(count); - ExecutorService cjxxPool = Executors.newFixedThreadPool(50); + ExecutorService cjxxPool = Executors.newFixedThreadPool(20); for (int i = 0; i <= count; i++) { Map cjxxMap = new HashMap(); diff --git a/src/main/java/com/ssf/mysqloracletest/task/MetaImpUserInfoTask.java b/src/main/java/com/ssf/mysqloracletest/task/MetaImpUserInfoTask.java index 9166d46..b21d2ef 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/MetaImpUserInfoTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/MetaImpUserInfoTask.java @@ -1,7 +1,5 @@ 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; @@ -19,12 +17,9 @@ 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 MetaImpUserInfoTask { @@ -48,10 +43,6 @@ public class MetaImpUserInfoTask { @Scheduled(initialDelay = 100, fixedDelay = 3000) public void transzdry() { - if (zdryTag) { - return; - } - if (!"true".equals(ConfigParam.metaImpUserSwitch)) { return; } @@ -63,74 +54,58 @@ public class MetaImpUserInfoTask { if (countzdry > 0) { - zdryTag = true; - int count = countzdry / oncesCounts; - CountDownLatch latch = new CountDownLatch(count); - ExecutorService zdryPool = Executors.newFixedThreadPool(50); for (int i = 0; i <= count; i++) { Map zdryMap = new HashMap(); zdryMap.put("rowStart", i * oncesCounts); zdryMap.put("rowEnd", (i + 1) * oncesCounts); - zdryPool.submit(() -> { - try { - List list = zdryMysqlService.lambdaQuery().list(); - for (ZhxfZdrygkRyjbxxViewMysql zdry : list) { - MetaImpUserInfo metaImpUserInfo = new MetaImpUserInfo(); - metaImpUserInfo.setUserName(zdry.getXM()); - metaImpUserInfo.setIdCard(zdry.getZJHM()); - if (zdry.getXB()!=null) { - metaImpUserInfo.setSex(Integer.parseInt(zdry.getXB())); - } - metaImpUserInfo.setPhone(zdry.getSJHM()); - 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()); - metaImpUserInfo.setHabitationRegister(zdry.getXZDHQ()); - metaImpUserInfo.setHabitationAddress(zdry.getXZDXZ()); - metaImpUserInfo.setRegisterUnitCode(zdry.getDJRDWDM()); - metaImpUserInfo.setRegisterUnitName(zdry.getDJRDWMC()); - //确定一个数据是否唯一 - MetaImpUserInfo one = metaImpUserInfoService.lambdaQuery().eq(MetaImpUserInfo::getIdCard, zdry.getZJHM()).one(); - if (one == null) { - metaImpUserInfoService.save(metaImpUserInfo); - logger.info("zdry-" + zdry.getZJHM() + ":插入成功"); - } else { - UpdateWrapper metaImpUserInfoUpdateWrapper = new UpdateWrapper<>(); - metaImpUserInfoUpdateWrapper.eq("id_card", zdry.getZJHM()); - metaImpUserInfoService.update(metaImpUserInfo,metaImpUserInfoUpdateWrapper); - logger.info("zdry-" + zdry.getZJHM() + ":更新成功"); - } + try { + List list = zdryMysqlService.lambdaQuery().list(); + for (ZhxfZdrygkRyjbxxViewMysql zdry : list) { + MetaImpUserInfo metaImpUserInfo = new MetaImpUserInfo(); + metaImpUserInfo.setUserName(zdry.getXM()); + metaImpUserInfo.setIdCard(zdry.getZJHM()); + if (zdry.getXB() != null) { + metaImpUserInfo.setSex(Integer.parseInt(zdry.getXB())); + } + metaImpUserInfo.setPhone(zdry.getSJHM()); + 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()); + metaImpUserInfo.setHabitationRegister(zdry.getXZDHQ()); + metaImpUserInfo.setHabitationAddress(zdry.getXZDXZ()); + metaImpUserInfo.setRegisterUnitCode(zdry.getDJRDWDM()); + metaImpUserInfo.setRegisterUnitName(zdry.getDJRDWMC()); + //确定一个数据是否唯一 + MetaImpUserInfo one = metaImpUserInfoService.lambdaQuery().eq(MetaImpUserInfo::getIdCard, zdry.getZJHM()).one(); + if (one == null) { + metaImpUserInfoService.save(metaImpUserInfo); + logger.info("zdry-" + zdry.getZJHM() + ":插入成功"); + } else { + UpdateWrapper metaImpUserInfoUpdateWrapper = new UpdateWrapper<>(); + metaImpUserInfoUpdateWrapper.eq("id_card", zdry.getZJHM()); + metaImpUserInfoService.update(metaImpUserInfo, metaImpUserInfoUpdateWrapper); + logger.info("zdry-" + zdry.getZJHM() + ":更新成功"); } - } catch (Exception e) { - logger.info("zdrys:" + e.getMessage()); } - latch.countDown(); - }); + } catch (Exception e) { + logger.info("zdrys:" + e.getMessage()); + } logger.info("zdryMap数据总量:" + countzdry + "," + "当前处理下标:" + zdryMap.get("rowStart") + "/" + zdryMap.get("rowEnd")); } - - try { - // Wait for all threads to complete - latch.await(); - } catch (InterruptedException e) { - e.printStackTrace(); - } - // 关闭线程池 - zdryPool.shutdown(); } } catch (Exception e) { diff --git a/src/main/java/com/ssf/mysqloracletest/task/MetaRealEstateInfoTask.java b/src/main/java/com/ssf/mysqloracletest/task/MetaRealEstateInfoTask.java index 0db9ca7..ab770e4 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/MetaRealEstateInfoTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/MetaRealEstateInfoTask.java @@ -51,7 +51,7 @@ public class MetaRealEstateInfoTask { List resultList = jwySyfwService.page(page, queryWrapper).getRecords(); CountDownLatch latch = new CountDownLatch(resultList.size()); - ExecutorService jwtSyfwPool = Executors.newFixedThreadPool(50); + ExecutorService jwtSyfwPool = Executors.newFixedThreadPool(5); for (VJwtSyfw bean : resultList) { jwtSyfwPool.submit(() -> { @@ -59,8 +59,6 @@ public class MetaRealEstateInfoTask { latch.countDown(); }); } - - try { // Wait for all threads to complete latch.await(); @@ -72,9 +70,6 @@ public class MetaRealEstateInfoTask { } catch (Exception e) { logger.info(StringKit.getTrace(e)); } - - - } private void cleanJwtSyfw(VJwtSyfw bean) { @@ -104,4 +99,7 @@ public class MetaRealEstateInfoTask { } + + + } diff --git a/src/main/java/com/ssf/mysqloracletest/task/RentalHousingTask.java b/src/main/java/com/ssf/mysqloracletest/task/RentalHousingTask.java index 54e9540..0bba88a 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/RentalHousingTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/RentalHousingTask.java @@ -55,7 +55,7 @@ public class RentalHousingTask { int count = countRentalHouse / oncesCounts; CountDownLatch latch = new CountDownLatch(count); - ExecutorService RentalHousePool = Executors.newFixedThreadPool(50); + ExecutorService RentalHousePool = Executors.newFixedThreadPool(5); for (int i = 0; i <= count; i++) { Map HouseMap = new HashMap(); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 10e9a6f..fb86b6a 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1 +1 @@ -server: port: 5678 spring: datasource: dynamic: primary: mysql #设置默认的数据源或者数据源组,默认值即为master strict: false #设置严格模式,默认false不启动. 启动后再为匹配到指定数据源时候回抛出异常,不启动会使用默认数据源. datasource: oracleSydz: url: jdbc:mysql://121.41.91.94:12036/yhzafk?useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&serverTimezone=GMT driver-class-name: com.mysql.cj.jdbc.Driver username: root password: '!QAZ1qaz' mysql: url: jdbc:mysql://121.41.91.94:12036/yhzafk?useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&serverTimezone=GMT driver-class-name: com.mysql.cj.jdbc.Driver username: root password: '!QAZ1qaz' mybatis-plus: mapper-locations: - classpath:mapper/*.xml \ No newline at end of file +server: port: 1204 spring: datasource: dynamic: primary: mysql #设置默认的数据源或者数据源组,默认值即为master strict: false #设置严格模式,默认false不启动. 启动后再为匹配到指定数据源时候回抛出异常,不启动会使用默认数据源. datasource: oracleSydz: url: jdbc:mysql://121.41.91.94:12036/yhzafk?useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&serverTimezone=GMT driver-class-name: com.mysql.cj.jdbc.Driver username: root password: '!QAZ1qaz' mysql: url: jdbc:mysql://121.41.91.94:12036/yhzafk?useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&serverTimezone=GMT driver-class-name: com.mysql.cj.jdbc.Driver username: root password: '!QAZ1qaz' mysqlSy: url: jdbc:mysql://121.41.91.94:12036/watu3?useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&serverTimezone=GMT driver-class-name: com.mysql.cj.jdbc.Driver username: root password: '!QAZ1qaz' mybatis-plus: mapper-locations: - classpath:mapper/*.xml \ No newline at end of file diff --git a/src/main/resources/mapper/VSySyrkMysqlMapper.xml b/src/main/resources/mapper/VSySyrkMysqlMapper.xml index bdc1123..8a78b58 100644 --- a/src/main/resources/mapper/VSySyrkMysqlMapper.xml +++ b/src/main/resources/mapper/VSySyrkMysqlMapper.xml @@ -46,6 +46,7 @@ + + + + and ga_record_id = #{gaRecordId} + and building_id = #{buildingId} + and user_home_id = #{userHomeId} + and actual_user_id = #{actualUserId} + and record_id = #{recordId} + and grid_code = #{gridCode} + and grid_name like concat('%', #{gridName}, '%') + and home_id = #{homeId} + and home_code = #{homeCode} + and police_district_code = + #{policeDistrictCode} + + and police_district = #{policeDistrict} + and police_station_name like concat('%', + #{policeStationName}, '%') + + and police_station_code = + #{policeStationCode} + + and person_category = #{personCategory} + and user_name like concat('%', #{userName}, '%') + and idcard like concat('%', #{idcard}, '%') + and phone = #{phone} + and landline = #{landline} + and sex = #{sex} + and nation = #{nation} + and marriage = #{marriage} + and education = #{education} + and birthday = #{birthday} + and house_hold_register = + #{houseHoldRegister} + + and house_hold_address = + #{houseHoldAddress} + + and habitation = #{habitation} + and block_code = #{blockCode} + and block_name like concat('%', #{blockName}, '%') + and date_status = #{dateStatus} + and isactive = #{isactive} + and c1 = #{c1} + and c2 = #{c2} + and c3 = #{c3} + and c4 = #{c4} + and c5 = #{c5} + + + + + + + + + + + insert into village_actual_user_info + + ga_record_id, + building_id, + user_home_id, + actual_user_id, + record_id, + grid_code, + grid_name, + home_id, + home_code, + police_district_code, + police_district, + police_station_name, + police_station_code, + person_category, + user_name, + idcard, + phone, + landline, + sex, + nation, + marriage, + education, + birthday, + house_hold_register, + house_hold_address, + habitation, + block_code, + block_name, + date_status, + isactive, + c1, + c2, + c3, + c4, + c5, + + + #{gaRecordId}, + #{buildingId}, + #{userHomeId}, + #{actualUserId}, + #{recordId}, + #{gridCode}, + #{gridName}, + #{homeId}, + #{homeCode}, + #{policeDistrictCode}, + #{policeDistrict}, + #{policeStationName}, + #{policeStationCode}, + #{personCategory}, + #{userName}, + #{idcard}, + #{phone}, + #{landline}, + #{sex}, + #{nation}, + #{marriage}, + #{education}, + #{birthday}, + #{houseHoldRegister}, + #{houseHoldAddress}, + #{habitation}, + #{blockCode}, + #{blockName}, + #{dateStatus}, + #{isactive}, + #{c1}, + #{c2}, + #{c3}, + #{c4}, + #{c5}, + + + + + update village_actual_user_info + + ga_record_id = #{gaRecordId}, + building_id = #{buildingId}, + user_home_id = #{userHomeId}, + actual_user_id = #{actualUserId}, + record_id = #{recordId}, + grid_code = #{gridCode}, + grid_name = #{gridName}, + home_id = #{homeId}, + home_code = #{homeCode}, + police_district_code = #{policeDistrictCode}, + police_district = #{policeDistrict}, + police_station_name = #{policeStationName}, + police_station_code = #{policeStationCode}, + person_category = #{personCategory}, + user_name = #{userName}, + idcard = #{idcard}, + phone = #{phone}, + landline = #{landline}, + sex = #{sex}, + nation = #{nation}, + marriage = #{marriage}, + education = #{education}, + birthday = #{birthday}, + house_hold_register = #{houseHoldRegister}, + house_hold_address = #{houseHoldAddress}, + habitation = #{habitation}, + block_code = #{blockCode}, + block_name = #{blockName}, + date_status = #{dateStatus}, + isactive = #{isactive}, + c1 = #{c1}, + c2 = #{c2}, + c3 = #{c3}, + c4 = #{c4}, + c5 = #{c5}, + pic_status = #{picStatus}, + user_pic = #{userPic}, + + where id = #{id} + + + + update village_actual_user_info + + ga_record_id = #{gaRecordId}, + building_id = #{buildingId}, + user_home_id = #{userHomeId}, + actual_user_id = #{actualUserId}, + record_id = #{recordId}, + grid_code = #{gridCode}, + grid_name = #{gridName}, + home_id = #{homeId}, + home_code = #{homeCode}, + police_district_code = #{policeDistrictCode}, + police_district = #{policeDistrict}, + police_station_name = #{policeStationName}, + police_station_code = #{policeStationCode}, + person_category = #{personCategory}, + user_name = #{userName}, + idcard = #{idcard}, + phone = #{phone}, + landline = #{landline}, + sex = #{sex}, + nation = #{nation}, + marriage = #{marriage}, + education = #{education}, + birthday = #{birthday}, + house_hold_register = #{houseHoldRegister}, + house_hold_address = #{houseHoldAddress}, + habitation = #{habitation}, + block_code = #{blockCode}, + block_name = #{blockName}, + date_status = #{dateStatus}, + isactive = #{isactive}, + c2 = #{c2}, + c3 = #{c3}, + c4 = #{c4}, + c5 = #{c5}, + c1 = #{c1New}, + + where idcard = #{idcard} and c1 = #{c1} + + + + delete from village_actual_user_info where id = #{id} + + + + delete from village_actual_user_info where id in + + #{id} + + + + + + delete from village_actual_user_info where DATE_FORMAT(updatetime, '%Y-%m-%d') != '${updatetimeV}' + + \ No newline at end of file