advertiser 更新

Signed-off-by: jiapeng.dong <jiapeng.dong@cloudcross.com>

src/main/java/com/cloudcross/ssp/service/impl/AdvertiserService.java

@@ -396,7 +396,7 @@ public class AdvertiserService implements IAdvertiserService, ISelectorProvider{
 		}else{
 			System.out.println("改投放下没有创意");
 			bannerFlag = true;
-		}
+		} 
 		
 		return advertiserFlag&&orderFlag&&campaignFlag&&adGroupFlag&&bannerFlag;
 	}

src/main/java/com/cloudcross/ssp/service/impl/BannerTemplateService.java

@@ -11,8 +11,8 @@ import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.cloudcross.ssp.advertiser.model.BannerTemplate;
-import com.cloudcross.ssp.advertiser.service.IBannerTemplateService;
+import com.cloudcross.ssp.model.BannerTemplate;
+import com.cloudcross.ssp.service.IBannerTemplateService;
 import com.cloudcross.ssp.base.dao.GenericIBatisDao;
 import com.cloudcross.ssp.common.utils.MapBuilder;
 import com.cloudcross.ssp.common.utils.Pager;

src/main/java/com/cloudcross/ssp/service/impl/CampaignService.java

@@ -11,10 +11,10 @@ import org.apache.commons.lang.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.cloudcross.ssp.advertiser.model.Campaign;
-import com.cloudcross.ssp.advertiser.service.IAdGroupService;
-import com.cloudcross.ssp.advertiser.service.IBannerService;
-import com.cloudcross.ssp.advertiser.service.ICampaignService;
+import com.cloudcross.ssp.model.Campaign;
+import com.cloudcross.ssp.service.IAdGroupService;
+import com.cloudcross.ssp.service.IBannerService;
+import com.cloudcross.ssp.service.ICampaignService;
 import com.cloudcross.ssp.base.dao.GenericIBatisDao;
 import com.cloudcross.ssp.common.utils.Assert;
 import com.cloudcross.ssp.common.utils.MapBuilder;

src/main/java/com/cloudcross/ssp/service/impl/SizeService.java

@@ -11,8 +11,8 @@ import org.springframework.stereotype.Service;
 
 import com.cloudcross.ssp.base.dao.GenericIBatisDao;
 import com.cloudcross.ssp.common.utils.Pager;
-import com.cloudcross.ssp.operator.model.Size;
-import com.cloudcross.ssp.operator.service.ISizeService;
+import com.cloudcross.ssp.model.Size;
+import com.cloudcross.ssp.service.ISizeService;
 
 
 @Service

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

@@ -18,10 +18,10 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import com.cloudcross.ssp.advertiser.model.Account;
-import com.cloudcross.ssp.advertiser.model.AdvBalance;
-import com.cloudcross.ssp.advertiser.model.Finance;
-import com.cloudcross.ssp.advertiser.service.IAdvBalanceService;
+import com.cloudcross.ssp.model.Account;
+import com.cloudcross.ssp.model.AdvBalance;
+import com.cloudcross.ssp.model.Finance;
+import com.cloudcross.ssp.service.IAdvBalanceService;
 import com.cloudcross.ssp.base.utils.freemarker.FreemarkerTemplateProcessor;
 import com.cloudcross.ssp.base.web.SimpleController;
 import com.cloudcross.ssp.common.utils.Pager;

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

@@ -22,15 +22,15 @@ 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.Industry;
-import com.cloudcross.ssp.advertiser.model.Log;
-import com.cloudcross.ssp.advertiser.model.Message;
-import com.cloudcross.ssp.advertiser.service.IAdvertiserService;
-import com.cloudcross.ssp.advertiser.service.IIndustryService;
-import com.cloudcross.ssp.advertiser.service.ILogService;
-import com.cloudcross.ssp.advertiser.service.IMessageService;
+import com.cloudcross.ssp.model.Account;
+import com.cloudcross.ssp.model.Advertiser;
+import com.cloudcross.ssp.model.Industry;
+import com.cloudcross.ssp.model.Log;
+import com.cloudcross.ssp.model.Message;
+import com.cloudcross.ssp.service.IAdvertiserService;
+import com.cloudcross.ssp.service.IIndustryService;
+import com.cloudcross.ssp.service.ILogService;
+import com.cloudcross.ssp.service.IMessageService;
 import com.cloudcross.ssp.base.utils.freemarker.FreemarkerTemplateProcessor;
 import com.cloudcross.ssp.base.web.SimpleController;
 import com.cloudcross.ssp.base.web.result.AjaxResult;

src/main/java/com/cloudcross/ssp/web/advertiser/main/ad/target/CloneBannerController.java

