소스 검색

修改标签筛选bug

syh 4 년 전
부모
커밋
10f6f09a31

+ 13 - 5
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/TagInfoController.java

@@ -44,19 +44,27 @@ public class TagInfoController {
 	  * @return
 	  */
 	 @RequestMapping(value = "/treeList", method = RequestMethod.GET)
-	 public Result<IPage<TagInfo>> list(@RequestParam(defaultValue = "10")Integer pageSize,@RequestParam(defaultValue = "1")Integer pageNo) {
+	 public Result<IPage<TagInfo>> list(@RequestParam (required = false)String tagName,@RequestParam(defaultValue = "10")Integer pageSize,@RequestParam(defaultValue = "1")Integer pageNo,@RequestParam(required = false)Long tagCategoryId,@RequestParam(defaultValue = "1")Integer level) {
 		 Result<IPage<TagInfo>> result = new Result<>();
 		 try {
-			QueryWrapper<TagInfo> query = new QueryWrapper<>();
+		 	QueryWrapper<TagInfo> query = new QueryWrapper<>();
 		 	query.eq("del_flag", CommonConstant.DEL_FLAG_0);
-		 	query.eq("level",1);
+		 	if(null!=level){
+				query.eq("level",level);
+			}
+		 	if(null!=tagCategoryId){
+		 		query.eq("tag_category_id",tagCategoryId);
+		 	}
+			 if(null!=tagName&&!"".equals(tagName)){
+				 query.like("tag_name",tagName);
+			 }
 		 	query.orderByAsc("tag_order");
 		 	Page<TagInfo> page = new Page<>(pageNo, pageSize);
 		 	IPage<TagInfo> pageList = tagInfoService.page(page,query);
 		 	List<TagInfo>recordsLevel1 = pageList.getRecords();
 
-			 List<TagInfo>setRecordsLevel1 = new ArrayList<>();
-			 if(null!=recordsLevel1&&!recordsLevel1.isEmpty()){
+		 	List<TagInfo>setRecordsLevel1 = new ArrayList<>();
+		 	if(null!=recordsLevel1&&!recordsLevel1.isEmpty()){
 		 		for (TagInfo level1tag:recordsLevel1) {
 					if(!level1tag.isLeaf()){
 						//非叶子节点

+ 5 - 7
jeecg-boot-module-system/src/test/java/org/jeecg/SampleTest.java

@@ -512,14 +512,12 @@ public class SampleTest {
         aiKuaishouNewCreateCampaign.kuaishouAiAddNewMaterialCreativity(accountTargetTemplate2,1);
     }
 
+    @Autowired
+    private IBytedancePlanDailyReportService planDailyReportService;
+
     @Test
     public void etlKuaishouProjectData(){
-        String dateString = "2020-08-07";
-        Date startDate = DateUtils.parseDate(dateString,"yyyy-MM-dd");
-        for(int i=0;i<=180;i++){
-            Date getDate = DateUtils.addDay(startDate,i);
-            kuaishouVideoEtlInfoService.etlKuaishouVideoInfo(getDate);
-            bytedanceVideoEtlInfoService.etlBytedanceVideoInfo(getDate);
-        }
+        CtopOauthToken token = tokenService.getTokenByAccountId(1660666858777607L);
+        reportService.getAdvertiserPlanReport(token,DateUtils.parseDate("2021-01-25","yyyy-MM-dd"),DateUtils.parseDate("2021-01-25","yyyy-MM-dd"),CtopAdConstant.BYTEDANCE_REPORT_TYPE_DAILY);
     }
 }

+ 0 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/controller/AiKuaishouAdvertiserStrategyController.java

@@ -53,7 +53,6 @@ public class AiKuaishouAdvertiserStrategyController {
 		List<AiKuaishouAdvertiserStrategy> records = pageList.getRecords();
 		List<AiKuaishouAdvertiserStrategy> setData = new ArrayList<>();
 		if(null!=records&&!records.isEmpty()){
-
 			records.forEach(record->{
 				Long accountId = record.getAccountId();
 				UserAllocation allocation = allocationService.getByAccountId(accountId);