Explorar el Código

定向包~修改查询列表系统类型设为不限

zhaoxian hace 4 años
padre
commit
00ce85d440

+ 1 - 1
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/ai/mapper/xml/KuaishouDirectionalPackageMapper.xml

@@ -19,7 +19,7 @@
         t1.template_name 'templateName',
         t2.project_name 'projectName',
         t1.project_id 'projectId',
-        CASE WHEN t1.platform_os =1 THEN 'Android' WHEN t1.platform_os =2 THEN 'iOS' ELSE '-' END 'platformOs',
+        CASE WHEN t1.platform_os =1 THEN 'Android' WHEN t1.platform_os =2 THEN 'iOS' ELSE '不限' END 'platformOs',
         t1.update_time 'updateTime',
         IFNULL(t4.count,0) as 'accountCount',
         IFNULL(t5.count,0) as 'unitCount'

+ 14 - 2
module-kuaishou/src/main/java/cn/com/ctop/kuaishou/modules/batch/controller/KuaishouTemplateController.java

@@ -21,7 +21,15 @@ import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
@@ -67,7 +75,7 @@ public class KuaishouTemplateController {
 
 
     /**
-     * 获取行为与兴趣"类目"
+     * 获取行为与兴趣"类目"
      *
      * @param
      * @return org.jeecg.common.api.vo.Result<java.lang.Object>
@@ -77,6 +85,10 @@ public class KuaishouTemplateController {
     @GetMapping(value = "/getbehaviorInterest")
     public Result<Object> getbehaviorInterest(Long accountId) {
         Result<List<JSONObject>> result = new Result<>();
+        if (Check.isNull(accountId)) {
+            //各账户类目词一致
+            accountId = 23212L;
+        }
         return kuaishouTemplateService.getBehaviorInterest(accountId);
     }