增加接口，商务平台企业用户数据更新同步到商城

src/main/java/com/uas/platform/b2c/common/account/Readme.md

@@ -8,12 +8,12 @@ account
 
 ## 创建人
 
-suntg
+hejq
 
 ## 创建时间
 
-2017年7月31日19:23:32
+2017年10月20日
 
 ## 说明
 
-系统登录用户，用户、企业、角色、资源、权限
+商务平台用户企业数据更新同步到商城

src/main/java/com/uas/platform/b2c/common/account/v2/controller/EnterpriseController.java

@@ -1,117 +1,38 @@
 package com.uas.platform.b2c.common.account.v2.controller;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.uas.account.entity.UserSpace;
-import com.uas.account.entity.UserSpaceDetail;
-import com.uas.platform.b2c.common.account.dao.EnterpriseDao;
 import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.common.account.v2.service.EnterpriseService;
-import com.uas.platform.b2c.core.config.SysConf;
-import com.uas.sso.common.util.HttpUtil;
-import com.uas.sso.common.util.HttpUtil.ResponseWrap;
+import com.uas.platform.core.util.serializer.FlexJsonUtils;
 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 java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+
 @Controller("v2.EnterpriseController")
 @RequestMapping(value = "api/public/enterprise")
 public class EnterpriseController {
 
 	@Autowired
 	private EnterpriseService enterpriseService;
-	@Autowired
-	private SysConf conf;
-	@SuppressWarnings("deprecation")
-	@Autowired
-	private EnterpriseDao enterpriseDao;
-
-	@RequestMapping(method = RequestMethod.POST)
-	@ResponseBody
-	public UserSpace save(UserSpace userSpace, UserSpaceDetail userSpaceDetail) throws Exception {
-		if (userSpace != null && userSpaceDetail != null) {
-			Enterprise enterprise = enterpriseService.save(userSpace, userSpaceDetail);
-//			userSpace.setDialectUID(String.valueOf(enterprise.getUu()));
-//			// 为兼容以前模式，同时知会下管理系统。管理系统主要为了获取企业uu
-//			try {
-//				userSpace = syncToManager(userSpace, userSpaceDetail);
-//				// 从管理系统保存完，dialectUID是管理系统masters.id
-////				enterprise.setEnMasterId(Long.parseLong(userSpace.getDialectUID()));
-//				enterpriseService.save(enterprise);
-//				// 返回给账户中心的，dialectUID表示商务平台的en_uu
-//				userSpace.setDialectUID(String.valueOf(enterprise.getUu()));
-//			} catch (Exception e) {
-//				e.printStackTrace();
-//				throw e;
-//			}
-//			return userSpace;
-		}
-		return null;
-	}
-
-	private UserSpace syncToManager(UserSpace userSpace, UserSpaceDetail userSpaceDetail) throws Exception {
-		JSONObject formData = JSON.parseObject(JSON.toJSONString(userSpace));
-		formData.putAll(JSON.parseObject(JSON.toJSONString(userSpaceDetail)));
-		ResponseWrap res = HttpUtil.doPost(conf.getManageInner() + "/public/enterprise", formData);
-		if (!res.isSuccess())
-			throw new Exception(res.getContent());
-		else
-			return JSON.parseObject(res.getContent(), UserSpace.class);
-	}
-
-	@RequestMapping(method = RequestMethod.DELETE)
-	@ResponseBody
-	public void remove(UserSpace userSpace) {
-		if (userSpace != null) {
-			enterpriseService.delete(userSpace);
-		}
-	}
-	
-	/**
-	 * 账户中心传输更新企业信息
-	 * 
-	 * @param userSpaceDetail
-	 * @return
-	 * @throws Exception
-	 */
-	@SuppressWarnings("deprecation")
-	@RequestMapping(value = "/renewUserSpace", method = RequestMethod.POST)
-	@ResponseBody
-	public String renewUserSpace(UserSpaceDetail userSpaceDetail) throws Exception {
-		Enterprise enterprise = null;
-		if(userSpaceDetail.getUu() != null) {
-			enterprise = enterpriseDao.findByUu(userSpaceDetail.getUu());
-		}
-		if (enterprise != null) {
-			enterprise.setEnName(userSpaceDetail.getName());
-			enterprise.setEnShortname(userSpaceDetail.getShortName());
-			enterprise.setEnAddress(userSpaceDetail.getAddress());
-			enterprise.setEnBussinessCode(userSpaceDetail.getBusinessCode());
-			try {
-				enterpriseService.save(enterprise);
-				return "success";
-			} catch (Exception e) {
-				e.printStackTrace();
-				return "error";
-			}
-		} else {
-			return "未找到相关的企业信息";
-		}
-	}
 
 	/**
 	 * b2b更新企业信息
-	 * @param userSpaceDetail
+     *
+	 * @param data
 	 * @return
 	 */
-	@RequestMapping(method = RequestMethod.PUT)
+	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
-	public Enterprise update(UserSpaceDetail userSpaceDetail) {
-		if (userSpaceDetail != null) {
-			return enterpriseService.update(userSpaceDetail);
+	public void update(@RequestParam("data") String data) throws UnsupportedEncodingException {
+        String jsonStr = URLDecoder.decode(data, "UTF-8");
+        Enterprise enterprise = FlexJsonUtils.fromJson(jsonStr, Enterprise.class);
+		if (enterprise != null) {
+			 enterpriseService.update(enterprise);
 		}
-		return null;
 	}
 }

src/main/java/com/uas/platform/b2c/common/account/v2/controller/UserController.java

@@ -1,14 +1,18 @@
 package com.uas.platform.b2c.common.account.v2.controller;
 
-import com.uas.account.entity.User;
-import com.uas.account.entity.UserDetail;
+import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.account.v2.service.UserService;
+import com.uas.platform.core.util.serializer.FlexJsonUtils;
 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 java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+
 @Controller("v2.UserController")
 @RequestMapping(value = "api/public/user")
 public class UserController {
@@ -16,43 +20,19 @@ public class UserController {
 	@Autowired
 	private UserService userService;
 
+    /**
+     * b2b修改用户信息
+     *
+     * @param data
+     */
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
-	public User save(User user, UserDetail userDetail) {
-		if (user != null && userDetail != null) {
-			return userService.save(user, userDetail);
-		}
-		return null;
-	}
-
-	@RequestMapping(value = "/pwd", method = RequestMethod.POST)
-	@ResponseBody
-	public void changePassword(User user, String password) {
-		if (user != null && password != null) {
-			userService.changePassword(user, password);
-		}
-	}
-
-	@RequestMapping(method = RequestMethod.DELETE)
-	@ResponseBody
-	public void remove(User user) {
+	public void save(@RequestParam("data") String data) throws UnsupportedEncodingException {
+        String jsonStr = URLDecoder.decode(data, "UTF-8");
+        User user = FlexJsonUtils.fromJson(jsonStr, User.class);
 		if (user != null) {
-			userService.delete(user);
-		}
-	}
-
-	/**
-	 * b2b修改用户信息
-	 * @param userDetail
-	 * @return
-	 */
-	@RequestMapping(method = RequestMethod.PUT)
-	@ResponseBody
-	public com.uas.platform.b2c.common.account.model.User update(UserDetail userDetail) {
-		if (userDetail != null) {
-			return userService.update(userDetail);
+			 userService.save(user);
 		}
-		return null;
 	}
 
 }

src/main/java/com/uas/platform/b2c/common/account/v2/service/EnterpriseService.java

@@ -1,21 +1,13 @@
 package com.uas.platform.b2c.common.account.v2.service;
 
-import com.uas.account.entity.UserSpace;
-import com.uas.account.entity.UserSpaceDetail;
 import com.uas.platform.b2c.common.account.model.Enterprise;
 
 public interface EnterpriseService {
 
-	Enterprise save(UserSpace userSpace, UserSpaceDetail detail);
-
-	Enterprise save(Enterprise enterprise);
-
-	void delete(UserSpace userSpace);
-
 	/**
 	 * b2b更新企业信息
-	 * @param userSpaceDetail
+	 * @param enterprise
 	 * @return
 	 */
-	Enterprise update(UserSpaceDetail userSpaceDetail);
+	void update(Enterprise enterprise);
 }

src/main/java/com/uas/platform/b2c/common/account/v2/service/UserService.java

@@ -1,20 +1,15 @@
 package com.uas.platform.b2c.common.account.v2.service;
 
-import com.uas.account.entity.User;
-import com.uas.account.entity.UserDetail;
 
-public interface UserService {
-
-	User save(User user, UserDetail detail);
+import com.uas.platform.b2c.common.account.model.User;
 
-	void changePassword(User user, String password);
+public interface UserService {
 
-	void delete(User user);
+    /**
+     * b2b修改用户信息
+     *
+     * @param user
+     */
+	void save(User user);
 
-	/**
-	 * b2b修改用户信息
-	 * @param user
-	 * @return
-	 */
-	com.uas.platform.b2c.common.account.model.User update (UserDetail user);
 }

src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/EnterpriseServiceImpl.java

@@ -1,128 +1,31 @@
 package com.uas.platform.b2c.common.account.v2.service.impl;
 
-import com.uas.account.entity.UserSpace;
-import com.uas.account.entity.UserSpaceDetail;
 import com.uas.platform.b2c.common.account.dao.EnterpriseDao;
-import com.uas.platform.b2c.common.account.dao.UserDao;
 import com.uas.platform.b2c.common.account.model.Enterprise;
-import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.account.v2.service.EnterpriseService;
-import com.uas.platform.core.exception.IllegalOperatorException;
-import com.uas.platform.core.model.Status;
+import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
+import com.uas.platform.core.logging.BufferedLoggerManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.List;
 
 @Service("v2.EnterpriseService")
 public class EnterpriseServiceImpl implements EnterpriseService {
 
 	@Autowired
 	private EnterpriseDao enterpriseDao;
-	@Autowired
-	private UserDao userDao;
 
-	@Override
-	public Enterprise save(UserSpace userSpace, UserSpaceDetail detail) {
-		Enterprise enterprise = getEnterprise(userSpace);
-		boolean isNew = false;
-		if (enterprise == null) {
-			enterprise = new Enterprise();
-			enterprise.setEnStatus((short) Status.ENABLED.value());
-			isNew = true;
-		}
+    private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
-		enterprise.setEnAddress(detail.getAddress());
-//		enterprise.setBusinesscodeimg(detail.getBusinessCodeImage());
-//		enterprise.setEnAdminEmail(detail.getAdminEmail());
-//		enterprise.setEnAdminName(detail.getAdminName());
-//		enterprise.setEnAdminTel(detail.getAdminTel());
-		enterprise.setEnArea(detail.getArea());
-		enterprise.setEnBussinessCode(detail.getBusinessCode());
-		enterprise.setEnCorporation(detail.getCorporation());
-		enterprise.setEnDate(new Date(detail.getRegisterDate()));
-		enterprise.setEnEmail(detail.getAdminEmail());
-		enterprise.setEnFax(detail.getFax());
-		enterprise.setEnIndustry(detail.getIndustry());
-		enterprise.setEnName(detail.getName());
-		enterprise.setEnShortname(detail.getShortName());
-		enterprise.setEnTel(detail.getAdminTel());
-		enterprise.setEnType(detail.getType());
-		enterprise.setEnUrl(detail.getUrl());
-//		enterprise.setLogUrl(detail.getLogoImage());
-//		enterprise.setProfession(detail.getProfession());
-//		enterprise.setTags(detail.getTags());
-//		enterprise.setContactMan(detail.getContactMan());
-//		enterprise.setContactTel(detail.getContactTel());
-//		enterprise.setContactEmail(detail.getContactEmail());
-		enterprise = enterpriseDao.save(enterprise);
-
-//		if (isNew) {
-//			final Long enUU = enterprise.getUu();
-//			new Thread() {
-//				@Override
-//				public void run() {
-//					enterpriseDao.callInitProcedure(enUU);
-//				};
-//			}.start();
-//		}
-		return enterprise;
-	}
-
-	private Enterprise getEnterprise(UserSpace userSpace) {
-		Enterprise enterprise = null;
-		if (userSpace.getDialectUID() != null)
-			enterprise = enterpriseDao.findByUu(Long.parseLong(userSpace.getDialectUID()));
-		else if (userSpace.getUid() != null)
-			enterprise = enterpriseDao.findByEnBussinessCode(userSpace.getUid());
-		return enterprise;
-	}
-
-	private Enterprise getEnterprise(UserSpaceDetail userSpaceDetail) {
-		Enterprise enterprise = null;
-		if (userSpaceDetail.getUu() != null) {
-			enterprise = enterpriseDao.findByUu(userSpaceDetail.getUu());
-		} else if (userSpaceDetail.getBusinessCode() != null) {
-			enterprise = enterpriseDao.findByEnBussinessCode(userSpaceDetail.getBusinessCode());
-		}
-		return enterprise;
-	}
+    private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd");
 
 	@Override
-	public void delete(UserSpace userSpace) {
-		Enterprise enterprise = getEnterprise(userSpace);
+	public void update(Enterprise enterprise) {
 		if (enterprise != null) {
-			List<User> users = userDao.findByEnUU(enterprise.getUu());
-			if (CollectionUtils.isEmpty(users)) {
-				enterpriseDao.delete(enterprise);
-			}
-		}
-	}
-
-	@Override
-	public Enterprise save(Enterprise enterprise) {
-		return enterpriseDao.save(enterprise);
-	}
-
-	@Override
-	public Enterprise update(UserSpaceDetail userSpaceDetail) {
-		Enterprise enterprise = getEnterprise(userSpaceDetail);
-		if (enterprise == null) {
-			throw new IllegalOperatorException("此企业不存在");
-		} else {
-			enterprise.setEnTel(userSpaceDetail.getTel());
-			enterprise.setEnEmail(userSpaceDetail.getContactEmail());
-			enterprise.setEnFax(userSpaceDetail.getFax());
-			enterprise.setEnUrl(userSpaceDetail.getUrl());
-			enterprise.setEnIndustry(userSpaceDetail.getIndustry());
-			enterprise.setEnName(userSpaceDetail.getName());
-			enterprise.setEnShortname(userSpaceDetail.getShortName());
-			enterprise.setEnBussinessCode(userSpaceDetail.getBusinessCode());
-			enterprise.setEnArea(userSpaceDetail.getArea());
-			enterprise.setEnAddress(userSpaceDetail.getAddress());
-			return enterpriseDao.save(enterprise);
+            enterpriseDao.save(enterprise);
+            logger.log("b2b更新企业信息", enterprise.getUu()+"time: " + sdf.format(new Date()));
 		}
 	}
 }

src/main/java/com/uas/platform/b2c/common/account/v2/service/impl/UserServiceImpl.java

@@ -1,171 +1,32 @@
 package com.uas.platform.b2c.common.account.v2.service.impl;
 
-import com.uas.account.entity.User;
-import com.uas.account.entity.UserDetail;
-import com.uas.platform.b2c.common.account.dao.EnterpriseDao;
 import com.uas.platform.b2c.common.account.dao.UserDao;
-import com.uas.platform.b2c.common.account.model.Enterprise;
+import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.account.v2.service.UserService;
-import com.uas.platform.core.model.Constant;
-import com.uas.platform.core.util.encry.Md5Utils;
-import org.apache.axis.utils.StringUtils;
+import com.uas.platform.b2c.core.support.log.UsageBufferedLogger;
+import com.uas.platform.core.logging.BufferedLoggerManager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
-import java.util.List;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
 
 @Service("v2.UserService")
 public class UserServiceImpl implements UserService {
 
 	@Autowired
 	private UserDao userDao;
-//	@Autowired
-//	private RoleDao roleDao;
-	@Autowired
-	private EnterpriseDao enterpriseDao;
-	
-	static final String defaultPassword = "111111";
-
-	@Override
-	public User save(User user, UserDetail detail) {
-		com.uas.platform.b2c.common.account.model.User oldUser = getUser(user);
-		if (oldUser == null) { // 如果是新用户，就新增一个user
-			oldUser = new com.uas.platform.b2c.common.account.model.User();
-			oldUser.setEnable(Constant.YES);
-			oldUser.setUserPwd(Md5Utils.encode(defaultPassword, oldUser.getUserUU()));
-		}
-		if (null != detail.getEmail())
-			oldUser.setUserEmail(detail.getEmail());
-		if (null != detail.getIdCode())
-			oldUser.setUserIdcode(detail.getIdCode());
-		if (null != detail.getName())
-			oldUser.setUserName(detail.getName());
-		boolean needChangePwd = false;
-		if (user.getPassword() != null) {
-			if (user.getPassword().length() < 32) {// 传过来的是明文
-				if (oldUser.getUserUU() != null)
-					oldUser.setUserPwd(Md5Utils.encode(user.getPassword(), oldUser.getUserUU()));
-				else
-					needChangePwd = true;
-			} else {
-				oldUser.setUserPwd(user.getPassword());// 传过来的是密文
-			}
-		}
-		if (null != detail.getSex())
-			oldUser.setUserSex(detail.getSex());
-		if (null != detail.getMobile())
-			oldUser.setUserTel(detail.getMobile());
-
-		Enterprise enterprise = getEnterprise(user);
-		if (enterprise != null) {
-			oldUser.addEnterprise(enterprise);
-		}
-
-		oldUser = userDao.save(oldUser);
-		if (needChangePwd) {
-			oldUser.setUserPwd(Md5Utils.encode(user.getPassword(), oldUser.getUserUU()));
-			oldUser = userDao.save(oldUser);
-		}
-		if (enterprise != null) {
-			// 管理员账号
-			if (/*StringUtils.isEmpty(enterprise.getEnAdminTel()) &&*/ null == enterprise.getEnAdminuu()) {
-//				enterprise.setEnAdminName(oldUser.getUserName());
-//				enterprise.setEnAdminEmail(oldUser.getUserEmail());
-//				enterprise.setEnAdminTel(oldUser.getUserTel());
-				enterprise.setEnAdminuu(oldUser.getUserUU());
-				enterpriseDao.save(enterprise);
-			}
-//			else if (oldUser.getUserTel().equals(enterprise.getEnAdminTel())) {
-//				enterprise.setEnAdminName(oldUser.getUserName());
-//				enterprise.setEnAdminEmail(oldUser.getUserEmail());
-//				enterprise.setEnAdminuu(oldUser.getUserUU());
-//				enterpriseDao.save(enterprise);
-//			}
-//			// 将用户设置为管理员，只对用户的当前企业的角色进行修改
-//			Set<Role> existRoles = new HashSet<Role>(); // 新用户注册企业时为空
-//			if (!CollectionUtils.isEmpty(oldUser.getRoles())) { // 老用户注册新企业
-//				existRoles = oldUser.getRoles();
-//			}
-//			// 设置为本企业管理员
-//			List<Role> adminList = roleDao.findByEnUUAndDesc(enterprise.getUu(),"管理员");
-//			existRoles.add(adminList.get(0));
-//			oldUser.setRoles(existRoles);
-			oldUser = userDao.save(oldUser);
-		}
-		user.setDialectUID(String.valueOf(oldUser.getUserUU()));
-		user.setSalt(String.valueOf(oldUser.getUserUU()));
-
-		return user;
-	}
-
-	private com.uas.platform.b2c.common.account.model.User getUser(User user) {
-		com.uas.platform.b2c.common.account.model.User oldUser = null;
-		if (!StringUtils.isEmpty(user.getDialectUID()))
-			oldUser = userDao.findOne(Long.parseLong(user.getDialectUID()));
-		else if (!StringUtils.isEmpty(user.getUid())) {
-			List<com.uas.platform.b2c.common.account.model.User> users = userDao.findUserByUserTel(user.getUid());
-			oldUser = CollectionUtils.isEmpty(users) ? null : users.get(0);
-		}
-		return oldUser;
-	}
-
-	private com.uas.platform.b2c.common.account.model.User getUser(UserDetail userDetail) {
-		com.uas.platform.b2c.common.account.model.User oldUser = null;
-		if (!StringUtils.isEmpty(userDetail.getSalt()))
-			oldUser = userDao.findOne(Long.parseLong(userDetail.getSalt()));
-		else if (!StringUtils.isEmpty(userDetail.getMobile())) {
-			List<com.uas.platform.b2c.common.account.model.User> users = userDao.findUserByUserTel(userDetail.getMobile());
-			oldUser = CollectionUtils.isEmpty(users) ? null : users.get(0);
-		}
-		return oldUser;
-	}
-
-	private Enterprise getEnterprise(User user) {
-		Enterprise enterprise = null;
-		if (user.getSpaceDialectUID() != null)
-			enterprise = enterpriseDao.findByUu(Long.parseLong(user.getSpaceDialectUID()));
-		else if (user.getSpaceUID() != null)
-			enterprise = enterpriseDao.findByEnBussinessCode(user.getSpaceUID());
-		return enterprise;
-	}
-
-	@Override
-	public void delete(User user) {
-		com.uas.platform.b2c.common.account.model.User oldUser = getUser(user);
-		if (oldUser != null) {
-			Enterprise enterprise = getEnterprise(user);
-			if (enterprise != null) {
-				oldUser.getEnterprises().remove(enterprise);
-				userDao.save(oldUser);
-			} else if (CollectionUtils.isEmpty(oldUser.getEnterprises())) {
-				userDao.delete(oldUser);
-			}
-		}
-	}
 
-	@Override
-	public com.uas.platform.b2c.common.account.model.User update(UserDetail user) {
-		com.uas.platform.b2c.common.account.model.User oldUser = getUser(user);
-		if (oldUser == null) {
-			throw new IllegalAccessError("此用户信息不存在");
-		} else {
-			oldUser.setUserName(user.getName());
-			oldUser.setUserTel(user.getMobile());
-			oldUser.setUserIdcode(user.getIdCode());
-			oldUser.setUserEmail(user.getEmail());
-			oldUser.setUserSex(user.getSex());
-			return userDao.save(oldUser);
-		}
-	}
+    private static final UsageBufferedLogger logger = BufferedLoggerManager.getLogger(UsageBufferedLogger.class);
 
-	@Override
-	public void changePassword(User user, String password) {
-		com.uas.platform.b2c.common.account.model.User oldUser = getUser(user);
-		if (oldUser != null) {
-			oldUser.setUserPwd(Md5Utils.encode(password, oldUser.getUserUU()));
-			userDao.save(oldUser);
-		}
-	}
+    private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-mm-dd");
 
+    @Override
+    public void save(User user) {
+        if(null != user) {
+            userDao.save(user);
+            logger.log("b2b更新用户信息", user.getUserUU() +"time: " + sdf.format(new Date()));
+        }
+    }
 }