接口修改

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

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

@@ -21,16 +21,12 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.uas.account.entity.UserDetail;
-import com.uas.account.entity.UserSpace;
-import com.uas.account.entity.UserSpaceDetail;
 import com.uas.platform.b2b.model.Enterprise;
 import com.uas.platform.b2b.model.SigninLog;
 import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.service.SigninLogService;
 import com.uas.platform.b2b.service.UserService;
 import com.uas.platform.b2b.support.SystemSession;
-import com.uas.platform.core.model.Constant;
 import com.uas.platform.core.util.AgentUtils;
 import com.uas.platform.core.util.serializer.FlexJsonUtils;
 import com.uas.sso.AuthToken;
@@ -219,50 +215,4 @@ public class SecurityController {
 		return SitePreference.NORMAL;
 	}
 
-	/**
-	 * 供账户中心回调的新增企业接口
-	 * 
-	 * @param space
-	 * @param spaceDetail
-	 * @return
-	 */
-	@RequestMapping(value = "/public/enterprise", method = RequestMethod.POST)
-	@ResponseBody
-	public UserSpace saveEnterprise(UserSpace space, UserSpaceDetail spaceDetail) {
-
-		return null;
-	}
-
-	/**
-	 * 供账户中心回调的新增用户接口
-	 * 
-	 * @param user
-	 * @param userDetail
-	 */
-	@RequestMapping(value = "/public/user", method = RequestMethod.POST)
-	@ResponseBody
-	public void saveUser(com.uas.account.entity.User user, UserDetail userDetail) {
-		User oldOne = null;
-		if (user.getDialectUID() != null) {
-			oldOne = userService.findUserByUserUU(Long.parseLong(user.getDialectUID()));
-		}
-		if (oldOne == null && userDetail.getMobile() != null) {
-			oldOne = userService.findUserByUserTel(userDetail.getMobile());
-		}
-		if (oldOne == null) {
-
-		}
-		User localUser = new User();
-		localUser.setEnable(Constant.YES);
-		localUser.setUserEmail(userDetail.getEmail());
-		localUser.setUserIdcode(userDetail.getIdCode());
-		localUser.setUserName(userDetail.getName());
-		localUser.setUserPwd(user.getPassword());
-		localUser.setUserSex(userDetail.getSex());
-		localUser.setUserTel(userDetail.getMobile());
-		if (user.getDialectUID() != null)
-			localUser.setUserUU(Long.parseLong(user.getDialectUID()));
-
-	}
-
 }

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

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.uas.account.entity.UserSpace;
 import com.uas.account.entity.UserSpaceDetail;
 import com.uas.platform.b2b.v2.service.EnterpriseService;
+import com.uas.platform.core.util.serializer.FlexJsonUtils;
 
 @Controller("v2.EnterpriseController")
 @RequestMapping(value = "/public/enterprise")
@@ -19,11 +20,12 @@ public class EnterpriseController {
 
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
-	public UserSpace save(UserSpace userSpace, UserSpaceDetail detail) {
-		if (userSpace != null && detail != null) {
-			return enterpriseService.save(userSpace, detail);
+	public UserSpace save(String userSpace, String userSpaceDetail) {
+		if (userSpace != null && userSpaceDetail != null) {
+			return enterpriseService.save(FlexJsonUtils.fromJson(userSpace, UserSpace.class),
+					FlexJsonUtils.fromJson(userSpaceDetail, UserSpaceDetail.class));
 		}
-		return userSpace;
+		return null;
 	}
 
 	@RequestMapping(method = RequestMethod.DELETE)

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

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import com.uas.account.entity.User;
 import com.uas.account.entity.UserDetail;
 import com.uas.platform.b2b.v2.service.UserService;
+import com.uas.platform.core.util.serializer.FlexJsonUtils;
 
 @Controller("v2.UserController")
 @RequestMapping(value = "/public/user")
@@ -19,11 +20,11 @@ public class UserController {
 
 	@RequestMapping(method = RequestMethod.POST)
 	@ResponseBody
-	public User save(User user, UserDetail detail) {
-		if (user != null && detail != null) {
-			return userService.save(user, detail);
+	public User save(String user, String userDetail) {
+		if (user != null && userDetail != null) {
+			return userService.save(FlexJsonUtils.fromJson(user, User.class), FlexJsonUtils.fromJson(userDetail, UserDetail.class));
 		}
-		return user;
+		return null;
 	}
 
 	@RequestMapping(method = RequestMethod.DELETE)

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

@@ -26,9 +26,11 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 	@Override
 	public UserSpace 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;
 		}
 
 		enterprise.setEnAddress(detail.getAddress());
@@ -51,6 +53,15 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		enterpriseDao.save(enterprise);
 		userSpace.setDialectUID(String.valueOf(enterprise.getUu()));
 
+		if (isNew) {
+			final Long enUU = enterprise.getUu();
+			new Thread() {
+				public void run() {
+					enterpriseDao.callInitProcedure(enUU);
+				};
+			}.start();
+		}
+
 		return userSpace;
 	}
 

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

@@ -43,6 +43,7 @@ public class UserServiceImpl implements UserService {
 
 		oldUser = userDao.save(oldUser);
 		user.setDialectUID(String.valueOf(oldUser.getUserUU()));
+		user.setSalt(String.valueOf(oldUser.getUserUU()));
 
 		return user;
 	}