..

src/main/java/io/renren/modules/app/controller/AppAdvertiseController.java

@@ -1,11 +1,10 @@
package io.renren.modules.app.controller;
import java.util.Map;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import io.renren.modules.admin.entity.AdvertiseEntity;
@@ -20,13 +19,28 @@ import io.renren.common.utils.R;
public class AppAdvertiseController {
    @Autowired
    private AdvertiseService advertiseService;
    @Value("${hostname}")
    private String hostname;
    /**
     * 列表
     */
    @RequestMapping("/list")
    public R list(@RequestParam Map<String, Object> params){
    public R list(){
        List<AdvertiseEntity> list = advertiseService.queryList();
        
        return R.ok().put("list", list);
    }
    /**
     * 列表
     */
    @RequestMapping("/listwithhost")
    public R listOnline(){
        List<AdvertiseEntity> list = advertiseService.queryList();
        for (AdvertiseEntity advertiseEntity : list) {
            advertiseEntity.setPicture(hostname + advertiseEntity.getPicture());
        }
        return R.ok().put("list", list);
    }

src/main/java/io/renren/modules/app/controller/AppMeetingController.java

@@ -3,6 +3,7 @@ package io.renren.modules.app.controller;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -24,7 +25,8 @@ import io.renren.common.utils.R;
public class AppMeetingController {
    @Autowired
    private MeetingService meetingService;
    @Value("${meetingId}")
    private Long meetingId;
    /**
     * 列表
     */
@@ -53,4 +55,20 @@ public class AppMeetingController {
        return R.ok().put("list", list);
    }
    /**
     * 分会列表
     */
    @GetMapping("/listbranch")
    public R listBranch(){
        List<MeetingEntity> list= meetingService.listByPid(meetingId);
        return R.ok().put("list", list);
    }
    /**
     * 获取配置的meetingId
     */
    @GetMapping("/configmid")
    public R getMeetingId(){
        return R.ok().put("meetingId", meetingId);
    }
}

src/main/java/io/renren/modules/app/controller/AppReportController.java

@@ -1,25 +1,15 @@
package io.renren.modules.app.controller;
import java.util.List;
import java.util.Map;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import io.renren.modules.admin.entity.AttendersEntity;
import io.renren.modules.admin.entity.ReportEntity;
import io.renren.modules.admin.service.AttendersService;
import io.renren.modules.admin.service.ReportService;
import io.renren.modules.admin.entity.ScheduleEntity;
import io.renren.modules.admin.service.ScheduleService;
import io.renren.common.utils.PageUtils;
import io.renren.common.utils.R;