Merge branch 'master' into feature-blank

src/main/java/com/example/cinema/bl/HallService.java → src/main/java/com/example/cinema/bl/management/HallService.java

@@ -1,4 +1,4 @@
-package com.example.cinema.bl;
+package com.example.cinema.bl.management;
 
 import com.example.cinema.vo.ResponseVO;
 

src/main/java/com/example/cinema/bl/MovieService.java → src/main/java/com/example/cinema/bl/management/MovieService.java

@@ -1,4 +1,4 @@
-package com.example.cinema.bl;
+package com.example.cinema.bl.management;
 
 import com.example.cinema.vo.MovieBatchOffForm;
 import com.example.cinema.vo.MovieForm;

src/main/java/com/example/cinema/bl/ScheduleService.java → src/main/java/com/example/cinema/bl/management/ScheduleService.java

@@ -1,4 +1,4 @@
-package com.example.cinema.bl;
+package com.example.cinema.bl.management;
 
 import com.example.cinema.vo.ResponseVO;
 import com.example.cinema.vo.ScheduleBatchDeleteForm;

src/main/java/com/example/cinema/bl/ActivityService.java → src/main/java/com/example/cinema/bl/promotion/ActivityService.java

@@ -1,4 +1,4 @@
-package com.example.cinema.bl;
+package com.example.cinema.bl.promotion;
 
 import com.example.cinema.vo.ActivityForm;
 import com.example.cinema.vo.ResponseVO;

src/main/java/com/example/cinema/bl/CouponService.java → src/main/java/com/example/cinema/bl/promotion/CouponService.java

@@ -1,4 +1,4 @@
-package com.example.cinema.bl;
+package com.example.cinema.bl.promotion;
 
 import com.example.cinema.vo.CouponForm;
 import com.example.cinema.vo.ResponseVO;

src/main/java/com/example/cinema/bl/VIPService.java → src/main/java/com/example/cinema/bl/promotion/VIPService.java

@@ -1,4 +1,4 @@
-package com.example.cinema.bl;
+package com.example.cinema.bl.promotion;
 
 import com.example.cinema.vo.VIPCardForm;
 import com.example.cinema.vo.ResponseVO;

src/main/java/com/example/cinema/bl/TicketService.java → src/main/java/com/example/cinema/bl/sales/TicketService.java

@@ -1,4 +1,4 @@
-package com.example.cinema.bl;
+package com.example.cinema.bl.sales;
 
 import com.example.cinema.vo.ResponseVO;
 import com.example.cinema.vo.TicketForm;

src/main/java/com/example/cinema/bl/StatisticsService.java → src/main/java/com/example/cinema/bl/statistics/StatisticsService.java

@@ -1,4 +1,4 @@
-package com.example.cinema.bl;
+package com.example.cinema.bl.statistics;
 
 import com.example.cinema.vo.ResponseVO;
 
@@ -28,4 +28,21 @@ public interface StatisticsService {
      * @return
      */
     ResponseVO getAudiencePriceSevenDays();
+
+
+    /**
+     * 获取所有电影某天的上座率
+     * 上座率参考公式：假设某影城设有n 个电影厅、m 个座位数，相对上座率=观众人次÷放映场次÷m÷n×100%
+     * @param date
+     * @return
+     */
+    ResponseVO getMoviePlacingRateByDate(Date date);
+
+    /**
+     * 获取最近days天内，最受欢迎的movieNum个电影(可以简单理解为最近days内票房越高的电影越受欢迎)
+     * @param days
+     * @param movieNum
+     * @return
+     */
+    ResponseVO getPopularMovies(int days, int movieNum);
 }

src/main/java/com/example/cinema/bl/AccountService.java → src/main/java/com/example/cinema/bl/user/AccountService.java

@@ -1,4 +1,4 @@
-package com.example.cinema.bl;
+package com.example.cinema.bl.user;
 
 import com.example.cinema.vo.UserForm;
 import com.example.cinema.vo.ResponseVO;

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

@@ -1,7 +1,7 @@
-package com.example.cinema.blImpl;
+package com.example.cinema.blImpl.management;
 
-import com.example.cinema.bl.HallService;
-import com.example.cinema.data.HallMapper;
+import com.example.cinema.bl.management.HallService;
+import com.example.cinema.data.management.HallMapper;
 import com.example.cinema.vo.ResponseVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -1,11 +1,11 @@
