From 0cd1631ceaa93e6483908fd692d2cb693b85324b Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期二, 02 一月 2024 14:26:01 +0800
Subject: [PATCH] 增加图片验证码和登录日志 权限管理优化
---
consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
index 0a5dff4..b8d85e1 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
@@ -70,7 +70,7 @@
@Autowired
private LWhProcureModelService lWhProcureModelService;
@Resource
- private LWarehouseFlowService lWarehouseFlowService;
+ private LWarehouseFlowService lWarehouseFlowServiceImpl;
/**
* @Description 鏂板鍑哄簱鍗�
@@ -132,8 +132,6 @@
}
try {
Field fieldDatas = GenericPager.class.getDeclaredField("datas");
- // fieldDatas.setAccessible(true);
- // fieldDatas.set(genericPager, resultList);
ReflectUtil.setFieldValue(genericPager, fieldDatas, resultList);
} catch (Exception e) {
logger.error("鏌ヨ鍑哄簱鍗曞垪琛ㄥけ璐�", e);
@@ -147,7 +145,7 @@
@ApiOperation(value = "鏍规嵁id鏌ヨ璇︽儏", notes = "鏍规嵁id鏌ヨ璇︽儏")
@ApiImplicitParam(name = "id", value = "鍑哄簱鍗昳d", required = true, dataType = "Long", paramType = "query")
@GetMapping("/detail")
- public ResponseValue getById(Long id) throws IllegalAccessException {
+ public ResponseValue getById(Long id) throws Exception {
if (id == null) {
return ResponseValue.error("鍑哄簱鍗昳d涓虹┖");
}
@@ -208,14 +206,14 @@
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
formOutputQry.setAgencyId(Long.valueOf(currentUser.getTenantId()));
- PageUtil genericPager = lWarehouseFlowService.queryAllBusinessFlow(formOutputQry);
+ PageUtil genericPager = lWarehouseFlowServiceImpl.queryAllBusinessFlow(formOutputQry);
return ResponseValue.success(genericPager);
}
@ApiOperation(value = "鍑哄簱鍗曞鍑�", notes = "鍑哄簱鍗曞鍑�")
@ApiImplicitParam(name = "id", value = "鍑哄簱鍗昳d", required = true, dataType = "Long", paramType = "query")
@GetMapping("/list/export")
- public void export(Long id, HttpServletResponse response) throws Exception {
+ public ResponseValue export(Long id, HttpServletResponse response) throws Exception {
FinSysTenantUser sysInfo = this.getSysInfo();
if (sysInfo == null) {
throw new RuntimeException("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -251,7 +249,8 @@
map.put("totalAmount", totalAmount);
Workbook workbook = ExcelExportUtil.exportExcel(params, OutputExcelTemplate.class, exportList, map);
- downLoadExcel("鍑哄簱鍗�", response, workbook);
+ String filePath = downLoadExcel("鍑哄簱鍗�", workbook);
+ return ResponseValue.success("瀵煎嚭鎴愬姛", filePath);
}
--
Gitblit v1.9.1