@@ -18,22 +18,22 @@ 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.AdGroup;
-import com.cloudcross.ssp.advertiser.model.Advertiser;
-import com.cloudcross.ssp.advertiser.model.Banner;
-import com.cloudcross.ssp.advertiser.model.BannerTemplate;
-import com.cloudcross.ssp.advertiser.model.Log;
-import com.cloudcross.ssp.advertiser.model.Order;
-import com.cloudcross.ssp.advertiser.model.Size;
-import com.cloudcross.ssp.advertiser.service.IAdGroupService;
-import com.cloudcross.ssp.advertiser.service.IAdvertiserService;
-import com.cloudcross.ssp.advertiser.service.IBannerService;
-import com.cloudcross.ssp.advertiser.service.IBannerTemplateService;
-import com.cloudcross.ssp.advertiser.service.ILogService;
-import com.cloudcross.ssp.advertiser.service.IOrderService;
-import com.cloudcross.ssp.advertiser.service.ISizeService;
-import com.cloudcross.ssp.advertiser.service.impl.BannerService;
+import com.cloudcross.ssp.model.Account;
+import com.cloudcross.ssp.model.AdGroup;
+import com.cloudcross.ssp.model.Advertiser;
+import com.cloudcross.ssp.model.Banner;
+import com.cloudcross.ssp.model.BannerTemplate;
+import com.cloudcross.ssp.model.Log;
+import com.cloudcross.ssp.model.Order;
+import com.cloudcross.ssp.model.Size;
+import com.cloudcross.ssp.service.IAdGroupService;
+import com.cloudcross.ssp.service.IAdvertiserService;
+import com.cloudcross.ssp.service.IBannerService;
+import com.cloudcross.ssp.service.IBannerTemplateService;
+import com.cloudcross.ssp.service.ILogService;
+import com.cloudcross.ssp.service.IOrderService;
+import com.cloudcross.ssp.service.ISizeService;
+import com.cloudcross.ssp.service.impl.BannerService;
 import com.cloudcross.ssp.base.web.SimpleController;
 import com.cloudcross.ssp.common.utils.Pager;
 

src/main/java/com/cloudcross/ssp/web/advertiser/main/ad/target/CreateBannerController.java

@@ -46,22 +46,22 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.multipart.commons.CommonsMultipartResolver;
 
-import com.cloudcross.ssp.advertiser.model.Account;
-import com.cloudcross.ssp.advertiser.model.AdGroup;
-import com.cloudcross.ssp.advertiser.model.Advertiser;
-import com.cloudcross.ssp.advertiser.model.Banner;
-import com.cloudcross.ssp.advertiser.model.BannerTemplate;
-import com.cloudcross.ssp.advertiser.model.Log;
-import com.cloudcross.ssp.advertiser.model.Order;
-import com.cloudcross.ssp.advertiser.model.Size;
-import com.cloudcross.ssp.advertiser.service.IAdGroupService;
-import com.cloudcross.ssp.advertiser.service.IAdvertiserService;
-import com.cloudcross.ssp.advertiser.service.IBannerService;
-import com.cloudcross.ssp.advertiser.service.IBannerTemplateService;
-import com.cloudcross.ssp.advertiser.service.ILogService;
-import com.cloudcross.ssp.advertiser.service.IOrderService;
-import com.cloudcross.ssp.advertiser.service.ISizeService;
-import com.cloudcross.ssp.advertiser.service.impl.BannerService;
+import com.cloudcross.ssp.model.Account;
+import com.cloudcross.ssp.model.AdGroup;
+import com.cloudcross.ssp.model.Advertiser;
+import com.cloudcross.ssp.model.Banner;
+import com.cloudcross.ssp.model.BannerTemplate;
+import com.cloudcross.ssp.model.Log;
+import com.cloudcross.ssp.model.Order;
+import com.cloudcross.ssp.model.Size;
+import com.cloudcross.ssp.service.IAdGroupService;
+import com.cloudcross.ssp.service.IAdvertiserService;
+import com.cloudcross.ssp.service.IBannerService;
+import com.cloudcross.ssp.service.IBannerTemplateService;
+import com.cloudcross.ssp.service.ILogService;
+import com.cloudcross.ssp.service.IOrderService;
+import com.cloudcross.ssp.service.ISizeService;
+import com.cloudcross.ssp.service.impl.BannerService;
 import com.cloudcross.ssp.base.web.SimpleController;
 import com.cloudcross.ssp.common.Config;
 import com.cloudcross.ssp.common.consts.Status;
@@ -88,8 +88,6 @@ public class CreateBannerController extends SimpleController{
 	@Autowired
 	IBannerTemplateService bat;
 	@Autowired
-	IAdGroupService adg;
-	@Autowired
 	IBannerService bs;
 	@Autowired
 	IOrderService orderService ;
@@ -121,7 +119,7 @@ public class CreateBannerController extends SimpleController{
 		//根据投放名，查找所有创建列表找总数
 		int totalRow = bs.countByParams(paramMap);
 		LOG.debug("totalRow="+totalRow);
-		AdGroup adGroup = adg.findById(adGroupId);
+		AdGroup adGroup = adGroupService.findById(adGroupId);
 		Long campaignId = adGroup.getCampaignId();
 		Long orderId = adGroup.getOrderId();
 		Order order = orderService.findById(orderId);
@@ -315,7 +313,7 @@ public class CreateBannerController extends SimpleController{
 				//保存缩略图路径
 				bannerTemplate.setPathSmall(replacePath(pathSmall));	
 				adGroupId =Long.parseLong(ids[0]);
-				AdGroup adGroup = adg.findById(adGroupId);
+				AdGroup adGroup = adGroupService.findById(adGroupId);
 				Long campaignId = adGroup.getCampaignId();
 				Long orderId = adGroup.getOrderId();
 				Order order = orderService.findById(orderId);