Skip to content

E
extend
Commit dac1eb11 by 牟邦恺
Options

Merge branch 'feature-20200720' into test

parents c34885ae 1848d0a1
Showing with 6 additions and 5 deletions
api/src/main/java/com/hikcreate/edl/pub/web/mobile/api/controller/DrivingLicenseController.java
...@@ -7,6 +7,7 @@ import com.hikcreate.common.sdk.response.apiparam.ResponseGenerator; ...@@ -7,6 +7,7 @@ import com.hikcreate.common.sdk.response.apiparam.ResponseGenerator;
import com.hikcreate.common.sdk.response.statuscode.StatusCode; import com.hikcreate.common.sdk.response.statuscode.StatusCode;
import com.hikcreate.edl.common.image.builder.domain.DlBackImageDO; import com.hikcreate.edl.common.image.builder.domain.DlBackImageDO;
import com.hikcreate.edl.common.image.builder.domain.DlImageDO; import com.hikcreate.edl.common.image.builder.domain.DlImageDO;
import com.hikcreate.edl.common.sdk.util.RegexUtil;
import com.hikcreate.edl.pub.web.mobile.domain.CredentialsImageService; import com.hikcreate.edl.pub.web.mobile.domain.CredentialsImageService;
import com.hikcreate.edl.pub.web.mobile.domain.DrivingLicenseService; import com.hikcreate.edl.pub.web.mobile.domain.DrivingLicenseService;
import com.hikcreate.edl.pub.web.mobile.domain.IBindService; import com.hikcreate.edl.pub.web.mobile.domain.IBindService;
...@@ -95,20 +96,20 @@ public class DrivingLicenseController { ...@@ -95,20 +96,20 @@ public class DrivingLicenseController {
ByteArrayOutputStream outputStream; ByteArrayOutputStream outputStream;
if (type == null || Objects.equals(type, 1)) { if (type == null || Objects.equals(type, 1)) {
DlImageDO dlImageDO = new DlImageDO(); DlImageDO dlImageDO = new DlImageDO();
dlImageDO.setAddress(drivingLicenseMicRes.getAddress()); dlImageDO.setAddress(RegexUtil.addressMask(drivingLicenseMicRes.getAddress()));
dlImageDO.setBelowLicenseNumber(drivingLicenseMicRes.getIdCard()); dlImageDO.setBelowLicenseNumber(drivingLicenseMicRes.getIdCard());
dlImageDO.setAvatarFullUrl(fastDfsConfigBean.genBigDataInnerUrl(drivingLicenseMicRes.getAvatar())); dlImageDO.setAvatarFullUrl(fastDfsConfigBean.genBigDataInnerUrl(drivingLicenseMicRes.getAvatar()));
dlImageDO.setBirthday(drivingLicenseMicRes.getBirthday()); dlImageDO.setBirthday(drivingLicenseMicRes.getBirthday());
dlImageDO.setLicenseNumber(drivingLicenseMicRes.getIdCard()); dlImageDO.setLicenseNumber(RegexUtil.idCardMask(drivingLicenseMicRes.getIdCard()));
dlImageDO.setInitLicenseDate(drivingLicenseMicRes.getIssueDate()); dlImageDO.setInitLicenseDate(drivingLicenseMicRes.getIssueDate());
dlImageDO.setName(drivingLicenseMicRes.getRealName()); dlImageDO.setName(RegexUtil.nameMask(drivingLicenseMicRes.getRealName()));
dlImageDO.setBelowName(drivingLicenseMicRes.getRealName()); dlImageDO.setBelowName(RegexUtil.nameMask(drivingLicenseMicRes.getRealName()));
dlImageDO.setModel(drivingLicenseMicRes.getLicenseType()); dlImageDO.setModel(drivingLicenseMicRes.getLicenseType());
dlImageDO.setNationality(drivingLicenseMicRes.getNationality()); dlImageDO.setNationality(drivingLicenseMicRes.getNationality());
dlImageDO.setSex(drivingLicenseMicRes.getGender()); dlImageDO.setSex(drivingLicenseMicRes.getGender());
dlImageDO.setValidityPeriod(drivingLicenseMicRes.getEffectiveDate() + "至" + drivingLicenseMicRes.getExpiryDate()); dlImageDO.setValidityPeriod(drivingLicenseMicRes.getEffectiveDate() + "至" + drivingLicenseMicRes.getExpiryDate());
dlImageDO.setRecord(""); dlImageDO.setRecord("");
dlImageDO.setFileNumber(drivingLicenseMicRes.getFileNum()); dlImageDO.setFileNumber(RegexUtil.fileNumMask(drivingLicenseMicRes.getFileNum()));
outputStream = (ByteArrayOutputStream) credentialsImageService.genDlImage(dlImageDO); outputStream = (ByteArrayOutputStream) credentialsImageService.genDlImage(dlImageDO);
} else { } else {
DlBackImageDO dlBackImageDO = new DlBackImageDO(); DlBackImageDO dlBackImageDO = new DlBackImageDO();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment