Skip to content

T
traffic-front
Commit f78ff302 authored by Ken you's avatar Ken you
Browse files
Options

add ebs api request---Ken

parent c8f8ab0e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 233 additions and 76 deletions
atms-api/src/main/java/pwc/taxtech/atms/controller/EbsApiController.java
View file @ f78ff302
......@@ -2,12 +2,13 @@ package pwc.taxtech.atms.controller;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import pwc.taxtech.atms.dto.ApiResultDto;
import pwc.taxtech.atms.dto.ebsdto.JEqueryDto;
import pwc.taxtech.atms.dto.ebsdto.*;
import pwc.taxtech.atms.service.EbsApiService;
import javax.annotation.Resource;
......@@ -18,13 +19,14 @@ import java.util.List;
@RequestMapping("/ebs/api/v1/dd")
public class EbsApiController {
private static final Logger logger= LoggerFactory.getLogger(EbsApiController.class);
private static final Logger logger = LoggerFactory.getLogger(EbsApiController.class);
@Resource
private EbsApiService ebsApiService;
@RequestMapping(value = "/queryRemoteServerThenUpdateJE", method = RequestMethod.POST)
public ApiResultDto queryRemoteServerThenUpdateJE(@RequestBody List<JEqueryDto> items) {
if (items!=null&&!items.isEmpty()) {
public ApiResultDto queryRemoteServerThenUpdateJE(@RequestBody List<JournalEntryQueryDto> items) {
if (CollectionUtils.isEmpty(items)) {
logger.debug("the queryRemoteServerThenUpdateJE return items is empty");
return ApiResultDto.success(Collections.emptyList());
}
try {
......@@ -36,5 +38,109 @@ public class EbsApiController {
return ApiResultDto.fail();
}
@RequestMapping(value = "/queryRemoteServerThenUpdateTB", method = RequestMethod.POST)
public ApiResultDto queryRemoteServerThenUpdateTB(@RequestBody List<TrialBalanceQueryDto> items) {
if (CollectionUtils.isEmpty(items)) {
logger.debug("the queryRemoteServerThenUpdateTB return items is empty");
return ApiResultDto.success(Collections.emptyList());
}
try {
ebsApiService.queryRemoteServerThenUpdateTB(items);
return ApiResultDto.success();
} catch (Exception e) {
logger.error("queryRemoteServerThenUpdateTB error.", e);
}
return ApiResultDto.fail();
}
@RequestMapping(value = "/queryRemoteServerThenUpdateCF", method = RequestMethod.POST)
public ApiResultDto queryRemoteServerThenUpdateCF(@RequestBody List<CashFlowQueryDto> items) {
if (CollectionUtils.isEmpty(items)) {
logger.debug("the queryRemoteServerThenUpdateCF return items is empty");
return ApiResultDto.success(Collections.emptyList());
}
try {
ebsApiService.queryRemoteServerThenUpdateCF(items);
return ApiResultDto.success();
} catch (Exception e) {
logger.error("queryRemoteServerThenUpdateCF error.", e);
}
return ApiResultDto.fail();
}
@RequestMapping(value = "/queryRemoteServerThenUpdateBS", method = RequestMethod.POST)
public ApiResultDto queryRemoteServerThenUpdateBS(@RequestBody List<BalanceSheetQueryDto> items) {
if (CollectionUtils.isEmpty(items)) {
logger.debug("the queryRemoteServerThenUpdateBS return items is empty");
return ApiResultDto.success(Collections.emptyList());
}
try {
ebsApiService.queryRemoteServerThenUpdateBS(items);
return ApiResultDto.success();
} catch (Exception e) {
logger.error("queryRemoteServerThenUpdateBS error.", e);
}
return ApiResultDto.fail();
}
@RequestMapping(value = "/queryRemoteServerThenUpdatePL", method = RequestMethod.POST)
public ApiResultDto queryRemoteServerThenUpdatePL(@RequestBody List<ProfitLossStatementQueryDto> items) {
if (CollectionUtils.isEmpty(items)) {
logger.debug("the queryRemoteServerThenUpdatePL return items is empty");
return ApiResultDto.success(Collections.emptyList());
}
try {
ebsApiService.queryRemoteServerThenUpdatePL(items);
return ApiResultDto.success();
} catch (Exception e) {
logger.error("queryRemoteServerThenUpdatePL error.", e);
}
return ApiResultDto.fail();
}
@RequestMapping(value = "/queryRemoteServerThenUpdateBSprc", method = RequestMethod.POST)
public ApiResultDto queryRemoteServerThenUpdateBSprc(@RequestBody List<BalanceSheetPrcQueryDto> items) {
if (CollectionUtils.isEmpty(items)) {
logger.debug("the queryRemoteServerThenUpdateBSprc return items is empty");
return ApiResultDto.success(Collections.emptyList());
}
try {
ebsApiService.queryRemoteServerThenUpdateBSprc(items);
return ApiResultDto.success();
} catch (Exception e) {
logger.error("queryRemoteServerThenUpdateBSprc error.", e);
}
return ApiResultDto.fail();
}
@RequestMapping(value = "/queryRemoteServerThenUpdatePLprc", method = RequestMethod.POST)
public ApiResultDto queryRemoteServerThenUpdatePLprc(@RequestBody List<ProfitLossStatementPrcQueryDto> items) {
if (CollectionUtils.isEmpty(items)) {
logger.debug("the queryRemoteServerThenUpdatePL return items is empty");
return ApiResultDto.success(Collections.emptyList());
}
try {
ebsApiService.queryRemoteServerThenUpdatePLprc(items);
return ApiResultDto.success();
} catch (Exception e) {
logger.error("queryRemoteServerThenUpdatePLprc error.", e);
}
return ApiResultDto.fail();
}
@RequestMapping(value = "/queryRemoteServerThenUpdateOAR", method = RequestMethod.POST)
public ApiResultDto queryRemoteServerThenUpdateOAR(@RequestBody List<OrganizationAccountingRateQueryDto> items) {
if (CollectionUtils.isEmpty(items)) {
logger.debug("the queryRemoteServerThenUpdateOAR return items is empty");
return ApiResultDto.success(Collections.emptyList());
}
try {
ebsApiService.queryRemoteServerThenUpdateOAR(items);
return ApiResultDto.success();
} catch (Exception e) {
logger.error("queryRemoteServerThenUpdateOAR error.", e);
}
return ApiResultDto.fail();
}
}
atms-api/src/main/java/pwc/taxtech/atms/service/EbsApiService.java
View file @ f78ff302
package pwc.taxtech.atms.service;
import pwc.taxtech.atms.dto.ebsdto.JEqueryDto;
import pwc.taxtech.atms.dto.ebsdto.*;
import java.util.List;
......@@ -8,7 +8,57 @@ public interface EbsApiService {
/**
* EBS 日记账同步更新
*
* @param items
*/
void queryRemoteServerThenUpdateJE(List<JEqueryDto> items);
void queryRemoteServerThenUpdateJE(List<JournalEntryQueryDto> items);
/**
* ebs 科目余额表同步更新
*
* @param items
*/
void queryRemoteServerThenUpdateTB(List<TrialBalanceQueryDto> items);
/**
* ebs 现金流量表同步更新
*
* @param items
*/
void queryRemoteServerThenUpdateCF(List<CashFlowQueryDto> items);
/**
* ebs 资产负债表同步更新
*
* @param items
*/
void queryRemoteServerThenUpdateBS(List<BalanceSheetQueryDto> items);
/**
* ebs 资产负债表PRC同步更新
*
* @param items
*/
void queryRemoteServerThenUpdateBSprc(List<BalanceSheetPrcQueryDto> items);
/**
* ebs 利润表同步更新
*
* @param items
*/
void queryRemoteServerThenUpdatePL(List<ProfitLossStatementQueryDto> items);
/**
* ebs 利润表PRC同步更新
*
* @param items
*/
void queryRemoteServerThenUpdatePLprc(List<ProfitLossStatementPrcQueryDto> items);
/**
* ebs 汇率表同步更新
*
* @param items
*/
void queryRemoteServerThenUpdateOAR(List<OrganizationAccountingRateQueryDto> items);
}
atms-api/src/test/java/pwc/taxtech/atms/service/impl/EbsApiServiceImplTest.java
View file @ f78ff302
package pwc.taxtech.atms.service.impl;
import org.junit.Test;
import pwc.taxtech.atms.CommonIT;
import pwc.taxtech.atms.dto.ebsdto.JEqueryDto;
import pwc.taxtech.atms.dto.ebsdto.JournalEntryQueryDto;
import pwc.taxtech.atms.service.EbsApiService;
import javax.annotation.Resource;
......@@ -18,73 +18,73 @@ public class EbsApiServiceImplTest extends CommonIT {
@Test
public void queryRemoteServerThenUpdateJE(){
List<JEqueryDto> items=new ArrayList<>();
List<JournalEntryQueryDto> items=new ArrayList<>();
for(int i=0;i<10;i++){
JEqueryDto jEqueryDto=new JEqueryDto();
jEqueryDto.setId(distributedIdService.nextId());
jEqueryDto.setOrganizationId("44250A49-F3EF-4A1E-89E0-165BB89A94D0");
jEqueryDto.setProjectId("44250A49-F3EF-4A1E-89E0-165BB89A94D0");
jEqueryDto.setDate(new Date());
jEqueryDto.setSource("这是哪里"+i);
jEqueryDto.setLedgerId("我关联谁"+i);
jEqueryDto.setLedgerName("我是谁"+i);
jEqueryDto.setCurrencyCode("123"+i);
jEqueryDto.setStatus("1");
jEqueryDto.setHeaderId("123456789");
jEqueryDto.setLineNum("1");
jEqueryDto.setApprovalStatus("1");
jEqueryDto.setPostedStatus("1");
jEqueryDto.setPeriod(0);
jEqueryDto.setAccountingDate(new Date());
jEqueryDto.setJournalSource("setJournalSource");
jEqueryDto.setCategory("setCategory");
jEqueryDto.setName("setName");
jEqueryDto.setVoucherNum("setVoucherNum");
jEqueryDto.setDescription("setDescription");
jEqueryDto.setSegment1("setSegment1");
jEqueryDto.setSegment2("setSegment2");
jEqueryDto.setSegment3("");
jEqueryDto.setSegment4("");
jEqueryDto.setSegment5("");
jEqueryDto.setSegment6("");
jEqueryDto.setSegment7("");
jEqueryDto.setSegment8("");
jEqueryDto.setSegment9("");
jEqueryDto.setSegment10("");
jEqueryDto.setSegment1Name("");
jEqueryDto.setSegment2Name("");
jEqueryDto.setSegment3Name("");
jEqueryDto.setSegment4Name("");
jEqueryDto.setSegment5Name("");
jEqueryDto.setSegment6Name("");
jEqueryDto.setSegment7Name("");
jEqueryDto.setSegment8Name("");
jEqueryDto.setSegment9Name("");
jEqueryDto.setSegment10Name("");
jEqueryDto.setJournalCurrencyCode("");
jEqueryDto.setSobCurrencyCode("");
jEqueryDto.setAccountedDr(new BigDecimal("0"));
jEqueryDto.setAccountedCr(new BigDecimal("0"));
jEqueryDto.setEnteredDr(new BigDecimal("0"));
jEqueryDto.setEnteredCr(new BigDecimal("0"));
jEqueryDto.setCfItem("");
jEqueryDto.setAttribute1("");
jEqueryDto.setAttribute2(new Date());
jEqueryDto.setAttribute3("");
jEqueryDto.setAttribute4("");
jEqueryDto.setAttribute5("");
jEqueryDto.setAttribute6("");
jEqueryDto.setAttribute7("");
jEqueryDto.setAttribute8("");
jEqueryDto.setAttribute9("");
jEqueryDto.setAttribute10("");
jEqueryDto.setAttribute11("");
jEqueryDto.setAttribute12("");
jEqueryDto.setAttribute13("");
jEqueryDto.setAttribute14("");
jEqueryDto.setAttribute15("");
jEqueryDto.setAttribute16("");
items.add(jEqueryDto);
JournalEntryQueryDto journalEntryQueryDto =new JournalEntryQueryDto();
journalEntryQueryDto.setId(distributedIdService.nextId());
journalEntryQueryDto.setOrganizationId("44250A49-F3EF-4A1E-89E0-165BB89A94D0");
journalEntryQueryDto.setProjectId("44250A49-F3EF-4A1E-89E0-165BB89A94D0");
journalEntryQueryDto.setDate(new Date());
journalEntryQueryDto.setSource("这是哪里"+i);
journalEntryQueryDto.setLedgerId("我关联谁"+i);
journalEntryQueryDto.setLedgerName("我是谁"+i);
journalEntryQueryDto.setCurrencyCode("123"+i);
journalEntryQueryDto.setStatus("1");
journalEntryQueryDto.setHeaderId("123456789");
journalEntryQueryDto.setLineNum("1");
journalEntryQueryDto.setApprovalStatus("1");
journalEntryQueryDto.setPostedStatus("1");
journalEntryQueryDto.setPeriod(0);
journalEntryQueryDto.setAccountingDate(new Date());
journalEntryQueryDto.setJournalSource("setJournalSource");
journalEntryQueryDto.setCategory("setCategory");
journalEntryQueryDto.setName("setName");
journalEntryQueryDto.setVoucherNum("setVoucherNum");
journalEntryQueryDto.setDescription("setDescription");
journalEntryQueryDto.setSegment1("setSegment1");
journalEntryQueryDto.setSegment2("setSegment2");
journalEntryQueryDto.setSegment3("");
journalEntryQueryDto.setSegment4("");
journalEntryQueryDto.setSegment5("");
journalEntryQueryDto.setSegment6("");
journalEntryQueryDto.setSegment7("");
journalEntryQueryDto.setSegment8("");
journalEntryQueryDto.setSegment9("");
journalEntryQueryDto.setSegment10("");
journalEntryQueryDto.setSegment1Name("");
journalEntryQueryDto.setSegment2Name("");
journalEntryQueryDto.setSegment3Name("");
journalEntryQueryDto.setSegment4Name("");
journalEntryQueryDto.setSegment5Name("");
journalEntryQueryDto.setSegment6Name("");
journalEntryQueryDto.setSegment7Name("");
journalEntryQueryDto.setSegment8Name("");
journalEntryQueryDto.setSegment9Name("");
journalEntryQueryDto.setSegment10Name("");
journalEntryQueryDto.setJournalCurrencyCode("");
journalEntryQueryDto.setSobCurrencyCode("");
journalEntryQueryDto.setAccountedDr(new BigDecimal("0"));
journalEntryQueryDto.setAccountedCr(new BigDecimal("0"));
journalEntryQueryDto.setEnteredDr(new BigDecimal("0"));
journalEntryQueryDto.setEnteredCr(new BigDecimal("0"));
journalEntryQueryDto.setCfItem("");
journalEntryQueryDto.setAttribute1("");
journalEntryQueryDto.setAttribute2(new Date());
journalEntryQueryDto.setAttribute3("");
journalEntryQueryDto.setAttribute4("");
journalEntryQueryDto.setAttribute5("");
journalEntryQueryDto.setAttribute6("");
journalEntryQueryDto.setAttribute7("");
journalEntryQueryDto.setAttribute8("");
journalEntryQueryDto.setAttribute9("");
journalEntryQueryDto.setAttribute10("");
journalEntryQueryDto.setAttribute11("");
journalEntryQueryDto.setAttribute12("");
journalEntryQueryDto.setAttribute13("");
journalEntryQueryDto.setAttribute14("");
journalEntryQueryDto.setAttribute15("");
journalEntryQueryDto.setAttribute16("");
items.add(journalEntryQueryDto);
}
ebsApiService.queryRemoteServerThenUpdateJE(items);
}
......
atms-web/src/main/webapp/app/vat/preview/vat-preview-cash-flow/vat-preview-cash-flow.ctrl.js
View file @ f78ff302
vatModule.controller('VatPreviewCashFlowController', ['$scope', '$log', '$translate', '$timeout', 'SweetAlert', '$q', 'uiGridConstants', '$interval', 'vatPreviewService', 'browserService', 'vatSessionService', 'region', 'enums', 'vatExportService',
function ($scope, $log, $translate, $timeout, SweetAlert, $q, uiGridConstants, $interval, vatPreviewService, browserService, vatSessionService, region, enums, vatExportService) {
vatModule.controller('VatPreviewCashFlowController', ['$scope', '$log', '$translate', '$timeout', 'SweetAlert', '$q', 'uiGridConstants', '$interval', 'vatPreviewService', 'browserService', 'vatSessionService', 'region', 'enums', 'vatExportService','$filter',
function ($scope, $log, $translate, $timeout, SweetAlert, $q, uiGridConstants, $interval, vatPreviewService, browserService, vatSessionService, region, enums, vatExportService,$filter) {
'use strict';
$scope.startDate = new Date(vatSessionService.project.year, 0, 1);
......@@ -195,7 +195,8 @@
//导出进项发票数据
$scope.downloadCashFlow = function () {
var fileName="cash_flow"
var localDate=$filter('date')(new Date(), 'yyyyMMddHHmmss');
var fileName="cash_flow_"+localDate;
vatPreviewService.initExportCFData($scope.queryParams,fileName).then(function (data) {
if (data) {
ackMessageBox.success(translate('FileExportSuccess'));
......
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