顶部搜索问题

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

@@ -48,23 +48,4 @@ public class UserController {
 		}
 	}
 
-	/**
-	 * 用户绑定企业
-	 * @param spaceUU 企业uu号
-	 * @param userUU 用户uu号
-	 */
-	@RequestMapping(params = "type=bind", method = RequestMethod.POST)
-	public void add(Long spaceUU, Long userUU) {
-		userService.addUser(spaceUU, userUU);
-	}
-
-	/**
-	 * 用户绑定企业
-	 * @param spaceUU 企业uu号
-	 * @param userUU 用户uu号
-	 */
-	@RequestMapping(params = "type=unbind", method = RequestMethod.POST)
-	public void remove(Long spaceUU, Long userUU) {
-		userService.removeUser(spaceUU, userUU);
-	}
 }

src/main/java/com/uas/platform/b2b/manage/service/UserService.java

@@ -14,17 +14,4 @@ public interface UserService {
 
 	public void remove(User user, Long enUU);
 
-	/**
-	 * 企业添加用户
-	 * @param spaceUU
-	 * @param userUU
-	 */
-    void addUser(Long spaceUU, Long userUU);
-
-	/**
-	 * 企业删除用户用户
-	 * @param spaceUU
-	 * @param userUU
-	 */
-    void removeUser(Long spaceUU, Long userUU);
 }

src/main/java/com/uas/platform/b2b/manage/service/impl/UserServiceImpl.java

@@ -101,28 +101,4 @@ public class UserServiceImpl implements UserService {
 		userDao.save(oldUser);
 	}
 
-	@Override
-	public void addUser(Long spaceUU, Long userUU) {
-		User user = userDao.findOne(userUU);
-		Enterprise enterprise = enterpriseDao.findOne(userUU);
-		if (user == null || enterprise == null) {
-			return;
-		}
-
-		user.getEnterprises().add(enterprise);
-		userDao.save(user);
-	}
-
-	@Override
-	public void removeUser(Long spaceUU, Long userUU) {
-		User user = userDao.findOne(userUU);
-		Enterprise enterprise = enterpriseDao.findOne(userUU);
-		if (user == null || enterprise == null) {
-			return;
-		}
-
-		user.getEnterprises().remove(enterprise);
-		userDao.save(user);
-	}
-
 }

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

@@ -10,17 +10,15 @@ import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.JoinTable;
 import javax.persistence.ManyToMany;
 import javax.persistence.OrderBy;
-import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
+import com.uas.sso.entity.UserView;
 import org.codehaus.jackson.annotate.JsonIgnore;
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
@@ -43,13 +41,23 @@ public class User implements Serializable {
 	 */
 	private static final long serialVersionUID = 1L;
 
-	public User() {
+	public User(UserView userView) {
+		this.setUserUU(userView.getUserUU());
+		this.setUserName(userView.getVipName());
+		this.setUserTel(userView.getMobile());
+		this.setUserEmail(userView.getEmail());
+		this.setUserPwd(userView.getPassword());
+		this.setUserIMId(Long.valueOf(userView.getImId()));
+		this.setUserSex(userView.getSex());
 	}
 
 	public User(Long userUU) {
 		this.userUU = userUU;
 	}
 
+	public User() {
+	}
+
 	@Id
 //	@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "users_gen")
 //	@SequenceGenerator(name = "users_gen", sequenceName = "users_seq", allocationSize = 1)

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

@@ -575,7 +575,13 @@ public class BaseInfoServiceImpl implements BaseInfoService {
 					spacetDetail.setCurrent(Constant.YES);
 					}
 				}
-                BeanUtils.copyProperties(detail, spacetDetail, UserSpaceDetail.class);
+                spacetDetail.setAddress(detail.getRegAddress());
+				spacetDetail.setName(detail.getSpaceName());
+				spacetDetail.setAdminEmail(detail.getAdmin().getEmail());
+				spacetDetail.setAdminName(detail.getAdmin().getVipName());
+				spacetDetail.setAdminTel(detail.getAdmin().getMobile());
+				spacetDetail.setBusinessCode(detail.getBusinessCode());
+				spacetDetail.setBusinessCodeImage(detail.getBusinessCodeImage());
                 spaceDetails.add(spacetDetail);
 			}
 			userSpaceDetails.setContent(spaceDetails);

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

