Prechádzať zdrojové kódy

fix: 功能资源导入接口自测完成

huangjy 4 rokov pred
rodič
commit
01b3282af9

+ 1 - 1
src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/auth/AppFunInfoController.java

@@ -134,7 +134,7 @@ public class AppFunInfoController  {
     @PostMapping(value = "/import")
     @PostMapping(value = "/import")
     @ApiImplicitParam(name = "fileId", value = "导入文件id")
     @ApiImplicitParam(name = "fileId", value = "导入文件id")
     @ApiOperation(value = "授权主客体管理_功能资源导入")
     @ApiOperation(value = "授权主客体管理_功能资源导入")
-    public Result impExcel(@RequestBody String fileId) {
+    public Result impExcel(@RequestParam("fileId") String fileId) {
         ResponseStatus responseStatus = iAppFunInfoFacade.impExcel(fileId);
         ResponseStatus responseStatus = iAppFunInfoFacade.impExcel(fileId);
         if (!responseStatus.getStatusCode().equals("200")){
         if (!responseStatus.getStatusCode().equals("200")){
             return Result.fail(responseStatus.getStatusCode(), responseStatus.getMessage());
             return Result.fail(responseStatus.getStatusCode(), responseStatus.getMessage());

+ 11 - 1
src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/download/DownloadController.java

@@ -60,10 +60,15 @@ public class DownloadController {
     public final String ORG_TEMPLATE_RLPATH = "/template/OrgTemplate.xls";
     public final String ORG_TEMPLATE_RLPATH = "/template/OrgTemplate.xls";
     public final String USER_TEMPLATE_RLPATH = "/template/UserTemplate.xls";
     public final String USER_TEMPLATE_RLPATH = "/template/UserTemplate.xls";
     /**
     /**
-     * 授权主客体管理_服务资源模板
+     * 客体_服务资源模板
      */
      */
     public final String SERVICE_RESOURCE_TEMPLATE_RLPATH = "/template/serviceResourceTemplate.xls";
     public final String SERVICE_RESOURCE_TEMPLATE_RLPATH = "/template/serviceResourceTemplate.xls";
 
 
+    /**
+     * 客体_功能资源模板
+     */
+    public final String APP_FUN_TEMPLATE_RLPATH = "/template/appFunTemplate.xls";
+
     private Logger logger = LoggerFactory.getLogger(DownloadController.class);
     private Logger logger = LoggerFactory.getLogger(DownloadController.class);
 
 
     @ApiOperation(value = "获取xls附件")
     @ApiOperation(value = "获取xls附件")
@@ -91,6 +96,9 @@ public class DownloadController {
         }else if (StringUtils.equals(type, "serviceResource")){
         }else if (StringUtils.equals(type, "serviceResource")){
             //授权主客体管理_服务资源模板
             //授权主客体管理_服务资源模板
             response = down(response,  SERVICE_RESOURCE_TEMPLATE_RLPATH);
             response = down(response,  SERVICE_RESOURCE_TEMPLATE_RLPATH);
+        }else if (StringUtils.equals(type, "appFun")){
+            //授权主客体管理_服务资源模板
+            response = down(response,  APP_FUN_TEMPLATE_RLPATH);
         }
         }
         return response;
         return response;
     }
     }
@@ -124,6 +132,8 @@ public class DownloadController {
                 fileName = "人员信息模板.xls";
                 fileName = "人员信息模板.xls";
             }else if ("serviceResourceTemplate.xls".equals( resource.getFilename())) {
             }else if ("serviceResourceTemplate.xls".equals( resource.getFilename())) {
                 fileName = "客体_服务资源导入.xls";
                 fileName = "客体_服务资源导入.xls";
+            }else if ("appFunTemplate.xls".equals( resource.getFilename())) {
+                fileName = "客体_功能资源导入.xls";
             }
             }
             response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8"));
             response.addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8"));
             response.addHeader("Content-Length", "" + resource.contentLength());
             response.addHeader("Content-Length", "" + resource.contentLength());

BIN
src/main/resources/template/appFunTemplate.xls


BIN
src/main/resources/template/serviceResourceTemplate.xls