Merge remote-tracking branch 'origin/jtdev' into jtdev

xieb

2023-10-19 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4

 skjcmanager/skjcmanager-ops/skjcmanager-resource/src/main/java/cn/gistack/resource/endpoint/OssEndpoint.java

@@ -197,9 +197,9 @@
    */
   @SneakyThrows
   @PostMapping("/put-file-by-textualResearchAttach")
   public R putFileByPrefixTextualResearchAttach(@RequestParam MultipartFile file,String resGuid) {
   public R putFileByPrefixTextualResearchAttach(@RequestParam MultipartFile file,String resGuid,Integer type) {
      BladeFile bladeFile = ossBuilder.templateByPrefixPath("textualResearchAttach").putFile(file.getOriginalFilename(), file.getInputStream());
      buildTextualResearchAttach(resGuid,bladeFile);
      buildTextualResearchAttach(resGuid,bladeFile,type);
      return R.data(bladeFile);
   }

@@ -207,9 +207,10 @@
    * 保存考证附件上传数据
    * @param bladeFile
    */
   private void buildTextualResearchAttach(String resGuid,BladeFile bladeFile) {
   private void buildTextualResearchAttach(String resGuid,BladeFile bladeFile,Integer type) {
      TextualResearchAttach attach = new TextualResearchAttach();
      attach.setResGuid(resGuid);
      attach.setType(type);
      attach.setPath(bladeFile.getName());
      attach.setName(bladeFile.getOriginalName());
      attach.setCreateTime(new Date());