-package com.example.cinema.blImpl;
+package com.example.cinema.blImpl.management;
 
-import com.example.cinema.bl.MovieService;
-import com.example.cinema.data.AccountMapper;
-import com.example.cinema.data.MovieLikeMapper;
-import com.example.cinema.data.MovieMapper;
+import com.example.cinema.bl.management.MovieService;
+import com.example.cinema.data.user.AccountMapper;
+import com.example.cinema.data.statistics.MovieLikeMapper;
+import com.example.cinema.data.management.MovieMapper;
 
-import com.example.cinema.data.ScheduleMapper;
+import com.example.cinema.data.management.ScheduleMapper;
 import com.example.cinema.vo.MovieBatchOffForm;
 import com.example.cinema.vo.MovieForm;
 import com.example.cinema.vo.ResponseVO;
@@ -13,9 +13,6 @@ import com.example.cinema.vo.ScheduleItem;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import javax.swing.plaf.synth.SynthScrollBarUI;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;

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

@@ -1,9 +1,9 @@
-package com.example.cinema.blImpl;
+package com.example.cinema.blImpl.management;
 
-import com.example.cinema.bl.ScheduleService;
-import com.example.cinema.data.HallMapper;
-import com.example.cinema.data.MovieMapper;
-import com.example.cinema.data.ScheduleMapper;
+import com.example.cinema.bl.management.ScheduleService;
+import com.example.cinema.data.management.HallMapper;
+import com.example.cinema.data.management.MovieMapper;
+import com.example.cinema.data.management.ScheduleMapper;
 import com.example.cinema.vo.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/com/example/cinema/blImpl/ActivityServiceImpl.java → src/main/java/com/example/cinema/blImpl/promotion/ActivityServiceImpl.java

@@ -1,8 +1,8 @@
-package com.example.cinema.blImpl;
+package com.example.cinema.blImpl.promotion;
 
-import com.example.cinema.bl.ActivityService;
-import com.example.cinema.bl.CouponService;
-import com.example.cinema.data.ActivityMapper;
+import com.example.cinema.bl.promotion.ActivityService;
+import com.example.cinema.bl.promotion.CouponService;
+import com.example.cinema.data.promotion.ActivityMapper;
 import com.example.cinema.po.Activity;
 import com.example.cinema.po.Coupon;
 import com.example.cinema.vo.ActivityForm;

src/main/java/com/example/cinema/blImpl/CouponServiceImpl.java → src/main/java/com/example/cinema/blImpl/promotion/CouponServiceImpl.java

@@ -1,7 +1,7 @@
-package com.example.cinema.blImpl;
+package com.example.cinema.blImpl.promotion;
 
-import com.example.cinema.bl.CouponService;
-import com.example.cinema.data.CouponMapper;
+import com.example.cinema.bl.promotion.CouponService;
+import com.example.cinema.data.promotion.CouponMapper;
 import com.example.cinema.po.Coupon;
 import com.example.cinema.vo.CouponForm;
 import com.example.cinema.vo.ResponseVO;

src/main/java/com/example/cinema/blImpl/VIPServiceImpl.java → src/main/java/com/example/cinema/blImpl/promotion/VIPServiceImpl.java

@@ -1,7 +1,7 @@
-package com.example.cinema.blImpl;
+package com.example.cinema.blImpl.promotion;
 
-import com.example.cinema.bl.VIPService;
-import com.example.cinema.data.VIPCardMapper;
+import com.example.cinema.bl.promotion.VIPService;
+import com.example.cinema.data.promotion.VIPCardMapper;
 import com.example.cinema.vo.VIPCardForm;
 import com.example.cinema.po.VIPCard;
 import com.example.cinema.vo.ResponseVO;

src/main/java/com/example/cinema/blImpl/TicketServiceImpl.java → src/main/java/com/example/cinema/blImpl/sales/TicketServiceImpl.java

@@ -1,9 +1,12 @@
-package com.example.cinema.blImpl;
+package com.example.cinema.blImpl.sales;
 
