diff --git a/server/pom.xml b/server/pom.xml index 3666f15..9373e5b 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -232,6 +232,11 @@ 1.04 provided + + com.alibaba.fastjson2 + fastjson2 + 2.0.12 + diff --git a/server/server.iml b/server/server.iml index d7e124f..9a2eeec 100644 --- a/server/server.iml +++ b/server/server.iml @@ -215,7 +215,8 @@ - + + diff --git a/server/src/main/java/cn/keking/web/controller/ContractController.java b/server/src/main/java/cn/keking/web/controller/ContractController.java index 57b6660..ee2b11e 100644 --- a/server/src/main/java/cn/keking/web/controller/ContractController.java +++ b/server/src/main/java/cn/keking/web/controller/ContractController.java @@ -12,9 +12,11 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.io.*; +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.OutputStream; import java.util.*; -import java.util.concurrent.ConcurrentHashMap; /** * @author Hikaru @@ -23,7 +25,7 @@ import java.util.concurrent.ConcurrentHashMap; @RestController @RequestMapping("/contract") @Slf4j -@Api(tags = "合同模板操作" ) +@Api(tags = "合同模板操作") public class ContractController { @@ -31,8 +33,6 @@ public class ContractController { private ContractService contractService; - - /** * 合同生成 * listTemplate @@ -44,7 +44,7 @@ public class ContractController { @ApiOperation("根据模板生成合同") @PostMapping("/gen/{templateName}") public ServiceResponse contractGen( - @ApiParam( value = "模板名称: 销售合同: sellContract ; 销售框架合同: frameContract", required = true ) @PathVariable String templateName, + @ApiParam(value = "模板名称: 销售合同: sellContract ; 销售框架合同: frameContract", required = true) @PathVariable String templateName, @io.swagger.v3.oas.annotations.parameters.RequestBody() @RequestBody Map dataMap) { try { @@ -94,7 +94,7 @@ public class ContractController { */ @ApiOperation("查询模板列表") @PostMapping("/list/template") - public ServiceResponse> listTemplate( @ApiParam( value = "默认列表: 销售合同: sellContract ; 销售框架合同: frameContract。 传空返回所有模板列表" ) @RequestBody(required = false) List templateNames) { + public ServiceResponse> listTemplate(@ApiParam(value = "默认列表: 销售合同: sellContract ; 销售框架合同: frameContract。 传空返回所有模板列表") @RequestBody(required = false) List templateNames) { try { templateNames = Optional.ofNullable(templateNames).orElse(Arrays.asList(Consts.FRAME_CONTRACT, Consts.SELL_CONTRACT)); List urls = this.contractService.listTemplate(templateNames); @@ -112,12 +112,11 @@ public class ContractController { /** * @return 下载合同pdf文件 - * - * */ + */ @ApiParam("下载合同pdf文件") @PostMapping("/download/{templateName}") public ServiceResponse downloadcontract( - @ApiParam( value = "模板名称: 销售合同: sellContract ; 销售框架合同: frameContract", required = true ) @PathVariable String templateName, + @ApiParam(value = "模板名称: 销售合同: sellContract ; 销售框架合同: frameContract", required = true) @PathVariable String templateName, @io.swagger.v3.oas.annotations.parameters.RequestBody() @RequestBody Map dataMap, HttpServletResponse response @@ -126,11 +125,11 @@ public class ContractController { log.error(JSON.toJSONString(dataMap)); OutputStream outstream = null; - File file=contractService.download(templateName, dataMap); + File file = contractService.download(templateName, dataMap); outstream = response.getOutputStream(); response.setCharacterEncoding("utf-8"); response.setContentType("application/octet-stream"); - String filename=dataMap.get("conCode")+".pdf"; + String filename = dataMap.get("conCode") + ".pdf"; response.reset(); // 设置response的Header response.addHeader("Content-Disposition", "attachment;filename=" + new String(filename.getBytes())); @@ -145,7 +144,7 @@ public class ContractController { bufferedInputStream.close(); outstream.flush(); outstream.close(); - return new ServiceResponse<>( "success", + return new ServiceResponse<>("success", ServiceResponse.RESULT_CODE_SUCCESS_CODE); } catch (Exception e) { log.error("生成错误:", e);