Browse Source

修改对应的controller

原志强 9 years ago
parent
commit
a57e11a022

+ 1 - 1
src/main/java/com/cloudcross/ssp/operator/service/IBannerService.java

@@ -5,7 +5,7 @@ import java.util.Map;
 
 import com.cloudcross.ssp.base.service.IGenericService;
 import com.cloudcross.ssp.common.utils.Pager;
-import com.cloudcross.ssp.operator.model.Banner;
+import com.cloudcross.ssp.model.Banner;
 
 /**
  * 投放活动对应创意表的服务接口

+ 6 - 6
src/main/java/com/cloudcross/ssp/service/impl/CodeConvertService.java

@@ -64,7 +64,7 @@ public class CodeConvertService implements ICodeConvertService{
 	
 	@Override
 	public CodeConvert findById(Long id) {
-		return myBatisDao.get("advertiser.codeConvertSqlMapper.selectById", id);
+		return myBatisDao.get("codeConvertSqlMapper.selectById", id);
 	}
 	
 	@Override
@@ -82,7 +82,7 @@ public class CodeConvertService implements ICodeConvertService{
 		paramMap.put("key", paramMap.get("searchKey"));
 		paramMap.put("value", searchValue);*/
 		paramMap.put("pager", pager);
-		return myBatisDao.getList("advertiser.codeConvertSqlMapper.selectByParamsadvertiser", paramMap);
+		return myBatisDao.getList("codeConvertSqlMapper.selectByParamsadvertiser", paramMap);
 	}
 	public List<CodeConvert> findByParamsOperator(Map<String, Object> paramMap, Pager pager) {
 		String searchValue = SqlHelper.doLike(paramMap.get("searchValue"));
@@ -90,14 +90,14 @@ public class CodeConvertService implements ICodeConvertService{
 		paramMap.put("key", paramMap.get("searchKey"));
 		paramMap.put("value", searchValue);
 		paramMap.put("pager", pager);
-		return myBatisDao.getList("operator.codeConvertSqlMapper.selectByParamsoperator", paramMap);
+		return myBatisDao.getList("codeConvertSqlMapper.selectByParamsoperator", paramMap);
 	}
 
 
 
 	@Override
 	public CodeConvert findByName(String convertName) {
-		return myBatisDao.get("advertiser.codeConvertSqlMapper.selectByName", convertName);
+		return myBatisDao.get("codeConvertSqlMapper.selectByName", convertName);
 	}
 
 	@Override
@@ -123,9 +123,9 @@ public class CodeConvertService implements ICodeConvertService{
 	public String getCode(Long id, int type) {
 		// TODO Auto-generated method stub
 		if(type == 0){
-			return myBatisDao.get("advertiser.codeConvertSqlMapper.getScriptById", id);
+			return myBatisDao.get("codeConvertSqlMapper.getScriptById", id);
 		}else{
-			return myBatisDao.get("advertiser.codeConvertSqlMapper.getPicyureById", id);
+			return myBatisDao.get("codeConvertSqlMapper.getPicyureById", id);
 		}
 	}
 

+ 5 - 5
src/main/java/com/cloudcross/ssp/web/operator/main/BannerAuditController.java

@@ -21,12 +21,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.back.model.Account;
+import com.cloudcross.ssp.model.Account;
 import com.cloudcross.ssp.base.utils.freemarker.FreemarkerTemplateProcessor;
 import com.cloudcross.ssp.base.web.SimpleController;
 import com.cloudcross.ssp.common.utils.Pager;
-import com.cloudcross.ssp.operator.model.Banner;
-import com.cloudcross.ssp.operator.service.IBannerService;
+import com.cloudcross.ssp.model.Banner;
+import com.cloudcross.ssp.service.IBannerService;;
 
 /**
  * 素材审核功能相关页面。
@@ -120,7 +120,7 @@ public class BannerAuditController extends SimpleController {
 		//将id转为List<Long>类型传入updateStatus函数
 		if (ArrayUtils.isNotEmpty(id)) {
 			for(long i:id){
-			Banner banner = bannerService.findById(i);
+			Banner banner = bannerService.findByIdOperator(i);
 				if(banner.getOperatorChecked()==-1){
 					bannerService.addOperatorBanner(i,1,operatorId);
 				}else{
@@ -144,7 +144,7 @@ public class BannerAuditController extends SimpleController {
 		//将id转为List<Long>类型传入updateStatus函数
 		if (ArrayUtils.isNotEmpty(id)) {
 			for(long i:id){
-				Banner banner = bannerService.findById(i);
+				Banner banner = bannerService.findByIdOperator(i);
 				if(banner.getOperatorChecked()==-1){
 					bannerService.addOperatorBanner(i,2,operatorId);
 				}else{

+ 4 - 4
src/main/java/com/cloudcross/ssp/web/operator/main/CodeClassController.java

@@ -14,8 +14,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import com.cloudcross.ssp.base.web.SimpleController;
 import com.cloudcross.ssp.common.utils.Pager;
-import com.cloudcross.ssp.operator.model.CodeClass;
-import com.cloudcross.ssp.operator.service.ICodeClassService;
+import com.cloudcross.ssp.model.CodeClass;
+import com.cloudcross.ssp.service.ICodeClassService;
 
 
 @Controller("operator.codeClassController")
@@ -42,13 +42,13 @@ System.out.println(paramMap.size()+"yyyy");
 		
 		// 搜索条件:账户类型、账户及姓名
 		// 查询总行数
-	int totalRow = codeClassService.countByParams(paramMap);
+	int totalRow = codeClassService.countByParamsOperator(paramMap);
 	System.out.println("tttttttt"+totalRow);
 	Pager pager = new Pager();
 		pager.setPage(page);
 		pager.setTotalRow(totalRow);
 		
-		List<CodeClass> codeClassList = codeClassService.findByParams(paramMap, pager);
+		List<CodeClass> codeClassList = codeClassService.findByParamsOperator(paramMap, pager);
 		
 		model.addAllAttributes(paramMap);
 		model.addAttribute("pager", pager);

+ 5 - 5
src/main/java/com/cloudcross/ssp/web/operator/main/CodeConvertController.java

@@ -14,11 +14,11 @@ import org.springframework.web.bind.annotation.RequestParam;
 
 import com.cloudcross.ssp.base.web.SimpleController;
 import com.cloudcross.ssp.common.utils.Pager;
-import com.cloudcross.ssp.operator.model.CodeConvert;
-import com.cloudcross.ssp.operator.service.ICodeConvertService;
+import com.cloudcross.ssp.model.CodeConvert;
+import com.cloudcross.ssp.service.ICodeConvertService;
 
 
-@Controller("operator.codeConvertController")
+@Controller
 @RequestMapping("/operator/main/code-convert")
 public  class CodeConvertController extends SimpleController {
 	private static final Logger LOG = Logger.getLogger(CodeConvertController.class);
@@ -42,13 +42,13 @@ System.out.println(paramMap.size()+"yyyy");
 		
 		// 搜索条件:账户类型、账户及姓名
 		// 查询总行数
-	int totalRow = codeConvertService.countByParams(paramMap);
+	int totalRow = codeConvertService.countByParamsOperator(paramMap);
 	System.out.println("tttttttt"+totalRow);
 	Pager pager = new Pager();
 		pager.setPage(page);
 		pager.setTotalRow(totalRow);
 		
-		List<CodeConvert> codeConvertList = codeConvertService.findByParams(paramMap, pager);
+		List<CodeConvert> codeConvertList = codeConvertService.findByParamsOperator(paramMap, pager);
 		
 		model.addAllAttributes(paramMap);
 		model.addAttribute("pager", pager);

+ 2 - 2
src/main/java/com/cloudcross/ssp/web/operator/main/CodeSiteController.java

@@ -11,8 +11,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import com.cloudcross.ssp.base.web.SimpleController;
-import com.cloudcross.ssp.operator.model.CodeSite;
-import com.cloudcross.ssp.operator.service.ICodeSiteService;
+import com.cloudcross.ssp.model.CodeSite;
+import com.cloudcross.ssp.service.ICodeSiteService;
 
 
 @Controller("operator.codeSiteController")

+ 3 - 3
src/main/java/com/cloudcross/ssp/web/operator/main/DashboardController.java

@@ -13,10 +13,10 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import com.cloudcross.ssp.back.model.Account;
+import com.cloudcross.ssp.model.Account;
 import com.cloudcross.ssp.base.web.SimpleController;
-import com.cloudcross.ssp.operator.model.RptZone;
-import com.cloudcross.ssp.operator.service.IRptZoneService;
+import com.cloudcross.ssp.model.RptZone;
+import com.cloudcross.ssp.service.IRptZoneService;
 
 /**
  * 控制面板功能。