..

src/main/java/io/renren/modules/admin/controller/LectureController.java

@@ -46,6 +46,9 @@ public class LectureController {
    @GetMapping("/list")
    @RequiresPermissions("admin:lecture:list")
    public R list(@RequestParam Map<String, Object> params) {
        if (!params.containsKey("meetingId")) {
            return R.error("会议id不可为空");
        }
        PageUtils page = lectureService.myQueryPage(params);
        return R.ok().put("page", page);

src/main/java/io/renren/modules/admin/controller/PaperRequireController.java

@@ -34,25 +34,35 @@ public class PaperRequireController {
    @Autowired
    private PaperRequireService paperRequireService;
    /**
     * 列表
     */
    @RequestMapping("/list")
    @RequiresPermissions("admin:paperrequire:list")
    public R list(@RequestParam Map<String, Object> params){
        PageUtils page = paperRequireService.queryPage(params);
        return R.ok().put("page", page);
    }
    // /**
    //  * 列表
    //  */
    // @RequestMapping("/list")
    // @RequiresPermissions("admin:paperrequire:list")
    // public R list(@RequestParam Map<String, Object> params){
    //     PageUtils page = paperRequireService.queryPage(params);
    //     return R.ok().put("page", page);
    // }
    // /**
    //  * 信息
    //  */
    // @GetMapping("/info/{id}")
    // @RequiresPermissions("admin:paperrequire:info")
    // public R info(@PathVariable("id") Long id){
	// 	PaperRequireEntity paperRequire = paperRequireService.getById(id);
    //     return R.ok().put("paperRequire", paperRequire);
    // }
    /**
     * 信息
     * 根据会议id信息
     */
    @GetMapping("/info/{id}")
    @GetMapping("/infobymid/{mid}")
    @RequiresPermissions("admin:paperrequire:info")
    public R info(@PathVariable("id") Long id){
		PaperRequireEntity paperRequire = paperRequireService.getById(id);
    public R infoByMid(@PathVariable("mid") Long mid){
		PaperRequireEntity paperRequire = paperRequireService.getOneByMeetingId(mid);
        return R.ok().put("paperRequire", paperRequire);
    }
@@ -80,15 +90,15 @@ public class PaperRequireController {
        return R.ok();
    }
    /**
     * 删除
     */
    @PostMapping("/delete")
    @RequiresPermissions("admin:paperrequire:delete")
    public R delete(@RequestBody Long[] ids){
		paperRequireService.removeByIds(Arrays.asList(ids));
    // /**
    //  * 删除
    //  */
    // @PostMapping("/delete")
    // @RequiresPermissions("admin:paperrequire:delete")
    // public R delete(@RequestBody Long[] ids){
	// 	paperRequireService.removeByIds(Arrays.asList(ids));
        return R.ok();
    }
    //     return R.ok();
    // }
}

src/main/java/io/renren/modules/admin/entity/PaperRequireEntity.java

@@ -24,6 +24,10 @@ public class PaperRequireEntity implements Serializable {
	 */
	@TableId
	private Long id;
	/**
	 * 会议 id
	 */
	private Long meetingId;
	/**
	 * 截止时间
	 */

src/main/java/io/renren/modules/admin/service/PaperRequireService.java

@@ -16,5 +16,7 @@ import java.util.Map;
public interface PaperRequireService extends IService<PaperRequireEntity> {
    PageUtils queryPage(Map<String, Object> params);
    PaperRequireEntity getOneByMeetingId(Long meetingId);
}

src/main/java/io/renren/modules/admin/service/impl/PaperRequireServiceImpl.java

@@ -26,4 +26,8 @@ public class PaperRequireServiceImpl extends ServiceImpl<PaperRequireDao, PaperR
        return new PageUtils(page);
    }
    @Override
    public PaperRequireEntity getOneByMeetingId(Long meetingId) {
        return this.getOne(new QueryWrapper<PaperRequireEntity>().eq("meeting_id", meetingId));
    }
}

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

@@ -1,16 +1,17 @@
package io.renren.modules.app.controller;
import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.util.Map;
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.RequestParam;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import io.renren.common.utils.R;
import io.renren.common.utils.PageUtils;
import io.renren.modules.admin.entity.LectureEntity;
import io.renren.modules.admin.service.LectureService;
@@ -23,32 +24,34 @@ import io.renren.modules.admin.service.LectureService;
 */
@RestController
@RequestMapping("app/lecture")
public class Lecture {
public class AppLectureController {
    @Autowired
    private LectureService lectureService;
    // /**
    //  * 列表
    //  */
    // @GetMapping("/list")
    // public R list(@RequestParam Map<String, Object> params) {
    //     PageUtils page = lectureService.queryPage(params);
    //     return R.ok().put("page", page);
    // }
    /**
     * 列表
     */
    @GetMapping("/list/{mid}")
    public R list(@PathVariable("mid") Long mid) {     
         List<LectureEntity> lectureList = lectureService.list(
             new QueryWrapper<LectureEntity>().eq("meeting_id", mid));
    @GetMapping("/list")
    public R list(@RequestParam Map<String, Object> params) {
        if (!params.containsKey("meetingId")) {
            return R.error("会议id不可为空");
        }
        PageUtils page = lectureService.myQueryPage(params);
        return R.ok().put("lectureList", lectureList);
        return R.ok().put("page", page);
    }
    // /**
    //  * 列表
    //  */
    // @GetMapping("/list/{mid}")
    // public R list(@PathVariable("mid") Long mid) {     
    //      List<LectureEntity> lectureList = lectureService.list(
    //          new QueryWrapper<LectureEntity>().eq("meeting_id", mid));
    //     return R.ok().put("lectureList", lectureList);
    // }
    /**
     * 信息
     */

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

@@ -5,6 +5,8 @@ import io.renren.modules.admin.entity.MeetingEntity;
import io.renren.modules.admin.entity.MoneyAccountEntity;
import io.renren.modules.admin.service.MeetingService;
import io.renren.modules.admin.service.MoneyAccountService;
import io.renren.modules.admin.entity.PaperRequireEntity;
import io.renren.modules.admin.service.PaperRequireService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -19,12 +21,14 @@ import org.springframework.web.bind.annotation.RestController;
 */
@RestController
@RequestMapping("/app/meeting")
public class Meeting {
public class AppMeetingController {
    @Autowired
    private MeetingService meetingService;
    @Autowired
    private MoneyAccountService moneyAccountService;
    @Autowired
    private PaperRequireService paperRequireService;
    /**
     * 获取会议信息
@@ -45,4 +49,14 @@ public class Meeting {
        
        return R.ok().put("moneyAccount", moneyAccount);
    }
     /**
     * 根据meetingId信息获取投稿要求
     */
    @GetMapping("/paperrequireinfo/{mid}")
    public R paperrequireInfoByMid(@PathVariable("mid") Long mid) {
        PaperRequireEntity paperRequir = paperRequireService.getOneByMeetingId(mid);
        
        return R.ok().put("paperRequir", paperRequir);
    }
}

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

@@ -1,33 +0,0 @@
package io.renren.modules.app.controller;
import io.renren.common.utils.R;
import io.renren.modules.admin.entity.PaperRequireEntity;
import io.renren.modules.admin.service.PaperRequireService;
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.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
 * 投稿要求接口
 *
 * @author huwhois huwhois@163.com
 */
@RestController
@RequestMapping("/app/paperrequire")
public class PaperRequire {
    @Autowired
    private PaperRequireService paperRequireService;
    
    /**
     * 信息
     */
    @GetMapping("/info/{id}")
    public R info(@PathVariable("id") Long id){
		PaperRequireEntity paperRequire = paperRequireService.getById(id);
        return R.ok().put("paperRequire", paperRequire);
    }
}