From f64dd13f70e8cfbc98e734356b81024f537a6e1d Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 27 二月 2023 20:13:58 +0800
Subject: [PATCH] 修改走访任务定时
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java | 86 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 86 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
index a97532f..532a874 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
@@ -4,6 +4,9 @@
import javax.annotation.Resource;
+import com.panzhihua.common.model.vos.community.ComMngPopulationCommunityTagsVo;
+import com.panzhihua.common.utlis.DateUtils;
+import com.panzhihua.common.utlis.LabelUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
@@ -171,6 +174,10 @@
eventVisitingTasksVO
.setNation(PopulPoliticalOutlookEnum.getCnDescByName(eventVisitingTasksVO.getNationCode()));
}
+ //查询该人口的标签
+ List<ComMngPopulationCommunityTagsVo> communityTagsList = this.baseMapper.getCommunityTagList(eventVisitingTasksVO.getVisiterId());
+ String label = LabelUtils.assembleLabel(communityTagsList);
+ eventVisitingTasksVO.setLabel(label);
}
return R.ok(page);
}
@@ -185,6 +192,11 @@
eventVisitingTasksVO
.setNation(PopulPoliticalOutlookEnum.getCnDescByName(eventVisitingTasksVO.getNationCode()));
}
+
+ //查询该人口的标签
+ List<ComMngPopulationCommunityTagsVo> communityTagsList = this.baseMapper.getCommunityTagList(eventVisitingTasksVO.getVisiterId());
+ String label = LabelUtils.assembleLabel(communityTagsList);
+ eventVisitingTasksVO.setLabel(label);
}
return R.ok(page);
}
@@ -590,4 +602,78 @@
return false;
}
+ /**
+ * 定时任务-给上月已走访的人员创建定时任务
+ * @return 执行结果
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R timedTaskVisitingJobHandler(){
+
+ //需要创建的走访任务列表
+ List<EventVisitingTasksDO> saveList = new ArrayList<>();
+
+ //获取上月第一天时间
+ Date lastMonthFirst = DateUtils.getLastMonthFirst();
+// Date lastMonthFirst = DateUtils.getYearMonthStart(2022,7);
+ //获取上月最后一天时间/
+ Date lastMonthEnd = DateUtils.getLastMonthEnd();
+// Date lastMonthEnd = DateUtils.getYearMonthStart(2022,8);
+
+ log.error("第一天时间"+lastMonthFirst);
+ log.error("第一天时间"+lastMonthEnd);
+
+ //查询上月已走访任务
+ List<EventVisitingTasksDO> visitingTasksList = this.baseMapper.selectList(new QueryWrapper<EventVisitingTasksDO>().lambda()
+ .eq(EventVisitingTasksDO::getEventStatus,EventVisitingTasksDO.eventStatus.yzf)
+ .ge(EventVisitingTasksDO::getSubmitDate,lastMonthFirst)
+ .le(EventVisitingTasksDO::getSubmitDate,lastMonthEnd));
+
+ log.error("走访对象"+visitingTasksList.size());
+
+ visitingTasksList.forEach(visitingTask -> {
+ EventVisitingTasksDO visitingTasksDO = dataConversion(visitingTask);
+ saveList.add(visitingTasksDO);
+ });
+
+ log.error("走访新对象"+saveList.size());
+
+ if(saveList.size() > 0){
+ this.saveBatch(saveList);
+ }
+ return R.ok();
+ }
+
+ /**
+ * 数据转换
+ * @param oldVisitingTasksDO 请求参数
+ * @return 转换后的对象
+ */
+ private EventVisitingTasksDO dataConversion(EventVisitingTasksDO oldVisitingTasksDO){
+ //创建走访任务新对象
+ EventVisitingTasksDO visitingTasksDO = new EventVisitingTasksDO();
+ visitingTasksDO.setGridId(oldVisitingTasksDO.getGridId());
+ visitingTasksDO.setGridMemberCommunity(oldVisitingTasksDO.getGridMemberCommunity());
+ visitingTasksDO.setGridMemberStreet(oldVisitingTasksDO.getGridMemberStreet());
+ visitingTasksDO.setVisiterId(oldVisitingTasksDO.getVisiterId());
+ visitingTasksDO.setVisiterName(oldVisitingTasksDO.getVisiterName());
+ visitingTasksDO.setVisiterSex(oldVisitingTasksDO.getVisiterSex());
+ visitingTasksDO.setVisiterTele(oldVisitingTasksDO.getVisiterTele());
+ visitingTasksDO.setVisiterAddress(oldVisitingTasksDO.getVisiterAddress());
+ visitingTasksDO.setVisiterType(0);
+ visitingTasksDO.setActOpara(0);
+ visitingTasksDO.setHappentLatLng(oldVisitingTasksDO.getHappentLatLng());
+ visitingTasksDO.setEventStatus(EventTasksStatusEnum.DZF.getCode());
+ visitingTasksDO.setReporting(0);
+ visitingTasksDO.setInvalid(false);
+ visitingTasksDO.setUrgent(false);
+ visitingTasksDO.setUrgentDell(false);
+ visitingTasksDO.setCreateBy(oldVisitingTasksDO.getCreateBy());
+ visitingTasksDO.setOutOrLocal(oldVisitingTasksDO.getOutOrLocal());
+ if(oldVisitingTasksDO.getTableContentJson() != null){
+ visitingTasksDO.setTableContentJson(oldVisitingTasksDO.getTableContentJson());
+ }
+ return visitingTasksDO;
+ }
+
}
--
Gitblit v1.7.1