-import com.example.cinema.bl.HallService;
-import com.example.cinema.bl.TicketService;
-import com.example.cinema.data.*;
-import com.example.cinema.po.Activity;
+import com.example.cinema.bl.sales.TicketService;
+import com.example.cinema.data.management.HallMapper;
+import com.example.cinema.data.management.ScheduleMapper;
+import com.example.cinema.data.promotion.ActivityMapper;
+import com.example.cinema.data.promotion.CouponMapper;
+import com.example.cinema.data.promotion.VIPCardMapper;
+import com.example.cinema.data.sales.TicketMapper;
 import com.example.cinema.po.Coupon;
 import com.example.cinema.po.Ticket;
 import com.example.cinema.po.VIPCard;

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

@@ -1,7 +1,7 @@
-package com.example.cinema.blImpl;
+package com.example.cinema.blImpl.statistics;
 
-import com.example.cinema.bl.StatisticsService;
-import com.example.cinema.data.StatisticsMapper;
+import com.example.cinema.bl.statistics.StatisticsService;
+import com.example.cinema.data.statistics.StatisticsMapper;
 import com.example.cinema.vo.AudiencePrice;
 import com.example.cinema.vo.AudiencePriceVO;
 import com.example.cinema.vo.MovieScheduleTimeVO;
@@ -77,6 +77,16 @@ public class StatisticsServiceImpl implements StatisticsService {
         }
     }
 
+    @Override
+    public ResponseVO getMoviePlacingRateByDate(Date date) {
+        return null;
+    }
+
+    @Override
+    public ResponseVO getPopularMovies(int days, int movieNum) {
+        return null;
+    }
+
 
     /**
      * 获得num天后的日期

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

@@ -1,7 +1,7 @@
-package com.example.cinema.blImpl;
+package com.example.cinema.blImpl.user;
 
-import com.example.cinema.bl.AccountService;
-import com.example.cinema.data.AccountMapper;
+import com.example.cinema.bl.user.AccountService;
+import com.example.cinema.data.user.AccountMapper;
 import com.example.cinema.vo.UserForm;
 import com.example.cinema.vo.ResponseVO;
 import com.example.cinema.vo.UserVO;

src/main/java/com/example/cinema/controller/FileController.java

@@ -1,41 +0,0 @@
-package com.example.cinema.controller;
-
-import com.example.cinema.vo.ResponseVO;
-import org.apache.commons.io.FileUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-import java.io.File;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-/**
- * @author fjj
- * @date 2019/3/12 5:11 PM
- */
-@RestController
-public class FileController {
-    @RequestMapping(value = "/uploadFile",method = RequestMethod.POST)
-    public ResponseVO upLoadFile(@RequestParam MultipartFile myFile, HttpServletRequest request, HttpServletResponse response, HttpSession session) throws IOException {
-        String realFileName = "";
-        if(myFile.isEmpty()) {
-            return ResponseVO.buildFailure("图片未上传");
-        }
-        else {
-            String realPath = request.getSession().getServletContext().getRealPath("/WEB-INF/upload")+File.separator;
-            System.out.println(realPath);
-            realFileName =new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()) + myFile.getOriginalFilename();
-            String realFileAddress = realPath + realFileName;
-            System.out.println(realFileAddress);
-            FileUtils.copyInputStreamToFile(myFile.getInputStream(), new File(realFileAddress));
-        }
-        return ResponseVO.buildSuccess("/uploads/" + realFileName);
-    }
-}

src/main/java/com/example/cinema/controller/HallController.java → src/main/java/com/example/cinema/controller/management/HallController.java

@@ -1,6 +1,6 @@
-package com.example.cinema.controller;
+package com.example.cinema.controller.management;
 
-import com.example.cinema.bl.HallService;
+import com.example.cinema.bl.management.HallService;
 import com.example.cinema.vo.ResponseVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/example/cinema/controller/MovieController.java → src/main/java/com/example/cinema/controller/management/MovieController.java

@@ -1,8 +1,8 @@
-package com.example.cinema.controller;
+package com.example.cinema.controller.management;
 
 import com.example.cinema.vo.MovieBatchOffForm;
 import com.example.cinema.vo.MovieForm;
-import com.example.cinema.bl.MovieService;
+import com.example.cinema.bl.management.MovieService;
 import com.example.cinema.vo.ResponseVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

src/main/java/com/example/cinema/controller/ScheduleController.java → src/main/java/com/example/cinema/controller/management/ScheduleController.java

@@ -1,6 +1,6 @@
-package com.example.cinema.controller;
+package com.example.cinema.controller.management;
 
