Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

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

@@ -20,6 +20,8 @@ import com.yihu.wlyy.util.MapListUtils;
import com.yihu.wlyy.util.SystemConf;
import org.json.JSONArray;
import org.json.JSONObject;
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.data.redis.core.StringRedisTemplate;
@@ -39,6 +41,8 @@ import java.util.*;
 */
@Service
public class StatisticsService extends BaseService {
    private Logger logger= LoggerFactory.getLogger(StatisticsService.class);
    @Autowired
    CityDao cityDao;
    @Autowired
@@ -4235,6 +4239,9 @@ public class StatisticsService extends BaseService {
    private int getLevel1NumForRedis(String index, String level, String code, String timeKey) {
        String key37 = "quota:" + index + ":" + level + ":" + code + ":" + timeKey;
        JSONObject switchJo = new JSONObject(redisTemplate.opsForValue().get(key37));
        logger.info(key37);
        logger.info(redisTemplate==null?"true":"false");
        logger.info(switchJo.toString());
        return switchJo.getInt("num");
    }

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

@@ -198,13 +198,11 @@ spring:
      password: jkzlehr@123
    health:
      url: jdbc:mysql://59.61.92.90:8079/device?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#      username: wlyy
#      password: jkzlehr@321465
      username: wlyy
      password: jkzlehr@123
  redis:
    host: 27.155.101.77 # Redis server host.
    host: 120.41.253.95 # Redis server host.
    port: 6380 # Redis server port.
    password: jkzl_ehr