From c92aa3899e11a355cddfcfeaececcc843d7ad1bb Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期三, 04 九月 2024 19:14:18 +0800 Subject: [PATCH] 修改 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataGeneratorController.java | 62 +++++++++++++++++++++++++++---- 1 files changed, 54 insertions(+), 8 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataGeneratorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataGeneratorController.java index c52f3b8..ea540a4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataGeneratorController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataGeneratorController.java @@ -1,16 +1,21 @@ package com.ruoyi.web.controller.api; +import com.ruoyi.common.basic.PageInfo; +import com.ruoyi.common.constant.OrderNumConstants; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.redis.RedisCache; +import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.system.dto.OrderMealGeneratorDTO; +import com.ruoyi.system.dto.OrderSaleGeneratorDTO; +import com.ruoyi.system.query.TDataGeneratorQuery; import com.ruoyi.system.service.TDataGeneratorService; import com.ruoyi.system.service.TOrderMealService; +import com.ruoyi.system.vo.TDataGeneratorVO; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; /** * <p> @@ -26,19 +31,60 @@ private final TOrderMealService orderMealService; private final TDataGeneratorService dataGeneratorService; + private final TokenService tokenService; + private final RedisCache redisCache; @Autowired - public TDataGeneratorController(TOrderMealService orderMealService, TDataGeneratorService dataGeneratorService) { + public TDataGeneratorController(TOrderMealService orderMealService, TDataGeneratorService dataGeneratorService, TokenService tokenService, RedisCache redisCache) { this.orderMealService = orderMealService; this.dataGeneratorService = dataGeneratorService; + this.tokenService = tokenService; + this.redisCache = redisCache; } @ApiOperation( value = "餐饮数据生成") - @PostMapping(value = "/dataGenerator") - public AjaxResult<String> dataGenerator(@RequestBody OrderMealGeneratorDTO dto) { - dataGeneratorService.dataGenerator(dto); + @PostMapping(value = "/mealDataGenerator") + public AjaxResult<String> mealDataGenerator(@RequestBody OrderMealGeneratorDTO dto) { + dto.setUserId(tokenService.getLoginUser().getUserId()); + dto.setNickName(tokenService.getLoginUser().getNickName()); + dataGeneratorService.mealDataGenerator(dto); return AjaxResult.success(); } + @ApiOperation( value = "销售数据生成") + @PostMapping(value = "/saleDataGenerator") + public AjaxResult<String> saleDataGenerator(@RequestBody OrderSaleGeneratorDTO dto) { + dto.setUserId(tokenService.getLoginUser().getUserId()); + dto.setNickName(tokenService.getLoginUser().getNickName()); + dataGeneratorService.saleDataGenerator(dto); + return AjaxResult.success(); + } + + @ApiOperation( value = "数据生成分页") + @PostMapping(value = "/pageList") + public AjaxResult<PageInfo<TDataGeneratorVO>> pageList(@Validated @RequestBody TDataGeneratorQuery query) { + return AjaxResult.success(dataGeneratorService.pageList(query)); + } + + @ApiOperation( value = "数据覆盖") + @GetMapping(value = "/dataCoverage") + public AjaxResult<String> dataCoverage(@RequestParam(value = "id") Long id) { + dataGeneratorService.dataCoverage(id); + return AjaxResult.success(); + } + + @ApiOperation( value = "数据生成终止 shopId=店铺id type: 1=餐饮 2=进货") + @GetMapping(value = "/stopGenerator") + public AjaxResult<String> dataCoverage(@RequestParam(value = "shopId") Long shopId, + @RequestParam(value = "type") Integer type) { + if(type == 1){ + redisCache.setCacheObject(OrderNumConstants.MEAL+"_"+shopId,shopId); + }else { + redisCache.setCacheObject(OrderNumConstants.STOCK+"_"+shopId,shopId); + } + return AjaxResult.success(); + } + + } -- Gitblit v1.7.1