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

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

@@ -1,12 +1,18 @@
 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;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
@@ -14,6 +20,7 @@ import com.uas.platform.b2b.model.Enterprise;
 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;
 
 /**
  * 对外公开的资料查询接口
@@ -34,6 +41,34 @@ public class PublicQueryController {
 	@Autowired
 	private UserService userService;
 
+	/**
+	 * 按企业名称、简称、UU号等查找企业信息
+	 * 
+	 * @return
+	 * @throws UnsupportedEncodingException
+	 */
+	@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);
+		ModelMap returnMap = new ModelMap();
+		String name = map.get("name");
+		if (!StringUtils.isEmpty(name)) {
+			returnMap.put("name", enterpriseService.findByName(name));
+		}
+		String shortName = map.get("shortname");
+		if (!StringUtils.isEmpty(shortName)) {
+			returnMap.put("shortname", enterpriseService.findByShortName(shortName));
+		}
+		String uu = map.get("uu");
+		if (!StringUtils.isEmpty(uu)) {
+			returnMap.put("uu", enterpriseService.findById(Long.parseLong(uu)));
+		}
+		return returnMap;
+	}
+
 	/**
 	 * 按UU号查找企业信息
 	 * 

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

@@ -3,7 +3,9 @@ package com.uas.platform.b2b.dao;
 import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.jpa.repository.query.Procedure;
+import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 
 import com.uas.platform.b2b.model.Enterprise;
@@ -17,6 +19,24 @@ public interface EnterpriseDao extends JpaRepository<Enterprise, Long> {
 
 	public List<Enterprise> findByEnStatusAndEnSendStatus(Short enStatus, Short enSendStatus);
 
+	/**
+	 * 按名称查找企业
+	 * 
+	 * @param name
+	 * @return
+	 */
+	@Query("from Enterprise e where e.enName LIKE :name%")
+	public List<Enterprise> findByEnName(@Param("name") String name);
+
+	/**
+	 * 按简称查找企业
+	 * 
+	 * @param shortName
+	 * @return
+	 */
+	@Query("from Enterprise e where e.enShortname LIKE :shortName%")
+	public List<Enterprise> findByEnShortName(@Param("shortName") String shortName);
+
 	/**
 	 * 企业资料初始化
 	 * 

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

@@ -31,17 +31,33 @@ public interface EnterpriseService {
 	 * @return
 	 */
 	public Enterprise findById(Long id);
-	
+
+	/**
+	 * 按名称查找企业
+	 * 
+	 * @param name
+	 * @return
+	 */
+	public List<Enterprise> findByName(String name);
+
+	/**
+	 * 按简称查找企业
+	 * 
+	 * @param shortName
+	 * @return
+	 */
+	public List<Enterprise> findByShortName(String shortName);
+
 	public List<Enterprise> getUnauditedEnterprises();
-	
+
 	public void unauditedUploadSuccess(List<Long> enUUs);
-	
+
 	public List<Enterprise> getEnabledEnterprises();
-	
+
 	public void enabledUploadSuccess(List<Long> enUUs);
 
 	public void audit(List<Enterprise> enterprises, HttpServletRequest request);
-	
+
 	public void audit(Enterprise enterprise, HttpServletRequest request);
 
 }

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

@@ -102,7 +102,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 				}
 			} else {
 				User admin = userDao.findOne(enterprise.getEnAdminuu());
-				if(admin.getUserPwd() == null) {
+				if (admin.getUserPwd() == null) {
 					return "SETPWD";
 				} else {
 					return "企业账号已激活并已设置管理员密码，您可以使用您的个人账号登陆UAS商务平台。";
@@ -126,14 +126,14 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		model.put("adminEmail", admin.getUserEmail());
 		model.put("adminTel", admin.getUserTel());
 		model.put("checkcode", encodeString);
-		try{
+		try {
 			sendMailService.sendTemplateMail(admin.getUserEmail(), "欢迎注册优软管理平台账号", model, "velocity/registerActivate.vm");
 			enterprise.setEnable(Constant.NO);
 			admin.setEnable(Constant.NO);
 			enterpriseDao.save(enterprise);
 			userDao.save(admin);
 			registeRecord(enterprise, "主动申请发送激活邮件", "成功");
-		} catch(Exception e) {
+		} catch (Exception e) {
 			registeRecord(enterprise, "主动申请发送激活邮件", "失败");
 		}
 		return "SUCCESS";
@@ -235,10 +235,10 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 					model.put("adminUU", admin.getUserUU().toString());
 					model.put("adminEmail", admin.getUserEmail());
 					model.put("adminTel", admin.getUserTel());
-					try{
+					try {
 						sendMailService.sendTemplateMail(admin.getUserEmail(), "欢迎注册优软管理平台账号", model, "velocity/registerActivate.vm");
 						registeRecord(enter, "发送审核通过邮件", "成功");
-					} catch(Exception e) {
+					} catch (Exception e) {
 						registeRecord(enter, "发送审核通过邮件", "失败");
 					}
 				}
@@ -273,9 +273,10 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 	private void init(Enterprise enterprise) {
 		enterpriseDao.callInitProcedure(enterprise.getUu());
 	}
-	
+
 	/**
 	 * 记录企业注册记录
+	 * 
 	 * @param enterprise
 	 * @param remark
 	 * @param result
@@ -292,4 +293,14 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		registerRecordDao.save(record);
 	}
 
+	@Override
+	public List<Enterprise> findByName(String name) {
+		return enterpriseDao.findByEnName(name);
+	}
+
+	@Override
+	public List<Enterprise> findByShortName(String shortName) {
+		return enterpriseDao.findByEnShortName(shortName);
+	}
+
 }

src/main/webapp/WEB-INF/views/normal/index.html

@@ -6,7 +6,7 @@
 <meta charset="utf-8">
 <title>优软商务平台</title>
 <meta name="keywords"
-	content="优软商务平台,优软B2B平台,商务平台,B2B平台,B2B,电子商务,ERP,UAS,UBTOB.COM,USOFTCHINA.COM,优软">
+	content="优软商务平台,优软商务,优软B2B平台,商务平台,B2B平台,B2B,电子商务,ERP,UAS,UBTOB.COM,USOFTCHINA.COM,优软,优软科技,深圳市优软科技有限公司">
 <meta name="description" content="优软商务平台，企业供销信息交流平台。">
 <link href="static/img/icon/u.png" rel="icon" type="image/x-icon" />
 <link rel="stylesheet" href="static/lib/bootstrap/css/bootstrap.min.css" />

src/main/webapp/WEB-INF/views/normal/signin.html

@@ -6,7 +6,7 @@
 <meta charset="utf-8">
 <title>优软商务平台</title>
 <meta name="keywords"
-	content="优软商务平台,优软B2B平台,商务平台,B2B平台,B2B,电子商务,ERP,UAS,UBTOB.COM,USOFTCHINA.COM,优软">
+	content="优软商务平台,优软商务,优软B2B平台,商务平台,B2B平台,B2B,电子商务,电子商务平台,ERP,UAS,UBTOB.COM,USOFTCHINA.COM,优软,优软科技,深圳市优软科技有限公司">
 <meta name="description" content="优软商务平台，企业供销信息交流平台。">
 <link href="static/img/icon/u.png" rel="icon" type="image/x-icon" />
 <link rel="stylesheet" href="static/lib/bootstrap/css/bootstrap.min.css" />