From b3f61428a2350a1afc461abfca46eecb86eabaa6 Mon Sep 17 00:00:00 2001 From: Cloud <3183761076@qq.com> Date: Wed, 16 Nov 2022 14:27:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/dhu/common/R.java | 4 +++- .../com/dhu/controller/CategoryController.java | 2 -- .../com/dhu/controller/CommonController.java | 4 +++- .../com/dhu/controller/DishController.java | 1 - .../com/dhu/controller/EmployeeController.java | 6 ------ .../com/dhu/controller/OrderController.java | 15 +++------------ .../com/dhu/controller/SetmealController.java | 18 ++++++++---------- .../com/dhu/controller/UserController.java | 1 - .../java/com/dhu/mapper/OrderDetailMapper.java | 3 ++- .../java/com/dhu/service/OrderService.java | 1 - .../com/dhu/service/impl/OrderServiceImpl.java | 1 - .../service/impl/ShoppingCartServiceImpl.java | 1 - 12 files changed, 19 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/dhu/common/R.java b/src/main/java/com/dhu/common/R.java index bcb7d39..ded535f 100644 --- a/src/main/java/com/dhu/common/R.java +++ b/src/main/java/com/dhu/common/R.java @@ -1,6 +1,8 @@ package com.dhu.common; import lombok.Data; + +import java.io.Serializable; import java.util.HashMap; import java.util.Map; @@ -9,7 +11,7 @@ import java.util.Map; * @param */ @Data -public class R { +public class R implements Serializable { private Integer code; //编码：1成功，0和其它数字为失败 diff --git a/src/main/java/com/dhu/controller/CategoryController.java b/src/main/java/com/dhu/controller/CategoryController.java index 917c88c..ca6bad8 100644 --- a/src/main/java/com/dhu/controller/CategoryController.java +++ b/src/main/java/com/dhu/controller/CategoryController.java @@ -4,10 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.dhu.common.R; import com.dhu.entity.Category; -import com.dhu.entity.Employee; import com.dhu.service.CategoryService; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/dhu/controller/CommonController.java b/src/main/java/com/dhu/controller/CommonController.java index 28a9454..f376023 100644 --- a/src/main/java/com/dhu/controller/CommonController.java +++ b/src/main/java/com/dhu/controller/CommonController.java @@ -45,7 +45,9 @@ public class CommonController { if (!dir.exists()) { dir.mkdirs(); } - file.transferTo(new File(dir + fileName)); + log.info("dir:{}",dir); + log.info("fileName:{}",fileName); + file.transferTo(new File(dir +"\\"+ fileName)); return R.success(fileName); } diff --git a/src/main/java/com/dhu/controller/DishController.java b/src/main/java/com/dhu/controller/DishController.java index 4bf64d4..865b1f4 100644 --- a/src/main/java/com/dhu/controller/DishController.java +++ b/src/main/java/com/dhu/controller/DishController.java @@ -18,7 +18,6 @@ import org.springframework.cache.CacheManager; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Set; diff --git a/src/main/java/com/dhu/controller/EmployeeController.java b/src/main/java/com/dhu/controller/EmployeeController.java index 6f7c0c3..cce605d 100644 --- a/src/main/java/com/dhu/controller/EmployeeController.java +++ b/src/main/java/com/dhu/controller/EmployeeController.java @@ -12,12 +12,6 @@ import org.springframework.util.DigestUtils; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - -import java.time.LocalDateTime; -import java.util.Date; - -import static com.dhu.common.R.success; @Slf4j @RestController diff --git a/src/main/java/com/dhu/controller/OrderController.java b/src/main/java/com/dhu/controller/OrderController.java index bbcf7fa..1019093 100644 --- a/src/main/java/com/dhu/controller/OrderController.java +++ b/src/main/java/com/dhu/controller/OrderController.java @@ -4,22 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.dhu.common.BaseContext; import com.dhu.common.R; -import com.dhu.dto.OrdersDto; -import com.dhu.entity.*; -import com.dhu.service.AddressBookService; -import com.dhu.service.OrderDetailService; +import com.dhu.entity.Orders; import com.dhu.service.OrderService; -import com.dhu.service.ShoppingCartService; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.time.LocalDateTime; -import java.util.List; -import java.util.stream.Collectors; - @Slf4j @RestController @RequestMapping("/order") @@ -33,12 +23,13 @@ public class OrderController { return R.success("下单成功"); } - @GetMapping("/page") + @GetMapping("/userPage") public R page(int page ,int pageSize, Long number){ Page pageInfo = new Page(page, pageSize); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.like(number != null, Orders::getNumber, number); + lqw.eq(Orders::getUserId, BaseContext.getCurrentId()); lqw.orderByDesc(Orders::getCheckoutTime); orderService.page(pageInfo, lqw); diff --git a/src/main/java/com/dhu/controller/SetmealController.java b/src/main/java/com/dhu/controller/SetmealController.java index 3481b32..2c24fff 100644 --- a/src/main/java/com/dhu/controller/SetmealController.java +++ b/src/main/java/com/dhu/controller/SetmealController.java @@ -3,21 +3,19 @@ package com.dhu.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.dhu.common.R; -import com.dhu.dto.DishDto; import com.dhu.dto.SetmealDto; import com.dhu.entity.Category; -import com.dhu.entity.Dish; -import com.dhu.entity.DishFlavor; import com.dhu.entity.Setmeal; import com.dhu.service.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Transactional; +import org.springframework.cache.annotation.CacheEvict; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.redis.cache.RedisCacheManager; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -28,13 +26,10 @@ public class SetmealController { @Autowired private SetmealService setmealService; @Autowired - private SetmealDishService setmealDishService; - @Autowired private CategoryService categoryService; + @Autowired - private DishService dishService; - @Autowired - private DishFlavorService dishFlavorService; + private RedisCacheManager redisCacheManager; /** * 新增套餐 @@ -43,6 +38,7 @@ public class SetmealController { * @return */ @PostMapping + @CacheEvict(value = "setmealCache", allEntries = true)//删除setmealCache所有数据 public R save(@RequestBody SetmealDto setmealDto) { setmealService.saveWithDish(setmealDto); return R.success("套餐新增成功"); @@ -91,6 +87,7 @@ public class SetmealController { * @return */ @DeleteMapping + @CacheEvict(value = "setmealCache", allEntries = true)//删除setmealCache所有数据 public R delete(@RequestParam List ids) { log.info("ids:{}", ids); setmealService.removeWithDIsh(ids); @@ -117,6 +114,7 @@ public class SetmealController { * @return */ @GetMapping("/list") + @Cacheable(value = "setmealCache", key= "#setmeal.categoryId+'_'+#setmeal.status") public R> list(Setmeal setmeal){ LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.eq(null!=setmeal.getCategoryId(),Setmeal::getCategoryId,setmeal.getCategoryId()); diff --git a/src/main/java/com/dhu/controller/UserController.java b/src/main/java/com/dhu/controller/UserController.java index 47927db..86282be 100644 --- a/src/main/java/com/dhu/controller/UserController.java +++ b/src/main/java/com/dhu/controller/UserController.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.dhu.common.R; import com.dhu.entity.User; import com.dhu.service.UserService; -import com.dhu.utils.SMSUtils; import com.dhu.utils.ValidateCodeUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; diff --git a/src/main/java/com/dhu/mapper/OrderDetailMapper.java b/src/main/java/com/dhu/mapper/OrderDetailMapper.java index d1c72f9..6ae76b5 100644 --- a/src/main/java/com/dhu/mapper/OrderDetailMapper.java +++ b/src/main/java/com/dhu/mapper/OrderDetailMapper.java @@ -2,8 +2,9 @@ package com.dhu.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dhu.entity.OrderDetail; import org.apache.ibatis.annotations.Mapper; @Mapper -public interface OrderDetailMapper extends BaseMapper { +public interface OrderDetailMapper extends BaseMapper { } diff --git a/src/main/java/com/dhu/service/OrderService.java b/src/main/java/com/dhu/service/OrderService.java index 9ef705f..dd01470 100644 --- a/src/main/java/com/dhu/service/OrderService.java +++ b/src/main/java/com/dhu/service/OrderService.java @@ -1,7 +1,6 @@ package com.dhu.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.dhu.common.R; import com.dhu.entity.Orders; public interface OrderService extends IService { diff --git a/src/main/java/com/dhu/service/impl/OrderServiceImpl.java b/src/main/java/com/dhu/service/impl/OrderServiceImpl.java index 82022be..a5f822f 100644 --- a/src/main/java/com/dhu/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/dhu/service/impl/OrderServiceImpl.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dhu.common.BaseContext; import com.dhu.common.CustomException; -import com.dhu.common.R; import com.dhu.entity.*; import com.dhu.mapper.OrderMapper; import com.dhu.service.*; diff --git a/src/main/java/com/dhu/service/impl/ShoppingCartServiceImpl.java b/src/main/java/com/dhu/service/impl/ShoppingCartServiceImpl.java index 8a35162..3d93b41 100644 --- a/src/main/java/com/dhu/service/impl/ShoppingCartServiceImpl.java +++ b/src/main/java/com/dhu/service/impl/ShoppingCartServiceImpl.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dhu.entity.ShoppingCart; import com.dhu.mapper.ShoppingCartMapper; import com.dhu.service.ShoppingCartService; -import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Service; @Service -- Gitee From 39444096676b54986a436c4838ecd702ea9b6f15 Mon Sep 17 00:00:00 2001 From: Cloud <3183761076@qq.com> Date: Sun, 20 Nov 2022 14:46:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0Swagger=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 7 ++++ src/main/java/com/dhu/common/R.java | 2 ++ .../java/com/dhu/config/WebMvcConfig.java | 32 +++++++++++++++++++ .../com/dhu/controller/CommonController.java | 2 -- .../com/dhu/controller/OrderController.java | 11 ++++++- .../com/dhu/controller/SetmealController.java | 2 ++ src/main/java/com/dhu/dto/SetmealDto.java | 2 ++ src/main/java/com/dhu/entity/Setmeal.java | 7 ++++ .../java/com/dhu/filter/LoginCheckFilter.java | 6 +++- src/main/resources/application.yml | 8 ++--- 10 files changed, 71 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 5ac910b..e1b95b8 100644 --- a/pom.xml +++ b/pom.xml @@ -17,6 +17,13 @@ 17 + + + com.github.xiaoymin + + knife4j-spring-boot-starter + 3.0.3 + org.springframework.boot diff --git a/src/main/java/com/dhu/common/R.java b/src/main/java/com/dhu/common/R.java index ded535f..3813dd0 100644 --- a/src/main/java/com/dhu/common/R.java +++ b/src/main/java/com/dhu/common/R.java @@ -1,5 +1,6 @@ package com.dhu.common; +import io.swagger.annotations.ApiModel; import lombok.Data; import java.io.Serializable; @@ -11,6 +12,7 @@ import java.util.Map; * @param */ @Data +@ApiModel("返回结果") public class R implements Serializable { private Integer code; //编码：1成功，0和其它数字为失败 diff --git a/src/main/java/com/dhu/config/WebMvcConfig.java b/src/main/java/com/dhu/config/WebMvcConfig.java index ab2cfd3..380fdd4 100644 --- a/src/main/java/com/dhu/config/WebMvcConfig.java +++ b/src/main/java/com/dhu/config/WebMvcConfig.java @@ -1,17 +1,28 @@ package com.dhu.config; import com.dhu.common.JacksonObjectMapper; +import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j; import lombok.extern.slf4j.Slf4j; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; +import springfox.documentation.builders.ApiInfoBuilder; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2; import java.util.List; @Slf4j @Configuration +@EnableSwagger2 +@EnableKnife4j public class WebMvcConfig extends WebMvcConfigurationSupport { @Override @@ -19,6 +30,8 @@ public class WebMvcConfig extends WebMvcConfigurationSupport { log.info("开始进行静态资源映射"); registry.addResourceHandler("/backend/**").addResourceLocations("classpath:/backend/"); registry.addResourceHandler("/front/**").addResourceLocations("classpath:/front/"); + registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/"); + registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/"); } /** @@ -35,4 +48,23 @@ public class WebMvcConfig extends WebMvcConfigurationSupport { //将消息转换器追加到mvc框架的转换器容器中 converters.add(0,messageConverter); } + + @Bean + public Docket createRestApi(){ + //文档类型 + return new Docket(DocumentationType.SWAGGER_2) + .apiInfo(apiInfo()) + .select() + .apis(RequestHandlerSelectors.basePackage("com.dhu.controller")) + .paths(PathSelectors.any()) + .build(); + } + + private ApiInfo apiInfo(){ + return new ApiInfoBuilder() + .title("瑞吉外卖") + .version("1.0") + .description("瑞吉外卖接口文档") + .build(); + } } diff --git a/src/main/java/com/dhu/controller/CommonController.java b/src/main/java/com/dhu/controller/CommonController.java index f376023..b75763f 100644 --- a/src/main/java/com/dhu/controller/CommonController.java +++ b/src/main/java/com/dhu/controller/CommonController.java @@ -45,8 +45,6 @@ public class CommonController { if (!dir.exists()) { dir.mkdirs(); } - log.info("dir:{}",dir); - log.info("fileName:{}",fileName); file.transferTo(new File(dir +"\\"+ fileName)); return R.success(fileName); } diff --git a/src/main/java/com/dhu/controller/OrderController.java b/src/main/java/com/dhu/controller/OrderController.java index 1019093..0313d82 100644 --- a/src/main/java/com/dhu/controller/OrderController.java +++ b/src/main/java/com/dhu/controller/OrderController.java @@ -23,8 +23,17 @@ public class OrderController { return R.success("下单成功"); } + @GetMapping("/page") + public R page(int page ,int pageSize){ + Page pageInfo = new Page(page, pageSize); + + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.orderByDesc(Orders::getCheckoutTime); + orderService.page(pageInfo, lqw); + return R.success(pageInfo); + } @GetMapping("/userPage") - public R page(int page ,int pageSize, Long number){ + public R userPage(int page ,int pageSize, Long number){ Page pageInfo = new Page(page, pageSize); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); diff --git a/src/main/java/com/dhu/controller/SetmealController.java b/src/main/java/com/dhu/controller/SetmealController.java index 2c24fff..2426726 100644 --- a/src/main/java/com/dhu/controller/SetmealController.java +++ b/src/main/java/com/dhu/controller/SetmealController.java @@ -7,6 +7,7 @@ import com.dhu.dto.SetmealDto; import com.dhu.entity.Category; import com.dhu.entity.Setmeal; import com.dhu.service.*; +import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; @@ -22,6 +23,7 @@ import java.util.stream.Collectors; @Slf4j @RestController @RequestMapping("/setmeal") +@Api(tags="套餐相关接口") public class SetmealController { @Autowired private SetmealService setmealService; diff --git a/src/main/java/com/dhu/dto/SetmealDto.java b/src/main/java/com/dhu/dto/SetmealDto.java index 7467bab..e1cab2d 100644 --- a/src/main/java/com/dhu/dto/SetmealDto.java +++ b/src/main/java/com/dhu/dto/SetmealDto.java @@ -2,10 +2,12 @@ package com.dhu.dto; import com.dhu.entity.Setmeal; import com.dhu.entity.SetmealDish; +import io.swagger.annotations.ApiModel; import lombok.Data; import java.util.List; @Data +@ApiModel("套餐Dto") public class SetmealDto extends Setmeal { private List setmealDishes; diff --git a/src/main/java/com/dhu/entity/Setmeal.java b/src/main/java/com/dhu/entity/Setmeal.java index c96f317..b347b66 100644 --- a/src/main/java/com/dhu/entity/Setmeal.java +++ b/src/main/java/com/dhu/entity/Setmeal.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; @@ -13,22 +15,27 @@ import java.time.LocalDateTime; * 套餐 */ @Data +@ApiModel("套餐") public class Setmeal implements Serializable { private static final long serialVersionUID = 1L; + @ApiModelProperty("主键") private Long id; //分类id + @ApiModelProperty("分类id") private Long categoryId; //套餐名称 + @ApiModelProperty("套餐名称") private String name; //套餐价格 + @ApiModelProperty("套餐价格") private BigDecimal price; diff --git a/src/main/java/com/dhu/filter/LoginCheckFilter.java b/src/main/java/com/dhu/filter/LoginCheckFilter.java index 0e97d0f..0bf89e6 100644 --- a/src/main/java/com/dhu/filter/LoginCheckFilter.java +++ b/src/main/java/com/dhu/filter/LoginCheckFilter.java @@ -33,7 +33,11 @@ public class LoginCheckFilter implements Filter { "/front/**", "/common/**", "/user/sendMsg", - "/user/login" + "/user/login", + "/doc.html", + "/webjars/**", + "/swagger-resources", + "/v2/api-docs" }; //判断本次请求是否需要处理 boolean check = check(urls, requestURI); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 5ac7a79..b46431c 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,5 +1,5 @@ server: - port: 8888 + port: 8880 spring: application: name: reggie @@ -13,7 +13,7 @@ spring: default-encoding: utf-8 redis: password: a20011028 - host: 192.168.254.129 + host: 101.133.226.33 port: 6379 database: 0 # 操作的是0号数据库 jedis: @@ -26,9 +26,9 @@ spring: datasource: druid: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://localhost:3306/db_reggie?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + url: jdbc:mysql://101.133.226.33:3306/db_reggie?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root - password: root + password: Aa.211028 mybatis-plus: configuration: #在映射实体或者属性时，将数据库中表名和字段名中的下划线去掉，按照驼峰命名法映射 -- Gitee