Browse Source

新增Serve控制器,控制网页的自助模块。ResgisterController删除了其中的测试代码"

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@1320 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
aof 10 years ago
parent
commit
ffd6b4ce2f

+ 33 - 3
src/main/java/com/uas/platform/b2b/service/impl/EnterpriseServiceImpl.java

@@ -11,6 +11,7 @@ import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.CollectionUtils;
@@ -55,6 +56,8 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 	@Autowired
 	@Autowired
 	private CommonDao commonDao;
 	private CommonDao commonDao;
 	
 	
+	static final String TEL_REGEXP = "^[0]{1}[0-9]{2,3}-[0-9]{7,8}|((\\(\\d{3}\\))|(\\d{3}\\-))?(13|15|18)\\d{9}$";
+	
 	/**
 	/**
 	 * 不可用的SAAS域名
 	 * 不可用的SAAS域名
 	 */
 	 */
@@ -75,7 +78,8 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 	@Override
 	@Override
 	public Enterprise registerEnterprise(Enterprise enterprise, Boolean isSaas) {
 	public Enterprise registerEnterprise(Enterprise enterprise, Boolean isSaas) {
 		Enterprise en = enterpriseDao.findEnterpriseByEnBussinessCode(enterprise.getEnBussinessCode());
 		Enterprise en = enterpriseDao.findEnterpriseByEnBussinessCode(enterprise.getEnBussinessCode());
-		if (en == null && userService.isEmailUseable(enterprise.getEnAdminEmail()) && userService.isTelUseable(enterprise.getEnAdminTel())) {
+		if (en == null && userService.isEmailUseable(enterprise.getEnAdminEmail())
+				&& userService.isTelUseable(enterprise.getEnAdminTel())) {
 			enterprise.setEnDate(new Date());
 			enterprise.setEnDate(new Date());
 			enterprise.setEnable(Constant.NO);
 			enterprise.setEnable(Constant.NO);
 			if(isSaas != null && isSaas) {// 申请SAAS
 			if(isSaas != null && isSaas) {// 申请SAAS
@@ -160,7 +164,8 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		model.put("adminTel", admin.getUserTel());
 		model.put("adminTel", admin.getUserTel());
 		model.put("checkcode", encodeString);
 		model.put("checkcode", encodeString);
 		try {
 		try {
-			sendMailService.sendTemplateMail(admin.getUserEmail(), "欢迎注册优软商务平台账号", model, "velocity/registerActivate.vm");
+			sendMailService.sendTemplateMail(admin.getUserEmail(), "欢迎注册优软商务平台账号", model,
+					"velocity/registerActivate.vm");
 			enterprise.setEnable(Constant.NO);
 			enterprise.setEnable(Constant.NO);
 			admin.setEnable(Constant.NO);
 			admin.setEnable(Constant.NO);
 			enterpriseDao.save(enterprise);
 			enterpriseDao.save(enterprise);
@@ -403,7 +408,8 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		model.put("adminTel", admin.getUserTel());
 		model.put("adminTel", admin.getUserTel());
 		model.put("checkcode", encodeString);
 		model.put("checkcode", encodeString);
 		try {
 		try {
-			sendMailService.sendTemplateMail(admin.getUserEmail(), "欢迎注册优软商务平台账号", model, "velocity/registerActivate.vm");
+			sendMailService.sendTemplateMail(admin.getUserEmail(), "欢迎注册优软商务平台账号", model,
+					"velocity/registerActivate.vm");
 			enterprise.setEnable(Constant.NO);
 			enterprise.setEnable(Constant.NO);
 			admin.setEnable(Constant.NO);
 			admin.setEnable(Constant.NO);
 			enterpriseDao.save(enterprise);
 			enterpriseDao.save(enterprise);
@@ -422,6 +428,30 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		return commonDao.generateSequence("enterprises_seq");
 		return commonDao.generateSequence("enterprises_seq");
 	}
 	}
 
 
+
+	/**
+	 * 通过邮箱查询企业
+	 * 
+	 * @param enMail
+	 * @return
+	 */
+	@Override
+	public Enterprise findByenEmail(String enEmail) {
+		List<Enterprise> en=enterpriseDao.findByEnEmail(enEmail);
+		if(en.size()==0){
+			throw new UsernameNotFoundException("没有找到您的账号 " +enEmail);
+		}
+		return en.get(0);
+	}
+
+	@Override
+	public Enterprise findByenBussinessCode(String enBussinessCode) {
+		Enterprise enterprise = enterpriseDao.findEnterpriseByEnBussinessCode(enBussinessCode);
+		if(enterprise == null){
+			throw new UsernameNotFoundException("没有找到您的账号 " +enBussinessCode);
+		}
+		return enterprise;
+	}
 	@Override
 	@Override
 	public boolean isSaasUrlUseable(String saasUrl) {
 	public boolean isSaasUrlUseable(String saasUrl) {
 		for(String unusableSaasUrl : UNUSABLE_SAASURL) {
 		for(String unusableSaasUrl : UNUSABLE_SAASURL) {