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

svr/svr-cloud-job/pom.xml

@@ -118,6 +118,17 @@
            <artifactId>elasticsearch</artifactId>
            <version>2.4.4</version>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>im-service</artifactId>
            <version>2.0.0</version>
            <exclusions>
                <exclusion>
                    <groupId>xalan</groupId>
                    <artifactId>xalan</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
    </dependencies>

svr/svr-cloud-job/src/main/java/com.yihu/CloudApplicationJob.java

@@ -5,12 +5,14 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.support.SpringBootServletInitializer;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.scheduling.annotation.EnableScheduling;
/**
 * Created by yeshijie on 2021/5/28.
 */
@SpringBootApplication
@EnableJpaAuditing
@EnableScheduling
public class CloudApplicationJob extends SpringBootServletInitializer {
    public static void main(String[] args)  {

svr/svr-cloud-job/src/main/java/com.yihu/jw.care/job/message/DoctorSendUnreadJob.java

@@ -1,18 +1,15 @@
package com.yihu.jw.care.job.message;
import com.yihu.jw.care.util.MessageUtil;
import com.yihu.jw.care.util.http.HttpUtils;
import com.yihu.jw.im.util.ImUtil;
import com.yihu.jw.util.common.MobileUtils;
import org.apache.commons.lang3.StringUtils;
import org.aspectj.apache.bcel.classfile.annotation.NameValuePair;
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.beans.factory.annotation.Value;
import org.springframework.jdbc.core.JdbcTemplate;
import java.util.List;
@@ -35,7 +32,7 @@ public class DoctorSendUnreadJob implements Job {
    @Override
    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
        logger.info("DoctorSendUnreadJob start.....");
        String sql = " select id,name,mobile from base_doctor where del=1  and mobile is not null  ";
        String sql = " select id,name,mobile from base_doctor where del=1 and id ='4028030c796376b801796380a2b50003' and mobile is not null  ";
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
        for (Map<String,Object> tmp:list){
            String mobile = tmp.get("mobile").toString();

svr/svr-cloud-job/src/main/java/com.yihu/jw.care/job/message/PatientSendUnreadJob.java

@@ -43,7 +43,7 @@ public class PatientSendUnreadJob implements Job {
    public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException {
        logger.info("PatientSendUnreadJob start.....");
        String sql = "select p.id,p.name,wc.openId from base_patient p INNER JOIN base_patient_wechat wc " +
                " on p.id = wc.patient_id where p.del=1 and wc.wechat_id = '"+wxId+"' GROUP BY p.id ORDER BY wc.create_time desc  ;  ";
                " on p.id = wc.patient_id where p.del=1 and p.id='808080eb7955aa9301795b8bad3f0078' and wc.wechat_id = '"+wxId+"' GROUP BY p.id ORDER BY wc.create_time desc  ;  ";
        List<Map<String,Object>> patientList = jdbcTemplate.queryForList(sql);
        for (Map<String,Object>tmp:patientList) {
            try {

svr/svr-cloud-job/src/main/java/com.yihu/jw.care/web/JobController.java

@@ -1,9 +1,14 @@
package com.yihu.jw.care.web;
import com.yihu.jw.care.job.QuartzHelper;
import com.yihu.jw.care.job.consult.FinishConsultJob;
import com.yihu.jw.care.job.message.DoctorSendUnreadJob;
import com.yihu.jw.care.job.message.PatientSendUnreadJob;
import com.yihu.jw.care.service.JobService;
import com.yihu.jw.care.util.SystemConf;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
@@ -11,6 +16,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
/**
 * 任务启动
 *
@@ -75,33 +82,33 @@ public class JobController extends BaseController {
                quartzHelper.removeJob(taskId);
            }
            switch(taskId){
//                case "data_device_quality_plan_job":
//                    if (!quartzHelper.isExistJob("data_device_quality_plan_job")) {
//                        String trigger = SystemConf.getInstance().getSystemProperties().getProperty("data_device_quality_plan_job");
//                        quartzHelper.addJob(DeviceQualityPlanJob.class, trigger, "data_device_quality_plan_job", new HashMap<String, Object>());
//                        logger.info("data_device_quality_plan_job  job success");
//                    } else {
//                        logger.info("data_device_quality_plan_job  job exist");
//                    }
//                    break;
//                case "data_sim_Balance_remind_job":
//                    if (!quartzHelper.isExistJob("data_sim_Balance_remind_job")) {
//                        String trigger = simBalanceService.getCron();
//                        quartzHelper.addJob(SimBalanceJob.class, trigger, "data_sim_Balance_remind_job", new HashMap<String, Object>());
//                        logger.info("data_sim_Balance_remind_job  job success");
//                    } else {
//                        logger.info("data_sim_Balance_remind_job  job exist");
//                    }
//                    break;
//                case "data_sim_set_meal_job":
//                    if (!quartzHelper.isExistJob("data_sim_set_meal_job")) {
//                        String trigger = simBalanceService.getCron();
//                        quartzHelper.addJob(SimSetMealJob.class, trigger, "data_sim_set_meal_job", new HashMap<String, Object>());
//                        logger.info("data_sim_set_meal_job  job success");
//                    } else {
//                        logger.info("data_sim_set_meal_job  job exist");
//                    }
//                    break;
                case "finish_consult_job":
                    if (!quartzHelper.isExistJob("finish_consult_job")) {
                        String trigger = SystemConf.getInstance().getSystemProperties().getProperty("finish_consult_job");
                        quartzHelper.addJob(FinishConsultJob.class, trigger, "finish_consult_job", new HashMap<String, Object>());
                        logger.info("finish_consult_job success");
                    } else {
                        logger.info("finish_consult_job exist");
                    }
                    break;
                case "DOCTOR_SEND_UNREAD_MES_JOB":
                    if (!quartzHelper.isExistJob("DOCTOR_SEND_UNREAD_MES_JOB")) {
                        String trigger = SystemConf.getInstance().getSystemProperties().getProperty("DOCTOR_SEND_UNREAD_MES_JOB");
                        quartzHelper.addJob(DoctorSendUnreadJob.class, trigger, "DOCTOR_SEND_UNREAD_MES_JOB", new HashMap<String, Object>());
                        logger.info("DOCTOR_SEND_UNREAD_MES_JOB success");
                    } else {
                        logger.info("DOCTOR_SEND_UNREAD_MES_JOB exist");
                    }
                    break;
                case "PATIENT_SEND_UNREAD_MES_JOB":
                    if (!quartzHelper.isExistJob("PATIENT_SEND_UNREAD_MES_JOB")) {
                        String trigger = SystemConf.getInstance().getSystemProperties().getProperty("PATIENT_SEND_UNREAD_MES_JOB");
                        quartzHelper.addJob(PatientSendUnreadJob.class, trigger, "PATIENT_SEND_UNREAD_MES_JOB", new HashMap<String, Object>());
                        logger.info("PATIENT_SEND_UNREAD_MES_JOB success");
                    } else {
                        logger.info("PATIENT_SEND_UNREAD_MES_JOB exist");
                    }
                    break;
                default :
            }
@@ -247,4 +254,18 @@ public class JobController extends BaseController {
            return invalidUserException(e, -1, "启动失败:" + e.getMessage());
        }
    }
    @RequestMapping(value = "/testNow", method = RequestMethod.POST)
    @ApiOperation("立即执行")
    public String executeSignFamilyPayResultJob() {
        try {
            quartzHelper.startNow(FinishConsultJob.class, "finish_consult_job", null);
            quartzHelper.startNow(DoctorSendUnreadJob.class, "DOCTOR_SEND_UNREAD_MES_JOB", null);
            quartzHelper.startNow(PatientSendUnreadJob.class, "PATIENT_SEND_UNREAD_MES_JOB", null);
            return write(200, "启动成功");
        } catch (Exception e) {
            error(e);
            return error(-1, e.getMessage());
        }
    }
}

svr/svr-cloud-job/src/main/resources/application.yml

@@ -80,6 +80,8 @@ im:
  data_base_name: im_internet_hospital
fastDFS:
  fastdfs_file_url: http://172.26.0.110:8888/
wlyy:
  url: http://ehr.yihu.com/wlyy/
wechat:
  id: d24d1367-7f4f-43af-910e-a0a43799e040  # base库中,wx_wechat 的id字段