瀏覽代碼

酒店信息 等等

huwhois 3 年之前
父節點
當前提交
e0d1e847a7

+ 10 - 0
src/main/java/io/renren/common/utils/ConfigEmail.java

@ -0,0 +1,10 @@
1
package io.renren.common.utils;
2
3
public class ConfigEmail {
4
    public final static String username = "qyx@ecorr.org";
5
    public final static String password = "Ecorr1234";
6
    public final static String host = "smtp.global-mail.cn";
7
    public final static Integer port = 465;
8
    public final static String protocol = "smtp";
9
    public final static String defaultencoding = "UTF-8";
10
}

+ 211 - 0
src/main/java/io/renren/common/utils/MailUtils.java

@ -0,0 +1,211 @@
1
package io.renren.common.utils;
2
3
import java.io.File;
4
import java.util.Arrays;
5
import java.util.Properties;
6
7
import javax.mail.MessagingException;
8
import javax.mail.internet.MimeMessage;
9
10
import org.springframework.mail.javamail.JavaMailSenderImpl;
11
import org.springframework.mail.javamail.MimeMessageHelper;
12
import io.renren.common.utils.ConfigEmail;
13
14
public class MailUtils {
15
16
    /**
17
     * 发送邮件的方法
18
     * @Param to :给谁发邮件
19
     * @Param subject : 主题
20
     * @Param text  : 内容
21
     *
22
     */
23
    public static void sendMail(String toEmail, final String subject,final String text){
24
        try{
25
            //1、创建邮件对象
26
            JavaMailSenderImpl javaMailSender = makeJavaMailSender();
27
            //10、创建
28
            MimeMessage mimeMessage = getMimeMessage(toEmail, subject, text, javaMailSender);
29
            // 11、发送邮件
30
            javaMailSender.send(mimeMessage);
31
32
            System.out.println("发往 " + toEmail + " 邮件发送成功");
33
        } catch (MessagingException e) {
34
            System.out.println("发往 " + toEmail + " 邮件发送异常");
35
            e.printStackTrace();
36
        }
37
    }
38
39
    /**
40
     * 发送邮件的方法
41
     * @Param to :给谁发邮件
42
     * @Param subject : 主题
43
     * @Param text  : 内容
44
     *
45
     */
46
    public static void sendMail(String[] toEmail, final String subject,final String text){
47
        try{
48
            //1、创建邮件对象
49
            JavaMailSenderImpl javaMailSender = makeJavaMailSender();
50
            //10、创建
51
            MimeMessage mimeMessage = getMimeMessage(toEmail, subject, text, javaMailSender);
52
            // 11、发送邮件
53
            javaMailSender.send(mimeMessage);
54
55
            System.out.println("发往 " + toEmail + " 邮件发送成功");
56
        } catch (MessagingException e) {
57
            System.out.println("发往 " + toEmail + " 邮件发送异常");
58
            e.printStackTrace();
59
        }
60
    }
61
62
    /**
63
     * 创建邮件对象
64
     * @return
65
     */
66
    private static JavaMailSenderImpl makeJavaMailSender() {
67
        //1、创建邮件对象
68
        JavaMailSenderImpl javaMailSender = new JavaMailSenderImpl();
69
        //2、发邮件人邮箱
70
        // javaMailSender.setUsername(emailConfig.getUsername());
71
        javaMailSender.setUsername(ConfigEmail.username);
72
        //3、发邮件人邮箱密码(默认使用客户端的授权码)
73
        javaMailSender.setPassword(ConfigEmail.password);
74
        //4、设置邮件服务器主机名  SMTP服务器地址
75
        javaMailSender.setHost(ConfigEmail.host);
76
        //5、SMTP服务器: 默认端口
77
        javaMailSender.setPort(ConfigEmail.port);
78
        //6、//发送邮件协议名称
79
        javaMailSender.setProtocol(ConfigEmail.protocol);
80
        //7、编码格式
81
        javaMailSender.setDefaultEncoding(ConfigEmail.defaultencoding);
82
83
        //8、创建连接对象,连接到邮箱服务器
84
        Properties mailProperties = new Properties();
85
        //发送服务器需要身份验证,要采用指定用户名密码的方式去认证
86
        mailProperties.put("mail.smtp.auth", true);
87
        mailProperties.put("mail.smtp.starttls.enable", true);
88
89
        //9、添加连接对象到邮件对象中
90
        javaMailSender.setJavaMailProperties(mailProperties);
91
92
        return javaMailSender;
93
    }
94
    
95
    private static MimeMessage getMimeMessage(String toEmail, String subject, String text,
96
        JavaMailSenderImpl javaMailSender) throws MessagingException {
97
98
        MimeMessage mimeMessage = javaMailSender.createMimeMessage();
99
100
        MimeMessageHelper mimeMessageHelper = new MimeMessageHelper(mimeMessage, true, "UTF-8");
101
        //发件人
102
        mimeMessageHelper.setFrom(ConfigEmail.username);
103
        //收件人  : 可以发送给多个收件人,该方法有一个重载的 数组形参
104
        mimeMessageHelper.setTo(toEmail);
105
    //        mimeMessage.setContent();
106
107
        //邮件主题
108
        mimeMessageHelper.setSubject(subject);
109
        //邮件内容(html格式)
110
        mimeMessageHelper.setText(text, true);
111
112
        return mimeMessage;
113
    }
114
115
    private static MimeMessage getMimeMessage(String[] toEmail, String subject, String text,
116
        JavaMailSenderImpl javaMailSender) throws MessagingException {
117
118
        MimeMessage mimeMessage = javaMailSender.createMimeMessage();
119
120
        MimeMessageHelper mimeMessageHelper = new MimeMessageHelper(mimeMessage, true, "UTF-8");
121
        //发件人
122
        mimeMessageHelper.setFrom(ConfigEmail.username);
123
        //收件人  : 可以发送给多个收件人,该方法有一个重载的 数组形参
124
        mimeMessageHelper.setTo(toEmail);
125
    //        mimeMessage.setContent();
126
127
        //邮件主题
128
        mimeMessageHelper.setSubject(subject);
129
        //邮件内容(html格式)
130
        mimeMessageHelper.setText(text, true);
131
132
        return mimeMessage;
133
    }
134
135
    /**
136
     * 发送邮件的方法
137
     * @Param to :给谁发邮件
138
     * @Param subject : 主题
139
     * @Param text  : 内容
140
     *
141
     */
142
    public static void sendMail(String[] toEmail, final String subject,final String text,final String[] attachmentFilename, final File[] file){
143
        try{
144
            //1、创建邮件对象
145
            JavaMailSenderImpl javaMailSender = new JavaMailSenderImpl();
146
            //2、发邮件人邮箱
147
            // javaMailSender.setUsername(emailConfig.getUsername());
148
            javaMailSender.setUsername(ConfigEmail.username);
149
            //3、发邮件人邮箱密码(默认使用客户端的授权码)
150
            javaMailSender.setPassword(ConfigEmail.password);
151
            //4、设置邮件服务器主机名  SMTP服务器地址
152
            javaMailSender.setHost(ConfigEmail.host);
153
            //5、SMTP服务器: 默认端口
154
            javaMailSender.setPort(ConfigEmail.port);
155
            //6、//发送邮件协议名称
156
            javaMailSender.setProtocol(ConfigEmail.protocol);
157
            //7、编码格式
158
            javaMailSender.setDefaultEncoding(ConfigEmail.defaultencoding);
159
    
160
            //8、创建连接对象,连接到邮箱服务器
161
            Properties mailProperties = new Properties();
162
            //发送服务器需要身份验证,要采用指定用户名密码的方式去认证
163
            mailProperties.put("mail.smtp.auth", true);
164
            mailProperties.put("mail.smtp.starttls.enable", true);
165
    
166
            //9、添加连接对象到邮件对象中
167
            javaMailSender.setJavaMailProperties(mailProperties);
168
            
169
            //10、创建
170
            // MimeMessage mimeMessage = getMimeMessage(toEmail, subject, text, javaMailSender);
171
            MimeMessage mimeMessage = javaMailSender.createMimeMessage();
172
173
            MimeMessageHelper mimeMessageHelper = new MimeMessageHelper(mimeMessage, true, "UTF-8");
174
            //发件人
175
            mimeMessageHelper.setFrom(ConfigEmail.username);
176
            //收件人  : 可以发送给多个收件人,该方法有一个重载的 数组形参
177
            mimeMessageHelper.setTo(toEmail);
178
        //        mimeMessage.setContent();
179
    
180
            //邮件主题
181
            mimeMessageHelper.setSubject(subject);
182
            //邮件内容(html格式)
183
            mimeMessageHelper.setText(text, true);
184
            //附件
185
            for (int i = 0; i < attachmentFilename.length; i++) {
186
                mimeMessageHelper.addAttachment(attachmentFilename[i], file[i]);
187
            }
188
189
            // 11、发送邮件
190
            javaMailSender.send(mimeMessage);
191
192
            System.out.println("发往 " + Arrays.toString(toEmail) + " 邮件发送成功");
193
        } catch (MessagingException e) {
194
            System.out.println("发往 " + Arrays.toString(toEmail) + " 邮件发送异常");
195
            e.printStackTrace();
196
        }
197
    }
198
199
    public static void main(String[] args) {
200
        String[] toEmail = {"3146695982@qq.com", "282188280@qq.com"};
201
        String subject = "Spring-boot Email 测试";
202
        String text = "<h2>测试<h2><p>这是一个测试</p>";
203
        String[] filename = {"测试.txt", "测试2.txt"};
204
205
        File file1 = new File("E:/ecorr/PHPMailer/fujian1.pdf");
206
        File file2 = new File("E:/ecorr/PHPMailer/fujian2.pdf");
207
        File[] file = {file1, file2};
208
209
        MailUtils.sendMail(toEmail, subject, text, filename, file);
210
    }
211
}

