Commit 64e406a50ca4e680fda946ab2aa13c8608b0f3c6
1 parent
40489c6a
修改接口,增加字段
Showing
2 changed files
with
79 additions
and
10 deletions
src/main/java/zzsy/controller/UserMessengeController.java
| @@ -9,7 +9,11 @@ import org.apache.poi.xssf.usermodel.XSSFSheet; | @@ -9,7 +9,11 @@ import org.apache.poi.xssf.usermodel.XSSFSheet; | ||
| 9 | import org.apache.poi.xssf.usermodel.XSSFWorkbook; | 9 | import org.apache.poi.xssf.usermodel.XSSFWorkbook; |
| 10 | import org.springframework.beans.factory.annotation.Autowired; | 10 | import org.springframework.beans.factory.annotation.Autowired; |
| 11 | import org.springframework.dao.DataIntegrityViolationException; | 11 | import org.springframework.dao.DataIntegrityViolationException; |
| 12 | -import org.springframework.web.bind.annotation.*; | 12 | +import org.springframework.data.domain.Example; |
| 13 | +import org.springframework.web.bind.annotation.PostMapping; | ||
| 14 | +import org.springframework.web.bind.annotation.RequestMapping; | ||
| 15 | +import org.springframework.web.bind.annotation.RequestParam; | ||
| 16 | +import org.springframework.web.bind.annotation.RestController; | ||
| 13 | import zzsy.dao.UserMessengeRepository; | 17 | import zzsy.dao.UserMessengeRepository; |
| 14 | import zzsy.entity.UserMessenge; | 18 | import zzsy.entity.UserMessenge; |
| 15 | import zzsy.utils.ErrorEnum; | 19 | import zzsy.utils.ErrorEnum; |
| @@ -18,6 +22,7 @@ import zzsy.utils.ResponseBean; | @@ -18,6 +22,7 @@ import zzsy.utils.ResponseBean; | ||
| 18 | import javax.servlet.ServletOutputStream; | 22 | import javax.servlet.ServletOutputStream; |
| 19 | import javax.servlet.http.HttpServletResponse; | 23 | import javax.servlet.http.HttpServletResponse; |
| 20 | import java.io.*; | 24 | import java.io.*; |
| 25 | +import java.text.SimpleDateFormat; | ||
| 21 | import java.util.List; | 26 | import java.util.List; |
| 22 | import java.util.regex.Pattern; | 27 | import java.util.regex.Pattern; |
| 23 | 28 | ||
| @@ -33,17 +38,32 @@ public class UserMessengeController { | @@ -33,17 +38,32 @@ public class UserMessengeController { | ||
| 33 | UserMessengeRepository userMessengeService; | 38 | UserMessengeRepository userMessengeService; |
| 34 | 39 | ||
| 35 | @PostMapping("save") | 40 | @PostMapping("save") |
| 36 | - public ResponseBean save(@RequestParam(name = "name") String name, @RequestParam(name = "phone")String phone, @RequestParam(name = "company")String company) { | 41 | + public ResponseBean save(@RequestParam(name = "name") String name, @RequestParam(name = "phone")String phone, @RequestParam(name = "company")String company,@RequestParam(name = "videoId")Integer videoId, |
| 42 | + @RequestParam(name = "videoTitle") String videoTitle, @RequestParam(name = "videoUrl") String videoUrl){ | ||
| 37 | ResponseBean responseBean = new ResponseBean(); | 43 | ResponseBean responseBean = new ResponseBean(); |
| 38 | try { | 44 | try { |
| 39 | String REGEX_PHONE = "^((13[0-9])|(14[5,7,9])|(15([0-3]|[5-9]))|(166)|(17[0,1,3,5,6,7,8])|(18[0-9])|(19[8|9]))\\d{8}$"; | 45 | String REGEX_PHONE = "^((13[0-9])|(14[5,7,9])|(15([0-3]|[5-9]))|(166)|(17[0,1,3,5,6,7,8])|(18[0-9])|(19[8|9]))\\d{8}$"; |
| 40 | boolean isPhone = Pattern.matches(REGEX_PHONE, phone); | 46 | boolean isPhone = Pattern.matches(REGEX_PHONE, phone); |
| 41 | if(isPhone){ | 47 | if(isPhone){ |
| 42 | UserMessenge userMessenge = new UserMessenge(); | 48 | UserMessenge userMessenge = new UserMessenge(); |
| 43 | - userMessenge.setName(name); | ||
| 44 | - userMessenge.setCompany(company); | ||
| 45 | userMessenge.setPhone(phone); | 49 | userMessenge.setPhone(phone); |
| 46 | - userMessengeService.save(userMessenge); | 50 | + userMessenge.setVideoId(videoId); |
| 51 | + Example<UserMessenge> example = Example.of(userMessenge); | ||
| 52 | + List<UserMessenge> userMessengeList = userMessengeService.findAll(example); | ||
| 53 | + if(userMessengeList.isEmpty()){ | ||
| 54 | + userMessenge.setName(name); | ||
| 55 | + userMessenge.setCompany(company); | ||
| 56 | + userMessenge.setVideoTitle(videoTitle); | ||
| 57 | + userMessenge.setVideoUrl(videoUrl); | ||
| 58 | + userMessengeService.save(userMessenge); | ||
| 59 | + }else { | ||
| 60 | + userMessenge.setId(userMessengeList.get(0).getId()); | ||
| 61 | + userMessenge.setName(name); | ||
| 62 | + userMessenge.setCompany(company); | ||
| 63 | + userMessenge.setVideoTitle(videoTitle); | ||
| 64 | + userMessenge.setVideoUrl(videoUrl); | ||
| 65 | + userMessengeService.saveAndFlush(userMessenge); | ||
| 66 | + } | ||
| 47 | }else{ | 67 | }else{ |
| 48 | responseBean = new ResponseBean(ErrorEnum.PHONE_ERROR.getErrorCode(),ErrorEnum.PHONE_ERROR.getErrorMessage()); | 68 | responseBean = new ResponseBean(ErrorEnum.PHONE_ERROR.getErrorCode(),ErrorEnum.PHONE_ERROR.getErrorMessage()); |
| 49 | } | 69 | } |
| @@ -74,20 +94,36 @@ public class UserMessengeController { | @@ -74,20 +94,36 @@ public class UserMessengeController { | ||
| 74 | XSSFSheet sheetlist = wb.createSheet(fileName); | 94 | XSSFSheet sheetlist = wb.createSheet(fileName); |
| 75 | XSSFRow row = sheetlist.createRow(0);//行 | 95 | XSSFRow row = sheetlist.createRow(0);//行 |
| 76 | XSSFCell cell = row.createCell(0);//列 | 96 | XSSFCell cell = row.createCell(0);//列 |
| 77 | - cell.setCellValue("姓名"); | 97 | + cell.setCellValue("填写时间"); |
| 78 | cell = row.createCell(1);//列 | 98 | cell = row.createCell(1);//列 |
| 79 | - cell.setCellValue("电话"); | 99 | + cell.setCellValue("视频名称"); |
| 80 | cell = row.createCell(2);//列 | 100 | cell = row.createCell(2);//列 |
| 101 | + cell.setCellValue("视频链接"); | ||
| 102 | + cell = row.createCell(3);//列 | ||
| 103 | + cell.setCellValue("姓名"); | ||
| 104 | + cell = row.createCell(4);//列 | ||
| 105 | + cell.setCellValue("电话"); | ||
| 106 | + cell = row.createCell(5);//列 | ||
| 81 | cell.setCellValue("公司"); | 107 | cell.setCellValue("公司"); |
| 82 | - | 108 | + cell = row.createCell(6);//列 |
| 109 | + cell.setCellValue("视频id"); | ||
| 110 | + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:SS"); | ||
| 83 | for (int i = 0; i < userMessengeList.size(); i++) { | 111 | for (int i = 0; i < userMessengeList.size(); i++) { |
| 84 | row = sheetlist.createRow((short) (i + 1));//行 | 112 | row = sheetlist.createRow((short) (i + 1));//行 |
| 85 | cell = row.createCell(0);//列 | 113 | cell = row.createCell(0);//列 |
| 86 | - cell.setCellValue(userMessengeList.get(i).getName()); | 114 | + cell.setCellValue(dateFormat.format(userMessengeList.get(i).getInsertDate())); |
| 87 | cell = row.createCell(1);//列 | 115 | cell = row.createCell(1);//列 |
| 88 | - cell.setCellValue(userMessengeList.get(i).getPhone()); | 116 | + cell.setCellValue(userMessengeList.get(i).getVideoTitle()); |
| 89 | cell = row.createCell(2);//列 | 117 | cell = row.createCell(2);//列 |
| 118 | + cell.setCellValue(userMessengeList.get(i).getVideoUrl()); | ||
| 119 | + cell = row.createCell(3);//列 | ||
| 120 | + cell.setCellValue(userMessengeList.get(i).getName()); | ||
| 121 | + cell = row.createCell(4);//列 | ||
| 122 | + cell.setCellValue(userMessengeList.get(i).getPhone()); | ||
| 123 | + cell = row.createCell(5);//列 | ||
| 90 | cell.setCellValue(userMessengeList.get(i).getCompany()); | 124 | cell.setCellValue(userMessengeList.get(i).getCompany()); |
| 125 | + cell = row.createCell(6);//列 | ||
| 126 | + cell.setCellValue(userMessengeList.get(i).getVideoId()); | ||
| 91 | } | 127 | } |
| 92 | 128 | ||
| 93 | ByteArrayOutputStream os = new ByteArrayOutputStream(); | 129 | ByteArrayOutputStream os = new ByteArrayOutputStream(); |
| @@ -125,4 +161,5 @@ public class UserMessengeController { | @@ -125,4 +161,5 @@ public class UserMessengeController { | ||
| 125 | } | 161 | } |
| 126 | } | 162 | } |
| 127 | } | 163 | } |
| 164 | + | ||
| 128 | } | 165 | } |
src/main/java/zzsy/entity/UserMessenge.java
| @@ -6,6 +6,7 @@ package zzsy.entity; | @@ -6,6 +6,7 @@ package zzsy.entity; | ||
| 6 | import javax.persistence.*; | 6 | import javax.persistence.*; |
| 7 | import java.io.Serializable; | 7 | import java.io.Serializable; |
| 8 | import java.sql.Timestamp; | 8 | import java.sql.Timestamp; |
| 9 | +import java.text.SimpleDateFormat; | ||
| 9 | 10 | ||
| 10 | /** | 11 | /** |
| 11 | * @Auther: Administrator | 12 | * @Auther: Administrator |
| @@ -27,6 +28,12 @@ public class UserMessenge implements Serializable { | @@ -27,6 +28,12 @@ public class UserMessenge implements Serializable { | ||
| 27 | private String phone; | 28 | private String phone; |
| 28 | 29 | ||
| 29 | private String company; | 30 | private String company; |
| 31 | + @Column(name = "video_id") | ||
| 32 | + private Integer videoId; | ||
| 33 | + @Column(name = "video_title") | ||
| 34 | + private String videoTitle; | ||
| 35 | + @Column(name = "video_url") | ||
| 36 | + private String videoUrl; | ||
| 30 | 37 | ||
| 31 | @Column(name = "INSERT_DATE") | 38 | @Column(name = "INSERT_DATE") |
| 32 | private Timestamp insertDate; | 39 | private Timestamp insertDate; |
| @@ -63,7 +70,32 @@ public class UserMessenge implements Serializable { | @@ -63,7 +70,32 @@ public class UserMessenge implements Serializable { | ||
| 63 | this.company = company; | 70 | this.company = company; |
| 64 | } | 71 | } |
| 65 | 72 | ||
| 73 | + public String getVideoTitle() { | ||
| 74 | + return videoTitle; | ||
| 75 | + } | ||
| 76 | + | ||
| 77 | + public void setVideoTitle(String videoTitle) { | ||
| 78 | + this.videoTitle = videoTitle; | ||
| 79 | + } | ||
| 80 | + | ||
| 81 | + public Integer getVideoId() { | ||
| 82 | + return videoId; | ||
| 83 | + } | ||
| 84 | + | ||
| 85 | + public void setVideoId(Integer videoId) { | ||
| 86 | + this.videoId = videoId; | ||
| 87 | + } | ||
| 88 | + | ||
| 89 | + public String getVideoUrl() { | ||
| 90 | + return videoUrl; | ||
| 91 | + } | ||
| 92 | + | ||
| 93 | + public void setVideoUrl(String videoUrl) { | ||
| 94 | + this.videoUrl = videoUrl; | ||
| 95 | + } | ||
| 96 | + | ||
| 66 | public Timestamp getInsertDate() { | 97 | public Timestamp getInsertDate() { |
| 98 | + | ||
| 67 | return insertDate; | 99 | return insertDate; |
| 68 | } | 100 | } |
| 69 | 101 |