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

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/etl/extract/DBPageExtract.java

@@ -91,7 +91,7 @@ public class DBPageExtract<T> {
     * @param pageSize
     * @return
     */
    private List<T> MultiThreadExtract(Class<T> clazz, String sql,String countSql, int pageSize)  {
    private   List<T> MultiThreadExtract(Class<T> clazz, String sql,String countSql, int pageSize)  {
        try{
            //得到数据的总数
            Integer dataCount=getCount(countSql);

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

@@ -95,6 +95,10 @@ public class CurrentDayAllQuotaJob implements Job {
    String fv_jdbc_username;
    @Value("${fv.jdbc.password}")
    String fv_jdbc_password;
    @Value("${redis.quota.current.expire}")
    Integer currentExpire=2;
    @Override
    public void execute(JobExecutionContext context)
            throws JobExecutionException {
@@ -167,7 +171,7 @@ public class CurrentDayAllQuotaJob implements Job {
        quartzJobLog.setJobEndTime(new Date());
        quartzJobLogDao.save(quartzJobLog);
        for (String key :RedisStorage.keys){
            redisTemplate.expire(key, 1, TimeUnit.HOURS);//1小时过期
            redisTemplate.expire(key, currentExpire, TimeUnit.HOURS);//2小时过期
        }
        RedisStorage.keys.clear();//清空Key

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

@@ -53,6 +53,10 @@ spring:
      max-wait: -1 # Maximum amount of time (in milliseconds) a connection allocation should block before throwing an exception when the pool is exhausted. Use a negative value to block indefinitely.
      min-idle: 1 # Target for the minimum number of idle connections to maintain in the pool. This setting only has an effect if it is positive.
redis:
  quota:
    current:
      expire: 2 #实时统计redis 的过期时间 默认是2小时
multipart:
  max-file-size: 100MB

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/common/account/LoginController.java

@@ -160,8 +160,8 @@ public class LoginController extends BaseController {
                password = RSAUtils.getInstance(doctorService).decryptString(password);
                password=StringUtils.reverse(password);
                Doctor doctor=doctorService.findDoctorByMobile(mobile);
                loginLog.setUserCode(doctor.getCode());
                loginLog.setLoginType("2");
                loginLog.setUserCode(doctor.getCode());
                if(doctor==null){
                    errorMessage="该身份证未注册！";
                    loginLog.setErrorMessage(errorMessage);
@@ -222,7 +222,6 @@ public class LoginController extends BaseController {
                        return error(-1, errorMessage);}
                }
                Doctor doctor = doctorService.findDoctorByMobile(mobile);
                loginLog.setUserCode(doctor.getCode());
                loginLog.setLoginType("1");
                if (doctor == null) {
                     errorMessage="该手机号未注册，请确认！";
@@ -230,6 +229,7 @@ public class LoginController extends BaseController {
                    loginLogService.saveLog(loginLog);
                    return error(-1, errorMessage);
                } else {
                    loginLog.setUserCode(doctor.getCode());
                    // 用户校验通过，生成token
                    Token token = tokenService.newToken(doctor.getCode(), getIMEI(), 2);
                    loginLog.setTokenId(token.getId());

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/common/account/WechatController.java

@@ -347,7 +347,6 @@ public class WechatController extends WeixinBaseController {
                if(patient==null){
                    patient= patientService.findByIdcard(mobile);
                }
                loginLog.setUserCode(patient.getCode());
                loginLog.setLoginType("2");
                if (patient == null) {
                    errorMessage="该手机号暂未注册帐号，请确认后重新输入！";
@@ -370,6 +369,7 @@ public class WechatController extends WeixinBaseController {
                    loginLogService.saveLog(loginLog);
                    return error(-1,errorMessage);
                }
                loginLog.setUserCode(patient.getCode());
                //解密
                password = RSAUtils.getInstance(patientService).decryptString(password);
                password=StringUtils.reverse(password);
@@ -428,7 +428,6 @@ public class WechatController extends WeixinBaseController {
                        return error(-1, errorMessage);}
                }
                Patient patient = patientService.findByMobile(mobile);
                loginLog.setUserCode(patient.getCode());
                loginLog.setLoginType("1");
                if (patient == null) {
                    errorMessage="该手机号暂未注册帐号，请确认后重新输入！";
@@ -451,7 +450,7 @@ public class WechatController extends WeixinBaseController {
                    loginLogService.saveLog(loginLog);
                    return error(-1, errorMessage);
                }
                loginLog.setUserCode(patient.getCode());
                // 绑定用户手机号和openid
                if (!StringUtils.equals(patient.getOpenid(), openid)) {
                    patient.setOpenid(openid);