Merge remote-tracking branch 'origin/feature-blank' into feature-blank

# Conflicts:
#	src/main/resources/application.yml

src/main/java/com/example/cinema/blImpl/management/hall/HallServiceImpl.java

@@ -41,23 +41,10 @@ public class HallServiceImpl implements HallService, HallServiceForBl {
 
     }
 
-    private HallVO hall2hallVO(Hall hall){
-        if(hall != null){
-            HallVO hallVO = new HallVO();
-            hallVO.setId(hall.getId());
-            hallVO.setName(hall.getName());
-            hallVO.setRow(hall.getRow());
-            hallVO.setColumn(hall.getColumn());
-
-            return hallVO;
-        }
-        return null;
-    }
-
     private List<HallVO> hallList2HallVOList(List<Hall> hallList){
         List<HallVO> hallVOList = new ArrayList<>();
         for(Hall hall : hallList){
-            hallVOList.add(hall2hallVO(hall));
+            hallVOList.add(new HallVO(hall));
         }
         return hallVOList;
     }

src/main/java/com/example/cinema/blImpl/management/movie/MovieServiceImpl.java

@@ -42,7 +42,12 @@ public class MovieServiceImpl implements MovieService, MovieServiceForBl {
     @Override
     public ResponseVO searchOneMovieByIdAndUserId(int id, int userId) {
         try {
-            return ResponseVO.buildSuccess(movie2MovieVO(movieMapper.selectMovieByIdAndUserId(id, userId)));
+            Movie movie = movieMapper.selectMovieByIdAndUserId(id, userId);
+            if(movie != null){
+                return ResponseVO.buildSuccess(new MovieVO(movie));
+            }else{
+                return ResponseVO.buildSuccess(null);
+            }
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseVO.buildFailure("失败");
@@ -142,33 +147,10 @@ public class MovieServiceImpl implements MovieService, MovieServiceForBl {
     }
 
 
-    private MovieVO movie2MovieVO(Movie movie){
-        if(movie != null){
-            MovieVO movieVO = new MovieVO();
-            movieVO.setId(movie.getId());
-            movieVO.setName(movie.getName());
-            movieVO.setPosterUrl(movie.getPosterUrl());
-            movieVO.setDirector(movie.getDirector());
-            movieVO.setScreenWriter(movie.getScreenWriter());
-            movieVO.setStarring(movie.getStarring());
-            movieVO.setType(movie.getType());
-            movieVO.setCountry(movie.getCountry());
-            movieVO.setLanguage(movie.getLanguage());
-            movieVO.setStartDate(movie.getStartDate());
-            movieVO.setLength(movie.getLength());
-            movieVO.setDescription(movie.getDescription());
-            movieVO.setStatus(movie.getStatus());
-            movieVO.setIslike(movie.getIslike());
-            movieVO.setLikeCount(movie.getLikeCount());
-            return movieVO;
-        }
-        return null;
-    }
-
     private List<MovieVO> movieList2MovieVOList(List<Movie> movieList){
         List<MovieVO> movieVOList = new ArrayList<>();
         for(Movie movie : movieList){
-            movieVOList.add(movie2MovieVO(movie));
+            movieVOList.add(new MovieVO(movie));
         }
         return movieVOList;
     }

src/main/java/com/example/cinema/blImpl/management/schedule/ScheduleServiceImpl.java

@@ -78,7 +78,12 @@ public class ScheduleServiceImpl implements ScheduleService, ScheduleServiceForB
     @Override
     public ResponseVO getScheduleById(int id) {
         try {
-            return ResponseVO.buildSuccess(scheduleItem2ScheduleItemVO(scheduleMapper.selectScheduleById(id)));
+            ScheduleItem scheduleItem = scheduleMapper.selectScheduleById(id);
+            if(scheduleItem != null){
+                return ResponseVO.buildSuccess(new ScheduleItemVO(scheduleItem));
+            }else{
+                return ResponseVO.buildSuccess(null);
+            }
         }catch (Exception e){
             e.printStackTrace();
             return ResponseVO.buildFailure("失败");
@@ -314,27 +319,12 @@ public class ScheduleServiceImpl implements ScheduleService, ScheduleServiceForB
         return scheduleVOList;
     }
 
-    private ScheduleItemVO scheduleItem2ScheduleItemVO(ScheduleItem scheduleItem){
-        if(scheduleItem != null){
-            ScheduleItemVO scheduleItemVO = new ScheduleItemVO();
-            scheduleItemVO.setId(scheduleItem.getId());
-            scheduleItemVO.setHallId(scheduleItem.getHallId());
-            scheduleItemVO.setHallName(scheduleItem.getHallName());
-            scheduleItemVO.setMovieId(scheduleItem.getMovieId());
-            scheduleItemVO.setMovieName(scheduleItem.getMovieName());
-            scheduleItemVO.setStartTime(scheduleItem.getStartTime());
-            scheduleItemVO.setEndTime(scheduleItem.getEndTime());
-            scheduleItemVO.setFare(scheduleItem.getFare());
-
-            return scheduleItemVO;
-        }
-        return null;
-    }
+
 
     private List<ScheduleItemVO> scheduleItemList2ScheduleItemVOList(List<ScheduleItem> scheduleItemList){
         List<ScheduleItemVO> scheduleItemVOList = new ArrayList<>();
         for(ScheduleItem scheduleItem : scheduleItemList){
-            scheduleItemVOList.add(scheduleItem2ScheduleItemVO(scheduleItem));
+            scheduleItemVOList.add(new ScheduleItemVO(scheduleItem));
         }
         return scheduleItemVOList;
     }

src/main/java/com/example/cinema/blImpl/statistics/MovieLikeServiceImpl.java

@@ -82,21 +82,12 @@ public class MovieLikeServiceImpl implements MovieLikeService {
     private boolean userLikeTheMovie(int userId, int movieId) {
         return movieLikeMapper.selectLikeMovie(movieId, userId) == 0 ? false : true;
     }
-
-    private DateLikeVO dateLike2DateLikeVO(DateLike dateLike){
-        if(dateLike != null){
-            DateLikeVO dateLikeVO = new DateLikeVO();
-            dateLikeVO.setLikeNum(dateLike.getLikeNum());
-            dateLikeVO.setLikeTime(dateLike.getLikeTime());
-            return dateLikeVO;
-        }
-        return null;
-    }
+    
 
     private List<DateLikeVO> dateLikeList2DateLikeVOList(List<DateLike> dateLikeList){
         List<DateLikeVO> dateLikeVOList = new ArrayList<>();
         for(DateLike dateLike : dateLikeList){
-            dateLikeVOList.add(dateLike2DateLikeVO(dateLike));
+            dateLikeVOList.add(new DateLikeVO(dateLike));
         }
         return dateLikeVOList;
     }

src/main/java/com/example/cinema/blImpl/statistics/StatisticsServiceImpl.java

@@ -104,40 +104,21 @@ public class StatisticsServiceImpl implements StatisticsService {
         return calendarTime.getTime();
     }
 
-    private MovieScheduleTimeVO movieScheduleTime2MovieScheduleTimeVO(MovieScheduleTime movieScheduleTime){
-        if(movieScheduleTime != null){
-            MovieScheduleTimeVO movieScheduleTimeVO = new MovieScheduleTimeVO();
-            movieScheduleTimeVO.setMovieId(movieScheduleTime.getMovieId());
-            movieScheduleTimeVO.setTime(movieScheduleTime.getTime());
-            movieScheduleTimeVO.setName(movieScheduleTime.getName());
-            return movieScheduleTimeVO;
-        }
-        return null;
-    }
+
 
     private List<MovieScheduleTimeVO> movieScheduleTimeList2MovieScheduleTimeVOList(List<MovieScheduleTime> movieScheduleTimeList){
         List<MovieScheduleTimeVO> movieScheduleTimeVOList = new ArrayList<>();
         for(MovieScheduleTime movieScheduleTime : movieScheduleTimeList){
-            movieScheduleTimeVOList.add(movieScheduleTime2MovieScheduleTimeVO(movieScheduleTime));
+            movieScheduleTimeVOList.add(new MovieScheduleTimeVO(movieScheduleTime));
         }
         return movieScheduleTimeVOList;
     }
 
-    private MovieTotalBoxOfficeVO movieTotalBoxOffice2MovieTotalBoxOfficeVO(MovieTotalBoxOffice movieTotalBoxOffice){
-        if(movieTotalBoxOffice != null){
-            MovieTotalBoxOfficeVO movieTotalBoxOfficeVO = new MovieTotalBoxOfficeVO();
-            movieTotalBoxOfficeVO.setMovieId(movieTotalBoxOffice.getMovieId());
-            movieTotalBoxOfficeVO.setBoxOffice(movieTotalBoxOffice.getBoxOffice());
-            movieTotalBoxOfficeVO.setName(movieTotalBoxOffice.getName());
-            return movieTotalBoxOfficeVO;
-        }
-        return null;
-    }
 
     private List<MovieTotalBoxOfficeVO> movieTotalBoxOfficeList2MovieTotalBoxOfficeVOList(List<MovieTotalBoxOffice> movieTotalBoxOfficeList){
         List<MovieTotalBoxOfficeVO> movieTotalBoxOfficeVOList = new ArrayList<>();
         for(MovieTotalBoxOffice movieTotalBoxOffice : movieTotalBoxOfficeList){
-            movieTotalBoxOfficeVOList.add(movieTotalBoxOffice2MovieTotalBoxOfficeVO(movieTotalBoxOffice));
+            movieTotalBoxOfficeVOList.add(new MovieTotalBoxOfficeVO(movieTotalBoxOffice));
         }
         return movieTotalBoxOfficeVOList;
     }

src/main/java/com/example/cinema/blImpl/user/AccountServiceImpl.java

@@ -31,21 +31,12 @@ public class AccountServiceImpl implements AccountService {
 
     @Override
     public UserVO login(UserForm userForm) {
-        UserVO user = user2UserVO(accountMapper.getAccountByName(userForm.getUsername()));
+        User user = accountMapper.getAccountByName(userForm.getUsername());
         if (null == user || !user.getPassword().equals(userForm.getPassword())) {
             return null;
         }
-        return user;
+        return new UserVO(user);
     }
 
-    private UserVO user2UserVO(User user){
-        if(user != null){
-            UserVO userVO = new UserVO();
-            userVO.setId(user.getId());
-            userVO.setUsername(user.getUsername());
-            userVO.setPassword(user.getPassword());
-            return userVO;
-        }
-        return null;
-    }
+
 }

src/main/java/com/example/cinema/vo/DateLikeVO.java

@@ -1,5 +1,7 @@
 package com.example.cinema.vo;
 
+import com.example.cinema.po.DateLike;
+
 import java.sql.Date;
 
 /**
@@ -17,6 +19,11 @@ public class DateLikeVO {
      */
     private Date likeTime;
 
+    public DateLikeVO(DateLike dateLike){
+        this.likeNum = dateLike.getLikeNum();
+        this.likeTime = dateLike.getLikeTime();
+    }
+
     public int getLikeNum() {
         return likeNum;
     }

src/main/java/com/example/cinema/vo/HallVO.java

@@ -1,5 +1,7 @@
 package com.example.cinema.vo;
 
+import com.example.cinema.po.Hall;
+
 /**
  * @author fjj
  * @date 2019/4/11 3:46 PM
@@ -10,6 +12,13 @@ public class HallVO {
     private Integer row;
     private Integer column;
 
+    public HallVO(Hall hall){
+        this.id = hall.getId();
+        this.name = hall.getName();
+        this.row = hall.getRow();
+        this.column = hall.getColumn();
+    }
+
     public Integer getId() {
         return id;
     }

src/main/java/com/example/cinema/vo/MovieScheduleTimeVO.java

@@ -1,5 +1,7 @@
 package com.example.cinema.vo;
 
+import com.example.cinema.po.MovieScheduleTime;
+
 /**
  * @author fjj
  * @date 2019/4/16 2:48 PM
@@ -12,6 +14,12 @@ public class MovieScheduleTimeVO {
     private Integer time;
     private String name;
 
+    public MovieScheduleTimeVO(MovieScheduleTime movieScheduleTime){
+        this.movieId = movieScheduleTime.getMovieId();
+        this.time = movieScheduleTime.getTime();
+        this.name = movieScheduleTime.getName();
+    }
+
     public Integer getMovieId() {
         return movieId;
     }

src/main/java/com/example/cinema/vo/MovieTotalBoxOfficeVO.java

@@ -1,5 +1,7 @@
 package com.example.cinema.vo;
 
+import com.example.cinema.po.MovieTotalBoxOffice;
+
 /**
  * @author fjj
  * @date 2019/4/21 1:42 PM
@@ -12,6 +14,12 @@ public class MovieTotalBoxOfficeVO {
     private Integer boxOffice;
     private String name;
 
+    public MovieTotalBoxOfficeVO(MovieTotalBoxOffice movieTotalBoxOffice){
+        this.movieId = movieTotalBoxOffice.getMovieId();
+        this.boxOffice = movieTotalBoxOffice.getBoxOffice();
+        this.name = movieTotalBoxOffice.getName();
+    }
+
     public Integer getMovieId() {
         return movieId;
     }

src/main/java/com/example/cinema/vo/MovieVO.java

@@ -1,5 +1,7 @@
 package com.example.cinema.vo;
 
+import com.example.cinema.po.Movie;
+
 import java.util.Date;
 
 /**
@@ -70,6 +72,24 @@ public class MovieVO {
      */
     private Integer likeCount;
 
+    public MovieVO(Movie movie){
+        this.id = movie.getId();
+        this.name = movie.getName();
+        this.posterUrl = movie.getPosterUrl();
+        this.director = movie.getDirector();
+        this.screenWriter = movie.getScreenWriter();
+        this.starring = movie.getStarring();
+        this.type = movie.getType();
+        this.country = movie.getCountry();
+        this.language = movie.getLanguage();
+        this.startDate = movie.getStartDate();
+        this.length = movie.getLength();
+        this.description = movie.getDescription();
+        this.status = movie.getStatus();
+        this.islike = movie.getIslike();
+        this.likeCount = movie.getLikeCount();
+    }
+
     public Integer getId() {
         return id;
     }

src/main/java/com/example/cinema/vo/ScheduleItemVO.java

@@ -1,5 +1,7 @@
 package com.example.cinema.vo;
 
+import com.example.cinema.po.ScheduleItem;
+
 import java.util.Date;
 
 /**
@@ -40,6 +42,17 @@ public class ScheduleItemVO {
      */
     private double fare;
 
+    public ScheduleItemVO(ScheduleItem scheduleItem){
+        this.id = scheduleItem.getId();
+        this.hallId = scheduleItem.getHallId();
+        this.hallName = scheduleItem.getHallName();
+        this.movieId = scheduleItem.getMovieId();
+        this.movieName = scheduleItem.getMovieName();
+        this.startTime = scheduleItem.getStartTime();
+        this.endTime = scheduleItem.getEndTime();
+        this.fare = scheduleItem.getFare();
+    }
+
     public Integer getId() {
         return id;
     }

src/main/java/com/example/cinema/vo/UserVO.java

@@ -1,5 +1,7 @@
 package com.example.cinema.vo;
 
+import com.example.cinema.po.User;
+
 /**
  * @author fjj
  * @date 2019/4/11 3:22 PM
@@ -9,6 +11,12 @@ public class UserVO {
     private String username;
     private String password;
 
+    public UserVO(User user){
+        this.id = user.getId();
+        this.username = user.getUsername();
+        this.password = user.getPassword();
+    }
+
     public Integer getId() {
         return id;
     }

src/main/resources/application.yml

@@ -1,17 +1,17 @@
-spring:
-  datasource:
-     url: jdbc:mysql://localhost/cinema?serverTimezone=CTT&characterEncoding=UTF-8
-     username: root
-     password: root
-     driver-class-name: com.mysql.cj.jdbc.Driver
-     max-active: 200
-     max-idle: 20
-     min-idle: 10
-  thymeleaf:
-     cache: false
-  jackson:
-    time-zone: GMT+8
-
-mybatis:
-  mapper-locations: classpath:dataImpl/*/*Mapper.xml
-
+spring:
+  datasource:
+     url: jdbc:mysql://localhost:3306/cinema?serverTimezone=CTT&characterEncoding=UTF-8
+     username: root
+     password: root
+     driver-class-name: com.mysql.cj.jdbc.Driver
+     max-active: 200
+     max-idle: 20
+     min-idle: 10
+  thymeleaf:
+     cache: false
+  jackson:
+    time-zone: GMT+8
+
+mybatis:
+  mapper-locations: classpath:dataImpl/*/*Mapper.xml
+