update

周伟鹏
1 parent 64e406a5
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;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.data.domain.Example;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,7 +21,9 @@ import zzsy.utils.ResponseBean;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
+import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.regex.Pattern;
@@ -37,44 +38,51 @@ public class UserMessengeController {
     @Autowired
     UserMessengeRepository userMessengeService;
+    /**
+     * 正在上演下载资料用户信息保存
+     * @param name
+     * @param phone
+     * @param company
+     * @param videoId
+     * @param videoTitle
+     * @param videoUrl
+     * @return
+     */
     @PostMapping("save")
     public ResponseBean save(@RequestParam(name = "name") String name, @RequestParam(name = "phone")String phone, @RequestParam(name = "company")String company,@RequestParam(name = "videoId")Integer videoId,
                              @RequestParam(name = "videoTitle") String videoTitle, @RequestParam(name = "videoUrl") String videoUrl){
         ResponseBean responseBean = new ResponseBean();
         try {
-            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}$";
-            boolean isPhone = Pattern.matches(REGEX_PHONE, phone);
+            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}$";
+            boolean isPhone = Pattern.matches(phoneReg, phone);
             if(isPhone){
                 UserMessenge userMessenge = new UserMessenge();
                 userMessenge.setPhone(phone);
                 userMessenge.setVideoId(videoId);
                 Example<UserMessenge> example = Example.of(userMessenge);
                 List<UserMessenge> userMessengeList = userMessengeService.findAll(example);
-                if(userMessengeList.isEmpty()){
-                    userMessenge.setName(name);
-                    userMessenge.setCompany(company);
-                    userMessenge.setVideoTitle(videoTitle);
-                    userMessenge.setVideoUrl(videoUrl);
-                    userMessengeService.save(userMessenge);
-                }else {
+                if(!userMessengeList.isEmpty()){
                     userMessenge.setId(userMessengeList.get(0).getId());
-                    userMessenge.setName(name);
-                    userMessenge.setCompany(company);
-                    userMessenge.setVideoTitle(videoTitle);
-                    userMessenge.setVideoUrl(videoUrl);
-                    userMessengeService.saveAndFlush(userMessenge);
                 }
+                userMessenge.setName(name);
+                userMessenge.setCompany(company);
+                userMessenge.setVideoTitle(videoTitle);
+                userMessenge.setVideoUrl(videoUrl);
+                userMessenge.setInsertDate(new Timestamp(new Date().getTime()));
+                userMessengeService.saveAndFlush(userMessenge);
             }else{
                 responseBean = new ResponseBean(ErrorEnum.PHONE_ERROR.getErrorCode(),ErrorEnum.PHONE_ERROR.getErrorMessage());
             }
-
-        }catch (DataIntegrityViolationException e){
-            responseBean = new ResponseBean(ErrorEnum.PHONE_REPEAT.getErrorCode(),ErrorEnum.PHONE_REPEAT.getErrorMessage());
+        }catch (Exception e){
+            responseBean = new ResponseBean(ErrorEnum.ERROR.getErrorCode(),ErrorEnum.ERROR.getErrorMessage());
         }
         return responseBean;
     }
-
+    /**
+     * 获取所有用户信息
+     * @return
+     */
     @RequestMapping("messenge")
     public ResponseBean findAll() {
         ResponseBean responseBean = new ResponseBean();
@@ -82,6 +90,10 @@ public class UserMessengeController {
         return responseBean;
     }
+    /**
+     * 用户信息Excel导出
+     * @param response
+     */
     @RequestMapping("excel")
     public void getExcel(HttpServletResponse response) {
         List<UserMessenge> userMessengeList = userMessengeService.findAll();