-import com.example.cinema.bl.ScheduleService;
+import com.example.cinema.bl.management.ScheduleService;
 import com.example.cinema.vo.ResponseVO;
 import com.example.cinema.vo.ScheduleBatchDeleteForm;
 import com.example.cinema.vo.ScheduleForm;

src/main/java/com/example/cinema/controller/ActivityController.java → src/main/java/com/example/cinema/controller/promotion/ActivityController.java

@@ -1,6 +1,6 @@
-package com.example.cinema.controller;
+package com.example.cinema.controller.promotion;
 
-import com.example.cinema.bl.ActivityService;
+import com.example.cinema.bl.promotion.ActivityService;
 import com.example.cinema.vo.ActivityForm;
 import com.example.cinema.vo.ResponseVO;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/example/cinema/controller/CouponController.java → src/main/java/com/example/cinema/controller/promotion/CouponController.java

@@ -1,6 +1,6 @@
-package com.example.cinema.controller;
+package com.example.cinema.controller.promotion;
 
-import com.example.cinema.bl.CouponService;
+import com.example.cinema.bl.promotion.CouponService;
 import com.example.cinema.vo.ResponseVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/com/example/cinema/controller/VIPCardController.java → src/main/java/com/example/cinema/controller/promotion/VIPCardController.java

@@ -1,6 +1,6 @@
-package com.example.cinema.controller;
+package com.example.cinema.controller.promotion;
 
-import com.example.cinema.bl.VIPService;
+import com.example.cinema.bl.promotion.VIPService;
 import com.example.cinema.vo.VIPCardForm;
 import com.example.cinema.vo.ResponseVO;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/example/cinema/controller/ViewController.java → src/main/java/com/example/cinema/controller/router/ViewController.java

@@ -1,4 +1,4 @@
-package com.example.cinema.controller;
+package com.example.cinema.controller.router;
 
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;

src/main/java/com/example/cinema/controller/TicketController.java → src/main/java/com/example/cinema/controller/sales/TicketController.java

@@ -1,7 +1,6 @@
-package com.example.cinema.controller;
+package com.example.cinema.controller.sales;
 
-import com.example.cinema.bl.TicketService;
-import com.example.cinema.blImpl.TicketServiceImpl;
+import com.example.cinema.bl.sales.TicketService;
 import com.example.cinema.vo.ResponseVO;
 import com.example.cinema.vo.TicketForm;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/example/cinema/controller/StatisticsController.java → src/main/java/com/example/cinema/controller/statistics/StatisticsController.java

@@ -1,12 +1,9 @@
-package com.example.cinema.controller;
+package com.example.cinema.controller.statistics;
 
-import com.example.cinema.bl.StatisticsService;
+import com.example.cinema.bl.statistics.StatisticsService;
 import com.example.cinema.vo.ResponseVO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
 
@@ -35,6 +32,20 @@ public class StatisticsController {
         return statisticsService.getAudiencePriceSevenDays();
     }
 
+    @RequestMapping(value = "statistics/PlacingRate", method = RequestMethod.GET)
+    public ResponseVO getMoviePlacingRateByDate(@RequestParam Date date){
+        return statisticsService.getMoviePlacingRateByDate(date);
+    }
+
+    @RequestMapping(value = "statistics/popular/movie", method = RequestMethod.GET)
+    public ResponseVO getPopularMovies(@RequestParam int days, @RequestParam int movieNum){
+        return statisticsService.getPopularMovies(days, movieNum);
+    }
+
+
+
+
+
 
 
 

src/main/java/com/example/cinema/controller/AccountController.java → src/main/java/com/example/cinema/controller/user/AccountController.java

@@ -1,6 +1,6 @@
-package com.example.cinema.controller;
+package com.example.cinema.controller.user;
 
-import com.example.cinema.blImpl.AccountServiceImpl;
+import com.example.cinema.blImpl.user.AccountServiceImpl;
 import com.example.cinema.config.InterceptorConfiguration;
 import com.example.cinema.vo.UserForm;
 import com.example.cinema.vo.ResponseVO;

src/main/java/com/example/cinema/data/HallMapper.java → src/main/java/com/example/cinema/data/management/HallMapper.java

@@ -1,4 +1,4 @@
-package com.example.cinema.data;
+package com.example.cinema.data.management;
 
 import com.example.cinema.vo.HallVO;
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/example/cinema/data/MovieMapper.java → src/main/java/com/example/cinema/data/management/MovieMapper.java

@@ -1,4 +1,4 @@
-package com.example.cinema.data;
+package com.example.cinema.data.management;
 
 import com.example.cinema.vo.MovieForm;
 import com.example.cinema.vo.MovieVO;

src/main/java/com/example/cinema/data/ScheduleMapper.java → src/main/java/com/example/cinema/data/management/ScheduleMapper.java

@@ -1,4 +1,4 @@
-package com.example.cinema.data;
+package com.example.cinema.data.management;
 
 
 import com.example.cinema.vo.ScheduleForm;

src/main/java/com/example/cinema/data/ActivityMapper.java → src/main/java/com/example/cinema/data/promotion/ActivityMapper.java

@@ -1,4 +1,4 @@
-package com.example.cinema.data;
+package com.example.cinema.data.promotion;
 
 import com.example.cinema.po.Activity;
 import com.example.cinema.vo.ActivityVO;

src/main/java/com/example/cinema/data/CouponMapper.java → src/main/java/com/example/cinema/data/promotion/CouponMapper.java

@@ -1,4 +1,4 @@
-package com.example.cinema.data;
+package com.example.cinema.data.promotion;
 
 import com.example.cinema.po.Coupon;
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/example/cinema/data/VIPCardMapper.java → src/main/java/com/example/cinema/data/promotion/VIPCardMapper.java

@@ -1,4 +1,4 @@
-package com.example.cinema.data;
+package com.example.cinema.data.promotion;
 
 import com.example.cinema.po.VIPCard;
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/example/cinema/data/TicketMapper.java → src/main/java/com/example/cinema/data/sales/TicketMapper.java

@@ -1,4 +1,4 @@
-package com.example.cinema.data;
+package com.example.cinema.data.sales;
 
 import com.example.cinema.po.Ticket;
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/example/cinema/data/MovieLikeMapper.java → src/main/java/com/example/cinema/data/statistics/MovieLikeMapper.java

@@ -1,4 +1,4 @@
-package com.example.cinema.data;
+package com.example.cinema.data.statistics;
 
 import com.example.cinema.po.DateLike;
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/example/cinema/data/StatisticsMapper.java → src/main/java/com/example/cinema/data/statistics/StatisticsMapper.java

@@ -1,4 +1,4 @@
-package com.example.cinema.data;
+package com.example.cinema.data.statistics;
 
 import com.example.cinema.vo.AudiencePrice;
 import com.example.cinema.vo.MovieScheduleTimeVO;

src/main/java/com/example/cinema/data/AccountMapper.java → src/main/java/com/example/cinema/data/user/AccountMapper.java

@@ -1,4 +1,4 @@
-package com.example.cinema.data;
+package com.example.cinema.data.user;
 
 import com.example.cinema.vo.UserVO;
 import org.apache.ibatis.annotations.Mapper;

src/main/java/com/example/cinema/interceptor/SessionInterceptor.java

@@ -14,14 +14,11 @@ import javax.servlet.http.HttpSession;
 public class SessionInterceptor extends HandlerInterceptorAdapter {
     @Override
     public boolean preHandle(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse, Object handler) throws Exception{
-        return true;
-//        HttpSession session=httpServletRequest.getSession();
-//        if(null!=session && null!=session.getAttribute(InterceptorConfiguration.SESSION_KEY)){
-//            return true;
-//        }
-//        httpServletResponse.sendRedirect("/index");
-//        return false;
+        HttpSession session=httpServletRequest.getSession();
+        if(null!=session && null!=session.getAttribute(InterceptorConfiguration.SESSION_KEY)){
+            return true;
+        }
+        httpServletResponse.sendRedirect("/index");
+        return false;
     }
-
-
 }

src/main/resources/application.yml

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

src/main/java/com/example/cinema/data/HallMapper.xml → src/main/resources/dataImpl/management/HallMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.example.cinema.data.HallMapper">
+<mapper namespace="com.example.cinema.data.management.HallMapper">
     <select id="selectAllHall" resultMap="Hall">
         select * from hall
     </select>

src/main/java/com/example/cinema/data/MovieMapper.xml → src/main/resources/dataImpl/management/MovieMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.example.cinema.data.MovieMapper">
+<mapper namespace="com.example.cinema.data.management.MovieMapper">
     <insert id="insertOneMovie" parameterType="com.example.cinema.vo.MovieForm"
             useGeneratedKeys="true" keyProperty="id">
         insert into movie(name, poster_url, director, screen_writer, starring, type, country, language, length, start_date, description, status)

