Merge branch 'dev'

Author: ZwiebelnX

src/main/java/com/njust/csa/reg/config/MyConfig.java

@@ -0,0 +1,16 @@
+package com.njust.csa.reg.config;
+
+import com.njust.csa.reg.interceptor.MyInterceptor;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+public class MyConfig implements WebMvcConfigurer {
+
+    //注册管理端访问拦截器
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(new MyInterceptor()).addPathPatterns("/page/index.html");
+    }
+}

src/main/java/com/njust/csa/reg/controller/AdminController.java

@@ -9,6 +9,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import java.sql.Timestamp;
 import java.util.HashMap;
@@ -25,6 +26,25 @@ public AdminController(AdminService adminService){
         this.adminService = adminService;
     }
 
+    //重定向后的请求处理
+    @RequestMapping(value = "/page/login", method = RequestMethod.GET)
+    public String getIndex(HttpServletRequest request){
+        request.getSession().setAttribute("isRedirect", true); //添加session信息，避免拦截器重复拦截
+        return "/page/index.html";
+    }
+
+    //处理管理端的所有静态请求
+    @RequestMapping(value = "/page/activity/*", method = RequestMethod.GET)
+    public String checkIndex(HttpSession session){
+        //如果登录，则跳回主页面
+        if(checkUser(session)){
+            return "/page/index.html";
+        }
+        //如果访问静态请求时没有登录，则重定向
+        return "redirect:/page/login";
+    }
+
+    //管理端登录
     @ResponseBody
     @RequestMapping(value = "/login", method = RequestMethod.POST,
             produces = "application/json;charset=UTF-8")
@@ -42,12 +62,14 @@ public ResponseEntity adminLogin(@RequestBody String jsonString, HttpSession ses
         }
     }
 
+    //管理端登出
     @ResponseBody
     @RequestMapping(value = "/logout", method = RequestMethod.GET,
             produces = "application/json;charset=UTF-8")
     public ResponseEntity adminLogout(HttpSession session){
         if(session.getAttribute("username") != null){
             sessionList.remove(session.getAttribute("username").toString());
+            session.removeAttribute("username");
         }
         return new ResponseEntity(HttpStatus.OK);
     }
@@ -90,32 +112,32 @@ public ResponseEntity<String> postActivity(@RequestBody String jsonString, HttpS
         }
     }
 
+    //获取用户列表，用于登录
     @ResponseBody
