与管理平台交互

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

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

@@ -39,7 +39,7 @@ public class RegisterController {
 	
 	@RequestMapping(method = RequestMethod.GET)
 	public String getSignupPage() {
-		return "register";
+		return "signup";
 	}
 
 	/**

src/main/java/com/uas/platform/b2b/manage/controller/EnterpriseController.java

@@ -0,0 +1,113 @@
+package com.uas.platform.b2b.manage.controller;
+
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+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.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.service.EnterpriseService;
+import com.uas.platform.b2b.service.UserService;
+import com.uas.platform.core.util.serializer.FlexJsonUtils;
+
+/**
+ * 企业请求
+ * 
+ * @author suntg
+ * @date 2015年5月19日18:49:28
+ */
+@Controller(value = "manage.EnterpriseController")
+@RequestMapping(value = "/manage/enterprise")
+public class EnterpriseController {
+
+	@Autowired
+	private EnterpriseService enterpriseService;
+	@Autowired
+	private UserService userService;
+	
+	/**
+	 *管理平台获取需要审核的企业
+	 * 
+	 * @param email
+	 * @return
+	 */
+	@RequestMapping(value = "/unaudited", method = RequestMethod.GET)
+	@ResponseBody
+	public List<Enterprise> getUnauditedEnterprises() {
+		return enterpriseService.getUnauditedEnterprises();
+	}
+	
+	/**
+	 * 成功上传到管理平台的待审核企业
+	 * 
+	 * @param email
+	 * @return
+	 * @throws UnsupportedEncodingException 
+	 */
+	@RequestMapping(value = "/unauditedSuccess", method = RequestMethod.POST)
+	@ResponseBody
+	public void uploadUnauditSuccess(String data) throws UnsupportedEncodingException {
+		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		System.out.println(jsonStr);
+		List<Long> enUUs = FlexJsonUtils.fromJsonArray(jsonStr, Long.class);
+		enterpriseService.unauditedUploadSuccess(enUUs);
+	}
+	
+	/**
+	 * 将ERP的采购订单写到平台
+	 * 
+	 * @param data
+	 * @return
+	 * @throws UnsupportedEncodingException
+	 */
+	@RequestMapping(value = "/auditResults", method = RequestMethod.POST)
+	@ResponseBody
+	public void saveAuditResults(@RequestParam("data") String data, HttpServletRequest request) throws UnsupportedEncodingException {
+		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		List<Enterprise> enterprises = FlexJsonUtils.fromJsonArray(jsonStr, Enterprise.class);
+		System.out.println(enterprises.size());
+		enterpriseService.audit(enterprises, request);
+	}
+
+	/**
+	 * 管理平台获取已经激活的企业
+	 * 
+	 * @param email
+	 * @return
+	 */
+	@RequestMapping(value = "/enabled", method = RequestMethod.GET)
+	@ResponseBody
+	public List<Long> getEnabledEnterprises() {
+		List<Enterprise> enterprises = enterpriseService.getEnabledEnterprises();
+		List<Long> enUUs = new ArrayList<Long>();
+		for(Enterprise enterprise : enterprises) {
+			enUUs.add(enterprise.getUu());
+		}
+		return enUUs;
+	}
+
+	/**
+	 * 成功上传到管理平台的已激活企业
+	 * 
+	 * @param email
+	 * @return
+	 * @throws UnsupportedEncodingException 
+	 */
+	@RequestMapping(value = "/enabledSuccess", method = RequestMethod.POST)
+	@ResponseBody
+	public void uploadEnabledSuccess(String data) throws UnsupportedEncodingException {
+		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		List<Long> enUUs = FlexJsonUtils.fromJsonArray(jsonStr, Long.class);
+		enterpriseService.enabledUploadSuccess(enUUs);
+	}
+
+}

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

@@ -152,6 +152,19 @@ public class Enterprise implements Serializable {
 
 	@Transient
 	private String enAdminEmail;
+	
+	@Transient
+	private String enAuditRemark;
+
+	@JSONField(serialize = false)
+	@JsonIgnore
+	public String getEnAuditRemark() {
+		return enAuditRemark;
+	}
+
+	public void setEnAuditRemark(String enAuditRemark) {
+		this.enAuditRemark = enAuditRemark;
+	}
 
 	public Long getEnAdminuu() {
 		return enAdminuu;

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

@@ -36,10 +36,14 @@ public interface EnterpriseService {
 	
 	public List<Enterprise> getUnauditedEnterprises();
 	
-	public void unauditedUploadSuccess(String uuStr);
+	public void unauditedUploadSuccess(List<Long> enUUs);
 	
 	public List<Enterprise> getEnabledEnterprises();
 	
-	public void enabledUploadSuccess(String uuStr);
+	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

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.service.impl;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -11,7 +12,6 @@ import javax.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
 
 import com.uas.platform.b2b.dao.EnterpriseDao;
 import com.uas.platform.b2b.dao.UserDao;
@@ -63,6 +63,7 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 			enterprise.setEnSendStatus((short) Status.NOT_UPLOAD.value());//上传状态设为未上传
 			Enterprise newEnterprise = enterpriseDao.save(enterprise);//保存enterprise
 			User user = new User();
+			user.setUserName("管理员");
 			user.setUserEmail(enterprise.getEnAdminEmail());
 			user.setUserTel(enterprise.getEnAdminTel());
 			user.setEnterprises(new HashSet<Enterprise>());
@@ -71,11 +72,6 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 			User newUser = userDao.save(user);//保存user
 			newEnterprise.setEnAdminuu(newUser.getUserUU());//设置管理员UU号
 			newEnterprise = enterpriseDao.save(newEnterprise);//再次保存enterprise
-//			//添加要传输的数据
-//			newEnterprise.setEnAdminEmail(enterprise.getEnAdminEmail());
-//			newEnterprise.setEnAdminTel(enterprise.getEnAdminTel());
-//			newEnterprise.setEnBussinesscodeImg(newEnterprise.getEnBussinessCodeAttach().getId());
-//			sendToAduit(newEnterprise);//传给管理平台进行资料审核
 			return newEnterprise;
 		}
 		return null;
@@ -188,44 +184,81 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 	@Override
 	public List<Enterprise> getEnabledEnterprises() {
 		List<Enterprise> enterprises = enterpriseDao.findByEnStatusAndEnSendStatus((short) Status.ENABLED.value(), (short) Status.NOT_UPLOAD.value());
-		if(!CollectionUtils.isEmpty(enterprises)) {
-			for(Enterprise enterprise : enterprises) {
-				User adminUser = userDao.findOne(enterprise.getEnAdminuu());
-				if(adminUser != null) {
-					enterprise.setEnAdminEmail(adminUser.getUserEmail());
-					enterprise.setEnAdminTel(adminUser.getUserTel());
-				}
-				enterprise.setEnBussinesscodeImg(enterprise.getEnBussinessCodeAttach().getId());
-			}
-		}
 		return enterprises;
 	}
 
 	@Override
-	public void unauditedUploadSuccess(String uuStr) {
-		if(StringUtils.hasText(uuStr)) {
-			String[] uus = uuStr.split(",");
-			for(String enUU : uus) {
-				Enterprise enterprise = enterpriseDao.findOne(Long.parseLong(enUU));
+	public void unauditedUploadSuccess(List<Long> enUUs) {
+		if(!CollectionUtils.isEmpty(enUUs)) {
+			List<Enterprise> enterprises = new ArrayList<Enterprise>();
+			for(Long enUU : enUUs) {
+				Enterprise enterprise = enterpriseDao.findOne(enUU);
 				if(enterprise != null) {
 					enterprise.setEnSendStatus((short) Status.DOWNLOADED.value());
-					enterpriseDao.save(enterprise);
+					enterprises.add(enterprise);
 				}
 			}
+			enterpriseDao.save(enterprises);
 		}
 	}
 
 	@Override
-	public void enabledUploadSuccess(String uuStr) {
-		if(StringUtils.hasText(uuStr)) {
-			String[] uus = uuStr.split(",");
-			for(String enUU : uus) {
-				Enterprise enterprise = enterpriseDao.findOne(Long.parseLong(enUU));
+	public void enabledUploadSuccess(List<Long> enUUs) {
+		if(!CollectionUtils.isEmpty(enUUs)) {
+			List<Enterprise> enterprises = new ArrayList<Enterprise>();
+			for(Long enUU : enUUs) {
+				Enterprise enterprise = enterpriseDao.findOne(enUU);
 				if(enterprise != null) {
 					enterprise.setEnSendStatus((short) Status.DOWNLOADED.value());
-					enterpriseDao.save(enterprise);
+					enterprises.add(enterprise);
 				}
 			}
+			enterpriseDao.save(enterprises);
+		}
+	}
+
+	@Override
+	public void audit(List<Enterprise> enterprises, HttpServletRequest request) {
+		for(Enterprise enterprise : enterprises) {
+			audit(enterprise, request);
+		}
+	}
+	
+	@Override
+	public void audit(Enterprise enterprise, HttpServletRequest request) {
+		Enterprise enter = enterpriseDao.findEnterpriseByUu(enterprise.getUu());
+		if(enter != null && enter.getEnStatus() == Status.UNAUDIT.value()) {
+			if(enterprise.getEnStatus() == Status.AUDITED.value()) {//审核通过
+				String encodeString = tokenService.getEncodeToken("enterprise", enter.getUu());
+				User admin = userDao.findOne(enter.getEnAdminuu());
+				if(admin != null) {
+					Map<String, Object> model = new HashMap<String, Object>();
+					model.put("name", enter.getEnName());
+					model.put("email", admin.getUserEmail());
+					model.put("rootpath", AgentUtils.getHost(request));
+					model.put("uu", enterprise.getUu());
+					model.put("checkcode", encodeString);
+					model.put("adminUU", admin.getUserUU().toString());
+					model.put("adminEmail", admin.getUserEmail());
+					model.put("adminTel", admin.getUserTel());
+					sendMailService.sendTemplateMail(admin.getUserEmail(),
+							"欢迎注册优软管理平台账号", model, "velocity/registerActivate.vm");
+				}
+			} else if(enterprise.getEnStatus() == Status.NOTALLOW.value()) {//审核不通过
+				User admin = userDao.findOne(enter.getEnAdminuu());
+				enterpriseDao.delete(enterprise);//删除企业记录
+				if(admin != null) {
+					userDao.delete(admin);//删除企业管理员记录
+					Map<String, Object> model = new HashMap<String, Object>();
+					model.put("name", enter.getEnName());
+					model.put("email", admin.getUserEmail());
+					model.put("rootpath", AgentUtils.getHost(request));
+					model.put("reason", enterprise.getEnAuditRemark());
+					sendMailService.sendTemplateMail(admin.getUserEmail(),
+							"很遗憾账号未能通过审核", model, "velocity/invalid.vm");
+				}
+			} else {
+			}
 		}
 	}