day02内容提交
This commit is contained in:
parent
7db2e4a53e
commit
211267c637
@ -5,5 +5,5 @@ import lombok.Data;
|
||||
@Data
|
||||
public class StartOrStopDTO {
|
||||
private int status;
|
||||
private int id;
|
||||
private Long id;
|
||||
}
|
@ -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<PageResult> 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<String> startOrStop(@PathVariable("status") Integer status, Long id){
|
||||
categoryService.startOrStop(status,id);
|
||||
return Result.success();
|
||||
}
|
||||
@GetMapping("/list")
|
||||
@ApiOperation("根据类型查询分类")
|
||||
public Result<List<Category>> listByType(Integer type){
|
||||
List<Category> categoryList=categoryService.listByType(type);
|
||||
return Result.success(categoryList);
|
||||
}
|
||||
}
|
@ -102,4 +102,19 @@ public class EmployeeController {
|
||||
employeeService.startOrStop(startOrStopDTO);
|
||||
return Result.success();
|
||||
}
|
||||
/**
|
||||
* 查询用户id信息
|
||||
*/
|
||||
@GetMapping("/{id}")
|
||||
@ApiOperation("查询用户信息")
|
||||
public Result<Employee> 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();
|
||||
}
|
||||
}
|
||||
|
27
sky-server/src/main/java/com/sky/mapper/CategoryMapper.java
Normal file
27
sky-server/src/main/java/com/sky/mapper/CategoryMapper.java
Normal file
@ -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<Category> 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<Category> listByType(Integer type);
|
||||
}
|
||||
|
@ -35,6 +35,8 @@ public interface EmployeeMapper {
|
||||
* @return
|
||||
*/
|
||||
List<Employee> 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);
|
||||
}
|
||||
|
@ -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<Category> listByType(Integer type);
|
||||
}
|
@ -21,4 +21,8 @@ public interface EmployeeService {
|
||||
PageResult pageQuery(EmployeePageQueryDTO employeePageQueryDTO);
|
||||
|
||||
void startOrStop(StartOrStopDTO startOrStopDTO);
|
||||
|
||||
Employee queryById(Integer id);
|
||||
|
||||
void update(EmployeeDTO employeeDTO);
|
||||
}
|
||||
|
@ -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<Category> categoryList=categoryMapper.list(categoryPageQueryDTO);
|
||||
Page<Category> p= (Page<Category>) 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<Category> listByType(Integer type) {
|
||||
List<Category> categoryList=categoryMapper.listByType(type);
|
||||
return categoryList;
|
||||
}
|
||||
}
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
29
sky-server/src/main/resources/mapper/CategoryMapper.xml
Normal file
29
sky-server/src/main/resources/mapper/CategoryMapper.xml
Normal file
@ -0,0 +1,29 @@
|
||||
<?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.sky.mapper.CategoryMapper">
|
||||
<select id="list" resultType="com.sky.entity.Category">
|
||||
select * from category
|
||||
<where>
|
||||
<if test="name!=null and name!=''">
|
||||
and name like concat('%',#{name},'%')
|
||||
</if>
|
||||
<if test="type!=null">
|
||||
and type=#{type}
|
||||
</if>
|
||||
</where>
|
||||
order by sort
|
||||
</select>
|
||||
<update id="update">
|
||||
update category
|
||||
<set>
|
||||
<if test="type!=null">type=#{type},</if>
|
||||
<if test="name!=null and null!=''">name=#{name},</if>
|
||||
<if test="sort!=null">sort=#{sort},</if>
|
||||
<if test="status!=null">status=#{status},</if>
|
||||
<if test="updateTime!=null">update_time=#{updateTime},</if>
|
||||
<if test="updateUser!=null">update_user=#{updateUser},</if>
|
||||
</set>
|
||||
where id=#{id}
|
||||
</update>
|
||||
</mapper>
|
@ -2,6 +2,21 @@
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
<mapper namespace="com.sky.mapper.EmployeeMapper">
|
||||
<update id="update">
|
||||
update employee
|
||||
<set>
|
||||
<if test="name != null">name = #{name},</if>
|
||||
<if test="username != null">username = #{username},</if>
|
||||
<if test="password != null">password = #{password},</if>
|
||||
<if test="phone != null">phone = #{phone},</if>
|
||||
<if test="sex != null">sex = #{sex},</if>
|
||||
<if test="idNumber != null">id_Number = #{idNumber},</if>
|
||||
<if test="updateTime != null">update_Time = #{updateTime},</if>
|
||||
<if test="updateUser != null">update_User = #{updateUser},</if>
|
||||
<if test="status != null">status = #{status},</if>
|
||||
</set>
|
||||
where id = #{id}
|
||||
</update>
|
||||
<select id="list" resultType="com.sky.entity.Employee">
|
||||
select * from employee
|
||||
<where>
|
||||
@ -9,6 +24,6 @@
|
||||
and name like concat('%',#{name},'%')
|
||||
</if>
|
||||
</where>
|
||||
order by update_time desc
|
||||
order by update_time asc
|
||||
</select>
|
||||
</mapper>
|
||||
|
Loading…
x
Reference in New Issue
Block a user