From 1a09f10bd8001351b4e63eb2887cdf161b7345f3 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Fri, 28 Jan 2022 19:12:59 +0800 Subject: [PATCH] =?UTF-8?q?20220128=E4=BF=AE=E6=94=B9=E5=BC=95=E5=AF=BC?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persist/dao/ProTaskPluginDao.java | 7 +++ .../ccsens/ptos_zero/service/TallService.java | 4 ++ .../ptos_zero/service/ZeroCommonService.java | 45 +++++++++++-------- .../com/ccsens/ptos_zero/util/Constant.java | 2 + .../resources/mapper_dao/ProTaskPluginDao.xml | 12 ++++- 5 files changed, 51 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/ccsens/ptos_zero/persist/dao/ProTaskPluginDao.java b/src/main/java/com/ccsens/ptos_zero/persist/dao/ProTaskPluginDao.java index bc4b47b..292fdbf 100644 --- a/src/main/java/com/ccsens/ptos_zero/persist/dao/ProTaskPluginDao.java +++ b/src/main/java/com/ccsens/ptos_zero/persist/dao/ProTaskPluginDao.java @@ -19,6 +19,13 @@ public interface ProTaskPluginDao extends ProTaskPluginMapper { */ List queryTaskOfPlugin(@Param("detailTaskId") Long detailTaskId); + /** + * 查询广告页或引导页 + * @param taskDetailId 任务详情id + * @return 插件列表 + */ + String queryParamByTaskId(@Param("detailTaskId")Long taskDetailId); + // /** // * 根据任务id列表查询任务插件 // * @param oldTaskIdList 任务id列表 diff --git a/src/main/java/com/ccsens/ptos_zero/service/TallService.java b/src/main/java/com/ccsens/ptos_zero/service/TallService.java index e0caec2..2e64486 100644 --- a/src/main/java/com/ccsens/ptos_zero/service/TallService.java +++ b/src/main/java/com/ccsens/ptos_zero/service/TallService.java @@ -643,4 +643,8 @@ public class TallService implements ITallService { } } + @Override + public List queryRegularTaskAndPlugin(String header, TallTaskDto.QueryRegularTask param) { + return null; + } } diff --git a/src/main/java/com/ccsens/ptos_zero/service/ZeroCommonService.java b/src/main/java/com/ccsens/ptos_zero/service/ZeroCommonService.java index 4e1d237..303e5a3 100644 --- a/src/main/java/com/ccsens/ptos_zero/service/ZeroCommonService.java +++ b/src/main/java/com/ccsens/ptos_zero/service/ZeroCommonService.java @@ -56,23 +56,32 @@ public class ZeroCommonService implements IZeroCommonService { @Override public String getGuidePlugin(Byte type) { String plugin = null; - //查找零号项目 - ProTaskDetail proTaskDetail = taskDetailDao.selectByPrimaryKey(Constant.ZERO_PROJECT_ID); - if(ObjectUtil.isNull(proTaskDetail)){ - return null; - } - //查找项目下的引导页或广告页任务 - TaskDto.QueryTaskOfProject taskOfProject = new TaskDto.QueryTaskOfProject(); - taskOfProject.setProjectId(Constant.ZERO_PROJECT_ID); - taskOfProject.setName(type == 0 ? Constant.ZERO_GUIDE : Constant.ZERO_ADVERTISING); - List taskOfProjects = taskDetailDao.queryTaskOfProject(taskOfProject); - if(CollectionUtil.isNotEmpty(taskOfProjects)){ - //查找任务关联的插件id - List taskPluginInfos = taskPluginDao.queryTaskOfPlugin(taskOfProjects.get(0).getDetailId()); - if(CollectionUtil.isNotEmpty(taskPluginInfos)){ - plugin = taskPluginInfos.get(0).getParam(); - } - } - return plugin; +// //查找零号项目 +// ProTaskDetail proTaskDetail = taskDetailDao.selectByPrimaryKey(Constant.ZERO_PROJECT_ID); +// if(ObjectUtil.isNull(proTaskDetail)){ +// return null; +// } +// //查找项目下的引导页或广告页任务 +// TaskDto.QueryTaskOfProject taskOfProject = new TaskDto.QueryTaskOfProject(); +// taskOfProject.setProjectId(Constant.ZERO_PROJECT_ID); +// taskOfProject.setName(type == 0 ? Constant.ZERO_GUIDE : Constant.ZERO_ADVERTISING); +// List taskOfProjects = taskDetailDao.queryTaskOfProject(taskOfProject); +// if(CollectionUtil.isNotEmpty(taskOfProjects)){ +// //查找任务关联的插件id +// List taskPluginInfos = taskPluginDao.queryTaskOfPlugin(taskOfProjects.get(0).getDetailId()); +// if(CollectionUtil.isNotEmpty(taskPluginInfos)){ +// plugin = taskPluginInfos.get(0).getParam(); +// } +// } + + //TODO 暂用任务id直接查询 +// taskOfProject.setName(type == 0 ? Constant.ZERO_GUIDE : Constant.ZERO_ADVERTISING); + Long taskDetailId = type == 0 ? Constant.ZERO_GUIDE_TASK_ID : Constant.ZERO_ADVERTISING_TASK_ID; +// List taskPluginInfos = taskPluginDao.queryTaskOfPlugin(taskDetailId); + String pluginParam = taskPluginDao.queryParamByTaskId(taskDetailId); +// if(CollectionUtil.isNotEmpty(taskPluginInfos)){ +// plugin = taskPluginInfos.get(0).getParam(); +// } + return pluginParam; } } diff --git a/src/main/java/com/ccsens/ptos_zero/util/Constant.java b/src/main/java/com/ccsens/ptos_zero/util/Constant.java index fb004ba..b1aebf9 100644 --- a/src/main/java/com/ccsens/ptos_zero/util/Constant.java +++ b/src/main/java/com/ccsens/ptos_zero/util/Constant.java @@ -15,8 +15,10 @@ public class Constant { public static Long ZERO_PROJECT_ID = 1486942101999587328L; /**引导页任务名*/ public static String ZERO_GUIDE = "引导页"; + public static Long ZERO_GUIDE_TASK_ID = 1486942115534606336L; /**广告页任务名*/ public static String ZERO_ADVERTISING = "广告页"; + public static Long ZERO_ADVERTISING_TASK_ID = 1486942114205011968L; /**appId*/ public static String APP_ID = "appId"; /**secret*/ diff --git a/src/main/resources/mapper_dao/ProTaskPluginDao.xml b/src/main/resources/mapper_dao/ProTaskPluginDao.xml index 9c02e12..5c1ccd8 100644 --- a/src/main/resources/mapper_dao/ProTaskPluginDao.xml +++ b/src/main/resources/mapper_dao/ProTaskPluginDao.xml @@ -44,8 +44,18 @@ WHERE td.rec_status = 0 AND tp.rec_status = 0 AND tp.task_detail_id = #{detailTaskId} + - +