huwhois 4 years ago
parent
commit
d92429a8e3

+ 0 - 3
src/main/java/io/renren/modules/admin/controller/PaperController.java

@ -32,7 +32,6 @@ import io.renren.modules.admin.service.PaperviewService;
32 32
33 33
/**
34 34
 * 
35
 *
36 35
 * @author chenshun
37 36
 * @email sunlightcs@gmail.com
38 37
 * @date 2020-02-12 10:52:23
@ -109,7 +108,6 @@ public class PaperController {
109 108
110 109
        PaperEntity paper = new PaperEntity();
111 110
        paper.setAttendersId(paperForm.getAttendersId());
112
        paper.setMeetingId(meetingId);
113 111
        paper.setTitle(paperForm.getTitle());
114 112
        paper.setUrl(paperForm.getUrl());
115 113
        paper.setType(paperForm.getType());
@ -141,7 +139,6 @@ public class PaperController {
141 139
        PaperEntity paper = new PaperEntity();
142 140
        paper.setId(paperForm.getId());
143 141
        paper.setAttendersId(paperForm.getAttendersId());
144
        paper.setMeetingId(meetingId);
145 142
        paper.setTitle(paperForm.getTitle());
146 143
        paper.setUrl(paperForm.getUrl());
147 144
        paper.setType(paperForm.getType());

+ 93 - 0
src/main/java/io/renren/modules/admin/controller/SignController.java

@ -0,0 +1,93 @@
1
package io.renren.modules.admin.controller;
2
3
import java.util.Arrays;
4
import java.util.Map;
5
6
import org.apache.shiro.authz.annotation.RequiresPermissions;
7
import org.springframework.beans.factory.annotation.Autowired;
8
import org.springframework.web.bind.annotation.PathVariable;
9
import org.springframework.web.bind.annotation.RequestBody;
10
import org.springframework.web.bind.annotation.RequestMapping;
11
import org.springframework.web.bind.annotation.RequestParam;
12
import org.springframework.web.bind.annotation.RestController;
13
14
import io.renren.modules.admin.entity.SignEntity;
15
import io.renren.modules.admin.entity.SignviewEntity;
16
import io.renren.modules.admin.service.SignService;
17
import io.renren.modules.admin.service.SignviewService;
18
import io.renren.common.utils.PageUtils;
19
import io.renren.common.utils.R;
20
21
22
23
/**
24
 * 签到表
25
 *
26
 * @author huwhois
27
 * @email huwhois@163.com
28
 * @date 2020-12-18 11:34:30
29
 */
30
@RestController
31
@RequestMapping("admin/sign")
32
public class SignController {
33
    @Autowired
34
    private SignService signService;
35
    @Autowired
36
    private SignviewService signviewService;
37
38
    /**
39
     * 列表
40
     */
41
    @RequestMapping("/list")
42
    @RequiresPermissions("admin:sign:list")
43
    public R list(@RequestParam Map<String, Object> params){
44
        PageUtils page = signviewService.queryPage(params);
45
46
        return R.ok().put("page", page);
47
    }
48
49
    /**
50
     * 信息
51
     */
52
    @RequestMapping("/info/{id}")
53
    @RequiresPermissions("admin:sign:info")
54
    public R info(@PathVariable("id") Long id){
55
		SignviewEntity sign = signviewService.getById(id);
56
57
        return R.ok().put("sign", sign);
58
    }
59
60
    /**
61
     * 保存
62
     */
63
    @RequestMapping("/save")
64
    @RequiresPermissions("admin:sign:save")
65
    public R save(@RequestBody SignEntity sign){
66
		signService.save(sign);
67
68
        return R.ok();
69
    }
70
71
    /**
72
     * 修改
73
     */
74
    @RequestMapping("/update")
75
    @RequiresPermissions("admin:sign:update")
76
    public R update(@RequestBody SignEntity sign){
77
		signService.updateById(sign);
78
79
        return R.ok();
80
    }
81
82
    /**
83
     * 删除
84
     */
85
    @RequestMapping("/delete")
86
    @RequiresPermissions("admin:sign:delete")
87
    public R delete(@RequestBody Long[] ids){
88
		signService.removeByIds(Arrays.asList(ids));
89
90
        return R.ok();
91
    }
92
93
}

+ 17 - 0
src/main/java/io/renren/modules/admin/dao/SignDao.java

@ -0,0 +1,17 @@
1
package io.renren.modules.admin.dao;
2
3
import io.renren.modules.admin.entity.SignEntity;
4
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5
import org.apache.ibatis.annotations.Mapper;
6
7
/**
8
 * 签到表
9
 * 
10
 * @author huwhois
11
 * @email huwhois@163.com
12
 * @date 2020-12-18 11:34:30
13
 */