+ 2 - 1
src/main/java/io/renren/common/validator/Assert.java

@ -34,7 +34,8 @@ public abstract class Assert {
34 34
    }
35 35
36 36
    public static void isNotPhone(String phone) {
37
        String phone_regex = "^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(17[013678])|(18[0,5-9]))\\d{8}$";
37
        // String phone_regex = "^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(17[013678])|(18[0,5-9]))\\d{8}$";
38
        String phone_regex = "^1[3|4|5|6|7|8|9][0-9]\\d{4,8}$";
38 39
        Pattern p = Pattern.compile(phone_regex);
39 40
        if (phone.length() != 11 || !p.matcher(phone).matches()) {
40 41
            throw new RRException("手机号格式不正确");

+ 95 - 0
src/main/java/io/renren/modules/admin/controller/HotalController.java

@ -0,0 +1,95 @@
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.AttendersEntity;
15
import io.renren.modules.admin.entity.HotalEntity;
16
import io.renren.modules.admin.service.AttendersService;
17
import io.renren.modules.admin.service.HotalService;
18
import io.renren.common.utils.PageUtils;
19
import io.renren.common.utils.R;
20
21
22
23
/**
24
 * VIEW
25
 *
26
 * @author huwhois
27
 * @email huwhois@163.com
28
 * @date 2021-06-08 09:39:30
29
 */
30
@RestController
31
@RequestMapping("admin/hotal")
32
public class HotalController {
33
    @Autowired
34
    private HotalService hotalService;
35
    @Autowired
36
    private AttendersService attendersService;
37
38
    /**
39
     * 列表
40
     */
41
    @RequestMapping("/list/{mid}")
42
    @RequiresPermissions("admin:hotal:list")
43
    public R list(@RequestParam Map<String, Object> params, @PathVariable("mid") Long mid){
44
        PageUtils page = hotalService.queryPage(params, mid);
45
46
        return R.ok().put("page", page);
47
    }
48
49
    /**
50
     * 信息
51
     */
52
    @RequestMapping("/info/{aid}")
53
    @RequiresPermissions("admin:hotal:info")
54
    public R info(@PathVariable("aid") Long aid){
55
		HotalEntity hotal = hotalService.getById(aid);
56
57
        return R.ok().put("hotal", hotal);
58
    }
59
60
    /**
61
     * 修改
62
     */
63
    @RequestMapping("/update")
64
    @RequiresPermissions("admin:hotal:update")
65
    public R update(@RequestBody HotalEntity hotal){
66
		AttendersEntity attenders = attendersService.getById(hotal.getAid());
67
        attenders.setHotelType(hotal.getHotelType());
68
        attenders.setIsShare(hotal.getIsShare());
69
        attenders.setRoomType(hotal.getRoomType());
70
        attenders.setCheckInDate(hotal.getCheckInDate());
71
        attenders.setCheckOutDate(hotal.getCheckOutDate());
72
73
        attendersService.updateById(attenders);
74
75
        return R.ok();
76
    }
77
78
    /**
79
     * 删除
80
     */
81
    @RequestMapping("/delete/{aid}")
82
    @RequiresPermissions("admin:hotal:delete")
83
    public R delete(@PathVariable("aid") Long aid){
84
        AttendersEntity attenders = attendersService.getById(aid);
85
        attenders.setHotelType(0);
86
        attenders.setIsShare(0);
87
        attenders.setRoomType(0);
88
        attenders.setCheckInDate(null);
89
        attenders.setCheckOutDate(null);
90
91
        attendersService.updateById(attenders);
92
        return R.ok();
93
    }
94
95
}

+ 2 - 2
src/main/java/io/renren/modules/admin/controller/MemberController.java

@ -336,8 +336,8 @@ public class MemberController extends AbstractController {
336 336
        }
337 337
    }
338 338
339
        /**
340
     * 导出最近上传出租哦文件
339
    /**
340
     * 导出最近上传出文件
341 341
     * @param response
342 342
     */
343 343
    @GetMapping("downloadfails")

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

@ -0,0 +1,17 @@
1
package io.renren.modules.admin.dao;
2
3
import io.renren.modules.admin.entity.HotalEntity;
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 2021-06-08 09:39:30
13
 */
14
@Mapper
15
public interface HotalDao extends BaseMapper<HotalEntity> {
16
	
17
}

+ 72 - 0
src/main/java/io/renren/modules/admin/entity/HotalEntity.java

@ -0,0 +1,72 @@
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
 * VIEW
12
 * 
13
 * @author huwhois
14
 * @email huwhois@163.com
15
 * @date 2021-06-08 09:39:30
16
 */
17
@Data
18
@TableName("hotal")
19
public class HotalEntity implements Serializable {
20
	private static final long serialVersionUID = 1L;
21
22
	/**
23
	 * id
24
	 */
25
	@TableId
26
	private Long aid;
27
	/**
28
	 * 会议id
29
	 */
30
	private Long meetingId;
31
	/**
32
	 * 名字
33
	 */
34
	private String truename;
35
	/**
36
	 * 电话
37
	 */
38
	private String phone;
39
	/**
40
	 * 单位名称
41
	 */
42
	private String organization;
43
	/**
44
	 * 职位
45
	 */
46
	private String position;
47
	/**
48
	 * 会员id
49
	 */
50
	private Long memberId;
51
	/**
52
	 * 酒店入住时间
53
	 */
54
	private Date checkInDate;
55
	/**
56
	 * 酒店离店时间
57
	 */
58
	private Date checkOutDate;
59
	/**
60
	 * 0不合住, 1可合住
61
	 */
62
	private Integer isShare;
63
	/**
64
	 * 房 型
65
	 */
66
	private Integer roomType;
67
	/**
68
	 * 酒店 1,会议合作; 2,其他
69
	 */
70
	private Integer hotelType;
71
72
}

+ 1 - 1
src/main/java/io/renren/modules/admin/entity/MemberEntity.java

@ -26,7 +26,7 @@ public class MemberEntity implements Serializable {
26 26
    private static final long serialVersionUID = 1L;
27 27
28 28
    /**
29
     * 
29
     * id
30 30
     */
31 31
    @TableId
32 32
    private Long id;

+ 6 - 5
src/main/java/io/renren/modules/admin/entity/PaperEntity.java

@ -1,5 +1,6 @@
1 1
package io.renren.modules.admin.entity;
2 2
3
import com.baomidou.mybatisplus.annotation.TableField;
3 4
import com.baomidou.mybatisplus.annotation.TableId;
4 5
import com.baomidou.mybatisplus.annotation.TableName;
5 6
@ -29,6 +30,11 @@ public class PaperEntity implements Serializable {
29 30
     * 投稿人id(参会名单id)
30 31
     */
31 32
    private Long attendersId;
33
     /**
34
     * 会议id
35
     */
36
    @TableField(exist = false)
37
    private Long meetingId;
32 38
    /**
33 39
     * 论文题目
34 40
     */
@ -65,9 +71,4 @@ public class PaperEntity implements Serializable {
65 71
     * 创建时间
66 72
     */
67 73
    private Date createTime;
68
    /**
69
     * 是否被删除 状态  0:正常   1:删除
70
     */
71
    private Integer isDel;
72
73 74
}

+ 20 - 0
src/main/java/io/renren/modules/admin/service/HotalService.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.HotalEntity;
6
7
import java.util.Map;
8
9
/**
10
 * VIEW
11
 *
12
 * @author huwhois
13
 * @email huwhois@163.com
14
 * @date 2021-06-08 09:39:30
15
 */
16
public interface HotalService extends IService<HotalEntity> {
17
18
    PageUtils queryPage(Map<String, Object> params, Long meetingId);
19
}
20

+ 36 - 0
src/main/java/io/renren/modules/admin/service/impl/HotalServiceImpl.java

@ -0,0 +1,36 @@
1
package io.renren.modules.admin.service.impl;
2
3
import org.apache.commons.lang.StringUtils;
4
import org.springframework.stereotype.Service;
5
import java.util.Map;
6
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
7
import com.baomidou.mybatisplus.core.metadata.IPage;
8
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
9
import io.renren.common.utils.PageUtils;
10
import io.renren.common.utils.Query;
11
12
import io.renren.modules.admin.dao.HotalDao;
13
import io.renren.modules.admin.entity.HotalEntity;
14
import io.renren.modules.admin.service.HotalService;
15
16
17
@Service("hotalService")
18
public class HotalServiceImpl extends ServiceImpl<HotalDao, HotalEntity> implements HotalService {
19
20
    @Override
21
    public PageUtils queryPage(Map<String, Object> params, Long meetingId) {
22
        String key = (String) params.get("key");
23
24
        IPage<HotalEntity> page = this.page(
25
                new Query<HotalEntity>().getPage(params),
26
                new QueryWrapper<HotalEntity>()
27
                .eq("meeting_id", meetingId)
28
                .like(StringUtils.isNotBlank(key),"truename", key)
29
                .or()
30
                .like(StringUtils.isNotBlank(key),"organization", key)
31
        );
32
33
        return new PageUtils(page);
34
    }
35
36
}

+ 5 - 5
src/main/java/io/renren/modules/app/controller/AppAttendersController.java

@ -9,7 +9,7 @@ import io.renren.modules.admin.service.AttendersService;
9 9
import io.renren.modules.admin.service.AttendersviewService;
10 10
import io.renren.modules.admin.service.MemberService;
11 11
import io.renren.modules.app.annotation.Login;
12
import io.renren.modules.app.form.HotalForm;
12
import io.renren.modules.admin.entity.HotalEntity;
13 13
14 14
import java.util.Date;
15 15
@ -117,8 +117,8 @@ public class AppAttendersController {
117 117
            return R.error("未找到您的报名信息, 请先报名参会.");
118 118
        }
119 119
        
120
        HotalForm hotal = new HotalForm();
121
        hotal.setId(attenders.getId());
120
        HotalEntity hotal = new HotalEntity();
121
        hotal.setAid(attenders.getId());
122 122
        hotal.setMeetingId(mid);
123 123
        hotal.setHotelType(attenders.getHotelType());
124 124
        hotal.setIsShare(attenders.getIsShare());
@ -131,8 +131,8 @@ public class AppAttendersController {
131 131
132 132
    @Login
133 133
    @PostMapping("/hotalsave")
134
    public R saveHotal(@RequestBody HotalForm hotalForm){
135
        AttendersEntity attenders = attendersService.getById(hotalForm.getId());
134
    public R saveHotal(@RequestBody HotalEntity hotalForm){
135
        AttendersEntity attenders = attendersService.getById(hotalForm.getAid());
136 136
        attenders.setHotelType(hotalForm.getHotelType());
137 137
        attenders.setIsShare(hotalForm.getIsShare());
138 138
        attenders.setRoomType(hotalForm.getRoomType());

+ 1 - 0
src/main/java/io/renren/modules/app/controller/AppLoginController.java

@ -49,6 +49,7 @@ public class AppLoginController {
49 49
        //表单校验
50 50
        ValidatorUtils.validateEntity(form);
51 51
52
        
52 53
        smsCodeService.validate(form.getUuid(), form.getCode(), form.getPhone());
53 54
54 55
        //用户登录

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

@ -3,7 +3,6 @@ package io.renren.modules.app.controller;
3 3
import java.util.List;
4 4
5 5
import org.springframework.beans.factory.annotation.Autowired;
6
import org.springframework.beans.factory.annotation.Value;
7 6
import org.springframework.web.bind.annotation.GetMapping;
8 7
import org.springframework.web.bind.annotation.PathVariable;
9 8
import org.springframework.web.bind.annotation.RequestMapping;
@ -25,8 +24,6 @@ import io.renren.common.utils.R;
25 24
public class AppMeetingController {
26 25
    @Autowired
27 26
    private MeetingService meetingService;
28
    @Value("${fyhs-meeting.meetingId}")
29
    private Long meetingId;
30 27
    /**
31 28
     * 列表
32 29
     */
@ -55,20 +52,4 @@ public class AppMeetingController {
55 52
        return R.ok().put("list", list);
56 53
    }
57 54
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
    }
74 55
}

+ 57 - 0
src/main/java/io/renren/modules/app/controller/AppMemberController.java

@ -0,0 +1,57 @@
1
package io.renren.modules.app.controller;
2
3
import org.springframework.beans.factory.annotation.Autowired;
4
import org.springframework.web.bind.annotation.GetMapping;
5
import org.springframework.web.bind.annotation.PostMapping;
6
import org.springframework.web.bind.annotation.RequestAttribute;
7
import org.springframework.web.bind.annotation.RequestMapping;
8
import org.springframework.web.bind.annotation.RestController;
9
10
import io.renren.common.utils.R;
11
import io.renren.modules.admin.entity.MemberEntity;
12
import io.renren.modules.admin.service.MemberService;
13
import io.renren.modules.app.annotation.Login;
14
import io.renren.modules.app.form.TaxForm;
15
16
/**
17
 * 会员个人信息
18
 */
19
@RestController
20
@RequestMapping("/app/member")
21
public class AppMemberController {
22
    @Autowired
23
    private MemberService memberService;
24
25
    @Login
26
    @GetMapping("/info")
27
    public R userInfo(@RequestAttribute("userId") Integer userId) {
28
        Long mid = userId.longValue();
29
        
30
        MemberEntity member = memberService.getById(mid);
31
32
        return R.ok().put("member", member);
33
    }
34
35
    @Login
36
    @PostMapping("/taxsave")
37
    public R taxSave(@RequestAttribute("userId") Integer userId, TaxForm tax) {
38
        Long mid = userId.longValue();
39
        
40
        MemberEntity member = memberService.getById(mid);
41
        // MemberEntity member = new MemberEntity();
42
        member.setId(mid);
43
        member.setTaxType(tax.getTaxType());
44
        member.setTaxTitle(tax.getTaxTitle());
45
        member.setTaxNumber(tax.getTaxNumber());
46
        member.setCompanyAddress(tax.getCompanyAddress());
47
        member.setCompanyPhone(tax.getCompanyPhone());
48
        member.setBankAccount(tax.getBankAccount());
49
        member.setBankAccount(tax.getBankAccount());
50
        member.setMailingAddress(tax.getMailingAddress());
51
        member.setPostcode(tax.getPostcode());
52
53
        memberService.updateById(member);
54
55
        return R.ok();
56
    } 
57
}

+ 14 - 29
src/main/java/io/renren/modules/app/controller/AppPaperController.java

@ -6,6 +6,7 @@ import java.util.Map;
6 6
7 7
import org.springframework.beans.factory.annotation.Autowired;
8 8
import org.springframework.web.bind.annotation.PostMapping;
9
import org.springframework.web.bind.annotation.RequestAttribute;
9 10
import org.springframework.web.bind.annotation.RequestBody;
10 11
import org.springframework.web.bind.annotation.RequestMapping;
11 12
import org.springframework.web.bind.annotation.RestController;
@ -21,6 +22,7 @@ import io.renren.modules.admin.service.AttendersService;
21 22
import io.renren.modules.admin.service.AttendersviewService;
22 23
import io.renren.modules.admin.service.MemberService;
23 24
import io.renren.modules.admin.service.PaperService;
25
import io.renren.modules.app.annotation.Login;
24 26
25 27
26 28
/**
@ -36,48 +38,31 @@ public class AppPaperController {
36 38
    private PaperService paperService;
37 39
    @Autowired
38 40
    private AttendersService attendersService;
39
    @Autowired
40
    private AttendersviewService attendersviewService;
41
    @Autowired
42
    private MemberService memberService;
43 41
44 42
    /**
45 43
     * 保存
46 44
     */
45
    @Login
47 46
    @PostMapping("/save")
48
    public R save(@RequestBody PaperviewEntity paperForm){
49
        Long meetingId = paperForm.getMeetingId();
47
    public R save(@RequestBody PaperEntity paper, @RequestAttribute("userId") Integer userId){
48
        Long meetingId = paper.getMeetingId();
50 49
        if (meetingId == null || meetingId == 0L) {
51 50
            return R.error("会议id不可为空");
52 51
        }
52
        Long uid = userId.longValue();
53 53
54
        if (paperForm.getAttendersId()==null || paperForm.getAttendersId()==0L) {
55
            String symbol = MyUtils.md5(paperForm.getTruename() + paperForm.getPhone());
56
57
            AttendersviewEntity attendersview = attendersviewService.getBySymbolAndMid(symbol, meetingId);
58
            
59
            if (attendersview==null) {
60
                MemberEntity member = memberService.saveMember(paperForm.getTruename(), paperForm.getPhone(), paperForm.getOrganization(), null);
54
        AttendersEntity attenders = attendersService.getByMMId(uid, meetingId);
61 55
62
                Long memberId = member.getId();
63
                // 存参会信息 
64
                AttendersEntity attenders = new AttendersEntity();
65
                attenders.setMemberId(memberId);
66
                attenders.setMeetingId(meetingId);
67
                attendersService.save(attenders);
68
                paperForm.setAttendersId(attenders.getId());
69
            } else {
70
                paperForm.setAttendersId(attendersview.getId());
71
            }
56
        if (attenders == null) {
57
            return R.error("报名信息为空, 请先报名参会");
72 58
        }
73 59
74
        PaperEntity paper = new PaperEntity();
75
        paper.setAttendersId(paperForm.getAttendersId());
76
        paper.setTitle(paperForm.getTitle());
77
        paper.setUrl(paperForm.getUrl());
78
        paper.setType(paperForm.getType());
60
        paper.setAttendersId(attenders.getId());
61
        paper.setTitle(paper.getTitle());
62
        paper.setUrl(paper.getUrl());
63
        paper.setType(paper.getType());
79 64
        paper.setStatus(0);
80
        paper.setRemark(paperForm.getRemark());
65
        paper.setRemark(paper.getRemark());
81 66
        paper.setCreateTime(new Date());
82 67
83 68
        paperService.save(paper);

+ 0 - 39
src/main/java/io/renren/modules/app/form/HotalForm.java

@ -1,39 +0,0 @@
1
package io.renren.modules.app.form;
2
3
import lombok.Data;
4
import java.util.Date;
5
6
/**
7
 * 酒店信息表单
8
 */
9
@Data
10
public class HotalForm {
11
    /**
12
     *  会议名单id
13
     */
14
    private Long id;
15
    /**
16
     * 酒店会议id
17
     */
18
    private Long meetingId;
19
    /**
20
     * 酒店 1,会议合作; 2,其他
21
     */
22
    private Integer hotelType;
23
    /**
24
     * 房 型
25
     */
26
    private Integer roomType;
27
    /**
28
     * 房 型
29
     */
30
    private Integer isShare;
31
    /**
32
     * 酒店入住信息
33
     */
34
    private Date checkInDate;
35
    /**
36
     * 酒店离店信息
37
     */
38
    private Date checkOutDate;
39
}

+ 50 - 0
src/main/java/io/renren/modules/app/form/TaxForm.java

@ -0,0 +1,50 @@
1
package io.renren.modules.app.form;
2
3
import java.io.Serializable;
4
5
import lombok.Data;
6
7
/**
8
 * 
9
 * 
10
 * @author huwhois
11
 * @email huwhois@163.com
12
 * @date 2020-12-09 14:33:56
13
 */
14
@Data
15
public class TaxForm implements Serializable {
16
    private static final long serialVersionUID = 1L;
17
18
    /**
19
     * 开票类型
20
     */
21
    private Integer taxType;
22
    /**
23
     * 公司名称
24
     */
25
    private String taxTitle;
26
    /**
27
     * 纳税人识别号
28
     */
29
    private String taxNumber;
30
    /**
31
     * 公司地址
32
     */
33
    private String companyAddress;
34
    /**
35
     * 公司电话
36
     */
37
    private String companyPhone;
38
    /**
39
     * 开户行及账号
40
     */
41
    private String bankAccount;
42
    /**
43
     * 邮寄地址
44
     */
45
    private String mailingAddress;
46
    /**
47
     * 邮编
48
     */
49
    private String postcode;
50
}

+ 130 - 0
src/main/java/io/renren/modules/sys/controller/SysEmailController.java

@ -0,0 +1,130 @@
1
package io.renren.modules.sys.controller;
2
3
import java.io.File;
4
import java.io.IOException;
5
import java.util.ArrayList;
6
import java.util.List;
7
import java.util.Map;
8
import java.util.UUID;
9
10
import org.apache.commons.lang.StringUtils;
11
import org.springframework.beans.factory.annotation.Autowired;
12
import org.springframework.beans.factory.annotation.Value;
13
import org.springframework.context.annotation.Configuration;
14
import org.springframework.web.bind.annotation.PostMapping;
15
import org.springframework.web.bind.annotation.RequestBody;
16
import org.springframework.web.bind.annotation.RequestMapping;
17
import org.springframework.web.bind.annotation.RequestParam;
18
import org.springframework.web.bind.annotation.RestController;
19
import org.springframework.web.multipart.MultipartFile;
20
21
import io.renren.common.utils.MailUtils;
22
import io.renren.common.utils.R;
23
import io.renren.modules.sys.entity.SysEmailEntity;
24
import io.renren.modules.sys.form.SysEmailForm;
25
import io.renren.modules.sys.service.SysEmailService;
26
import io.renren.modules.sys.controller.AbstractController;
27
28
/**
29
 * Captcha by huwhois time 2019/11/22
30
 */
31
@RestController
32
@RequestMapping("/sys/mail")
33
@Configuration
34
public class SysEmailController extends AbstractController  {
35
    @Value("${fyhs-meeting.file.datapath}")
36
    private String dataPath; // 读取配置文件中的指定目录
37
38
    @Value("${fyhs-meeting.file.uploadFolder}")
39
    private String uploadFolder; // 读取配置文件中的指定目录
40
41
    @Autowired
42
	private SysEmailService sysEmailService;
43
    
44
    @PostMapping("sendEmailTest")
45
    public R sendEmailTest() {
46
        String[] toEmail = {"3146695982@qq.com", "282188280@qq.com"};
47
        String subject = "Spring-boot Email 测试";
48
        String text = "<h2>测试<h2><p>这是一个测试</p>";
49
        String[] filename = {"测试.txt", "测试2.txt"};
50
51
        File file1 = new File(dataPath + uploadFolder + "/documents/" + "23123.txt");
52
        File file2 = new File(dataPath + uploadFolder + "/documents/" + "23123.txt");
53
        File[] file = {file1, file2};
54
55
        MailUtils.sendMail(toEmail, subject, text, filename, file);
56
        return R.ok();
57
    }
58
59
    @PostMapping("send")
60
    public R sendEmail(@RequestBody String[] emails) {
61
        SysEmailEntity sysEmail = sysEmailService.getById(1);
62
        if (emails.length == 0) {
63
            return R.error("邮箱不能为空");
64
        }
65
66
        String[] toEmail = emails;
67
        String subject = sysEmail.getSubject();
68
        String text = sysEmail.getText();
69
        String filename = sysEmail.getFilename();
70
        String[] filenames = filename.split(",");
71
        String  fileurl = sysEmail.getFileurl();
72
        String[] fileurls = fileurl.split(",");
73
        File[] files = new File[fileurls.length];
74
        for (int i = 0; i < fileurls.length; i++) {
75
            files[i] = new File(dataPath + fileurls[i]);
76
        }
77
78
        MailUtils.sendMail(toEmail, subject, text, filenames, files);
79
        return R.ok();
80
    }
81
82
    @PostMapping("update")
83
    public R update(@RequestBody SysEmailForm sysEmail) {
84
        SysEmailEntity email = new SysEmailEntity();
85
        email.setId(1L);
86
        email.setSubject(sysEmail.getSubject());
87
        email.setText(sysEmail.getText());
88
        email.setFilename(StringUtils.join(sysEmail.getFilename(), ","));
89
        email.setFileurl(StringUtils.join(sysEmail.getFileurl(), ","));
90
        
91
        sysEmailService.updateById(email);
92
        return R.ok();
93
    }
94
95
    @PostMapping("/upload")
96
    public R upload(@RequestParam(value = "upload_file") MultipartFile file) throws IOException {
97
        if (file.isEmpty()) {
98
            return R.error("文件不能为空");
99
        }
100
                
101
        String fileOldName = file.getOriginalFilename();
102
        // 上传的附件不允许是 exe、sh 或 bat 等中的格式
103
        if (fileOldName.contains(".exe") || fileOldName.contains(".sh") || fileOldName.contains(".bat")) {
104
            return R.error("上传文件失败, 不允许是 exe、sh 或 bat文件");
105
        }
106
        try {
107
            String useUploadPath = uploadFolder + "/documents"; // 文件上传使用的目录
108
            String dir = dataPath + useUploadPath; // 文件绝对路径
109
            
110
            File createFile = new File(dir);
111
            if (!createFile.exists()) {// 判断文件是否存在如果不存在则自动创建文件夹
112
                createFile.mkdir();
113
            }
114
115
            String uuid = UUID.randomUUID().toString().replace("-", "");// 随机生成一个唯一性的id 文件不重名
116
            String suffix = fileOldName.substring(fileOldName.lastIndexOf(".") + 1);
117
            String newFilename = uuid + "." + suffix;
118
            File f = new File(dir + newFilename);
119
            if (f.exists()) {
120
                return R.error("上传的文件已经存在,则提示用户重新上传附件或者重命名");
121
            } else {
122
                file.transferTo(f); // 将上传的文件写入到系统中
123
                return R.ok().put("filename", fileOldName).put("fileurl", useUploadPath + newFilename);
124
            }
125
        } catch (Exception e) {
126
            e.printStackTrace();
127
            return R.error("文件上传出错");
128
        }
129
    }
130
}