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

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/job/business/CurrentDayAllQuotaJob.java

@@ -178,6 +178,8 @@ public class CurrentDayAllQuotaJob implements Job {
        quartzJobLog.setJobEndTime(new Date());
        quartzJobLogDao.save(quartzJobLog);
        initCurrentExpire();//初始化生命周期
        for (String key :RedisStorage.keys){
            redisTemplate.expire(key, Integer.valueOf(currentExpire), TimeUnit.HOURS);//2小时过期
        }
@@ -190,6 +192,24 @@ public class CurrentDayAllQuotaJob implements Job {
        redisTemplate.opsForValue().set("quota:timeKey",RedisStorage.timeKey);
    }
    private void initCurrentExpire() {
        try{
            if(StringUtils.isEmpty(currentExpire)){
                currentExpire="2";//默认是2小时
            }
            if(!org.apache.commons.lang.StringUtils.isNumeric(currentExpire)){
                currentExpire="2";//默认是2小时
            }else{
                Integer cout =Integer.valueOf(currentExpire);
                if(cout<=0){
                    currentExpire="2";//默认是2小时
                }
            }
        }catch (Exception e){
            currentExpire="2";//默认是2小时
        }
    }
    private void computequota_17(String sql, List<SignFamily> signFamilies, Object o) {
        String quotaId="17";
        try{

patient-co-statistics/src/main/resources/application.yml

@@ -40,7 +40,6 @@ spring:
    # REDIS
  redis:
    database: 0 # Database index used by the connection factory.
    port: 6379 # Redis server port.
    password: # Login password of the redis server.
    timeout: 0 # Connection timeout in milliseconds.
      #sentinel:
@@ -107,6 +106,7 @@ spring:
  redis:
    host: 172.19.103.88
    port: 6379 # Redis server port.
fv:
  jdbc:
@@ -130,7 +130,8 @@ spring:
      password: ssgg
  redis:
      host: 172.19.103.88 # Redis server host.
    host: 172.19.103.88 # Redis server host.
    port: 6379 # Redis server port.
fv:
  jdbc:
    driver: com.mysql.jdbc.Driver
@@ -158,6 +159,7 @@ spring:
  redis:
    host: 120.41.253.95 # Redis server host.
    port: 6380 # Redis server port.
fv:
  jdbc:
@@ -187,6 +189,7 @@ spring:
  redis:
    host: 172.19.103.47 # Redis server host.
    port: 6379 # Redis server port.
fv:
  jdbc: