From 13a3236249d21e1ed1a0f1e8ae20a29d6bf3913a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 26 九月 2025 17:49:11 +0800
Subject: [PATCH] 修改
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TDataGeneratorController.java | 34 +++++++++++-----------------------
1 files changed, 11 insertions(+), 23 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 7de049c..84a1f37 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
@@ -6,10 +6,12 @@
import cn.afterturn.easypoi.excel.entity.TemplateExportParams;
import cn.hutool.core.io.resource.ClassPathResource;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ruoyi.common.annotation.Log;
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.common.enums.BusinessType;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.WebUtils;
import com.ruoyi.framework.web.service.TokenService;
@@ -76,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) {
@@ -85,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) {
@@ -101,20 +103,21 @@
return AjaxResult.success(dataGeneratorService.pageList(query));
}
+ @Log(title = "数据生成-数据生成删除", businessType = BusinessType.DELETE)
@ApiOperation( value = "数据生成删除")
@DeleteMapping(value = "/deleteById")
public AjaxResult<String> deleteById(@RequestParam("id") Long id) {
dataGeneratorService.removeById(id);
return AjaxResult.success();
}
-
+ @Log(title = "数据生成-数据覆盖", businessType = BusinessType.UPDATE)
@ApiOperation( value = "数据覆盖")
@GetMapping(value = "/dataCoverage")
public AjaxResult<String> dataCoverage(@RequestParam(value = "id") Long id) {
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,
@@ -181,6 +184,7 @@
// }
// }
// }
+ @Log(title = "生成-餐饮生成数据详情导出", businessType = BusinessType.UPDATE)
@ApiOperation( value = "餐饮生成数据详情导出")
@PostMapping(value = "/mealGeneratorExport")
public void mealGeneratorExport(@Validated @RequestBody TDataGeneratorMealQuery query) {
@@ -284,7 +288,7 @@
}
}
}
-
+ @Log(title = "生成-销售生成数据详情导出", businessType = BusinessType.UPDATE)
@ApiOperation( value = "销售生成数据详情导出")
@PostMapping(value = "/saleGeneratorExport")
public void saleGeneratorExport(@Validated @RequestBody TDataGeneratorSaleQuery query) {
@@ -355,22 +359,6 @@
ClassPathResource classPathResource = new ClassPathResource("template/销售数据列表.xls");
TemplateExportParams params = new TemplateExportParams(classPathResource.getPath());
Workbook workbook = ExcelExportUtil.exportExcel(params, result);
-
- Sheet firstSheet = workbook.getSheetAt(0);
-// List<CellRangeAddress> mergedRegions = firstSheet.getMergedRegions();
-// List<Integer> removeMergedRegionIndexList = new ArrayList<>();
- // 处理数据不显示
-// for (int i = 0; i < mergedRegions.size(); i++) {
-// CellRangeAddress mergedRegion = mergedRegions.get(i);
-// int firstColumn = mergedRegion.getFirstColumn();
-// int lastColumn = mergedRegion.getLastColumn();
-// int firstRow = mergedRegion.getFirstRow();
-// if(firstRow >= 2 && firstColumn >= 3 && lastColumn <= 5){
-// removeMergedRegionIndexList.add(i);
-// }
-// }
-// firstSheet.removeMergedRegions(removeMergedRegionIndexList);
-
HttpServletResponse response = WebUtils.response();
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
@@ -460,7 +448,7 @@
}
}
}
-
+ @Log(title = "生成-餐饮数据生成列表导出", businessType = BusinessType.UPDATE)
@ApiOperation( value = "餐饮数据生成列表导出")
@PostMapping(value = "/mealGeneratorListExport")
public void mealGeneratorListExport(@RequestBody TDataGeneratorQuery query) {
@@ -497,7 +485,7 @@
}
}
}
-
+ @Log(title = "生成-销售数据生成列表导出", businessType = BusinessType.UPDATE)
@ApiOperation( value = "销售数据生成列表导出")
@PostMapping(value = "/saleGeneratorListExport")
public void saleGeneratorListExport(@RequestBody TDataGeneratorQuery query) {
--
Gitblit v1.7.1