git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@850 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/controller/ResourceController.java

@@ -0,0 +1,38 @@
+package com.uas.platform.b2b.controller;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.uas.platform.b2b.model.Resource;
+import com.uas.platform.b2b.service.ResourceService;
+
+/**
+ * 账户管理--系统资源
+ * 
+ * @author yingp
+ *
+ */
+@Controller
+@RequestMapping(value = "/account/resource")
+public class ResourceController {
+
+	@Autowired
+	private ResourceService resourceService;
+
+	/**
+	 * 取系统资源
+	 * 
+	 * @return
+	 */
+	@RequestMapping(method = RequestMethod.GET)
+	@ResponseBody
+	public List<Resource> getResources() {
+		return resourceService.findAll();
+	}
+
+}

src/main/java/com/uas/platform/b2b/dao/ResourceDao.java

@@ -1,11 +1,18 @@
 package com.uas.platform.b2b.dao;
 
+import java.util.List;
+
+import javax.persistence.OrderBy;
+
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
-import com.uas.platform.b2b.model.ResourceItem;
+import com.uas.platform.b2b.model.Resource;
 
 @Repository
-public interface ResourceDao extends JpaRepository<ResourceItem, Long> {
+public interface ResourceDao extends JpaRepository<Resource, Long> {
+	
+	@OrderBy("id")
+	public List<Resource> findAll();
 
 }

src/main/java/com/uas/platform/b2b/dao/ResourceItemDao.java

@@ -0,0 +1,11 @@
+package com.uas.platform.b2b.dao;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import com.uas.platform.b2b.model.ResourceItem;
+
+@Repository
+public interface ResourceItemDao extends JpaRepository<ResourceItem, Long>{
+
+}

src/main/java/com/uas/platform/b2b/service/ResourceService.java

@@ -0,0 +1,11 @@
+package com.uas.platform.b2b.service;
+
+import java.util.List;
+
+import com.uas.platform.b2b.model.Resource;
+
+public interface ResourceService {
+	
+	public List<Resource> findAll();
+	
+}

src/main/java/com/uas/platform/b2b/service/impl/ResourceServiceImpl.java

@@ -0,0 +1,23 @@
+package com.uas.platform.b2b.service.impl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.uas.platform.b2b.dao.ResourceDao;
+import com.uas.platform.b2b.model.Resource;
+import com.uas.platform.b2b.service.ResourceService;
+
+@Service
+public class ResourceServiceImpl implements ResourceService{
+	
+	@Autowired
+	private ResourceDao resourceDao;
+
+	@Override
+	public List<Resource> findAll() {
+		return resourceDao.findAll();
+	}
+
+}

src/main/java/com/uas/platform/b2b/support/CustomSecurityMetadataSource.java

@@ -16,7 +16,7 @@ import org.springframework.security.web.FilterInvocation;
 import org.springframework.security.web.access.intercept.FilterInvocationSecurityMetadataSource;
 import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
 
-import com.uas.platform.b2b.dao.ResourceDao;
+import com.uas.platform.b2b.dao.ResourceItemDao;
 import com.uas.platform.b2b.model.ResourceItem;
 
 /**
@@ -28,7 +28,7 @@ import com.uas.platform.b2b.model.ResourceItem;
 public class CustomSecurityMetadataSource implements FilterInvocationSecurityMetadataSource {
 
 	@Autowired
-	private ResourceDao resourceDao;
+	private ResourceItemDao resourceItemDao;
 
 	/**
 	 * LOGGER 日志对象
@@ -44,7 +44,7 @@ public class CustomSecurityMetadataSource implements FilterInvocationSecurityMet
 	private void loadResourceDefine() {
 		if (resourceMap == null) {
 			resourceMap = new HashMap<String, Collection<ConfigAttribute>>();
-			List<ResourceItem> resources = resourceDao.findAll();
+			List<ResourceItem> resources = resourceItemDao.findAll();
 			for (ResourceItem resource : resources) {
 				Collection<ConfigAttribute> configAttributes = new ArrayList<ConfigAttribute>();
 				ConfigAttribute configAttribute = new SecurityConfig(resource.getName());