Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/user/FacilityUsedRecordController.java

@@ -223,7 +223,9 @@ public class FacilityUsedRecordController extends EnvelopRestEndpoint {
            }
            //根据设施编码获取 设施状态
            Facility facility = facilityService.findByCode(facilityCode);
            record.setFacilitieStatus(facility.getStatus());
            if (facility!=null) {
                record.setFacilitieStatus(facility.getStatus());
            }
        }
        int count = (int) facilityUsedRecordService.getCount(filters);
        return success(facilityUsedRecordList, count, page, size);

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/interceptor/ActivatedInterceptor.java

@@ -37,13 +37,14 @@ import java.util.HashMap;
import java.util.Map;
/**
 *  用户在线状态验证拦截器
 * 用户在线状态验证拦截器
 *
 * @author HZY
 * @created 2018/10/9 9:19
 */
//@Aspect
//@Component
public class ActivatedInterceptor  {
@Aspect
@Component
public class ActivatedInterceptor {
    private static final Logger logger = LoggerFactory.getLogger(ActivatedInterceptor.class);
@@ -87,34 +88,45 @@ public class ActivatedInterceptor  {
    @Around("execution(* com.yihu.jw.healthyhouse.controller..*.*(..))")
    public Object activatedAround(ProceedingJoinPoint  joinPoint) throws Throwable{
    public Object activatedAround(ProceedingJoinPoint joinPoint) throws Throwable {
        RequestAttributes ra = RequestContextHolder.getRequestAttributes();
        ServletRequestAttributes sra = (ServletRequestAttributes) ra;
        HttpServletRequest request = sra.getRequest();
        HttpServletResponse response = sra.getResponse();
        String requestUri = request.getRequestURI();
        String contextPath = request.getContextPath();
        if (requestUri.indexOf("/login") != -1
                || requestUri.indexOf("/register") != -1
                || requestUri.indexOf("/loginout") != -1
                || requestUri.indexOf("/getRandomImageCode") != -1
                || requestUri.indexOf("/checkRandomImageCode") != -1
                || requestUri.indexOf("/captcha") != -1
                || requestUri.indexOf("swagger") != -1
                || requestUri.indexOf(contextPath + "/v2/api-docs") != -1) {
            return joinPoint.proceed();
        }
        HttpSession session = request.getSession();
        Object userId = session.getAttribute(LoginInfo.USER_ID);
        if (userId == null ){
        String userId = request.getHeader("userId");
        System.out.println(userId);
        if (userId == null) {
            response.setStatus(402);
            return  joinPoint.proceed();
            return joinPoint.proceed();
//            return failed("用户未登录，请登录！",-10000);
        }
        User user = userService.findById(userId.toString());
        if (user == null ){
        User user = userService.findById(userId);
        if (user == null) {
            response.setStatus(402);
            return  joinPoint.proceed();
            return joinPoint.proceed();
//            return failed("用户不存在，请重新登录！",-10000);
        }else if (HouseUserContant.activated_lock.equals(user.getActivated())){
            response.setStatus(402);
        } else if (HouseUserContant.activated_lock.equals(user.getActivated())) {
            response.setStatus(103);
//           return failed("用户已被冻结，请联系管理员！",-10000);
        }else if (HouseUserContant.activated_offline.equals(user.getActivated())){
        } else if (HouseUserContant.activated_offline.equals(user.getActivated())) {
            response.setStatus(402);
//            return failed("用户已离线，请重新登录！",-10000);
        }else {
//            return  joinPoint.proceed();
        }
        return  joinPoint.proceed();
        return joinPoint.proceed();
    }
@@ -144,8 +156,7 @@ public class ActivatedInterceptor  {
    }
    protected Envelop failed (String message, int status) {
    protected Envelop failed(String message, int status) {
        Envelop envelop = new Envelop();
        envelop.setMessage(message);
        envelop.setStatus(status);
@@ -154,4 +165,5 @@ public class ActivatedInterceptor  {
}

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/service/user/UserService.java

@@ -464,7 +464,9 @@ public class UserService extends BaseJpaService<User, UserDao> {
     */
    @Transactional
    public void updateUserOffLine(List<Serializable> ids) throws ManageException {
        userDao.updateUserOnLine(ids);//更新在线
        if (ids!=null) {
            userDao.updateUserOnLine(ids);//更新在线
        }
        userDao.updateUserOffLine(ids);//更新离线
    }