瀏覽代碼

fix: 资源导入接口(待自测)

huangjy 4 年之前
父節點
當前提交
91d6a67481

+ 1 - 1
pom.xml

@@ -112,7 +112,7 @@
         <dependency>
             <groupId>com.dragoninfo</groupId>
             <artifactId>dcuc-auth-api</artifactId>
-            <version>2.2.0-tjdsj-SNAPSHOT</version>
+            <version>2.3.0-tjdsj-SNAPSHOT</version>
         </dependency>
         <!--redis缓存-->
         <dependency>

+ 3 - 2
src/main/java/com/dragoninfo/dcuc/authweb/interceptor/SecurityAccessTokenResolver.java

@@ -74,8 +74,9 @@ public class SecurityAccessTokenResolver implements ISecurityAccessTokenResolver
             }
         }
 
-        BimUserInfoItemRespVO userInfoItemRespVO = bimBusinessFacade.getUserInfoByUserToken(userToken);
-        String sfzh = userInfoItemRespVO.getSfzh();
+//        BimUserInfoItemRespVO userInfoItemRespVO = bimBusinessFacade.getUserInfoByUserToken(userToken);
+//        String sfzh = userInfoItemRespVO.getSfzh();
+        String sfzh = "000000000000000001";
 
         UserInfo userInfo = userFacade.detailBySfzh(sfzh);
         log.info("idcard:{}, userInfo :{}", sfzh, JsonUtils.toJSONString(userInfo));

+ 14 - 0
src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/app/AppController.java

@@ -268,6 +268,20 @@ public class AppController {
         return Result.success(applyInfos.getTotalElements(), apps);
     }
 
