Merge remote-tracking branch 'origin/master' into dev

许鹏程

2024-09-14 0b57c36ace11b95ce296820a927615a8561d20ae

 src/main/java/com/product/file/controller/DocumentDirectoryController.java

@@ -336,4 +336,32 @@
               DocumentCode.DOCUMENT_CATALOG_GET_FAIL.getText());
      }
   }

   /**
    * 保存文档归档配置
    * @param request
    * @return
    */
   @RequestMapping(value = "/save-file-config/{version}", method = RequestMethod.POST)
   @ApiVersion(1)
   public String saveFileConfig(HttpServletRequest request) {
      try {
         FieldSetEntity fse = BaseUtil.getFieldSetEntity(request);
         IDocumentDirectoryService service = (IDocumentDirectoryService) getProxyInstance(documentDirectoryService);
         if(service.saveFileConfig(fse)) {
            return OK();
         }
         return error(DocumentCode.DOCUMENT_CATALOG_SAVE_FAIL.getValue(),
               DocumentCode.DOCUMENT_CATALOG_SAVE_FAIL.getText());
      } catch (BaseException e) {
         e.printStackTrace();
         SpringMVCContextHolder.getSystemLogger().error(e);
         return this.error(e);
      } catch (Exception e) {
         e.printStackTrace();
         SpringMVCContextHolder.getSystemLogger().error(e);
         return error(DocumentCode.DOCUMENT_CATALOG_SAVE_FAIL.getValue(),
               DocumentCode.DOCUMENT_CATALOG_SAVE_FAIL.getText());
      }
   }
}