From 322b8baa87c92d0d0af1b205e470c3da6b7019f4 Mon Sep 17 00:00:00 2001
From: wyl <wangyulong990316@outlook.com>
Date: Thu, 28 Nov 2024 11:18:38 +0000
Subject: [PATCH] update
---
.../config/AuthenticationFailHandler.java | 1 -
.../config/AuthenticationSuccessHandler.java | 2 -
.../CustomAuthenticationEntryPoint.java | 3 -
.../config/WebMvcConfiguration.java | 1 -
.../config/WebSecurityConfig.java | 1 -
.../controller/ViewController.java | 4 +-
.../hospital/HospitalController.java | 1 +
.../mapper/SuperAdminMapper.java | 314 ++----------------
.../service/HospitalService.java | 3 +-
.../service/imp/HospitalServiceImpl.java | 2 +-
src/main/resources/application-dev.yml | 2 +-
.../resources/static/html/superAdminView.html | 56 ----
.../resources/static/js/mainHospitalView.js | 37 +--
.../resources/static/js/mainSupAdminView.js | 21 +-
.../resources/templates/mainSupAdminView.html | 9 +-
15 files changed, 69 insertions(+), 388 deletions(-)
diff --git a/src/main/java/com/cardiff/client_project/config/AuthenticationFailHandler.java b/src/main/java/com/cardiff/client_project/config/AuthenticationFailHandler.java
index 0964c4d..c249d1f 100644
--- a/src/main/java/com/cardiff/client_project/config/AuthenticationFailHandler.java
+++ b/src/main/java/com/cardiff/client_project/config/AuthenticationFailHandler.java
@@ -4,7 +4,6 @@ import com.cardiff.client_project.utils.Result;
import com.fasterxml.jackson.databind.ObjectMapper;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-import org.springframework.context.annotation.Configuration;
import org.springframework.security.core.AuthenticationException;
import org.springframework.security.web.authentication.AuthenticationFailureHandler;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/cardiff/client_project/config/AuthenticationSuccessHandler.java b/src/main/java/com/cardiff/client_project/config/AuthenticationSuccessHandler.java
index a52fa0a..bbb78fd 100644
--- a/src/main/java/com/cardiff/client_project/config/AuthenticationSuccessHandler.java
+++ b/src/main/java/com/cardiff/client_project/config/AuthenticationSuccessHandler.java
@@ -4,8 +4,6 @@ import com.cardiff.client_project.utils.Result;
import com.fasterxml.jackson.databind.ObjectMapper;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-
-import org.springframework.context.annotation.Configuration;
import org.springframework.security.core.Authentication;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/cardiff/client_project/config/CustomAuthenticationEntryPoint.java b/src/main/java/com/cardiff/client_project/config/CustomAuthenticationEntryPoint.java
index eceecba..384904a 100644
--- a/src/main/java/com/cardiff/client_project/config/CustomAuthenticationEntryPoint.java
+++ b/src/main/java/com/cardiff/client_project/config/CustomAuthenticationEntryPoint.java
@@ -1,8 +1,5 @@
package com.cardiff.client_project.config;
-import com.cardiff.client_project.constant.ResponseCode;
-import com.cardiff.client_project.utils.Result;
-import com.fasterxml.jackson.databind.ObjectMapper;
import jakarta.servlet.ServletException;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
diff --git a/src/main/java/com/cardiff/client_project/config/WebMvcConfiguration.java b/src/main/java/com/cardiff/client_project/config/WebMvcConfiguration.java
index 3f294c4..1c9e2d0 100644
--- a/src/main/java/com/cardiff/client_project/config/WebMvcConfiguration.java
+++ b/src/main/java/com/cardiff/client_project/config/WebMvcConfiguration.java
@@ -1,6 +1,5 @@
package com.cardiff.client_project.config;
-import org.springframework.context.annotation.Configuration;
import org.springframework.stereotype.Component;
import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
diff --git a/src/main/java/com/cardiff/client_project/config/WebSecurityConfig.java b/src/main/java/com/cardiff/client_project/config/WebSecurityConfig.java
index e52ca43..52debc2 100644
--- a/src/main/java/com/cardiff/client_project/config/WebSecurityConfig.java
+++ b/src/main/java/com/cardiff/client_project/config/WebSecurityConfig.java
@@ -2,7 +2,6 @@ package com.cardiff.client_project.config;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
-
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.core.GrantedAuthorityDefaults;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
diff --git a/src/main/java/com/cardiff/client_project/controller/ViewController.java b/src/main/java/com/cardiff/client_project/controller/ViewController.java
index 5126718..10f4ab0 100644
--- a/src/main/java/com/cardiff/client_project/controller/ViewController.java
+++ b/src/main/java/com/cardiff/client_project/controller/ViewController.java
@@ -23,7 +23,7 @@ public class ViewController {
@GetMapping("/defaultLoadMain")
public String loadMainView_1(Model model) {
- Result result = superAdminService.selectAllAdmin();
+ Result result = superAdminService.selectAllAdmin();
// Add data to the model
model.addAttribute("tableData", result.getData());
return "mainSupAdminView";
@@ -36,7 +36,7 @@ public class ViewController {
// Add data to the model
System.out.println("result"+result.getData());
model.addAttribute("tableData", result.getData());
- // System.out.println("result"+result.getData());
+ // System.out.println("result"+result.getData());
return "mainHospitalView";
}
@GetMapping("/beds")
diff --git a/src/main/java/com/cardiff/client_project/controller/hospital/HospitalController.java b/src/main/java/com/cardiff/client_project/controller/hospital/HospitalController.java
index 3c0febe..780437b 100644
--- a/src/main/java/com/cardiff/client_project/controller/hospital/HospitalController.java
+++ b/src/main/java/com/cardiff/client_project/controller/hospital/HospitalController.java
@@ -4,6 +4,7 @@ import com.cardiff.client_project.pojo.dto.HospitalDTO;
import com.cardiff.client_project.service.HospitalService;
import com.cardiff.client_project.utils.Result;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import java.util.List;
diff --git a/src/main/java/com/cardiff/client_project/mapper/SuperAdminMapper.java b/src/main/java/com/cardiff/client_project/mapper/SuperAdminMapper.java
index 5c21a00..875327d 100644
--- a/src/main/java/com/cardiff/client_project/mapper/SuperAdminMapper.java
+++ b/src/main/java/com/cardiff/client_project/mapper/SuperAdminMapper.java
@@ -30,272 +30,7 @@ import java.util.Map;
public class SuperAdminMapper {
@Autowired
- JdbcTemplate jdbcTemplate;
-
- /**
- * ser registration
- * @param commonAdmin
- */
- public Result insertUserInform(CommonAdmin commonAdmin) {
-
- //Check whether the account exists(If the user name and email address are the same, the account is confirmed to exist)
- String sql = "SELECT count(id) FROM common_admin where name = ? and email = ?";
- Integer count= jdbcTemplate.queryForObject(sql, new Object[]{commonAdmin.getName(), commonAdmin.getEmail()}, Integer.class);
- System.out.println(count);
- if(count>0){
- return Result.error(ResponseCode.ACCOUNT_EXISTS_ERROR);
- }
-
- //insert data
- SimpleJdbcInsert insert = new SimpleJdbcInsert(jdbcTemplate)
- .withTableName("common_admin")
- .usingGeneratedKeyColumns("id");
-
- Map<String, Object> parameters = new HashMap<>();
- parameters.put("name",commonAdmin.getName());
- parameters.put("password",commonAdmin.getPassword());
- parameters.put("email",commonAdmin.getEmail());
- parameters.put("phone",commonAdmin.getPhone());
- parameters.put("type",commonAdmin.getType());
- parameters.put("status",commonAdmin.getStatus());
- parameters.put("roleId",commonAdmin.getRoleId());
-
- Number number = insert.executeAndReturnKey(parameters);
- if(number.longValue() > 0){
- return Result.success(ResponseCode.SUCCESS);
- }else {
- return Result.error(ResponseCode.ERROR);
- }
- }
-
- /**
- * Batch deletion based on id
- * @param ids
- * @return
- */
- public int[] deleteByIdAndType(List<Integer> ids,String type) {
- String sql = "";
- String sql_1="";
- String sql_2="";
- if(type.equals("hospital")){
- sql = "DELETE FROM hospital WHERE id=?";
- sql_1="ALTER TABLE hospital DROP COLUMN id;";
- sql_2="ALTER TABLE hospital ADD COLUMN id INT NOT NULL PRIMARY KEY AUTO_INCREMENT FIRST;";
- }
- if(type.equals("commonAdmin")){
- sql = "DELETE FROM common_admin WHERE id=?";
- sql_1="ALTER TABLE common_admin DROP COLUMN id;";
- sql_2="ALTER TABLE common_admin ADD COLUMN id INT NOT NULL PRIMARY KEY AUTO_INCREMENT FIRST;";
- }
- List<Object[]> idList = new ArrayList<>();
- // Build parameter list
- for (Integer id : ids) {
- idList.add(new Object[]{id});
- }
- // Batch delete
- int[] item = jdbcTemplate.batchUpdate(sql, idList);
- jdbcTemplate.update(sql_1);
- jdbcTemplate.update(sql_2);
- return item;
- }
-
- /**
- * select admin
- * @return
- */
- public List<AdminVO> selectAllAdmin() {
-
- // Parameterized queries avoid SQL injection
- String sql = "SELECT * FROM common_admin ORDER BY status DESC";
- List<AdminVO> query = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(AdminVO.class));
- return query;
- }
-
- /**
- * select hospital
- * @return
- */
- public List<Hospital> selectAllHospital(){
-
- // Parameterized queries avoid SQL injection
- String sql = "SELECT * FROM hospital ORDER BY status DESC";
- List<Hospital> query = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(Hospital.class));
- System.out.println(query);
- return query;
- }
-
-
- /**
- * update data
- * @param o
- */
- public List update(Object o) {
- if(o instanceof CommonAdmin){
- CommonAdmin commonAdmin=(CommonAdmin)o;
- StringBuilder sql = new StringBuilder("UPDATE common_admin SET ");
- List<Object> params = new ArrayList<>();
-
- if (commonAdmin.getName() != null && !commonAdmin.getName().isEmpty()) {
- sql.append("name = ?, ");
- params.add(commonAdmin.getName());
- }
-
- if (commonAdmin.getEmail() != null && !commonAdmin.getEmail().isEmpty()) {
- sql.append("email = ?, ");
- params.add(commonAdmin.getEmail());
- }
-
- if (commonAdmin.getPhone() != null && !commonAdmin.getPhone().isEmpty()) {
- sql.append("phone = ?, ");
- params.add(commonAdmin.getPhone());
- }
- if (Integer.valueOf(commonAdmin.getStatus())!=null) {
- sql.append("status = ?, ");
- params.add(commonAdmin.getStatus());
- }
- // Remove the last comma and space
- sql.setLength(sql.length() - 2);
-
- // Add the WHERE clause
- sql.append(" WHERE id = ?");
- params.add(commonAdmin.getId());
-
- jdbcTemplate.update(sql.toString(), params.toArray());
-
- List<AdminVO> adminVOS = selectAllAdmin();
- return adminVOS;
-
- }
- if(o instanceof Hospital){
-
- Hospital hospital = (Hospital) o;
- System.out.println("hospital"+hospital);
- StringBuilder sql = new StringBuilder("UPDATE hospital SET ");
- List<Object> params = new ArrayList<>();
-
- if (hospital.getEmail() != null && !hospital.getEmail().isEmpty()) {
- sql.append("email = ?, ");
- params.add(hospital.getEmail());
- }
-
- if (hospital.getName() != null && !hospital.getName().isEmpty()) {
- sql.append("name = ?, ");
- params.add(hospital.getName());
- }
-
- if (hospital.getPhone() != null && !hospital.getPhone().isEmpty()) {
- sql.append("phone = ?, ");
- params.add(hospital.getPhone());
- }
-
- if (Integer.valueOf(hospital.getStatus()) != null) {
- sql.append("status = ?, ");
- params.add(hospital.getStatus());
- }
-
- if (hospital.getAddress() != null && !hospital.getAddress().isEmpty()) {
- sql.append("address = ?, ");
- params.add(hospital.getAddress());
- }
-
- if ((Integer.valueOf(hospital.getMaxAmount()) != null)){
- sql.append("maxAmount = ?, ");
- params.add(hospital.getMaxAmount());
- }
-
- if (Integer.valueOf(hospital.getAmountPatient()) != null) {
- sql.append("amountPatient = ?, ");
- params.add(hospital.getAmountPatient());
- }
-
-
- sql.setLength(sql.length() - 2);
- sql.append(" WHERE id = ?");
- params.add(hospital.getId());
-
- jdbcTemplate.update(sql.toString(), params.toArray());
-
- List<Hospital> hospitals = selectAllHospital();
- return hospitals;
- }
- return null;
- }
-
-
-
- /**
- * fuzzy query
- * @param selectDTO
- * @return
- */
- public List<SelectVO> selectByItem(SelectDTO selectDTO) {
- System.out.println("test:"+selectDTO);
- // Get query type
- String type = selectDTO.getType();
- // Build the basic SQL and parameter list
- StringBuilder sql = new StringBuilder("SELECT * FROM");
- if(type.contains("commonAdmin")){
- sql.append(" common_admin ");
- }
- if(type.contains("hospital")){
- sql.append(" hospital ");
- }
-
- //Dynamic table name stitching
- sql.append(" WHERE 1=1 ");
- List<Object> params = new ArrayList<>();
-
- //Dynamic concatenation of query conditions
- if (selectDTO.getName() != null && selectDTO.getName()!="") {
- sql.append(" AND name LIKE ?");
- params.add("%" + selectDTO.getName() + "%");
- }
- if (selectDTO.getPhone() != null && selectDTO.getPhone()!="") {
- sql.append(" AND phone LIKE ?");
- params.add("%" + selectDTO.getPhone() + "%");
- }
- if (selectDTO.getAddress() != null && selectDTO.getAddress()!="") {
- sql.append(" AND address LIKE ?");
- params.add("%" + selectDTO.getAddress() + "%");
- }
- if (Integer.valueOf(selectDTO.getStatus())!=null) {
- sql.append(" AND status = ?, ");
- params.add(selectDTO.getStatus());
- }
- sql.setLength(sql.length() - 2);
-
- System.out.println("sql: "+sql.toString());
- List<SelectVO> query = jdbcTemplate.query(sql.toString(), params.toArray(), new BeanPropertyRowMapper<>(SelectVO.class));
- System.out.println("quert"+query);
- return query;
-
- //String type=selectVo.getType();
-// String first="select * from ";
-// String second = " where ";
-// if(selectVo.getName()!=null){
-// second+="name like '%"+selectVo.getName()+"%'";
-// }
-// if(selectVo.getPhone()!=null){
-// second+="phone like '%"+selectVo.getPhone()+"%'";
-// }
-// if(selectVo.getAddress()!=null){
-// second+="address like '%"+selectVo.getAddress()+"'";
-// }
-//
-//
-// List<SelectDTO> query=new ArrayList<>();
-// if("commonAdmin".equals(type)){
-// String sql=first+"common_admin"+second;
-// System.out.println(sql);
-// query = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(SelectDTO.class));
-// }
-// if("hospital".equals(type)){
-// String sql=first+"hospital"+second;
-// System.out.println(sql);
-// query = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(SelectDTO.class));
-// }
-// System.out.println(query);
- }
+ JdbcTemplate jdbcTemplate;;
/**
* ser registration
@@ -569,31 +304,26 @@ public class SuperAdminMapper {
*/
public Object getInforByName(String username){
+ try {
+ String sql = "select * from super_admin where name=?";
+ return jdbcTemplate.queryForObject(sql, new Object[]{username}, new BeanPropertyRowMapper<>(SuperUser.class));
+ } catch (Exception s) {
try {
- // 1. 查询 super_admin 表
- String sql = "select * from super_admin where name=?";
- return jdbcTemplate.queryForObject(sql, new Object[]{username}, new BeanPropertyRowMapper<>(SuperUser.class));
- } catch (Exception s) {
+ String sql = "select * from hospital where email=?";
+ return jdbcTemplate.queryForObject(sql, new Object[]{username}, new BeanPropertyRowMapper<>(Hospital.class));
+ } catch (Exception h) {
try {
- // 2. 查询 hospital 表
- String sql = "select * from hospital where email=?";
- return jdbcTemplate.queryForObject(sql, new Object[]{username}, new BeanPropertyRowMapper<>(Hospital.class));
- } catch (Exception h) {
+ String sql = "select * from common_admin where email=?";
+ return jdbcTemplate.queryForObject(sql, new Object[]{username}, new BeanPropertyRowMapper<>(CommonAdmin.class));
+ } catch (Exception c) {
try {
- // 3. 查询 common_admin 表
- String sql = "select * from common_admin where email=?";
- return jdbcTemplate.queryForObject(sql, new Object[]{username}, new BeanPropertyRowMapper<>(CommonAdmin.class));
- } catch (Exception c) {
- try {
- // 4. 查询 patient 表
- String sql = "select * from patient where email=?";
- return jdbcTemplate.queryForObject(sql, new Object[]{username}, new BeanPropertyRowMapper<>(Patient.class));
- } catch (Exception p) {}
- }
+ String sql = "select * from patient where email=?";
+ return jdbcTemplate.queryForObject(sql, new Object[]{username}, new BeanPropertyRowMapper<>(Patient.class));
+ } catch (Exception p) {}
}
}
- // 如果所有查询都为空，返回 null
- return null;
+ }
+ return null;
}
/**
@@ -646,4 +376,16 @@ public class SuperAdminMapper {
return Result.error(ResponseCode.ERROR);
}
}
+
+ /**
+ * page select
+ * @param pageSize
+ */
+ public List<CommonAdmin> selectPageCommonAdmin(Integer pageSize,Integer pageNumber) {
+ String sql="select * from common_admin LIMIT ? OFFSET ?";
+ int offset = (pageNumber - 1) * pageSize;
+ List<CommonAdmin> query = jdbcTemplate.query(sql, new Object[]{pageSize,offset}, new BeanPropertyRowMapper<>(CommonAdmin.class));
+ System.out.println(query);
+ return query;
+ }
}
diff --git a/src/main/java/com/cardiff/client_project/service/HospitalService.java b/src/main/java/com/cardiff/client_project/service/HospitalService.java
index 77f1a34..5a7e1a0 100644
--- a/src/main/java/com/cardiff/client_project/service/HospitalService.java
+++ b/src/main/java/com/cardiff/client_project/service/HospitalService.java
@@ -1,4 +1,4 @@
-package com.cardiff.client_project.service.imp;
+package com.cardiff.client_project.service;
import com.cardiff.client_project.pojo.dto.HospitalDTO;
import com.cardiff.client_project.utils.Result;
@@ -11,4 +11,5 @@ public interface HospitalService {
Result updateHospital(HospitalDTO hospitalDTO);
Result deleteHospitalById(List<Integer> ids);
Result getAllHospitals();
+ Result updateBedCount(int hospitalId, int currentPatients);
}
\ No newline at end of file
diff --git a/src/main/java/com/cardiff/client_project/service/imp/HospitalServiceImpl.java b/src/main/java/com/cardiff/client_project/service/imp/HospitalServiceImpl.java
index 23b4540..79fdb9d 100644
--- a/src/main/java/com/cardiff/client_project/service/imp/HospitalServiceImpl.java
+++ b/src/main/java/com/cardiff/client_project/service/imp/HospitalServiceImpl.java
@@ -18,7 +18,7 @@ public class HospitalServiceImpl implements HospitalService {
@Override
public Result getAvailableBeds(String name) {
try {
- List<HospitalDTO> hospitals = hospitalMapper.findAvailableBeds(name);
+ List<HospitalDTO> hospitals = hospitalMapper.findAvailableBeds(name,"",0);
if (hospitals.isEmpty()) {
return Result.error("No hospitals with available beds found.");
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index b0f4bde..ae3309b 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -3,4 +3,4 @@ healthcare:
url: jdbc:mysql://localhost:3306/health_care
port: 3306
username: root
- password: 472500
\ No newline at end of file
+ password: root
\ No newline at end of file
diff --git a/src/main/resources/static/html/superAdminView.html b/src/main/resources/static/html/superAdminView.html
index af3f6a2..90bcc3c 100644
--- a/src/main/resources/static/html/superAdminView.html
+++ b/src/main/resources/static/html/superAdminView.html
@@ -62,61 +62,5 @@
}
})
-
- var bool;
-
- // 页é¢åŠ è½½åŽç”ŸæˆéªŒè¯ç
- window.onload = function () {
- createCode(4);
- }
-
- function createCode(length) {
- var code = "";
- var checkCode = document.getElementById("checkCode");
- var codeChars = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ".split("");
- for (var i = 0; i < length; i++) {
- var charNum = Math.floor(Math.random() * codeChars.length);
- code += codeChars[charNum];
- }
- if (checkCode) {
- checkCode.innerHTML = code;
- }
- }
-
- function validateCode() {
- var inputCode = document.getElementById("inputCode").value;
- var checkCode = document.getElementById("checkCode").innerHTML;
- if (!inputCode) {
- alert("Please enter the verification code!");
- return false;
- }
- if (inputCode.toUpperCase() !== checkCode.toUpperCase()) {
- alert("Verification code error!");
- createCode(4);
- return false;
- }
- return true;
- }
-
- const form = document.getElementById('loginForm');
- form.addEventListener('submit', function (event) {
- event.preventDefault();
-
- // 验è¯éªŒè¯ç
- if (!validateCode()) {
- return;
- }
-
- // 验è¯ç”¨æˆ·å和密ç
- const username = document.getElementById('username').value;
- const password = document.getElementById('password').value;
-
- if (username === '2649783657@qq.com' && password === 'admin') {
- alert("Login successful! Redirecting...");
- window.location.href = "superAdminView.html"; // æˆåŠŸåŽè·³è½¬
- } else {
- alert("Invalid email or password. Please try again.");
- }
- });
</script>
</html>
\ No newline at end of file
diff --git a/src/main/resources/static/js/mainHospitalView.js b/src/main/resources/static/js/mainHospitalView.js
index 9f0ff36..1e6a9e1 100644
--- a/src/main/resources/static/js/mainHospitalView.js
+++ b/src/main/resources/static/js/mainHospitalView.js
@@ -217,14 +217,8 @@ $(document).on("dblclick","#searchButton",function (){
//use jQuery's load() to load content dynamically,Events cannot be bound in dom mode
$(document).on("click", "#searchButton", function () {
- let status = document.getElementById("searchStatus").value;
-
- if (status === "active") {
- status = 1;
- } else if (status === "inactive") {
- status = 0;
- } else {
- status = ""; // Allow all statuses if none selected
+ let status=document.getElementById("searchStatus").value;
+
if(status==="active"){
status=1;
}
@@ -234,16 +228,6 @@ $(document).on("click", "#searchButton", function () {
status=1;
}
- var data = {
- 'name': document.getElementById("searchName").value,
- 'phone': document.getElementById("searchPhone").value,
- 'address': document.getElementById("searchAddress").value,
- 'type': "hospital",
- 'status': status
- };
-
- console.log("Search data:", data); // Debugging line
-
var data={
'name':document.getElementById("searchName").value,
'phone':document.getElementById("searchPhone").value,
@@ -256,12 +240,6 @@ $(document).on("click", "#searchButton", function () {
url: "/superAdmin/select",
type: "POST",
data: JSON.stringify(data),
- dataType: "json",
- success: function (response) {
- if (response.code !== 0) {
- updateTable(response.data);
- } else {
- alert(response.msg);
dataType: "Json",
success: function (data) {
@@ -272,17 +250,14 @@ $(document).on("click", "#searchButton", function () {
alert(data.msg)
}
},
- error: function (xhr) {
- alert('Error during search: ' + xhr.responseText);
- }
});
});
function updateTable(data) {
- let tbody = $("table tbody");
- tbody.empty();
- console.log("Table data:", data); // Debugging line
-
+ let tbody = $("table tbody"); // choose table's tbody
+ tbody.empty(); // clean old data
+ console.log(data)
+ // create new table
data.forEach(row => {
const tr = `
<tr
diff --git a/src/main/resources/static/js/mainSupAdminView.js b/src/main/resources/static/js/mainSupAdminView.js
index ad3e90a..8d4328f 100644
--- a/src/main/resources/static/js/mainSupAdminView.js
+++ b/src/main/resources/static/js/mainSupAdminView.js
@@ -253,4 +253,23 @@ function updateTable(data) {
`;
tbody.append(tr);
});
-}
\ No newline at end of file
+}
+$(document).on("change","#page-size",function (){
+ let pageSize=document.getElementById("page-size").value
+ $.ajax({
+ contentType: "application/json",
+ url: `/superAdmin/pageSelect?type=commonAdmin&pageSize=${pageSize}`,
+ type: "GET",
+ dataType: "Json",
+ success: function (data) {
+ console.log(data)
+ if (data.code != 0) {
+ updateTable(data.data)
+ //location.reload()
+ } else {
+ alert(data.msg)
+ }
+ },
+ })
+
+})
\ No newline at end of file
diff --git a/src/main/resources/templates/mainSupAdminView.html b/src/main/resources/templates/mainSupAdminView.html
index ac416b1..c0d52d8 100644
--- a/src/main/resources/templates/mainSupAdminView.html
+++ b/src/main/resources/templates/mainSupAdminView.html
@@ -91,7 +91,14 @@
<button type="button" id="addAdmin" style="margin-right: 170px;margin-left: 20px">Submit</button>
<button type="button" onclick="location.reload()">Cancel</button>
</div>
-
+<div>
+ <select id="page-size">
+ <option value="">items per page</option>
+ <option value="1">1</option>
+ <option value="2">2</option>
+ <option value="15">15</option>
+ </select>
+</div>
<script src="/js/mainSupAdminView.js"></script>
</body>
</html>
--
GitLab