|
|
@@ -16,7 +16,6 @@ import javax.servlet.http.HttpServletResponse;
|
|
|
import org.apache.commons.lang.ArrayUtils;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.beans.factory.annotation.Qualifier;
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
import org.springframework.ui.Model;
|
|
|
import org.springframework.web.bind.annotation.ModelAttribute;
|
|
|
@@ -28,17 +27,16 @@ import com.cloudcross.ssp.base.utils.freemarker.FreemarkerTemplateProcessor;
|
|
|
import com.cloudcross.ssp.base.web.SimpleController;
|
|
|
import com.cloudcross.ssp.common.consts.Status;
|
|
|
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.operator.model.Account;
|
|
|
-import com.cloudcross.ssp.operator.model.Operator;
|
|
|
-import com.cloudcross.ssp.operator.model.Resources;
|
|
|
-import com.cloudcross.ssp.operator.model.UserLogin;
|
|
|
-import com.cloudcross.ssp.operator.service.IAccountService;
|
|
|
-import com.cloudcross.ssp.operator.service.IOperatorService;
|
|
|
-import com.cloudcross.ssp.operator.service.IResourcesService;
|
|
|
-import com.cloudcross.ssp.operator.service.IUserLoginService;
|
|
|
+import com.cloudcross.ssp.model.Account;
|
|
|
+import com.cloudcross.ssp.model.Operator;
|
|
|
+import com.cloudcross.ssp.model.Resources;
|
|
|
+import com.cloudcross.ssp.model.UserLogin;
|
|
|
+import com.cloudcross.ssp.service.IAccountService;
|
|
|
+import com.cloudcross.ssp.service.IOperatorService;
|
|
|
+import com.cloudcross.ssp.service.IResourcesService;
|
|
|
+import com.cloudcross.ssp.service.IUserLoginService;
|
|
|
/**
|
|
|
*
|
|
|
*
|
|
|
@@ -79,7 +77,7 @@ public class AuthorityController1 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);
|
|
|
@@ -128,7 +126,7 @@ public class AuthorityController1 extends SimpleController{
|
|
|
|
|
|
String password = t.getPassword();
|
|
|
if ((t.getId()) == 0) {
|
|
|
- com.cloudcross.ssp.back.model.Account account = getLoginUser();
|
|
|
+ Account account = getLoginUser();
|
|
|
//如果创建的是广告主端的账号，此处应插入相应的agentId，并且在关联广告主的时候插入advertiserId
|
|
|
//如果没有关联广告主，要区分广告主端的小账号，还是代理商的超管账号！
|
|
|
t.setOperatorId(account.getOperatorId());
|
|
|
@@ -216,7 +214,7 @@ public class AuthorityController1 extends SimpleController{
|
|
|
* 要判断当前登录用户是不是超管账号。admin_id字段等于当前登录用户的id就表示是超管,是超管就要将operator中的信息传到页面上去；
|
|
|
* 否则就表示不是！
|
|
|
*/
|
|
|
- com.cloudcross.ssp.back.model.Account account = getLoginUser();
|
|
|
+ Account account = getLoginUser();
|
|
|
//广告主系统的：运营商登录系统，去t_adv_agent;广告主登录系统，去t_advertiser。
|
|
|
Long operatorId = account.getOperatorId();
|
|
|
Operator operator = null;
|
|
|
@@ -302,7 +300,7 @@ public class AuthorityController1 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++) {
|
jun.zhou