Skip to content

A
amos-boot-biz
Commit f04b88c9 authored by tangwei's avatar tangwei
Browse files
Options

增加接口

parent ffac3734
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 83 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/ContractDataDto.java
View file @ f04b88c9
......@@ -3,6 +3,8 @@ package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import lombok.Data;
import java.util.List;
/**
* @description:
* @author: tw
......@@ -32,4 +34,5 @@ public class ContractDataDto {
Double personalOffsetX;
Double personalOffsetY;
Integer personalKeywordIndex;
private List<Long> sealId;
}
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/QiyuesuoController.java
View file @ f04b88c9
package com.yeejoin.amos.boot.module.hygf.biz.controller;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.qiyuesuo.sdk.v2.SdkClient;
import com.qiyuesuo.sdk.v2.bean.*;
import com.qiyuesuo.sdk.v2.exception.BaseSdkException;
......@@ -13,6 +14,8 @@ import com.qiyuesuo.sdk.v2.response.SdkResponse;
import com.yeejoin.amos.boot.module.hygf.api.dto.ContractDataDto;
import com.yeejoin.amos.boot.module.hygf.api.dto.HouseholdContractDto;
import com.yeejoin.amos.boot.module.hygf.api.entity.HouseholdContract;
import com.yeejoin.amos.boot.module.hygf.api.entity.SealDictionary;
import com.yeejoin.amos.boot.module.hygf.api.mapper.SealDictionaryMapper;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.HouseholdContractServiceImpl;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.QiyuesuoServiceImpl;
import io.swagger.annotations.Api;
......@@ -20,10 +23,7 @@ import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
......@@ -46,7 +46,8 @@ import java.util.Map;
public class QiyuesuoController {
private static final Logger logger = LoggerFactory.getLogger(QiyuesuoController.class);
@Autowired
SealDictionaryMapper sealDictionaryMapper;
@Autowired
QiyuesuoServiceImpl qiyuesuoService;
@Autowired
......@@ -71,7 +72,18 @@ public class QiyuesuoController {
return ResponseHelper.buildResponse(result.getResult());
}
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
@ApiOperation(httpMethod = "post",value = "合同token", notes = "合同token")
@PostMapping (value = "/getContractTokengz/{sequenceNbr}")
public ResponseModel<Object> getContractSdkResponseSequenceNbr(@RequestBody ContractMiniappTicketRequest request, @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
QueryWrapper<SealDictionary> queryWrapper=new QueryWrapper();
queryWrapper.eq("amos_company_seq",sequenceNbr);
SealDictionary sealDictionary=sealDictionaryMapper.selectOne(queryWrapper);
request.setUser(new User( sealDictionary.getSealedPhone(), "MOBILE"));
SdkResponse<MiniappTicketResult> result= qiyuesuoService.getContractSdkResponse(request);
return ResponseHelper.buildResponse(result.getResult());
}
@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
......@@ -152,14 +164,14 @@ public class QiyuesuoController {
contract.setCategory(new Category("智信能源合同"));
// contract.setBizId("");
contract.setSend(false);
// 个人
// 个人
Signatory signatory1 = new Signatory();
signatory1.setTenantName(username);
signatory1.setTenantType("PERSONAL");
signatory1.setReceiver(new User(username, contact, "MOBILE"));
signatory1.setSerialNo(1);
// 对接方
// 对接方
Signatory signatory2 = new Signatory();
signatory2.setTenantName("智信能源科技有限公司-测试");
signatory2.setTenantType("COMPANY");
......@@ -167,15 +179,15 @@ public class QiyuesuoController {
signatory2.setSerialNo(2);
Action action = new Action("COMPANY", 0);
signatory2.addAction(action);
// 设置签署方
// 设置签署方
contract.addSignatory(signatory1);
contract.addSignatory(signatory2);
// 创建合同
// 创建合同
ContractDraftRequest request = new ContractDraftRequest(contract);
String response = sdkClient.service(request);
SdkResponse<Contract> responseObj = JSONUtils.toQysResponse(response, Contract.class);
// 返回结果
// 返回结果
Contract result=new Contract();
if(responseObj.getCode() == 0) {
result = responseObj.getResult();
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/HouseholdContractServiceImpl.java
View file @ f04b88c9
......@@ -7,8 +7,10 @@ import com.yeejoin.amos.boot.module.hygf.api.dto.*;
import com.yeejoin.amos.boot.module.hygf.api.entity.ContractTemplate;
import com.yeejoin.amos.boot.module.hygf.api.entity.HouseholdContract;
import com.yeejoin.amos.boot.module.hygf.api.entity.PreparationMoney;
import com.yeejoin.amos.boot.module.hygf.api.entity.SealDictionary;
import com.yeejoin.amos.boot.module.hygf.api.mapper.ContractTemplateMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.HouseholdContractMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.SealDictionaryMapper;
import com.yeejoin.amos.boot.module.hygf.api.service.IHouseholdContractService;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -40,18 +42,8 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
@Autowired
QiyuesuoServiceImpl qiyuesuoServiceImpl;
// @Value("${qiyuesuo.category}")
String category="智信能源合同";
// @Value("${qiyuesuo.companyTenantName}")
String companyTenantName="智信能源科技有限公司";
//@Value("${qiyuesuo.companyUsername}")
String companyUsername="于鹏";
@Value("${qiyuesuo.companyContact}")
String companyContact;
@Autowired
SealDictionaryMapper sealDictionaryMapper;
@Autowired
ContractTemplateMapper contractTemplateMapper;
......@@ -104,17 +96,6 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
householdContractMapper.insert(householdContract);
}
// public void reissueHouseholdContract(HouseholdContract householdContract){
//
// householdContract.setContractNumber(this.getnum());//合同编号
// householdContract.setSurveyStatus(HouseholdContractEnum.勘察状态_未勘察.getCode());
// householdContract.setStatus(HouseholdContractEnum.合同状态_未签署.getCode());
// householdContract.setSignStatus(HouseholdContractEnum.签字状态_未签字.getCode());
// householdContract.setStampStatus(HouseholdContractEnum.盖章状态_未盖章.getCode());
// householdContract.setInitiateStatus(HouseholdContractEnum.发起状态_已发起.getCode());
// householdContractMapper.insert(householdContract);
// }
public String getnum() {
SimpleDateFormat format = new SimpleDateFormat("YYYYMMddHHmmssSSS");
......@@ -126,9 +107,6 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
public HouseholdContract initiateHouseholdContract(HouseholdContractDto model){
HouseholdContract householdContract= householdContractMapper.selectById(model.getSequenceNbr());
householdContract.setPartyA(model.getPartyA());
householdContract.setPartyB(model.getPartyB());
......@@ -143,30 +121,29 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
householdContract.setStationPower(model.getStationPower());
householdContract.setName(model.getName());
//调用第三方
// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
//签署结束时间默认一个月后
// LocalDateTime now = LocalDateTime.now();
// LocalDateTime afterOneMonth = now.plus(Period.ofMonths(1));
ContractDataDto contractDataDto =new ContractDataDto();
contractDataDto.setUsername(model.getPartyA());
contractDataDto.setContact(model.getPeasantHouseholdPhone());
contractDataDto.setIDCard(model.getPeasantHouseholdCard());
contractDataDto.setSubject(model.getName());
// contractDataDto.setEndTime(sdf.format(afterOneMonth));
//// contractDataDto.setExpireTime(sdf.format(model.getLeaseEndDate()));
contractDataDto.setCategory(category);
contractDataDto.setCompanyTenantName(companyTenantName);
contractDataDto.setCompanyUsername(companyUsername);
contractDataDto.setCompanyContact(companyContact);
contractDataDto.setEmplateId(model.getContractTemplateId());
QueryWrapper<SealDictionary> queryWrapper=new QueryWrapper();
queryWrapper.eq("amos_company_seq",householdContract.getRegionalCompaniesSeq());
SealDictionary sealDictionary=sealDictionaryMapper.selectOne(queryWrapper);
contractDataDto.setCategory(sealDictionary.getCategory());
contractDataDto.setCompanyTenantName(sealDictionary.getCompanyTenantName());
contractDataDto.setCompanyUsername(sealDictionary.getSealedUser());
contractDataDto.setCompanyContact(sealDictionary.getSealedPhone());
List<Long> listSealId= new ArrayList<>();
listSealId.add(sealDictionary.getSealId());
contractDataDto.setSealId(listSealId);
QueryWrapper<ContractTemplate> qu=new QueryWrapper();
qu.eq("template_id",model.getContractTemplateId());
ContractTemplate contractTemplate=contractTemplateMapper.selectOne(qu);
contractDataDto.setEmplateId(model.getContractTemplateId());
contractDataDto.setCompanykeyword(contractTemplate.getCompanyKeyword());
contractDataDto.setCompanyPage(contractTemplate.getCompanyPage());
contractDataDto.setCompanyOffsetX(contractTemplate.getCompanyOffsetx());
......@@ -178,8 +155,6 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
contractDataDto.setPersonalOffsetY(contractTemplate.getPersonalOffsety());
contractDataDto.setPersonalKeywordIndex(contractTemplate.getPersonalKeywordIndex());
List<TemplateParamDto> templateParam=new ArrayList<>();
SimpleDateFormat sdfdate = new SimpleDateFormat("yyyy-MM-dd");
templateParam.add(new TemplateParamDto("partyA",householdContract.getPartyA()!=null?householdContract.getPartyA():null));
......@@ -206,9 +181,6 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
public HouseholdContract reissueinitiateHouseholdContract(HouseholdContract model,Long sequenceNbr){
HouseholdContract householdContract= householdContractMapper.selectById(sequenceNbr);
householdContract.setPartyA(model.getPartyA());
householdContract.setPartyB(model.getPartyB());
......@@ -222,31 +194,29 @@ public class HouseholdContractServiceImpl extends BaseService<HouseholdContractD
householdContract.setComponentPower(model.getComponentPower());
householdContract.setStationPower(model.getStationPower());
householdContract.setName(model.getName());
//调用第三方
// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS");
//签署结束时间默认一个月后
// LocalDateTime now = LocalDateTime.now();
// LocalDateTime afterOneMonth = now.plus(Period.ofMonths(1));
ContractDataDto contractDataDto =new ContractDataDto();
contractDataDto.setUsername(model.getPartyA());
contractDataDto.setContact(model.getPeasantHouseholdPhone());
contractDataDto.setIDCard(model.getPeasantHouseholdCard());
contractDataDto.setSubject(model.getName());
// contractDataDto.setEndTime(sdf.format(afterOneMonth));
//// contractDataDto.setExpireTime(sdf.format(model.getLeaseEndDate()));
contractDataDto.setCategory(category);
contractDataDto.setCompanyTenantName(companyTenantName);
contractDataDto.setCompanyUsername(companyUsername);
contractDataDto.setCompanyContact(companyContact);
contractDataDto.setEmplateId(model.getContractTemplateId());
QueryWrapper<SealDictionary> queryWrapper=new QueryWrapper();
queryWrapper.eq("amos_company_seq",householdContract.getRegionalCompaniesSeq());
SealDictionary sealDictionary=sealDictionaryMapper.selectOne(queryWrapper);
contractDataDto.setCategory(sealDictionary.getCategory());
contractDataDto.setCompanyTenantName(sealDictionary.getCompanyTenantName());
contractDataDto.setCompanyUsername(sealDictionary.getSealedUser());
contractDataDto.setCompanyContact(sealDictionary.getSealedPhone());
List<Long> listSealId= new ArrayList<>();
listSealId.add(sealDictionary.getSealId());
contractDataDto.setSealId(listSealId);
QueryWrapper<ContractTemplate> qu=new QueryWrapper();
qu.eq("template_id",model.getContractTemplateId());
ContractTemplate contractTemplate=contractTemplateMapper.selectOne(qu);
contractDataDto.setEmplateId(model.getContractTemplateId());
contractDataDto.setCompanykeyword(contractTemplate.getCompanyKeyword());
contractDataDto.setCompanyPage(contractTemplate.getCompanyPage());
contractDataDto.setCompanyOffsetX(contractTemplate.getCompanyOffsetx());
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/QiyuesuoServiceImpl.java
View file @ f04b88c9
......@@ -111,17 +111,13 @@ public class QiyuesuoServiceImpl {
Integer personalPage= contractDataDto.getPersonalPage();
Double personalOffsetX= contractDataDto.getPersonalOffsetX();
Double personalOffsetY= contractDataDto.getPersonalOffsetY();
List<Long> corpSealIds=contractDataDto.getSealId();
SdkClient sdkClient = new SdkClient(serverUrl, accessKey, accessSecret);
// 合同基本参数
//进行日期格式化
Contract contract = new Contract();
contract.setSubject(subject);
contract.setDescription(subject);
// contract.setExpireTime(expireTime);
// contract.setEndTime(endTime);
contract.setCategory(new Category(category));
contract.setSend(false);
// 个人
......@@ -138,7 +134,8 @@ public class QiyuesuoServiceImpl {
signatory2.setReceiver(new User(companyUsername, companyContact, "MOBILE"));
signatory2.setSerialNo(2);
Action action = new Action("COMPANY", 0);
//指定印章
action.setCorpSealIds(corpSealIds);
signatory2.addAction(action);
// 设置签署方
contract.addSignatory(signatory1);
......@@ -146,10 +143,7 @@ public class QiyuesuoServiceImpl {
// 创建合同
ContractDraftRequest request = new ContractDraftRequest(contract);
logger.info("创建草稿合同调用前"+JSON.toJSONString(request));
String response = sdkClient.service(request);
SdkResponse<Contract> responseObj = JSONUtils.toQysResponse(response, Contract.class);
// 返回结果
......@@ -161,7 +155,6 @@ public class QiyuesuoServiceImpl {
} else {
logger.info("请求失败，错误码:{}，错误信息:{}", responseObj.getCode(), responseObj.getMessage());
}
DocumentAddResult documentAddResult= this.getDocumentAddResult(result.getId(),subject, templateParam,emplateId);
List<Signatory> list= result.getSignatories();
Long ActionId=null;
......@@ -194,7 +187,6 @@ public class QiyuesuoServiceImpl {
stampers.add(stamper);
stampers.add(stamper2);
SdkResponse<Object> data= this.getSdkResponse(result.getId(), stampers);
return result.getId();
}
......@@ -212,7 +204,6 @@ public class QiyuesuoServiceImpl {
DocumentAddByTemplateRequest request = new DocumentAddByTemplateRequest(contractId,
emplateId , params, subject);
logger.info("添加合同文档前", JSON.toJSONString(request));
String response = sdkClient.service(request);
SdkResponse<DocumentAddResult> responseObj = JSONUtils.toQysResponse(response, DocumentAddResult.class);
logger.info("添加合同文档后", JSON.toJSONString(responseObj));
......@@ -223,7 +214,6 @@ public class QiyuesuoServiceImpl {
} else {
throw new RuntimeException("请求失败");
}
return result;
}
......@@ -243,8 +233,6 @@ public class QiyuesuoServiceImpl {
throw new RuntimeException("请求失败");
}
return responseObj;
}
......
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