控制器整合

Signed-off-by: you.chen <you.chen@cloudcross.com>

src/main/java/com/cloudcross/ssp/web/advertiser/main/AuthorityController.java

@@ -22,16 +22,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.cloudcross.ssp.advertiser.model.Account;
-import com.cloudcross.ssp.advertiser.model.Advertiser;
-import com.cloudcross.ssp.advertiser.model.Operator;
-import com.cloudcross.ssp.advertiser.model.Resources;
-import com.cloudcross.ssp.advertiser.model.UserLogin;
-import com.cloudcross.ssp.advertiser.service.IAccountService;
-import com.cloudcross.ssp.advertiser.service.IAdvertiserService;
-import com.cloudcross.ssp.advertiser.service.IOperatorService;
-import com.cloudcross.ssp.advertiser.service.IResourcesService;
-import com.cloudcross.ssp.advertiser.service.IUserLoginService;
 import com.cloudcross.ssp.base.utils.freemarker.FreemarkerTemplateProcessor;
 import com.cloudcross.ssp.base.web.SimpleController;
 import com.cloudcross.ssp.common.consts.Status;
@@ -39,6 +29,15 @@ import com.cloudcross.ssp.common.utils.LangUtil;
 //import com.cloudcross.ssp.common.utils.MD5;
 import com.cloudcross.ssp.common.utils.Md5Tool;
 import com.cloudcross.ssp.common.utils.Pager;
+import com.cloudcross.ssp.model.Account;
+import com.cloudcross.ssp.model.Advertiser;
+import com.cloudcross.ssp.model.Resources;
+import com.cloudcross.ssp.model.UserLogin;
+import com.cloudcross.ssp.service.IAccountService;
+import com.cloudcross.ssp.service.IAdvertiserService;
+import com.cloudcross.ssp.service.IOperatorService;
+import com.cloudcross.ssp.service.IResourcesService;
+import com.cloudcross.ssp.service.IUserLoginService;
 /**
  * 
  * 
@@ -82,7 +81,7 @@ public class AuthorityController extends SimpleController{
 			@RequestParam HashMap<String, Object> paramMap,
 			@RequestParam(defaultValue="1") int page){
 		//当前登录用户，这个界面是要显示当前登陆用户所创建的所有账户，由于小号是没有权限看到这个界面的，所以不用区分是超管账号，还是小号！
-		com.cloudcross.ssp.back.model.Account loginAccount = getLoginUser();
+		Account loginAccount = getLoginUser();
 		paramMap.put("loginAccount", loginAccount);
 		int totalRow = accountService.countByParams(paramMap);
 		System.out.println("黑喂狗"+totalRow);
@@ -117,7 +116,7 @@ public class AuthorityController extends SimpleController{
 	 */
 	@RequestMapping("/create")
 	public String create(Model model){
-		com.cloudcross.ssp.back.model.Account account = getLoginUser();
+	Account account = getLoginUser();
 		model.addAttribute("agentId",account.getAgentId());//要传代理商的Id到页面上去！
 		return page("create");
 	}
