|
@@ -19,6 +19,7 @@ import cn.com.ctop.manage.modules.actor.service.IActorVideoService;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
+import com.github.pagehelper.PageInfo;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.api.vo.Result;
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
import org.jeecg.common.system.query.QueryGenerator;
|
|
@@ -65,6 +66,11 @@ public class ProductController {
|
|
HttpServletRequest request, HttpServletResponse response){
|
|
HttpServletRequest request, HttpServletResponse response){
|
|
log.info("/ctop/product/getProjectListByAdvertiserId 方法开始");
|
|
log.info("/ctop/product/getProjectListByAdvertiserId 方法开始");
|
|
Result<List<Project>> result = new Result();
|
|
Result<List<Project>> result = new Result();
|
|
|
|
+ if(dto == null || dto.getAdvertiserId() ==null ){
|
|
|
|
+ result.setSuccess(false);
|
|
|
|
+ result.setMessage("advertiserId不能为空");
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
|
|
try {
|
|
try {
|
|
List<Project> projectList = productService.getProjectListByAdvertiserId(dto.getAdvertiserId());
|
|
List<Project> projectList = productService.getProjectListByAdvertiserId(dto.getAdvertiserId());
|
|
@@ -85,8 +91,13 @@ public class ProductController {
|
|
@RequestMapping(value = "/getSaleAndYunyingListByProjectIds")
|
|
@RequestMapping(value = "/getSaleAndYunyingListByProjectIds")
|
|
public Result<Map<String, Object>> getSaleAndYunyingListByProjectIds(@RequestBody ProductInfoDto dto,
|
|
public Result<Map<String, Object>> getSaleAndYunyingListByProjectIds(@RequestBody ProductInfoDto dto,
|
|
HttpServletRequest request, HttpServletResponse response){
|
|
HttpServletRequest request, HttpServletResponse response){
|
|
- log.info("/ctop/product/getProjectListByAdvertiserId 方法开始");
|
|
|
|
|
|
+ log.info("/ctop/product/getSaleAndYunyingListByProjectIds 方法开始");
|
|
Result<Map<String, Object>> result = new Result();
|
|
Result<Map<String, Object>> result = new Result();
|
|
|
|
+ if(dto == null || dto.getProjectIds() ==null || dto.getProjectIds().size() ==0 ){
|
|
|
|
+ result.setSuccess(false);
|
|
|
|
+ result.setMessage("projectIds不能为空");
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
|
|
try {
|
|
try {
|
|
Map<String, Object> map = productService.getSaleAndYunyingListByProjectIds(dto.getProjectIds());
|
|
Map<String, Object> map = productService.getSaleAndYunyingListByProjectIds(dto.getProjectIds());
|
|
@@ -96,7 +107,7 @@ public class ProductController {
|
|
result.setSuccess(false);
|
|
result.setSuccess(false);
|
|
result.setMessage("error");
|
|
result.setMessage("error");
|
|
}finally{
|
|
}finally{
|
|
- log.info("/ctop/product/getProjectListByAdvertiserId 方法结束");
|
|
|
|
|
|
+ log.info("/ctop/product/getSaleAndYunyingListByProjectIds 方法结束");
|
|
}
|
|
}
|
|
|
|
|
|
return result;
|
|
return result;
|
|
@@ -108,6 +119,11 @@ public class ProductController {
|
|
public Result deleteProduct(@RequestBody ProductInfoDto dto,HttpServletRequest request, HttpServletResponse response){
|
|
public Result deleteProduct(@RequestBody ProductInfoDto dto,HttpServletRequest request, HttpServletResponse response){
|
|
log.info("/ctop/product/deleteProduct 方法开始");
|
|
log.info("/ctop/product/deleteProduct 方法开始");
|
|
Result result = new Result();
|
|
Result result = new Result();
|
|
|
|
+ if(dto == null || dto.getProductId() ==null ){
|
|
|
|
+ result.setSuccess(false);
|
|
|
|
+ result.setMessage("productId不能为空");
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
|
|
try {
|
|
try {
|
|
productService.deleteProduct(dto.getProductId());
|
|
productService.deleteProduct(dto.getProductId());
|
|
@@ -148,6 +164,11 @@ public class ProductController {
|
|
public Result<Map<String, Object>> getProductInfo(@RequestBody ProductInfoDto dto, HttpServletRequest request, HttpServletResponse response){
|
|
public Result<Map<String, Object>> getProductInfo(@RequestBody ProductInfoDto dto, HttpServletRequest request, HttpServletResponse response){
|
|
log.info("/ctop/product/getProductInfo 方法开始");
|
|
log.info("/ctop/product/getProductInfo 方法开始");
|
|
Result<Map<String, Object>> result = new Result();
|
|
Result<Map<String, Object>> result = new Result();
|
|
|
|
+ if(dto==null || dto.getProductId() == null){
|
|
|
|
+ result.setSuccess(false);
|
|
|
|
+ result.setMessage("productId不能为空");
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
|
|
try {
|
|
try {
|
|
Map<String, Object> productInfo = productService.getProductInfo(dto.getProductId());
|
|
Map<String, Object> productInfo = productService.getProductInfo(dto.getProductId());
|
|
@@ -169,6 +190,11 @@ public class ProductController {
|
|
public Result deleteByProjectIdAndProductId(@RequestBody ProductInfoDto dto, HttpServletRequest request, HttpServletResponse response){
|
|
public Result deleteByProjectIdAndProductId(@RequestBody ProductInfoDto dto, HttpServletRequest request, HttpServletResponse response){
|
|
log.info("/ctop/product/deleteByProjectIdAndProductId 方法开始");
|
|
log.info("/ctop/product/deleteByProjectIdAndProductId 方法开始");
|
|
Result result = new Result();
|
|
Result result = new Result();
|
|
|
|
+ if(dto==null || dto.getProductId() == null || dto.getProjectId() ==null){
|
|
|
|
+ result.setSuccess(false);
|
|
|
|
+ result.setMessage("productId,projectId不能为空");
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
|
|
try {
|
|
try {
|
|
productService.deleteByProjectIdAndProductId(dto.getProjectId(), dto.getProductId());
|
|
productService.deleteByProjectIdAndProductId(dto.getProjectId(), dto.getProductId());
|
|
@@ -189,6 +215,11 @@ public class ProductController {
|
|
public Result<List<ProjectVO>> getProjectListByProductId(@RequestBody ProductInfoDto dto, HttpServletRequest request, HttpServletResponse response){
|
|
public Result<List<ProjectVO>> getProjectListByProductId(@RequestBody ProductInfoDto dto, HttpServletRequest request, HttpServletResponse response){
|
|
log.info("/ctop/product/getProjectListByProductId 方法开始");
|
|
log.info("/ctop/product/getProjectListByProductId 方法开始");
|
|
Result<List<ProjectVO>> result = new Result();
|
|
Result<List<ProjectVO>> result = new Result();
|
|
|
|
+ if(dto==null || dto.getProductId() == null){
|
|
|
|
+ result.setSuccess(false);
|
|
|
|
+ result.setMessage("productId,projectId不能为空");
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
|
|
try {
|
|
try {
|
|
List<ProjectVO> projectListByProductId = productService.getProjectListByProductId(dto.getProductId());
|
|
List<ProjectVO> projectListByProductId = productService.getProjectListByProductId(dto.getProductId());
|
|
@@ -207,12 +238,16 @@ public class ProductController {
|
|
//产品列表
|
|
//产品列表
|
|
@ResponseBody
|
|
@ResponseBody
|
|
@RequestMapping(value = "/getProductList")
|
|
@RequestMapping(value = "/getProductList")
|
|
- public Result<List<ProductVO>> getProductList(@RequestBody ProductInfoDto dto, HttpServletRequest request, HttpServletResponse response){
|
|
|
|
|
|
+ public Result<PageInfo<ProductVO>> getProductList(@RequestBody ProductInfoDto dto, HttpServletRequest request, HttpServletResponse response){
|
|
log.info("/ctop/product/getProductList 方法开始");
|
|
log.info("/ctop/product/getProductList 方法开始");
|
|
- Result<List<ProductVO>> result = new Result();
|
|
|
|
|
|
+ Result<PageInfo<ProductVO>> result = new Result();
|
|
|
|
+ if(dto==null || dto.getPageNum() == 0 || dto.getPageSize() ==0){
|
|
|
|
+ dto.setPageNum(1);
|
|
|
|
+ dto.setPageSize(10);
|
|
|
|
+ }
|
|
|
|
|
|
try {
|
|
try {
|
|
- List<ProductVO> productList = productService.getProductList(dto.getAdvertiserName(), dto.getProductName(), dto.getPageNum(), dto.getPageSize());
|
|
|
|
|
|
+ PageInfo<ProductVO> productList = productService.getProductList(dto.getAdvertiserName(), dto.getProductName(), dto.getPageNum(), dto.getPageSize());
|
|
result.setResult(productList);
|
|
result.setResult(productList);
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|
|
log.error(e.getMessage());
|
|
log.error(e.getMessage());
|
|
@@ -231,6 +266,11 @@ public class ProductController {
|
|
public Result insertProductProjectMap(@RequestBody ProductInfoDto dto, HttpServletRequest request, HttpServletResponse response){
|
|
public Result insertProductProjectMap(@RequestBody ProductInfoDto dto, HttpServletRequest request, HttpServletResponse response){
|
|
log.info("/ctop/product/insertProductProjectMap 方法开始");
|
|
log.info("/ctop/product/insertProductProjectMap 方法开始");
|
|
Result result = new Result();
|
|
Result result = new Result();
|
|
|
|
+ if(dto==null || dto.getProductId() == null || dto.getProjectIds() == null){
|
|
|
|
+ result.setSuccess(false);
|
|
|
|
+ result.setMessage("productId,projectIds不能为空");
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
|
|
|
|
try {
|
|
try {
|
|
productService.insertProductProjectMap(dto.getProductId(), dto.getProjectIds());
|
|
productService.insertProductProjectMap(dto.getProductId(), dto.getProjectIds());
|
|
@@ -256,5 +296,4 @@ public class ProductController {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
}
|
|
}
|