diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/SynUserLawNoByCodeTask.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/SynUserLawNoByCodeTask.java new file mode 100644 index 00000000..311266af --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/task/SynUserLawNoByCodeTask.java @@ -0,0 +1,65 @@ +package com.zdxt.app.task; + +import com.zdxt.auth.project.system.user.service.IUserService; +import com.zdxt.code.domain.Zfryjdm2405301; +import com.zdxt.code.service.IZfryjdm2405301Service; +import com.zdxt.common.util.IdCardCryptoUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import java.util.List; + + +/** + * @Author: kylin + * @Date: 2024/5/9 2:58 下午 + * @Version: 1.0 + * @Desc: TODO + */ +@Component("synUserLawNoByCodeTask") +public class SynUserLawNoByCodeTask { + + private static final Logger log = LoggerFactory.getLogger(SynUserLawNoByCodeTask.class); + + @Value("${srnwg.secretKey}") + private String secretKey; + + @Autowired private IZfryjdm2405301Service iZfryjdm2405301Service; + @Autowired private IUserService userService; + + + + public void run(){ + this.encryptSfzcode(); + } + + /** + * 同步用户执法编码 + */ + public void encryptSfzcode(){ + int optionNum = 0; + int optionUserNum = 0; + try { + List zqyjjdmList = iZfryjdm2405301Service.selectZfryjdmList(null); + for (Zfryjdm2405301 zq : zqyjjdmList) { + //证件号加密 + String sfzcode = ""; + try { + sfzcode = IdCardCryptoUtil.symmetricEncryptIdCard(secretKey, zq.getSfzcode()); + } catch (Exception e) { + sfzcode = ""; + } + zq.setSfzcodeEncrypt(sfzcode); + optionNum += iZfryjdm2405301Service.updateZfryjdmSfzcodeByid(zq); + optionUserNum += userService.updateLawCertificateNum(sfzcode); + } + log.info("加密身份证数量 : {}", optionNum); + log.info("更新用户执法码数量 : {}", optionUserNum); + } catch (Exception e) { + e.printStackTrace(); + } + } +} diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/mapper/UserMapper.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/mapper/UserMapper.java index 592a91e2..d52eb9d4 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/mapper/UserMapper.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/mapper/UserMapper.java @@ -181,4 +181,10 @@ public interface UserMapper * @return */ List getDeptByUser(@Param("deptId") Long[] deptId,@Param("postCode")String postCode ); + + /** + * 更新执法证件号 + * @return + */ + public int updateLawCertificateNum(String sfzcodeEncrypt); } diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/IUserService.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/IUserService.java index e14da907..3f656dec 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/IUserService.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/IUserService.java @@ -223,4 +223,10 @@ public interface IUserService * @return */ Map addSrzUser(JSONArray dataArr, String token); + + /** + * 更新执法证件号 + * @return + */ + public int updateLawCertificateNum(String sfzcodeEncrypt); } diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java index 6ac5aeeb..2b280713 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/user/service/UserServiceImpl.java @@ -714,6 +714,11 @@ public class UserServiceImpl implements IUserService { return resMap; } + @Override + public int updateLawCertificateNum(String sfzcodeEncrypt) { + return userMapper.updateLawCertificateNum(sfzcodeEncrypt); + } + @Value("${srnwg.url}") private String znwgUrl; @Value("${srnwg.paasId}") diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml index f00c03d4..f8a2e626 100644 --- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml @@ -492,4 +492,11 @@ #{deptId} + + + + update sys_user + set law_certificate_num = (select zfcode from zfryjdm2405301 where sfzcode_encrypt = #{sfzcodeEncrypt} limit 1) + where certificateNumber = #{sfzcodeEncrypt} + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zfryjdm2405301.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zfryjdm2405301.java old mode 100644 new mode 100755 index 37409ce6..f2567a97 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zfryjdm2405301.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zfryjdm2405301.java @@ -1,36 +1,78 @@ package com.zdxt.code.domain; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + /** - * 执法人员数据 + * 双系统 + * + * @author ruoyi + * @date 2024-04-12 */ +@JsonIgnoreProperties(ignoreUnknown = true) public class Zfryjdm2405301 { + private static final long serialVersionUID = 1L; - /** - * 执法人员姓名 - */ + /** 主键 */ + private String id; + /** 是否有效 */ + private String sfyx; + /** 执法人员类型 */ + private String rylx; + /** 执法单位 */ + private String zfzzfdw; + /** 执法人员ID */ + private String zfryid; + /** 执法人员姓名 */ private String name; + /** 身份证号码 */ + private String sfzcode; + /** 身份证号码 */ + private String sfzcodeEncrypt; + /** 执法单位的组织机构代码 */ + private String zzjgdm; + /** 执法单位 */ + private String zfdw; + /** 单位地址 */ + private String address; + /** 所属主体名称 */ + private String subName; + /** 是否具有法律职业资格 */ + private String isLawcode; + /** 证件状态 */ + private String codeState; + /** 执法证编号 */ + private String zfcode; - /** - * 执法单位 - */ - private String zfzzfdw; + public String getSfzcodeEncrypt() { + return sfzcodeEncrypt; + } - /** - * 身份证号码 - */ - private String sfzcode; + public void setSfzcodeEncrypt(String sfzcodeEncrypt) { + this.sfzcodeEncrypt = sfzcodeEncrypt; + } - /** - * 执法证编号 - */ - private String zfcode; + public String getId() { + return id; + } - public String getName() { - return name; + public void setId(String id) { + this.id = id; } - public void setName(String name) { - this.name = name; + public String getSfyx() { + return sfyx; + } + + public void setSfyx(String sfyx) { + this.sfyx = sfyx; + } + + public String getRylx() { + return rylx; + } + + public void setRylx(String rylx) { + this.rylx = rylx; } public String getZfzzfdw() { @@ -41,6 +83,22 @@ public class Zfryjdm2405301 { this.zfzzfdw = zfzzfdw; } + public String getZfryid() { + return zfryid; + } + + public void setZfryid(String zfryid) { + this.zfryid = zfryid; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + public String getSfzcode() { return sfzcode; } @@ -49,6 +107,54 @@ public class Zfryjdm2405301 { this.sfzcode = sfzcode; } + public String getZzjgdm() { + return zzjgdm; + } + + public void setZzjgdm(String zzjgdm) { + this.zzjgdm = zzjgdm; + } + + public String getZfdw() { + return zfdw; + } + + public void setZfdw(String zfdw) { + this.zfdw = zfdw; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + + public String getSubName() { + return subName; + } + + public void setSubName(String subName) { + this.subName = subName; + } + + public String getIsLawcode() { + return isLawcode; + } + + public void setIsLawcode(String isLawcode) { + this.isLawcode = isLawcode; + } + + public String getCodeState() { + return codeState; + } + + public void setCodeState(String codeState) { + this.codeState = codeState; + } + public String getZfcode() { return zfcode; } @@ -56,6 +162,4 @@ public class Zfryjdm2405301 { public void setZfcode(String zfcode) { this.zfcode = zfcode; } - - } diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zqyjjdm137344.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zqyjjdm137344.java index ff55fe5f..dc8108c9 100755 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zqyjjdm137344.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/Zqyjjdm137344.java @@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; /** - * 联动字典对象 linkage_dict + * 市认证 * * @author ruoyi * @date 2024-04-12 diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Zfryjdm2405301Mapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Zfryjdm2405301Mapper.java new file mode 100755 index 00000000..4c69c17b --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/Zfryjdm2405301Mapper.java @@ -0,0 +1,29 @@ +package com.zdxt.code.mapper; + +import com.zdxt.code.domain.Zfryjdm2405301; +import java.util.List; + +/** + * 联动字典Mapper接口 + * + * @author ruoyi + * @date 2024-04-12 + */ +public interface Zfryjdm2405301Mapper +{ + /** + * 关键字查询 + * + * @param searchValue 关键字 + * @return 集合 + */ + public List selectZfryjdmList(String searchValue); + + /** + * 修改身份证号 + * + * @param zqyjjdm 规则项 + * @return 结果 + */ + public int updateZfryjdmSfzcodeByid(Zfryjdm2405301 zqyjjdm); +} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IZfryjdm2405301Service.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IZfryjdm2405301Service.java new file mode 100755 index 00000000..c3dce849 --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/IZfryjdm2405301Service.java @@ -0,0 +1,29 @@ +package com.zdxt.code.service; + +import com.zdxt.code.domain.Zfryjdm2405301; +import java.util.List; + +/** + * 联动字典Service接口 + * + * @author ruoyi + * @date 2024-04-12 + */ +public interface IZfryjdm2405301Service +{ + /** + * 关键字查询 + * + * @param searchValue 关键字 + * @return 集合 + */ + public List selectZfryjdmList(String searchValue); + + /** + * 修改身份证号 + * + * @param zqyjjdm 规则项 + * @return 结果 + */ + public int updateZfryjdmSfzcodeByid(Zfryjdm2405301 zqyjjdm); +} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zfryjdm2405301ServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zfryjdm2405301ServiceImpl.java new file mode 100755 index 00000000..2f3b9ab7 --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/Zfryjdm2405301ServiceImpl.java @@ -0,0 +1,30 @@ +package com.zdxt.code.service.impl; + +import com.zdxt.code.domain.Zfryjdm2405301; +import com.zdxt.code.mapper.Zfryjdm2405301Mapper; +import com.zdxt.code.service.IZfryjdm2405301Service; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.List; + +/** + * 联动字典Service业务层处理 + * + * @author ruoyi + * @date 2024-04-12 + */ +@Service +public class Zfryjdm2405301ServiceImpl implements IZfryjdm2405301Service +{ + @Autowired private Zfryjdm2405301Mapper zfryjdm2405301Mapper; + + @Override + public List selectZfryjdmList(String searchValue) { + return zfryjdm2405301Mapper.selectZfryjdmList(searchValue); + } + + @Override + public int updateZfryjdmSfzcodeByid(Zfryjdm2405301 zqyjjdm) { + return zfryjdm2405301Mapper.updateZfryjdmSfzcodeByid(zqyjjdm); + } +} diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml new file mode 100755 index 00000000..2f06ea26 --- /dev/null +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/Zfryjdm2405301Mapper.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + select id, sfyx, rylx, zfzzfdw, zfryid, `name`, sfzcode, zzjgdm, zfdw, address, sub_name, is_lawcode, code_state, zfcode, sfzcode_encrypt from zfryjdm2405301 + + + + + + update zfryjdm2405301 + + sfzcode_encrypt = #{sfzcodeEncrypt}, + + where id = #{id} + + + \ No newline at end of file