Merge branch 'dev' of chenweida/patient-co-management into dev

patient-co/patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/dao/QuartzJobConfigDao.java

@@ -18,7 +18,7 @@ public interface QuartzJobConfigDao extends PagingAndSortingRepository<QuartzJob
    @Query(" FROM QuartzJobConfig a WHERE a.status=?1 and a.del='1'")
    List<QuartzJobConfig> findByAll(String s);
    @Query(" FROM QuartzJobConfig a WHERE  a.del='1' ")
    @Query(" FROM QuartzJobConfig a WHERE  a.del='1' and a.id != 11")
    List<QuartzJobConfig> findByIds();
    @Query(" FROM QuartzJobConfig a WHERE a.id=?1 and a.del='1'")

patient-co/patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/etl/mycache/CachePool.java

@@ -262,6 +262,15 @@ public class CachePool {
        diseaseGroup.clear();
        healthGroup.clear();
        serverGroup.clear();
        arriveRenewSignOrgOutMap.clear();
        arriveRenewSignTeamOutMap.clear();
        arriveRenewSignTownOutMap.clear();
        arriveRenewTotalCityMap.clear();
        arriveRenewTotalOrgMap.clear();
        arriveRenewTotalTeamMap.clear();
        arriveRenewTotalTownMap.clear();
        renewDiseaseGroup.clear();;
    }
    public static Map<String, CacheModel> getArriveSignFamilyExpenseStatus1Map() {

patient-co/patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/service/JobService.java

@@ -20,6 +20,8 @@ import com.yihu.wlyy.statistics.model.signfamily.SignFamily;
import com.yihu.wlyy.statistics.vo.WlyyJobConfigVO;
import com.yihu.wlyy.statistics.vo.WlyyQuotaVO;
import org.quartz.SchedulerException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -37,6 +39,8 @@ import java.util.*;
 */
@Service
public class JobService {
    private Logger logger= LoggerFactory.getLogger(JobService.class);
    @Autowired
    private QuartzHelper quartzHelper;
@@ -54,7 +58,7 @@ public class JobService {
    @Autowired
    private CachePool cachePool;
    private Long sleepTime=30000L;
    private Long sleepTime=60000L;
    @Transactional
    public void stopById(String id) throws Exception {
@@ -208,6 +212,7 @@ public class JobService {
            params.put("yesterday", yesterday);
            if (!StringUtils.isEmpty(quartzJobConfig.getJobClass())) {
                quartzHelper.startNow(getRightClass(quartzJobConfig), quartzJobConfig.getId() + UUID.randomUUID().toString().replace("-", ""), params);
                logger.info(quartzJobConfig.getId());
                Thread.sleep(sleepTime);
            }