🎉 代码优化

blade-service-api/blade-system-api/src/main/java/org/springblade/system/vo/DataScopeVO.java

@@ -0,0 +1,39 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.system.vo;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.system.entity.DataScope;
+
+/**
+ * 视图实体类
+ *
+ * @author Chill
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "DataScopeVO对象", description = "DataScopeVO对象")
+public class DataScopeVO extends DataScope {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 规则类型名
+	 */
+	private String scopeTypeName;
+}

blade-service/blade-system/src/main/java/org/springblade/system/controller/DataScopeController.java

@@ -28,6 +28,8 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.system.entity.DataScope;
 import org.springblade.system.service.IDataScopeService;
+import org.springblade.system.vo.DataScopeVO;
+import org.springblade.system.wrapper.DataScopeWrapper;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.web.bind.annotation.*;
 
@@ -64,9 +66,9 @@ public class DataScopeController extends BladeController {
 	 */
 	@GetMapping("/list")
 	@ApiOperation(value = "分页", notes = "传入dataScope", position = 2)
-	public R<IPage<DataScope>> list(DataScope dataScope, Query query) {
+	public R<IPage<DataScopeVO>> list(DataScope dataScope, Query query) {
 		IPage<DataScope> pages = dataScopeService.page(Condition.getPage(query), Condition.getQueryWrapper(dataScope));
-		return R.data(pages);
+		return R.data(DataScopeWrapper.build().pageVO(pages));
 	}
 
 	/**

blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java

@@ -112,7 +112,7 @@ public class MenuController extends BladeController {
 	@GetMapping("/routes")
 	@ApiOperation(value = "前端菜单数据", notes = "前端菜单数据", position = 3)
 	public R<List<MenuVO>> routes(BladeUser user) {
-		List<MenuVO> list = menuService.routes(user.getRoleId());
+		List<MenuVO> list = menuService.routes((user == null) ? null : user.getRoleId());
 		return R.data(list);
 	}
 

blade-service/blade-system/src/main/java/org/springblade/system/wrapper/DataScopeWrapper.java

@@ -0,0 +1,46 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.system.wrapper;
+
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.system.cache.DictCache;
+import org.springblade.system.entity.DataScope;
+import org.springblade.system.vo.DataScopeVO;
+
+
+/**
+ * 包装类,返回视图层所需的字段
+ *
+ * @author Chill
+ */
+public class DataScopeWrapper extends BaseEntityWrapper<DataScope, DataScopeVO> {
+
+	public static DataScopeWrapper build() {
+		return new DataScopeWrapper();
+	}
+
+	@Override
+	public DataScopeVO entityVO(DataScope dataScope) {
+		DataScopeVO dataScopeVO = BeanUtil.copy(dataScope, DataScopeVO.class);
+		assert dataScopeVO != null;
+		String scopeTypeName = DictCache.getValue("scope_type", dataScope.getScopeType());
+		dataScopeVO.setScopeTypeName(scopeTypeName);
+		return dataScopeVO;
+	}
+
+}