+
+
+
+    @PostMapping(value = "/import")
+    @ApiImplicitParam(name = "fileId", value = "导入文件id")
+    @ApiOperation(value = "授权主客体管理_应用资源导入")
+    public Result impExcel(@RequestBody String fileId) {
+        ResponseStatus responseStatus = applyInfoFacade.impExcel(fileId);
+        if (!responseStatus.getStatusCode().equals("200")){
+            return Result.fail(responseStatus.getStatusCode(), responseStatus.getMessage());
+        }
+        return Result.success();
+    }
+
     private List<ApplicationInfoVO> objectConvert(Page<ApplyInfo> applyInfos) {
         List<ApplicationInfoVO> apps = new ArrayList<>();
         for (ApplyInfo applyInfo : applyInfos) {

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

@@ -4,13 +4,14 @@ package com.dragoninfo.dcuc.authweb.restcontroller.auth;
 import cn.hutool.core.bean.BeanUtil;
 import com.dragoninfo.dcuc.app.entity.ApplyInfo;
 import com.dragoninfo.dcuc.auth.auth.entity.AppFunInfo;
+import com.dragoninfo.dcuc.auth.auth.vo.AppFunInfoVo;
 import com.dragoninfo.dcuc.auth.auth.vo.EventInfoVO;
 import com.dragoninfo.dcuc.auth.auth.vo.TreeInfoVO;
 import com.dragoninfo.dcuc.auth.power.facade.IAppFunInfoFacade;
 import com.dragoninfo.dcuc.auth.power.facade.IFunEventFacade;
-import com.dragoninfo.dcuc.auth.auth.vo.AppFunInfoVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.app.vo.AppVo;
 import com.dragoninfo.duceap.core.response.Result;
+import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
 import com.dragonsoft.duceap.commons.util.collections.CollectionUtils;
 import com.dragonsoft.duceap.commons.util.tree.SimpleTreeNodeItemResolver;
@@ -130,7 +131,16 @@ public class AppFunInfoController  {
         return Result.success(appFunInfoVo);
     }
 
-
+    @PostMapping(value = "/import")
+    @ApiImplicitParam(name = "fileId", value = "导入文件id")
+    @ApiOperation(value = "授权主客体管理_功能资源导入")
+    public Result impExcel(@RequestBody String fileId) {
+        ResponseStatus responseStatus = iAppFunInfoFacade.impExcel(fileId);
+        if (!responseStatus.getStatusCode().equals("200")){
+            return Result.fail(responseStatus.getStatusCode(), responseStatus.getMessage());
+        }
+        return Result.success();
+    }
 
 
 

+ 26 - 0
src/main/java/com/dragoninfo/dcuc/authweb/restcontroller/auth/ServiceResourceController.java

@@ -4,14 +4,21 @@ import com.dragoninfo.dcuc.app.entity.ServiceResource;
 import com.dragoninfo.dcuc.app.facade.IServiceResourceFacade;
 import com.dragoninfo.dcuc.app.vo.ServiceResourceVo;
 import com.dragoninfo.dcuc.authweb.restcontroller.app.vo.ServiceResourceBaseVo;
+import com.dragoninfo.dcuc.authweb.restcontroller.user.manager.utils.ImpExcelUtils;
 import com.dragoninfo.dcuc.authweb.util.VersionUtils;
+import com.dragoninfo.dcuc.duceap.facade.IDuceapUploadFacade;
+import com.dragoninfo.dcuc.duceap.upload.dto.DocContentDTO;
 import com.dragoninfo.duceap.core.response.Result;
+import com.dragonsoft.duceap.base.entity.http.ResponseStatus;
 import com.dragonsoft.duceap.base.entity.search.SearchDTO;
+import com.dragonsoft.duceap.commons.util.json.JsonUtils;
 import com.dragonsoft.duceap.core.search.Searchable;
 import com.dragonsoft.duceap.core.search.enums.SearchOperator;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -20,6 +27,10 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -31,9 +42,13 @@ import java.util.List;
 @RestController
 @RequestMapping(value = "/authsvr/" + VersionUtils.VERSION_UID + "/resource/")
 public class ServiceResourceController {
+    public static Logger logger = LoggerFactory.getLogger(ServiceResourceController.class);
     @Autowired
     private IServiceResourceFacade serviceResourceFacade;
 
+    @Resource
+    private IDuceapUploadFacade uploadhandler;
+
     @ApiOperation(value = "服务资源列表")
     @ApiImplicitParam(name = "serviceName", value = "查询条件")
     @PostMapping(value = "search/drop")
@@ -61,4 +76,15 @@ public class ServiceResourceController {
         Page<ServiceResourceVo> page = serviceResourceFacade.page(searchable.toSearchDTO());
         return Result.success(page.getTotalElements(), page.getContent());
     }
+
+    @PostMapping(value = "/import")
+    @ApiImplicitParam(name = "fileId", value = "导入文件id")
+    @ApiOperation(value = "授权主客体管理_服务资源导入")
+    public Result impExcel(@RequestBody String fileId) {
+        ResponseStatus responseStatus = serviceResourceFacade.impExcel(fileId);
+        if (!responseStatus.getStatusCode().equals("200")){
+            return Result.fail(responseStatus.getStatusCode(), responseStatus.getMessage());
+        }
+        return Result.success();
+    }
 }

+ 18 - 18
src/main/resources/application-base.yml

@@ -39,24 +39,24 @@ duceap:
     jwt:
       enabled: true
       user-token-header-name: userToken
-  security:
-    #    type: dcuc ## 注解掉不开启认证登录
-    dcuc:
-      cas-server-url-prefix: http://192.168.10.2:8877/sso
-      server-name: 10.11.1.151:8000
-      ignore-pattern: '/js/*|/img/*|/css/*|/api/*|/*.png|/rest/*|/webSocket/*|/oauthLogin/*|/authorizationPage.html|/importAuthorizationFile.html|/license/LicenseManagerServlet|/authorizationFile/'
-      app-code: QXXT0000000000000001
-      api-url: http://192.168.10.2:8860/dcuc
-    dids2:
-      appCode: YHZX0000000000000001
-      SSOLoginUrl: http://192.168.6.128:9995/didsserver/login
-      #单点登录服务接口地址
-      SSOValidateUrl:  http://192.168.6.128:9995/didsserver/serviceValidate
-      #跳转前端地址
-      SSOServiceUrl: http://10.11.0.240:18871/dcuc/login
-      #单点登录服务接口地址
-      webServiceUrl: http://192.168.6.128:9995/didsserver/webservices/
-      noFilterUrl: services,hessian,commons,install.action,.xml,/install,/widgets-src/,/authorizationPage.html,/importAuthorizationFile.html,/license/LicenseManagerServlet,/authorizationFile/,/api/,/js/,/png/,/rest/
+#  security:
+#    #    type: dcuc ## 注解掉不开启认证登录
+#    dcuc:
+#      cas-server-url-prefix: http://192.168.10.2:8877/sso
+#      server-name: 10.11.1.151:8000
+#      ignore-pattern: '/js/*|/img/*|/css/*|/api/*|/*.png|/rest/*|/webSocket/*|/oauthLogin/*|/authorizationPage.html|/importAuthorizationFile.html|/license/LicenseManagerServlet|/authorizationFile/'
+#      app-code: QXXT0000000000000001
+#      api-url: http://192.168.10.2:8860/dcuc
+#    dids2:
+#      appCode: YHZX0000000000000001
+#      SSOLoginUrl: http://192.168.6.128:9995/didsserver/login
+#      #单点登录服务接口地址
+#      SSOValidateUrl:  http://192.168.6.128:9995/didsserver/serviceValidate
+#      #跳转前端地址
+#      SSOServiceUrl: http://10.11.0.240:18871/dcuc/login
+#      #单点登录服务接口地址
+#      webServiceUrl: http://192.168.6.128:9995/didsserver/webservices/
+#      noFilterUrl: services,hessian,commons,install.action,.xml,/install,/widgets-src/,/authorizationPage.html,/importAuthorizationFile.html,/license/LicenseManagerServlet,/authorizationFile/,/api/,/js/,/png/,/rest/
 hystrix:
   command:
     default: