huwhois 4 jaren geleden
bovenliggende
commit
28bf18832c

+ 17 - 3
src/main/java/io/renren/modules/app/controller/AppAdvertiseController.java

1
package io.renren.modules.app.controller;
1
package io.renren.modules.app.controller;
2
2
3
import java.util.Map;
4
import java.util.List;
3
import java.util.List;
5
4
6
import org.springframework.beans.factory.annotation.Autowired;
5
import org.springframework.beans.factory.annotation.Autowired;
6
import org.springframework.beans.factory.annotation.Value;
7
import org.springframework.web.bind.annotation.RequestMapping;
7
import org.springframework.web.bind.annotation.RequestMapping;
8
import org.springframework.web.bind.annotation.RequestParam;
9
import org.springframework.web.bind.annotation.RestController;
8
import org.springframework.web.bind.annotation.RestController;
10
9
11
import io.renren.modules.admin.entity.AdvertiseEntity;
10
import io.renren.modules.admin.entity.AdvertiseEntity;
20
public class AppAdvertiseController {
19
public class AppAdvertiseController {
21
    @Autowired
20
    @Autowired
22
    private AdvertiseService advertiseService;
21
    private AdvertiseService advertiseService;
22
    @Value("${hostname}")
23
    private String hostname;
23
24
24
    /**
25
    /**
25
     * 列表
26
     * 列表
26
     */
27
     */
27
    @RequestMapping("/list")
28
    @RequestMapping("/list")
28
    public R list(@RequestParam Map<String, Object> params){
29
    public R list(){
29
        List<AdvertiseEntity> list = advertiseService.queryList();
30
        List<AdvertiseEntity> list = advertiseService.queryList();
31
        
32
        return R.ok().put("list", list);
33
    }
34
35
    /**
36
     * 列表
37
     */
38
    @RequestMapping("/listwithhost")
39
    public R listOnline(){
40
        List<AdvertiseEntity> list = advertiseService.queryList();
41
        for (AdvertiseEntity advertiseEntity : list) {
42
            advertiseEntity.setPicture(hostname + advertiseEntity.getPicture());
43
        }
30
44
31
        return R.ok().put("list", list);
45
        return R.ok().put("list", list);
32
    }
46
    }

+ 19 - 1
src/main/java/io/renren/modules/app/controller/AppMeetingController.java

3
import java.util.List;
3
import java.util.List;
4
4
5
import org.springframework.beans.factory.annotation.Autowired;
5
import org.springframework.beans.factory.annotation.Autowired;
6
import org.springframework.beans.factory.annotation.Value;
6
import org.springframework.web.bind.annotation.GetMapping;
7
import org.springframework.web.bind.annotation.GetMapping;
7
import org.springframework.web.bind.annotation.PathVariable;
8
import org.springframework.web.bind.annotation.PathVariable;
8
import org.springframework.web.bind.annotation.RequestMapping;
9
import org.springframework.web.bind.annotation.RequestMapping;
24
public class AppMeetingController {
25
public class AppMeetingController {
25
    @Autowired
26
    @Autowired
26
    private MeetingService meetingService;
27
    private MeetingService meetingService;
27
28
    @Value("${meetingId}")
29
    private Long meetingId;
28
    /**
30
    /**
29
     * 列表
31
     * 列表
30
     */
32
     */
53
        return R.ok().put("list", list);
55
        return R.ok().put("list", list);
54
    }
56
    }
55
57
58
    /**
59
     * 分会列表
60
     */
61
    @GetMapping("/listbranch")
62
    public R listBranch(){
63
        List<MeetingEntity> list= meetingService.listByPid(meetingId);
64
        return R.ok().put("list", list);
65
    }
66
67
    /**
68
     * 获取配置的meetingId
69
     */
70
    @GetMapping("/configmid")
71
    public R getMeetingId(){
72
        return R.ok().put("meetingId", meetingId);
73
    }
56
}
74
}

+ 0 - 10
src/main/java/io/renren/modules/app/controller/AppReportController.java

1
package io.renren.modules.app.controller;
1
package io.renren.modules.app.controller;
2
2
3
import java.util.List;
3
import java.util.List;
4
import java.util.Map;
5
4
6
import org.apache.shiro.authz.annotation.RequiresPermissions;
7
import org.springframework.beans.factory.annotation.Autowired;
5
import org.springframework.beans.factory.annotation.Autowired;
8
import org.springframework.web.bind.annotation.GetMapping;
6
import org.springframework.web.bind.annotation.GetMapping;
9
import org.springframework.web.bind.annotation.PathVariable;
7
import org.springframework.web.bind.annotation.PathVariable;
10
import org.springframework.web.bind.annotation.PostMapping;
11
import org.springframework.web.bind.annotation.RequestBody;
12
import org.springframework.web.bind.annotation.RequestMapping;
8
import org.springframework.web.bind.annotation.RequestMapping;
13
import org.springframework.web.bind.annotation.RequestParam;
14
import org.springframework.web.bind.annotation.RestController;
9
import org.springframework.web.bind.annotation.RestController;
15
10
16
import io.renren.modules.admin.entity.AttendersEntity;
17
import io.renren.modules.admin.entity.ReportEntity;
11
import io.renren.modules.admin.entity.ReportEntity;
18
import io.renren.modules.admin.service.AttendersService;
19
import io.renren.modules.admin.service.ReportService;
12
import io.renren.modules.admin.service.ReportService;
20
import io.renren.modules.admin.entity.ScheduleEntity;
21
import io.renren.modules.admin.service.ScheduleService;
22
import io.renren.common.utils.PageUtils;
23
import io.renren.common.utils.R;
13
import io.renren.common.utils.R;
24
14
25
15