后端一些类的 operator字段

src/main/java/com/cloudcross/ssp/model/AdGroup.java

@@ -1,7 +1,6 @@
 package com.cloudcross.ssp.model;
 import java.util.Date;
 
-import com.cloudcross.ssp.common.consts.Status;
 import com.cloudcross.ssp.web.widget.SelectorController.ISelector;
 
 /**
@@ -20,6 +19,8 @@ public final class AdGroup implements ISelector{
 	private Long orderId;
 	//活动id
 	private Long campaignId;
+	//运营商Id
+	private Long operatorId;	
 	// 投放名称
 	private String adGroupName;
 	// 开始时间
@@ -148,6 +149,14 @@ public final class AdGroup implements ISelector{
 	public void setUpdated(Date updated) {
 		this.updated = updated;
 	}
+	
+	public Long getOperatorId() {
+		return operatorId;
+	}
+
+	public void setOperatorId(Long operatorId) {
+		this.operatorId = operatorId;
+	}
 
 	public Long getId() {
 		return id;

src/main/java/com/cloudcross/ssp/model/AdvAgent.java

@@ -6,6 +6,7 @@ import com.cloudcross.ssp.web.widget.SelectorController.ISelector;
 
 public class AdvAgent implements ISelector{
 	private Long id;
+	private Long operatorId;
 	private String name;
 	private String contacts;
 	private String tel;
@@ -24,6 +25,12 @@ public class AdvAgent implements ISelector{
 	public void setId(Long id) {
 		this.id = id;
 	}
+	public Long getOperatorId() {
+		return operatorId;
+	}
+	public void setOperatorId(Long operatorId) {
+		this.operatorId = operatorId;
+	}
 	public String getName() {
 		return name;
 	}

src/main/java/com/cloudcross/ssp/model/Campaign.java

@@ -62,6 +62,7 @@ public class Campaign implements ISelector {
     //投放数目
 	private Long groupNumber;
 	
+	private Long operatorId;
 	
 	//广告主advertiserId，增于2015/10/20
 	private Long advertiserId;
@@ -93,6 +94,14 @@ public class Campaign implements ISelector {
 	public void setId(Long id) {
 		this.id = id;
 	}
+	
+	public Long getOperatorId() {
+		return operatorId;
+	}
+
+	public void setOperatorId(Long operatorId) {
+		this.operatorId = operatorId;
+	}
 
 	public Long getOrderId() {
 		return orderId;

src/main/java/com/cloudcross/ssp/model/Order.java

@@ -15,6 +15,7 @@ public class Order implements ISelector {
 		// 广告主ID
 		private Long advertiserId;
 		// 订单名称
+		private Long operatorId;
 		private String name;
 		// 订单预算
 		private float budget;
@@ -61,6 +62,13 @@ public class Order implements ISelector {
 		public void setAdvertiserId(Long advertiserId) {
 			this.advertiserId = advertiserId;
 		}
+		
+		public Long getOperatorId() {
+			return operatorId;
+		}
+		public void setOperatorId(Long operatorId) {
+			this.operatorId = operatorId;
+		}
 		public String getName() {
 			return name;
 		}

src/main/java/com/cloudcross/ssp/model/mapper/account.sql.xml

@@ -228,10 +228,11 @@
 		 tel,
 		 agent_id,
 		 advertiser_id,
+		 operator_id,
 		 description, 
 		 state,
 		 sys_type ) values (#{accountName}, #{password},#{realName}, 
-    	#{tel},#{agentId},#{advertiserId},#{description},#{state},#{sysType}) 
+    	#{tel},#{agentId},#{advertiserId},#{operatorId},#{description},#{state},#{sysType}) 
 	</insert>
 
 	<delete id="delete" parameterType="String">

src/main/java/com/cloudcross/ssp/model/mapper/ad-group.sql.xml

@@ -7,6 +7,7 @@
 		t_adgroup.advertiser_id as advertiserId,
 		t_adgroup.order_id as orderId,
 		t_adgroup.campaign_id as campaignId,
+		t_adgroup.operator_id as operatorId,
 		name as adGroupName,
 		active_time as startDate,
 		expire_time as endDate,

src/main/java/com/cloudcross/ssp/model/mapper/advAgent.sql.xml

@@ -13,6 +13,7 @@
 		zip,
 		email,
 		title,
+		operator_id as operatorId,
 		admin_id as adminId,
 		status
 	</sql>

src/main/java/com/cloudcross/ssp/model/mapper/advertiser.sql.xml

@@ -299,6 +299,7 @@
 		t_advertiser.name as name,
 		reg_name as regName,
 		homepage as homePage,
+		t_advertiser.operator_id as operatorId, 
 		t_advertiser.contacts,
 		t_advertiser.tel as tel,
 		t_advertiser.email as email,

src/main/java/com/cloudcross/ssp/model/mapper/campaign.sql.xml

@@ -11,6 +11,7 @@
 	    t_campaign.dailybudget as dailyBudget,
 	    t_campaign.impression as impression,
 	    t_campaign.click as click,
+	    t_campaign.operator_id as operatorId,
 	    t_campaign.conversion as conversion,
 	    t_campaign.daily_impression as dailyImpression,
 	    t_campaign.daily_click as dailyClick,

src/main/java/com/cloudcross/ssp/model/mapper/order.sql.xml

@@ -5,6 +5,7 @@
 	<sql id="base_column">
 		t_order.id as id,
 		t_order.advertiser_id as advertiserId,
+		t_order.operator_id as operatorId,
 		t_order.name as name,
 		t_order.budget as budget,
 		t_order.comment as comment,

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

@@ -140,11 +140,16 @@ public class AuthorityController extends SimpleController{
 			//如果创建的是广告主端的账号，此处应插入相应的agentId，并且在关联广告主的时候插入advertiserId
 			//如果没有关联广告主,插入的就是代理商的小账号，但是代理商可以事后为这个编辑账号时分配广告主
 			t.setAgentId(account.getAgentId());
+			if (account.getOperatorId()!=0) {
+				//创建小账号的时候operatorId标签要嵌入
+				t.setOperatorId(account.getOperatorId());
+			}
 			t.setSysType(account.getSysType());
 			t.setPassword(Md5Tool.getMd5(password));
 			t.setDescription(account.getDescription()+"（小）");
 			if(t.getAdvertiserId()==null){
 				t.setAdvertiserId(new Long(0));
+				accountService.addAccountAdvertiser(t);
 			}else {
 				accountService.addAccountAdvertiser(t);
 				Advertiser advertiser = advertiserService.findById(t.getAdvertiserId());

src/main/java/com/cloudcross/ssp/web/advertiser/main/ad/AdvertiserController.java

@@ -190,6 +190,11 @@ public class AdvertiserController extends SimpleController {
 		//添加用户
 		//添加广告主ID为空
 		if (t.getId() == null) {
+			Account account = getLoginUser();
+			if (account.getOperatorId()!=0) {
+				//如果获取的当前执行操作的账号的operatorId不等于0，那么，对应的广告主也要插入不等于0的operatorId。
+				t.setOperatorId(account.getOperatorId());
+			}
 			if (advertiserService.add(t)) {
 				//添加广告主后的资质审核消息
 				Message message = new Message();

src/main/java/com/cloudcross/ssp/web/back/main/ClientAccountController.java

@@ -424,7 +424,6 @@ public class ClientAccountController extends SimpleController{
 	public String correlation(Model model){
 		List<Correlation> correlations = correlationService.findAllCorrelation();
 		model.addAttribute("correlations",correlations);
-		System.err.println("ccmd"+correlations);
 		return page("correlation");
 	}
 	/**