Skip to content

Y
yd-backend
Commit 27682633 by jianan
Options

保存电子签名接口

parent 48dcb513
Showing with 81 additions and 57 deletions
yd-api/src/main/java/com/yd/api/practitioner/PractitionerHiringController.java
...@@ -52,7 +52,7 @@ public class PractitionerHiringController { ...@@ -52,7 +52,7 @@ public class PractitionerHiringController {
@RequestMapping("/saveBasicInfo") @RequestMapping("/saveBasicInfo")
public Object saveBasicInfo(@RequestBody SaveBasicInfoRequestVO requestVO){ public Object saveBasicInfo(@RequestBody SaveBasicInfoRequestVO requestVO){
JsonResult result = new JsonResult(); JsonResult result = new JsonResult();
SaveBasicInfoResponseVO responseVO = practitionerHiringService.saveBasicInfo(requestVO); CommonResultResponseVO responseVO = practitionerHiringService.saveBasicInfo(requestVO);
result.addResult(responseVO); result.addResult(responseVO);
result.setData(responseVO); result.setData(responseVO);
return result; return result;
...@@ -65,7 +65,7 @@ public class PractitionerHiringController { ...@@ -65,7 +65,7 @@ public class PractitionerHiringController {
@RequestMapping("/saveWorkingExperience") @RequestMapping("/saveWorkingExperience")
public Object saveWorkingExperience(@RequestBody SaveWorkingExperienceRequestVO requestVO){ public Object saveWorkingExperience(@RequestBody SaveWorkingExperienceRequestVO requestVO){
JsonResult result = new JsonResult(); JsonResult result = new JsonResult();
SaveWorkingExperienceResponseVO responseVO = practitionerHiringService.saveWorkingExperience(requestVO); CommonResultResponseVO responseVO = practitionerHiringService.saveWorkingExperience(requestVO);
result.addResult(responseVO); result.addResult(responseVO);
result.setData(responseVO); result.setData(responseVO);
return result; return result;
...@@ -117,7 +117,7 @@ public class PractitionerHiringController { ...@@ -117,7 +117,7 @@ public class PractitionerHiringController {
@RequestMapping("/savePersonalStatements") @RequestMapping("/savePersonalStatements")
public Object savePersonalStatements(@RequestBody SavePersonalStatementsRequestVO requestVO){ public Object savePersonalStatements(@RequestBody SavePersonalStatementsRequestVO requestVO){
JsonResult result = new JsonResult(); JsonResult result = new JsonResult();
SavePersonalStatementsResponseVO responseVO = practitionerHiringService.savePersonalStatements(requestVO); CommonResultResponseVO responseVO = practitionerHiringService.savePersonalStatements(requestVO);
result.addResult(responseVO); result.addResult(responseVO);
result.setData(responseVO); result.setData(responseVO);
return result; return result;
...@@ -130,7 +130,7 @@ public class PractitionerHiringController { ...@@ -130,7 +130,7 @@ public class PractitionerHiringController {
@RequestMapping("/saveContractTermsConfirms") @RequestMapping("/saveContractTermsConfirms")
public Object saveContractTermsConfirms(@RequestBody SaveContractTermsConfirmsRequestVO requestVO){ public Object saveContractTermsConfirms(@RequestBody SaveContractTermsConfirmsRequestVO requestVO){
JsonResult result = new JsonResult(); JsonResult result = new JsonResult();
SaveContractTermsConfirmsResponseVO responseVO = practitionerHiringService.saveContractTermsConfirms(requestVO); CommonResultResponseVO responseVO = practitionerHiringService.saveContractTermsConfirms(requestVO);
result.addResult(responseVO); result.addResult(responseVO);
result.setData(responseVO); result.setData(responseVO);
return result; return result;
...@@ -143,7 +143,7 @@ public class PractitionerHiringController { ...@@ -143,7 +143,7 @@ public class PractitionerHiringController {
@RequestMapping("/saveBankAccount") @RequestMapping("/saveBankAccount")
public Object saveBankAccount(@RequestBody SaveBankAccountRequestVO requestVO){ public Object saveBankAccount(@RequestBody SaveBankAccountRequestVO requestVO){
JsonResult result = new JsonResult(); JsonResult result = new JsonResult();
SaveBankAccountResponseVO responseVO = practitionerHiringService.saveBankAccount(requestVO); CommonResultResponseVO responseVO = practitionerHiringService.saveBankAccount(requestVO);
result.addResult(responseVO); result.addResult(responseVO);
result.setData(responseVO); result.setData(responseVO);
return result; return result;
...@@ -176,6 +176,19 @@ public class PractitionerHiringController { ...@@ -176,6 +176,19 @@ public class PractitionerHiringController {
} }
/** /**
* 保存报聘经纪人电子签名
*
*/
@RequestMapping("/saveDigitalSignatures")
public Object saveDigitalSignatures(@RequestBody SaveDigitalSignaturesRequestVO requestVO){
JsonResult result = new JsonResult();
CommonResultResponseVO responseVO = practitionerHiringService.saveDigitalSignatures(requestVO);
result.addResult(responseVO);
result.setData(responseVO);
return result;
}
/**
* 经纪人审批列表查询 * 经纪人审批列表查询
* @param requestVO 请求数据 * @param requestVO 请求数据
* @return 响应数据 * @return 响应数据
......
yd-api/src/main/java/com/yd/api/practitioner/service/PractitionerHiringService.java
...@@ -8,11 +8,11 @@ public interface PractitionerHiringService { ...@@ -8,11 +8,11 @@ public interface PractitionerHiringService {
SaveMembershipResponseVO saveMembership(SaveMembershipRequestVO requestVO); SaveMembershipResponseVO saveMembership(SaveMembershipRequestVO requestVO);
SaveBasicInfoResponseVO saveBasicInfo(SaveBasicInfoRequestVO requestVO); CommonResultResponseVO saveBasicInfo(SaveBasicInfoRequestVO requestVO);
QueryMembershipResponseVO queryMembership(HiringBasicInfoIdRequestVO requestVO); QueryMembershipResponseVO queryMembership(HiringBasicInfoIdRequestVO requestVO);
SaveWorkingExperienceResponseVO saveWorkingExperience(SaveWorkingExperienceRequestVO requestVO); CommonResultResponseVO saveWorkingExperience(SaveWorkingExperienceRequestVO requestVO);
SavePersonPictureResponseVO savePersonPicture(SavePersonPictureRequestVO requestVO); SavePersonPictureResponseVO savePersonPicture(SavePersonPictureRequestVO requestVO);
...@@ -20,9 +20,9 @@ public interface PractitionerHiringService { ...@@ -20,9 +20,9 @@ public interface PractitionerHiringService {
SaveLastGraduateGradeResponseVO saveLastGraduateGrade(SaveLastGraduateGradeRequestVO requestVO); SaveLastGraduateGradeResponseVO saveLastGraduateGrade(SaveLastGraduateGradeRequestVO requestVO);
SavePersonalStatementsResponseVO savePersonalStatements(SavePersonalStatementsRequestVO requestVO); CommonResultResponseVO savePersonalStatements(SavePersonalStatementsRequestVO requestVO);
SaveContractTermsConfirmsResponseVO saveContractTermsConfirms(SaveContractTermsConfirmsRequestVO requestVO); CommonResultResponseVO saveContractTermsConfirms(SaveContractTermsConfirmsRequestVO requestVO);
/** /**
* 经纪人审批列表查询 * 经纪人审批列表查询
* @param requestVO 请求数据 * @param requestVO 请求数据
...@@ -43,10 +43,11 @@ public interface PractitionerHiringService { ...@@ -43,10 +43,11 @@ public interface PractitionerHiringService {
*/ */
HiringApproveResponseVO hiringApprove(HiringApproveRequestVO requestVO); HiringApproveResponseVO hiringApprove(HiringApproveRequestVO requestVO);
SaveBankAccountResponseVO saveBankAccount(SaveBankAccountRequestVO requestVO); CommonResultResponseVO saveBankAccount(SaveBankAccountRequestVO requestVO);
QueryContractTermsResponseVO queryContractTerms(); QueryContractTermsResponseVO queryContractTerms();
QueryWholeInfoResponseVO queryWholeInfo(HiringBasicInfoIdRequestVO requestVO); QueryWholeInfoResponseVO queryWholeInfo(HiringBasicInfoIdRequestVO requestVO);
CommonResultResponseVO saveDigitalSignatures(SaveDigitalSignaturesRequestVO requestVO);
} }
yd-api/src/main/java/com/yd/api/practitioner/service/impl/PractitionerHiringServiceImpl.java
...@@ -17,6 +17,7 @@ import com.yd.util.HttpUtil; ...@@ -17,6 +17,7 @@ import com.yd.util.HttpUtil;
import com.yd.util.config.ZHBErrorConfig; import com.yd.util.config.ZHBErrorConfig;
import org.apache.commons.beanutils.BeanPropertyValueEqualsPredicate; import org.apache.commons.beanutils.BeanPropertyValueEqualsPredicate;
import org.apache.commons.collections.CollectionUtils; import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -27,10 +28,7 @@ import java.io.ByteArrayInputStream; ...@@ -27,10 +28,7 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.InputStream; import java.io.InputStream;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.ArrayList; import java.util.*;
import java.util.Date;
import java.util.List;
import java.util.Map;
@Service @Service
...@@ -122,8 +120,8 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService ...@@ -122,8 +120,8 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
} }
@Override @Override
public SaveBasicInfoResponseVO saveBasicInfo(SaveBasicInfoRequestVO requestVO) { public CommonResultResponseVO saveBasicInfo(SaveBasicInfoRequestVO requestVO) {
SaveBasicInfoResponseVO resp = new SaveBasicInfoResponseVO(); CommonResultResponseVO resp = new CommonResultResponseVO();
try { try {
// 数据库实体 // 数据库实体
AclPractitionerHiringBasicInfo basicInfo = new AclPractitionerHiringBasicInfo(); AclPractitionerHiringBasicInfo basicInfo = new AclPractitionerHiringBasicInfo();
...@@ -165,8 +163,8 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService ...@@ -165,8 +163,8 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
} }
@Override @Override
public SaveWorkingExperienceResponseVO saveWorkingExperience(SaveWorkingExperienceRequestVO requestVO) { public CommonResultResponseVO saveWorkingExperience(SaveWorkingExperienceRequestVO requestVO) {
SaveWorkingExperienceResponseVO resp = new SaveWorkingExperienceResponseVO(); CommonResultResponseVO resp = new CommonResultResponseVO();
try { try {
List<PractitionerHiringWorkingExperience> workingExperienceList = requestVO.getWorkingExperienceList(); List<PractitionerHiringWorkingExperience> workingExperienceList = requestVO.getWorkingExperienceList();
Long basicInfoId = requestVO.getHiringBasicInfoId(); Long basicInfoId = requestVO.getHiringBasicInfoId();
...@@ -299,8 +297,8 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService ...@@ -299,8 +297,8 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
} }
@Override @Override
public SavePersonalStatementsResponseVO savePersonalStatements(SavePersonalStatementsRequestVO requestVO) { public CommonResultResponseVO savePersonalStatements(SavePersonalStatementsRequestVO requestVO) {
SavePersonalStatementsResponseVO resp = new SavePersonalStatementsResponseVO(); CommonResultResponseVO resp = new CommonResultResponseVO();
try { try {
List<AclPractitionerHiringPersonalStatements> personalStatementList = requestVO.getPersonalStatementList(); List<AclPractitionerHiringPersonalStatements> personalStatementList = requestVO.getPersonalStatementList();
Long basicInfoId = requestVO.getHiringBasicInfoId(); Long basicInfoId = requestVO.getHiringBasicInfoId();
...@@ -339,8 +337,8 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService ...@@ -339,8 +337,8 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
} }
@Override @Override
public SaveContractTermsConfirmsResponseVO saveContractTermsConfirms(SaveContractTermsConfirmsRequestVO requestVO) { public CommonResultResponseVO saveContractTermsConfirms(SaveContractTermsConfirmsRequestVO requestVO) {
SaveContractTermsConfirmsResponseVO resp = new SaveContractTermsConfirmsResponseVO(); CommonResultResponseVO resp = new CommonResultResponseVO();
try { try {
List<AclPractitionerHiringContractTermsConfirms> contractTermsConfirmsList = requestVO.getContractTermsConfirmsList(); List<AclPractitionerHiringContractTermsConfirms> contractTermsConfirmsList = requestVO.getContractTermsConfirmsList();
Long basicInfoId = requestVO.getHiringBasicInfoId(); Long basicInfoId = requestVO.getHiringBasicInfoId();
...@@ -507,8 +505,8 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService ...@@ -507,8 +505,8 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
} }
@Override @Override
public SaveBankAccountResponseVO saveBankAccount(SaveBankAccountRequestVO requestVO) { public CommonResultResponseVO saveBankAccount(SaveBankAccountRequestVO requestVO) {
SaveBankAccountResponseVO resp = new SaveBankAccountResponseVO(); CommonResultResponseVO resp = new CommonResultResponseVO();
try { try {
AclPractitionerHiringBasicInfo basicInfo = new AclPractitionerHiringBasicInfo(); AclPractitionerHiringBasicInfo basicInfo = new AclPractitionerHiringBasicInfo();
BeanUtils.copyProperties(requestVO, basicInfo); BeanUtils.copyProperties(requestVO, basicInfo);
...@@ -571,6 +569,45 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService ...@@ -571,6 +569,45 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
return resp; return resp;
} }
@Override
public CommonResultResponseVO saveDigitalSignatures(SaveDigitalSignaturesRequestVO requestVO) {
CommonResultResponseVO resp = new CommonResultResponseVO();
Long basicInfoId = requestVO.getHiringBasicInfoId();
String imgStr = requestVO.getImgStr();
try {
if (StringUtils.isBlank(imgStr)) {
resp.setCommonResult(new CommonResult(false, "file不可为空"));
return resp;
}
if (imgStr.indexOf("data:image/png;") != -1) {
imgStr = imgStr.replace("data:image/png;base64,", "");
}
byte[] fileBytes = Base64.getDecoder().decode(imgStr);
InputStream inputStream = new ByteArrayInputStream(fileBytes);
// 上传图片至阿里云
StringBuffer fileName = new StringBuffer();
fileName.append("brokerHiring/").append(basicInfoId).append("/");
String originalFilename = generateKey(9);
String key = fileName.append(originalFilename).append(".png").toString();
String putFileToOss = ossService.putFileToOss(null, key, inputStream);
// 保存入库
AclPractitionerHiringBasicInfo basicInfo = new AclPractitionerHiringBasicInfo();
basicInfo.setId(basicInfoId);
basicInfo.setPersonalSignOssPath(putFileToOss);
basicInfoMapper.updateByPrimaryKeySelective(basicInfo);
resp.setCommonResult(new CommonResult(true, ZHBErrorConfig.getErrorInfo("800000")));
} catch (Exception e) {
e.printStackTrace();
resp.setCommonResult(new CommonResult(false, "保存失败"));
}
return resp;
}
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
private boolean addStepToList(HiringApproveRequestVO requestVO, private boolean addStepToList(HiringApproveRequestVO requestVO,
int stepSeq, int stepSeq,
...@@ -615,7 +652,7 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService ...@@ -615,7 +652,7 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
//上传图片至阿里云 //上传图片至阿里云
String prefix = "brokerHiring/" + hiringBasicInfoId + "/"; String prefix = "brokerHiring/" + hiringBasicInfoId + "/";
String originalFilename = generateKey(targetUseFor); String originalFilename = generateKey(targetUseFor);
String key = prefix + originalFilename; String key = prefix + originalFilename + ".jpg";
String putFileToOss = ossService.putFileToOss(null, key, inputStream); String putFileToOss = ossService.putFileToOss(null, key, inputStream);
return putFileToOss; return putFileToOss;
...@@ -623,7 +660,7 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService ...@@ -623,7 +660,7 @@ public class PractitionerHiringServiceImpl implements PractitionerHiringService
private String generateKey(int targetUseFor) { private String generateKey(int targetUseFor) {
SimpleDateFormat sdf = new SimpleDateFormat("yyMMdd"); SimpleDateFormat sdf = new SimpleDateFormat("yyMMdd");
return targetUseFor+sdf.format(new Date()) + ".jpg"; return targetUseFor+sdf.format(new Date());
} }
} }
yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/SaveBankAccountResponseVO.java → yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/CommonResultResponseVO.java
...@@ -4,6 +4,6 @@ import com.yd.api.result.CommonResult; ...@@ -4,6 +4,6 @@ import com.yd.api.result.CommonResult;
import lombok.Data; import lombok.Data;
@Data @Data
public class SaveBankAccountResponseVO { public class CommonResultResponseVO {
private CommonResult commonResult; private CommonResult commonResult;
} }
yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/SaveContractTermsConfirmsResponseVO.java deleted 100644 → 0
package com.yd.api.practitioner.vo.hiring;
import com.yd.api.result.CommonResult;
import lombok.Data;
@Data
public class SaveContractTermsConfirmsResponseVO {
private CommonResult commonResult;
}
yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/SaveBasicInfoResponseVO.java → yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/SaveDigitalSignaturesRequestVO.java
package com.yd.api.practitioner.vo.hiring; package com.yd.api.practitioner.vo.hiring;
import com.yd.api.result.CommonResult;
import lombok.Data; import lombok.Data;
@Data @Data
public class SaveBasicInfoResponseVO { public class SaveDigitalSignaturesRequestVO {
private CommonResult commonResult; private Long hiringBasicInfoId;
private String imgStr;
} }
yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/SavePersonalStatementsResponseVO.java deleted 100644 → 0
package com.yd.api.practitioner.vo.hiring;
import com.yd.api.result.CommonResult;
import lombok.Data;
@Data
public class SavePersonalStatementsResponseVO {
private CommonResult commonResult;
}
yd-api/src/main/java/com/yd/api/practitioner/vo/hiring/SaveWorkingExperienceResponseVO.java deleted 100644 → 0
package com.yd.api.practitioner.vo.hiring;
import com.yd.api.result.CommonResult;
import lombok.Data;
@Data
public class SaveWorkingExperienceResponseVO {
private CommonResult commonResult;
}
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