diff --git a/config/application.properties b/config/application.properties index 6355fc1..88cbeb0 100644 --- a/config/application.properties +++ b/config/application.properties @@ -14,16 +14,22 @@ zdrySwitch=false cyrySwitch=false JjxxSwitch=false NewNsydwSwitch=false -metaImpUserSwitch=true +metaImpUserSwitch=false NewNalarminfoSwitch=false -metaHandleAlarmSwitch=true +metaHandleAlarmSwitch=false metaActualUnitUserInfoSwitch=false metaActualUserInfoSwitch=false actualTimecjxxSwitch=false actualTimejjxxSwitch=false RentalHouseSwitch=false metaRealEstateInfoSwitch=false -sydzToEstateInfoSwitch=true -syryToActualInfoSwitch=true +sydzToEstateInfoSwitch=false +syryToActualInfoSwitch=false +metaImpUserPicSwitch=false +wsDownloadPicAreaStart=320924 +wsDownloadPicPath=/home/dataaccess +wshttpurl=http://50.146.63.16:8080/syx_webservice/getCzrkImgage.xhtml?sfzh= +#射阳 实有人口将有房屋号的数据根据户籍表数据清洗，并更新户主关系 +jwzUserInfoToActual=true diff --git a/pom.xml b/pom.xml index 7d5f22a..e12521e 100644 --- a/pom.xml +++ b/pom.xml @@ -97,6 +97,18 @@ 2.9.0 + + com.squareup.okhttp + okhttp + 2.2.0 + + + + com.squareup.okhttp3 + okhttp + 4.9.1 + + diff --git a/src/main/java/com/ssf/mysqloracletest/domain/MetaActualUnitUserInfo.java b/src/main/java/com/ssf/mysqloracletest/domain/MetaActualUnitUserInfo.java index 9eac1a5..d53f9ce 100644 --- a/src/main/java/com/ssf/mysqloracletest/domain/MetaActualUnitUserInfo.java +++ b/src/main/java/com/ssf/mysqloracletest/domain/MetaActualUnitUserInfo.java @@ -24,47 +24,63 @@ public class MetaActualUnitUserInfo implements Serializable { /** * 鍗曚綅id */ + @TableField(value = "unit_id") private String unitId; /** * 鍗曚綅鍚嶇О */ + @TableField(value = "unit_name") private String unitName; /** * 鍛樺伐鐓х墖 */ + @TableField(value = "staff_pic") private String staffPic; /** * 鍛樺伐濮撳悕 */ + @TableField(value = "staff_name") private String staffName; /** * 鍛樺伐韬唤璇 */ + @TableField(value = "identity_id") private String identityId; /** * 鑱旂郴鏂瑰紡 */ + @TableField(value = "contact_info") private String contactInfo; /** * 鎬у埆 */ + @TableField(value = "sex") private Integer sex; + @TableField(exist = false) + private String sexCn; + /** * 浜哄憳鍒嗙被 */ + @TableField(value = "staff_type") private Integer staffType; + @TableField(exist = false) + private String staffTypeCn; /** * 浜哄憳鐘舵 */ + @TableField(value = "staff_state") private Integer staffState; + @TableField(exist = false) + private String staffStateCn; /** * 鍏冩暟鎹垱寤烘椂闂 @@ -101,6 +117,4 @@ public class MetaActualUnitUserInfo implements Serializable { */ private Integer isActive; - @TableField(exist = false) - private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/src/main/java/com/ssf/mysqloracletest/domain/MetaActualUserInfo.java b/src/main/java/com/ssf/mysqloracletest/domain/MetaActualUserInfo.java index 0019b72..82dd221 100644 --- a/src/main/java/com/ssf/mysqloracletest/domain/MetaActualUserInfo.java +++ b/src/main/java/com/ssf/mysqloracletest/domain/MetaActualUserInfo.java @@ -120,6 +120,8 @@ public class MetaActualUserInfo implements Serializable { * 鍏冩暟鎹洿鏂版椂闂 */ private String metaUpdateTime; + //涓庢埛涓诲叧绯 + private int householderRelation; } \ No newline at end of file diff --git a/src/main/java/com/ssf/mysqloracletest/domain/MetaHuntersInfo.java b/src/main/java/com/ssf/mysqloracletest/domain/MetaHuntersInfo.java index f1d5906..e15249a 100644 --- a/src/main/java/com/ssf/mysqloracletest/domain/MetaHuntersInfo.java +++ b/src/main/java/com/ssf/mysqloracletest/domain/MetaHuntersInfo.java @@ -1,44 +1,53 @@ package com.ssf.mysqloracletest.domain; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import java.io.Serializable; -import java.util.Date; +import com.baomidou.mybatisplus.annotation.*; import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; /** - * 闈炴硶鐙╃寧浜哄憳淇℃伅琛 - * @TableName meta_hunters_info + * 闈炴硶鐙╃寧浜哄憳淇℃伅琛(MetaHuntersInfo)Domain + * + * @author makejava + * @since 2023-12-09 17:22:06 */ -@TableName(value ="meta_hunters_info") @Data -public class MetaHuntersInfo implements Serializable { +@EqualsAndHashCode(callSuper = false) +@TableName(value = "meta_hunters_info") +public class MetaHuntersInfo { + /** * 涓婚敭 */ - @TableId(type = IdType.AUTO) + @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 濮撳悕 */ + @TableField(condition = SqlCondition.LIKE_RIGHT) private String hunterName; /** * 鎬у埆 */ - private String sex; + private Integer sex; /** * 鑱旂郴鏂瑰紡 */ + @TableField(condition = SqlCondition.LIKE_RIGHT) private String phone; + /** + */ + private String userPic; + /** * 璇佷欢鍙风爜 */ + @TableField(condition = SqlCondition.LIKE_RIGHT) private String idCard; /** @@ -49,11 +58,13 @@ public class MetaHuntersInfo implements Serializable { /** * 鎴风睄鍦板潃璇︽儏 */ + @TableField(condition = SqlCondition.LIKE_RIGHT) private String houseHoldAddress; /** * 鐜颁綇鍦拌鍧 */ + @TableField(condition = SqlCondition.LIKE_RIGHT) private String habitationAddress; /** diff --git a/src/main/java/com/ssf/mysqloracletest/domain/MetaImpUserInfo.java b/src/main/java/com/ssf/mysqloracletest/domain/MetaImpUserInfo.java index 72375e9..fd6f6a5 100644 --- a/src/main/java/com/ssf/mysqloracletest/domain/MetaImpUserInfo.java +++ b/src/main/java/com/ssf/mysqloracletest/domain/MetaImpUserInfo.java @@ -1,6 +1,7 @@ package com.ssf.mysqloracletest.domain; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -24,66 +25,81 @@ public class MetaImpUserInfo implements Serializable { /** * 鐓х墖 */ + @TableField(value = "user_pic") private String userPic; /** * 濮撳悕 */ + @TableField(value = "user_name") private String userName; /** * 韬唤璇佸彿鐮 */ + @TableField(value = "id_card") private String idCard; /** * 鎬у埆 */ + @TableField(value = "sex") private Integer sex; + @TableField(exist = false) + private String sexCn; /** * 鑱旂郴鏂瑰紡 */ + @TableField(value = "phone") private String phone; /** * 閲嶇偣浜哄ぇ绫 */ + @TableField(value = "imp_user_type") private String impUserType; /** * 閲嶇偣浜哄皬绫 */ + @TableField(value = "imp_user_sub_type") private String impUserSubType; /** * 鎴风睄鍦板尯鍙 */ + @TableField(value = "house_hold_register") private String houseHoldRegister; /** * 鎴风睄鍦拌鍧 */ + @TableField(value = "house_hold_address") private String houseHoldAddress; /** * 鐜颁綇鍦板尯鍙 */ + @TableField(value = "habitation_register") private String habitationRegister; /** * 鐜颁綇鍦拌鍧 */ + @TableField(value = "habitation_address") private String habitationAddress; /** * 鐧昏浜哄崟浣嶄唬鐮 */ + @TableField(value = "register_unit_code") private String registerUnitCode; /** * 鐧昏浜哄崟浣嶅悕绉 */ + @TableField(value = "register_unit_name") private String registerUnitName; } \ No newline at end of file diff --git a/src/main/java/com/ssf/mysqloracletest/domain/VillageJwzUserInfo.java b/src/main/java/com/ssf/mysqloracletest/domain/VillageJwzUserInfo.java new file mode 100644 index 0000000..7b30ec1 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/domain/VillageJwzUserInfo.java @@ -0,0 +1,133 @@ +package com.ssf.mysqloracletest.domain; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +/** + * TODO + * + * @author dinosuar + * @version 1.0 + * @date 2021/2/24 15:04 + **/ +@Data +@TableName(value = "village_jwz_user_info") +public class VillageJwzUserInfo { + + + /** + * 涓婚敭 + */ + @TableField(value = "id") + private Long id; + /** + * 涓庢埛涓诲叧绯 + */ + @TableField(value = "householder_relation") + private String householderRelation; + /** + * 瀛﹀巻锛堟枃鍖栫▼搴︼級 + */ + @TableField(value = "education") + private String education; + /** + * 瀹楁暀淇′话 + */ + @TableField(value = "religious") + private String religious; + /** + * 濠氬Щ鐘跺喌 + */ + @TableField(value = "marriage") + private String marriage; + /** + * 鏀挎不闈㈣矊 + */ + @TableField(value = "political_outlook") + private String politicalOutlook; + /** + * 绠＄悊鐘舵 + */ + @TableField(value = "management_status") + private String managementStatus; + /** + * 鐓х墖 + */ + @TableField(value = "user_pic") + private String userPic; + /** + * 浜哄憳濮撳悕 + */ + @TableField(value = "user_name") + private String userName; + /** + * 绉诲姩鍙风爜 + */ + @TableField(value = "phone") + private String phone; + /** + * 鎴峰彿 + */ + @TableField(value = "account_number") + private String accountNumber; + /** + * 鑱旂郴鐢佃瘽 + */ + @TableField(value = "landline") + private String landline; + /** + * 璇佷欢鍙风爜 + */ + @TableField(value = "id_card") + private String idCard; + /** + * 鎴风睄鍦板潃_鐪佸競鍘匡紙鍖猴級 + */ + @TableField(value = "houseHold_register") + private String houseHoldRegister; + /** + * 鎴风睄鍦板潃_鍖哄垝鍐呰缁嗗湴鍧 + */ + @TableField(value = "houseHold_address") + private String houseHoldAddress; + /** + * 閰嶅伓濮撳悕 + */ + @TableField(value = "spouse_name") + private String spouseName; + /** + * 閰嶅伓韬唤璇 + */ + @TableField(value = "spouse_id_card") + private String spouseIdCard; + /** + * 鐖朵翰濮撳悕 + */ + @TableField(value = "father_name") + private String fatherName; + /** + * 鐖朵翰韬唤璇佸彿鐮 + */ + @TableField(value = "father_id_card") + private String fatherIdCard; + /** + * 姣嶄翰濮撳悕 + */ + @TableField(value = "mother_name") + private String motherName; + /** + * 姣嶄翰韬唤璇佸彿鐮 + */ + @TableField(value = "mother_id_card") + private String motherIdCard; + /** + * 璀﹀姟鍖虹紪鐮 + */ + @TableField(value = "police_district_code") + private String policeDistrictCode; + @TableField(value = "isactive") + private String isactive; + + +} diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/MetaActualUnitUserInfoMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/MetaActualUnitUserInfoMapper.java index 5d67d6a..7817d01 100644 --- a/src/main/java/com/ssf/mysqloracletest/mapper/MetaActualUnitUserInfoMapper.java +++ b/src/main/java/com/ssf/mysqloracletest/mapper/MetaActualUnitUserInfoMapper.java @@ -3,6 +3,9 @@ package com.ssf.mysqloracletest.mapper; import com.ssf.mysqloracletest.domain.MetaActualUnitUserInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * @author 28758 @@ -13,6 +16,9 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface MetaActualUnitUserInfoMapper extends BaseMapper { + @Select(" select * from meta_actual_unit_user_info where staff_pic is null ") + public List getListByPic() ; + } diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/MetaActualUserInfoMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/MetaActualUserInfoMapper.java index e98626a..5119d46 100644 --- a/src/main/java/com/ssf/mysqloracletest/mapper/MetaActualUserInfoMapper.java +++ b/src/main/java/com/ssf/mysqloracletest/mapper/MetaActualUserInfoMapper.java @@ -65,6 +65,8 @@ public interface MetaActualUserInfoMapper extends BaseMapper */ public int deleteMetaActualUserInfoByIds(Long[] ids); + public List selectListByHomeIdSuccess(MetaActualUserInfo metaActualUserInfo); + } diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/MetaHuntersInfoMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/MetaHuntersInfoMapper.java index 0a3245d..90927fd 100644 --- a/src/main/java/com/ssf/mysqloracletest/mapper/MetaHuntersInfoMapper.java +++ b/src/main/java/com/ssf/mysqloracletest/mapper/MetaHuntersInfoMapper.java @@ -1,20 +1,22 @@ package com.ssf.mysqloracletest.mapper; -import com.ssf.mysqloracletest.domain.MetaHuntersInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ssf.mysqloracletest.domain.MetaHuntersInfo; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** -* @author 10503 -* @description 閽堝琛ㄣ恗eta_hunters_info(闈炴硶鐙╃寧浜哄憳淇℃伅琛)銆戠殑鏁版嵁搴撴搷浣淢apper -* @createDate 2023-12-08 23:11:18 -* @Entity com.ssf.mysqloracletest.domain.MetaHuntersInfo -*/ + * 闈炴硶鐙╃寧浜哄憳淇℃伅琛(MetaHuntersInfo)Mapper + * + * @author makejava + * @since 2023-12-09 17:22:06 + */ @Mapper public interface MetaHuntersInfoMapper extends BaseMapper { -} - - - + @Select(" select * from meta_hunters_info where user_pic is null ") + public List getHuntersList() ; +} diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/MetaImpUserInfoMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/MetaImpUserInfoMapper.java index ded08cf..0dec87e 100644 --- a/src/main/java/com/ssf/mysqloracletest/mapper/MetaImpUserInfoMapper.java +++ b/src/main/java/com/ssf/mysqloracletest/mapper/MetaImpUserInfoMapper.java @@ -3,6 +3,9 @@ package com.ssf.mysqloracletest.mapper; import com.ssf.mysqloracletest.domain.MetaImpUserInfo; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * @author 28758 @@ -13,6 +16,9 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface MetaImpUserInfoMapper extends BaseMapper { + @Select(" select * from meta_imp_user_info where user_pic is null limit 200 ") + public List getListByPic() ; + } diff --git a/src/main/java/com/ssf/mysqloracletest/mapper/VillageJwzUserInfoMapper.java b/src/main/java/com/ssf/mysqloracletest/mapper/VillageJwzUserInfoMapper.java new file mode 100644 index 0000000..db00cda --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/mapper/VillageJwzUserInfoMapper.java @@ -0,0 +1,61 @@ +package com.ssf.mysqloracletest.mapper; + +import com.ssf.mysqloracletest.domain.VillageJwzUserInfo; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +/** + * 鏂囩珷鍐呭 + * + * @author chglee + * @email 1992lcg@163.com + * @date 2017-10-03 16:17:48 + */ +@Mapper +public interface VillageJwzUserInfoMapper { + + /** + * + */ + public VillageJwzUserInfo selectVillageJwzUserInfoById(Long id); + + public VillageJwzUserInfo selectVillageJwzUserInfoByIdcard(String id); + + /** + * + */ + public List selectVillageJwzUserInfoList(VillageJwzUserInfo bean); + + /** + * + */ + public int insertVillageJwzUserInfo(VillageJwzUserInfo bean); + + /** + * + */ + public int updateVillageJwzUserInfo(VillageJwzUserInfo bean); + + public int updateVillageJwzUserInfoByIdcard(VillageJwzUserInfo bean); + + /** + * + */ + public int deleteVillageJwzUserInfoById(Long id); + + public int deleteVillageJwzUserInfoByUpdatetime(VillageJwzUserInfo bean); + + /** + * 鎵归噺鍒犻櫎褰綋鎶撴媿璁板綍 + * + * @param ids 闇瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎 + * @return 缁撴灉 + */ + public int deleteVillageJwzUserInfoByIds(Long[] ids); + + public List list(Map map); + + +} diff --git a/src/main/java/com/ssf/mysqloracletest/service/MetaActualUnitUserInfoService.java b/src/main/java/com/ssf/mysqloracletest/service/MetaActualUnitUserInfoService.java index 67df7ab..d973b65 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/MetaActualUnitUserInfoService.java +++ b/src/main/java/com/ssf/mysqloracletest/service/MetaActualUnitUserInfoService.java @@ -3,6 +3,8 @@ package com.ssf.mysqloracletest.service; import com.ssf.mysqloracletest.domain.MetaActualUnitUserInfo; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** * @author 28758 * @description 閽堝琛ㄣ恗eta_actual_unit_user_info(鍗曚綅浠庝笟浜哄憳淇℃伅琛)銆戠殑鏁版嵁搴撴搷浣淪ervice @@ -10,4 +12,6 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface MetaActualUnitUserInfoService extends IService { + + public List getListByPic(); } diff --git a/src/main/java/com/ssf/mysqloracletest/service/MetaActualUserInfoService.java b/src/main/java/com/ssf/mysqloracletest/service/MetaActualUserInfoService.java index 1f156e6..81871fb 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/MetaActualUserInfoService.java +++ b/src/main/java/com/ssf/mysqloracletest/service/MetaActualUserInfoService.java @@ -63,4 +63,6 @@ public interface MetaActualUserInfoService extends IService */ public int deleteMetaActualUserInfoById(Long id); + public List selectListByHomeIdSuccess(MetaActualUserInfo metaActualUserInfo); + } diff --git a/src/main/java/com/ssf/mysqloracletest/service/MetaHuntersInfoService.java b/src/main/java/com/ssf/mysqloracletest/service/MetaHuntersInfoService.java index 4abc4c7..c63d8cb 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/MetaHuntersInfoService.java +++ b/src/main/java/com/ssf/mysqloracletest/service/MetaHuntersInfoService.java @@ -1,13 +1,19 @@ package com.ssf.mysqloracletest.service; -import com.ssf.mysqloracletest.domain.MetaHuntersInfo; + import com.baomidou.mybatisplus.extension.service.IService; +import com.ssf.mysqloracletest.domain.MetaHuntersInfo; + +import java.util.List; /** -* @author 10503 -* @description 閽堝琛ㄣ恗eta_hunters_info(闈炴硶鐙╃寧浜哄憳淇℃伅琛)銆戠殑鏁版嵁搴撴搷浣淪ervice -* @createDate 2023-12-08 23:11:18 -*/ + * 闈炴硶鐙╃寧浜哄憳淇℃伅琛(MetaHuntersInfo)Service + * + * @author makejava + * @since 2023-12-09 17:22:06 + */ public interface MetaHuntersInfoService extends IService { + public List getHuntersList(); + } diff --git a/src/main/java/com/ssf/mysqloracletest/service/MetaImpUserInfoService.java b/src/main/java/com/ssf/mysqloracletest/service/MetaImpUserInfoService.java index 757d8b1..4e089e0 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/MetaImpUserInfoService.java +++ b/src/main/java/com/ssf/mysqloracletest/service/MetaImpUserInfoService.java @@ -3,6 +3,8 @@ package com.ssf.mysqloracletest.service; import com.ssf.mysqloracletest.domain.MetaImpUserInfo; import com.baomidou.mybatisplus.extension.service.IService; +import java.util.List; + /** * @author 28758 * @description 閽堝琛ㄣ恗eta_imp_user_info(閲嶇偣浜哄憳淇℃伅琛)銆戠殑鏁版嵁搴撴搷浣淪ervice @@ -10,4 +12,6 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface MetaImpUserInfoService extends IService { + public List getListByPic(); + } diff --git a/src/main/java/com/ssf/mysqloracletest/service/VillageJwzUserInfoService.java b/src/main/java/com/ssf/mysqloracletest/service/VillageJwzUserInfoService.java new file mode 100644 index 0000000..7a2ff1e --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/service/VillageJwzUserInfoService.java @@ -0,0 +1,53 @@ +package com.ssf.mysqloracletest.service; + +import com.ssf.mysqloracletest.domain.VillageJwzUserInfo; + +import java.util.List; + +/** + * 鏂囩珷鍐呭 + * + * @author chglee + * @email 1992lcg@163.com + * @date 2017-09-09 10:03:34 + */ +public interface VillageJwzUserInfoService { + + /** + * + */ + public VillageJwzUserInfo selectVillageJwzUserInfoById(Long id); + + /** + * + */ + public List selectVillageJwzUserInfoList(VillageJwzUserInfo VillageJwzUserInfo); + + public VillageJwzUserInfo selectVillageJwzUserInfoByIdcard(String idcard); + + /** + * + */ + public int insertVillageJwzUserInfo(VillageJwzUserInfo VillageJwzUserInfo); + + /** + * + */ + public int updateVillageJwzUserInfo(VillageJwzUserInfo VillageJwzUserInfo); + + public int updateVillageJwzUserInfoByIdcard(VillageJwzUserInfo bean); + + /** + * + */ + public int deleteVillageJwzUserInfoByIds(Long[] ids); + + /** + * + */ + public int deleteVillageJwzUserInfoById(Long id); + + public int deleteVillageJwzUserInfoByUpdatetime(VillageJwzUserInfo bean); + + +} 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 563421f..82a8ee5 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/impl/MetaActualUnitUserInfoServiceImpl.java +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/MetaActualUnitUserInfoServiceImpl.java @@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ssf.mysqloracletest.domain.MetaActualUnitUserInfo; import com.ssf.mysqloracletest.service.MetaActualUnitUserInfoService; import com.ssf.mysqloracletest.mapper.MetaActualUnitUserInfoMapper; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author 28758 * @description 閽堝琛ㄣ恗eta_actual_unit_user_info(鍗曚綅浠庝笟浜哄憳淇℃伅琛)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇 @@ -14,9 +17,16 @@ import org.springframework.stereotype.Service; */ @Service @DS("mysql") +@RequiredArgsConstructor public class MetaActualUnitUserInfoServiceImpl extends ServiceImpl implements MetaActualUnitUserInfoService{ + private final MetaActualUnitUserInfoMapper actualUnitUserInfoMapper; + + @Override + public List getListByPic() { + return actualUnitUserInfoMapper.getListByPic(); + } } 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 208e509..f801387 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/impl/MetaActualUserInfoServiceImpl.java +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/MetaActualUserInfoServiceImpl.java @@ -92,6 +92,12 @@ public class MetaActualUserInfoServiceImpl extends ServiceImpl selectListByHomeIdSuccess(MetaActualUserInfo metaActualUserInfo) { + return metaActualUserInfoMapper.selectListByHomeIdSuccess(metaActualUserInfo); + } } diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/MetaHuntersInfoServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/MetaHuntersInfoServiceImpl.java index 104d466..7df9e41 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/impl/MetaHuntersInfoServiceImpl.java +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/MetaHuntersInfoServiceImpl.java @@ -1,24 +1,31 @@ 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.MetaHuntersInfo; -import com.ssf.mysqloracletest.service.MetaHuntersInfoService; import com.ssf.mysqloracletest.mapper.MetaHuntersInfoMapper; +import com.ssf.mysqloracletest.service.MetaHuntersInfoService; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; + /** -* @author 10503 -* @description 閽堝琛ㄣ恗eta_hunters_info(闈炴硶鐙╃寧浜哄憳淇℃伅琛)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇 -* @createDate 2023-12-08 23:11:18 -*/ + * 闈炴硶鐙╃寧浜哄憳淇℃伅琛(MetaHuntersInfo)ServiceImpl + * + * @author makejava + * @since 2023-12-09 17:22:06 + */ @Service +@RequiredArgsConstructor @DS("mysql") -public class MetaHuntersInfoServiceImpl extends ServiceImpl - implements MetaHuntersInfoService{ - -} - - +public class MetaHuntersInfoServiceImpl extends ServiceImpl implements MetaHuntersInfoService { + private final MetaHuntersInfoMapper huntersInfoMapper; + @Override + public List getHuntersList() { + return huntersInfoMapper.getHuntersList(); + } +} 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 a75204d..4ef0326 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/impl/MetaImpUserInfoServiceImpl.java +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/MetaImpUserInfoServiceImpl.java @@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ssf.mysqloracletest.domain.MetaImpUserInfo; import com.ssf.mysqloracletest.service.MetaImpUserInfoService; import com.ssf.mysqloracletest.mapper.MetaImpUserInfoMapper; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author 28758 * @description 閽堝琛ㄣ恗eta_imp_user_info(閲嶇偣浜哄憳淇℃伅琛)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇 @@ -14,9 +17,16 @@ import org.springframework.stereotype.Service; */ @Service @DS("mysql") +@RequiredArgsConstructor public class MetaImpUserInfoServiceImpl extends ServiceImpl implements MetaImpUserInfoService{ + private final MetaImpUserInfoMapper metaImpUserInfoMapper; + + @Override + public List getListByPic() { + return metaImpUserInfoMapper.getListByPic(); + } } diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/VillageActualUserInfoServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/VillageActualUserInfoServiceImpl.java index ef5f19b..51f8a97 100644 --- a/src/main/java/com/ssf/mysqloracletest/service/impl/VillageActualUserInfoServiceImpl.java +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/VillageActualUserInfoServiceImpl.java @@ -145,7 +145,7 @@ public class VillageActualUserInfoServiceImpl implements VillageActualUserInfoSe } - private static String getFolderPath(String picpath) { + public static String getFolderPath(String picpath) { String floderPath; Date date = new Date(); SimpleDateFormat simpleDate = new SimpleDateFormat("yyyyMMdd"); diff --git a/src/main/java/com/ssf/mysqloracletest/service/impl/VillageJwzUserInfoServiceImpl.java b/src/main/java/com/ssf/mysqloracletest/service/impl/VillageJwzUserInfoServiceImpl.java new file mode 100644 index 0000000..2134e63 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/service/impl/VillageJwzUserInfoServiceImpl.java @@ -0,0 +1,122 @@ +package com.ssf.mysqloracletest.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.ssf.mysqloracletest.domain.VillageJwzUserInfo; +import com.ssf.mysqloracletest.mapper.VillageJwzUserInfoMapper; +import com.ssf.mysqloracletest.service.VillageJwzUserInfoService; +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.stereotype.Service; + +import java.util.List; + + +/** + * 褰綋鎶撴媿璁板綍Service涓氬姟灞傚鐞 + * + * @author ruoyi + * @date 2023-04-17 + */ +@Service +@RequiredArgsConstructor +@DS("mysql") +public class VillageJwzUserInfoServiceImpl implements VillageJwzUserInfoService { + + private static final Logger logger = LoggerFactory.getLogger(VillageJwzUserInfoServiceImpl.class); + + + private final VillageJwzUserInfoMapper jwzUserInfoDao; + + /** + * + */ + @Override + public VillageJwzUserInfo selectVillageJwzUserInfoById(Long id) { + VillageJwzUserInfo v = jwzUserInfoDao.selectVillageJwzUserInfoById(id); + return v; + } + + /** + * + */ + @Override + public VillageJwzUserInfo selectVillageJwzUserInfoByIdcard(String idcard) { + VillageJwzUserInfo v = jwzUserInfoDao.selectVillageJwzUserInfoByIdcard(idcard); + return v; + } + + /** + * + */ + @Override + public List selectVillageJwzUserInfoList(VillageJwzUserInfo VillageJwzUserInfo) { + List list = jwzUserInfoDao.selectVillageJwzUserInfoList(VillageJwzUserInfo); + return list; + } + + /** + * + */ + @Override + public int insertVillageJwzUserInfo(VillageJwzUserInfo VillageJwzUserInfo) { + return jwzUserInfoDao.insertVillageJwzUserInfo(VillageJwzUserInfo); + } + + public int saveOrUpdate(VillageJwzUserInfo villageJwzUserInfo) { + try { + String idcard = StringKit.toString(villageJwzUserInfo.getIdCard()); + VillageJwzUserInfo bean = selectVillageJwzUserInfoByIdcard(idcard); + int res = 0; + if (bean == null) { + res = jwzUserInfoDao.insertVillageJwzUserInfo(villageJwzUserInfo); + } else { + VillageJwzUserInfo beanUp = new VillageJwzUserInfo(); + BeanUtils.copyProperties(villageJwzUserInfo, beanUp); + updateVillageJwzUserInfoByIdcard(beanUp); + } + return res; + } catch (Exception e) { + logger.info(StringKit.getTrace(e)); + return 0; + } + } + + /** + * + */ + @Override + public int updateVillageJwzUserInfo(VillageJwzUserInfo VillageJwzUserInfo) { + return jwzUserInfoDao.updateVillageJwzUserInfo(VillageJwzUserInfo); + } + + @Override + public synchronized int updateVillageJwzUserInfoByIdcard(VillageJwzUserInfo bean) { + return jwzUserInfoDao.updateVillageJwzUserInfoByIdcard(bean); + } + + /** + * + */ + @Override + public int deleteVillageJwzUserInfoByIds(Long[] ids) { + return jwzUserInfoDao.deleteVillageJwzUserInfoByIds(ids); + } + + /** + * + */ + @Override + public int deleteVillageJwzUserInfoById(Long id) { + return jwzUserInfoDao.deleteVillageJwzUserInfoById(id); + } + + @Override + public int deleteVillageJwzUserInfoByUpdatetime(VillageJwzUserInfo bean) { + return jwzUserInfoDao.deleteVillageJwzUserInfoByUpdatetime(bean); + } + + +} diff --git a/src/main/java/com/ssf/mysqloracletest/task/JwzUserInfoToActualTask.java b/src/main/java/com/ssf/mysqloracletest/task/JwzUserInfoToActualTask.java new file mode 100644 index 0000000..acd3988 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/task/JwzUserInfoToActualTask.java @@ -0,0 +1,131 @@ +package com.ssf.mysqloracletest.task; + +import com.ssf.mysqloracletest.domain.MetaActualUserInfo; +import com.ssf.mysqloracletest.domain.VillageActualUserInfo; +import com.ssf.mysqloracletest.domain.VillageJwzUserInfo; +import com.ssf.mysqloracletest.service.MetaActualUserInfoService; +import com.ssf.mysqloracletest.service.VillageActualUserInfoService; +import com.ssf.mysqloracletest.service.VillageJwzUserInfoService; +import com.ssf.mysqloracletest.utils.ConfigParam; +import com.ssf.mysqloracletest.utils.IdcardUtil; +import com.ssf.mysqloracletest.utils.NumKit; +import com.ssf.mysqloracletest.utils.StringKit; +import com.ssf.mysqloracletest.utils.util.DictUtil; +import lombok.RequiredArgsConstructor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * 鏍规嵁瀹炴湁浜哄彛涓甫鎴垮眿鍙风殑鏁版嵁浠 鎴风睄淇℃伅涓竻娲楁暟鎹埌 瀹炴湁浜哄彛琛 + */ +@Component +@RequiredArgsConstructor +public class JwzUserInfoToActualTask { + private static final Logger logger = LoggerFactory.getLogger(JwzUserInfoToActualTask.class); + + private final MetaActualUserInfoService actualUserInfoService; + private final VillageJwzUserInfoService jwzUserInfoService; + private final VillageActualUserInfoService villageActualUserInfoService; + + /** + * 澶勭悊瀹炴湁浜哄彛涓殑璁板綍 + */ + @Scheduled(initialDelay = 100, fixedDelay = 3000) + public void actualInfoRebaseHomeId() { + + if (!"true".equals(StringKit.toString(ConfigParam.jwzUserInfoToActual))) { + return; + } + + List userInfos = actualUserInfoService.selectListByHomeIdSuccess(new MetaActualUserInfo()); + + for (MetaActualUserInfo bean : userInfos) { + + String idcard = StringKit.toString(bean.getIdCard()); + //棣栧厛鏍规嵁韬唤璇佸湪 鎴风睄淇℃伅鏌ュ埌杩欎釜浜 + VillageJwzUserInfo jwzUserInfo = jwzUserInfoService.selectVillageJwzUserInfoByIdcard(idcard); + + if (jwzUserInfo == null) { + bean.setHouseholderRelation(0); + actualUserInfoService.saveOrUpdate(bean); + continue; + } + + //鏌ュ埌杩欎釜浜轰箣鍚 鍦ㄦ牴鎹繖涓汉鐨勬埛鍙锋煡璇㈣窡浠栧悓涓鎴风殑浜虹劧鍚庡惊鐜 + VillageJwzUserInfo userInfoPara = new VillageJwzUserInfo(); + + userInfoPara.setAccountNumber(jwzUserInfo.getAccountNumber()); + List jwzUserInfoDos = jwzUserInfoService.selectVillageJwzUserInfoList(userInfoPara); + //閬嶅巻鏌ヨ鍒扮殑鎴风睄淇℃伅鏁版嵁 + for (VillageJwzUserInfo userInfoDo : jwzUserInfoDos) { + String jwzRelation = userInfoDo.getHouseholderRelation(); + int convortRelation = DictUtil.convertRelationJwzUserInfo(jwzRelation); + MetaActualUserInfo saveBean = new MetaActualUserInfo(); + +// String filePath = VillageActualUserInfoServiceImpl.getFolderPath(ConfigParam.wsDownloadPicPath) + idcard + StringKit.toString(UUID.randomUUID()).replaceAll("-", "") + ".jpg"; +// try { +// boolean b = WsOkHttpUtils.wsImageDownload(idcard, filePath); +// } catch (Exception e) { +// filePath = ""; +// } + + + VillageActualUserInfo actUserInfoPara = new VillageActualUserInfo(); + actUserInfoPara.setIdcard(StringKit.toString(idcard)); + List actualUserInfos = villageActualUserInfoService.selectVillageActualUserInfoListLimit1(actUserInfoPara); + String userPic = ""; + if (actualUserInfos != null && actualUserInfos.size() > 0) { + userPic = StringKit.toString(actualUserInfos.get(0).getUserPic()); + } + + + saveBean.setUserPic(userPic); + saveBean.setHouseholderRelation(convortRelation); + //濡傛灉寰幆涓殑韬唤璇 璺 寮濮嬫煡璇㈢殑韬唤璇佷竴鏍 鏇存柊鍗冲彲 + if (idcard.equals(StringKit.toString(userInfoDo.getIdCard()))) { + saveBean.setId(bean.getId()); + actualUserInfoService.saveOrUpdate(saveBean); + } + + + saveBean.setUserName(StringKit.toString(userInfoDo.getUserName())); + saveBean.setIdCard(StringKit.toString(userInfoDo.getIdCard())); + saveBean.setSex(NumKit.checkInt(IdcardUtil.getGenderFromIDCard(userInfoDo.getIdCard()))); + saveBean.setPhone(StringKit.toString(userInfoDo.getPhone())); + saveBean.setLandline(StringKit.toString(userInfoDo.getLandline())); + //todo 绫诲瀷鍏ㄩ儴鏀规垚浜烘埛涓嶄竴鑷 + saveBean.setActualUserType(124); +// saveBean.setHouseHoldRegister(); + saveBean.setHouseHoldAddress(StringKit.toString(userInfoDo.getHouseHoldAddress())); + saveBean.setHabitationAddress(StringKit.toString(userInfoDo.getHouseHoldAddress())); +// saveBean.setPoliceStationCode(); +// saveBean.setPoliceStationName(); + saveBean.setPoliceDistrictCode(StringKit.toString(userInfoDo.getPoliceDistrictCode())); +// saveBean.setPoliceDistrictName(); + saveBean.setManagementStatus("Y"); + saveBean.setHomeId(StringKit.toString(bean.getHomeId())); +// saveBean.setHomeCode(); +// saveBean.setAccountNumber(); + saveBean.setMetaCreateTime(cn.hutool.core.date.DateUtil.format(cn.hutool.core.date.DateUtil.date(), "yyyyMMddHHmmss")); + saveBean.setMetaUpdateTime(cn.hutool.core.date.DateUtil.format(cn.hutool.core.date.DateUtil.date(), "yyyyMMddHHmmss")); + + if ("".equals(userInfoDo.getIdCard())) { + continue; + } + //濡傛灉寰幆涓殑韬唤璇 璺 寮濮嬫煡璇㈢殑韬唤璇佷竴鏍 鏇存柊鍗冲彲 + if (idcard.equals(StringKit.toString(userInfoDo.getIdCard()))) { + saveBean.setId(bean.getId()); + } + actualUserInfoService.saveOrUpdate(saveBean); + + logger.info("鏇存柊鎴栨柊澧炴垚鍔燂細" + saveBean.getIdCard()); + } + + } + } + +} diff --git a/src/main/java/com/ssf/mysqloracletest/task/MetaActualUnitUserInfoTask.java b/src/main/java/com/ssf/mysqloracletest/task/MetaActualUnitUserInfoTask.java index a5a2f63..a4c238b 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/MetaActualUnitUserInfoTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/MetaActualUnitUserInfoTask.java @@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ssf.mysqloracletest.domain.MetaActualUnitUserInfo; import com.ssf.mysqloracletest.domain.VSySydwCyryMysql; +import com.ssf.mysqloracletest.domain.VillageActualUserInfo; import com.ssf.mysqloracletest.service.MetaActualUnitUserInfoService; import com.ssf.mysqloracletest.service.VSySydwCyryMysqlService; +import com.ssf.mysqloracletest.service.VillageActualUserInfoService; import com.ssf.mysqloracletest.utils.ConfigParam; import com.ssf.mysqloracletest.utils.StringKit; import lombok.RequiredArgsConstructor; @@ -30,7 +32,7 @@ public class MetaActualUnitUserInfoTask { private final VSySydwCyryMysqlService vSySydwCyryMysqlService; private final MetaActualUnitUserInfoService metaActualUnitUserInfoService; - + private final VillageActualUserInfoService actualUserInfoService; @Scheduled(initialDelay = 100, fixedDelay = 3000) public void transcyry() { @@ -49,10 +51,8 @@ public class MetaActualUnitUserInfoTask { for (VSySydwCyryMysql bean : resultList) { - - cleanCyry(bean); - latch.countDown(); - + cleanCyry(bean); + latch.countDown(); } @@ -97,7 +97,23 @@ public class MetaActualUnitUserInfoTask { cyry.setStatus("2"); vSySydwCyryMysqlService.updateCyryById(cyry); } + } + + @Scheduled(initialDelay = 100, fixedDelay = 3000) + public void transCyryToPic() { + List impUserInfos = metaActualUnitUserInfoService.getListByPic(); + for (MetaActualUnitUserInfo userInfo : impUserInfos) { + VillageActualUserInfo userInfoPara = new VillageActualUserInfo(); + userInfoPara.setIdcard(StringKit.toString(userInfo.getIdentityId())); + List actualUserInfos = actualUserInfoService.selectVillageActualUserInfoListLimit1(userInfoPara); + String userPic = ""; + if (actualUserInfos != null && actualUserInfos.size() > 0) { + userPic = StringKit.toString(actualUserInfos.get(0).getUserPic()); + } + userInfo.setStaffPic(userPic); + metaActualUnitUserInfoService.updateById(userInfo); + } } diff --git a/src/main/java/com/ssf/mysqloracletest/task/MetaImpUserInfoTask.java b/src/main/java/com/ssf/mysqloracletest/task/MetaImpUserInfoTask.java index 1ed702b..9d947b8 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/MetaImpUserInfoTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/MetaImpUserInfoTask.java @@ -80,7 +80,7 @@ public class MetaImpUserInfoTask { userInfo.setPhone(StringKit.toString(beanCp.getSJHM())); String zdrlx = StringKit.toString(beanCp.getZDRYXL()); - if ("".equals(zdrlx)) { + if (!"".equals(zdrlx)) { userInfo.setImpUserType(zdrlx.substring(0, 4) + "000000"); userInfo.setImpUserSubType(beanCp.getZDRYXL()); } @@ -105,4 +105,21 @@ public class MetaImpUserInfoTask { } + @Scheduled(initialDelay = 100, fixedDelay = 3000) + public void transCyryToPic() { + List impUserInfos = metaImpUserInfoService.getListByPic(); + for (MetaImpUserInfo userInfo : impUserInfos) { + VillageActualUserInfo userInfoPara = new VillageActualUserInfo(); + userInfoPara.setIdcard(StringKit.toString(userInfo.getIdCard())); + List actualUserInfos = actualUserInfoService.selectVillageActualUserInfoListLimit1(userInfoPara); + String userPic = ""; + if (actualUserInfos != null && actualUserInfos.size() > 0) { + userPic = StringKit.toString(actualUserInfos.get(0).getUserPic()); + } + userInfo.setUserPic(userPic); + metaImpUserInfoService.updateById(userInfo); + } + } + + } diff --git a/src/main/java/com/ssf/mysqloracletest/task/SlryOracleTask.java b/src/main/java/com/ssf/mysqloracletest/task/SlryOracleTask.java index 4ee62cc..b89a762 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/SlryOracleTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/SlryOracleTask.java @@ -69,7 +69,7 @@ public class SlryOracleTask { for (SlryOracle slry : slryList) { MetaHuntersInfo metaHuntersInfo = new MetaHuntersInfo(); metaHuntersInfo.setHunterName(slry.getXM()); - metaHuntersInfo.setSex(slry.getXB()); + metaHuntersInfo.setSex(NumKit.checkInt(slry.getXB())); metaHuntersInfo.setPhone(slry.getSJHM()); metaHuntersInfo.setIdCard(slry.getZJHM()); metaHuntersInfo.setHouseHoldRegister(slry.getHJDQH()); diff --git a/src/main/java/com/ssf/mysqloracletest/task/SyrkToActualInfoTask.java b/src/main/java/com/ssf/mysqloracletest/task/SyrkToActualInfoTask.java index 5104980..b08efac 100644 --- a/src/main/java/com/ssf/mysqloracletest/task/SyrkToActualInfoTask.java +++ b/src/main/java/com/ssf/mysqloracletest/task/SyrkToActualInfoTask.java @@ -1,6 +1,8 @@ package com.ssf.mysqloracletest.task; -import com.ssf.mysqloracletest.domain.*; +import com.ssf.mysqloracletest.domain.MetaActualUserInfo; +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; @@ -92,6 +94,8 @@ public class SyrkToActualInfoTask { // } + String idcard = StringKit.toString(beanCp.getSFZH()); + VillageActualUserInfo userInfoPara = new VillageActualUserInfo(); userInfoPara.setIdcard(StringKit.toString(beanCp.getSFZH())); List actualUserInfos = villageActualUserInfoService.selectVillageActualUserInfoListLimit1(userInfoPara); @@ -100,10 +104,18 @@ public class SyrkToActualInfoTask { userPic = StringKit.toString(actualUserInfos.get(0).getUserPic()); } + +// String filePath = VillageActualUserInfoServiceImpl.getFolderPath(ConfigParam.wsDownloadPicPath) + idcard + StringKit.toString(UUID.randomUUID()).replaceAll("-", "") + ".jpg"; +// try { +// boolean b = WsOkHttpUtils.wsImageDownload(idcard, filePath); +// } catch (Exception e) { +// filePath = ""; +// } + MetaActualUserInfo realEstateInfo = new MetaActualUserInfo(); realEstateInfo.setUserPic(userPic); realEstateInfo.setUserName(beanCp.getXM()); - realEstateInfo.setIdCard(beanCp.getSFZH()); + realEstateInfo.setIdCard(idcard); realEstateInfo.setSex(NumKit.checkInt(beanCp.getXB())); realEstateInfo.setPhone(beanCp.getLXDH()); realEstateInfo.setLandline(beanCp.getSJHM()); diff --git a/src/main/java/com/ssf/mysqloracletest/task/hunterToPicTask.java b/src/main/java/com/ssf/mysqloracletest/task/hunterToPicTask.java new file mode 100644 index 0000000..59771cf --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/task/hunterToPicTask.java @@ -0,0 +1,59 @@ +package com.ssf.mysqloracletest.task; + +import com.ssf.mysqloracletest.domain.MetaHuntersInfo; +import com.ssf.mysqloracletest.domain.VillageActualUserInfo; +import com.ssf.mysqloracletest.service.MetaHuntersInfoService; +import com.ssf.mysqloracletest.service.VillageActualUserInfoService; +import com.ssf.mysqloracletest.utils.StringKit; +import lombok.RequiredArgsConstructor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * 鏍规嵁瀹炴湁浜哄彛涓甫鎴垮眿鍙风殑鏁版嵁浠 鎴风睄淇℃伅涓竻娲楁暟鎹埌 瀹炴湁浜哄彛琛 + */ +@Component +@RequiredArgsConstructor +public class hunterToPicTask { + private static final Logger logger = LoggerFactory.getLogger(hunterToPicTask.class); + + private final VillageActualUserInfoService actualUserInfoService; + private final MetaHuntersInfoService huntersInfoService; + + + /** + * 澶勭悊瀹炴湁浜哄彛涓殑璁板綍 + */ + @Scheduled(initialDelay = 100, fixedDelay = 3000) + public void huntersToPic() { + + + List huntersInfos = huntersInfoService.getHuntersList(); + for (MetaHuntersInfo huntersInfo : huntersInfos) { + String idcard = huntersInfo.getIdCard(); + + if ("".equals(StringKit.toString(idcard))) { + huntersInfo.setUserPic(""); + } else { + VillageActualUserInfo userInfoPara = new VillageActualUserInfo(); + userInfoPara.setIdcard(idcard); + List actualUserInfos = actualUserInfoService.selectVillageActualUserInfoListLimit1(userInfoPara); + + String userPic = ""; + if (actualUserInfos != null && actualUserInfos.size() > 0) { + userPic = StringKit.toString(actualUserInfos.get(0).getUserPic()); + } + huntersInfo.setUserPic(userPic); + } + + huntersInfoService.saveOrUpdate(huntersInfo); + logger.info("idcard鍥剧墖鏇存柊鎴愬姛锛" + idcard); + } + + } + +} diff --git a/src/main/java/com/ssf/mysqloracletest/utils/ConfigParam.java b/src/main/java/com/ssf/mysqloracletest/utils/ConfigParam.java index 7b41dfe..21f8db4 100644 --- a/src/main/java/com/ssf/mysqloracletest/utils/ConfigParam.java +++ b/src/main/java/com/ssf/mysqloracletest/utils/ConfigParam.java @@ -52,4 +52,10 @@ public class ConfigParam { public static String SlryOracleSwitch = StringKit.toString(PropertiesUtil.queryPropertiesByKey("SlryOracleSwitch")); + public static String jwzUserInfoToActual = StringKit.toString(PropertiesUtil.queryPropertiesByKey("jwzUserInfoToActual")); + + public static String wshttpurl = PropertiesUtil.queryPropertiesByKey("wshttpurl"); + public static String wsDownloadPicPath = PropertiesUtil.queryPropertiesByKey("wsDownloadPicPath"); + public static String wsDownloadPicAreaStart = PropertiesUtil.queryPropertiesByKey("wsDownloadPicAreaStart"); + } diff --git a/src/main/java/com/ssf/mysqloracletest/utils/IdcardUtil.java b/src/main/java/com/ssf/mysqloracletest/utils/IdcardUtil.java new file mode 100644 index 0000000..04d1075 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/utils/IdcardUtil.java @@ -0,0 +1,59 @@ +package com.ssf.mysqloracletest.utils; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.text.SimpleDateFormat; +import java.util.Date; + +public class IdcardUtil { + + private static Logger logger = LoggerFactory.getLogger(IdcardUtil.class); + + // 浠庤韩浠借瘉鍙风爜涓幏鍙栨у埆 + public static String getGenderFromIDCard(String idCard) { + String gender = ""; + try { + if (idCard.length() == 18) { + int genderCode = Integer.parseInt(idCard.substring(16, 17)); + //1鐢 2濂 + gender = genderCode % 2 == 0 ? "2" : "1"; +// gender = genderCode % 2 == 0 ? "濂" : "鐢"; + } + } catch (Exception e) { + logger.info(idCard + ":鎻愬彇鎬у埆澶辫触"); + } + return gender; + } + + // 浠庤韩浠借瘉鍙风爜涓幏鍙栫敓鏃 + public static String getBirthdayFromIDCard(String idCard) { + String birthday = ""; + if (idCard.length() == 18) { + String year = idCard.substring(6, 10); + String month = idCard.substring(10, 12); + String day = idCard.substring(12, 14); + birthday = year + "-" + month + "-" + day; + } + return birthday; + } + + + /** + * 灏嗚韩浠借瘉涓殑鐢熸棩杞垚date + * + * @param dateString + * @return + */ + public static Date convertStringToDate(String dateString) { + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + try { + return sdf.parse(dateString); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } + + +} diff --git a/src/main/java/com/ssf/mysqloracletest/utils/WsOkHttpUtils.java b/src/main/java/com/ssf/mysqloracletest/utils/WsOkHttpUtils.java new file mode 100644 index 0000000..0ff3d81 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/utils/WsOkHttpUtils.java @@ -0,0 +1,74 @@ +package com.ssf.mysqloracletest.utils; + +import com.squareup.okhttp.OkHttpClient; +import com.squareup.okhttp.Request; +import com.squareup.okhttp.Response; +import com.squareup.okhttp.ResponseBody; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.FileOutputStream; +import java.io.InputStream; +import java.io.OutputStream; + +public class WsOkHttpUtils { + private static Logger logger = LoggerFactory.getLogger(WsOkHttpUtils.class); + + + public static boolean wsImageDownload(String idcard, String toPath) { + String url = ConfigParam.wshttpurl + idcard; + OkHttpClient client = new OkHttpClient(); + Request request = new Request.Builder() + .url(url) + .get() + .addHeader("User-Agent", "PostmanRuntime/7.15.2") + .addHeader("Accept", "*/*") + .addHeader("Cache-Control", "no-cache") + .addHeader("Postman-Token", "7c9d31e5-31af-462b-a139-1d8e708f3754,66cb412d-20dd-42e2-930f-ea1f746d890d") + .addHeader("Accept-Encoding", "gzip, deflate") + .addHeader("Referer", url) + .addHeader("Connection", "keep-alive") + .addHeader("cache-control", "no-cache") + .build(); + + try { + Response response = client.newCall(request).execute(); + + if (response.isSuccessful()) { + // 鑾峰彇鍝嶅簲浣 + ResponseBody responseBody = response.body(); + + long length = responseBody.contentLength(); + if (0 == length) { + logger.info("pic length is null"); + return false; + } + + // 鑾峰彇杈撳叆娴 + InputStream inputStream = responseBody.byteStream(); + + // 鎸囧畾鏈湴淇濆瓨璺緞 +// String localFilePath = "path/to/save/image.jpg"; + + // 浣跨敤杈撳嚭娴佸皢杈撳叆娴佸啓鍏ユ湰鍦版枃浠 + try (OutputStream outputStream = new FileOutputStream(toPath)) { + byte[] buffer = new byte[8192]; + int bytesRead; + while ((bytesRead = inputStream.read(buffer)) != -1) { + outputStream.write(buffer, 0, bytesRead); + } + } + + logger.info("Image saved successfully!"); + return true; + } else { + logger.info("Request failed with code: " + response.code()); + } + } catch (Exception e) { + e.printStackTrace(); + } + return false; + } + + +} diff --git a/src/main/java/com/ssf/mysqloracletest/utils/util/DictUtil.java b/src/main/java/com/ssf/mysqloracletest/utils/util/DictUtil.java new file mode 100644 index 0000000..c960fb6 --- /dev/null +++ b/src/main/java/com/ssf/mysqloracletest/utils/util/DictUtil.java @@ -0,0 +1,551 @@ +package com.ssf.mysqloracletest.utils.util; + +import com.ssf.mysqloracletest.utils.StringKit; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class DictUtil { + + private static Logger logger = LoggerFactory.getLogger(DictUtil.class); + + /** + * 涓庢埛涓诲叧绯诲瓧鍏歌浆鎹 + * + * @return + */ + public static int convertRelation(String value) { + value = StringKit.toString(value); + int result = 8; + + //1 鏈汉 + if ("01".equals(value)) { + result = 0; + } + //2 鎴蜂富 + else if ("02".equals(value)) { + result = 0; + } + //3 灏忛泦浣撴埛鎴蜂富 + else if ("03".equals(value)) { + result = 0; + } + //10 閰嶅伓 + else if ("10".equals(value)) { + result = 1; + } + //11 澶 + else if ("11".equals(value)) { + result = 1; + } + //12 濡 + else if ("12".equals(value)) { + result = 1; + } + //20 瀛 + else if ("20".equals(value)) { + result = 2; + } + //21 鐙敓瀛 + else if ("21".equals(value)) { + result = 2; + } + //22 闀垮瓙 + else if ("22".equals(value)) { + result = 2; + } + //23 娆″瓙 + else if ("23".equals(value)) { + result = 2; + } + //24 涓夊瓙 + else if ("24".equals(value)) { + result = 2; + } + //25 鍥涘瓙 + else if ("25".equals(value)) { + result = 2; + } + //26 浜斿瓙 + else if ("26".equals(value)) { + result = 2; + } + //27 鍏诲瓙鎴栫户瀛 + else if ("27".equals(value)) { + result = 2; + } + //28 濂冲┛ + else if ("28".equals(value)) { + result = 8; + } + //29 鍏跺畠鍎垮瓙 + else if ("28".equals(value)) { + result = 2; + } + //30 濂 + else if ("30".equals(value)) { + result = 3; + } + //31 鐙敓濂 + else if ("31".equals(value)) { + result = 3; + } + //32 闀垮コ + else if ("32".equals(value)) { + result = 3; + } + //33 浜屽コ + else if ("33".equals(value)) { + result = 3; + } + //34 涓夊コ + else if ("34".equals(value)) { + result = 3; + } + //35 鍥涘コ + else if ("35".equals(value)) { + result = 3; + } + //36 浜斿コ + else if ("36".equals(value)) { + result = 3; + } + //37 鍏诲コ + else if ("37".equals(value)) { + result = 3; + } + //38 鍎垮 + else if ("38".equals(value)) { + result = 8; + } + //39 鍏跺畠濂冲効 + else if ("39".equals(value)) { + result = 3; + } + //40 瀛欏瓙,瀛欏コ鎴栧瀛欏瓙,澶栧瓩濂 + else if ("40".equals(value)) { + result = 4; + } + //41 瀛欏瓙 + else if ("41".equals(value)) { + result = 4; + } + //42 瀛欏コ + else if ("42".equals(value)) { + result = 4; + } + //43 澶栧瓩瀛 + else if ("43".equals(value)) { + result = 4; + } + //44 澶栧瓩濂 + else if ("44".equals(value)) { + result = 4; + } + //45 瀛欏濡囨垨澶栧瓩濯冲 + else if ("45".equals(value)) { + result = 8; + } + //46 瀛欏コ濠挎垨澶栧瓩濂冲┛ + else if ("46".equals(value)) { + result = 8; + } + //47 鏇惧瓩瀛愭垨鏇惧瀛欏瓙 + else if ("47".equals(value)) { + result = 8; + } + //48 鏇惧瓩濂虫垨鏇惧瀛欏コ + else if ("48".equals(value)) { + result = 8; + } + //49 鍏朵粬瀛欏瓙,瀛欏コ鎴栧瀛欏瓙 + else if ("49".equals(value)) { + result = 8; + } + //50 鐖舵瘝 + else if ("50".equals(value)) { + result = 5; + } + //51 鐖朵翰 + else if ("51".equals(value)) { + result = 5; + } + //52 姣嶄翰 + else if ("52".equals(value)) { + result = 5; + } + //53 鍏叕 + else if ("53".equals(value)) { + result = 8; + } + //54 濠嗗﹩ + else if ("54".equals(value)) { + result = 8; + } + //55 宀崇埗 + else if ("55".equals(value)) { + result = 8; + } + //56 宀虫瘝 + else if ("56".equals(value)) { + result = 8; + } + //57 缁х埗鎴栧吇鐖 + else if ("57".equals(value)) { + result = 8; + } + //58 缁ф瘝鎴栧吇姣 + else if ("58".equals(value)) { + result = 8; + } + //59 鍏跺畠鐖舵瘝鍏崇郴 + else if ("59".equals(value)) { + result = 8; + } + //60 绁栫埗姣嶆垨澶栫鐖舵瘝 + else if ("60".equals(value)) { + result = 6; + } + //61 绁栫埗 + else if ("61".equals(value)) { + result = 6; + } + //62 绁栨瘝 + else if ("62".equals(value)) { + result = 6; + } + //63 澶栫鐖 + else if ("63".equals(value)) { + result = 6; + } + //64 澶栫姣 + else if ("64".equals(value)) { + result = 6; + } + //65 閰嶅伓鐨勭鐖舵瘝鎴栧绁栫埗姣 + else if ("65".equals(value)) { + result = 8; + } + //66 鏇剧鐖 + else if ("66".equals(value)) { + result = 8; + } + //67 鏇剧姣 + else if ("67".equals(value)) { + result = 8; + } + //68 閰嶅伓鐨勬浘绁栫埗姣 + else if ("68".equals(value)) { + result = 8; + } + //69 鍏跺畠绁栫埗姣嶆垨澶栫鐖舵瘝鍏崇郴 + else if ("69".equals(value)) { + result = 8; + } + //70 鍏勫紵濮愬 + else if ("70".equals(value)) { + result = 7; + } + //71 鍏 + else if ("71".equals(value)) { + result = 7; + } + //72 瀚 + else if ("72".equals(value)) { + result = 8; + } + //73 寮 + else if ("73".equals(value)) { + result = 7; + } + //74 寮熷 + else if ("74".equals(value)) { + result = 8; + } + //75 濮愬 + else if ("75".equals(value)) { + result = 7; + } + //76 濮愬か + else if ("76".equals(value)) { + result = 8; + } + //77 濡瑰 + else if ("77".equals(value)) { + result = 7; + } + //78 濡瑰か + else if ("78".equals(value)) { + result = 8; + } + //79 鍏跺畠鍏勫紵濮愬 + else if ("79".equals(value)) { + result = 8; + } else { + //涓嬮潰鐨勫叧绯婚兘鏄叾浠 + result = 8; + } + + return result; + + +// 81 浼埗 +// 82 浼瘝 +// 83 鍙旂埗 +// 84 濠舵瘝 +// 85 鑸呯埗 +// 86 鑸呮瘝 +// 87 濮ㄧ埗 +// 88 濮ㄦ瘝 +// 89 濮戠埗 +// 90 濮戞瘝 +// 91 鍫傚厔寮,鍫傚濡 +// 92 琛ㄥ厔寮,琛ㄥ濡 +// 93 渚勫瓙 +// 94 渚勫コ +// 95 澶栫敟 +// 96 澶栫敟濂 +// 97 鍏朵粬浜插睘 +// 98 淇濆 +// 99 闈炰翰灞 + + + } + + public static int convertRelationJwzUserInfo(String value) { + value = StringKit.toString(value); + int result = 99; + + //1 鏈汉 + if ("01".equals(value)) { + result = 99; + } + //2 鎴蜂富 + else if ("02".equals(value)) { + result = 1; + } + //3 灏忛泦浣撴埛鎴蜂富 + else if ("03".equals(value)) { + result = 1; + } + //10 閰嶅伓 + else if ("10".equals(value)) { + result = 2; + } + //11 澶 + else if ("11".equals(value)) { + result = 2; + } + //12 濡 + else if ("12".equals(value)) { + result = 2; + } + //20 瀛 + else if ("20".equals(value)) { + result = 3; + } + //21 鐙敓瀛 + else if ("21".equals(value)) { + result = 3; + } + //22 闀垮瓙 + else if ("22".equals(value)) { + result = 3; + } + //23 娆″瓙 + else if ("23".equals(value)) { + result = 3; + } + //24 涓夊瓙 + else if ("24".equals(value)) { + result = 3; + } + //25 鍥涘瓙 + else if ("25".equals(value)) { + result = 3; + } + //26 浜斿瓙 + else if ("26".equals(value)) { + result = 3; + } + //27 鍏诲瓙鎴栫户瀛 + else if ("27".equals(value)) { + result = 3; + } + //29 鍏跺畠鍎垮瓙 + else if ("28".equals(value)) { + result = 3; + } + //30 濂 + else if ("30".equals(value)) { + result = 4; + } + //31 鐙敓濂 + else if ("31".equals(value)) { + result = 4; + } + //32 闀垮コ + else if ("32".equals(value)) { + result = 4; + } + //33 浜屽コ + else if ("33".equals(value)) { + result = 4; + } + //34 涓夊コ + else if ("34".equals(value)) { + result = 4; + } + //35 鍥涘コ + else if ("35".equals(value)) { + result = 4; + } + //36 浜斿コ + else if ("36".equals(value)) { + result = 4; + } + //37 鍏诲コ + else if ("37".equals(value)) { + result = 4; + } + //39 鍏跺畠濂冲効 + else if ("39".equals(value)) { + result = 4; + } + //40 瀛欏瓙,瀛欏コ鎴栧瀛欏瓙,澶栧瓩濂 + else if ("40".equals(value)) { + result = 5; + } + //41 瀛欏瓙 + else if ("41".equals(value)) { + result = 5; + } + //42 瀛欏コ + else if ("42".equals(value)) { + result = 5; + } + //43 澶栧瓩瀛 + else if ("43".equals(value)) { + result = 5; + } + //44 澶栧瓩濂 + else if ("44".equals(value)) { + result = 5; + } + //47 鏇惧瓩瀛愭垨鏇惧瀛欏瓙 + else if ("47".equals(value)) { + result = 5; + } + //48 鏇惧瓩濂虫垨鏇惧瀛欏コ + else if ("48".equals(value)) { + result = 5; + } + //49 鍏朵粬瀛欏瓙,瀛欏コ鎴栧瀛欏瓙 + else if ("49".equals(value)) { + result = 5; + } + //50 鐖舵瘝 + else if ("50".equals(value)) { + result = 6; + } + //51 鐖朵翰 + else if ("51".equals(value)) { + result = 6; + } + //52 姣嶄翰 + else if ("52".equals(value)) { + result = 6; + } + //57 缁х埗鎴栧吇鐖 + else if ("57".equals(value)) { + result = 6; + } + //58 缁ф瘝鎴栧吇姣 + else if ("58".equals(value)) { + result = 6; + } + //59 鍏跺畠鐖舵瘝鍏崇郴 + else if ("59".equals(value)) { + result = 6; + } + //60 绁栫埗姣嶆垨澶栫鐖舵瘝 + else if ("60".equals(value)) { + result = 7; + } + //61 绁栫埗 + else if ("61".equals(value)) { + result = 7; + } + //62 绁栨瘝 + else if ("62".equals(value)) { + result = 7; + } + //63 澶栫鐖 + else if ("63".equals(value)) { + result = 7; + } + //64 澶栫姣 + else if ("64".equals(value)) { + result = 7; + } + //65 閰嶅伓鐨勭鐖舵瘝鎴栧绁栫埗姣 + else if ("65".equals(value)) { + result = 7; + } + //66 鏇剧鐖 + else if ("66".equals(value)) { + result = 7; + } + //67 鏇剧姣 + else if ("67".equals(value)) { + result = 7; + } + //68 閰嶅伓鐨勬浘绁栫埗姣 + else if ("68".equals(value)) { + result = 7; + } + //69 鍏跺畠绁栫埗姣嶆垨澶栫鐖舵瘝鍏崇郴 + else if ("69".equals(value)) { + result = 7; + } + //70 鍏勫紵濮愬 + else if ("70".equals(value)) { + result = 8; + } + //71 鍏 + else if ("71".equals(value)) { + result = 8; + } + //73 寮 + else if ("73".equals(value)) { + result = 8; + } + //75 濮愬 + else if ("75".equals(value)) { + result = 8; + } + //76 濮愬か + else if ("76".equals(value)) { + result = 8; + } + //77 濡瑰 + else if ("77".equals(value)) { + result = 8; + } + //78 濡瑰か + else if ("78".equals(value)) { + result = 8; + } + //79 鍏跺畠鍏勫紵濮愬 + else if ("79".equals(value)) { + result = 8; + } else { + //涓嬮潰鐨勫叧绯婚兘鏄叾浠 + result = 99; + } + + return result; + + } + + +} diff --git a/src/main/resources/lib/arcsoft-sdk-face-3.0.0.0.jar b/src/main/resources/lib/arcsoft-sdk-face-3.0.0.0.jar new file mode 100644 index 0000000..5f37c1e Binary files /dev/null and b/src/main/resources/lib/arcsoft-sdk-face-3.0.0.0.jar differ diff --git a/src/main/resources/lib/artemis-http-client-1.1.8-javadoc.jar b/src/main/resources/lib/artemis-http-client-1.1.8-javadoc.jar new file mode 100644 index 0000000..6a3450d Binary files /dev/null and b/src/main/resources/lib/artemis-http-client-1.1.8-javadoc.jar differ diff --git a/src/main/resources/lib/artemis-http-client-1.1.8-sources.jar b/src/main/resources/lib/artemis-http-client-1.1.8-sources.jar new file mode 100644 index 0000000..1d4855a Binary files /dev/null and b/src/main/resources/lib/artemis-http-client-1.1.8-sources.jar differ diff --git a/src/main/resources/lib/artemis-http-client-1.1.8.jar b/src/main/resources/lib/artemis-http-client-1.1.8.jar new file mode 100644 index 0000000..01e93e3 Binary files /dev/null and b/src/main/resources/lib/artemis-http-client-1.1.8.jar differ diff --git a/src/main/resources/lib/kotlin-stdlib-1.3.71.jar b/src/main/resources/lib/kotlin-stdlib-1.3.71.jar new file mode 100644 index 0000000..e9012cf Binary files /dev/null and b/src/main/resources/lib/kotlin-stdlib-1.3.71.jar differ diff --git a/src/main/resources/lib/okhttp-2.2.0.jar b/src/main/resources/lib/okhttp-2.2.0.jar new file mode 100644 index 0000000..aabcbaa Binary files /dev/null and b/src/main/resources/lib/okhttp-2.2.0.jar differ diff --git a/src/main/resources/lib/okhttp-4.9.1.jar b/src/main/resources/lib/okhttp-4.9.1.jar new file mode 100644 index 0000000..e0f95b2 Binary files /dev/null and b/src/main/resources/lib/okhttp-4.9.1.jar differ diff --git a/src/main/resources/lib/okio-2.8.0.jar b/src/main/resources/lib/okio-2.8.0.jar new file mode 100644 index 0000000..bac6c6e Binary files /dev/null and b/src/main/resources/lib/okio-2.8.0.jar differ diff --git a/src/main/resources/mapper/MetaActualUserInfoMapper.xml b/src/main/resources/mapper/MetaActualUserInfoMapper.xml index 53ab173..329f28e 100644 --- a/src/main/resources/mapper/MetaActualUserInfoMapper.xml +++ b/src/main/resources/mapper/MetaActualUserInfoMapper.xml @@ -156,4 +156,9 @@ where home_id is not null and account_number is null limit 200; + + \ No newline at end of file diff --git a/src/main/resources/mapper/VillageJwzUserInfoMapper.xml b/src/main/resources/mapper/VillageJwzUserInfoMapper.xml new file mode 100644 index 0000000..91332c9 --- /dev/null +++ b/src/main/resources/mapper/VillageJwzUserInfoMapper.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select + id, + + householder_relation, + education, + religious, + marriage, + political_outlook, + + management_status, + user_pic, + user_name, + phone, + account_number, + + landline, + id_card, + house_hold_register, + house_hold_address, + spouse_name, + + spouse_id_card, + father_name, + father_id_card, + mother_name, + mother_id_card, + + police_district_code, + isactive + from village_jwz_user_info + + + + + + + + + + insert into village_jwz_user_info + + householder_relation, + education, + religious, + marriage, + political_outlook, + + management_status, + user_pic, + user_name, + phone, + account_number, + + landline, + id_card, + house_hold_register, + house_hold_address, + spouse_name, + + spouse_id_card, + father_name, + father_id_card, + mother_name, + mother_id_card, + + police_district_code, + isactive, + + + #{householderRelation}, + #{education}, + #{religious}, + #{marriage}, + #{politicalOutlook}, + + #{managementStatus}, + #{userPic}, + #{userName}, + #{phone}, + #{accountNumber}, + + #{landline}, + #{idCard}, + #{houseHoldRegister}, + #{houseHoldAddress}, + #{spouseName}, + + #{spouseIdCard}, + #{fatherName}, + #{fatherIdCard}, + #{motherName}, + #{motherIdCard}, + + #{policeDistrictCode}, + #{isactive}, + + + + + + update village_jwz_user_info + + householder_relation = #{householderRelation}, + education = #{education}, + religious = #{religious}, + marriage = #{marriage}, + political_outlook = #{politicalOutlook}, + + management_status = #{managementStatus}, + user_pic = #{userPic}, + user_name = #{userName}, + phone = #{phone}, + account_number = #{accountNumber}, + + landline = #{landline}, + id_card = #{idCard}, + house_hold_register = #{houseHoldRegister}, + house_hold_address = #{houseHoldAddress}, + spouse_name = #{spouseName}, + + spouse_id_card = #{spouseIdCard}, + father_name = #{fatherName}, + father_id_card = #{fatherIdCard}, + mother_name = #{motherName}, + mother_id_card = #{motherIdCard}, + + police_district_code = #{policeDistrictCode}, + isactive = #{isactive}, + + where id = #{id} + + + + update village_jwz_user_info + + householder_relation = #{householderRelation}, + education = #{education}, + religious = #{religious}, + marriage = #{marriage}, + political_outlook = #{politicalOutlook}, + + management_status = #{managementStatus}, + user_pic = #{userPic}, + user_name = #{userName}, + phone = #{phone}, + account_number = #{accountNumber}, + + landline = #{landline}, + id_card = #{idCard}, + house_hold_register = #{houseHoldRegister}, + house_hold_address = #{houseHoldAddress}, + spouse_name = #{spouseName}, + + spouse_id_card = #{spouseIdCard}, + father_name = #{fatherName}, + father_id_card = #{fatherIdCard}, + mother_name = #{motherName}, + mother_id_card = #{motherIdCard}, + + police_district_code = #{policeDistrictCode}, + isactive = #{isactive}, + + where id_card = #{idCard} + + + + delete from village_jwz_user_info where id = #{id} + + + + delete from village_jwz_user_info where DATE_FORMAT(updatetime, '%Y-%m-%d') != '${updatetimeV}' + + + + delete from village_jwz_user_info where id in + + #{id} + + + + + + + + + \ No newline at end of file