huwhois лет назад: 4
Родитель
Сommit
4172bd6e47

+ 27 - 10
src/main/java/io/renren/modules/admin/controller/MeetingController.java

8
import io.renren.modules.admin.entity.TypesOfAttendersEntity;
8
import io.renren.modules.admin.entity.TypesOfAttendersEntity;
9
import io.renren.modules.admin.entity.EmployeeEntity;
9
import io.renren.modules.admin.entity.EmployeeEntity;
10
import io.renren.modules.admin.form.MeetingForm;
10
import io.renren.modules.admin.form.MeetingForm;
11
import io.renren.modules.admin.form.TitlePicture;
11
import io.renren.modules.admin.form.TitlePictureForm;
12
import io.renren.modules.admin.service.IndustryService;
12
import io.renren.modules.admin.service.IndustryService;
13
import io.renren.modules.admin.service.MeetingService;
13
import io.renren.modules.admin.service.MeetingService;
14
import io.renren.modules.admin.service.SubjectService;
14
import io.renren.modules.admin.service.SubjectService;
83
        Date[] startAndEndTime = new Date[2];
83
        Date[] startAndEndTime = new Date[2];
84
        startAndEndTime[0] = meeting.getStartTime();
84
        startAndEndTime[0] = meeting.getStartTime();
85
        startAndEndTime[1] = meeting.getEndTime();
85
        startAndEndTime[1] = meeting.getEndTime();
86
        ArrayList <TitlePicture> arlist = new ArrayList <TitlePicture>();
86
        ArrayList <TitlePictureForm> arlist = new ArrayList <TitlePictureForm>();
