diff --git a/sky-pojo/src/main/java/com/sky/dto/StartOrStopDTO.java b/sky-pojo/src/main/java/com/sky/dto/StartOrStopDTO.java index 2d72bfa..778018e 100644 --- a/sky-pojo/src/main/java/com/sky/dto/StartOrStopDTO.java +++ b/sky-pojo/src/main/java/com/sky/dto/StartOrStopDTO.java @@ -5,5 +5,5 @@ import lombok.Data; @Data public class StartOrStopDTO { private int status; - private int id; + private Long id; } \ No newline at end of file diff --git a/sky-server/src/main/java/com/sky/controller/admin/CategoryController.java b/sky-server/src/main/java/com/sky/controller/admin/CategoryController.java new file mode 100644 index 0000000..a4a9d5f --- /dev/null +++ b/sky-server/src/main/java/com/sky/controller/admin/CategoryController.java @@ -0,0 +1,68 @@ +package com.sky.controller.admin; + +import com.sky.dto.CategoryDTO; +import com.sky.dto.CategoryPageQueryDTO; +import com.sky.entity.Category; +import com.sky.result.PageResult; +import com.sky.result.Result; +import com.sky.service.CategoryService; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/admin/category") +@Slf4j +public class CategoryController { + @Autowired + private CategoryService categoryService; + /** + * 新增菜品分类 + */ + @PostMapping + @ApiOperation("新增菜品分类") + public Result addCategory(CategoryDTO categoryDTO){ + categoryService.addCategory(categoryDTO); + return Result.success(); + } + @GetMapping("/page") + @ApiOperation("菜品分类分页查询") + public Result list(CategoryPageQueryDTO categoryPageQueryDTO){ + PageResult pageResult=categoryService.list(categoryPageQueryDTO); + return Result.success(pageResult); + } + /** + * 根据id删除分类 + */ + // TODO 是否需要级联删除菜品？？？ + @DeleteMapping + @ApiOperation("根据id删除分类") + public Result deleteById(Integer id){ + categoryService.deleteById(id); + return Result.success(); + } + /** + * 修改分类 + */ + @PutMapping + @ApiOperation("修改分类") + public Result update(@RequestBody CategoryDTO categoryDTO){ + categoryService.update(categoryDTO); + return Result.success(); + } + @PostMapping("/status/{status}") + @ApiOperation("启用禁用分类") + public Result startOrStop(@PathVariable("status") Integer status, Long id){ + categoryService.startOrStop(status,id); + return Result.success(); + } + @GetMapping("/list") + @ApiOperation("根据类型查询分类") + public Result> listByType(Integer type){ + List categoryList=categoryService.listByType(type); + return Result.success(categoryList); + } +} diff --git a/sky-server/src/main/java/com/sky/controller/admin/EmployeeController.java b/sky-server/src/main/java/com/sky/controller/admin/EmployeeController.java index 7a14e27..dace6f2 100644 --- a/sky-server/src/main/java/com/sky/controller/admin/EmployeeController.java +++ b/sky-server/src/main/java/com/sky/controller/admin/EmployeeController.java @@ -102,4 +102,19 @@ public class EmployeeController { employeeService.startOrStop(startOrStopDTO); return Result.success(); } + /** + * 查询用户id信息 + */ + @GetMapping("/{id}") + @ApiOperation("查询用户信息") + public Result queryById(@PathVariable Integer id){ + Employee employee=employeeService.queryById(id); + return Result.success(employee); + } + @PutMapping + @ApiOperation("修改用户信息") + public Result update(@RequestBody EmployeeDTO employeeDTO){ + employeeService.update(employeeDTO); + return Result.success(); + } } diff --git a/sky-server/src/main/java/com/sky/mapper/CategoryMapper.java b/sky-server/src/main/java/com/sky/mapper/CategoryMapper.java new file mode 100644 index 0000000..74680f9 --- /dev/null +++ b/sky-server/src/main/java/com/sky/mapper/CategoryMapper.java @@ -0,0 +1,27 @@ +package com.sky.mapper; + +import com.sky.dto.CategoryDTO; +import com.sky.dto.CategoryPageQueryDTO; +import com.sky.entity.Category; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +@Mapper +public interface CategoryMapper { + @Insert("insert into category (type,name,sort,status,create_time,update_time,create_user,update_user)" + + "values" + + "(#{type},#{name},#{sort},#{status},#{createTime},#{updateTime},#{createUser},#{updateUser})") + void addCategory(Category category); + List list(CategoryPageQueryDTO categoryPageQueryDTO); + @Delete("delete from category where id=#{id}") + void deleteById(Integer id); + + void update(Category category); + @Select("select * from category where type=#{type}") + List listByType(Integer type); +} + diff --git a/sky-server/src/main/java/com/sky/mapper/EmployeeMapper.java b/sky-server/src/main/java/com/sky/mapper/EmployeeMapper.java index 39895fa..c99a095 100644 --- a/sky-server/src/main/java/com/sky/mapper/EmployeeMapper.java +++ b/sky-server/src/main/java/com/sky/mapper/EmployeeMapper.java @@ -35,6 +35,8 @@ public interface EmployeeMapper { * @return */ List list(EmployeePageQueryDTO employeePageQueryDTO); - @Update("update employee set status=#{status} where id=#{id}") - void startOrStop(StartOrStopDTO startOrStopDTO); + @Select("select * from employee where id=#{id};") + Employee queryById(Integer id); + + void update(Employee employee); } diff --git a/sky-server/src/main/java/com/sky/service/CategoryService.java b/sky-server/src/main/java/com/sky/service/CategoryService.java new file mode 100644 index 0000000..5fb0e3f --- /dev/null +++ b/sky-server/src/main/java/com/sky/service/CategoryService.java @@ -0,0 +1,22 @@ +package com.sky.service; + +import com.sky.dto.CategoryDTO; +import com.sky.dto.CategoryPageQueryDTO; +import com.sky.entity.Category; +import com.sky.result.PageResult; + +import java.util.List; + +public interface CategoryService { + void addCategory(CategoryDTO categoryDTO); + + PageResult list(CategoryPageQueryDTO categoryPageQueryDTO); + + void deleteById(Integer id); + + void update(CategoryDTO categoryDTO); + + void startOrStop(Integer status, Long id); + + List listByType(Integer type); +} diff --git a/sky-server/src/main/java/com/sky/service/EmployeeService.java b/sky-server/src/main/java/com/sky/service/EmployeeService.java index 3f02909..9038855 100644 --- a/sky-server/src/main/java/com/sky/service/EmployeeService.java +++ b/sky-server/src/main/java/com/sky/service/EmployeeService.java @@ -21,4 +21,8 @@ public interface EmployeeService { PageResult pageQuery(EmployeePageQueryDTO employeePageQueryDTO); void startOrStop(StartOrStopDTO startOrStopDTO); + + Employee queryById(Integer id); + + void update(EmployeeDTO employeeDTO); } diff --git a/sky-server/src/main/java/com/sky/service/impl/CategoryServiceImpl.java b/sky-server/src/main/java/com/sky/service/impl/CategoryServiceImpl.java new file mode 100644 index 0000000..8c594a3 --- /dev/null +++ b/sky-server/src/main/java/com/sky/service/impl/CategoryServiceImpl.java @@ -0,0 +1,75 @@ +package com.sky.service.impl; + +import com.github.pagehelper.Page; +import com.github.pagehelper.PageHelper; +import com.sky.constant.StatusConstant; +import com.sky.context.BaseContext; +import com.sky.dto.CategoryDTO; +import com.sky.dto.CategoryPageQueryDTO; +import com.sky.entity.Category; +import com.sky.mapper.CategoryMapper; +import com.sky.result.PageResult; +import com.sky.service.CategoryService; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.util.List; + +@Service +public class CategoryServiceImpl implements CategoryService { + @Autowired + private CategoryMapper categoryMapper; + + @Override + public void addCategory(CategoryDTO categoryDTO) { + Category category=new Category(); + BeanUtils.copyProperties(categoryDTO,category); + category.setCreateTime(LocalDateTime.now()); + category.setUpdateTime(LocalDateTime.now()); + category.setCreateUser(BaseContext.getCurrentId()); + category.setUpdateUser(BaseContext.getCurrentId()); + category.setStatus(StatusConstant.DISABLE); + categoryMapper.addCategory(category); + } + + @Override + public PageResult list(CategoryPageQueryDTO categoryPageQueryDTO) { + PageHelper.startPage(categoryPageQueryDTO.getPage(),categoryPageQueryDTO.getPageSize()); + List categoryList=categoryMapper.list(categoryPageQueryDTO); + Page p= (Page) categoryList; + PageResult pageResult=new PageResult(p.getTotal(),p.getResult()); + return pageResult; + } + + @Override + public void deleteById(Integer id) { + categoryMapper.deleteById(id); + } + + @Override + public void update(CategoryDTO categoryDTO) { + Category category=new Category(); + BeanUtils.copyProperties(categoryDTO,category); + category.setUpdateTime(LocalDateTime.now()); + category.setUpdateUser(BaseContext.getCurrentId()); + categoryMapper.update(category); + } + + @Override + public void startOrStop(Integer status, Long id) { + Category category=new Category(); + category.setStatus(status); + category.setId(id); + category.setUpdateTime(LocalDateTime.now()); + category.setUpdateUser(BaseContext.getCurrentId()); + categoryMapper.update(category); + } + + @Override + public List listByType(Integer type) { + List categoryList=categoryMapper.listByType(type); + return categoryList; + } +} diff --git a/sky-server/src/main/java/com/sky/service/impl/EmployeeServiceImpl.java b/sky-server/src/main/java/com/sky/service/impl/EmployeeServiceImpl.java index d4ce1e4..a36b7e8 100644 --- a/sky-server/src/main/java/com/sky/service/impl/EmployeeServiceImpl.java +++ b/sky-server/src/main/java/com/sky/service/impl/EmployeeServiceImpl.java @@ -53,7 +53,6 @@ public class EmployeeServiceImpl implements EmployeeService { } //密码比对 - // TODO 后期需要进行md5加密，然后再进行比对 if (!bCryptPasswordEncoder.matches(password,employee.getPassword())) { //密码错误 throw new PasswordErrorException(MessageConstant.PASSWORD_ERROR); @@ -94,6 +93,24 @@ public class EmployeeServiceImpl implements EmployeeService { @Override public void startOrStop(StartOrStopDTO startOrStopDTO) { - employeeMapper.startOrStop(startOrStopDTO); + Employee employee=Employee.builder().status(startOrStopDTO.getStatus()).id(startOrStopDTO.getId()).build(); + employeeMapper.update(employee); + } + + @Override + public Employee queryById(Integer id) { + Employee employee=employeeMapper.queryById(id); + return employee; + } + + @Override + public void update(EmployeeDTO employeeDTO) { + Employee employee = new Employee(); + BeanUtils.copyProperties(employeeDTO, employee); + + employee.setUpdateTime(LocalDateTime.now()); + employee.setUpdateUser(BaseContext.getCurrentId()); + + employeeMapper.update(employee); } } diff --git a/sky-server/src/main/resources/mapper/CategoryMapper.xml b/sky-server/src/main/resources/mapper/CategoryMapper.xml new file mode 100644 index 0000000..a8b24f2 --- /dev/null +++ b/sky-server/src/main/resources/mapper/CategoryMapper.xml @@ -0,0 +1,29 @@ + + + + + + update category + + type=#{type}, + name=#{name}, + sort=#{sort}, + status=#{status}, + update_time=#{updateTime}, + update_user=#{updateUser}, + + where id=#{id} + + \ No newline at end of file diff --git a/sky-server/src/main/resources/mapper/EmployeeMapper.xml b/sky-server/src/main/resources/mapper/EmployeeMapper.xml index f7ea02a..65c9916 100644 --- a/sky-server/src/main/resources/mapper/EmployeeMapper.xml +++ b/sky-server/src/main/resources/mapper/EmployeeMapper.xml @@ -2,6 +2,21 @@ + + update employee + + name = #{name}, + username = #{username}, + password = #{password}, + phone = #{phone}, + sex = #{sex}, + id_Number = #{idNumber}, + update_Time = #{updateTime}, + update_User = #{updateUser}, + status = #{status}, + + where id = #{id} +