|
@@ -1,21 +1,27 @@
|
|
|
package com.persagy.fm.saas.role.controller;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
+import com.persagy.fm.common.response.CommonResult;
|
|
|
+import com.persagy.fm.common.response.PageList;
|
|
|
import com.persagy.fm.common.utils.ResultHelper;
|
|
|
+import com.persagy.fm.saas.role.model.ConvertSaasRoleTool;
|
|
|
+import com.persagy.fm.saas.role.model.SaasRole;
|
|
|
+import com.persagy.fm.saas.role.model.dto.AddSaasRoleDTO;
|
|
|
+import com.persagy.fm.saas.role.model.dto.DeleteSaasRoleDTO;
|
|
|
+import com.persagy.fm.saas.role.model.dto.PageQuerySaasRoleDTO;
|
|
|
+import com.persagy.fm.saas.role.model.dto.UpdateSaasRoleDTO;
|
|
|
+import com.persagy.fm.saas.role.model.vo.SaasRoleListItemVO;
|
|
|
import com.persagy.fm.saas.role.service.ISaasRoleService;
|
|
|
-
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
-import com.persagy.fm.saas.role.model.*;
|
|
|
-import com.persagy.fm.saas.role.model.vo.*;
|
|
|
-import com.persagy.fm.saas.role.model.dto.*;
|
|
|
-import com.persagy.fm.common.response.*;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.validation.annotation.Validated;
|
|
|
-import org.springframework.web.bind.annotation.*;
|
|
|
+import org.springframework.web.bind.annotation.PostMapping;
|
|
|
+import org.springframework.web.bind.annotation.RequestBody;
|
|
|
+import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
+import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import javax.validation.Valid;
|
|
|
-import java.util.List;
|
|
|
|
|
|
/**
|
|
|
* @author lixing
|
|
@@ -37,14 +43,14 @@ public class SaasRoleController {
|
|
|
return ResultHelper.success("创建成功");
|
|
|
}
|
|
|
|
|
|
-// @ApiOperation(value = "详情")
|
|
|
-// @PostMapping("/get")
|
|
|
-// public FmResponseItem<ResponseSaasRoleItemVO> querySaasRoleDetail(
|
|
|
-// @Valid @RequestBody QuerySaasRoleDetailDTO querySaasRoleDetailDTO) {
|
|
|
-// SaasRole saasRole = saasRoleService.querySaasRoleDetail(querySaasRoleDetailDTO.getId());
|
|
|
-// ResponseSaasRoleItemVO responseSaasRoleItemVO = ConvertSaasRoleTool.INSTANCE.convert2ResponseItemDTO(saasRole);
|
|
|
-// return ResultHelper.successItem(responseSaasRoleItemVO);
|
|
|
-// }
|
|
|
+ // @ApiOperation(value = "详情")
|
|
|
+ // @PostMapping("/get")
|
|
|
+ // public FmResponseItem<ResponseSaasRoleItemVO> querySaasRoleDetail(
|
|
|
+ // @Valid @RequestBody QuerySaasRoleDetailDTO querySaasRoleDetailDTO) {
|
|
|
+ // SaasRole saasRole = saasRoleService.querySaasRoleDetail(querySaasRoleDetailDTO.getId());
|
|
|
+ // ResponseSaasRoleItemVO responseSaasRoleItemVO = ConvertSaasRoleTool.INSTANCE.convert2ResponseItemDTO(saasRole);
|
|
|
+ // return ResultHelper.successItem(responseSaasRoleItemVO);
|
|
|
+ // }
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "更新")
|
|
@@ -65,14 +71,14 @@ public class SaasRoleController {
|
|
|
}
|
|
|
|
|
|
|
|
|
-// @ApiOperation(value = "列表")
|
|
|
-// @PostMapping("/query")
|
|
|
-// public CommonResult<List<ResponseSaasRoleListItemVO>> querySaasRole(
|
|
|
-// @Valid @RequestBody QuerySaasRoleDTO querySaasRoleDTO) {
|
|
|
-// List<SaasRole> saasRoleList = saasRoleService.querySaasRoleList(querySaasRoleDTO);
|
|
|
-// List<ResponseSaasRoleListItemVO> resultList = ConvertSaasRoleTool.INSTANCE.convert2List(saasRoleList);
|
|
|
-// return ResultHelper.multi(resultList);
|
|
|
-// }
|
|
|
+ // @ApiOperation(value = "列表")
|
|
|
+ // @PostMapping("/query")
|
|
|
+ // public CommonResult<List<ResponseSaasRoleListItemVO>> querySaasRole(
|
|
|
+ // @Valid @RequestBody QuerySaasRoleDTO querySaasRoleDTO) {
|
|
|
+ // List<SaasRole> saasRoleList = saasRoleService.querySaasRoleList(querySaasRoleDTO);
|
|
|
+ // List<ResponseSaasRoleListItemVO> resultList = ConvertSaasRoleTool.INSTANCE.convert2List(saasRoleList);
|
|
|
+ // return ResultHelper.multi(resultList);
|
|
|
+ // }
|
|
|
|
|
|
@ApiOperation(value = "列表, 分页查询")
|
|
|
@PostMapping("/query")
|
|
@@ -81,7 +87,13 @@ public class SaasRoleController {
|
|
|
IPage<SaasRole> pagedList = saasRoleService.pageQuerySaasRole(pageQuerySaasRoleDTO);
|
|
|
IPage<SaasRoleListItemVO> pagedResultList = pagedList.convert(item -> {
|
|
|
try {
|
|
|
- return ConvertSaasRoleTool.INSTANCE.convert2ResponseListItemDTO(item);
|
|
|
+ SaasRoleListItemVO saasRoleListItemVO = ConvertSaasRoleTool.INSTANCE.convert2ResponseListItemDTO(item);
|
|
|
+ Integer countFunction = item.getCountFunction();
|
|
|
+ Integer countMenu = item.getCountMenu();
|
|
|
+ countFunction = countFunction == null ? 0 : countFunction;
|
|
|
+ countMenu = countMenu == null ? 0 : countMenu;
|
|
|
+ saasRoleListItemVO.setRelatedFunCount(countFunction + countMenu);
|
|
|
+ return saasRoleListItemVO;
|
|
|
} catch (Exception e) {
|
|
|
throw new IllegalArgumentException("分页查询,SaasRole实体类转换为列表对象发生异常", e);
|
|
|
}
|