@@ -137,7 +136,7 @@ public class AuthorityController extends SimpleController{
 		//++++++++这地方要看有没有关联广告主账号
 		String password = t.getPassword();
 		if ((t.getId()) == 0) {
-			com.cloudcross.ssp.back.model.Account account = getLoginUser();
+			Account account = getLoginUser();
 			//如果创建的是广告主端的账号，此处应插入相应的agentId，并且在关联广告主的时候插入advertiserId
 			//如果没有关联广告主,插入的就是代理商的小账号，但是代理商可以事后为这个编辑账号时分配广告主
 			t.setAgentId(account.getAgentId());
@@ -242,7 +241,7 @@ public class AuthorityController extends SimpleController{
 		 *  要判断当前登录用户是不是超管账号。admin_id字段等于当前登录用户的id就表示是超管,是超管就要将operator中的信息传到页面上去；
 		 *  否则就表示不是！
 		 */
-		com.cloudcross.ssp.back.model.Account account = getLoginUser();
+		Account account = getLoginUser();
 		model.addAttribute("account",account);
 		return page("loginperson");
 	}
@@ -257,7 +256,7 @@ public class AuthorityController extends SimpleController{
 	public String saveloginperson(Model model,
 					@ModelAttribute("form") Account t,
 					@RequestParam(value = "ensurePassword", defaultValue = "") String ensurePassword){
-		com.cloudcross.ssp.back.model.Account loginAccount = getLoginUser();
+		Account loginAccount = getLoginUser();
 		String password = t.getPassword();
 		if (StringUtils.isNotBlank(password)) {
 			t.setPassword(Md5Tool.getMd5(password));
@@ -297,7 +296,7 @@ public class AuthorityController extends SimpleController{
 		/**
 		 * 参数和list里要一样
 		 */
-		com.cloudcross.ssp.back.model.Account loginAccount = getLoginUser();
+		Account loginAccount = getLoginUser();
 		paramMap.put("loginAccount", loginAccount);
 		List<Account> accountList = accountService.findExcelAccounts(paramMap);
 		for (int i = 0; i < accountList.size(); i++) {

src/main/java/com/cloudcross/ssp/web/advertiser/main/CodeClassController.java

@@ -9,19 +9,18 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.cloudcross.ssp.advertiser.model.Account;
-import com.cloudcross.ssp.advertiser.model.CodeClass;
-import com.cloudcross.ssp.advertiser.service.ICodeClassService;
 import com.cloudcross.ssp.base.web.SimpleController;
 import com.cloudcross.ssp.common.utils.Pager;
+import com.cloudcross.ssp.model.Account;
+import com.cloudcross.ssp.model.CodeClass;
+import com.cloudcross.ssp.service.ICodeClassService;
 
 
-@Controller
+@Controller("advertiser.codeClassController")
 @RequestMapping("/advertiser/main/code-class")
 public  class CodeClassController extends SimpleController {
 	@Autowired

src/main/java/com/cloudcross/ssp/web/advertiser/main/CodeConvertController.java

@@ -9,19 +9,18 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.cloudcross.ssp.advertiser.model.Account;
-import com.cloudcross.ssp.advertiser.model.CodeConvert;
-import com.cloudcross.ssp.advertiser.service.ICodeConvertService;
+import com.cloudcross.ssp.model.Account;
+import com.cloudcross.ssp.model.CodeConvert;
+import com.cloudcross.ssp.service.ICodeConvertService;
 import com.cloudcross.ssp.base.web.SimpleController;
 import com.cloudcross.ssp.common.utils.Pager;
 
 
-@Controller
+@Controller("advertiser.codeConvertController")
 @RequestMapping("/advertiser/main/code-convert")
 public  class CodeConvertController extends SimpleController {
 	@Autowired

src/main/java/com/cloudcross/ssp/web/advertiser/main/CodeSiteController.java

@@ -9,12 +9,12 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.cloudcross.ssp.advertiser.model.CodeSite;
-import com.cloudcross.ssp.advertiser.service.ICodeSiteService;
+import com.cloudcross.ssp.model.CodeSite;
+import com.cloudcross.ssp.service.ICodeSiteService;
 import  com.cloudcross.ssp.base.web.SimpleController;
 
 
-@Controller
+@Controller("advertiser.codeSiteController")
 @RequestMapping("/advertiser/main/code-site")
 public  class CodeSiteController extends SimpleController {
 	@Autowired

src/main/java/com/cloudcross/ssp/web/advertiser/main/DashboardController.java

@@ -10,7 +10,6 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.userdetails.User;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,18 +18,18 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.LocaleResolver;
 import org.springframework.web.servlet.support.RequestContextUtils;
 
-import com.cloudcross.ssp.advertiser.model.Account;
-import com.cloudcross.ssp.advertiser.service.IAccountService;
-import com.cloudcross.ssp.advertiser.service.IAdReportService;
 import com.cloudcross.ssp.base.web.SimpleController;
 import com.cloudcross.ssp.common.utils.Pager;
+import com.cloudcross.ssp.model.Account;
+import com.cloudcross.ssp.service.IAccountService;
+import com.cloudcross.ssp.service.IAdReportService;
 
 /**
  * 控制面板功能。
  * 
  * @author chenyou
  */
-@Controller
+@Controller("advertiser.dashboardController")
 @RequestMapping("/advertiser/main/dashboard")
 public class DashboardController extends SimpleController {
 	@Autowired
@@ -62,7 +61,7 @@ public class DashboardController extends SimpleController {
 		}
 		
 		//得到登录账号
-		com.cloudcross.ssp.back.model.Account account = getLoginUser();
+		Account account = getLoginUser();
 		
 		model.addAttribute("loginAccountName", account.getAccountName());
 		Map<String,Object> paramMap = new HashMap<String, Object>();
@@ -110,7 +109,7 @@ public class DashboardController extends SimpleController {
 		 * 因为当下拉框如果选则全部的时候传递过来的广告主id位-1，这时其实就是查询该代理商的账号余额
 		 */
 		if(null != paramMap && paramMap.containsKey("advertiserId") && "-1".equals((String)paramMap.get("advertiserId"))) {
-			com.cloudcross.ssp.back.model.Account account = getLoginUser();
+			Account account = getLoginUser();
 			paramMap.put("agentId", String.valueOf(account.getAgentId()));
 		}