Browse Source

SAAS注册、SAAS申请

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@1254 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
suntg 10 years ago
parent
commit
0a823c19a2

+ 27 - 1
src/main/java/com/uas/platform/b2b/controller/EnterpriseController.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -43,10 +44,35 @@ public class EnterpriseController {
 	@ResponseBody
 	@ResponseBody
 	public Enterprise getEnterprise() {
 	public Enterprise getEnterprise() {
 		Enterprise enterprise = SystemSession.getUser().getEnterprise();
 		Enterprise enterprise = SystemSession.getUser().getEnterprise();
-		enterprise.setAdmin(userService.findUserByUserUU(enterprise.getEnAdminuu()));
+		enterprise.setAdmin(userService.findUserByUserUU(enterprise
+				.getEnAdminuu()));
 		return enterprise;
 		return enterprise;
 	}
 	}
 
 
+	/**
+	 * 修改企业基本资料
+	 * 
+	 * @return
+	 */
+	@RequestMapping(method = RequestMethod.POST)
+	@ResponseBody
+	public void updateEnterprise(@RequestBody Enterprise enterprise) {
+		enterprise = enterpriseService.save(enterprise);
+		SystemSession.getUser().setCurrentEnterprise(enterprise);
+	}
+
+	/**
+	 * 申请SAAS服务
+	 * 
+	 * @return
+	 */
+	@RequestMapping(value="/applySaas", method = RequestMethod.POST)
+	@ResponseBody
+	public void applySaas(Long enUU, String enSaasUrl, String enAdminPassword) {
+		Enterprise enterprise = enterpriseService.applySaas(enUU, enSaasUrl, enAdminPassword);
+		SystemSession.getUser().setCurrentEnterprise(enterprise);
+	}
+
 	/**
 	/**
 	 * 企业成长历程
 	 * 企业成长历程
 	 * 
 	 * 

+ 3 - 6
src/main/java/com/uas/platform/b2b/controller/RegisterController.java

@@ -105,17 +105,14 @@ public class RegisterController {
 	 * 设置管理员账号密码
 	 * 设置管理员账号密码
 	 */
 	 */
 	@RequestMapping(value = "/setAdminPassword", method = RequestMethod.POST)
 	@RequestMapping(value = "/setAdminPassword", method = RequestMethod.POST)
-	public @ResponseBody ResponseEntity<ModelMap> setAdminPassword(Long enuu, String password) {
+	@ResponseBody
+	public ResponseEntity<ModelMap> setAdminPassword(Long enuu, String password) {
 		HttpHeaders headers = new HttpHeaders();
 		HttpHeaders headers = new HttpHeaders();
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		headers.add("Content-Type", "application/json; charset=utf-8");
 		ModelMap map = new ModelMap();
 		ModelMap map = new ModelMap();
 		String result = enterpriseService.setAdminPassword(enuu, password);
 		String result = enterpriseService.setAdminPassword(enuu, password);
 		map.put("result", result);
 		map.put("result", result);
-		if (result.equals("SUCCESS")) {// 验证通过
-			return new ResponseEntity<ModelMap>(map, headers, HttpStatus.OK);
-		} else {// 验证不通过
-			return new ResponseEntity<ModelMap>(map, headers, HttpStatus.EXPECTATION_FAILED);
-		}
+		return new ResponseEntity<ModelMap>(map, headers, HttpStatus.OK);
 	}
 	}
 
 
 	/**
 	/**

+ 20 - 0
src/main/java/com/uas/platform/b2b/manage/controller/EnterpriseController.java

@@ -40,6 +40,11 @@ public class EnterpriseController {
 	private UserService userService;
 	private UserService userService;
 	@Autowired
 	@Autowired
 	private RegisterLogService registerLogService;
 	private RegisterLogService registerLogService;
+
+	/**
+	 * 管理平台项目地址
+	 */
+	public static final String MANAGE_HOST = "http://192.168.253.231:9090/platform-manage/";
 	
 	
 	/**
 	/**
 	 *管理平台获取需要审核的企业
 	 *管理平台获取需要审核的企业
@@ -163,5 +168,20 @@ public class EnterpriseController {
 		}
 		}
 		return new ResponseEntity<String>(result, headers, HttpStatus.OK);
 		return new ResponseEntity<String>(result, headers, HttpStatus.OK);
 	}
 	}
+	
+	/**
+	 * 管理平台创建好SAAS账套之后,邮件通知企业管理员
+	 * 
+	 * @param data
+	 * @return
+	 * @throws UnsupportedEncodingException
+	 */
+	@RequestMapping(value = "/createdSaas", method = RequestMethod.POST)
+	@ResponseBody
+	public void saveCreatedSaas(@RequestParam("data") String data, HttpServletRequest request) throws UnsupportedEncodingException {
+		String jsonStr = URLDecoder.decode(data, "UTF-8");
+		List<Enterprise> enterprises = FlexJsonUtils.fromJsonArray(jsonStr, Enterprise.class);
+		enterpriseService.createdSaas(enterprises, request);
+	}
 
 
 }
 }