ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBoardController.java
@@ -88,6 +88,7 @@ /** * 修改 餐桌 */ @Log(title = "餐桌-修改餐桌", businessType = BusinessType.UPDATE) @ApiOperation( value = "修改餐桌") @PostMapping(value = "/update") public AjaxResult<Boolean> update(@RequestBody TBoard dto) { @@ -126,6 +127,7 @@ /** * 批量删除 餐桌 */ @Log(title = "餐桌-批量删除餐桌", businessType = BusinessType.DELETE) @ApiOperation( value = "批量删除餐桌") @DeleteMapping(value = "/deleteByIds") public AjaxResult<Boolean> deleteByIds(@RequestBody List<Long> ids) { ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataGeneratorController.java
@@ -78,7 +78,7 @@ this.tokenService = tokenService; this.redisCache = redisCache; } @Log(title = "生成-餐饮数据生成", businessType = BusinessType.INSERT) @ApiOperation( value = "餐饮数据生成") @PostMapping(value = "/mealDataGenerator") public AjaxResult<String> mealDataGenerator(@RequestBody OrderMealGeneratorDTO dto) { @@ -87,7 +87,7 @@ dataGeneratorService.mealDataGenerator(dto); return AjaxResult.success(); } @Log(title = "生成-销售数据生成", businessType = BusinessType.INSERT) @ApiOperation( value = "销售数据生成") @PostMapping(value = "/saleDataGenerator") public AjaxResult<String> saleDataGenerator(@RequestBody OrderSaleGeneratorDTO dto) { @@ -117,7 +117,7 @@ dataGeneratorService.dataCoverage(id); return AjaxResult.success(); } @Log(title = "生成-数据生成终止", businessType = BusinessType.UPDATE) @ApiOperation( value = "数据生成终止 shopId=店铺id type: 1=餐饮 2=进货") @GetMapping(value = "/stopGenerator") public AjaxResult<String> stopGenerator(@RequestParam(value = "shopId") Long shopId, @@ -184,6 +184,7 @@ // } // } // } @Log(title = "生成-餐饮生成数据详情导出", businessType = BusinessType.UPDATE) @ApiOperation( value = "餐饮生成数据详情导出") @PostMapping(value = "/mealGeneratorExport") public void mealGeneratorExport(@Validated @RequestBody TDataGeneratorMealQuery query) { @@ -287,7 +288,7 @@ } } } @Log(title = "生成-销售生成数据详情导出", businessType = BusinessType.UPDATE) @ApiOperation( value = "销售生成数据详情导出") @PostMapping(value = "/saleGeneratorExport") public void saleGeneratorExport(@Validated @RequestBody TDataGeneratorSaleQuery query) { @@ -447,7 +448,7 @@ } } } @Log(title = "生成-餐饮数据生成列表导出", businessType = BusinessType.UPDATE) @ApiOperation( value = "餐饮数据生成列表导出") @PostMapping(value = "/mealGeneratorListExport") public void mealGeneratorListExport(@RequestBody TDataGeneratorQuery query) { @@ -484,7 +485,7 @@ } } } @Log(title = "生成-销售数据生成列表导出", businessType = BusinessType.UPDATE) @ApiOperation( value = "销售数据生成列表导出") @PostMapping(value = "/saleGeneratorListExport") public void saleGeneratorListExport(@RequestBody TDataGeneratorQuery query) { ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataStatisticsController.java
@@ -6,8 +6,10 @@ import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import cn.hutool.core.io.resource.ClassPathResource; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.WebUtils; @@ -151,7 +153,7 @@ } return AjaxResult.success(profitDetailsVO); } @Log(title = "统计-盈利明细导出", businessType = BusinessType.UPDATE) @ApiOperation( value = "盈利明细导出") @PostMapping(value = "/profitDetailsExport") public void profitDetailsExport(@RequestBody ProfitDetailsQuery query) { @@ -362,7 +364,7 @@ return AjaxResult.success(personnelStatisticsAndSumVO); } @Log(title = "统计-汇总导出", businessType = BusinessType.UPDATE) @ApiOperation( value = "汇总导出") @PostMapping(value = "/sumExport") public void sumExport(@RequestBody ProfitDetailsQuery query) { ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TFoundationPersonController.java
@@ -2,8 +2,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.system.domain.TFoundationConfig; import com.ruoyi.system.domain.TFoundationPerson; import com.ruoyi.system.domain.TShop; @@ -67,6 +69,7 @@ /** * 添加基础设置管理 */ @Log(title = "基础设置-添加基础设置", businessType = BusinessType.INSERT) @ApiOperation( value = "添加基础设置") @PostMapping(value = "/add") public AjaxResult<Boolean> add(@RequestBody TFoundationPersonBatchDTO dto) { @@ -77,6 +80,7 @@ /** * 修改基础设置 */ @Log(title = "基础设置-修改基础设置", businessType = BusinessType.UPDATE) @ApiOperation( value = "修改基础设置") @PostMapping(value = "/update") public AjaxResult<Boolean> update(@RequestBody TFoundationPersonBatchDTO dto) { @@ -107,6 +111,7 @@ /** * 删除基础设置 */ @Log(title = "基础设置-删除基础设置", businessType = BusinessType.DELETE) @ApiOperation( value = "删除基础设置") @DeleteMapping(value = "/deleteById") public AjaxResult<Boolean> deleteById(@RequestParam("id") Long id) { ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsController.java
@@ -2,8 +2,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.CodeGenerateUtils; import com.ruoyi.common.utils.bean.BeanUtils; import com.ruoyi.framework.web.service.TokenService; @@ -65,6 +67,7 @@ /** * 添加商品管理管理 */ @Log(title = "商品管理-添加商品管理", businessType = BusinessType.INSERT) @ApiOperation( value = "添加商品管理") @PostMapping(value = "/add") public AjaxResult<Boolean> add(@RequestBody TGoods dto) { @@ -82,6 +85,7 @@ /** * 修改商品管理 */ @Log(title = "商品管理-修改商品管理", businessType = BusinessType.UPDATE) @ApiOperation( value = "修改商品管理") @PostMapping(value = "/update") public AjaxResult<Boolean> update(@RequestBody TGoods dto) { @@ -125,6 +129,7 @@ /** * 删除商品管理 */ @Log(title = "商品管理-删除商品管理", businessType = BusinessType.DELETE) @ApiOperation( value = "删除商品管理") @DeleteMapping(value = "/deleteById") public AjaxResult<Boolean> deleteById(@RequestParam("id") Long id) { @@ -141,6 +146,7 @@ /** * 批量删除商品管理 */ @Log(title = "商品管理-批量删除商品管理", businessType = BusinessType.DELETE) @ApiOperation( value = "批量删除商品管理") @DeleteMapping(value = "/deleteByIds") public AjaxResult<Boolean> deleteByIds(@RequestBody List<Long> ids) { ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TGoodsTypeController.java
@@ -3,7 +3,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.system.domain.TFoundationConfig; import com.ruoyi.system.domain.TGoodsType; @@ -89,6 +91,7 @@ /** * 添加商品分类管理 */ @Log(title = "商品分类-添加商品分类", businessType = BusinessType.INSERT) @ApiOperation( value = "添加商品分类") @PostMapping(value = "/add") public AjaxResult<Boolean> add(@RequestBody TGoodsType dto) { @@ -102,6 +105,7 @@ /** * 修改商品分类 */ @Log(title = "商品分类-修改商品分类", businessType = BusinessType.UPDATE) @ApiOperation( value = "修改商品分类") @PostMapping(value = "/update") public AjaxResult<Boolean> update(@RequestBody TGoodsType dto) { @@ -120,6 +124,7 @@ /** * 删除商品分类 */ @Log(title = "商品分类-删除商品分类", businessType = BusinessType.DELETE) @ApiOperation( value = "删除商品分类") @DeleteMapping(value = "/deleteById") public AjaxResult<Boolean> deleteById(@RequestParam("id") Long id) { @@ -135,6 +140,7 @@ /** * 批量删除商品分类 */ @Log(title = "商品分类-批量删除商品分类", businessType = BusinessType.DELETE) @ApiOperation( value = "批量删除商品分类") @DeleteMapping(value = "/deleteByIds") public AjaxResult<Boolean> deleteByIds(@RequestBody List<Long> ids) { ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderMealController.java
@@ -117,6 +117,7 @@ return AjaxResult.success(orderMealVO); } @Log(title = "餐饮-修改餐饮信息", businessType = BusinessType.UPDATE) @ApiOperation( value = "修改") @PostMapping(value = "/update") public AjaxResult<String> update(@RequestBody TOrderMealDTO dto) { @@ -137,6 +138,7 @@ } return AjaxResult.success(); } @Log(title = "餐饮-列表详情结账", businessType = BusinessType.UPDATE) @ApiOperation( value = "列表详情结账") @PostMapping(value = "/detailUpdate") public AjaxResult<String> detailUpdate(@RequestBody TOrderMealDTO dto) { @@ -167,6 +169,7 @@ /** * 添加餐饮管理 */ @Log(title = "餐饮-开台", businessType = BusinessType.UPDATE) @ApiOperation( value = "开台") @PostMapping(value = "/startMeal") public AjaxResult<Integer> startMeal(@RequestBody TOrderMeal dto) { @@ -178,6 +181,7 @@ /** * 添加餐饮管理 */ @Log(title = "餐饮-点菜", businessType = BusinessType.UPDATE) @ApiOperation( value = "点菜接口") @PostMapping(value = "/add") public AjaxResult<Integer> add(@RequestBody TOrderMealDTO dto) { @@ -192,6 +196,7 @@ // return AjaxResult.success(); // } @Log(title = "餐饮-结账", businessType = BusinessType.UPDATE) @ApiOperation( value = "结账接口") @PostMapping(value = "/checkout") public AjaxResult<String> checkout(@Validated @RequestBody CheckoutDTO dto) { @@ -202,6 +207,7 @@ /** * 导出餐饮列表 */ @Log(title = "餐饮-导出餐饮列表", businessType = BusinessType.UPDATE) @ApiOperation(value = "导出餐饮列表") @PostMapping("/exportOrderMeal") public void exportOrderMeal(@RequestBody TOrderMealQuery query) ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderSaleController.java
@@ -118,6 +118,7 @@ /** * 销售下单接口 */ @Log(title = "销售-销售下单", businessType = BusinessType.INSERT) @ApiOperation( value = "销售下单接口") @PostMapping(value = "/add") public AjaxResult<String> add(@RequestBody TOrderSaleDTO dto) { @@ -129,6 +130,7 @@ /** * 销售下单接口 */ @Log(title = "销售-销售修改", businessType = BusinessType.UPDATE) @ApiOperation( value = "销售单修改接口") @PostMapping(value = "/edit") public AjaxResult<String> edit(@RequestBody TOrderSaleDTO dto) { @@ -136,6 +138,7 @@ return AjaxResult.success(); } @Log(title = "销售-结账", businessType = BusinessType.UPDATE) @ApiOperation( value = "结账接口") @PostMapping(value = "/checkout") public AjaxResult<String> checkout(@Validated @RequestBody CheckoutDTO dto) { @@ -146,6 +149,7 @@ /** * 导出销售列表 */ @Log(title = "销售-导出销售列表", businessType = BusinessType.UPDATE) @ApiOperation(value = "导出销售列表") @PostMapping("/exportOrderSale") public void exportOrderSale(@RequestBody TOrderMealQuery query) ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOrderStockController.java
@@ -59,6 +59,7 @@ /** * 进货单下单接口 */ @Log(title = "进货单-进货单下单接口", businessType = BusinessType.INSERT) @ApiOperation( value = "进货单下单接口") @PostMapping(value = "/add") public AjaxResult<String> add(@RequestBody TOrderStockDTO dto) { @@ -70,6 +71,7 @@ /** * 编辑进货单下单接口 */ @Log(title = "进货单-编辑进货单下单接口", businessType = BusinessType.UPDATE) @ApiOperation( value = "编辑进货单下单接口") @PostMapping(value = "/edit") public AjaxResult<String> edit(@RequestBody TOrderStockDTO dto) { @@ -80,6 +82,7 @@ /** * 编辑进货单下单接口 */ @Log(title = "进货单-编辑生成进货单接口", businessType = BusinessType.UPDATE) @ApiOperation( value = "编辑生成进货单接口") @PostMapping(value = "/editGenerator") public AjaxResult<String> editGenerator(@RequestBody TOrderStockDTO dto) { @@ -119,6 +122,7 @@ /** * 批量删除进货单 */ @Log(title = "进货单-批量删除进货单", businessType = BusinessType.DELETE) @ApiOperation( value = "批量删除进货单") @DeleteMapping(value = "/deleteByIds") public AjaxResult<Boolean> deleteByIds(@RequestBody List<Long> ids) { ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TShopController.java
@@ -85,6 +85,7 @@ /** * 添加店铺信息 */ @Log(title = "店铺信息-添加店铺信息", businessType = BusinessType.INSERT) @ApiOperation( value = "添加店铺信息") @PostMapping(value = "/add") public AjaxResult<String> add(@RequestBody TShopDTO dto) { @@ -106,6 +107,7 @@ /** * 编辑店铺信息 */ @Log(title = "店铺信息-编辑店铺信息", businessType = BusinessType.UPDATE) @ApiOperation( value = "编辑店铺信息") @PostMapping(value = "/edit") public AjaxResult<String> edit(@RequestBody TShopDTO dto) { @@ -217,6 +219,7 @@ /** * 启用禁用店铺 */ @Log(title = "店铺信息-启用禁用店铺", businessType = BusinessType.UPDATE) @ApiOperation( value = "启用禁用店铺") @GetMapping(value = "/updateStatus") public AjaxResult<Boolean> updateStatus(@RequestParam(value = "id") Integer id, ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TaskUtil.java
@@ -1,17 +1,7 @@ package com.ruoyi.web.controller.tool; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.core.redis.RedisCache; import com.ruoyi.system.service.*; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; import java.time.Instant; import java.util.*; /** @@ -20,86 +10,5 @@ @Slf4j @Component public class TaskUtil { @Autowired private ISysRoleService roleService; @Autowired private ISysUserService userService; @Autowired private RedisCache redisCache; @Scheduled(fixedRate = 1000 * 60) public void message() { try { } catch (Exception e) { e.printStackTrace(); } } /** * 每隔一分钟去处理的定时任务 */ @Scheduled(fixedRate = 1000 * 60) public void taskMinute(){ try { // List<Message> list = messageService.list(); // Map<Integer,List<Message>> map = new LinkedHashMap<>(); // for (Message message : list) { // if (map.get(message.getUserId())==null){ // List<Message> messages = new ArrayList<>(); // messages.add(message); // map.put(message.getUserId(),messages); // System.err.println("为空"); // }else { // List<Message> messages = map.get(message.getUserId()); // messages.add(message); // map.put(message.getUserId(),messages); // } // } // Object cacheObject = redisCache.getCacheObject("1"); // Set<Integer> integers = map.keySet(); // for (Integer integer : integers) { // redisCache.deleteObject(String.valueOf(integer)); // redisCache.setCacheList(String.valueOf(integer),map.get(integer)); // List<Message> cacheList = redisCache.getCacheList(String.valueOf(integer)); // System.err.println("====="+cacheList); // } // // // System.err.println("======="+map); } catch (Exception e) { e.printStackTrace(); } } /** * 每天的凌晨执行的任务 */ @Scheduled(cron = "0 0 0 * * *") public void taskDay(){ // List<SysRole> sysRoles = roleService.selectListByDelFlag(2); // if(CollectionUtils.isEmpty(sysRoles)){ // return; // } // for (SysRole sysRole : sysRoles) { // if(sysRole.getRemoveDays()>0){ // sysRole.setRemoveDays(sysRole.getRemoveDays()-1); // roleService.updateRole(sysRole); // }else { // roleService.deleteRoleById(sysRole.getRoleId()); // } // } } /** * 每天的凌晨执行的任务 */ @Scheduled(cron = "0 0 1 * * ? ") public void taskDayOne(){ } }