14
@Mapper
15
public interface SignDao extends BaseMapper<SignEntity> {
16
	
17
}

+ 17 - 0
src/main/java/io/renren/modules/admin/dao/SignviewDao.java

@ -0,0 +1,17 @@
1
package io.renren.modules.admin.dao;
2
3
import io.renren.modules.admin.entity.SignviewEntity;
4
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
5
import org.apache.ibatis.annotations.Mapper;
6
7
/**
8
 * VIEW
9
 * 
10
 * @author huwhois
11
 * @email huwhois@163.com
12
 * @date 2020-12-18 11:34:20
13
 */
14
@Mapper
15
public interface SignviewDao extends BaseMapper<SignviewEntity> {
16
	
17
}

+ 0 - 4
src/main/java/io/renren/modules/admin/entity/PaperEntity.java

@ -25,10 +25,6 @@ public class PaperEntity implements Serializable {
25 25
     */
26 26
    @TableId
27 27
    private Long id;
28
    /**
29
     * 会议id
30
     */
31
    private Long meetingId;
32 28
    /**
33 29
     * 投稿人id(参会名单id)
34 30
     */

+ 68 - 0
src/main/java/io/renren/modules/admin/entity/SignEntity.java

@ -0,0 +1,68 @@
1
package io.renren.modules.admin.entity;
2
3
import com.baomidou.mybatisplus.annotation.TableId;
4
import com.baomidou.mybatisplus.annotation.TableName;
5
6
import java.io.Serializable;
7
import java.util.Date;
8
import lombok.Data;
9
10
/**
11
 * 签到表
12
 * 
13
 * @author huwhois
14
 * @email huwhois@163.com
15
 * @date 2020-12-18 11:34:30
16
 */
17
@Data
18
@TableName("sign")
19
public class SignEntity implements Serializable {
20
	private static final long serialVersionUID = 1L;
21
22
	/**
23
	 * 签到id
24
	 */
25
	@TableId
26
	private Long id;
27
	/**
28
	 * 参会人员id
29
	 */
30
	private Long attendersId;
31
	/**
32
	 * 签到状态
33
	 */
34
	private Integer status;
35
	/**
36
	 * 签到地点(主会场/分会场)
37
	 */
38
	private Long site;
39
	/**
40
	 * 是否打印胸卡
41
	 */
42
	private Integer badge;
43
	/**
44
	 * 打印次数
45
	 */
46
	private Integer printNum;
47
	/**
48
	 * 打印时间
49
	 */
50
	private Date printTime;
51
	/**
52
	 * 条码or二维码内容
53
	 */
54
	private String token;
55
	/**
56
	 * 最后签到时间
57
	 */
58
	private Date lastTime;
59
	/**
60
	 * 创建时间
61
	 */
62
	private Date createTime;
63
	/**
64
	 * 是否被删除 状态  0:正常   1:删除
65
	 */
66
	private Integer isDel;
67
68
}

+ 109 - 0
src/main/java/io/renren/modules/admin/entity/SignviewEntity.java

@ -0,0 +1,109 @@
1
package io.renren.modules.admin.entity;
2
3
import com.baomidou.mybatisplus.annotation.TableId;
4
import com.baomidou.mybatisplus.annotation.TableName;
5
6
import java.math.BigDecimal;
7
import java.io.Serializable;
8
import java.util.Date;
9
import lombok.Data;
10
11
/**
12
 * VIEW
13
 * 
14
 * @author huwhois
15
 * @email huwhois@163.com
16
 * @date 2020-12-18 11:34:20
17
 */
18
@Data
19
@TableName("signview")
20
public class SignviewEntity implements Serializable {
21
	private static final long serialVersionUID = 1L;
22
23
	/**
24
	 * 签到id
25
	 */
26
	@TableId
27
	private Long id;
28
	/**
29
	 * 会议名单id
30
	 */
31
	private Long aid;
32
	/**
33
	 * 名字
34
	 */
35
	private String truename;
36
	/**
37
	 * 单位名称
38
	 */
39
	private String organization;
40
	/**
41
	 * 电话
42
	 */
43
	private String phone;
44
	/**
45
	 * 标记
46
	 */
47
	private Integer flag;
48
	/**
49
	 * 备注
50
	 */
51
	private String remark;
52
	/**
53
	 * 用户类型 0,正常; 1, 免注册
54
	 */
55
	private Integer memberType;
56
	/**
57
	 * 注册(费用)类型 1, 普通, 2 学生
58
	 */
59
	private Integer feeType;
60
	/**
61
	 * 付款方式 1 现场缴费; 2 汇款
62
	 */
63
	private Integer payType;
64
	/**
65
	 * 是否缴费 0,未缴费; 1,已缴费
66
	 */
67
	private Integer isPay;
68
	/**
69
	 * 金额
70
	 */
71
	private BigDecimal money;
72
	/**
73
	 * 
74
	 */
75
	private Integer status;
76
	/**
77
	 * 是否打印胸卡
78
	 */
79
	private Integer badge;
80
	/**
81
	 * 签到地点(主会场/分会场)
82
	 */
83
	private Long site;
84
	/**
85
	 * 打印次数
86
	 */
87
	private Integer printNum;
88
	/**
89
	 * 打印时间
90
	 */
91
	private Date printTime;
92
	/**
93
	 * 条码or二维码内容
94
	 */
95
	private String token;
96
	/**
97
	 * 最后签到时间
98
	 */
99
	private Date lastTime;
100
	/**
101
	 * 创建时间
102
	 */
103
	private Date createTime;
104
	/**
105
	 * 标识
106
	 */
107
	private String symbol;
108
109
}

+ 20 - 0
src/main/java/io/renren/modules/admin/service/SignService.java

@ -0,0 +1,20 @@
1
package io.renren.modules.admin.service;
2
3
import com.baomidou.mybatisplus.extension.service.IService;
4
import io.renren.common.utils.PageUtils;
5
import io.renren.modules.admin.entity.SignEntity;
6
7
import java.util.Map;
8
9
/**
10
 * 签到表
11
 *
12
 * @author huwhois
13
 * @email huwhois@163.com
14
 * @date 2020-12-18 11:34:30
15
 */
16
public interface SignService extends IService<SignEntity> {
17
18
    PageUtils queryPage(Map<String, Object> params);
19
}
20

+ 20 - 0
src/main/java/io/renren/modules/admin/service/SignviewService.java

@ -0,0 +1,20 @@
1
package io.renren.modules.admin.service;
2
3
import com.baomidou.mybatisplus.extension.service.IService;
4
import io.renren.common.utils.PageUtils;
5
import io.renren.modules.admin.entity.SignviewEntity;
6
7
import java.util.Map;
8
9
/**
10
 * VIEW
11
 *
12
 * @author huwhois
13
 * @email huwhois@163.com
14
 * @date 2020-12-18 11:34:20
15
 */
16
public interface SignviewService extends IService<SignviewEntity> {
17
18
    PageUtils queryPage(Map<String, Object> params);
19
}
20

+ 29 - 0
src/main/java/io/renren/modules/admin/service/impl/SignServiceImpl.java

@ -0,0 +1,29 @@
1
package io.renren.modules.admin.service.impl;
2
3
import org.springframework.stereotype.Service;
4
import java.util.Map;
5
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
6
import com.baomidou.mybatisplus.core.metadata.IPage;
7
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
8
import io.renren.common.utils.PageUtils;
9
import io.renren.common.utils.Query;
10
11
import io.renren.modules.admin.dao.SignDao;
12
import io.renren.modules.admin.entity.SignEntity;
13
import io.renren.modules.admin.service.SignService;
14
15
16
@Service("signService")
17
public class SignServiceImpl extends ServiceImpl<SignDao, SignEntity> implements SignService {
18
19
    @Override
20
    public PageUtils queryPage(Map<String, Object> params) {
21
        IPage<SignEntity> page = this.page(
22
                new Query<SignEntity>().getPage(params),
23
                new QueryWrapper<SignEntity>()
24
        );
25
26
        return new PageUtils(page);
27
    }
28
29
}

+ 29 - 0
src/main/java/io/renren/modules/admin/service/impl/SignviewServiceImpl.java

@ -0,0 +1,29 @@
1
package io.renren.modules.admin.service.impl;
2
3
import org.springframework.stereotype.Service;
4
import java.util.Map;
5
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
6
import com.baomidou.mybatisplus.core.metadata.IPage;
7
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
8
import io.renren.common.utils.PageUtils;
9
import io.renren.common.utils.Query;
10
11
import io.renren.modules.admin.dao.SignviewDao;
12
import io.renren.modules.admin.entity.SignviewEntity;
13
import io.renren.modules.admin.service.SignviewService;
14
15
16
@Service("signviewService")
17
public class SignviewServiceImpl extends ServiceImpl<SignviewDao, SignviewEntity> implements SignviewService {
18
19
    @Override
20
    public PageUtils queryPage(Map<String, Object> params) {
21
        IPage<SignviewEntity> page = this.page(
22
                new Query<SignviewEntity>().getPage(params),
23
                new QueryWrapper<SignviewEntity>()
24
        );
25
26
        return new PageUtils(page);
27
    }
28
29
}