From 853e6fc4521dff44d368ecdb4d84959d7f685836 Mon Sep 17 00:00:00 2001 From: dongxiaoke <1910333201@qq.com> Date: Tue, 23 May 2023 14:14:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E7=A8=8E=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../http/invoice/v1/InvoiceController.java | 2 +- .../invoice/BillInfoController.java | 2 +- .../platform/InvoiceAddController.java | 54 ++++++++++++------- .../web/core/config/SwaggerConfig.java | 21 ++++++++ .../src/main/resources/application.yml | 2 +- .../com/jianshui/invoice/domain/BillInfo.java | 4 -- .../jianshui/invoice/utils/IncomeTest.java | 2 +- jianshui-platform/pom.xml | 4 ++ .../platform/domain/dto/BillInfoDTO.java | 32 +++++++++++ 9 files changed, 97 insertions(+), 26 deletions(-) create mode 100644 jianshui-platform/src/main/java/com/jianshui/platform/domain/dto/BillInfoDTO.java diff --git a/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java b/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java index 9494359..84b6aed 100644 --- a/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java +++ b/jianshui-admin/src/main/java/com/jianshui/api/controller/http/invoice/v1/InvoiceController.java @@ -42,7 +42,7 @@ import java.util.concurrent.TimeUnit; * @Author 巩权林 * @Date 2022/3/26 10:11 **/ -@Api(tags = "A简税升级-销项接口V1.0") +//@Api(tags = "A简税升级-销项接口V1.0") @RestController // @RequestMapping("/api/invoice/v1/invoice") // 为了兼容老版本航信接口 @Slf4j diff --git a/jianshui-admin/src/main/java/com/jianshui/web/controller/invoice/BillInfoController.java b/jianshui-admin/src/main/java/com/jianshui/web/controller/invoice/BillInfoController.java index d0d623f..f4c83fd 100644 --- a/jianshui-admin/src/main/java/com/jianshui/web/controller/invoice/BillInfoController.java +++ b/jianshui-admin/src/main/java/com/jianshui/web/controller/invoice/BillInfoController.java @@ -30,7 +30,7 @@ import com.jianshui.common.core.page.TableDataInfo; * @author Gong Quanlin * @date 2022-03-06 */ -@Api(tags = "测试接口文档",value = "ceceshi") +//@Api(tags = "测试接口文档",value = "ceceshi") @RestController @RequestMapping("/invoice/billinfo") public class BillInfoController extends BaseController diff --git a/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/InvoiceAddController.java b/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/InvoiceAddController.java index 0fc1a42..f99e5d0 100644 --- a/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/InvoiceAddController.java +++ b/jianshui-admin/src/main/java/com/jianshui/web/controller/platform/InvoiceAddController.java @@ -1,35 +1,53 @@ package com.jianshui.web.controller.platform; +import com.alibaba.fastjson.JSONObject; import com.jianshui.common.core.controller.BaseController; +import com.jianshui.common.core.domain.AjaxResult; +import com.jianshui.common.core.domain.entity.Companyservice; +import com.jianshui.common.enums.ErrorCode; +import com.jianshui.common.utils.StringUtils; +import com.jianshui.invoice.domain.dto.HXResponse; +import com.jianshui.invoice.service.IInvoiceApiService; +import com.jianshui.invoice.service.IInvoiceRequestService; +import com.jianshui.invoice.service.IInvoiceResponseService; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletRequest; + /** * 发票录入 * */ -@Api(tags = "测试接口文档",value = "ceceshi") +@Api(tags={"单据录入"},value = "单据录入") @RestController -@RequestMapping("/platForm/invoice") +@RequestMapping("/platForm/documentEntry/") public class InvoiceAddController extends BaseController { - //发票录入 - - /** - * 接口权限走登录验证，token - * 发票录入-》对接发票开具接口 - * - * 录入到billInfo表里面去。 - * - * - */ - - /** - * 单据录入菜单： - * - */ - // TODO: 2023/5/23 发票录入接口 + + @ApiOperation("单据保存") + @ApiImplicitParams({ + @ApiImplicitParam(name = "identity", value = "身份认证", dataType = "string", example = "1130", required = true), + @ApiImplicitParam(name = "order", value = "请求体", required = true)}) + @PostMapping( "save") + public AjaxResult invoiceStatistics(HttpServletRequest request, String identity) throws Exception { + + + + + + return AjaxResult.success("保存成功"); + + } + + + +// 《======================》 diff --git a/jianshui-admin/src/main/java/com/jianshui/web/core/config/SwaggerConfig.java b/jianshui-admin/src/main/java/com/jianshui/web/core/config/SwaggerConfig.java index fcf8450..5415dab 100644 --- a/jianshui-admin/src/main/java/com/jianshui/web/core/config/SwaggerConfig.java +++ b/jianshui-admin/src/main/java/com/jianshui/web/core/config/SwaggerConfig.java @@ -69,6 +69,27 @@ public class SwaggerConfig .pathMapping(pathMapping); } + @Bean + public Docket createRestApiPlatform() + { + return new Docket(DocumentationType.OAS_30) + // 是否启用Swagger + .enable(enabled) + // 用来创建该API的基本信息，展示在文档的页面中（自定义展示的信息） + .apiInfo(apiInfo()) + // 设置哪些接口暴露给Swagger展示 + .select() + // 扫描所有有注解的api，用这种方式更灵活 + .apis(RequestHandlerSelectors.basePackage("com.jianshui.web.controller.platform")) + .paths(PathSelectors.any()) + .build() + .groupName("简税产品") + /* 设置安全模式，swagger可以设置访问token */ + .securitySchemes(securitySchemes()) + .securityContexts(securityContexts()) + .pathMapping(pathMapping); + } + /** * 安全模式，这里指定token通过Authorization头请求头传递 */ diff --git a/jianshui-admin/src/main/resources/application.yml b/jianshui-admin/src/main/resources/application.yml index 7b20ab2..895842e 100644 --- a/jianshui-admin/src/main/resources/application.yml +++ b/jianshui-admin/src/main/resources/application.yml @@ -46,7 +46,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: dev + active: dev-local # 文件上传 servlet: multipart: diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillInfo.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillInfo.java index c641efe..5a8e451 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillInfo.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillInfo.java @@ -342,10 +342,6 @@ public class BillInfo extends BaseEntity - - - - @Override public String getSearchValue() { return searchValue; diff --git a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/IncomeTest.java b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/IncomeTest.java index 2b333e4..d019f67 100644 --- a/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/IncomeTest.java +++ b/jianshui-invoice/src/main/java/com/jianshui/invoice/utils/IncomeTest.java @@ -207,7 +207,7 @@ public class IncomeTest { order = "{\n" + " \"PCH\": \"" + uuid + "\",\n" + " \"GMFSBH\": \"9111122223333CKFPT\",\n" + - " \"TJBZ\": \"0\",\n" + + " \"TJBZ\": \"1\",\n" + " \"RZSKSSQ\": \"202209\",\n" + " \"taxNo\": \"9111122223333CKFPT\"\n" + "}"; diff --git a/jianshui-platform/pom.xml b/jianshui-platform/pom.xml index e1abb07..ecef9fa 100644 --- a/jianshui-platform/pom.xml +++ b/jianshui-platform/pom.xml @@ -55,6 +55,10 @@ compile + + com.jianshui + jianshui-invoice + diff --git a/jianshui-platform/src/main/java/com/jianshui/platform/domain/dto/BillInfoDTO.java b/jianshui-platform/src/main/java/com/jianshui/platform/domain/dto/BillInfoDTO.java new file mode 100644 index 0000000..e8d4b26 --- /dev/null +++ b/jianshui-platform/src/main/java/com/jianshui/platform/domain/dto/BillInfoDTO.java @@ -0,0 +1,32 @@ +package com.jianshui.platform.domain.dto; + +/** + * 单据录入统一入参 + */ +public class BillInfoDTO { + + //---》》》》||| + + + + + + + + + + + + + + + + + + + + + + + +}