酒店管理员修改

src/main/java/com/chuanghai/ihotel/controller/HotelStaffController.java

@@ -8,8 +8,8 @@ import com.chuanghai.ihotel.common.utils.CommonResult;
 import com.chuanghai.ihotel.common.utils.PageParam;
 import com.chuanghai.ihotel.common.utils.PageUtils;
 import com.chuanghai.ihotel.controller.request.AdminLoginRequest;
-import com.chuanghai.ihotel.entity.HotelStaffEntity;
-import com.chuanghai.ihotel.service.HotelStaffService;
+import com.chuanghai.ihotel.entity.HotelAdminEntity;
+import com.chuanghai.ihotel.service.HotelAdminService;
 import com.chuanghai.ihotel.vo.LoginUserVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.StringUtils;
@@ -25,17 +25,17 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.Arrays;
 
 /**
- * 酒店员工 
+ * 酒店管理员
  *
  * @author codingliang
  * @email codingliang@gmail.com
  * @date 2022-07-27 10:02:04
  */
 @RestController
-@RequestMapping("hotelStaff")
-public class HotelStaffController {
+@RequestMapping("hotelAdmin")
+public class HotelAdminController {
     @Autowired
-    private HotelStaffService hotelStaffService;
+    private HotelAdminService hotelAdminService;
 
     /**
      * 管理员登录
@@ -47,7 +47,7 @@ public class HotelStaffController {
     @ParamCheck
     @PostMapping("login")
     public CommonResult<LoginUserVO> login(@RequestBody AdminLoginRequest request) {
-        LoginUserVO vo = hotelStaffService.login(request);
+        LoginUserVO vo = hotelAdminService.login(request);
         return CommonResult.ok().setResult(vo);
     }
 
@@ -59,9 +59,9 @@ public class HotelStaffController {
      */
     @AdminLoginCheck
     @GetMapping("/list")
-    public CommonResult<PageUtils<HotelStaffEntity>> list(@RequestHeader("admin_token") String adminToken,
-                                                         PageParam pageParam){
-        PageUtils page = hotelStaffService.queryPage(pageParam);
+    public CommonResult<PageUtils<HotelAdminEntity>> list(@RequestHeader("admin_token") String adminToken,
+                                                          PageParam pageParam){
+        PageUtils page = hotelAdminService.queryPage(pageParam);
 
         return CommonResult.ok().setResult(page);
     }
@@ -76,14 +76,14 @@ public class HotelStaffController {
     @ParamCheck(index = {2})
     @PostMapping("/add")
     public CommonResult<String> add(@RequestHeader("admin-token") String adminToken,
-                                     @RequestBody HotelStaffEntity staffEntity){
+                                     @RequestBody HotelAdminEntity staffEntity){
 
         String password = staffEntity.getPassword();
         if (!StringUtils.hasText(password)) {
             throw new RRException(BizCodeEnume.PARAMETER_ERROR, "密码不能为空");
         }
 
-        hotelStaffService.mySave(staffEntity);
+        hotelAdminService.mySave(staffEntity);
         return CommonResult.ok();
     }
 
@@ -93,9 +93,9 @@ public class HotelStaffController {
     @AdminLoginCheck
     @ParamCheck
     @PutMapping("/update")
-    public CommonResult<String> update(@RequestHeader("admin-token") String adminToken, @RequestBody HotelStaffEntity hotelStaff){
+    public CommonResult<String> update(@RequestHeader("admin-token") String adminToken, @RequestBody HotelAdminEntity hotelStaff){
         hotelStaff.setPassword(null);
-		boolean flag = hotelStaffService.updateById(hotelStaff);
+		boolean flag = hotelAdminService.updateById(hotelStaff);
 
 		if (flag) {
             return CommonResult.ok();
@@ -110,7 +110,7 @@ public class HotelStaffController {
     @AdminLoginCheck
     @DeleteMapping("/delete")
     public CommonResult<String> delete(@RequestHeader("admin-token") String adminToken, @RequestBody Long[] ids){
-        boolean flag = hotelStaffService.removeByIds(Arrays.asList(ids));
+        boolean flag = hotelAdminService.removeByIds(Arrays.asList(ids));
         if (flag) {
             return CommonResult.ok();
         } else {

src/main/java/com/chuanghai/ihotel/dao/HotelStaffDao.java

@@ -1,6 +1,6 @@
 package com.chuanghai.ihotel.dao;
 
-import com.chuanghai.ihotel.entity.HotelStaffEntity;
+import com.chuanghai.ihotel.entity.HotelAdminEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -12,6 +12,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @date 2022-07-27 10:02:04
  */
 @Mapper
-public interface HotelStaffDao extends BaseMapper<HotelStaffEntity> {
+public interface HotelAdminDao extends BaseMapper<HotelAdminEntity> {
 	
 }

src/main/java/com/chuanghai/ihotel/entity/HotelStaffEntity.java

@@ -9,15 +9,15 @@ import javax.validation.constraints.Pattern;
 import java.io.Serializable;
 
 /**
- * 酒店员工 
+ * 酒店管理员
  * 
  * @author codingliang
  * @email codingliang@gmail.com
  * @date 2022-07-27 10:02:04
  */
 @Data
-@TableName("hotel_staff")
-public class HotelStaffEntity implements Serializable {
+@TableName("hotel_admin")
+public class HotelAdminEntity implements Serializable {
 	private static final long serialVersionUID = -3898086427694264371L;
 
 	/**
@@ -26,11 +26,6 @@ public class HotelStaffEntity implements Serializable {
 	@TableId
 	private Long id;
 	/**
-	 * 员工卡号 微校card_number
-	 */
-	@NotBlank(message = "员工卡号不能为空")
-	private String cardNumber;
-	/**
 	 * 手机号码 登录账号
 	 */
 	@NotBlank(message = "手机号码不能为空")
@@ -43,8 +38,8 @@ public class HotelStaffEntity implements Serializable {
 	/**
 	 * 职位
 	 */
-	@NotBlank(message = "职位不能为空")
-	private String position;
+	@NotBlank(message = "角色不能为空")
+	private String adminType;
 	/**
 	 * 密码 登录密码，新增时不能为空，使用RSA加密后传输
 	 */

src/main/java/com/chuanghai/ihotel/service/HotelStaffService.java

@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.chuanghai.ihotel.common.utils.PageUtils;
 import com.chuanghai.ihotel.common.utils.PageParam;
 import com.chuanghai.ihotel.controller.request.AdminLoginRequest;
-import com.chuanghai.ihotel.entity.HotelStaffEntity;
+import com.chuanghai.ihotel.entity.HotelAdminEntity;
 import com.chuanghai.ihotel.vo.LoginUserVO;
 
 /**
@@ -14,7 +14,7 @@ import com.chuanghai.ihotel.vo.LoginUserVO;
  * @email codingliang@gmail.com
  * @date 2022-07-27 10:02:04
  */
-public interface HotelStaffService extends IService<HotelStaffEntity> {
+public interface HotelAdminService extends IService<HotelAdminEntity> {
 
     PageUtils queryPage(PageParam pageParam);
 
@@ -25,6 +25,6 @@ public interface HotelStaffService extends IService<HotelStaffEntity> {
      */
     LoginUserVO login(AdminLoginRequest request);
 
-    void mySave(HotelStaffEntity staffEntity);
+    void mySave(HotelAdminEntity staffEntity);
 }
 

src/main/java/com/chuanghai/ihotel/service/impl/HotelStaffServiceImpl.java

@@ -17,21 +17,21 @@ import com.chuanghai.ihotel.common.utils.PageUtils;
 import com.chuanghai.ihotel.common.utils.MyQuery;
 import com.chuanghai.ihotel.common.utils.PageParam;
 
-import com.chuanghai.ihotel.dao.HotelStaffDao;
-import com.chuanghai.ihotel.entity.HotelStaffEntity;
-import com.chuanghai.ihotel.service.HotelStaffService;
+import com.chuanghai.ihotel.dao.HotelAdminDao;
+import com.chuanghai.ihotel.entity.HotelAdminEntity;
+import com.chuanghai.ihotel.service.HotelAdminService;
 
 
 @Service("hotelStaffService")
-public class HotelStaffServiceImpl extends ServiceImpl<HotelStaffDao, HotelStaffEntity> implements HotelStaffService {
+public class HotelAdminServiceImpl extends ServiceImpl<HotelAdminDao, HotelAdminEntity> implements HotelAdminService {
 
     @Value("${my-security.private-key}")
     private String privateKey;
 
     @Override
     public PageUtils queryPage(PageParam pageParam) {
-        IPage<HotelStaffEntity> page = this.page(
-                new MyQuery<HotelStaffEntity>().getPage(pageParam),
+        IPage<HotelAdminEntity> page = this.page(
+                new MyQuery<HotelAdminEntity>().getPage(pageParam),
                 new QueryWrapper<>()
         );
 
@@ -40,10 +40,10 @@ public class HotelStaffServiceImpl extends ServiceImpl<HotelStaffDao, HotelStaff
 
     @Override
     public LoginUserVO login(AdminLoginRequest request) {
-        QueryWrapper<HotelStaffEntity> wrapper = new QueryWrapper<>();
+        QueryWrapper<HotelAdminEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("username", request.getUsername());
         wrapper.last("limit 1");
-        HotelStaffEntity staff = this.getOne(wrapper);
+        HotelAdminEntity staff = this.getOne(wrapper);
         if (staff == null) {
             throw new RRException(BizCodeEnume.ADMIN_LOGIN_FAIL);
         }
@@ -73,7 +73,7 @@ public class HotelStaffServiceImpl extends ServiceImpl<HotelStaffDao, HotelStaff
     }
 
     @Override
-    public void mySave(HotelStaffEntity staffEntity) {
+    public void mySave(HotelAdminEntity staffEntity) {
         String password;
         try {
             password = RSAUtils.decrypt(staffEntity.getPassword(), RSAUtils.getPrivateKey(privateKey));

src/main/resources/mapper/ihotel/HotelStaffDao.xml

@@ -1,15 +1,14 @@
 <?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.chuanghai.ihotel.dao.HotelStaffDao">
+<mapper namespace="com.chuanghai.ihotel.dao.HotelAdminDao">
 
 	<!-- 可根据自己的需求，是否要使用 -->
-    <resultMap type="com.chuanghai.ihotel.entity.HotelStaffEntity" id="hotelStaffMap">
+    <resultMap type="com.chuanghai.ihotel.entity.HotelAdminEntity" id="hotelAdminMap">
         <result property="id" column="id"/>
-        <result property="cardNumber" column="card_number"/>
         <result property="phone" column="phone"/>
         <result property="username" column="username"/>
-        <result property="position" column="position"/>
+        <result property="adminType" column="admin_type"/>
         <result property="password" column="password"/>
         <result property="statu" column="statu"/>
     </resultMap>