..

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

@@ -42,6 +42,7 @@ import io.renren.common.utils.ExcelUtils;
import io.renren.common.utils.MyUtils;
import io.renren.common.utils.PageUtils;
import io.renren.common.utils.R;
import io.renren.common.validator.Assert;
import io.renren.common.validator.ValidatorUtils;
import io.renren.common.validator.group.AddGroup;
import io.renren.common.validator.group.UpdateGroup;
@@ -95,6 +96,7 @@ public class MemberController extends AbstractController {
    @RequiresPermissions("admin:member:save")
    public R save(@RequestBody MemberEntity member){
        ValidatorUtils.validateEntity(member, AddGroup.class);
        Assert.isNotPhone(member.getPhone());
        memberService.saveMember(member);
        return R.ok();
@@ -107,6 +109,7 @@ public class MemberController extends AbstractController {
    @RequiresPermissions("admin:member:update")
    public R update(@RequestBody MemberEntity member){
        ValidatorUtils.validateEntity(member, UpdateGroup.class);
        Assert.isNotPhone(member.getPhone());
		memberService.updateMember(member);
        return R.ok();

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

@@ -82,7 +82,7 @@ public class PaperController {
    @RequiresPermissions("admin:paper:save")
    public R save(@RequestBody PaperviewEntity paperForm){
        Long meetingId = paperForm.getMeetingId();
        if (meetingId == 0L) {
        if (meetingId == null || meetingId == 0L) {
            return R.error("会议id不可为空");
        }

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

@@ -0,0 +1,164 @@
package io.renren.modules.admin.controller;
import java.util.Arrays;
import java.util.Date;
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;
/**
 * 报告管理
 *
 * @author huwhois
 * @email huwhois@163.com
 * @date 2020-12-29 10:27:09
 */
@RestController
@RequestMapping("admin/report")
public class ReportController {
    @Autowired
    private ReportService reportService;
    @Autowired
    private AttendersService attendersService;
    @Autowired
    private ScheduleService scheduleService;
    /**
     * 列表
     */
    @GetMapping("/list")
    @RequiresPermissions("admin:report:list")
    public R list(@RequestParam Map<String, Object> params){
        if (!params.containsKey("meetingId")) {
            return R.error("会议id不可为空");
        }
        PageUtils page = reportService.queryPage(params);
        return R.ok().put("page", page);
    }
    /**
     * 信息
     */
    @GetMapping("/info/{aid}")
    @RequiresPermissions("admin:report:info")
    public R info(@PathVariable("aid") Long aid){
		ReportEntity report = reportService.getById(aid);
        return R.ok().put("report", report);
    }
    /**
     * 新增/修改
     */
    @PostMapping("/update")
    @RequiresPermissions("admin:report:update")
    public R update(@RequestBody ReportEntity report){
        AttendersEntity attenders = attendersService.getById(report.getAid());
        if (attenders==null) {
            return R.error("参会人员不存在");
        }
        attenders.setIsReport(1);
        attenders.setReportTitle(report.getTitle());
        attendersService.updateById(attenders);
        ScheduleEntity schedule = new ScheduleEntity();
        schedule.setAttendersId(report.getAid());
        schedule.setBranchId(report.getBranchId());
        schedule.setSort(report.getSort());
        if (report.getId()==null || report.getId()==0L) {
            scheduleService.save(schedule);
        } else {
            schedule.setAttendersId(report.getId());
            scheduleService.updateById(schedule);
        }
        
        return R.ok();
    }
    /**
     * 删除
     */
    @PostMapping("/delete/{aid}")
    @RequiresPermissions("admin:report:delete")
    public R delete(@PathVariable("aid") Long aid){
		// reportService.removeByIds(Arrays.asList(aids));
        ReportEntity report = reportService.getById(aid);
        if (report!=null) {
            scheduleService.removeById(report.getId());
        }
        attendersService.removeReport(aid);
        return R.ok();
    }
    /**
     * 分配会场
     */
    @PostMapping("/branch")
    @RequiresPermissions("admin:report:update")
    public R branch(@RequestBody Map<String, Object> params){
        Long aid = Long.valueOf(params.get("aid").toString());
        Long branchId = Long.valueOf(params.get("branchId").toString());
        Long id = params.containsKey("id") ? Long.valueOf(params.get("id").toString()) : 0L;
		ScheduleEntity schedule = new ScheduleEntity();
        schedule.setAttendersId(aid);
        schedule.setBranchId(branchId);
        if (id==0L) {
            scheduleService.save(schedule);
        } else {
            schedule.setId(id);
            scheduleService.updateById(schedule);
        }
        return R.ok();
    }
    /**
     * listbybranch
     */
    @GetMapping("/listbranch/{bid}")
    @RequiresPermissions("admin:report:list")
    public R listByBranch(@PathVariable("bid") Long bid){
        List<ReportEntity> list = reportService.listByBranch(bid);
        return R.ok().put("list", list);
    }
    /**
     * listbybranch
     */
    @GetMapping("/listbranch")
    @RequiresPermissions("admin:report:list")
    public R listByBranch(){
        List<ReportEntity> list = reportService.list();
        return R.ok().put("list", list);
    }
}

src/main/java/io/renren/modules/admin/dao/AttendersDao.java

@@ -2,6 +2,8 @@ package io.renren.modules.admin.dao;
import io.renren.modules.admin.entity.AttendersEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Update;
import org.apache.ibatis.annotations.Mapper;
/**
@@ -13,5 +15,7 @@ import org.apache.ibatis.annotations.Mapper;
 */
@Mapper
public interface AttendersDao extends BaseMapper<AttendersEntity> {
	
    
    @Update("update attenders set is_report=0,report_title='' where id=#{id}")
	int removeReport(Long id);
}

src/main/java/io/renren/modules/admin/dao/ReportDao.java

@@ -0,0 +1,17 @@
package io.renren.modules.admin.dao;
import io.renren.modules.admin.entity.ReportEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/**
 * VIEW
 * 
 * @author huwhois
 * @email huwhois@163.com
 * @date 2020-12-29 10:27:09
 */
@Mapper
public interface ReportDao extends BaseMapper<ReportEntity> {
	
}

src/main/java/io/renren/modules/admin/dao/ScheduleDao.java

@@ -0,0 +1,17 @@
package io.renren.modules.admin.dao;
import io.renren.modules.admin.entity.ScheduleEntity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
/**
 * 
 * 
 * @author huwhois
 * @email huwhois@163.com
 * @date 2020-12-29 10:26:47
 */
@Mapper
public interface ScheduleDao extends BaseMapper<ScheduleEntity> {
	
}

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
import io.renren.common.validator.group.AddGroup;
import io.renren.common.validator.group.UpdateGroup;
import io.renren.common.validator.Assert;
import java.io.Serializable;
import java.util.Date;

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

@@ -0,0 +1,72 @@
package io.renren.modules.admin.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
 * VIEW
 * 
 * @author huwhois
 * @email huwhois@163.com
 * @date 2020-12-29 10:27:09
 */
@Data
@TableName("report")
public class ReportEntity implements Serializable {
	private static final long serialVersionUID = 1L;
	/**
	 * id
	 */
	@TableId
	private Long aid;
	/**
	 * 会议id
	 */
	private Long meetingId;
	/**
	 * 报告题目
	 */
	private String title;
	/**
	 * 所属会场(主会场/分会场)
	 */
	private Long branchId;
	/**
	 * id
	 */
	private Long id;
	/**
	 * 演讲开始时间
	 */
	private Date startTime;
	/**
	 * 演讲结束时间
	 */
	private Date endTime;
	/**
	 * sort
	 */
	private Integer sort;
	/**
	 * 名字
	 */
	private String truename;
	/**
	 * 单位名称
	 */
	private String organization;
	/**
	 * 职位
	 */
	private String position;
	/**
	 * 电话
	 */
	private String phone;
}

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

@@ -0,0 +1,56 @@
package io.renren.modules.admin.entity;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
 * 
 * 
 * @author huwhois
 * @email huwhois@163.com
 * @date 2020-12-29 10:26:47
 */
@Data
@TableName("schedule")
public class ScheduleEntity implements Serializable {
	private static final long serialVersionUID = 1L;
	/**
	 * id
	 */
	@TableId
	private Long id;
	/**
	 * 参会人员id
	 */
	private Long attendersId;
	/**
	 * 所属会场(主会场/分会场)
	 */
	private Long branchId;
	/**
	 * 演讲开始时间
	 */
	private Date startTime;
	/**
	 * 演讲结束时间
	 */
	private Date endTime;
	/**
	 * 排序
	 */
	private Integer sort;
	/**
	 * 新建时间
	 */
	private Date createTime;
	/**
	 * 标记删除
	 */
	private Integer isDel;
}

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

@@ -18,5 +18,7 @@ public interface AttendersService extends IService<AttendersEntity> {
    PageUtils queryPage(Map<String, Object> params);
	AttendersEntity getByMMId(Long id, Long meetingId);
	int removeReport(Long id);
}

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

@@ -0,0 +1,23 @@
package io.renren.modules.admin.service;
import com.baomidou.mybatisplus.extension.service.IService;
import io.renren.common.utils.PageUtils;
import io.renren.modules.admin.entity.ReportEntity;
import java.util.List;
import java.util.Map;
/**
 * VIEW
 *
 * @author huwhois
 * @email huwhois@163.com
 * @date 2020-12-29 10:27:09
 */
public interface ReportService extends IService<ReportEntity> {
    PageUtils queryPage(Map<String, Object> params);
	List<ReportEntity> listByBranch(Long bid);
}

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

@@ -0,0 +1,20 @@
package io.renren.modules.admin.service;
import com.baomidou.mybatisplus.extension.service.IService;
import io.renren.common.utils.PageUtils;
import io.renren.modules.admin.entity.ScheduleEntity;
import java.util.Map;
/**
 * 
 *
 * @author huwhois
 * @email huwhois@163.com
 * @date 2020-12-29 10:26:47
 */
public interface ScheduleService extends IService<ScheduleEntity> {
    PageUtils queryPage(Map<String, Object> params);
}

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

@@ -32,4 +32,9 @@ public class AttendersServiceImpl extends ServiceImpl<AttendersDao, AttendersEnt
        return this.getOne(new QueryWrapper<AttendersEntity>().eq("member_id", memberId).eq("meeting_id",meetingId));
    }
    @Override
    public int removeReport(Long id) {
        return baseMapper.removeReport(id);
    }
}

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

@@ -15,9 +15,9 @@ import io.renren.modules.admin.dao.AttendersviewDao;
import io.renren.modules.admin.entity.AttendersviewEntity;
import io.renren.modules.admin.service.AttendersviewService;
@Service("attendersviewService")
public class AttendersviewServiceImpl extends ServiceImpl<AttendersviewDao, AttendersviewEntity> implements AttendersviewService {
public class AttendersviewServiceImpl extends ServiceImpl<AttendersviewDao, AttendersviewEntity>
        implements AttendersviewService {
    @Override
    public PageUtils queryPage(Map<String, Object> params) {
@@ -44,7 +44,8 @@ public class AttendersviewServiceImpl extends ServiceImpl<AttendersviewDao, Atte
    @Override
    public AttendersviewEntity getBySymbolAndMid(String symbol, Long meetingId) {
        AttendersviewEntity attenders = this.getOne(new QueryWrapper<AttendersviewEntity>().eq("symbol", symbol).eq("meeting_id",meetingId));
        AttendersviewEntity attenders = this
                .getOne(new QueryWrapper<AttendersviewEntity>().eq("symbol", symbol).eq("meeting_id", meetingId));
        return attenders;
    }
}

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

@@ -0,0 +1,38 @@
package io.renren.modules.admin.service.impl;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import io.renren.common.utils.PageUtils;
import io.renren.common.utils.Query;
import io.renren.modules.admin.dao.ReportDao;
import io.renren.modules.admin.entity.ReportEntity;
import io.renren.modules.admin.service.ReportService;
@Service("reportService")
public class ReportServiceImpl extends ServiceImpl<ReportDao, ReportEntity> implements ReportService {
    @Override
    public PageUtils queryPage(Map<String, Object> params) {
        Long meetingId = Long.valueOf((String) params.get("meetingId"));
        String key = params.containsKey("key") ? (String) params.get("key") : null;
        IPage<ReportEntity> page = this.page(new Query<ReportEntity>().getPage(params),
                new QueryWrapper<ReportEntity>().eq("meeting_id", meetingId)
                        .like(StringUtils.isNotBlank(key), "title", key).or()
                        .like(StringUtils.isNotBlank(key), "truename", key).or()
                        .like(StringUtils.isNotBlank(key), "organization", key));
        return new PageUtils(page);
    }
    @Override
    public List<ReportEntity> listByBranch(Long bid) {
        return this.list(new QueryWrapper<ReportEntity>().eq("branch_id", bid));
    }
}

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

@@ -0,0 +1,29 @@
package io.renren.modules.admin.service.impl;
import org.springframework.stereotype.Service;
import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import io.renren.common.utils.PageUtils;
import io.renren.common.utils.Query;
import io.renren.modules.admin.dao.ScheduleDao;
import io.renren.modules.admin.entity.ScheduleEntity;
import io.renren.modules.admin.service.ScheduleService;
@Service("scheduleService")
public class ScheduleServiceImpl extends ServiceImpl<ScheduleDao, ScheduleEntity> implements ScheduleService {
    @Override
    public PageUtils queryPage(Map<String, Object> params) {
        IPage<ScheduleEntity> page = this.page(
                new Query<ScheduleEntity>().getPage(params),
                new QueryWrapper<ScheduleEntity>()
        );
        return new PageUtils(page);
    }
}