Commit 3628d7c0337290bf4b0d98731cf9fecac37f42f8
1 parent
64e406a5
update
Showing
1 changed file
with
31 additions
and
19 deletions
src/main/java/zzsy/controller/UserMessengeController.java
| ... | ... | @@ -8,7 +8,6 @@ import org.apache.poi.xssf.usermodel.XSSFRow; |
| 8 | 8 | import org.apache.poi.xssf.usermodel.XSSFSheet; |
| 9 | 9 | import org.apache.poi.xssf.usermodel.XSSFWorkbook; |
| 10 | 10 | import org.springframework.beans.factory.annotation.Autowired; |
| 11 | -import org.springframework.dao.DataIntegrityViolationException; | |
| 12 | 11 | import org.springframework.data.domain.Example; |
| 13 | 12 | import org.springframework.web.bind.annotation.PostMapping; |
| 14 | 13 | import org.springframework.web.bind.annotation.RequestMapping; |
| ... | ... | @@ -22,7 +21,9 @@ import zzsy.utils.ResponseBean; |
| 22 | 21 | import javax.servlet.ServletOutputStream; |
| 23 | 22 | import javax.servlet.http.HttpServletResponse; |
| 24 | 23 | import java.io.*; |
| 24 | +import java.sql.Timestamp; | |
| 25 | 25 | import java.text.SimpleDateFormat; |
| 26 | +import java.util.Date; | |
| 26 | 27 | import java.util.List; |
| 27 | 28 | import java.util.regex.Pattern; |
| 28 | 29 | |
| ... | ... | @@ -37,44 +38,51 @@ public class UserMessengeController { |
| 37 | 38 | @Autowired |
| 38 | 39 | UserMessengeRepository userMessengeService; |
| 39 | 40 | |
| 41 | + /** | |
| 42 | + * 正在上演下载资料用户信息保存 | |
| 43 | + * @param name | |
| 44 | + * @param phone | |
| 45 | + * @param company | |
| 46 | + * @param videoId | |
| 47 | + * @param videoTitle | |
| 48 | + * @param videoUrl | |
| 49 | + * @return | |
| 50 | + */ | |
| 40 | 51 | @PostMapping("save") |
| 41 | 52 | public ResponseBean save(@RequestParam(name = "name") String name, @RequestParam(name = "phone")String phone, @RequestParam(name = "company")String company,@RequestParam(name = "videoId")Integer videoId, |
| 42 | 53 | @RequestParam(name = "videoTitle") String videoTitle, @RequestParam(name = "videoUrl") String videoUrl){ |
| 43 | 54 | ResponseBean responseBean = new ResponseBean(); |
| 44 | 55 | try { |
| 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}$"; | |
| 46 | - boolean isPhone = Pattern.matches(REGEX_PHONE, phone); | |
| 56 | + String phoneReg = "^((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}$"; | |
| 57 | + boolean isPhone = Pattern.matches(phoneReg, phone); | |
| 47 | 58 | if(isPhone){ |
| 48 | 59 | UserMessenge userMessenge = new UserMessenge(); |
| 49 | 60 | userMessenge.setPhone(phone); |
| 50 | 61 | userMessenge.setVideoId(videoId); |
| 51 | 62 | Example<UserMessenge> example = Example.of(userMessenge); |
| 52 | 63 | 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 { | |
| 64 | + if(!userMessengeList.isEmpty()){ | |
| 60 | 65 | 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 | 66 | } |
| 67 | + userMessenge.setName(name); | |
| 68 | + userMessenge.setCompany(company); | |
| 69 | + userMessenge.setVideoTitle(videoTitle); | |
| 70 | + userMessenge.setVideoUrl(videoUrl); | |
| 71 | + userMessenge.setInsertDate(new Timestamp(new Date().getTime())); | |
| 72 | + userMessengeService.saveAndFlush(userMessenge); | |
| 67 | 73 | }else{ |
| 68 | 74 | responseBean = new ResponseBean(ErrorEnum.PHONE_ERROR.getErrorCode(),ErrorEnum.PHONE_ERROR.getErrorMessage()); |
| 69 | 75 | } |
| 70 | - | |
| 71 | - }catch (DataIntegrityViolationException e){ | |
| 72 | - responseBean = new ResponseBean(ErrorEnum.PHONE_REPEAT.getErrorCode(),ErrorEnum.PHONE_REPEAT.getErrorMessage()); | |
| 76 | + }catch (Exception e){ | |
| 77 | + responseBean = new ResponseBean(ErrorEnum.ERROR.getErrorCode(),ErrorEnum.ERROR.getErrorMessage()); | |
| 73 | 78 | } |
| 74 | 79 | return responseBean; |
| 75 | 80 | } |
| 76 | 81 | |
| 77 | - | |
| 82 | + /** | |
| 83 | + * 获取所有用户信息 | |
| 84 | + * @return | |
| 85 | + */ | |
| 78 | 86 | @RequestMapping("messenge") |
| 79 | 87 | public ResponseBean findAll() { |
| 80 | 88 | ResponseBean responseBean = new ResponseBean(); |
| ... | ... | @@ -82,6 +90,10 @@ public class UserMessengeController { |
| 82 | 90 | return responseBean; |
| 83 | 91 | } |
| 84 | 92 | |
| 93 | + /** | |
| 94 | + * 用户信息Excel导出 | |
| 95 | + * @param response | |
| 96 | + */ | |
| 85 | 97 | @RequestMapping("excel") |
| 86 | 98 | public void getExcel(HttpServletResponse response) { |
| 87 | 99 | List<UserMessenge> userMessengeList = userMessengeService.findAll(); | ... | ... |