87
        if (meeting.getTitlePicture().indexOf(",") != -1) {
87
        if (meeting.getTitlePicture().indexOf(",") != -1) {
88
            String[] arr = meeting.getTitlePicture().split(",");
88
            String[] arr = meeting.getTitlePicture().split(",");
89
            int i = 0;
89
            for (String string : arr) {
90
            for (String string : arr) {
90
                TitlePicture tip = new TitlePicture();
91
                i++;
92
                TitlePictureForm tip = new TitlePictureForm();
91
                tip.setStatus("success");
93
                tip.setStatus("success");
92
                tip.setUid(new Date().getTime());
94
                tip.setUid((new Date().getTime())+i);
93
                tip.setUrl("http://192.168.3.233" + string);
95
                tip.setUrl("http://192.168.3.233" + string);
94
                arlist.add(tip);
96
                arlist.add(tip);
95
            }
97
            }
96
        } else {
98
        } else {
97
            TitlePicture tip = new TitlePicture();
99
            TitlePictureForm tip = new TitlePictureForm();
98
            tip.setStatus("success");
100
            tip.setStatus("success");
99
            tip.setUid(new Date().getTime());
101
            tip.setUid(new Date().getTime());
100
            tip.setUrl("http://192.168.3.233" + meeting.getTitlePicture());
102
            tip.setUrl("http://192.168.3.233" + meeting.getTitlePicture());
113
        String[] subjects = meetingForm.getSubjects();
115
        String[] subjects = meetingForm.getSubjects();
114
        String[] industries = meetingForm.getIndustries();
116
        String[] industries = meetingForm.getIndustries();
115
        String[] attendersType = meetingForm.getAttendersType();
117
        String[] attendersType = meetingForm.getAttendersType();
116
        Date[] startAndEndTime = meetingForm.getStartAndEndTime();
117
        for (String s : subjects) {
118
        for (String s : subjects) {
118
            int i = subjectService.selectIsName(s);
119
            int i = subjectService.selectIsName(s);
119
            if(i==0){
120
            if(i==0){
139
        meeting.setNameCn(meetingForm.getNameCn());
140
        meeting.setNameCn(meetingForm.getNameCn());
140
        meeting.setNameEn(meetingForm.getNameEn());
141
        meeting.setNameEn(meetingForm.getNameEn());
141
        meeting.setAddress(meetingForm.getAddress());
142
        meeting.setAddress(meetingForm.getAddress());
143
        Date[] startAndEndTime = meetingForm.getStartAndEndTime();
142
        if (startAndEndTime != null && startAndEndTime.length == 2) {
144
        if (startAndEndTime != null && startAndEndTime.length == 2) {
143
            meeting.setStartTime(startAndEndTime[0]);
145
            meeting.setStartTime(startAndEndTime[0]);
144
            meeting.setEndTime(startAndEndTime[1]);
146
            meeting.setEndTime(startAndEndTime[1]);
145
        }
147
        }
146
        meeting.setOfficeWebsite(meetingForm.getOfficeWebsite());
148
        meeting.setOfficeWebsite(meetingForm.getOfficeWebsite());
147
        String[] titlePictures = meetingForm.getTitlePicture();
150
        TitlePictureForm[] titlePictures = meetingForm.getTitlePicture();
148
        String titlePicture = StringUtils.join(titlePictures, ",");
151
        String titlePicture = "";
152
        for (int i = 0; i < titlePictures.length; i++) {
153
            if (i==0) {
154
                titlePicture += titlePictures[i].getUrl();
155
            } else {
156
                titlePicture += "," + titlePictures[i].getUrl();
157
            }
158
        }
149
        meeting.setTitlePicture(titlePicture);
159
        meeting.setTitlePicture(titlePicture);
150
        meeting.setSubjects(StringUtils.join(meetingForm.getSubjects(), ","));
160
        meeting.setSubjects(StringUtils.join(meetingForm.getSubjects(), ","));
151
        meeting.setIndustries(StringUtils.join(meetingForm.getIndustries(), ","));
161
        meeting.setIndustries(StringUtils.join(meetingForm.getIndustries(), ","));
230
            meeting.setEndTime(startAndEndTime[1]);
240
            meeting.setEndTime(startAndEndTime[1]);
231
        }
241
        }
232
        meeting.setOfficeWebsite(meetingForm.getOfficeWebsite());
242
        meeting.setOfficeWebsite(meetingForm.getOfficeWebsite());
233
        String[] titlePictures = meetingForm.getTitlePicture();
243
        TitlePictureForm[] titlePictures = meetingForm.getTitlePicture();
234
        String titlePicture = StringUtils.join(titlePictures, ",");
244
        String titlePicture = "";
245
        for (int i = 0; i < titlePictures.length; i++) {
246
            if (i==0) {
247
                titlePicture += titlePictures[i].getUrl();
248
            } else {
249
                titlePicture += "," + titlePictures[i].getUrl();
250
            }
251
        }
235
        meeting.setTitlePicture(titlePicture);
252
        meeting.setTitlePicture(titlePicture);
236
        meeting.setSubjects(StringUtils.join(meetingForm.getSubjects(), ","));
253
        meeting.setSubjects(StringUtils.join(meetingForm.getSubjects(), ","));
237
        meeting.setIndustries(StringUtils.join(meetingForm.getIndustries(), ","));
254
        meeting.setIndustries(StringUtils.join(meetingForm.getIndustries(), ","));

+ 2 - 1
src/main/java/io/renren/modules/admin/form/MeetingForm.java

1
package io.renren.modules.admin.form;
1
package io.renren.modules.admin.form;
2
2
3
import java.util.Date;
3
import java.util.Date;
4
import io.renren.modules.admin.form.TitlePictureForm;
4
5
5
import lombok.Data;
6
import lombok.Data;
6
7
48
	/**
49
	/**
49
	 * 会议封面图片地址
50
	 * 会议封面图片地址
50
	 */
51
	 */
51
	private String[] titlePicture;
52
	private TitlePictureForm[] titlePicture;
52
	/**
53
	/**
53
	 * 涉及学科
54
	 * 涉及学科
54
	 */
55
	 */

+ 1 - 1
src/main/java/io/renren/modules/admin/form/TitlePicture.java

6
 * 会议图片
6
 * 会议图片
7
 */
7
 */
8
@Data
8
@Data
9
public class TitlePicture {
9
public class TitlePictureForm {
10
    String status;
10
    String status;
11
    Long uid;
11
    Long uid;
12
    String url;
12
    String url;