From 3fe9785a684315589d092258cde8a2390de7786f Mon Sep 17 00:00:00 2001 From: zhizhi wu <2377881365@qq.com> Date: Tue, 17 Mar 2020 18:25:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/application-util-dev.yml | 12 ++++++------ .../main/resources/application-util-test.yml | 12 ++++++------ .../java/com/ccsens/tall/bean/vo/TaskVo.java | 13 +++++++++++++ .../tall/service/ProTaskDetailService.java | 16 ++++++++++++++++ tall/src/main/resources/application.yml | 4 ++-- .../resources/mapper_dao/TaskDetailDao.xml | 18 ++++++++++++++++++ 6 files changed, 61 insertions(+), 14 deletions(-) diff --git a/cloudutil/src/main/resources/application-util-dev.yml b/cloudutil/src/main/resources/application-util-dev.yml index 997b9a7d..4e0eefaa 100644 --- a/cloudutil/src/main/resources/application-util-dev.yml +++ b/cloudutil/src/main/resources/application-util-dev.yml @@ -52,9 +52,9 @@ logging: root: info org.springframework.cloud.sleuth: DEBUG spring: - zipkin: - base-url: http://anyring.cc:9411 - sleuth: - sampler: - # 采样率，模式0.1，也就是10%，为了便于观察效果，改为1.0，也就是100%。生产环境建议保持默认。 - probability: 1.0 +# zipkin: +# base-url: http://anyring.cc:9411 +# sleuth: +# sampler: +# # 采样率，模式0.1，也就是10%，为了便于观察效果，改为1.0，也就是100%。生产环境建议保持默认。 +# probability: 1.0 diff --git a/cloudutil/src/main/resources/application-util-test.yml b/cloudutil/src/main/resources/application-util-test.yml index 348a879c..46e5e128 100644 --- a/cloudutil/src/main/resources/application-util-test.yml +++ b/cloudutil/src/main/resources/application-util-test.yml @@ -49,12 +49,12 @@ logging: root: info org.springframework.cloud.sleuth: DEBUG spring: - zipkin: - base-url: http://49.233.89.188:9411 - sleuth: - sampler: - # 采样率，模式0.1，也就是10%，为了便于观察效果，改为1.0，也就是100%。生产环境建议保持默认。 - probability: 1.0 +# zipkin: +# base-url: http://49.233.89.188:9411 +# sleuth: +# sampler: +# # 采样率，模式0.1，也就是10%，为了便于观察效果，改为1.0，也就是100%。生产环境建议保持默认。 +# probability: 1.0 cloud: inetutils: ignored-interfaces: ['VMware.*'] \ No newline at end of file diff --git a/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java b/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java index c2f7704d..713b0b2d 100644 --- a/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java +++ b/tall/src/main/java/com/ccsens/tall/bean/vo/TaskVo.java @@ -55,6 +55,13 @@ public class TaskVo { private int delay; @ApiModelProperty("状态：0-未开始，1-进行中，2-已完成") private int process; + + @ApiModelProperty("页面/接口路径") + private String webPath; + @ApiModelProperty("程序位置 0:tall内部，1外部") + private Byte routineLocation; + @ApiModelProperty("入参") + private String importParam; public Long getDuration(){ if(ObjectUtil.isNotNull(beginTime) && ObjectUtil.isNotNull(endTime)) { return endTime - beginTime; @@ -124,6 +131,12 @@ public class TaskVo { @ApiModelProperty("当前周期内任务的序号") private int sequence; + @ApiModelProperty("页面/接口路径") + private String webPath; + @ApiModelProperty("程序位置 0:tall内部，1外部") + private Byte routineLocation; + @ApiModelProperty("入参") + private String importParam; public Long getDuration(){ if(ObjectUtil.isNotNull(beginTime) && ObjectUtil.isNotNull(endTime)) { return endTime - beginTime; diff --git a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java index 67301b25..81a936ec 100644 --- a/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java +++ b/tall/src/main/java/com/ccsens/tall/service/ProTaskDetailService.java @@ -12,6 +12,7 @@ import com.ccsens.tall.bean.vo.MemberVo; import com.ccsens.tall.bean.vo.ProjectVo; import com.ccsens.tall.bean.vo.TaskVo; import com.ccsens.tall.persist.dao.*; +import com.ccsens.tall.persist.mapper.ProPluginConfigMapper; import com.ccsens.tall.util.TaskUtil; import com.ccsens.util.CodeEnum; import com.ccsens.util.DateUtil; @@ -26,6 +27,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.math.BigDecimal; import java.util.*; @@ -66,6 +68,8 @@ public class ProTaskDetailService implements IProTaskDetailService { private Snowflake snowflake; @Autowired private MtFeignClient mtFeignClient; + @Resource + private ProPluginConfigMapper proPluginConfigMapper; @Override public void saveTaskDetail(ProTaskDetail taskDetail) { @@ -131,6 +135,18 @@ public class ProTaskDetailService implements IProTaskDetailService { normalTask.setDetailId(firstTaskDetail.getId()); normalTask.setId(taskDeliverService.isTaskOrSubTime(firstTaskDetail.getId())); normalTask.setSequence(sequence); + // 查询任务名对应的配置 + ProPluginConfigExample configExample = new ProPluginConfigExample(); + configExample.createCriteria().andTaskIdEqualTo(firstTaskDetail.getId()).andPlaceLocationEqualTo((byte)0); + List proPluginConfigs = proPluginConfigMapper.selectByExample(configExample); + if (CollectionUtil.isNotEmpty(proPluginConfigs)) { + ProPluginConfig config = proPluginConfigs.get(0); + normalTask.setImportParam(config.getImportParam()); + normalTask.setRoutineLocation(config.getRoutineLocation()); + normalTask.setWebPath(config.getWebPath()); + } + + //一级任务完成状态 ProSubTimeMember firstSubTimeMember = getProcessByUserIdAndTask(currentUserId, normalTask.getId()); if (ObjectUtil.isNotNull(firstSubTimeMember)) { diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index eca66951..1d881c2f 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: test - include: util-test,common \ No newline at end of file + active: dev + include: util-dev,common \ No newline at end of file diff --git a/tall/src/main/resources/mapper_dao/TaskDetailDao.xml b/tall/src/main/resources/mapper_dao/TaskDetailDao.xml index 983e4ef1..097028e2 100644 --- a/tall/src/main/resources/mapper_dao/TaskDetailDao.xml +++ b/tall/src/main/resources/mapper_dao/TaskDetailDao.xml @@ -9,6 +9,9 @@ + + + @@ -28,6 +31,9 @@ + + + @@ -64,6 +70,9 @@ d.virtual as tVirtual, d.delay as tDelay, d.has_group as tHasGroup, + c.web_path as webPath, + c.routine_location as routineLocation, + c.import_param as importParam, GROUP_CONCAT(p.id) as pId, GROUP_CONCAT(sp.name) as pName, GROUP_CONCAT(sp.description) as pDescription @@ -77,6 +86,7 @@ p.id IS NULL ) LEFT JOIN t_sys_plugin sp ON sp.id = p.plugin_id + left join t_pro_plugin_config c on d.id = c.task_id WHERE d.rec_status = 0 AND @@ -96,6 +106,8 @@ d.Level in (2,3) AND d.has_group = 0 + AND + (c.place_location = 0 or c.id is null) group by s.task_detail_id @@ -119,6 +131,9 @@ d.virtual as tVirtual, d.delay as tDelay, d.has_group as tHasGroup, + c.web_path as webPath, + c.routine_location as routineLocation, + c.import_param as importParam, GROUP_CONCAT(p.id) as pId, GROUP_CONCAT(sp.name) as pName, GROUP_CONCAT(sp.description) as pDescription @@ -132,6 +147,7 @@ p.id IS NULL ) LEFT JOIN t_sys_plugin sp ON sp.id = p.plugin_id + left join t_pro_plugin_config c on d.id = c.task_id WHERE d.rec_status = 0 AND @@ -146,6 +162,8 @@ d.Level in (2,3) AND d.has_group = 0 + AND + (c.place_location = 0 or c.id is null) group by s.task_detail_id