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

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

@@ -2,7 +2,6 @@ package com.uas.platform.b2b.controller;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
-import java.util.Map;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
@@ -17,10 +16,11 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
 import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.QueriableMember;
+import com.uas.platform.b2b.model.QueriableUser;
 import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.service.EnterpriseService;
 import com.uas.platform.b2b.service.UserService;
-import com.uas.platform.core.util.serializer.FlexJsonUtils;
 
 /**
  * 对外公开的资料查询接口
@@ -29,7 +29,7 @@ import com.uas.platform.core.util.serializer.FlexJsonUtils;
  * </p>
  * 
  * @author yingp
- *
+ * 
  */
 @Controller
 @RequestMapping("/public/queriable")
@@ -50,21 +50,19 @@ public class PublicQueryController {
 	@RequestMapping(value = "/members", method = RequestMethod.GET)
 	@ResponseBody
 	@ResponseStatus(value = HttpStatus.OK)
-	public ModelMap queryEnterprise(@RequestParam("data") String data) throws UnsupportedEncodingException {
-		String jsonStr = URLDecoder.decode(data, "UTF-8");
-		Map<String, String> map = FlexJsonUtils.fromJson(jsonStr);
+	public ModelMap queryEnterprise(@RequestParam("name") String name, @RequestParam("shortName") String shortName,
+			@RequestParam("uu") Long uu) throws UnsupportedEncodingException {
 		ModelMap returnMap = new ModelMap();
-		String name = map.get("name");
 		if (!StringUtils.isEmpty(name)) {
-			returnMap.put("name", enterpriseService.findByName(name));
+			returnMap.put("name",
+					QueriableMember.getMembers(enterpriseService.findByName(URLDecoder.decode(name, "UTF-8"))));
 		}
-		String shortName = map.get("shortname");
 		if (!StringUtils.isEmpty(shortName)) {
-			returnMap.put("shortname", enterpriseService.findByShortName(shortName));
+			returnMap.put("shortname", QueriableMember.getMembers(enterpriseService.findByShortName(URLDecoder.decode(
+					shortName, "UTF-8"))));
 		}
-		String uu = map.get("uu");
-		if (!StringUtils.isEmpty(uu)) {
-			returnMap.put("uu", enterpriseService.findById(Long.parseLong(uu)));
+		if (uu != null) {
+			returnMap.put("uu", enterpriseService.findById(uu));
 		}
 		return returnMap;
 	}
@@ -77,15 +75,10 @@ public class PublicQueryController {
 	@RequestMapping(value = "/members/{uu}", method = RequestMethod.GET)
 	@ResponseBody
 	@ResponseStatus(value = HttpStatus.OK)
-	public ModelMap getEnterprise(@PathVariable("uu") Long uu) {
+	public QueriableMember getEnterprise(@PathVariable("uu") Long uu) {
 		Enterprise enterprise = enterpriseService.findById(uu);
-		if (enterprise != null) {
-			ModelMap map = new ModelMap();
-			map.put("name", enterprise.getEnName());
-			map.put("shortname", enterprise.getEnShortname());
-			map.put("address", enterprise.getEnAddress());
-			return map;
-		}
+		if (enterprise != null)
+			return new QueriableMember(enterprise);
 		return null;
 	}
 
@@ -97,15 +90,10 @@ public class PublicQueryController {
 	@RequestMapping(value = "/members/{enUU}/users/{userUU}", method = RequestMethod.GET)
 	@ResponseBody
 	@ResponseStatus(value = HttpStatus.OK)
-	public ModelMap getUser(@PathVariable("enUU") Long enUU, @PathVariable("userUU") Long userUU) {
+	public QueriableUser getUser(@PathVariable("enUU") Long enUU, @PathVariable("userUU") Long userUU) {
 		User user = userService.findUserByEnUUAndUserUU(enUU, userUU);
-		if (user != null) {
-			ModelMap map = new ModelMap();
-			map.put("name", user.getUserName());
-			map.put("tel", user.getUserTel());
-			map.put("email", user.getUserEmail());
-			return map;
-		}
+		if (user != null)
+			return new QueriableUser(user);
 		return null;
 	}
 

src/main/java/com/uas/platform/b2b/model/QueriableMember.java

@@ -0,0 +1,74 @@
+package com.uas.platform.b2b.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.util.CollectionUtils;
+
+/**
+ * 企业信息对外查询接口的模型
+ * 
+ * @author yingp
+ * 
+ */
+public class QueriableMember {
+
+	private String name;
+	private String shortName;
+	private Long uu;
+	private String address;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getShortName() {
+		return shortName;
+	}
+
+	public void setShortName(String shortName) {
+		this.shortName = shortName;
+	}
+
+	public Long getUu() {
+		return uu;
+	}
+
+	public void setUu(Long uu) {
+		this.uu = uu;
+	}
+
+	public String getAddress() {
+		return address;
+	}
+
+	public void setAddress(String address) {
+		this.address = address;
+	}
+
+	public QueriableMember() {
+
+	}
+
+	public QueriableMember(Enterprise enterprise) {
+		this.name = enterprise.getEnName();
+		this.shortName = enterprise.getEnShortname();
+		this.uu = enterprise.getUu();
+		this.address = enterprise.getEnAddress();
+	}
+
+	public static List<QueriableMember> getMembers(List<Enterprise> enterprises) {
+		if (!CollectionUtils.isEmpty(enterprises)) {
+			List<QueriableMember> members = new ArrayList<QueriableMember>();
+			for (Enterprise enterprise : enterprises)
+				members.add(new QueriableMember(enterprise));
+			return members;
+		}
+		return null;
+	}
+
+}

src/main/java/com/uas/platform/b2b/model/QueriableUser.java

@@ -0,0 +1,58 @@
+package com.uas.platform.b2b.model;
+
+/**
+ * 个人信息对外查询接口的模型
+ * 
+ * @author yingp
+ * 
+ */
+public class QueriableUser {
+
+	private String name;
+	private String tel;
+	private String email;
+	private Long uu;
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getTel() {
+		return tel;
+	}
+
+	public void setTel(String tel) {
+		this.tel = tel;
+	}
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
+	public Long getUu() {
+		return uu;
+	}
+
+	public void setUu(Long uu) {
+		this.uu = uu;
+	}
+
+	public QueriableUser() {
+	}
+
+	public QueriableUser(User user) {
+		this.name = user.getUserName();
+		this.tel = user.getUserTel();
+		this.email = user.getUserEmail();
+		this.uu = user.getUserUU();
+	}
+
+}

src/main/java/com/uas/platform/b2b/model/UserInfo.java

@@ -7,7 +7,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 
 /**
- * 用户简单信息
+ * 用户简单信息，前台程序使用
  * 
  * @author yingp
  *