Merge branch 'wyl' into 'main'

update dto and vo

See merge request !20

src/main/java/com/cardiff/client_project/controller/admin/AdminController.java

 package com.cardiff.client_project.controller.admin;
 
-import com.cardiff.client_project.pojo.vo.SelectVo;
-import com.cardiff.client_project.pojo.vo.SignUserVo;
+import com.cardiff.client_project.pojo.dto.SelectDTO;
+import com.cardiff.client_project.pojo.dto.SignUserDTO;
 import com.cardiff.client_project.service.AdminService;
 import com.cardiff.client_project.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,13 +19,13 @@ public class AdminController {
 
     /**
      * User registration
-     * @param signVo
+     * @param signDTO
      * @return
      */
     @PostMapping("/sign")
-    public Result signIn(@RequestBody SignUserVo signVo){
-        System.out.println(signVo);
-        Result result=adminService.insertUserInform(signVo);
+    public Result signIn(@RequestBody SignUserDTO signDTO){
+        System.out.println(signDTO);
+        Result result=adminService.insertUserInform(signDTO);
         return result;
     }
 
@@ -57,21 +57,21 @@ public class AdminController {
      * @return
      */
     @GetMapping("/select")
-    public Result selectByItem(@RequestBody SelectVo selectVo){
+    public Result selectByItem(@RequestBody SelectDTO selectDTO){
 
-        Result result=adminService.selectByItem(selectVo);
+        Result result=adminService.selectByItem(selectDTO);
         return result;
     }
 
 
     /**
      * Update data
-     * @param selectVo
+     * @param selectDTO
      * @return
      */
     @PutMapping("/update")
-    public Result updateById(@RequestBody SelectVo selectVo){
-        Result result=adminService.update(selectVo);
+    public Result updateById(@RequestBody SelectDTO selectDTO){
+        Result result=adminService.update(selectDTO);
         return result;
     }
 }

src/main/java/com/cardiff/client_project/mapper/AdminMapper.java

 package com.cardiff.client_project.mapper;
 
 import com.cardiff.client_project.constant.ResponseCode;
-import com.cardiff.client_project.pojo.dto.SelectDto;
+import com.cardiff.client_project.pojo.dto.SelectDTO;
 import com.cardiff.client_project.pojo.entity.CommonAdmin;
-import com.cardiff.client_project.pojo.vo.SelectVo;
+import com.cardiff.client_project.pojo.vo.SelectVO;
 import com.cardiff.client_project.utils.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.BeanPropertyRowMapper;
@@ -79,16 +79,16 @@ public class AdminMapper {
 
     public Result selectAllBytype(String type) {
         String sql;
-        List<SelectDto> query = new ArrayList<>();
+        List<SelectVO> query = new ArrayList<>();
         if ("commonAdmin".equals(type)) {
             // Parameterized queries avoid SQL injection
             sql = "SELECT * FROM common_admin WHERE type = ?";
-            query = jdbcTemplate.query(sql, new Object[]{"commonAdmin"}, new BeanPropertyRowMapper<>(SelectDto.class));
+            query = jdbcTemplate.query(sql, new Object[]{"commonAdmin"}, new BeanPropertyRowMapper<>(SelectVO.class));
         }
 
         if("patient".equals(type)){
             sql = "SELECT * FROM patient WHERE type = ?";
-            query = jdbcTemplate.query(sql, new Object[]{"patient"}, new BeanPropertyRowMapper<>(SelectDto.class));
+            query = jdbcTemplate.query(sql, new Object[]{"patient"}, new BeanPropertyRowMapper<>(SelectVO.class));
         }
 
 
@@ -113,13 +113,13 @@ public class AdminMapper {
 
     /**
      * fuzzy query
-     * @param selectVo
+     * @param selectDTO
      * @return
      */
-    public List<SelectDto> selectByItem(SelectVo selectVo) {
+    public List<SelectDTO> selectByItem(SelectDTO selectDTO) {
 
         // Get query type
-        String type = selectVo.getType();
+        String type = selectDTO.getType();
 
         // Build the basic SQL and parameter list
         StringBuilder sql = new StringBuilder("SELECT * FROM ");
@@ -130,24 +130,24 @@ public class AdminMapper {
         if(type.equals("patient")){
             sql.append("patient");
         }
-
+        sql.append(" WHERE 1=1 ");
         List<Object> params = new ArrayList<>();
 
         //Dynamic concatenation of query conditions
-        if (selectVo.getName() != null) {
+        if (selectDTO.getName() != null) {
             sql.append(" AND name LIKE ?");
-            params.add("%" + selectVo.getName() + "%");
+            params.add("%" + selectDTO.getName() + "%");
         }
-        if (selectVo.getPhone() != null) {
+        if (selectDTO.getPhone() != null) {
             sql.append(" AND phone LIKE ?");
-            params.add("%" + selectVo.getPhone() + "%");
+            params.add("%" + selectDTO.getPhone() + "%");
         }
-        if (selectVo.getAddress() != null) {
+        if (selectDTO.getAddress() != null) {
             sql.append(" AND address LIKE ?");
-            params.add("%" + selectVo.getAddress() + "%");
+            params.add("%" + selectDTO.getAddress() + "%");
         }
 
-        List<SelectDto> query = jdbcTemplate.query(sql.toString(), params.toArray(), new BeanPropertyRowMapper<>(SelectDto.class));
+        List<SelectDTO> query = jdbcTemplate.query(sql.toString(), params.toArray(), new BeanPropertyRowMapper<>(SelectDTO.class));
 
         return query;
 
@@ -165,16 +165,16 @@ public class AdminMapper {
 //        }
 //
 //
-//        List<SelectDto> query=new ArrayList<>();
+//        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));
+//            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));
+//           query = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(SelectDTO.class));
 //        }
 //        System.out.println(query);
     }

src/main/java/com/cardiff/client_project/pojo/dto/SelectDto.java → src/main/java/com/cardiff/client_project/pojo/dto/SelectDTO.java

@@ -7,7 +7,7 @@ import java.util.Date;
 
 @Data
 @ToString
-public class SelectDto {
+public class SelectDTO {
     private int id;
     private String name;
     private String email;

src/main/java/com/cardiff/client_project/pojo/vo/SignUserVo.java → src/main/java/com/cardiff/client_project/pojo/dto/SignUserDTO.java

-package com.cardiff.client_project.pojo.vo;
+package com.cardiff.client_project.pojo.dto;
 
 import lombok.Data;
 import lombok.ToString;
 
 @Data
 @ToString
-public class SignUserVo {
+public class SignUserDTO {
     private String name;
     private String password;
     private String email;

src/main/java/com/cardiff/client_project/pojo/vo/SelectVo.java → src/main/java/com/cardiff/client_project/pojo/vo/SelectVO.java

@@ -7,7 +7,7 @@ import java.util.Date;
 
 @Data
 @ToString
-public class SelectVo {
+public class SelectVO {
     private int id;
     private String name;
     private String email;

src/main/java/com/cardiff/client_project/service/AdminService.java

 package com.cardiff.client_project.service;
 
-import com.cardiff.client_project.pojo.vo.SelectVo;
-import com.cardiff.client_project.pojo.vo.SignUserVo;
+import com.cardiff.client_project.pojo.dto.SelectDTO;
+import com.cardiff.client_project.pojo.dto.SignUserDTO;
 import com.cardiff.client_project.utils.Result;
 
 import java.util.List;
@@ -9,10 +9,10 @@ import java.util.List;
 public interface AdminService {
     /**
      * User registration
-     * @param signVo
+     * @param signDTO
      * @return
      */
-    Result insertUserInform(SignUserVo signVo);
+    Result insertUserInform(SignUserDTO signDTO);
 
 
     /**
@@ -31,15 +31,15 @@ public interface AdminService {
 
     /**
      * Update data
-     * @param selectVo
+     * @param selectDTO
      * @return
      */
-    Result update(SelectVo selectVo);
+    Result update(SelectDTO selectDTO);
 
     /**
      * fuzzy query
-     * @param selectVo
+     * @param selectDTO
      * @return
      */
-    Result selectByItem(SelectVo selectVo);
+    Result selectByItem(SelectDTO selectDTO);
 }

src/main/java/com/cardiff/client_project/service/imp/AdminServiceImp.java

@@ -5,14 +5,12 @@ import com.cardiff.client_project.constant.Authority;
 import com.cardiff.client_project.constant.ResponseCode;
 import com.cardiff.client_project.mapper.AdminMapper;
 import com.cardiff.client_project.mapper.PatientMapper;
-import com.cardiff.client_project.pojo.dto.SelectDto;
+import com.cardiff.client_project.pojo.dto.SelectDTO;
+import com.cardiff.client_project.pojo.dto.SignUserDTO;
 import com.cardiff.client_project.pojo.entity.CommonAdmin;
 import com.cardiff.client_project.pojo.entity.Patient;
-import com.cardiff.client_project.pojo.vo.SelectVo;
-import com.cardiff.client_project.pojo.vo.SignUserVo;
 import com.cardiff.client_project.service.AdminService;
 import com.cardiff.client_project.utils.Result;
-import org.apache.coyote.Response;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -32,15 +30,15 @@ public class AdminServiceImp implements AdminService {
 
     /**
      * User registration
-     * @param signVo
+     * @param signDTO
      * @return
      */
     @Override
-    public Result insertUserInform(SignUserVo signVo) {
+    public Result insertUserInform(SignUserDTO signDTO) {
         CommonAdmin commonAdmin = new CommonAdmin();
-        BeanUtils.copyProperties(signVo,commonAdmin);
+        BeanUtils.copyProperties(signDTO,commonAdmin);
         commonAdmin.setPassword(passwordEncoder.encode(commonAdmin.getPassword()));
-        String role = signVo.getRole();
+        String role = signDTO.getRole();
         if(role.equals("ADMIN")){
             commonAdmin.setRoleId(Authority.ADMIN);
         }
@@ -76,20 +74,20 @@ public class AdminServiceImp implements AdminService {
 
     /**
      * Update data
-     * @param selectVo
+     * @param selectDTO
      * @return
      */
     @Override
-    public Result update(SelectVo selectVo) {
+    public Result update(SelectDTO selectDTO) {
         int update=0;
-        if(selectVo.getType().equals("commonAdmin")){
+        if(selectDTO.getType().equals("commonAdmin")){
             CommonAdmin commonAdmin = new CommonAdmin();
-            BeanUtils.copyProperties(selectVo,commonAdmin);
+            BeanUtils.copyProperties(selectDTO,commonAdmin);
              update = adminMapper.update(commonAdmin);
         }
-        if(selectVo.getType().equals("patient")){
+        if(selectDTO.getType().equals("patient")){
             Patient patient = new Patient();
-            BeanUtils.copyProperties(selectVo,patient);
+            BeanUtils.copyProperties(selectDTO,patient);
             update=patientMapper.update(patient);
         }
 
@@ -103,12 +101,12 @@ public class AdminServiceImp implements AdminService {
 
     /**
      * fuzzy query
-     * @param selectVo
+     * @param selectDTO
      * @return
      */
     @Override
-    public Result selectByItem(SelectVo selectVo) {
-        List<SelectDto> selectDtos = adminMapper.selectByItem(selectVo);
+    public Result selectByItem(SelectDTO selectDTO) {
+        List<SelectDTO> selectDtos = adminMapper.selectByItem(selectDTO);
         if(selectDtos.size()>0){
             return Result.success(selectDtos);
         }else {

src/main/resources/static/html/login.html

@@ -63,7 +63,7 @@
   </form>
     <p class="text-sm text-center mt-6">
       Don't have an account yet?
-      <a href="/register" class="text-purple-500 hover:underline">
+      <a href="../html/regist.html" class="text-purple-500 hover:underline">
         Sign up for free!</a>
     </p>