@@ -379,6 +379,8 @@ public class UserServiceImpl implements UserService {
 		try {
 			Long userUU = addUserToAccountCenter(user);
 			user.setUserUU(userUU);
+            user.addEnterprise(SystemSession.getUser().getEnterprise());
+            user.setCurrentEnterprise();
 			userDao.save(user);
 		} catch (Exception e) {
 			e.printStackTrace();

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

@@ -4,6 +4,7 @@ import com.uas.platform.b2b.support.CommBufferedLogger;
 import com.uas.platform.b2b.temporary.model.UserSpaceDetail;
 import com.uas.platform.core.logging.BufferedLoggerManager;
 import com.uas.sso.entity.UserSpaceView;
+import com.uas.sso.entity.UserView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -36,15 +37,16 @@ public class EnterpriseController {
 
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
-	public UserSpaceView save(UserSpaceView userSpaceDetail) throws Exception {
+	public UserSpaceView save(UserSpaceView userSpaceDetail, UserView admin) throws Exception {
+		userSpaceDetail.setAdmin(admin);
 		if (userSpaceDetail != null) {
 			Enterprise enterprise = enterpriseService.save(userSpaceDetail);
 			userSpaceDetail.setSpaceUU(enterprise.getUu());
 			// 为兼容以前模式，同时知会下管理系统。管理系统主要为了获取企业uu
 			try {
-				String masterId = syncToManager(userSpaceDetail);
+//				String masterId = syncToManager(userSpaceDetail);
 				// 从管理系统保存完，dialectUID是管理系统masters.id
-				enterprise.setEnMasterId(Long.parseLong(masterId));
+//				enterprise.setEnMasterId(Long.parseLong(masterId));
 				enterpriseService.save(enterprise);
 			} catch (Exception e) {
 				e.printStackTrace();

src/main/java/com/uas/platform/b2b/v2/controller/UserController.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.v2.controller;
 
+import com.uas.platform.b2b.model.User;
 import com.uas.sso.entity.UserView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -18,7 +19,7 @@ public class UserController {
 
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
-	public UserView save(UserView user) {
+	public User save(UserView user) {
 		if (user != null) {
 			return userService.save(user);
 		}
@@ -33,4 +34,23 @@ public class UserController {
 		}
 	}
 
+	/**
+	 * 用户绑定企业
+	 * @param spaceUU 企业uu号
+	 * @param userView 用户信息
+	 */
+	@RequestMapping(params = "type=bind", method = RequestMethod.POST)
+	public void add(Long spaceUU, UserView userView) {
+		userService.addUser(spaceUU, userView);
+	}
+
+	/**
+	 * 用户绑定企业
+	 * @param spaceUU 企业uu号
+	 * @param userUU 用户uu号
+	 */
+	@RequestMapping(params = "type=unbind", method = RequestMethod.POST)
+	public void remove(Long spaceUU, Long userUU) {
+		userService.removeUser(spaceUU, userUU);
+	}
 }

src/main/java/com/uas/platform/b2b/v2/service/UserService.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.v2.service;
 
+import com.uas.platform.b2b.model.User;
 import com.uas.sso.entity.UserView;
 
 public interface UserService {
@@ -9,8 +10,21 @@ public interface UserService {
 	 * @param user 用户信息
 	 * @return
 	 */
-	UserView save(UserView user);
+	User save(UserView user);
 
 	void changePassword(UserView user, String password);
 
+	/**
+	 * 企业添加用户
+	 * @param spaceUU
+	 * @param userView 用户信息
+	 */
+	void addUser(Long spaceUU, UserView userView);
+
+	/**
+	 * 企业删除用户用户
+     * @param spaceUU
+     * @param userUU
+     */
+	void removeUser(Long spaceUU, Long userUU);
 }

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

@@ -40,9 +40,9 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 
 		enterprise.setEnAddress(detail.getRegAddress());
 		enterprise.setBusinesscodeimg(detail.getBusinessCodeImage());
-//		enterprise.setEnAdminEmail(detail.getAdmin().getEmail());
-//		enterprise.setEnAdminName(detail.getAdmin().getName());
-//		enterprise.setEnAdminTel(detail.getAdmin().getMobile());
+		enterprise.setEnAdminEmail(detail.getAdmin().getEmail());
+		enterprise.setEnAdminName(detail.getAdmin().getVipName());
+		enterprise.setEnAdminTel(detail.getAdmin().getMobile());
 		enterprise.setEnArea(detail.getArea());
 		enterprise.setEnBussinessCode(detail.getBusinessCode());
 		enterprise.setEnCorporation(detail.getCorporation());

src/main/java/com/uas/platform/b2b/v2/service/impl/UserServiceImpl.java

@@ -1,5 +1,6 @@
 package com.uas.platform.b2b.v2.service.impl;
 
+import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.model.User;
 import com.uas.sso.entity.UserView;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,6 +13,8 @@ import com.uas.platform.b2b.v2.service.UserService;
 import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.util.encry.Md5Utils;
 
+import java.util.HashSet;
+
 @Service("v2.UserService")
 public class UserServiceImpl implements UserService {
 
@@ -25,10 +28,10 @@ public class UserServiceImpl implements UserService {
 	static final String defaultPassword = "111111";
 
 	@Override
-	public UserView save(UserView user) {
+	public User save(UserView user) {
 		User oldUser = getUser(user);
 		if (oldUser == null) { // 如果是新用户，就新增一个user
-			oldUser = new com.uas.platform.b2b.model.User();
+			oldUser = new com.uas.platform.b2b.model.User(user);
 			oldUser.setEnable(Constant.YES);
 			oldUser.setUserPwd(Md5Utils.encode(defaultPassword, oldUser.getUserUU()));
 		}
@@ -37,8 +40,6 @@ public class UserServiceImpl implements UserService {
 		oldUser.setUserName(user.getVipName());
 		oldUser.setUserSex(user.getSex());
 		oldUser.setUserTel(user.getMobile());
-		oldUser.setUserSex(user.getSex());
-		oldUser.setUserTel(user.getMobile());
 		if (user.getPassword() != null) {
 			if (user.getPassword().length() < 32) {// 传过来的是明文
 				oldUser.setUserPwd(Md5Utils.encode(user.getPassword(), user.getUserUU()));
@@ -46,8 +47,8 @@ public class UserServiceImpl implements UserService {
 				oldUser.setUserPwd(user.getPassword());// 传过来的是密文
 			}
 		}
-
-		return user;
+		oldUser = userDao.save(oldUser);
+		return oldUser;
 	}
 
 	private com.uas.platform.b2b.model.User getUser(UserView user) {
@@ -67,4 +68,31 @@ public class UserServiceImpl implements UserService {
 		}
 	}
 
+	@Override
+	public void addUser(Long spaceUU, UserView userView) {
+		User user = userDao.findOne(userView.getUserUU());
+		Enterprise enterprise = enterpriseDao.findOne(spaceUU);
+		if (user == null) {
+			user = new User(userView);
+			user.setEnterprises(new HashSet<Enterprise>());
+		}
+		if (user == null || enterprise == null) {
+			return;
+		}
+		user.getEnterprises().add(enterprise);
+		userDao.save(user);
+	}
+
+	@Override
+	public void removeUser(Long spaceUU, Long userUU) {
+		User user = userDao.findOne(userUU);
+		Enterprise enterprise = enterpriseDao.findOne(spaceUU);
+		if (user == null || enterprise == null) {
+			return;
+		}
+
+		user.getEnterprises().remove(enterprise);
+		userDao.save(user);
+	}
+
 }