src/main/java/com/example/cinema/data/ScheduleMapper.xml → src/main/resources/dataImpl/management/ScheduleMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.example.cinema.data.ScheduleMapper">
+<mapper namespace="com.example.cinema.data.management.ScheduleMapper">
     <insert id="insertOneSchedule" parameterType="com.example.cinema.vo.ScheduleForm"
             useGeneratedKeys="true" keyProperty="id">
         insert into schedule(hall_id, movie_id, start_time, end_time, fare)

src/main/java/com/example/cinema/data/ActivityMapper.xml → src/main/resources/dataImpl/promotion/ActivityMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.example.cinema.data.ActivityMapper">
+<mapper namespace="com.example.cinema.data.promotion.ActivityMapper">
     <insert id="insertActivity" parameterType="com.example.cinema.po.Activity"
             useGeneratedKeys="true" keyProperty="id">
         insert into activity(a_description,activity_name,coupon_id,start_time,end_time)
@@ -83,7 +83,7 @@
         <result column="activity_name" property="name"></result>
         <result column="start_time" property="startTime"></result>
         <result column="end_time" property="endTime"></result>
-        <association property="coupon" column="coupon_id" select="com.example.cinema.data.CouponMapper.selectById">
+        <association property="coupon" column="coupon_id" select="com.example.cinema.data.promotion.CouponMapper.selectById">
         </association>
         <collection property="movieList" ofType="com.example.cinema.vo.MovieVO">
             <id column="movie_id" property="id"></id>

src/main/java/com/example/cinema/data/CouponMapper.xml → src/main/resources/dataImpl/promotion/CouponMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.example.cinema.data.CouponMapper">
+<mapper namespace="com.example.cinema.data.promotion.CouponMapper">
     <insert id="insertCoupon" parameterType="com.example.cinema.po.Coupon"
             useGeneratedKeys="true" keyProperty="id">
         insert into coupon(description,name,target_amount,discount_amount,start_time,end_time)

src/main/java/com/example/cinema/data/VIPCardMapper.xml → src/main/resources/dataImpl/promotion/VIPCardMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.example.cinema.data.VIPCardMapper">
+<mapper namespace="com.example.cinema.data.promotion.VIPCardMapper">
     <insert id="insertOneCard" parameterType="com.example.cinema.po.VIPCard"
             useGeneratedKeys="true" keyProperty="id">
         insert into vip_card(user_id,balance)

src/main/java/com/example/cinema/data/TicketMapper.xml → src/main/resources/dataImpl/sales/TicketMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.example.cinema.data.TicketMapper">
+<mapper namespace="com.example.cinema.data.sales.TicketMapper">
     <insert id="insertTicket" parameterType="com.example.cinema.po.Ticket"
             useGeneratedKeys="true" keyProperty="id">
         insert into ticket(user_id,schedule_id,column_index,row_index,state)

