企业注册过程添加操作记录

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

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

@@ -79,23 +79,6 @@ public class RegisterController {
 			return new ResponseEntity<ModelMap>(map, headers, HttpStatus.OK);
 		}
 	}
-
-	/**
-	 * 处理审核结果
-	 */
-	@RequestMapping(value = "/audit", method = RequestMethod.POST)
-	public @ResponseBody ResponseEntity<ModelMap> aduit(Long uu, String result, String reason, HttpServletRequest request) {
-		HttpHeaders headers = new HttpHeaders();
-		headers.add("Content-Type", "application/json; charset=utf-8");
-		ModelMap map = new ModelMap();
-		String aduitReslt = enterpriseService.audit(uu, result, reason, request);
-		map.put("aduit", aduitReslt);
-		if (aduitReslt.equals("ALLOW") || aduitReslt.equals("NOTALLOW")) {
-			return new ResponseEntity<ModelMap>(map, headers, HttpStatus.OK);
-		} else {
-			return new ResponseEntity<ModelMap>(map, headers, HttpStatus.EXPECTATION_FAILED);
-		}
-	}
 	
 	/**
 	 * 激活码验证激活

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

@@ -0,0 +1,12 @@
+package com.uas.platform.b2b.dao;
+
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+import com.uas.platform.b2b.model.RegisterRecord;
+import com.uas.platform.core.data.repository.GenericRepository;
+
+@Repository
+public interface RegisterRecordDao extends JpaSpecificationExecutor<RegisterRecord>, GenericRepository<RegisterRecord, Long> {
+	
+}

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

@@ -57,13 +57,12 @@ public class EnterpriseController {
 	@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
@@ -74,7 +73,6 @@ public class EnterpriseController {
 	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);
 	}
 

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

@@ -0,0 +1,145 @@
+package com.uas.platform.b2b.model;
+
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.validation.constraints.NotNull;
+
+/**
+ * 记录企业注册的记录，包括企业注册、审核、发送邮件、激活、再次激活等操作
+ * 
+ */
+@Entity
+@Table(name = "log$registe")
+public class RegisterRecord {
+	/**
+	 * ID
+	 */
+	@Id
+	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "registerrecord_gen")
+	@SequenceGenerator(name = "registerrecord_gen", sequenceName = "registerrecord_seq", allocationSize = 1)
+	@Column(name = "lr_id")
+	private Long arId;
+	/**
+	 * 企业UU
+	 */
+	@NotNull
+	@Column(name = "lr_enuu")
+	private Long enUu;
+	
+	/**
+	 * 企业名称
+	 */
+	@Column(name = "lr_enname")
+	private String enName;
+	
+	/**
+	 * 企业联系电话
+	 */
+	@Column(name = "lr_entel")
+	private String enTel;
+	
+	/**
+	 * 企业联系邮箱
+	 */
+	@Column(name = "lr_enemail")
+	private String enEmail;
+	/**
+	 * 操作员ID
+	 */
+	@Column(name = "lr_recorderid")
+	private Long recorderId;
+	
+	/**
+	 * 操作员名字
+	 */
+	@Column(name = "lr_recordername")
+	private String recorderName;
+	/**
+	 * 操作备注
+	 */
+	@Column(name = "lr_remark")
+	private String remark;
+	/**
+	 * 操作时间
+	 */
+	@Column(name = "lr_date")
+	private Date date;
+	/**
+	 * 操作结果
+	 */
+	@Column(name = "lr_result")
+	private String result;
+	public Long getArId() {
+		return arId;
+	}
+	public void setArId(Long arId) {
+		this.arId = arId;
+	}
+	public Long getEnUu() {
+		return enUu;
+	}
+	public void setEnUu(Long enUu) {
+		this.enUu = enUu;
+	}
+	public String getEnName() {
+		return enName;
+	}
+	public void setEnName(String enName) {
+		this.enName = enName;
+	}
+	public String getEnTel() {
+		return enTel;
+	}
+	public void setEnTel(String enTel) {
+		this.enTel = enTel;
+	}
+	public String getEnEmail() {
+		return enEmail;
+	}
+	public void setEnEmail(String enEmail) {
+		this.enEmail = enEmail;
+	}
+	public Long getRecorderId() {
+		return recorderId;
+	}
+	public void setRecorderId(Long recorderId) {
+		this.recorderId = recorderId;
+	}
+	public String getRecorderName() {
+		return recorderName;
+	}
+	public void setRecorderName(String recorderName) {
+		this.recorderName = recorderName;
+	}
+	public String getRemark() {
+		return remark;
+	}
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+	public Date getDate() {
+		return date;
+	}
+	public void setDate(Date date) {
+		this.date = date;
+	}
+	public String getResult() {
+		return result;
+	}
+	public void setResult(String result) {
+		this.result = result;
+	}
+
+	public RegisterRecord() {
+		this.date = new Date();
+	}
+	
+
+}

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

