diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/config/Constant.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/config/Constant.java index 1c8a853..a7176dd 100644 --- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/config/Constant.java +++ b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/config/Constant.java @@ -30,22 +30,35 @@ public class Constant { public static final String KUNMINGPRIVATEKEY = "MIIBVgIBADANBgkqhkiG9w0BAQEFAASCAUAwggE8AgEAAkEAtYOPB+vznro1kokCzlWctrju70W+KLO8pyQcflxA13rdNPVrCQgPmgaT8zf1BzX2mPcSE7fK43yQDhQHG00eyQIDAQABAkEAhf96DrIMZkg3FldZH/Opvmal1TPaXvfZNFZ/RnVaVPeY7sZATBhfitn3WqzdpdDtoksctbyPKrXjzAV0iafqxQIhAPWH4t0PJwnlP10Y+Ig1WCAcvFVc2Fu8ElshpVqYngWnAiEAvUDj49N9+yS6weO2eRuioXcGLEx9NjD7NomzMu+sJg8CIQCjDI8iH8rb7moKp+d7hHk2Mf77bQGcwaMq84f8RrdBpwIgIQqdPv+DtT86Y/OPviE3CZ2wNDe+fKGcmm78HF5/3b0CIQDwZK0KIZskQi0FN8muojQaklzhBt6teC4CW4tfVJyBrQ=="; + /** + * 税务局 节点地址 + */ + public static final String KUNMINGNODEADDRESS = "5ubz98RvsSFGPKWlMaTSCkMXaT10WqO47G"; + public static final String YINBANGPUBLICKEY = "MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBALiSEU13ypBqC5PdjttNIfXtaK/gpFJkREdysX/qzY9+OQCt7Xu1F/NUqRBzAVlPu8eBQr2JFdo5rpZkPsp1CaUCAwEAAQ=="; public static final String YINBANGPRIVATEKEY = "MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAuJIRTXfKkGoLk92O200h9e1or+CkUmRER3Kxf+rNj345AK3te7UX81SpEHMBWU+7x4FCvYkV2jmulmQ+ynUJpQIDAQABAkA95LWqrcYe4YDaaAzU26vMxX06pXFVM8x1zS9avwmJ2W17j/MOTO4ZZkvSvEqXsqfXNEBuI9u1x0mEwsA1luItAiEA/lOpzSiOwboFc979DVz23f3Cv4qOjTMjYO6gs7V3C28CIQC5yOvGC7Kgj57YpSoVEVW8/8HlE8fOX5mdJ/PxffTCKwIgIt8h1ymKeXGiMcMPe3eVudaDj3PWG/I5FZ9ilYF6My0CIDN+ikNBeMhiJoAb/3cJb/9L0H1jJy1/d/+EVGwqIk4zAiEA8hEbKehnmUv09i/tci3j8eEHv2fjn3PFx8pC3jQDVk0="; - + /** + * 商户 节点地址 + */ + public static final String YINBANGSADDRESS = "1fTzePeLpEGefHEDOPTfTLGSLmv7DivfPa"; public static final String XINFENGPUBLICKEY = "MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAIXJ3AcYZEyMxaNmIZxH1bQZ6vOVBpnLxg2Ks1OUqeUikWt+lgU077OqfHlfs8yF8hIgojztaTQL3QQtiHfTzLMCAwEAAQ=="; public static final String XINFENGPRIVATEKEY = "MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAhcncBxhkTIzFo2YhnEfVtBnq85UGmcvGDYqzU5Sp5SKRa36WBTTvs6p8eV+zzIXyEiCiPO1pNAvdBC2Id9PMswIDAQABAkB8K9/1DeR5T+ZXQ4FKZTmpEK0KKnSX5ZMKGoNZvY75xII9QRoGbyM7SXGmeZ/9TWv1NcHH57hcTwrZjfI4XRdBAiEA1w7Wbw69MkyDx4Aa5iH9yGTDRMgseQnuRE1xd+MWIYMCIQCfQjy7UFx6JUxyZFmo7bBVgRTpcJKBoFurnezPqhCxEQIgIwKSXCANItwb8+Vh+6b69p2YwGDKBKZeOJZW64p3dtsCIHlBS1AqzV5Ki7wE36cY4csYLr3V8hYz69fss+MgzvihAiEAxtF7691ObYOh4DMMLCEBYzGCTTbWDCxRyFltD/nrvrE="; + /** + * 个人 节点地址 + */ + public static final String XINFENGADDRESS = "9J7mdg5rbQyUHENYdx39WVWK7fsLpEoXZy"; public static final String SHENZHENPUBLICKEY = "MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAMfZpjt7MVadQky2TL+RHD+eJhjmWNtqCvKWZByVEajltTgLiQFIn8ESNcL9ZkB5aAidxYP7QjHHFWGMgRprkp0CAwEAAQ=="; public static final String SHENZHENPRIVATEKEY = "MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAx9mmO3sxVp1CTLZMv5EcP54mGOZY22oK8pZkHJURqOW1OAuJAUifwRI1wv1mQHloCJ3Fg/tCMccVYYyBGmuSnQIDAQABAkBm5loBJl0xC6end/XsbPruhq93AqOd1evtHCJP1TFSlIrWPy95H/fqZVxH65uMcXZpuMlmSkj1G8FgY401BvwBAiEA5aspno8vXg7HNXffqDqv2I+G/liOg81ei7bnjBcNGJECIQDew07gL7Se9mkNyakQvuvj/kD/A3YYleXB5ZmQrze/TQIgd0Tl/jO5k4z1Iu03tvOTMlGG9zsh94yFVuULZhLqeCECIGETm/v2zi+4Em//wb2adhIVax221HBCYq3s8M8sjI7BAiEAg5QCIjWpOWFavCmeR6/hoD/dWpKbP55twOKxZyadTEQ="; + public static final String SHENZHENADDRESS = "1A1zP1eP5QGefi2DMPTfTL5SLmv7DivfNa"; public static final String SUPPLIER="供应商"; @@ -56,4 +69,7 @@ public class Constant { public static final String CHUANGSHIQUKUAIDATA = "Jk3I59fWbCBMeCChqOdHTD1JF4GrG0+d9IRzp/1rG4bKa+XSh2AdDVhBrNWygc716U5sRkETy2gaZqXoJw/lgL5TwO6iYWF/GjeGqfAP/k6po6cQUgmP8Mr0KPTKb8qY6qrvyH7ZxrJ22ypxc4lTVN7pVNumlapbkEVCsSInVws="; + + + } diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuAddBussinessController.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuAddBussinessController.java index 5f599b0..6fa3472 100644 --- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuAddBussinessController.java +++ b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuAddBussinessController.java @@ -64,7 +64,7 @@ public class StuAddBussinessController { HashMap map = new HashMap<>(); map.put("采购订单","/supply/采购订单1.pdf"); - + map.put("开具发票","/supply/部分7增值税发票1.pdf"); map.put("开具发票1","/supply/部分7增值税发票1.pdf"); map.put("开具发票2","/supply/部分8增值税发票2.pdf"); map.put("开具发票3","/supply/部分9增值税发票3.pdf"); @@ -84,6 +84,9 @@ public class StuAddBussinessController { map.put("报告模板预览","/supply/尽职调查内容与程序.pdf"); map.put("评级模板预览","/supply/供应链金融应收账款类融资信用调查与分析.pdf"); map.put("商业保理业务风险管理操作指引","/supply/商业保理业务风险管理操作指引.pdf"); + map.put("国内有追索权保理业务合同及附件","/supply/国内有追索权保理业务合同及附件.pdf"); + map.put("客户结算条款","/supply/客户结算条款.pdf"); + //map.put("确认开增值税发票","/supply/部分3 采购订单1.pdf"); @@ -119,15 +122,13 @@ public class StuAddBussinessController { HashMap map = new HashMap<>(); map.put("采购订单","/supply/采购订单1.pdf"); - + map.put("开具发票","/supply/部分7增值税发票1.pdf"); map.put("开具发票1","/supply/部分7增值税发票1.pdf"); map.put("开具发票2","/supply/部分8增值税发票2.pdf"); map.put("开具发票3","/supply/部分9增值税发票3.pdf"); map.put("开具发票4","/supply/部分10增值税发票4.pdf"); - - map.put("邮件确认订单","/supply/部分2邮件确认订单.pdf"); map.put("交货对账单","/supply/部分6对账单.pdf"); @@ -137,6 +138,7 @@ public class StuAddBussinessController { map.put("报告模板预览","/supply/尽职调查内容与程序.pdf"); map.put("评级模板预览","/supply/供应链金融应收账款类融资信用调查与分析.pdf"); + map.put("保理合同模板下载","/supply/国内有追索权保理业务合同及附件.pdf"); map.put("客户结算条款模板下载","/supply/客户结算条款.pdf"); diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuCreditInvestmentController.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuCreditInvestmentController.java index 0dac7c4..be84f31 100644 --- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuCreditInvestmentController.java +++ b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuCreditInvestmentController.java @@ -52,6 +52,9 @@ public class StuCreditInvestmentController { private StuUploadResourceInfoMapper stuUploadResourceInfoMapper; + + + @ApiOperation("上传资料") @PostMapping("/uploadData") @AnonymousAccess @@ -71,8 +74,27 @@ public class StuCreditInvestmentController { public ResponseEntity previewInfoData( @RequestParam(required = true,name = "name")@NotBlank @ApiParam("文件类型名如：调查资料收集") String name, @NotBlank String userId) throws IOException { + StuUploadResourceInfoExample example = new StuUploadResourceInfoExample(); + example.createCriteria().andUserIdEqualTo(userId).andFileNameEqualTo(name); + + + List documentsInfoList = stuUploadResourceInfoMapper.selectByExample(example); + + if (documentsInfoList.isEmpty()){ + return null; + } + + String fileUrl = documentsInfoList.get(0).getFileUrl(); + + + // 模拟加载公章图片的数据（假设在硬盘上的某个路径下） + String imagePath = filePath +fileUrl; +// 替换为你的实际路径 + byte[] sealBytes = Files.readAllBytes(Paths.get(imagePath)); + + // 构建HTTP响应，设置Content-Type为image/png + return ResponseEntity.ok().contentType(MediaType.APPLICATION_PDF).body(sealBytes); - return stuCreditInvestService.previewInfoData(name,userId); } @@ -110,10 +132,6 @@ public class StuCreditInvestmentController { @RequestParam(required = true,name = "name")@NotBlank @ApiParam("文件类型名如：调查资料收集") String name, @NotBlank String userId) throws IOException { - - - - StuTransactionDocumentsInfoExample example = new StuTransactionDocumentsInfoExample(); example.createCriteria().andUserIdEqualTo(userId).andFileNameEqualTo(name); diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuReceiveDigitalVoucherController.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuReceiveDigitalVoucherController.java index 1aaafca..6c27d34 100644 --- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuReceiveDigitalVoucherController.java +++ b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuReceiveDigitalVoucherController.java @@ -8,10 +8,7 @@ import com.sztzjy.block_finance.util.ResultEntity; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** * @author 17803 @@ -45,7 +42,7 @@ public class StuReceiveDigitalVoucherController { @ApiOperation("交易相关信息解密") @PostMapping("/decryVoucher") @AnonymousAccess - public ResultEntity decryVoucher(StutranDocDto dto){ + public ResultEntity decryVoucher(@RequestBody StutranDocDto dto){ return service.decryVoucher(dto); @@ -54,7 +51,7 @@ public class StuReceiveDigitalVoucherController { @ApiOperation("接收数字凭证交易文件数字签名验证解密") @PostMapping("/decryVoucherBySign") @AnonymousAccess - public ResultEntity decryVoucherBySign(StutInfoSecDto dto){ + public ResultEntity decryVoucherBySign(@RequestBody StutInfoSecDto dto){ return service.decryVoucherBySign(dto); diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuSendApplyController.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuSendApplyController.java index fde9e68..ebf234c 100644 --- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuSendApplyController.java +++ b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuSendApplyController.java @@ -54,6 +54,7 @@ public class StuSendApplyController { @ApiOperation("融资需求输入内容") @PostMapping("/info") + @AnonymousAccess public ResultEntity info(@RequestBody StuFinanNeeds stuFinanNeeds){ return service.info(stuFinanNeeds); @@ -62,7 +63,7 @@ public class StuSendApplyController { @ApiOperation("关联数字债权凭证上传") - @GetMapping("/uploadDebt") + @PostMapping("/uploadDebt") @AnonymousAccess public ResultEntity uploadDebt(@RequestParam(required = true) @RequestPart MultipartFile file, @RequestParam(required = true) String userId,String fileName){ diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuSignFactorContractBySupplyController.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuSignFactorContractBySupplyController.java index 9b76ec9..000f7c3 100644 --- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuSignFactorContractBySupplyController.java +++ b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuSignFactorContractBySupplyController.java @@ -52,7 +52,7 @@ public class StuSignFactorContractBySupplyController { //保理合同 @ApiOperation("保理合同预览内容查询") - @PostMapping("/selectPreviewContext") + @GetMapping("/selectPreviewContext") @AnonymousAccess public ResultEntity selectPreviewContext(String userId){ return contractService.selectPreviewContext(userId); diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuSignFactorContractController.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuSignFactorContractController.java index 526ffbd..7a47999 100644 --- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuSignFactorContractController.java +++ b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/StuSignFactorContractController.java @@ -91,17 +91,15 @@ public class StuSignFactorContractController { @ApiOperation("上传保理合同/客户结算条款") - @GetMapping("/uploadContract") + @PostMapping("/uploadContract") @AnonymousAccess public ResultEntity uploadContract(@RequestParam(required = true) @RequestPart MultipartFile file, @RequestParam(required = true) String userId,String fileName){ - return contractService.uploadContract(file,userId,fileName); - } @@ -125,9 +123,9 @@ public class StuSignFactorContractController { String fileUrl = uploadResourceInfoList.get(0).getFileUrl(); - // 模拟加载公章图片的数据（假设在硬盘上的某个路径下） + // 模拟加载公章图片的数据（假设在硬盘上的某个路径下） String imagePath = filePath + fileUrl; -// 替换为你的实际路径 + // 替换为你的实际路径 byte[] sealBytes = Files.readAllBytes(Paths.get(imagePath)); // 构建HTTP响应，设置Content-Type为image/png diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/stuEncryptOnChainController.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/stuEncryptOnChainController.java index 0d6aead..972d017 100644 --- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/stuEncryptOnChainController.java +++ b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/stuEncryptOnChainController.java @@ -56,10 +56,8 @@ public class stuEncryptOnChainController { @AnonymousAccess public ResultEntity readInfo(@NotBlank String userId ) { - return service.readInfo(userId); - } @@ -71,10 +69,8 @@ public class stuEncryptOnChainController { @AnonymousAccess public ResultEntity tranDoc(@RequestBody @Validated StutranDocDto dto ) throws Exception { - return service.tranDoc(dto); - } @ApiOperation("交易相关信息加密") @@ -82,10 +78,8 @@ public class stuEncryptOnChainController { @AnonymousAccess public ResultEntity InfoSec(@RequestBody @Validated StutInfoSecDto dto ) throws Exception { - return service.InfoSec(dto); - } @PostMapping("/upload") @@ -116,21 +110,21 @@ public class stuEncryptOnChainController { throw new InvoceTException(HttpStatus.ACCEPTED, "请勿上传空文件！"); } - // 获取文件名 - String originalFilename = file.getOriginalFilename(); - - if (!name.equals(originalFilename)) - { - throw new InvoceTException(HttpStatus.ACCEPTED, "请上传正确的文件！"); - } - - - // 判断文件扩展名是否为图片格式 - - if (!StringUtils.hasLength(originalFilename) || (!originalFilename.toLowerCase().endsWith(".pdf"))) - { - throw new InvoceTException(HttpStatus.ACCEPTED, "请上传正确的文件！"); - } +// // 获取文件名 +// String originalFilename = file.getOriginalFilename(); +// +// if (!name.equals(originalFilename)) +// { +// throw new InvoceTException(HttpStatus.ACCEPTED, "请上传正确的文件！"); +// } +// +// +// // 判断文件扩展名是否为图片格式 +// +// if (!StringUtils.hasLength(originalFilename) || (!originalFilename.toLowerCase().endsWith(".pdf"))) +// { +// throw new InvoceTException(HttpStatus.ACCEPTED, "请上传正确的文件！"); +// } StuTransactionDocumentsInfoExample example = new StuTransactionDocumentsInfoExample(); @@ -187,7 +181,6 @@ public class stuEncryptOnChainController { docMapper.insertSelective(documentsInfo); - } diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/stuTransactionConfirmationController.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/stuTransactionConfirmationController.java index 07b3b66..39b9d29 100644 --- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/stuTransactionConfirmationController.java +++ b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/controller/stuTransactionConfirmationController.java @@ -52,25 +52,19 @@ public class stuTransactionConfirmationController { - - - @ApiOperation("交易文件数据") - @PostMapping("tranDoc") + @GetMapping("tranDoc") @AnonymousAccess public ResultEntity> tranDataList(String userId ){ - - return stuTransactionConfirmationService.tranDataList(userId); - - + return stuTransactionConfirmationService.tranDataList(userId); } @ApiOperation("交易相关信息解密") @AnonymousAccess - @PostMapping("updateEncryByInfo") + @PostMapping("updateEncryByInfo") public ResultEntity updateEncryByInfo(@RequestBody @Validated StutranDocDto dto){ return stuTransactionConfirmationService.updateEncryByInfo(dto); diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuBusinessSupplyServiceImpl.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuBusinessSupplyServiceImpl.java index 84a7285..e81e08b 100644 --- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuBusinessSupplyServiceImpl.java +++ b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuBusinessSupplyServiceImpl.java @@ -171,7 +171,7 @@ public class StuBusinessSupplyServiceImpl implements StuBusinessSupplyService { List stuJoinNodes = stuJoinNodeMapper.selectByExample(example); if (StringUtils.hasLength(stuJoinNodes.get(0).getPublicKey())) { - throw new InvoceTException(HttpStatus.BAD_REQUEST,"请勿重复注册！"); + return; } @@ -179,12 +179,14 @@ public class StuBusinessSupplyServiceImpl implements StuBusinessSupplyService { stuJoinNodes.get(0).setPublicKey( Constant.KUNMINGPUBLICKEY); stuJoinNodes.get(0).setPrivateKey( Constant.KUNMINGPRIVATEKEY); + stuJoinNodes.get(0).setNodeAddress(Constant.KUNMINGNODEADDRESS); } if (Constant.XINFENG.equals(stuAddNodesDto.getRegName())){ stuJoinNodes.get(0).setPublicKey( Constant.XINFENGPUBLICKEY); stuJoinNodes.get(0).setPrivateKey( Constant.XINFENGPRIVATEKEY); + stuJoinNodes.get(0).setNodeAddress(Constant.XINFENGADDRESS); } @@ -192,12 +194,14 @@ public class StuBusinessSupplyServiceImpl implements StuBusinessSupplyService { stuJoinNodes.get(0).setPublicKey( Constant.YINBANGPUBLICKEY); stuJoinNodes.get(0).setPrivateKey( Constant.YINBANGPRIVATEKEY); + stuJoinNodes.get(0).setNodeAddress(Constant.YINBANGSADDRESS); } if (Constant.SHENZHEN.equals(stuAddNodesDto.getRegName())){ stuJoinNodes.get(0).setPublicKey( Constant.SHENZHENPUBLICKEY); stuJoinNodes.get(0).setPrivateKey( Constant.SHENZHENPRIVATEKEY); + stuJoinNodes.get(0).setNodeAddress(Constant.SHENZHENADDRESS); } diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuDigitalDebtVoucherServiceImpl.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuDigitalDebtVoucherServiceImpl.java index 888aa35..454597f 100644 --- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuDigitalDebtVoucherServiceImpl.java +++ b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuDigitalDebtVoucherServiceImpl.java @@ -246,8 +246,7 @@ public class StuDigitalDebtVoucherServiceImpl implements StuDigitalDebtVoucherSe stuBlockOnChainMapper.insert(chain); - return new ResultEntity(HttpStatus.ACCEPTED,"加密成功！",encrypt); - + return new ResultEntity(HttpStatus.OK,"加密成功！",encrypt); }else { @@ -255,16 +254,12 @@ public class StuDigitalDebtVoucherServiceImpl implements StuDigitalDebtVoucherSe } - - }else { return new ResultEntity(HttpStatus.BAD_REQUEST,"加密失败！"); } - - } throw new ServiceException(HttpStatus.ACCEPTED,"请选择正确的密钥！"); diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuEncryptOnChainServiceImpl.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuEncryptOnChainServiceImpl.java index 8841530..6587acf 100644 --- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuEncryptOnChainServiceImpl.java +++ b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuEncryptOnChainServiceImpl.java @@ -134,6 +134,7 @@ public class StuEncryptOnChainServiceImpl implements StuEncryptOnChainService { blockOnChain.setUserId(dto.getUserId()); blockOnChain.setId(RandomUtil.randomString(64)); blockOnChain.setBuyData(Constant.CHUANGSHIQUKUAIDATA); + blockOnChain.setSequence(0); stuBlockOnChainMapper.insert(blockOnChain); @@ -152,6 +153,7 @@ public class StuEncryptOnChainServiceImpl implements StuEncryptOnChainService { stuBlockOnChain.setChainTime(System.currentTimeMillis()); stuBlockOnChain.setId(RandomUtil.randomString(64)); stuBlockOnChain.setBuyData(blockHashData); + stuBlockOnChain.setSequence(1); // stuBlockOnChain.setPlanNumber(stuEnterpriseBuyPlan.getPlanNumber()); stuBlockOnChainMapper.insert(stuBlockOnChain); } else { diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuSignFactorContractServiceImpl.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuSignFactorContractServiceImpl.java index 1e6dea6..c63c6be 100644 --- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuSignFactorContractServiceImpl.java +++ b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuSignFactorContractServiceImpl.java @@ -63,7 +63,7 @@ public class StuSignFactorContractServiceImpl implements StuSignFactorContractSe String sha256Hex = DigestUtil.sha256Hex("合同"); StuUploadResourceInfoExample example = new StuUploadResourceInfoExample(); - example.createCriteria().andUserIdEqualTo(dto.getUserId()).andModuleEqualTo("保理合同"); + example.createCriteria().andUserIdEqualTo(dto.getUserId()).andFileNameEqualTo("上传保理合同"); List uploadResourceInfoList = stuUploadResourceInfoMapper.selectByExample(example); if (uploadResourceInfoList.isEmpty()) { return new ResultEntity<>(HttpStatus.BAD_REQUEST,"加密失败"); @@ -106,7 +106,7 @@ public class StuSignFactorContractServiceImpl implements StuSignFactorContractSe uploadResourceInfoList.get(0).setFileUrl(path); uploadResourceInfoList.get(0).setUpdateTime(new Date()); - uploadResourceInfoList.get(0).setFileName(file.getOriginalFilename()); + uploadResourceInfoList.get(0).setFileName(fileName); uploadResourceInfoList.get(0).setFileSize(String.valueOf(file.getSize())); @@ -118,9 +118,11 @@ public class StuSignFactorContractServiceImpl implements StuSignFactorContractSe resourceInfo.setId(IdUtil.simpleUUID()); resourceInfo.setFileUrl(path); resourceInfo.setCreateTime(new Date()); - resourceInfo.setFileName(file.getOriginalFilename()); + resourceInfo.setFileName(fileName); resourceInfo.setFileSize(String.valueOf(file.getSize())); - stuUploadResourceInfoMapper.updateByPrimaryKeySelective(resourceInfo); + resourceInfo.setUserId(userId); + stuUploadResourceInfoMapper.insertSelective(resourceInfo); + } return new ResultEntity<>(HttpStatus.OK,"上传成功"); @@ -142,10 +144,11 @@ public class StuSignFactorContractServiceImpl implements StuSignFactorContractSe if (Constant.SHENZHENPRIVATEKEY.equals(dto.getPrivateKey())) { - String sha256Hex = RsaUtil.decryptByPrivateKey("数字签名",dto.getPrivateKey()); + //String sha256Hex = RsaUtil.decryptByPrivateKey("签名",dto.getPrivateKey()); + String sha256Hex = RsaUtil.encryptByPrivateKey("签名",dto.getPrivateKey()); StuUploadResourceInfoExample example = new StuUploadResourceInfoExample(); - example.createCriteria().andUserIdEqualTo(dto.getUserId()).andModuleEqualTo("保理合同"); + example.createCriteria().andUserIdEqualTo(dto.getUserId()).andFileNameEqualTo("上传保理合同"); List uploadResourceInfoList = stuUploadResourceInfoMapper.selectByExample(example); if (uploadResourceInfoList.isEmpty()) { return new ResultEntity<>(HttpStatus.BAD_REQUEST,"加密失败"); @@ -175,12 +178,12 @@ public class StuSignFactorContractServiceImpl implements StuSignFactorContractSe if (Constant.XINFENGPUBLICKEY.equals(dto.getPublicKey())) { //加密数据 - String encrypt = RsaUtil.encryptByPrivateKey("保理合同上链", dto.getPublicKey()); + String encrypt = RsaUtil.encryptByPublicKey("保理合同上链", dto.getPublicKey()); //通过hash256将加密数据生成区块哈希 String blockHashInfo = DigestUtil.sha256Hex(encrypt); StuUploadResourceInfoExample example = new StuUploadResourceInfoExample(); - example.createCriteria().andUserIdEqualTo(dto.getUserId()).andModuleEqualTo("保理合同"); + example.createCriteria().andUserIdEqualTo(dto.getUserId()).andFileNameEqualTo("上传保理合同"); List uploadResourceInfoList = stuUploadResourceInfoMapper.selectByExample(example); if (uploadResourceInfoList.isEmpty()) { return new ResultEntity<>(HttpStatus.BAD_REQUEST,"加密失败"); @@ -232,7 +235,7 @@ public class StuSignFactorContractServiceImpl implements StuSignFactorContractSe stuBlockOnChainMapper.insert(chain); - return new ResultEntity(HttpStatus.ACCEPTED,"加密成功！",encrypt); + return new ResultEntity(HttpStatus.OK,"加密成功！",encrypt); }else { @@ -258,12 +261,12 @@ public class StuSignFactorContractServiceImpl implements StuSignFactorContractSe StuUploadResourceInfoExample example = new StuUploadResourceInfoExample(); - example.createCriteria().andUserIdEqualTo(userId).andModuleEqualTo("保理合同") - .andModuleEqualTo("客户结算条款"); + example.createCriteria().andUserIdEqualTo(userId).andFileNameEqualTo("上传保理合同"); +// .andModuleEqualTo("客户结算条款"); List uploadResourceInfoList = stuUploadResourceInfoMapper.selectByExample(example); if (!uploadResourceInfoList.isEmpty()){ - StuUploadResourceInfo resourceInfo = uploadResourceInfoList.stream().filter(item -> item.getModule().equals("保理合同")).findFirst().orElse(null); + StuUploadResourceInfo resourceInfo = uploadResourceInfoList.stream().filter(item -> item.getFileName().equals("上传保理合同")).findFirst().orElse(null); if (resourceInfo.getFactorContractDecryState()==1) { @@ -297,7 +300,7 @@ public class StuSignFactorContractServiceImpl implements StuSignFactorContractSe StuUploadResourceInfoExample example = new StuUploadResourceInfoExample(); - example.createCriteria().andUserIdEqualTo(dto.getUserId()).andModuleEqualTo("保理合同"); + example.createCriteria().andUserIdEqualTo(dto.getUserId()).andFileNameEqualTo("上传保理合同"); List uploadResourceInfoList = stuUploadResourceInfoMapper.selectByExample(example); if (!uploadResourceInfoList.isEmpty()) { @@ -356,7 +359,7 @@ public class StuSignFactorContractServiceImpl implements StuSignFactorContractSe String encrypt = RsaUtil.encryptByPrivateKey("数字签名供应商", dto.getPrivateKey()); StuUploadResourceInfoExample example = new StuUploadResourceInfoExample(); - example.createCriteria().andUserIdEqualTo(dto.getUserId()).andModuleEqualTo("保理合同"); + example.createCriteria().andUserIdEqualTo(dto.getUserId()).andFileNameEqualTo("上传保理合同"); List uploadResourceInfoList = stuUploadResourceInfoMapper.selectByExample(example); if (!uploadResourceInfoList.isEmpty()) { @@ -373,10 +376,6 @@ public class StuSignFactorContractServiceImpl implements StuSignFactorContractSe } - - - - throw new ServiceException(HttpStatus.ACCEPTED,"请选择正确密钥！"); } } diff --git a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuTransactionConfirmationServiceImpl.java b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuTransactionConfirmationServiceImpl.java index c9a179f..e6fe455 100644 --- a/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuTransactionConfirmationServiceImpl.java +++ b/BlockFinanceCentral/src/main/java/com/sztzjy/block_finance/service/impl/StuTransactionConfirmationServiceImpl.java @@ -39,7 +39,6 @@ public class StuTransactionConfirmationServiceImpl implements StuTransactionConf example.createCriteria().andUserIdEqualTo(userId); List stuTransactionDocumentsInfoList = documentsInfoMapper.selectByExample(example); if (!stuTransactionDocumentsInfoList.isEmpty()){ - //判断交易相关信息解密状态 if (stuTransactionDocumentsInfoList.get(0).getInformationStatusEncry() == 1){ return new ResultEntity<>(HttpStatus.OK,"获取成功！",stuTransactionDocumentsInfoList); @@ -47,7 +46,6 @@ public class StuTransactionConfirmationServiceImpl implements StuTransactionConf stuTransactionDocumentsInfoList.forEach(item->{ item.setFileName("--"); - }); stuTransactionDocumentsInfoList.sort(Comparator.comparing(StuTransactionDocumentsInfo::getSequence)); @@ -58,8 +56,6 @@ public class StuTransactionConfirmationServiceImpl implements StuTransactionConf return new ResultEntity<>(HttpStatus.OK); } - - } /** @@ -87,17 +83,12 @@ public class StuTransactionConfirmationServiceImpl implements StuTransactionConf documentsInfoMapper.updateByPrimaryKey(item); }); - return new ResultEntity(HttpStatus.OK,"解密成功!"); - }else { return new ResultEntity(HttpStatus.BAD_REQUEST,"暂未查到加密数据！"); } - - - }else { @@ -105,11 +96,6 @@ public class StuTransactionConfirmationServiceImpl implements StuTransactionConf } - - - - - } /** diff --git a/BlockFinanceCentral/src/main/resources/mappers/StuSupplyOnchainMapper.xml b/BlockFinanceCentral/src/main/resources/mappers/StuSupplyOnchainMapper.xml index 04deed6..27d3eb2 100644 --- a/BlockFinanceCentral/src/main/resources/mappers/StuSupplyOnchainMapper.xml +++ b/BlockFinanceCentral/src/main/resources/mappers/StuSupplyOnchainMapper.xml @@ -309,7 +309,7 @@ \ No newline at end of file