src/main/java/com/example/cinema/data/MovieLikeMapper.xml → src/main/resources/dataImpl/statistics/MovieLikeMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.example.cinema.data.MovieLikeMapper">
+<mapper namespace="com.example.cinema.data.statistics.MovieLikeMapper">
     <insert id="insertOneLike" >
         insert into movie_like(user_id,movie_id)
         values(#{userId}, #{movieId})

src/main/java/com/example/cinema/data/StatisticsMapper.xml → src/main/resources/dataImpl/statistics/StatisticsMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.example.cinema.data.StatisticsMapper">
+<mapper namespace="com.example.cinema.data.statistics.StatisticsMapper">
     <select id="selectMovieScheduleTimes" resultType="com.example.cinema.vo.MovieScheduleTimeVO">
         select movie_id as movieId, count(*) as time,name from
               (select * from schedule where start_time between #{date} and #{nextDate}) s,

src/main/java/com/example/cinema/data/AccountMapper.xml → src/main/resources/dataImpl/user/AccountMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.example.cinema.data.AccountMapper">
+<mapper namespace="com.example.cinema.data.user.AccountMapper">
     <insert id="createNewAccount" useGeneratedKeys="true" keyProperty="id">
         insert into user(username,password)
         values(#{username},#{password})

src/main/resources/static/js/adminCinemaStatistic.js

@@ -7,6 +7,10 @@ $(document).ready(function() {
 
     getAudiencePrice();
 
+    getPlacingRate();
+
+    getPolularMovie();
+
     function getScheduleRate() {
 
         getRequest(
@@ -145,4 +149,11 @@ $(document).ready(function() {
             });
     }
 
+    function getPlacingRate() {
+        // todo
+    }
+
+    function getPolularMovie() {
+        // todo
+    }
 });

src/main/resources/static/js/movieDetail.js

@@ -97,7 +97,10 @@ $(document).ready(function(){
 
     // admin界面才有
     $("#modify-btn").click(function () {
-       alert('后续功能');
+       alert('交给你们啦，修改时需要在对应html文件添加表单然后获取用户输入，提交给后端，别忘记对用户输入进行验证。（可参照添加电影&添加排片&修改排片）');
+    });
+    $("#delete-btn").click(function () {
+        alert('交给你们啦，下架别忘记需要一个确认提示框，也别忘记下架之后要对用户有所提示哦');
     });
 
 });

src/main/resources/templates/adminCinemaStatistic.html

@@ -41,6 +41,10 @@
         </div>
         <div class="card table-container" id="audience-price-container">
         </div>
+        <div class="card table-container" id="place-rate-container">
+        </div>
+        <div class="card table-container" id="popular-movie-container">
+        </div>
     </div>
 </div>
 </body>

src/main/resources/templates/adminMovieDetail.html

@@ -50,7 +50,10 @@
                 <div><span>导 演 ：</span><span id="movie-director"></span></div>
                 <div><span>主 演 ：</span><span id="movie-starring"></span></div>
                 <div><span>编 剧 ：</span><span id="movie-writer"></span></div>
-                <div class="movie-operations"><button type="button" class="btn btn-primary" id="modify-btn"><span>修 改</span></button></div>
+                <div class="movie-operations">
+                    <button type="button" class="btn btn-primary" id="modify-btn"><span>修 改</span></button>
+                    <button type="button" class="btn btn-danger" id="delete-btn"><span>下 架</span></button>
+                </div>
             </div>
         </div>
         <div class="statistic-container card">

src/test/java/com/example/cinema/bl/ScheduleServiceImplTest.java

@@ -1,16 +1,11 @@
 package com.example.cinema.bl;
 
-import com.example.cinema.vo.ScheduleBatchDeleteForm;
-import org.junit.Test;
+import com.example.cinema.bl.management.ScheduleService;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
 /**
  * @author fjj
  * @date 2019/4/12 3:21 PM

src/test/java/com/example/cinema/bl/VIPServiceImplTest.java

@@ -1,7 +1,7 @@
 package com.example.cinema.bl;
 
-import com.example.cinema.data.CouponMapper;
-import com.example.cinema.vo.VIPCardForm;
+import com.example.cinema.bl.promotion.VIPService;
+import com.example.cinema.data.promotion.CouponMapper;
 import com.example.cinema.vo.ResponseVO;
 import org.junit.Test;
 import org.junit.runner.RunWith;

src/test/java/com/example/cinema/blImpl/MovieServiceImplTest.java

@@ -1,17 +1,11 @@
 package com.example.cinema.blImpl;
 
-import com.example.cinema.bl.MovieService;
-import com.example.cinema.vo.MovieBatchOffForm;
-import org.junit.Test;
+import com.example.cinema.bl.management.MovieService;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import java.util.Arrays;
-
-import static org.junit.Assert.*;
-
 /**
  * @author fjj
  * @date 2019/4/16 10:06 PM

src/test/java/com/example/cinema/blImpl/ScheduleServiceImplTest.java

@@ -1,14 +1,12 @@
 package com.example.cinema.blImpl;
 
-import com.example.cinema.bl.ScheduleService;
+import com.example.cinema.bl.management.ScheduleService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import static org.junit.Assert.*;
-
 /**
  * @author fjj
  * @date 2019/4/21 12:08 AM

src/test/java/com/example/cinema/blImpl/StatisticsServiceImplTest.java

@@ -1,6 +1,6 @@
 package com.example.cinema.blImpl;
 
-import com.example.cinema.bl.StatisticsService;
+import com.example.cinema.bl.statistics.StatisticsService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,8 +11,6 @@ import java.text.ParseException;
 import java.util.Calendar;
 import java.util.Date;
 
-import static org.junit.Assert.*;
-
 /**
  * @author fjj
  * @date 2019/4/16 3:05 PM