|
|
@ -1,349 +1,3 @@ |
|
|
<<<<<<< HEAD |
|
|
|
|
|
//package com.acupuncture.web.controller.web;
|
|
|
|
|
|
//
|
|
|
|
|
|
//import cn.hutool.core.bean.BeanUtil;
|
|
|
|
|
|
//import cn.hutool.core.collection.CollectionUtil;
|
|
|
|
|
|
//import cn.hutool.core.date.DateUtil;
|
|
|
|
|
|
//import cn.hutool.core.util.IdUtil;
|
|
|
|
|
|
//import com.acupuncture.common.annotation.Anonymous;
|
|
|
|
|
|
//import com.acupuncture.common.core.redis.RedisCache;
|
|
|
|
|
|
//import com.acupuncture.framework.datasource.DynamicDataSourceContextHolder;
|
|
|
|
|
|
//import com.acupuncture.system.domain.dto.FmsFollowupDto;
|
|
|
|
|
|
//import com.acupuncture.system.domain.po.FmsFollowupTask;
|
|
|
|
|
|
//import com.acupuncture.system.domain.po.FmsFollowupTaskExample;
|
|
|
|
|
|
//import com.acupuncture.system.domain.po.FmsPatientQueueRelation;
|
|
|
|
|
|
//import com.acupuncture.system.domain.vo.FmsFollowupVo;
|
|
|
|
|
|
//import com.acupuncture.system.domain.vo.UmsDataSourceVo;
|
|
|
|
|
|
//import com.acupuncture.system.persist.dao.FmsFollowupDao;
|
|
|
|
|
|
//import com.acupuncture.system.persist.dao.UmsDataSourceDao;
|
|
|
|
|
|
//import com.acupuncture.system.persist.mapper.FmsFollowupTaskMapper;
|
|
|
|
|
|
//import com.acupuncture.system.persist.mapper.FmsPatientQueueRelationMapper;
|
|
|
|
|
|
//import com.acupuncture.system.service.FmsFollowupQueueService;
|
|
|
|
|
|
//import com.acupuncture.system.service.FmsFollowupService;
|
|
|
|
|
|
//import io.swagger.annotations.Api;
|
|
|
|
|
|
//import io.swagger.annotations.ApiOperation;
|
|
|
|
|
|
//import lombok.Data;
|
|
|
|
|
|
//import lombok.extern.slf4j.Slf4j;
|
|
|
|
|
|
//import org.apache.catalina.connector.Response;
|
|
|
|
|
|
//import org.quartz.TriggerUtils;
|
|
|
|
|
|
//import org.quartz.impl.triggers.CronTriggerImpl;
|
|
|
|
|
|
//import org.quartz.spi.OperableTrigger;
|
|
|
|
|
|
//import org.springframework.scheduling.annotation.Scheduled;
|
|
|
|
|
|
//import org.springframework.transaction.annotation.Propagation;
|
|
|
|
|
|
//import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
//import org.springframework.web.bind.annotation.PostMapping;
|
|
|
|
|
|
//import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
|
|
|
//import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
//
|
|
|
|
|
|
//import javax.annotation.Resource;
|
|
|
|
|
|
//import javax.servlet.http.HttpServletRequest;
|
|
|
|
|
|
//import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
//import java.util.*;
|
|
|
|
|
|
//import java.util.regex.Matcher;
|
|
|
|
|
|
//import java.util.regex.Pattern;
|
|
|
|
|
|
//
|
|
|
|
|
|
///**
|
|
|
|
|
|
// * @Author zzc
|
|
|
|
|
|
// * @Package com.acupuncture.web.controller.web
|
|
|
|
|
|
// * @Date 2025/2/13 8:50
|
|
|
|
|
|
// * @description:
|
|
|
|
|
|
// */
|
|
|
|
|
|
//@Slf4j
|
|
|
|
|
|
//@Api(tags = "定时任务相关")
|
|
|
|
|
|
//@RestController
|
|
|
|
|
|
//@RequestMapping("/task")
|
|
|
|
|
|
//@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
|
|
|
|
|
|
//public class TaskController {
|
|
|
|
|
|
//
|
|
|
|
|
|
// @Resource
|
|
|
|
|
|
// private FmsFollowupDao fmsFollowupDao;
|
|
|
|
|
|
// @Resource
|
|
|
|
|
|
// private FmsFollowupService fmsFollowupService;
|
|
|
|
|
|
// @Resource
|
|
|
|
|
|
// private FmsFollowupTaskMapper fmsFollowupTaskMapper;
|
|
|
|
|
|
// @Resource
|
|
|
|
|
|
// private UmsDataSourceDao umsDataSourceDao;
|
|
|
|
|
|
// @Resource
|
|
|
|
|
|
// private RedisCache redisCache;
|
|
|
|
|
|
// @Resource
|
|
|
|
|
|
// private FmsFollowupQueueService fmsFollowupQueueService;
|
|
|
|
|
|
//
|
|
|
|
|
|
// @ApiOperation("定时任务添加随访工单")
|
|
|
|
|
|
// @PostMapping("/task")
|
|
|
|
|
|
// @Scheduled(fixedDelay = 10000)
|
|
|
|
|
|
// @Anonymous
|
|
|
|
|
|
// public void task() {
|
|
|
|
|
|
// // TODO 生成工单第一次生成之后2周的，往后只生成之后一周。第一次随访时间： （ 患者的出院时间 - 7 + 轮次时间） 到 （患者的出院时间 + 7 + 轮次时间 ）
|
|
|
|
|
|
// //查询租户，根据租户循环切换数据源，定时处理所有医院的随访工单
|
|
|
|
|
|
//// UmsDataSourceVo.Result result1 = new UmsDataSourceVo.Result();
|
|
|
|
|
|
//// result1.setDataSourceKey("MASTER");
|
|
|
|
|
|
//// changeDataSource(result1);
|
|
|
|
|
|
//// List<UmsDataSourceVo.Result> query = umsDataSourceDao.query(null);
|
|
|
|
|
|
//// if (CollectionUtil.isEmpty(query)) {
|
|
|
|
|
|
//// return;
|
|
|
|
|
|
//// }
|
|
|
|
|
|
// //查询公共队列
|
|
|
|
|
|
// List<Object> queueResults = redisCache.getCacheList("common_followup_queue");
|
|
|
|
|
|
// List<FmsFollowupVo.FollowupQueueVO> followupQueueVOS = new ArrayList<>();
|
|
|
|
|
|
// if (CollectionUtil.isEmpty(queueResults)) {
|
|
|
|
|
|
//
|
|
|
|
|
|
// followupQueueVOS = fmsFollowupQueueService.queryCommonQueue(null);
|
|
|
|
|
|
// }
|
|
|
|
|
|
//// List<FmsFollowupVo.FollowupQueueVO> queueResults = fmsFollowupDao.queryCommonQueue(null);
|
|
|
|
|
|
// //切换数据源
|
|
|
|
|
|
//// for (UmsDataSourceVo.Result result : query) {
|
|
|
|
|
|
//// if ("MASTER".equals(result.getDataSourceKey()) || "PROD_YY".equals(result.getDataSourceKey())) {
|
|
|
|
|
|
//// continue;
|
|
|
|
|
|
//// }
|
|
|
|
|
|
//// changeDataSource(result);
|
|
|
|
|
|
// {
|
|
|
|
|
|
// //获取随访患者列表，根据患者出院日时间和队列添加工单
|
|
|
|
|
|
// //1. 查询队列
|
|
|
|
|
|
// List<FmsFollowupVo.FollowupQueueVO> queueList = fmsFollowupDao.selectQueueList(null, null, null, null);
|
|
|
|
|
|
//
|
|
|
|
|
|
// if (CollectionUtil.isEmpty(queueList)) {
|
|
|
|
|
|
// if (CollectionUtil.isEmpty(queueResults)) {
|
|
|
|
|
|
// queueList = followupQueueVOS;
|
|
|
|
|
|
// }
|
|
|
|
|
|
// } else {
|
|
|
|
|
|
// if (CollectionUtil.isEmpty(queueResults)) {
|
|
|
|
|
|
// queueList.addAll(followupQueueVOS);
|
|
|
|
|
|
// }
|
|
|
|
|
|
// }
|
|
|
|
|
|
// for (FmsFollowupVo.FollowupQueueVO followupQueueVO : queueList) {
|
|
|
|
|
|
// Integer followWindowAdys = followupQueueVO.getFollowWindowAdys();
|
|
|
|
|
|
//
|
|
|
|
|
|
// //2. 查询队列随访患者列表
|
|
|
|
|
|
//// changeDataSource(result);
|
|
|
|
|
|
// FmsFollowupDto.FollowupPatientQueryDTO followupPatientQueryDTO = new FmsFollowupDto.FollowupPatientQueryDTO();
|
|
|
|
|
|
// followupPatientQueryDTO.setQueueId(followupQueueVO.getId());
|
|
|
|
|
|
// followupPatientQueryDTO.setTenantId(followupQueueVO.getTenantId());
|
|
|
|
|
|
//// changeDataSource(result);
|
|
|
|
|
|
// List<FmsFollowupVo.FollowupPatient> patientList = fmsFollowupService.queryTaskPatient(followupPatientQueryDTO);
|
|
|
|
|
|
//// List<FmsFollowupVo.FollowupPatient> patientList = fmsFollowupDao.queryPatient(followupQueueVO.getId(), null, null);
|
|
|
|
|
|
// if (CollectionUtil.isEmpty(patientList)) {
|
|
|
|
|
|
// continue;
|
|
|
|
|
|
// }
|
|
|
|
|
|
// //随访总月数
|
|
|
|
|
|
// Integer followupMonth = followupQueueVO.getFollowupMonth();
|
|
|
|
|
|
// for (FmsFollowupVo.FollowupPatient followupPatient : patientList) {
|
|
|
|
|
|
// //获取随访到期时间 出院时间+随访总月数 = 到期时间
|
|
|
|
|
|
// Calendar calendar = Calendar.getInstance();
|
|
|
|
|
|
// calendar.setTime(followupPatient.getDischargeTime());
|
|
|
|
|
|
// calendar.set(Calendar.MONTH, followupMonth);
|
|
|
|
|
|
// Date time = calendar.getTime();
|
|
|
|
|
|
//
|
|
|
|
|
|
// //获取队列信息
|
|
|
|
|
|
// String frequency = followupQueueVO.getFrequency();
|
|
|
|
|
|
// List<Date> dateList = new ArrayList<>();
|
|
|
|
|
|
// try {
|
|
|
|
|
|
// CronTriggerImpl cronTrigger = new CronTriggerImpl();
|
|
|
|
|
|
// cronTrigger.setCronExpression(frequency);
|
|
|
|
|
|
// //TriggerUtils.computeFireTimesBetween(要计算触发时间的触发器对象, 用于计算触发时间的日历对象, 计算触发时间的起始时间点, 计算触发时间的结束时间点);
|
|
|
|
|
|
// dateList = TriggerUtils.computeFireTimesBetween(cronTrigger, null, followupPatient.getDischargeTime(), time);
|
|
|
|
|
|
// if (CollectionUtil.isEmpty(dateList)) {
|
|
|
|
|
|
// continue;
|
|
|
|
|
|
// }
|
|
|
|
|
|
// } catch (Exception e) {
|
|
|
|
|
|
// e.printStackTrace();
|
|
|
|
|
|
// }
|
|
|
|
|
|
// //3. 判断随访类型
|
|
|
|
|
|
// if (followupQueueVO.getFollowupType() == 0) {
|
|
|
|
|
|
// //单次
|
|
|
|
|
|
// //判断是否已有该次随访
|
|
|
|
|
|
// FmsFollowupTaskExample fmsFollowupTaskExample = new FmsFollowupTaskExample();
|
|
|
|
|
|
// fmsFollowupTaskExample.createCriteria().andTimesEqualTo(1).andPatientIdEqualTo(followupPatient.getPatientId()).andQueueIdEqualTo(followupQueueVO.getId());
|
|
|
|
|
|
// List<FmsFollowupTask> fmsFollowupTasks = fmsFollowupTaskMapper.selectByExample(fmsFollowupTaskExample);
|
|
|
|
|
|
// if (CollectionUtil.isNotEmpty(fmsFollowupTasks)) {
|
|
|
|
|
|
// continue;
|
|
|
|
|
|
// }
|
|
|
|
|
|
// FmsFollowupTask fmsFollowupTask = new FmsFollowupTask();
|
|
|
|
|
|
// BeanUtil.copyProperties(followupQueueVO, fmsFollowupTask);
|
|
|
|
|
|
// fmsFollowupTask.setId(IdUtil.getSnowflakeNextId());
|
|
|
|
|
|
// fmsFollowupTask.setName(followupPatient.getName());
|
|
|
|
|
|
// fmsFollowupTask.setPinyinFull(followupPatient.getPinyinFull());
|
|
|
|
|
|
// fmsFollowupTask.setPinyinSimple(followupPatient.getPinyinSimple());
|
|
|
|
|
|
// fmsFollowupTask.setGender(followupPatient.getGender());
|
|
|
|
|
|
// if (followupPatient.getBirthDate() != null) {
|
|
|
|
|
|
// fmsFollowupTask.setAge(DateUtil.age(followupPatient.getBirthDate(), new Date()));
|
|
|
|
|
|
// }
|
|
|
|
|
|
// fmsFollowupTask.setEthnicity(followupPatient.getEthnicity());
|
|
|
|
|
|
// fmsFollowupTask.setEducationYears(followupPatient.getEducationYears());
|
|
|
|
|
|
// fmsFollowupTask.setPhone(followupPatient.getPhone());
|
|
|
|
|
|
// fmsFollowupTask.setTenantId(followupPatient.getTenantId());
|
|
|
|
|
|
// fmsFollowupTask.setIdCardType(followupPatient.getIdCardType());
|
|
|
|
|
|
// fmsFollowupTask.setIdCard(followupPatient.getIdCard());
|
|
|
|
|
|
// fmsFollowupTask.setTimes(1);
|
|
|
|
|
|
// fmsFollowupTask.setQueueId(followupQueueVO.getId());
|
|
|
|
|
|
// fmsFollowupTask.setPatientId(followupPatient.getId());
|
|
|
|
|
|
// fmsFollowupTask.setEducationYears(followupPatient.getEducationYears());
|
|
|
|
|
|
// fmsFollowupTask.setDelFlag((byte) 0);
|
|
|
|
|
|
// fmsFollowupTask.setCreateTime(new Date());
|
|
|
|
|
|
// fmsFollowupTask.setStatus((byte) 0);
|
|
|
|
|
|
//
|
|
|
|
|
|
// //计算第一次随访的时间
|
|
|
|
|
|
// DateComparator dateComparator = getDate(dateList);
|
|
|
|
|
|
// if (dateComparator.getDate() != null) {
|
|
|
|
|
|
// fmsFollowupTask.setStartTime(dateComparator.getDate());
|
|
|
|
|
|
// } else {
|
|
|
|
|
|
// Calendar instance = Calendar.getInstance();
|
|
|
|
|
|
// instance.setTime(dateList.get(0));
|
|
|
|
|
|
// instance.add(Calendar.DATE, -followWindowAdys / 2);
|
|
|
|
|
|
// fmsFollowupTask.setStartTime(instance.getTime());
|
|
|
|
|
|
// }
|
|
|
|
|
|
// Calendar instance1 = Calendar.getInstance();
|
|
|
|
|
|
// instance1.setTime(dateList.get(0));
|
|
|
|
|
|
// instance1.add(Calendar.DATE, followWindowAdys / 2);
|
|
|
|
|
|
// fmsFollowupTask.setEndTime(instance1.getTime());
|
|
|
|
|
|
// fmsFollowupTask.setFollowuper(followupQueueVO.getPersonInCharge());
|
|
|
|
|
|
// fmsFollowupTask.setFollowupTime(dateList.get(0));
|
|
|
|
|
|
//// changeDataSource(result);
|
|
|
|
|
|
// fmsFollowupTaskMapper.insertSelective(fmsFollowupTask);
|
|
|
|
|
|
//
|
|
|
|
|
|
// } else {
|
|
|
|
|
|
// //周期
|
|
|
|
|
|
// //4. 根据频次和总月数添加
|
|
|
|
|
|
// DateComparator dateComparator = getDate(dateList);
|
|
|
|
|
|
// if (dateComparator.getDate() == null || dateComparator.getIndex() == null) {
|
|
|
|
|
|
// continue;
|
|
|
|
|
|
// }
|
|
|
|
|
|
// Date date = dateComparator.getDate();
|
|
|
|
|
|
// Integer index = dateComparator.getIndex();
|
|
|
|
|
|
//
|
|
|
|
|
|
// //判断是否已有该次随访
|
|
|
|
|
|
// FmsFollowupTaskExample fmsFollowupTaskExample = new FmsFollowupTaskExample();
|
|
|
|
|
|
// fmsFollowupTaskExample.createCriteria().andTimesEqualTo(index).andPatientIdEqualTo(followupPatient.getPatientId()).andQueueIdEqualTo(followupQueueVO.getId());
|
|
|
|
|
|
// List<FmsFollowupTask> fmsFollowupTasks = fmsFollowupTaskMapper.selectByExample(fmsFollowupTaskExample);
|
|
|
|
|
|
// if (CollectionUtil.isNotEmpty(fmsFollowupTasks)) {
|
|
|
|
|
|
// continue;
|
|
|
|
|
|
// }
|
|
|
|
|
|
//
|
|
|
|
|
|
// FmsFollowupTask fmsFollowupTask = new FmsFollowupTask();
|
|
|
|
|
|
// BeanUtil.copyProperties(followupQueueVO, fmsFollowupTask);
|
|
|
|
|
|
// fmsFollowupTask.setId(IdUtil.getSnowflakeNextId());
|
|
|
|
|
|
// fmsFollowupTask.setName(followupPatient.getName());
|
|
|
|
|
|
// fmsFollowupTask.setPinyinFull(followupPatient.getPinyinFull());
|
|
|
|
|
|
// fmsFollowupTask.setPinyinSimple(followupPatient.getPinyinSimple());
|
|
|
|
|
|
// fmsFollowupTask.setGender(followupPatient.getGender());
|
|
|
|
|
|
// if (followupPatient.getBirthDate() != null) {
|
|
|
|
|
|
// fmsFollowupTask.setAge(DateUtil.age(followupPatient.getBirthDate(), new Date()));
|
|
|
|
|
|
// }
|
|
|
|
|
|
// fmsFollowupTask.setEthnicity(followupPatient.getEthnicity());
|
|
|
|
|
|
// fmsFollowupTask.setEducationYears(followupPatient.getEducationYears());
|
|
|
|
|
|
// fmsFollowupTask.setTimes(index);
|
|
|
|
|
|
// fmsFollowupTask.setPhone(followupPatient.getPhone());
|
|
|
|
|
|
// fmsFollowupTask.setTenantId(followupPatient.getTenantId());
|
|
|
|
|
|
// fmsFollowupTask.setIdCardType(followupPatient.getIdCardType());
|
|
|
|
|
|
// fmsFollowupTask.setIdCard(followupPatient.getIdCard());
|
|
|
|
|
|
// fmsFollowupTask.setId(IdUtil.getSnowflakeNextId());
|
|
|
|
|
|
// fmsFollowupTask.setQueueId(followupQueueVO.getId());
|
|
|
|
|
|
// fmsFollowupTask.setDelFlag((byte) 0);
|
|
|
|
|
|
// fmsFollowupTask.setCreateTime(new Date());
|
|
|
|
|
|
// fmsFollowupTask.setEducationYears(followupPatient.getEducationYears());
|
|
|
|
|
|
// fmsFollowupTask.setStatus((byte) 0);
|
|
|
|
|
|
//
|
|
|
|
|
|
// fmsFollowupTask.setStartTime(date);
|
|
|
|
|
|
// Calendar instance = Calendar.getInstance();
|
|
|
|
|
|
// instance.setTime(date);
|
|
|
|
|
|
// instance.add(Calendar.DATE, followWindowAdys / 2);
|
|
|
|
|
|
//
|
|
|
|
|
|
// fmsFollowupTask.setEndTime(instance.getTime());
|
|
|
|
|
|
//// changeDataSource(result);
|
|
|
|
|
|
// fmsFollowupTask.setPatientId(followupPatient.getId());
|
|
|
|
|
|
// fmsFollowupTaskMapper.insertSelective(fmsFollowupTask);
|
|
|
|
|
|
// }
|
|
|
|
|
|
// }
|
|
|
|
|
|
// }
|
|
|
|
|
|
// }
|
|
|
|
|
|
// }
|
|
|
|
|
|
//
|
|
|
|
|
|
// private static void changeDataSource(UmsDataSourceVo.Result result) {
|
|
|
|
|
|
// try {
|
|
|
|
|
|
// DynamicDataSourceContextHolder.setDataSourceType(result.getDataSourceKey());
|
|
|
|
|
|
// } finally {
|
|
|
|
|
|
// DynamicDataSourceContextHolder.clearDataSourceType();
|
|
|
|
|
|
// }
|
|
|
|
|
|
// }
|
|
|
|
|
|
//
|
|
|
|
|
|
// public String getName(String url) {
|
|
|
|
|
|
// Pattern pattern = Pattern.compile("jdbc:mysql://[^/]+/([^?]+)");
|
|
|
|
|
|
// Matcher matcher = pattern.matcher(url);
|
|
|
|
|
|
// if (matcher.find()) {
|
|
|
|
|
|
// String dbName = matcher.group(1); // 输出 acupuncture_yfyy
|
|
|
|
|
|
// System.out.println("数据库名称: " + dbName);
|
|
|
|
|
|
// return dbName;
|
|
|
|
|
|
// }
|
|
|
|
|
|
// return "";
|
|
|
|
|
|
// }
|
|
|
|
|
|
//
|
|
|
|
|
|
// /**
|
|
|
|
|
|
// * 法用于计算在指定时间范围内触发器的触发时间点。具体步骤如下：
|
|
|
|
|
|
// * 初始化一个空列表 lst 存储触发时间点。
|
|
|
|
|
|
// * 克隆传入的触发器 trigg，并检查其下一个触发时间是否为空。如果为空，则设置开始时间和结束时间，并计算首次触发时间。
|
|
|
|
|
|
// * 使用 while 循环遍历触发器的触发时间点，直到没有更多触发时间或超出指定范围。
|
|
|
|
|
|
// * 如果触发时间在指定范围内，则将其添加到列表中，并更新触发器状态。
|
|
|
|
|
|
// *
|
|
|
|
|
|
// * @param trigg cron表达式
|
|
|
|
|
|
// * @param from 患者出院时间
|
|
|
|
|
|
// * @param to 患者出院时间 + 随访总月数
|
|
|
|
|
|
// * @return
|
|
|
|
|
|
// */
|
|
|
|
|
|
// public static List<Date> computeFireTimesBetween(OperableTrigger trigg, org.quartz.Calendar cal, Date from, Date to) {
|
|
|
|
|
|
// LinkedList<Date> lst = new LinkedList();
|
|
|
|
|
|
// OperableTrigger t = (OperableTrigger) trigg.clone();
|
|
|
|
|
|
// if (t.getNextFireTime() == null) {
|
|
|
|
|
|
// t.setStartTime(from);
|
|
|
|
|
|
// t.setEndTime(to);
|
|
|
|
|
|
// t.computeFirstFireTime(cal);
|
|
|
|
|
|
// }
|
|
|
|
|
|
//
|
|
|
|
|
|
// while (true) {
|
|
|
|
|
|
// Date d = t.getNextFireTime();
|
|
|
|
|
|
// if (d == null) {
|
|
|
|
|
|
// break;
|
|
|
|
|
|
// }
|
|
|
|
|
|
//
|
|
|
|
|
|
// if (d.before(from)) {
|
|
|
|
|
|
// t.triggered(cal);
|
|
|
|
|
|
// } else {
|
|
|
|
|
|
// if (d.after(to)) {
|
|
|
|
|
|
// break;
|
|
|
|
|
|
// }
|
|
|
|
|
|
// lst.add(d);
|
|
|
|
|
|
// t.triggered(cal);
|
|
|
|
|
|
// }
|
|
|
|
|
|
// }
|
|
|
|
|
|
// return Collections.unmodifiableList(lst);
|
|
|
|
|
|
// }
|
|
|
|
|
|
//
|
|
|
|
|
|
// /**
|
|
|
|
|
|
// * 返回当前时间之后的第一个date及对应顺序
|
|
|
|
|
|
// *
|
|
|
|
|
|
// * @param dateList key 为顺序，value 为时间
|
|
|
|
|
|
// * @return
|
|
|
|
|
|
// */
|
|
|
|
|
|
// public static DateComparator getDate(List<Date> dateList) {
|
|
|
|
|
|
// Date today = new Date();
|
|
|
|
|
|
// DateComparator dateComparator = new DateComparator();
|
|
|
|
|
|
// for (int i = 0; i < dateList.size(); i++) {
|
|
|
|
|
|
// Date date = dateList.get(i);
|
|
|
|
|
|
// if (date.after(today)) {
|
|
|
|
|
|
// dateComparator.setDate(date);
|
|
|
|
|
|
// dateComparator.setIndex(i + 1);
|
|
|
|
|
|
// return dateComparator;
|
|
|
|
|
|
// }
|
|
|
|
|
|
// }
|
|
|
|
|
|
// return dateComparator;
|
|
|
|
|
|
// }
|
|
|
|
|
|
//
|
|
|
|
|
|
// @Data
|
|
|
|
|
|
// public static class DateComparator {
|
|
|
|
|
|
// private Date date;
|
|
|
|
|
|
// private Integer index;
|
|
|
|
|
|
// }
|
|
|
|
|
|
//}
|
|
|
|
|
|
======= |
|
|
|
|
|
>>>>>>> new |
|
|
|
|
|
package com.acupuncture.web.task; |
|
|
package com.acupuncture.web.task; |
|
|
|
|
|
|
|
|
import cn.hutool.core.bean.BeanUtil; |
|
|
import cn.hutool.core.bean.BeanUtil; |
|
|
|
ccsens_zhengzhichuan
3 weeks ago