超时及问卷bug修改

business/base-service/src/main/java/com/yihu/jw/hospital/survey/dao/SurveyUserAnswerDao.java

@@ -18,7 +18,7 @@ public interface SurveyUserAnswerDao extends PagingAndSortingRepository<WlyySurv
    List<WlyySurveyUserAnswerDO> findBySurverUserId(String surverUserId);
    List<WlyySurveyUserAnswerDO> findByTempQuestionCode(String tempQuestionCode);
    @Query("From WlyySurveyUserAnswerDO c WHERE c.tempOptionCode = ?1 and c.surveyTempCode = ?2")
    List<WlyySurveyUserAnswerDO> findBytempOptionCode(String tempOptionCode,String surveyTempCode);
    @Query("SELECT DISTINCT c.patient from WlyySurveyUserAnswerDO c WHERE c.tempQuestionCode = ?1 and c.surveyTempCode = ?2")

gateway/ag-basic/src/main/java/com/yihu/jw/gateway/filter/BasicZuulFilter.java

@@ -148,7 +148,14 @@ public class BasicZuulFilter extends ZuulFilter {
        for (String resourceId : resourceIds) {
            if (resourceId.equals("/**")) {
                System.out.println("/**"+true);
                this.checkTimeout(oAuth2AccessToken);
                //判断用户操作间隔
                String userId = userAgent.getUID();
                System.out.println(userId);
                Boolean checkTimeOut = baseLoginLogService.checkTime(userId);
                System.out.println("即将进入验证操作时间接口");
                if (!checkTimeOut){
                    return this.forbidden(ctx, ResultStatus.OPERATE_TIME, "expired token");
                }
                return true;
            }
            if (!resourceId.startsWith("/")) {
@@ -158,7 +165,14 @@ public class BasicZuulFilter extends ZuulFilter {
            if (path.startsWith(resourceId)
                    && (path.length() == resourceId.length() || path.charAt(resourceId.length()) == '/')) {
                System.out.println("158"+true);
                this.checkTimeout(oAuth2AccessToken);
                //判断用户操作间隔
                String userId = userAgent.getUID();
                System.out.println(userId);
                Boolean checkTimeOut = baseLoginLogService.checkTime(userId);
                System.out.println("即将进入验证操作时间接口");
                if (!checkTimeOut){
                    return this.forbidden(ctx, ResultStatus.OPERATE_TIME, "expired token");
                }
                return true;
            }
        }
@@ -168,23 +182,11 @@ public class BasicZuulFilter extends ZuulFilter {
        Boolean checkTimeOut = baseLoginLogService.checkTime(userId);
        System.out.println("即将进入验证操作时间接口");
        if (!checkTimeOut){
            tokenStore.removeAccessToken(oAuth2AccessToken);
            return this.forbidden(ctx, ResultStatus.OPERATE_TIME, "expired token");
        }
        return this.forbidden(ctx, ResultStatus.NO_PERMI, "invalid token does not contain request resource " + path);
    }
    private void checkTimeout(OAuth2AccessToken oAuth2AccessToken){
        //判断用户操作间隔
        String userId = userAgent.getUID();
        System.out.println(userId);
        Boolean checkTimeOut = baseLoginLogService.checkTime(userId);
        System.out.println("即将进入验证操作时间接口");
        if (!checkTimeOut){
            tokenStore.removeAccessToken(oAuth2AccessToken);
            redisTokenStore.removeAccessToken(oAuth2AccessToken.getValue());
            redisTokenStore.removeRefreshToken(oAuth2AccessToken.getRefreshToken().getValue());
        }
    }
    private String extractToken(HttpServletRequest request) {
        String accessToken = request.getHeader(ACCESS_TOKEN_PARAMETER);
        if (null == accessToken) {