springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComClusterMemberExcelListen.java
@@ -20,6 +20,8 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; /** @@ -114,6 +116,16 @@ index++; mistakes.add(setErrorObject(oneData,"联系电话不可为空，请填写联系电话")); continue; }else{ //验证手机号正则 String regex = "/^1(3\\d|4[5-9]|5[0-35-9]|6[567]|7[0-8]|8\\d|9[0-35-9])\\d{8}$/"; Pattern pattern = Pattern.compile(regex); Matcher m = pattern.matcher(oneData.get(3)); if(!m.matches()){ index++; mistakes.add(setErrorObject(oneData,"联系电话输入错误，请核对联系电话")); continue; } } vo.setPhone(oneData.get(3)); if (StringUtils.isEmpty(oneData.get(4))) { springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/grid/GridService.java
@@ -1338,4 +1338,11 @@ */ @PostMapping("/statistics/admin/gridMemberStatisticsAll") R gridMemberStatisticsAll(@RequestBody MemberStatisticsAdminDTO statisticsAdminDTO); /** * 定时任务-给上月已走访的人员创建定时任务 * @return 执行结果 */ @PostMapping("/eventvisitingtasks/timedTaskVisitingJobHandler") R timedTaskVisitingJobHandler(); } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/utlis/DateUtils.java
@@ -888,10 +888,12 @@ } public static void main(String[] args) throws Exception { // Date date= new Date(); // Date after = new Date(); // System.out.println(getFirstDayOfMonthString()); // System.out.println(getDayOfMonthString()); Date date= getLastMonthFirst(); Date after = getLastMonthEnd(); System.out.println(date); System.out.println(after); } /** @@ -934,4 +936,30 @@ Date currYearFirst = calendar.getTime(); return currYearFirst; } /** * 获取上月第一天时间 * @return 上月第一天时间 */ public static Date getLastMonthFirst(){ // 上月起始 Calendar lastMonthFirstDateCal = Calendar.getInstance(); lastMonthFirstDateCal.add(Calendar.MONTH,-1); lastMonthFirstDateCal.set(Calendar.DAY_OF_MONTH, 1); String lastMonthFirstTime = yyyyMMdd_format.format(lastMonthFirstDateCal.getTime()) + " 00:00:00"; return stringToDateStandard(lastMonthFirstTime); } /** * 获取上月最后一天时间 * @return 最后一天时间 */ public static Date getLastMonthEnd(){ // 上月末尾 Calendar lastMonthEndDateCal = Calendar.getInstance(); lastMonthEndDateCal.add(Calendar.MONTH,-1); lastMonthEndDateCal.set(Calendar.DAY_OF_MONTH, lastMonthEndDateCal.getActualMaximum(Calendar.DAY_OF_MONTH)); String lastMonthEndTime = yyyyMMdd_format.format(lastMonthEndDateCal.getTime()) + " 23:59:59"; return stringToDateStandard(lastMonthEndTime); } } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComElderAuthRecordsMapper.xml
@@ -39,7 +39,7 @@ ceae.sex, ceae.birthday, ceae.personnel_category, ceae.address, cear.address, ceae.is_alive, cear.auth_method, cear.auth_period, springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComPensionAuthRecordMapper.xml
@@ -37,7 +37,7 @@ cpap.sex, cpap.birthday, cpap.personnel_category, cpap.address, cpar.address, cpap.is_alive, cpar.auth_period, cpar.auth_date, springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/api/EventVisitingTasksApi.java
@@ -247,4 +247,13 @@ Boolean updateLcUploadFlagVisitingTask(@RequestParam("id") Long id) { return eventVisitingTasksService.updateLcUploadFlagVisitingTask(id); } /** * 定时任务-给上月已走访的人员创建定时任务 * @return 执行结果 */ @PostMapping("/timedTaskVisitingJobHandler") public R timedTaskVisitingJobHandler() { return eventVisitingTasksService.timedTaskVisitingJobHandler(); } } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/model/dos/EventVisitingTasksDO.java
@@ -222,4 +222,12 @@ int no = 0; } /** * 走访任务状态（1.待走访 2.已走访） */ public interface eventStatus{ int dzf = 1; int yzf = 2; } } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/EventVisitingTasksService.java
@@ -185,4 +185,10 @@ * @date 2021/6/10 17:00 */ Boolean updateLcUploadFlagVisitingTask(Long id); /** * 定时任务-给上月已走访的人员创建定时任务 * @return 执行结果 */ R timedTaskVisitingJobHandler(); } springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventVisitingTasksServiceImpl.java
@@ -4,6 +4,7 @@ import javax.annotation.Resource; import com.panzhihua.common.utlis.DateUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -590,4 +591,69 @@ return false; } /** * 定时任务-给上月已走访的人员创建定时任务 * @return 执行结果 */ @Override @Transactional(rollbackFor = Exception.class) public R timedTaskVisitingJobHandler(){ //需要创建的走访任务列表 List<EventVisitingTasksDO> saveList = new ArrayList<>(); //获取上月第一天时间 Date lastMonthFirst = DateUtils.getLastMonthFirst(); //获取上月最后一天时间 Date lastMonthEnd = DateUtils.getLastMonthEnd(); //查询上月已走访任务 List<EventVisitingTasksDO> visitingTasksList = this.baseMapper.selectList(new QueryWrapper<EventVisitingTasksDO>().lambda() .eq(EventVisitingTasksDO::getEventStatus,EventVisitingTasksDO.eventStatus.yzf) .ge(EventVisitingTasksDO::getSubmitDate,lastMonthFirst) .le(EventVisitingTasksDO::getSubmitDate,lastMonthEnd)); visitingTasksList.forEach(visitingTask -> { EventVisitingTasksDO visitingTasksDO = dataConversion(visitingTask); saveList.add(visitingTasksDO); }); 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; } } springcloud_k8s_panzhihuazhihuishequ/timejob/src/main/java/com/panzhihua/timejob/jobhandler/GridMemberJobHandler.java
@@ -28,4 +28,12 @@ log.info("执行结果【{}】", r.toString()); return ReturnT.SUCCESS; } @XxlJob("timedTaskVisitingJobHandler") public ReturnT<String> timedTaskVisitingJobHandler(String param) throws Exception { log.info("定时任务给上月已走访人员创建走访任务"); R r = gridService.timedTaskVisitingJobHandler(); log.info("执行结果【{}】", r.toString()); return ReturnT.SUCCESS; } }
