Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/visit/BaseVisitService.java

@@ -110,7 +110,11 @@ public class BaseVisitService {
        if("1".equals(visitDO.getStatus())){
            return "走访已完成不能修改";
        }
        visitDO.setVisitPlanDate(DateUtil.strToDate(visitPlanDate));
        Date planDate = DateUtil.strToDate(visitPlanDate);
        if(DateUtil.compareDateTime(planDate,new Date())<0){
            return "计划走访日期不能早于当前日期";
        }
        visitDO.setVisitPlanDate(planDate);
        visitDO.setStatus("0");
        baseVisitDao.save(visitDO);
        return null;

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/event/ApplicationEvent.java

@@ -10,6 +10,7 @@ import com.yihu.jw.care.job.message.PatientSendUnreadJob;
import com.yihu.jw.care.job.order.CancelPayOrderJob;
import com.yihu.jw.care.job.order.EmeWarnOrderDayJob;
import com.yihu.jw.care.job.order.EmeWarnOrderJob;
import com.yihu.jw.care.job.visit.OverTimeVistJob;
import com.yihu.jw.care.util.SystemConf;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -113,6 +114,15 @@ public class ApplicationEvent implements ApplicationListener<ContextRefreshedEve
                logger.info("EME_WARNING_OVERTIME_NOT_RESPONSE_DAY exist");
            }
            //#取消订单支付超时的订单，每5分钟执行一次
            if (!quartzHelper.isExistJob("OVERTIME_VISIT_JOB")) {
                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("OVERTIME_VISIT_JOB");
                quartzHelper.addJob(OverTimeVistJob.class, trigger, "OVERTIME_VISIT_JOB", new HashMap<String, Object>());
                logger.info("OVERTIME_VISIT_JOB success");
            } else {
                logger.info("OVERTIME_VISIT_JOB exist");
            }
        } catch (Exception e) {
            logger.info(" job start failed");
        }

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/job/visit/OverTimeVistJob.java

@@ -0,0 +1,48 @@
package com.yihu.jw.care.job.visit;
import com.yihu.jw.care.job.consult.FinishConsultJob;
import com.yihu.jw.entity.care.doorCoach.BaseDoorCoachOrderDO;
import com.yihu.jw.entity.care.lifeCare.LifeCareOrderDO;
import com.yihu.jw.entity.care.visit.BaseVisitDO;
import com.yihu.jw.entity.order.BusinessOrderDO;
import com.yihu.jw.util.date.DateUtil;
import org.quartz.DisallowConcurrentExecution;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
 * 每5分钟执行一次 过期超时的日常走访
 * Created by yeshijie on 2021/11/15.
 */
@DisallowConcurrentExecution//解决执行频率和间隔时间的问题。到了执行时间点前一任务还在执行中，不会执行下一次任务，直至该次任务完成
public class OverTimeVistJob implements Job {
    private static Logger logger = LoggerFactory.getLogger(OverTimeVistJob.class);
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Override
    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
        Long nowTime = System.currentTimeMillis();
        logger.info("OverTimeVistJob start 过期超时的日常走访JOb开始----截至支付时间："+nowTime);
        try {
            String now = DateUtil.getStringDate();
            String sql = "update base_visit set status ='2' WHERE `status` = 0 and visit_plan_date<='"+now+"'";
            jdbcTemplate.execute(sql);
        }catch (Exception e){
            e.printStackTrace();
        }
        logger.info("OverTimeVistJob end 过期超时的日常走访JOb结束----");
    }
}

svr/svr-cloud-job/src/main/resources/system.properties

@@ -14,6 +14,9 @@ BIRTHDAY_REMINDER_JOB=0 0 9 * * ?
#\u53D6\u6D88\u8BA2\u5355\u652F\u4ED8\u8D85\u65F6\u7684\u8BA2\u5355\uFF0C\u6BCF3\u5206\u949F\u6267\u884C\u4E00\u6B21
CANCEL_PAY_ORDER_OVERTIME_JOB=0 0/3 * * * ?
#\u8FC7\u671F\u8D85\u65F6\u7684\u65E5\u5E38\u8D70\u8BBF\uFF0C\u6BCF5\u5206\u949F\u6267\u884C\u4E00\u6B21
OVERTIME_VISIT_JOB=0 0/5 * * * ?
#\u5C45\u6C11\u7D27\u6025\u8054\u7CFB\u4EBA\u6570\u636E\u540C\u6B65\u66F4\u65B0\u6BCF2\u5206\u949F\u6267\u884C\u4E00\u6B21
PATIENT_SOS_CONTACTS_JOB=0 0/2 * * * ?