返回状态设置

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

@@ -280,27 +280,28 @@ public class UserController extends EnvelopRestEndpoint {
    @ApiOperation(value = "用户列表导出excel")
    public Envelop exportToExcel(
            HttpServletResponse response,
            @ApiParam(name = "city", value = "所在市区", required = false) @RequestParam(required = false, name = "city") String city,
            @ApiParam(name = "activated", value = "用户状态", required = false) @RequestParam(required = false, name = "activated") String activated,
            @ApiParam(name = "name", value = "姓名/手机号", required = false) @RequestParam(required = false, name = "name") String name,
            @ApiParam(name = "sort", value = "使用次数排序", required = false) @RequestParam(required = false, name = "sort") String sort) {
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段", defaultValue = "")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器", defaultValue = "")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序", defaultValue = "")
            @RequestParam(value = "sorts", required = false) String sorts) {
        response.setCharacterEncoding("UTF-8");
        try {
            //获取用户数据
            Map<String, String> map = new HashMap<>();
            map.put("cityCode", city);
            map.put("activated", activated);
            map.put("name", name);
            map.put("telephone", name);
            List<User> userList = userService.userList(map, sort);
            List<User> userList = userService.search(fields, filters, sorts);
            userService.exportUsersExcel(response, userList);
            return success("导出成功");
        } catch (ManageException e) {
            return failed(e.getMessage());
        } catch (ParseException e) {
            e.printStackTrace();
            return failed(e.getMessage());
        }
    }
    @PostMapping(value = "/heartbeat")
    @ApiOperation(value = "用户在线-心跳接口", notes = "心跳接口")
    public Envelop heartbeat(

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

@@ -20,9 +20,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestAttributes;
import org.springframework.web.context.request.RequestContextHolder;
@@ -91,34 +88,27 @@ public class ActivatedInterceptor  {
    @Around("execution(* com.yihu.jw.healthyhouse.controller..*.*(..))")
    public Object activatedAround(ProceedingJoinPoint  joinPoint) throws Throwable{
        ObjectMapper objectMapper = new ObjectMapper();
        RequestAttributes ra = RequestContextHolder.getRequestAttributes();
        ServletRequestAttributes sra = (ServletRequestAttributes) ra;
        HttpServletRequest request = sra.getRequest();
        HttpServletResponse response = sra.getResponse();
        HttpSession session = request.getSession();
        Object userId = session.getAttribute(LoginInfo.USER_ID);
        if (userId == null ){
            HttpHeaders headers = new HttpHeaders();
            headers.set("Cache-Control", "no-store");
            headers.set("Pragma", "no-cache");
            return new ResponseEntity<>("用户未登录，请登录！", headers, HttpStatus.PAYMENT_REQUIRED);
            response.setStatus(402);
            return failed("用户未登录，请登录！",-10000);
        }
        User user = userService.findById(userId.toString());
        if (user == null ){
            HttpHeaders headers = new HttpHeaders();
            headers.set("Cache-Control", "no-store");
            headers.set("Pragma", "no-cache");
            return new ResponseEntity<>("用户未登录，请登录！", headers, HttpStatus.PAYMENT_REQUIRED);
            response.setStatus(402);
            return failed("用户不存在，请重新登录！",-10000);
        }else if (HouseUserContant.activated_lock.equals(user.getActivated())){
            HttpHeaders headers = new HttpHeaders();
            headers.set("Cache-Control", "no-store");
            headers.set("Pragma", "no-cache");
            return new ResponseEntity<>("用户已被冻结，请联系管理员！", headers, HttpStatus.PAYMENT_REQUIRED);
            response.setStatus(402);
           return failed("用户已被冻结，请联系管理员！",-10000);
        }else if (HouseUserContant.activated_offline.equals(user.getActivated())){
            HttpHeaders headers = new HttpHeaders();
            headers.set("Cache-Control", "no-store");
            headers.set("Pragma", "no-cache");
            return new ResponseEntity<>("用户已离线，请重新登录！", headers, HttpStatus.PAYMENT_REQUIRED);
            response.setStatus(402);
            return failed("用户已离线，请重新登录！",-10000);
        }else {
            return  joinPoint.proceed();
        }