-    @RequestMapping(value = "/user", method = RequestMethod.POST,
+    @RequestMapping(value = "/user", method = RequestMethod.GET,
             produces = "application/json;charset=UTF-8")
-    public ResponseEntity<String> getUsers(HttpSession session){
-        if(checkUser(session)){
-            return new ResponseEntity<>(adminService.getUser(), HttpStatus.OK);
-        }
-        else return new ResponseEntity<>("", HttpStatus.UNAUTHORIZED);
+    public ResponseEntity<String> getUsers(){
+        return new ResponseEntity<>(adminService.getUser(), HttpStatus.OK);
     }
 
+    //获取所有活动
     @ResponseBody
     @RequestMapping(value = "/admin/activity", method = RequestMethod.GET,
             produces = "application/json;charset=UTF-8")
     public ResponseEntity<String> adminGetActivity(HttpSession session){
         if(checkUser(session)){
-            return new ResponseEntity<>(adminService.getActivity(), HttpStatus.OK);
+            return new ResponseEntity<>(adminService.getActivities(), HttpStatus.OK);
         }
         else return new ResponseEntity<>("", HttpStatus.UNAUTHORIZED);
     }
 
+    //设置活动状态
     @ResponseBody
     @RequestMapping(value = "/admin/activity/{id}/status", method = RequestMethod.PUT,
             produces = "application/json;charset=UTF-8")
     public ResponseEntity setActivityStatus(@PathVariable long id, @RequestBody String jsonString, HttpSession session){
         if(checkUser(session)){
-            byte status = (byte)Integer.parseInt(new JSONObject(jsonString).getString("status"));
+            byte status = (byte)new JSONObject(jsonString).getInt("status");
             if(adminService.setActivityStatus(id, status)){
                 return new ResponseEntity(HttpStatus.ACCEPTED);
             }
@@ -124,10 +146,71 @@ public ResponseEntity setActivityStatus(@PathVariable long id, @RequestBody Stri
         else return new ResponseEntity(HttpStatus.UNAUTHORIZED);
     }
 
+    //作为管理员获取一个活动的结构
+    @ResponseBody
+    @RequestMapping(value = "/admin/activity/{id}", method = RequestMethod.GET,
+            produces = "application/json;charset=UTF-8")
+    public ResponseEntity<String> getActivityStructure(@PathVariable long id, HttpSession session){
+        if(checkUser(session)){
+            return new ResponseEntity<>(adminService.getActivityStructure(id), HttpStatus.OK);
+        }
+        else return new ResponseEntity<>("", HttpStatus.UNAUTHORIZED);
+    }
+
+    //删除一个报名
+    @ResponseBody
+    @RequestMapping(value = "/admin/activity/{id}", method = RequestMethod.DELETE,
+            produces = "application/json;charset=UTF-8")
+    public ResponseEntity<String> deleteActivity(@PathVariable long id, HttpSession session){
+        if(checkUser(session)){
+            return new ResponseEntity<>(adminService.deleteActivity(id), HttpStatus.OK);
+        }
+        else return new ResponseEntity<>("", HttpStatus.UNAUTHORIZED);
+    }
+
+    //获取一个报名内的报名信息
+    @ResponseBody
+    @RequestMapping(value = "/admin/activity/{id}/applicant", method = RequestMethod.GET,
+            produces = "application/json;charset=UTF-8")
+    public ResponseEntity<String> getActivityApplicants(@PathVariable long id, HttpSession session){
+        if(checkUser(session)){
+            return new ResponseEntity<>(adminService.getActivityApplicants(id), HttpStatus.OK);
+        }
+        else return new ResponseEntity<>("", HttpStatus.UNAUTHORIZED);
+    }
+
+    //删除指定的报名信息
+    @ResponseBody
+    @RequestMapping(value = "/admin/activity/{aid}/applicant/{iid}", method = RequestMethod.DELETE,
+            produces = "application/json;charset=UTF-8")
+    public ResponseEntity<String> deleteApplicantInfo(@PathVariable long aid, @PathVariable int iid, HttpSession session){
+        if(checkUser(session)){
+            return new ResponseEntity<>(adminService.deleteApplicantInfo(aid, iid), HttpStatus.OK);
+        }
+        else return new ResponseEntity<>("", HttpStatus.UNAUTHORIZED);
+    }
+
+    //更新报名信息
+    @ResponseBody
+    @RequestMapping(value = "/admin/activity/{id}", method = RequestMethod.PUT,
+            produces = "application/json;charset=UTF-8")
+    public ResponseEntity<String> alterActivityStructure(@PathVariable long id, HttpSession session,
+                                                         @RequestBody String jsonString){
+        if(checkUser(session) ){
+            if(adminService.alterActivityStructure(id, new JSONObject(jsonString)))
+                return new ResponseEntity<>("", HttpStatus.OK);
+            else
+                return new ResponseEntity<>("", HttpStatus.NOT_ACCEPTABLE);
+        }
+        else return new ResponseEntity<>("", HttpStatus.UNAUTHORIZED);
+    }
+
     // 检查当前用户连接是否已经登陆
     private boolean checkUser(HttpSession session){
+        if(session == null) return false;
         String userName = session.getAttribute("username") == null ?
                 null : session.getAttribute("username").toString();
         return userName != null && sessionList.get(userName).equals(session.getId());
     }
+
 }

src/main/java/com/njust/csa/reg/controller/AppController.java

@@ -16,18 +16,21 @@ public AppController(AppService appService){
         this.appService = appService;
     }
 
+    //获取所有已开启的报名信息
     @RequestMapping(value = "/activity", method = RequestMethod.GET,
             produces = "application/json;charset=UTF-8")
     public String getActivities(){
         return appService.getActivities();
     }
 
+    //获取指定报名信息的结构
     @RequestMapping(value = "/activity/{id}", method = RequestMethod.GET,
             produces = "application/json;charset=UTF-8")
     public String getActivityStructure(@PathVariable long id){
         return appService.getActivityStructure(id);
     }
 
+    //提交指定报名信息
     @RequestMapping(value = "/activity/{id}", method = RequestMethod.POST,
             produces = "application/json;charset=UTF-8")
     public String putApplicantInfo(@PathVariable long id, @RequestBody String jsonString){

src/main/java/com/njust/csa/reg/interceptor/MyInterceptor.java

@@ -0,0 +1,19 @@
+package com.njust.csa.reg.interceptor;
+
+import org.springframework.web.servlet.HandlerInterceptor;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+
+public class MyInterceptor implements HandlerInterceptor {
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        if(request.getSession().getAttribute("username") == null && request.getSession().getAttribute("isRedirect") == null){
+            response.sendRedirect("login");
+            return false;
+        }
+        request.getSession().removeAttribute("isRedirect");
+        return true;
+    }
+}

src/main/java/com/njust/csa/reg/repository/docker/ApplicantInfoRepo.java

@@ -3,8 +3,12 @@
 import com.njust.csa.reg.repository.entities.ApplicantInfoEntity;
 import org.springframework.data.repository.CrudRepository;
 
+import java.util.List;
+
 public interface ApplicantInfoRepo extends CrudRepository<ApplicantInfoEntity, Long> {
     int countByBelongsToStructureId(long structureId);
 
     boolean existsByBelongsToStructureIdAndValue(long structureId, String value);
+
+    Integer deleteAllByIdIn(List<Long> in);
 }

src/main/java/com/njust/csa/reg/repository/docker/ApplicantInfoViewRepo.java

@@ -0,0 +1,12 @@
+package com.njust.csa.reg.repository.docker;
+
+import com.njust.csa.reg.repository.entities.ApplicantInfoViewEntity;
+import org.springframework.data.repository.CrudRepository;
+
+import java.util.List;
+
+public interface ApplicantInfoViewRepo extends CrudRepository<ApplicantInfoViewEntity, Long> {
+    List<ApplicantInfoViewEntity> findAllByTableId(long id);
+
+    List<ApplicantInfoViewEntity> findAllByTableIdAndApplicantNumber(long tableId, int applicantNumber);
+}

src/main/java/com/njust/csa/reg/repository/docker/TableInfoRepo.java

@@ -3,8 +3,6 @@
 import com.njust.csa.reg.repository.entities.TableInfoEntity;
 import org.springframework.data.repository.CrudRepository;
 
-import java.util.List;
-
 public interface TableInfoRepo extends CrudRepository<TableInfoEntity, Long> {
-    List<TableInfoEntity> findAllByStatus(byte status);
+    Iterable<TableInfoEntity> findAllByStatus(byte status);
 }

src/main/java/com/njust/csa/reg/repository/docker/TableStructureRepo.java

@@ -10,4 +10,8 @@ public interface TableStructureRepo extends CrudRepository<TableStructureEntity,
     List<TableStructureEntity> findAllByBelongsToOrderByIndexNumber(long belongsTo);
 
     List<TableStructureEntity> findAllByTableIdAndBelongsToOrderByIndexNumber(long tableId, Long BelongsTo);
+
+    TableStructureEntity findTopByTableIdAndIsUnique(long id, byte isUnique);
+
+    List<TableStructureEntity> findAllByTableId(long id);
 }

src/main/java/com/njust/csa/reg/repository/entities/ApplicantInfoViewEntity.java

@@ -0,0 +1,93 @@
+package com.njust.csa.reg.repository.entities;
+
+import javax.persistence.*;
+import java.util.Objects;
+
+@Entity
+@Table(name = "applicant_info_view", schema = "test_reg_sys", catalog = "")
+public class ApplicantInfoViewEntity {
+    private int applicantNumber;
+    private String value;
+    private long id;
+    private long structureId;
+    private long tableId;
+    private String type;
+
+    @Basic
+    @Column(name = "applicant_number", nullable = false)
+    public int getApplicantNumber() {
+        return applicantNumber;
+    }
+
+    public void setApplicantNumber(int applicantNumber) {
+        this.applicantNumber = applicantNumber;
+    }
+
+    @Basic
+    @Column(name = "value", nullable = false, length = 1000)
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    @Id
+    @Column(name = "id", nullable = false)
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    @Basic
+    @Column(name = "structure_id", nullable = false)
+    public long getStructureId() {
+        return structureId;
+    }
+
+    public void setStructureId(long structureId) {
+        this.structureId = structureId;
+    }
+
+    @Basic
+    @Column(name = "table_id", nullable = false)
+    public long getTableId() {
+        return tableId;
+    }
+
+    public void setTableId(long tableId) {
+        this.tableId = tableId;
+    }
+
+    @Basic
+    @Column(name = "type", nullable = false, length = 30)
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        ApplicantInfoViewEntity that = (ApplicantInfoViewEntity) o;
+        return applicantNumber == that.applicantNumber &&
+                id == that.id &&
+                structureId == that.structureId &&
+                tableId == that.tableId &&
+                Objects.equals(value, that.value) &&
+                Objects.equals(type, that.type);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(applicantNumber, value, id, structureId, tableId, type);
+    }
+}