cms用户资源权限支持指定时长

rankin-cms-web/src/main/java/cn/rankin/cmsweb/controller/user/TerminalUserController.java

@@ -1,12 +1,15 @@
 package cn.rankin.cmsweb.controller.user;
 
 import cn.rankin.cmsweb.assist.resolver.NeedUser;
+import cn.rankin.cmsweb.code.CmsWebAPICode;
 import cn.rankin.cmsweb.entity.UserDetails;
 import cn.rankin.cmsweb.service.product.ProductService;
 import cn.rankin.cmsweb.service.user.TerminalUserService;
+import cn.rankin.common.utils.api.model.APICode;
 import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
 import cn.rankin.common.utils.util.ListUtil;
+import cn.rankin.data.api.auth.dto.AuthDTO;
 import cn.rankin.data.api.product.vo.ProductVo;
 import cn.rankin.data.api.user.dto.TerminalUserDTO;
 import cn.rankin.data.api.user.dto.TerminalUserSearchDTO;
@@ -15,6 +18,7 @@ import cn.rankin.data.api.user.vo.TerminalUserAuthVo;
 import cn.rankin.data.api.user.vo.TerminalUserVo;
 import com.alibaba.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
@@ -66,6 +70,15 @@ public class TerminalUserController {
         return terminalUserService.getUser(id);
     }
 
+    @RequestMapping(value = "/auth", method = RequestMethod.POST)
+    public APIResult updateAuth(@RequestBody AuthDTO dto) {
+        if(StringUtils.isBlank(dto.getId())){
+            log.info("update Auth error ! id is empty");
+            return APIResult.error(APICode.PARAMETER_ERROR);
+        }
+        return terminalUserService.saveOrUpdateAuth(dto);
+    }
+
     @RequestMapping(value = "/auth/list", method = RequestMethod.GET)
     public APIResult<Page<TerminalUserAuthVo>> findAuthList(TerminalUserSearchDTO searchDTO) {
         log.info("/auth/list request params ,params = {}",JSON.toJSONString(searchDTO));

rankin-cms-web/src/main/java/cn/rankin/cmsweb/service/user/TerminalUserService.java

@@ -2,6 +2,7 @@ package cn.rankin.cmsweb.service.user;
 
 import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
+import cn.rankin.data.api.auth.dto.AuthDTO;
 import cn.rankin.data.api.user.dto.TerminalUserDTO;
 import cn.rankin.data.api.user.vo.TerminalUserAuthVo;
 import cn.rankin.data.api.user.vo.TerminalUserVo;
@@ -40,4 +41,7 @@ public interface TerminalUserService {
 
     @RequestMapping(value = "/user/auth/list", method = RequestMethod.GET)
     Page<TerminalUserAuthVo> findAuthList(@RequestParam Map<String,Object> searchDTO);
+
+    @RequestMapping(value = "/user/auth", method = RequestMethod.POST)
+    APIResult saveOrUpdateAuth(@RequestBody AuthDTO dto);
 }

rankin-user-service/src/main/java/cn/rankin/userservice/controller/TerminalUserController.java

@@ -7,6 +7,7 @@ import cn.rankin.common.utils.enums.BaseStatusEnum;
 import cn.rankin.common.utils.util.HttpUtil;
 import cn.rankin.common.utils.util.ListUtil;
 import cn.rankin.common.utils.util.ProvinceUtil;
+import cn.rankin.data.api.auth.dto.AuthDTO;
 import cn.rankin.data.api.auth.dto.AuthQueryDTO;
 import cn.rankin.data.api.auth.vo.AuthVo;
 import cn.rankin.data.api.user.dto.TerminalUserDTO;
@@ -125,6 +126,11 @@ public class TerminalUserController {
         return APIResult.ok(terminalUserList);
     }
 
+    @RequestMapping(value = "/auth", method = RequestMethod.POST)
+    public APIResult updateAuth(@RequestBody AuthDTO dto) {
+        return remoteAuthProxy.saveOrUpdateAuth(dto);
+    }
+
     @RequestMapping(value = "/auth/list", method = RequestMethod.GET)
     public Page<TerminalUserAuthVo> findAuthListByCondition(TerminalUserSearchDTO terminalUserSearchDTO) {
         Page<TerminalUserAuthVo> pageResult = new Page<>();

rankin-user-service/src/main/java/cn/rankin/userservice/proxy/RemoteAuthFeign.java

@@ -2,6 +2,7 @@ package cn.rankin.userservice.proxy;
 
 import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
+import cn.rankin.data.api.auth.dto.AuthDTO;
 import cn.rankin.data.api.auth.dto.AuthQueryDTO;
 import cn.rankin.data.api.auth.vo.AuthVo;
 import org.springframework.cloud.netflix.feign.FeignClient;
@@ -15,4 +16,7 @@ public interface RemoteAuthFeign {
     @RequestMapping(value = "/acenter/v1/auth/list/v2", method = RequestMethod.POST)
     APIResult<Page<AuthVo>> findAuthList(AuthQueryDTO authQueryDTO);
 
+    @RequestMapping(value = "/acenter/v1/auth", method = RequestMethod.POST)
+    APIResult saveOrUpdateAuth(@RequestBody AuthDTO dto);
+
 }

rankin-user-service/src/main/java/cn/rankin/userservice/proxy/RemoteAuthProxy.java

@@ -2,11 +2,13 @@ package cn.rankin.userservice.proxy;
 
 import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
+import cn.rankin.data.api.auth.dto.AuthDTO;
 import cn.rankin.data.api.auth.dto.AuthQueryDTO;
 import cn.rankin.data.api.auth.vo.AuthVo;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
+@Slf4j
 @Service
 public class RemoteAuthProxy {
 
@@ -16,8 +18,18 @@ public class RemoteAuthProxy {
     public Page<AuthVo> findAuthList(AuthQueryDTO authQueryDTO) {
         APIResult<Page<AuthVo>> apiResult = remoteAuthFeign.findAuthList(authQueryDTO);
         if(!apiResult.getSuccess()){
+            log.info("remote server error ,code={},message={}", apiResult.getCode(), apiResult.getMessage());
             throw new RuntimeException("远程服务器错误");
         }
         return apiResult.getData();
     }
+
+    public APIResult saveOrUpdateAuth(AuthDTO dto) {
+        APIResult apiResult = remoteAuthFeign.saveOrUpdateAuth(dto);
+        if(!apiResult.getSuccess()){
+            log.info("remote server error ,code={},message={}", apiResult.getCode(), apiResult.getMessage());
+            throw new RuntimeException("远程服务器错误");
+        }
+        return apiResult;
+    }
 }

rankin-user-service/src/main/java/cn/rankin/userservice/utils/Converter.java

@@ -21,6 +21,7 @@ public class Converter {
         vo.setUpdateTime(authVo.getUpdateTime());
         vo.setPid(authVo.getPid());
         vo.setUid(authVo.getUid());
+        vo.setTitle(authVo.getTitle());
 
         if(null != termianlUser){
             vo.setUCode(termianlUser.getCode());