Merge remote-tracking branch 'origin/dev_patrol_stats' into dev_patrol_stats

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/BizDataStatsServiceImpl.java

@@ -5,6 +5,7 @@ import com.epmet.dto.extract.form.StaffPatrolStatsFormDTO;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
 import com.epmet.service.BizDataStatsService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 /**
  * desc:业务库 数据统计服务实现
@@ -13,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
  * @date: 2021/7/2 2:58 下午
  * @version: 1.0
  */
+@Service
 public class BizDataStatsServiceImpl implements BizDataStatsService {
     @Autowired
     private DataStatisticalOpenFeignClient feignClient;

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/StaffPatrolStatsTask.java

@@ -14,7 +14,7 @@ import org.springframework.stereotype.Component;
  * @date 2020/6/23 14:36
  */
 @Slf4j
-@Component("dimInitTask")
+@Component("staffPatrolStatsTask")
 public class StaffPatrolStatsTask implements ITask {
 
 	@Autowired
@@ -22,13 +22,13 @@ public class StaffPatrolStatsTask implements ITask {
 
 	@Override
 	public void run(String params) {
-		log.debug("DimInitTask定时任务正在执行，参数为：{}", params);
+		log.debug("staffPatrolStatsTask定时任务正在执行，参数为：{}", params);
 		StaffPatrolStatsFormDTO formDTO = JSON.parseObject(params, StaffPatrolStatsFormDTO.class);
 		Result result = bizDataStatsService.exeStaffPatrolStats(formDTO);
 		if (result.success()){
-			log.debug("StaffPatrolStatsTask定时任务正在执行定时任务执行成功");
+			log.debug("staffPatrolStatsTask定时任务正在执行定时任务执行成功");
 		}else {
-			log.debug("StaffPatrolStatsTask定时任务正在执行定时任务执行失败:" + result.getMsg());
+			log.debug("staffPatrolStatsTask定时任务正在执行定时任务执行失败:" + result.getMsg());
 		}
 	}
 }