@@ -12,8 +12,6 @@ public interface EnterpriseService {
 
 	public Enterprise registerEnterprise(Enterprise enterprise);
 
-	public String audit(Long uu, String result, String reason, HttpServletRequest request);
-
 	public String activateCheck(Long uu, String checkcode);
 
 	/**

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

@@ -14,8 +14,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import com.uas.platform.b2b.dao.EnterpriseDao;
+import com.uas.platform.b2b.dao.RegisterRecordDao;
 import com.uas.platform.b2b.dao.UserDao;
 import com.uas.platform.b2b.model.Enterprise;
+import com.uas.platform.b2b.model.RegisterRecord;
 import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.service.EnterpriseService;
 import com.uas.platform.b2b.service.UserService;
@@ -39,6 +41,8 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 	private TokenService tokenService;
 	@Autowired
 	private SendMailService sendMailService;
+	@Autowired
+	private RegisterRecordDao registerRecordDao;
 
 	@Override
 	public String bussinessCodeEnable(String code) {
@@ -71,44 +75,12 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 			User newUser = userDao.save(user);// 保存user
 			newEnterprise.setEnAdminuu(newUser.getUserUU());// 设置管理员UU号
 			newEnterprise = enterpriseDao.save(newEnterprise);// 再次保存enterprise
+			registeRecord(newEnterprise, "注册", "成功");
 			return newEnterprise;
 		}
 		return null;
 	}
 
-	@Override
-	public String audit(Long uu, String result, String reason, HttpServletRequest request) {
-		Enterprise enterprise = enterpriseDao.findEnterpriseByUu(uu);
-		if (enterprise != null) {
-			if (result.equals("ALLOW")) {// 审核通过
-				String encodeString = tokenService.getEncodeToken("enterprise", uu);
-				User admin = userDao.findOne(enterprise.getEnAdminuu());
-				Map<String, Object> model = new HashMap<String, Object>();
-				model.put("name", enterprise.getEnName());
-				model.put("email", admin.getUserEmail());
-				model.put("rootpath", AgentUtils.getHost(request));
-				model.put("uu", enterprise.getUu());
-				model.put("checkcode", encodeString);
-				sendMailService.sendTemplateMail(admin.getUserEmail(), "欢迎注册优软管理平台账号", model, "velocity/registerActivate.vm");
-				return "ALLOW";
-			} else if (result.equals("NOTALLOW")) {// 审核不通过
-				User admin = userDao.findOne(enterprise.getEnAdminuu());
-				enterpriseDao.delete(enterprise);// 删除企业记录
-				userDao.delete(admin);// 删除企业管理员记录
-				Map<String, Object> model = new HashMap<String, Object>();
-				model.put("name", enterprise.getEnName());
-				model.put("email", admin.getUserEmail());
-				model.put("rootpath", AgentUtils.getHost(request));
-				model.put("reason", reason);
-				sendMailService.sendTemplateMail(admin.getUserEmail(), "很遗憾账号未能通过审核", model, "velocity/invalid.vm");
-				return "NOTALLOW";
-			} else {
-				return "审核结果参数出错";
-			}
-		}
-		return "找不到uu号对应的企业";
-	}
-
 	@Override
 	public String activateCheck(Long uu, String checkcode) {
 		Enterprise enterprise = enterpriseDao.findEnterpriseByUu(uu);
@@ -123,6 +95,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 					enterprise.setEnSendStatus((short) Status.NOT_UPLOAD.value());
 					userDao.save(admin);
 					enterpriseDao.save(enterprise);
+					registeRecord(enterprise, "激活企业", "成功");
 					return "SUCCESS";
 				} else {
 					return "验证码错误，激活失败";
@@ -148,7 +121,12 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		model.put("adminEmail", admin.getUserEmail());
 		model.put("adminTel", admin.getUserTel());
 		model.put("checkcode", encodeString);
-		sendMailService.sendTemplateMail(admin.getUserEmail(), "欢迎注册优软管理平台账号", model, "velocity/registerActivate.vm");
+		try{
+			sendMailService.sendTemplateMail(admin.getUserEmail(), "欢迎注册优软管理平台账号", model, "velocity/registerActivate.vm");
+			registeRecord(enterprise, "主动申请发送激活邮件", "成功");
+		} catch(Exception e) {
+			registeRecord(enterprise, "主动申请发送激活邮件", "失败");
+		}
 		return "SUCCESS";
 	}
 
@@ -158,6 +136,7 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		User admin = userDao.findUserByUserUU(enterprise.getEnAdminuu()).get(0);
 		admin.setUserPwd(Md5Utils.encode(password, admin.getUserUU()));
 		userDao.save(admin);
+		registeRecord(enterprise, "设置管理员密码", "成功");
 		return "SUCCESS";
 	}
 
@@ -234,6 +213,9 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 			if (enterprise.getEnStatus() == Status.AUDITED.value()) {// 审核通过
 				String encodeString = tokenService.getEncodeToken("enterprise", enter.getUu());
 				User admin = userDao.findOne(enter.getEnAdminuu());
+				registeRecord(enter, "审核", "通过");
+				enter.setEnStatus((short) Status.UNACT.value());
+				enterpriseDao.save(enter);
 				if (admin != null) {
 					Map<String, Object> model = new HashMap<String, Object>();
 					model.put("name", enter.getEnName());
@@ -244,7 +226,12 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 					model.put("adminUU", admin.getUserUU().toString());
 					model.put("adminEmail", admin.getUserEmail());
 					model.put("adminTel", admin.getUserTel());
-					sendMailService.sendTemplateMail(admin.getUserEmail(), "欢迎注册优软管理平台账号", model, "velocity/registerActivate.vm");
+					try{
+						sendMailService.sendTemplateMail(admin.getUserEmail(), "欢迎注册优软管理平台账号", model, "velocity/registerActivate.vm");
+						registeRecord(enterprise, "发送审核通过邮件", "成功");
+					} catch(Exception e) {
+						registeRecord(enterprise, "发送审核通过邮件", "失败");
+					}
 				}
 				// 平台初始化资料
 				init(enterprise);
@@ -260,8 +247,9 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 					model.put("reason", enterprise.getEnAuditRemark());
 					try {
 						sendMailService.sendTemplateMail(admin.getUserEmail(), "很遗憾账号未能通过审核", model, "velocity/invalid.vm");
+						registeRecord(enterprise, "发送审核不通过邮件", "成功");
 					} catch (Exception e) {
-
+						registeRecord(enterprise, "发送审核不通过邮件", "失败");
 					}
 				}
 				enterpriseDao.delete(enterprise);// 删除企业记录
@@ -275,5 +263,22 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 	private void init(Enterprise enterprise) {
 		enterpriseDao.callInitProcedure(enterprise.getUu());
 	}
+	
+	/**
+	 * 记录企业注册记录
+	 * @param enterprise
+	 * @param remark
+	 * @param result
+	 */
+	private void registeRecord(Enterprise enterprise, String remark, String result) {
+		RegisterRecord record = new RegisterRecord();
+		record.setEnEmail(enterprise.getEnAdminEmail());
+		record.setEnName(enterprise.getEnName());
+		record.setEnTel(enterprise.getEnAdminTel());
+		record.setEnUu(enterprise.getUu());
+		record.setRemark(remark);
+		record.setResult(result);
+		registerRecordDao.save(record);
+	}
 
 }