huwhois 3 years ago
parent
commit
584f09999b

+ 14 - 7
src/main/java/io/renren/modules/app/controller/AppAttendersController.java

7
import io.renren.modules.admin.entity.MemberEntity;
7
import io.renren.modules.admin.entity.MemberEntity;
8
import io.renren.modules.admin.service.AttendersService;
8
import io.renren.modules.admin.service.AttendersService;
9
import io.renren.modules.admin.service.AttendersviewService;
9
import io.renren.modules.admin.service.AttendersviewService;
10
import io.renren.modules.admin.service.MeetingService;
10
import io.renren.modules.admin.service.MemberService;
11
import io.renren.modules.admin.service.MemberService;
12
import io.renren.modules.admin.service.SignService;
13
import io.renren.modules.admin.service.SignviewService;
11
import io.renren.modules.app.annotation.Login;
14
import io.renren.modules.app.annotation.Login;
12
import io.renren.modules.app.service.SmsCodeService;
15
import io.renren.modules.app.service.SmsCodeService;
13
import io.renren.modules.admin.entity.HotalEntity;
16
import io.renren.modules.admin.entity.HotalEntity;
17
import io.renren.modules.admin.entity.MeetingEntity;
14
18
15
import java.util.Date;
19
import java.util.Date;
16
20
34
    private AttendersviewService attendersviewService;
38
    private AttendersviewService attendersviewService;
35
    @Autowired
39
    @Autowired
36
    private SmsCodeService smsCodeService;
40
    private SmsCodeService smsCodeService;
41
    @Autowired
42
    private MeetingService meetingService;
43
    @Autowired
44
    private SignviewService signviewService;
37
45
38
    @GetMapping("notToken")
46
    @GetMapping("notToken")
39
    public R notToken() {
47
    public R notToken() {
109
        return R.ok();
117
        return R.ok();
110
    }
118
    }
111
119
112
    @GetMapping("/infobysymbol/{token}")
113
    public R notToken(@PathVariable("symbol") String symbol){
114
        // AttendersviewEntity attenders = attendersviewService.getBySymbol(token);
115
        // return R.ok().put("attenders", attenders);
116
        return null;
120
    @GetMapping("/attenderinfo/{mid}/{symbol}")
121
    public R notToken(@PathVariable("mid") Long mid, @PathVariable("symbol") String symbol){
122
        AttendersviewEntity attenders = attendersviewService.getBySymbolAndMid(symbol, mid);
123
        
124
        MeetingEntity meeting = meetingService.getById(mid);
125
        return R.ok().put("attenders", attenders).put("meeting", meeting);
117
    }
126
    }
118
127
119
    @Login
128
    @Login
151
160
152
        return R.ok();
161
        return R.ok();
153
    }
162
    }
154
155
156
}
163
}