From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java | 508 +-
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementExceptionRecordController.java | 10
src/main/java/com/ruoyi/sales/controller/SalespersonManagementController.java | 20
src/main/java/com/ruoyi/project/system/controller/SysMenuController.java | 276
src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java | 10
src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java | 374 +-
src/main/java/com/ruoyi/purchase/service/IProductRecordService.java | 4
src/main/java/com/ruoyi/ai/controller/SalesAiController.java | 15
src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java | 46
src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java | 24
src/main/java/com/ruoyi/account/controller/AccountFileController.java | 21
src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java | 25
src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java | 16
src/main/resources/application-dev.yml | 27
src/main/java/com/ruoyi/staff/service/StaffSalaryMainService.java | 12
src/main/java/com/ruoyi/technology/controller/TechnologyOperationParamController.java | 8
src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java | 25
src/main/java/com/ruoyi/quality/controller/QualityReportController.java | 26
src/main/java/com/ruoyi/project/common/CaptchaController.java | 198
src/main/java/com/ruoyi/project/system/controller/SysRegisterController.java | 66
src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java | 8
src/main/java/com/ruoyi/device/controller/DeviceRepairController.java | 27
src/main/java/com/ruoyi/basic/controller/ProductController.java | 32
src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java | 36
src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java | 21
src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java | 34
src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java | 46
src/main/java/com/ruoyi/project/system/controller/SysProfileController.java | 268
src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java | 40
src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java | 46
src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeController.java | 22
src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java | 26
src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java | 6
src/main/java/com/ruoyi/staff/controller/BankController.java | 21
src/main/java/com/ruoyi/approve/controller/NotificationManagementController.java | 31
src/main/java/com/ruoyi/account/service/impl/AccountingServiceImpl.java | 14
src/main/java/com/ruoyi/account/controller/AccountExpenseController.java | 43
src/main/java/com/ruoyi/account/controller/BorrowInfoController.java | 14
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java | 18
src/main/java/com/ruoyi/project/system/controller/SysConfigController.java | 256
src/main/java/com/ruoyi/project/monitor/controller/ServerController.java | 55
src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java | 265
src/main/java/com/ruoyi/equipmentenergyconsumption/service/EquipmentEnergyConsumptionService.java | 4
src/main/java/com/ruoyi/basic/controller/SupplierManageFileController.java | 19
src/main/java/com/ruoyi/project/system/controller/SysUserClientController.java | 8
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java | 76
src/main/java/com/ruoyi/project/monitor/controller/CacheController.java | 223
src/main/java/com/ruoyi/device/service/MaintenanceTaskService.java | 10
src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementFileController.java | 19
src/main/java/com/ruoyi/projectManagement/controller/PlanController.java | 17
src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java | 20
src/main/java/com/ruoyi/account/controller/AccountingController.java | 8
src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java | 31
src/main/java/com/ruoyi/sales/controller/CommonFileController.java | 9
src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java | 27
src/main/java/com/ruoyi/projectManagement/controller/InfoController.java | 37
src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java | 21
src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java | 21
src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java | 24
src/main/java/com/ruoyi/procurementrecord/controller/GasTankWarningController.java | 23
src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceFileController.java | 14
src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsController.java | 25
src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java | 16
src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java | 26
src/main/java/com/ruoyi/project/system/controller/SysRoleController.java | 520 +-
src/main/java/com/ruoyi/account/service/BorrowInfoService.java | 10
src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java | 17
src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java | 16
src/main/java/com/ruoyi/sales/controller/InvoiceRegistrationController.java | 31
src/main/java/com/ruoyi/staff/service/SchemeApplicableStaffService.java | 10
src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java | 23
src/main/java/com/ruoyi/project/monitor/controller/SysUserOnlineController.java | 165
src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java | 195
src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java | 16
src/main/java/com/ruoyi/quality/controller/QualityInspectFileController.java | 16
src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java | 23
src/main/java/com/ruoyi/quality/controller/QualityInspectController.java | 28
src/main/java/com/ruoyi/ai/controller/XiaozhiController.java | 23
src/main/java/com/ruoyi/officesupplies/service/OfficeSuppliesService.java | 4
src/main/java/com/ruoyi/basic/service/ISupplierService.java | 1
src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java | 34
src/main/java/com/ruoyi/procurementrecord/controller/ReturnManagementController.java | 32
src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java | 46
src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java | 17
src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java | 17
src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerTemplateController.java | 19
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPriceManagementController.java | 20
src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java | 4
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 14
src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java | 23
src/main/java/com/ruoyi/project/system/controller/SysLoginController.java | 311 +-
src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeTypeController.java | 19
src/main/java/com/ruoyi/project/system/controller/SysDeptController.java | 271
src/main/java/com/ruoyi/officesupplies/controller/OfficeSuppliesController.java | 18
src/main/java/com/ruoyi/staff/controller/StaffContractController.java | 9
src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java | 37
src/main/java/com/ruoyi/project/system/controller/SysUserController.java | 577 +-
src/main/java/com/ruoyi/staff/controller/StaffSchedulingController.java | 25
src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java | 241
src/main/java/com/ruoyi/customervisits/service/CustomerVisitsService.java | 2
src/main/java/com/ruoyi/procurementrecord/controller/InboundManagementController.java | 20
src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java | 28
src/main/java/com/ruoyi/basic/controller/SupplierManageController.java | 27
src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java | 37
src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java | 26
src/main/java/com/ruoyi/device/service/IDeviceMaintenanceService.java | 6
src/main/java/com/ruoyi/project/monitor/controller/SysOperlogController.java | 140
src/main/java/com/ruoyi/waterrecord/service/WaterRecordService.java | 4
src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java | 20
src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java | 45
src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java | 25
src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java | 20
src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java | 19
src/main/java/com/ruoyi/projectManagement/controller/RolesController.java | 27
src/main/java/com/ruoyi/quality/controller/QualityTestStandardBindingController.java | 16
src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesNearExpiryController.java | 18
src/main/java/com/ruoyi/procurementrecord/service/ProcurementRecordService.java | 8
src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java | 15
src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java | 26
src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java | 24
src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java | 186
src/main/java/com/ruoyi/sales/service/impl/MetricStatisticsServiceImpl.java | 14
src/main/java/com/ruoyi/ai/controller/PurchaseAiController.java | 25
src/main/java/com/ruoyi/home/controller/HomeController.java | 164
src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java | 20
src/main/java/com/ruoyi/device/service/IDeviceLedgerService.java | 6
src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java | 71
src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java | 18
src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java | 24
src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java | 25
src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java | 23
src/main/java/com/ruoyi/officesupplies/service/impl/OfficeSuppliesServiceImpl.java | 6
src/main/java/com/ruoyi/quality/controller/QualityInspectParamController.java | 16
src/main/java/com/ruoyi/stock/controller/StockInRecordController.java | 27
src/main/java/com/ruoyi/framework/web/controller/BaseController.java | 36
src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java | 40
src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java | 141
src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java | 36
src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesRowcolController.java | 6
src/main/java/com/ruoyi/approve/controller/HolidaySettingsController.java | 77
src/main/java/com/ruoyi/device/service/IDeviceRepairService.java | 10
src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java | 13
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 25
src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java | 22
src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java | 43
src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java | 38
src/main/java/com/ruoyi/basic/service/IProductModelService.java | 4
src/main/java/com/ruoyi/ai/controller/ManufacturingAiController.java | 15
src/main/java/com/ruoyi/project/system/controller/SysPostController.java | 268
src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java | 36
src/main/java/com/ruoyi/ai/service/PurchaseAiService.java | 92
src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java | 36
src/main/java/com/ruoyi/staff/controller/AnalyticsController.java | 17
src/main/java/com/ruoyi/account/controller/AccountIncomeController.java | 35
src/main/java/com/ruoyi/device/controller/DeviceMaintenanceFileController.java | 19
src/main/java/com/ruoyi/waterrecord/service/impl/WaterRecordServiceImpl.java | 11
src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java | 4
src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java | 34
src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EquipmentEnergyConsumptionServiceImpl.java | 11
src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java | 50
src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java | 10
src/main/java/com/ruoyi/purchase/controller/ProcurementBusinessSummaryController.java | 6
src/main/java/com/ruoyi/purchase/controller/InvoicePurchaseController.java | 12
src/main/java/com/ruoyi/quality/controller/QualityTestStandardParamController.java | 20
src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsRequisitionRecordController.java | 9
165 files changed, 4,477 insertions(+), 4,427 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java b/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
index 9d49919..ea80191 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountExpenseController.java
@@ -8,7 +8,8 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.dto.DateQueryDto;
import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.annotation.Resource;
@@ -25,7 +26,7 @@
@RestController
@RequestMapping("/account/accountExpense")
@Tag(name = "璐㈠姟绠＄悊--鏀嚭绠＄悊")
-public class AccountExpenseController {
+public class AccountExpenseController extends BaseController {
@Resource
private AccountExpenseService accountExpenseService;
@@ -41,11 +42,11 @@
*/
@PostMapping("/add")
@Operation(summary = "鏂板")
- public AjaxResult add(@RequestBody AccountExpense accountExpense) {
+ public R<?> add(@RequestBody AccountExpense accountExpense) {
accountExpense.setInputTime(new Date());
LoginUser loginUser = SecurityUtils.getLoginUser();
accountExpense.setInputUser(loginUser.getNickName());
- return AjaxResult.success(accountExpenseService.save(accountExpense));
+ return R.ok(accountExpenseService.save(accountExpense));
}
/**
@@ -55,12 +56,12 @@
*/
@DeleteMapping("/del")
@Operation(summary = "鍒犻櫎")
- public AjaxResult delQualityInspect(@RequestBody List<Integer> ids) {
+ public R<?> delQualityInspect(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
//鍒犻櫎妫�楠屽崟
- return AjaxResult.success(accountExpenseService.removeBatchByIds(ids));
+ return R.ok(accountExpenseService.removeBatchByIds(ids));
}
/**
@@ -70,8 +71,8 @@
*/
@PostMapping("/update")
@Operation(summary = "淇敼")
- public AjaxResult update(@RequestBody AccountExpense accountExpense) {
- return AjaxResult.success(accountExpenseService.updateById(accountExpense));
+ public R<?> update(@RequestBody AccountExpense accountExpense) {
+ return R.ok(accountExpenseService.updateById(accountExpense));
}
/**
@@ -82,8 +83,8 @@
*/
@GetMapping("/listPage")
@Operation(summary = "鍒嗛〉鏌ヨ")
- public AjaxResult accountExpenseListPage(Page page, AccountExpense accountExpense) {
- return AjaxResult.success(accountExpenseService.accountExpenseListPage(page, accountExpense));
+ public R<?> accountExpenseListPage(Page page, AccountExpense accountExpense) {
+ return R.ok(accountExpenseService.accountExpenseListPage(page, accountExpense));
}
/**
@@ -93,8 +94,8 @@
*/
@GetMapping("/{id}")
@Operation(summary = "璇︽儏")
- public AjaxResult accountExpenseDetail(@PathVariable("id") Integer id) {
- return AjaxResult.success(accountExpenseService.getById(id));
+ public R<?> accountExpenseDetail(@PathVariable("id") Integer id) {
+ return R.ok(accountExpenseService.getById(id));
}
/**
@@ -115,8 +116,8 @@
*/
@GetMapping("/report/forms")
@Operation(summary = "璐㈠姟鎶ヨ〃鍥捐〃鏌ヨ")
- public AjaxResult report(DateQueryDto dateQueryDto) {
- return AjaxResult.success(accountExpenseService.report(dateQueryDto));
+ public R<?> report(DateQueryDto dateQueryDto) {
+ return R.ok(accountExpenseService.report(dateQueryDto));
}
/**
@@ -125,8 +126,8 @@
*/
@GetMapping("/report/analysis")
@Operation(summary = "璐㈠姟鎶ヨ〃-璐㈠姟鍒嗘瀽")
- public AjaxResult analysis() {
- return AjaxResult.success(accountExpenseService.analysis());
+ public R<?> analysis() {
+ return R.ok(accountExpenseService.analysis());
}
/**
@@ -136,8 +137,8 @@
*/
@GetMapping("/report/income")
@Operation(summary = "璐㈠姟鎶ヨ〃鍥捐〃鏀跺叆骞村害鏌ヨ")
- public AjaxResult reportIncome(ReportDateDto reportDateDto) {
- return AjaxResult.success(accountIncomeService.reportIncome(reportDateDto));
+ public R<?> reportIncome(ReportDateDto reportDateDto) {
+ return R.ok(accountIncomeService.reportIncome(reportDateDto));
}
/**
@@ -147,8 +148,8 @@
*/
@GetMapping("/report/expense")
@Operation(summary = "璐㈠姟鎶ヨ〃鍥捐〃鏀嚭骞村害鏌ヨ")
- public AjaxResult reportExpense(ReportDateDto reportDateDto) {
- return AjaxResult.success(accountExpenseService.reportExpense(reportDateDto));
+ public R<?> reportExpense(ReportDateDto reportDateDto) {
+ return R.ok(accountExpenseService.reportExpense(reportDateDto));
}
diff --git a/src/main/java/com/ruoyi/account/controller/AccountFileController.java b/src/main/java/com/ruoyi/account/controller/AccountFileController.java
index 42c20d1..4427a3f 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountFileController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountFileController.java
@@ -3,9 +3,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.pojo.AccountFile;
import com.ruoyi.account.service.AccountFileService;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.quality.pojo.QualityInspectFile;
-import com.ruoyi.quality.service.IQualityInspectFileService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import org.springframework.util.CollectionUtils;
@@ -20,7 +19,7 @@
@RestController
@RequestMapping("/account/accountFile")
@Tag(name = "璐㈠姟闄勪欢")
-public class AccountFileController {
+public class AccountFileController extends BaseController {
@Resource
@@ -34,8 +33,8 @@
*/
@PostMapping("/add")
@Operation(summary = "鏂板")
- public AjaxResult add(@RequestBody AccountFile accountFile) {
- return AjaxResult.success(accountFileService.save(accountFile));
+ public R<?> add(@RequestBody AccountFile accountFile) {
+ return R.ok(accountFileService.save(accountFile));
}
/**
@@ -45,12 +44,12 @@
*/
@DeleteMapping("/del")
@Operation(summary = "鍒犻櫎")
- public AjaxResult delAccountFile(@RequestBody List<Integer> ids) {
+ public R<?> delAccountFile(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
//鍒犻櫎妫�楠岄檮浠�
- return AjaxResult.success(accountFileService.removeBatchByIds(ids));
+ return R.ok(accountFileService.removeBatchByIds(ids));
}
/**
@@ -61,8 +60,8 @@
*/
@GetMapping("/listPage")
@Operation(summary = "鍒嗛〉鏌ヨ")
- public AjaxResult accountFileListPage(Page page, AccountFile accountFile) {
- return AjaxResult.success(accountFileService.accountFileListPage(page, accountFile));
+ public R<?> accountFileListPage(Page page, AccountFile accountFile) {
+ return R.ok(accountFileService.accountFileListPage(page, accountFile));
}
diff --git a/src/main/java/com/ruoyi/account/controller/AccountIncomeController.java b/src/main/java/com/ruoyi/account/controller/AccountIncomeController.java
index 690e75a..6d31342 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountIncomeController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountIncomeController.java
@@ -1,19 +1,12 @@
package com.ruoyi.account.controller;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.pojo.AccountIncome;
-import com.ruoyi.account.service.AccountFileService;
import com.ruoyi.account.service.AccountIncomeService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.quality.pojo.QualityInspect;
-import com.ruoyi.quality.pojo.QualityInspectFile;
-import com.ruoyi.quality.pojo.QualityInspectParam;
-import com.ruoyi.quality.service.IQualityInspectFileService;
-import com.ruoyi.quality.service.IQualityInspectParamService;
-import com.ruoyi.quality.service.IQualityInspectService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import org.springframework.util.CollectionUtils;
@@ -30,7 +23,7 @@
@RestController
@RequestMapping("/account/accountIncome")
@Tag(name = "璐㈠姟绠＄悊--鏀跺叆绠＄悊")
-public class AccountIncomeController {
+public class AccountIncomeController extends BaseController {
@Resource
private AccountIncomeService accountIncomeService;
@@ -43,11 +36,11 @@
*/
@PostMapping("/add")
@Operation(summary = "鏂板")
- public AjaxResult add(@RequestBody AccountIncome accountIncome) {
+ public R<?> add(@RequestBody AccountIncome accountIncome) {
accountIncome.setInputTime(new Date());
LoginUser loginUser = SecurityUtils.getLoginUser();
accountIncome.setInputUser(loginUser.getNickName());
- return AjaxResult.success(accountIncomeService.save(accountIncome));
+ return R.ok(accountIncomeService.save(accountIncome));
}
/**
@@ -57,12 +50,12 @@
*/
@DeleteMapping("/del")
@Operation(summary = "鍒犻櫎")
- public AjaxResult delQualityInspect(@RequestBody List<Integer> ids) {
+ public R<?> delQualityInspect(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
//鍒犻櫎妫�楠屽崟
- return AjaxResult.success(accountIncomeService.removeBatchByIds(ids));
+ return R.ok(accountIncomeService.removeBatchByIds(ids));
}
/**
@@ -72,8 +65,8 @@
*/
@PostMapping("/update")
@Operation(summary = "淇敼")
- public AjaxResult update(@RequestBody AccountIncome accountIncome) {
- return AjaxResult.success(accountIncomeService.updateById(accountIncome));
+ public R<?> update(@RequestBody AccountIncome accountIncome) {
+ return R.ok(accountIncomeService.updateById(accountIncome));
}
/**
@@ -84,8 +77,8 @@
*/
@GetMapping("/listPage")
@Operation(summary = "鍒嗛〉鏌ヨ")
- public AjaxResult accountIncomeListPage(Page page, AccountIncome accountIncome) {
- return AjaxResult.success(accountIncomeService.accountIncomeListPage(page, accountIncome));
+ public R<?> accountIncomeListPage(Page page, AccountIncome accountIncome) {
+ return R.ok(accountIncomeService.accountIncomeListPage(page, accountIncome));
}
/**
@@ -95,8 +88,8 @@
*/
@GetMapping("/{id}")
@Operation(summary = "璇︽儏")
- public AjaxResult accountIncomeDetail(@PathVariable("id") Integer id) {
- return AjaxResult.success(accountIncomeService.getById(id));
+ public R<?> accountIncomeDetail(@PathVariable("id") Integer id) {
+ return R.ok(accountIncomeService.getById(id));
}
/**
diff --git a/src/main/java/com/ruoyi/account/controller/AccountingController.java b/src/main/java/com/ruoyi/account/controller/AccountingController.java
index 4688942..630694e 100644
--- a/src/main/java/com/ruoyi/account/controller/AccountingController.java
+++ b/src/main/java/com/ruoyi/account/controller/AccountingController.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.service.impl.AccountingServiceImpl;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
@@ -27,19 +27,19 @@
@Operation(summary = "鎬昏")
@GetMapping("/total")
- public AjaxResult total(@RequestParam Integer year) {
+ public R<?> total(@RequestParam Integer year) {
return accountingService.total(year);
}
@Operation(summary = "璁惧绫诲瀷鍒嗗竷")
@GetMapping("/deviceTypeDistribution")
- public AjaxResult deviceTypeDistribution(@RequestParam Integer year) {
+ public R<?> deviceTypeDistribution(@RequestParam Integer year) {
return accountingService.deviceTypeDistribution(year);
}
@Operation(summary = "璁惧鍒嗛〉鏌ヨ璁＄畻鎶樻棫")
@GetMapping("/calculateDepreciation")
- public AjaxResult calculateDepreciation(Page page, @RequestParam Integer year) {
+ public R<?> calculateDepreciation(Page page, @RequestParam Integer year) {
return accountingService.calculateDepreciation(page,year);
}
diff --git a/src/main/java/com/ruoyi/account/controller/BorrowInfoController.java b/src/main/java/com/ruoyi/account/controller/BorrowInfoController.java
index 7620c19..fd39de0 100644
--- a/src/main/java/com/ruoyi/account/controller/BorrowInfoController.java
+++ b/src/main/java/com/ruoyi/account/controller/BorrowInfoController.java
@@ -6,11 +6,11 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -29,13 +29,13 @@
@RestController
@RequestMapping("/borrowInfo")
@AllArgsConstructor
-public class BorrowInfoController {
+public class BorrowInfoController extends BaseController {
private BorrowInfoService borrowInfoService;
@GetMapping("/listPage")
@Operation(summary = "鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, BorrowInfo borrowInfo) {
+ public R<?> listPage(Page page, BorrowInfo borrowInfo) {
return borrowInfoService.listPage(page,borrowInfo);
}
@@ -45,7 +45,7 @@
@PostMapping("/add")
@Transactional(rollbackFor = Exception.class)
@Log(title = "鏂板鍊熸淇℃伅", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody BorrowInfo borrowInfo) {
+ public R<?> add(@RequestBody BorrowInfo borrowInfo) {
return borrowInfoService.add(borrowInfo);
}
@@ -55,7 +55,7 @@
@PostMapping("/update")
@Transactional(rollbackFor = Exception.class)
@Log(title = "淇敼鍊熸淇℃伅", businessType = BusinessType.UPDATE)
- public AjaxResult updateBorrowInfo(@RequestBody BorrowInfo borrowInfo) {
+ public R<?> updateBorrowInfo(@RequestBody BorrowInfo borrowInfo) {
return borrowInfoService.updateBorrowInfo(borrowInfo);
}
@@ -66,7 +66,7 @@
@DeleteMapping("/delete")
@Transactional(rollbackFor = Exception.class)
@Log(title = "鍒犻櫎鍊熸淇℃伅", businessType = BusinessType.DELETE)
- public AjaxResult delete(@RequestBody List<Long> ids) {
+ public R<?> delete(@RequestBody List<Long> ids) {
return borrowInfoService.delete(ids);
}
diff --git a/src/main/java/com/ruoyi/account/service/BorrowInfoService.java b/src/main/java/com/ruoyi/account/service/BorrowInfoService.java
index eb1c83b..7d2384f 100644
--- a/src/main/java/com/ruoyi/account/service/BorrowInfoService.java
+++ b/src/main/java/com/ruoyi/account/service/BorrowInfoService.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.pojo.BorrowInfo;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import java.util.List;
@@ -17,11 +17,11 @@
*/
public interface BorrowInfoService extends IService<BorrowInfo> {
- AjaxResult listPage(Page page, BorrowInfo borrowInfo);
+ R<?> listPage(Page page, BorrowInfo borrowInfo);
- AjaxResult add(BorrowInfo borrowInfo);
+ R<?> add(BorrowInfo borrowInfo);
- AjaxResult updateBorrowInfo(BorrowInfo borrowInfo);
+ R<?> updateBorrowInfo(BorrowInfo borrowInfo);
- AjaxResult delete(List<Long> ids);
+ R<?> delete(List<Long> ids);
}
diff --git a/src/main/java/com/ruoyi/account/service/impl/AccountingServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/AccountingServiceImpl.java
index ab38285..7df89e6 100644
--- a/src/main/java/com/ruoyi/account/service/impl/AccountingServiceImpl.java
+++ b/src/main/java/com/ruoyi/account/service/impl/AccountingServiceImpl.java
@@ -10,7 +10,7 @@
import com.ruoyi.account.pojo.BorrowInfo;
import com.ruoyi.device.mapper.DeviceLedgerMapper;
import com.ruoyi.device.pojo.DeviceLedger;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.procurementrecord.mapper.CustomStorageMapper;
import com.ruoyi.procurementrecord.mapper.ProcurementRecordMapper;
import com.ruoyi.procurementrecord.mapper.ProcurementRecordOutMapper;
@@ -43,7 +43,7 @@
private final ProcurementRecordMapper procurementRecordMapper;
private final ProcurementRecordOutMapper procurementRecordOutMapper;
- public AjaxResult total(Integer year) {
+ public R<?> total(Integer year) {
Map<String,Object> map = new HashMap<>();
map.put("deprAmount",0); // 鎶樻棫閲戦
map.put("deviceTotal",0); // 璁惧鎬绘暟
@@ -150,7 +150,7 @@
});
}
map.put("inventoryValue",procurementRecordTotal.add(customStorageTotal));
- return AjaxResult.success( map);
+ return R.ok(map);
}
/**
@@ -245,7 +245,7 @@
return totalDepreciation.setScale(2, BigDecimal.ROUND_HALF_UP);
}
- public AjaxResult deviceTypeDistribution(Integer year) {
+ public R<?> deviceTypeDistribution(Integer year) {
// 2. 缁勮杩斿洖VO
DeviceTypeDistributionVO vo = new DeviceTypeDistributionVO();
List<DeviceTypeDetail> details = deviceLedgerMapper.getDeviceTypeDistributionByYear( year);
@@ -265,10 +265,10 @@
.collect(Collectors.toList()));
vo.setTotalCount(vo.getCategories().size());
}
- return AjaxResult.success(vo);
+ return R.ok(vo);
}
- public AjaxResult calculateDepreciation(Page page, Integer year) {
+ public R<?> calculateDepreciation(Page page, Integer year) {
LambdaQueryWrapper<DeviceLedger> deviceLedgerLambdaQueryWrapper = new LambdaQueryWrapper<>();
deviceLedgerLambdaQueryWrapper.like(DeviceLedger::getCreateTime,year)
.eq(DeviceLedger::getIsDepr,1);
@@ -277,6 +277,6 @@
record.setDeprAmount(calculatePreciseDepreciation(record));
record.setNetValue(record.getTaxIncludingPriceTotal().subtract(record.getDeprAmount()));
}
- return AjaxResult.success(deviceLedgerIPage);
+ return R.ok(deviceLedgerIPage);
}
}
diff --git a/src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java b/src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java
index 773799d..950237f 100644
--- a/src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/account/service/impl/BorrowInfoServiceImpl.java
@@ -12,7 +12,7 @@
import com.ruoyi.account.service.BorrowInfoService;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -37,7 +37,7 @@
private final AccountExpenseService accountExpenseService;
@Override
- public AjaxResult listPage(Page page, BorrowInfo borrowInfo) {
+ public R<?> listPage(Page page, BorrowInfo borrowInfo) {
LambdaQueryWrapper<BorrowInfo> borrowInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
if(borrowInfo != null){
if(StringUtils.isNotEmpty(borrowInfo.getEntryDateStart()) && StringUtils.isNotEmpty(borrowInfo.getEntryDateEnd())){
@@ -51,11 +51,11 @@
borrowInfoLambdaQueryWrapper.like(BorrowInfo::getBorrowerName, borrowInfo.getBorrowerName());
}
}
- return AjaxResult.success(borrowInfoMapper.selectPage(page, borrowInfoLambdaQueryWrapper));
+ return R.ok(borrowInfoMapper.selectPage(page, borrowInfoLambdaQueryWrapper));
}
@Override
- public AjaxResult add(BorrowInfo borrowInfo) {
+ public R<?> add(BorrowInfo borrowInfo) {
int insert = borrowInfoMapper.insert(borrowInfo);
if(insert > 0){
// 娣诲姞鎴愬姛锛岃繘鍏ユ敹鍏ョ鐞�
@@ -70,13 +70,13 @@
accountIncome.setInputTime(DateUtils.getNowDate());
accountIncome.setInputUser(borrowInfo.getBorrowerName());
accountIncomeService.save(accountIncome);
- return AjaxResult.success("娣诲姞鎴愬姛");
+ return R.ok(null, "娣诲姞鎴愬姛");
}
- return AjaxResult.success("娣诲姞澶辫触");
+ return R.ok(null, "娣诲姞澶辫触");
}
@Override
- public AjaxResult updateBorrowInfo(BorrowInfo borrowInfo) {
+ public R<?> updateBorrowInfo(BorrowInfo borrowInfo) {
int update = borrowInfoMapper.updateById(borrowInfo);
if(update > 0){
// 淇敼鎴愬姛锛屼慨鏀规敹鍏ョ鐞�
@@ -103,13 +103,13 @@
accountExpense.setInputUser(borrowInfo.getBorrowerName());
accountExpenseService.save(accountExpense);
}
- return AjaxResult.success("淇敼鎴愬姛");
+ return R.ok(null, "淇敼鎴愬姛");
}
- return AjaxResult.success("淇敼澶辫触");
+ return R.ok(null, "淇敼澶辫触");
}
@Override
- public AjaxResult delete(List<Long> ids) {
+ public R<?> delete(List<Long> ids) {
int delete = borrowInfoMapper.deleteBatchIds(ids);
if(delete > 0){
// 鍒犻櫎鎴愬姛锛屽垹闄ゆ敹鍏ョ鐞�
@@ -120,8 +120,8 @@
accountExpenseService.remove(new LambdaQueryWrapper<AccountExpense>()
.in(AccountExpense::getBusinessId, ids)
.eq(AccountExpense::getBusinessType, 2));
- return AjaxResult.success("鍒犻櫎鎴愬姛");
+ return R.ok(null, "鍒犻櫎鎴愬姛");
}
- return AjaxResult.success("鍒犻櫎澶辫触");
+ return R.ok(null, "鍒犻櫎澶辫触");
}
}
diff --git a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesNearExpiryController.java b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesNearExpiryController.java
index ccc13b9..1bb2125 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesNearExpiryController.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesNearExpiryController.java
@@ -7,7 +7,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
@@ -36,9 +36,9 @@
@PostMapping("/add")
@Operation(summary = "鏂板涓存湡鍞悗")
@Log(title = "鏂板涓存湡鍞悗", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody AfterSalesNearExpiry entity) {
+ public R<?> add(@RequestBody AfterSalesNearExpiry entity) {
afterSalesNearExpiryService.add(entity);
- return AjaxResult.success("娣诲姞鎴愬姛");
+ return R.ok(null, "娣诲姞鎴愬姛");
}
/**
@@ -47,9 +47,9 @@
@PostMapping("/update")
@Operation(summary = "鏇存柊涓存湡鍞悗")
@Log(title = "鏇存柊涓存湡鍞悗", businessType = BusinessType.UPDATE)
- public AjaxResult update(@RequestBody AfterSalesNearExpiry entity) {
+ public R<?> update(@RequestBody AfterSalesNearExpiry entity) {
afterSalesNearExpiryService.update(entity);
- return AjaxResult.success("鏇存柊鎴愬姛");
+ return R.ok(null, "鏇存柊鎴愬姛");
}
/**
@@ -58,9 +58,9 @@
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎涓存湡鍞悗")
@Log(title = "鍒犻櫎涓存湡鍞悗", businessType = BusinessType.DELETE)
- public AjaxResult delete(Long[] ids) {
+ public R<?> delete(Long[] ids) {
afterSalesNearExpiryService.delete(ids);
- return AjaxResult.success("鍒犻櫎鎴愬姛");
+ return R.ok(null, "鍒犻櫎鎴愬姛");
}
/**
@@ -69,9 +69,9 @@
@GetMapping("/listPage")
@Operation(summary = "鍒嗛〉鏌ヨ涓存湡鍞悗")
@Log(title = "鍒嗛〉鏌ヨ涓存湡鍞悗", businessType = BusinessType.OTHER)
- public AjaxResult listPage(Page<AfterSalesNearExpiry> page, AfterSalesNearExpiry entity) {
+ public R<?> listPage(Page<AfterSalesNearExpiry> page, AfterSalesNearExpiry entity) {
IPage<AfterSalesNearExpiry> listPage = afterSalesNearExpiryService.listPage(page, entity);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
}
}
diff --git a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
index 5f4c3a8..0c424fb 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceController.java
@@ -10,7 +10,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.sales.dto.SalesLedgerDto;
@@ -45,9 +45,9 @@
@GetMapping("/listPage")
@Operation(summary = "鍞悗鏈嶅姟-鍒嗛〉鏌ヨ")
@Log(title = "鍞悗鏈嶅姟-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPage(Page page, AfterSalesServiceNewDto afterSalesService) {
+ public R<?> listPage(Page page, AfterSalesServiceNewDto afterSalesService) {
IPage<AfterSalesServiceNewDto> listPage = afterSalesServiceService.listPage(page, afterSalesService);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
}
@Log(title = "鍞悗鏈嶅姟-鍙嶉鐧昏", businessType = BusinessType.EXPORT)
@@ -85,14 +85,14 @@
@PostMapping("/add")
@Operation(summary = "鍞悗鏈嶅姟-鏂板")
@Log(title = "鍞悗鏈嶅姟-鏂板", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody AfterSalesServiceNewDto afterSalesServiceNewDto) {
- return afterSalesServiceService.addAfterSalesServiceDto(afterSalesServiceNewDto) ? AjaxResult.success() : AjaxResult.error();
+ public R<?> add(@RequestBody AfterSalesServiceNewDto afterSalesServiceNewDto) {
+ return afterSalesServiceService.addAfterSalesServiceDto(afterSalesServiceNewDto) ? R.ok() : R.fail();
}
@PostMapping("/update")
@Operation(summary = "鍞悗鏈嶅姟-淇敼")
@Log(title = "鍞悗鏈嶅姟-淇敼", businessType = BusinessType.UPDATE)
- public AjaxResult update(@RequestBody AfterSalesServiceNewDto afterSalesServiceNewDto) {
+ public R<?> update(@RequestBody AfterSalesServiceNewDto afterSalesServiceNewDto) {
if (afterSalesServiceNewDto.getProductModelIdList() != null && afterSalesServiceNewDto.getProductModelIdList().isEmpty() ) {
String productModelIds = afterSalesServiceNewDto.getProductModelIdList().stream()
.map(String::valueOf)
@@ -100,24 +100,24 @@
afterSalesServiceNewDto.setProductModelIds(productModelIds);
}
boolean update = afterSalesServiceService.updateById(afterSalesServiceNewDto);
- return update ? AjaxResult.success() : AjaxResult.error();
+ return update ? R.ok() : R.fail();
}
@DeleteMapping("/delete")
@Operation(summary = "鍞悗鏈嶅姟-鍒犻櫎")
@Log(title = "鍞悗鏈嶅姟-鍒犻櫎", businessType = BusinessType.DELETE)
- public AjaxResult delete(@RequestBody List<Long> ids) {
+ public R<?> delete(@RequestBody List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) {
- return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
boolean delete = afterSalesServiceService.removeByIds(ids);
- return delete ? AjaxResult.success() : AjaxResult.error();
+ return delete ? R.ok() : R.fail();
}
@PostMapping("/dispose")
@Operation(summary = "鍞悗鏈嶅姟-澶勭悊")
@Log(title = "鍞悗鏈嶅姟-澶勭悊", businessType = BusinessType.UPDATE)
- public AjaxResult dispose(@RequestBody AfterSalesService afterSalesService) {
+ public R<?> dispose(@RequestBody AfterSalesService afterSalesService) {
AfterSalesService byId = afterSalesServiceService.getById(afterSalesService.getId());
if(byId == null) throw new RuntimeException("鏈壘鍒拌鏁版嵁");
if(byId.getStatus().equals(2)) throw new RuntimeException("璇ユ暟鎹凡澶勭悊");
@@ -126,28 +126,28 @@
afterSalesService.setDisposeNickName(sysUser.getNickName());
afterSalesService.setStatus(2);
boolean update = afterSalesServiceService.updateById(afterSalesService);
- return update ? AjaxResult.success() : AjaxResult.error();
+ return update ? R.ok() : R.fail();
}
@GetMapping("listSalesLedger")
@Operation(summary = "鍞悗鏈嶅姟-鑾峰彇閿�鍞彴璐�")
- public AjaxResult listSalesLedger(SalesLedgerDto salesLedgerDto, Page page) {
+ public R<?> listSalesLedger(SalesLedgerDto salesLedgerDto, Page page) {
IPage<SalesLedgerDto> list = salesLedgerService.listSalesLedger(salesLedgerDto,page);
- return AjaxResult.success(list);
+ return R.ok(list);
}
@GetMapping("getById")
@Operation(summary = "鍞悗鏈嶅姟-鏍规嵁id鑾峰彇璇︽儏")
- public AjaxResult getById(Long id) {
- return AjaxResult.success(afterSalesServiceService.getAfterSalesServiceNewDtoById(id));
+ public R<?> getById(Long id) {
+ return R.ok(afterSalesServiceService.getAfterSalesServiceNewDtoById(id));
}
@Operation(summary = "鍞悗鏈嶅姟-缁熻宸ュ崟鎯呭喌")
@GetMapping("count")
- public AjaxResult count() {
- return AjaxResult.success(afterSalesServiceService.countAfterSalesService());
+ public R<?> count() {
+ return R.ok(afterSalesServiceService.countAfterSalesService());
}
}
diff --git a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceFileController.java b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceFileController.java
index 9032852..2290e5b 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceFileController.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/controller/AfterSalesServiceFileController.java
@@ -6,7 +6,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
@@ -34,24 +34,24 @@
@PostMapping("/upload")
@Operation(summary = "鍞悗鏈嶅姟-鏂囦欢涓婁紶")
@Log(title = "鍞悗鏈嶅姟-鏂囦欢涓婁紶", businessType = BusinessType.INSERT)
- public AjaxResult fileUpload(@RequestParam("file") MultipartFile file,
+ public R<?> fileUpload(@RequestParam("file") MultipartFile file,
@RequestParam("id") Long afterSalesServiceId) {
afterSalesServiceFileService.fileUpload(file, afterSalesServiceId);
- return AjaxResult.success("涓婁紶鎴愬姛");
+ return R.ok(null, "涓婁紶鎴愬姛");
}
@GetMapping("/listPage")
@Operation(summary = "鍞悗澶勭悊-鍞悗闄勪欢鍒楄〃")
@Log(title = "鍞悗澶勭悊-鍞悗闄勪欢鍒楄〃", businessType = BusinessType.OTHER)
- public AjaxResult fileList(Page<AfterSalesServiceFile> page, Long afterSalesServiceId) {
- return AjaxResult.success(afterSalesServiceFileService.fileList(page, afterSalesServiceId));
+ public R<?> fileList(Page<AfterSalesServiceFile> page, Long afterSalesServiceId) {
+ return R.ok(afterSalesServiceFileService.fileList(page, afterSalesServiceId));
}
@DeleteMapping("/del/{fileId}")
@Operation(summary = "鍞悗澶勭悊-鍒犻櫎闄勪欢")
@Log(title = "鍞悗澶勭悊-鍒犻櫎闄勪欢", businessType = BusinessType.DELETE)
- public AjaxResult delFile(@PathVariable Long fileId) {
+ public R<?> delFile(@PathVariable Long fileId) {
afterSalesServiceFileService.delFile(fileId);
- return AjaxResult.success("鍒犻櫎鎴愬姛!");
+ return R.ok(null, "鍒犻櫎鎴愬姛!");
}
}
diff --git a/src/main/java/com/ruoyi/ai/controller/ManufacturingAiController.java b/src/main/java/com/ruoyi/ai/controller/ManufacturingAiController.java
index cb7c0ba..8e2948e 100644
--- a/src/main/java/com/ruoyi/ai/controller/ManufacturingAiController.java
+++ b/src/main/java/com/ruoyi/ai/controller/ManufacturingAiController.java
@@ -10,7 +10,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import dev.langchain4j.data.message.AiMessage;
import dev.langchain4j.data.message.UserMessage;
import io.swagger.v3.oas.annotations.Operation;
@@ -83,20 +83,21 @@
@Operation(summary = "鍒堕�犱細璇濆垪琛�")
@GetMapping("/history/sessions")
- public AjaxResult listSessions() {
- return success(aiChatSessionService.listCurrentUserSessions(SecurityUtils.getLoginUser()));
+ public R<?> listSessions() {
+ return R.ok(aiChatSessionService.listCurrentUserSessions(SecurityUtils.getLoginUser()));
}
@Operation(summary = "鍒堕�犱細璇濇秷鎭�")
@GetMapping("/history/messages/{memoryId}")
- public AjaxResult listMessages(@PathVariable String memoryId) {
- return success(aiChatSessionService.listCurrentUserMessages(memoryId, SecurityUtils.getLoginUser()));
+ public R<?> listMessages(@PathVariable String memoryId) {
+ return R.ok(aiChatSessionService.listCurrentUserMessages(memoryId, SecurityUtils.getLoginUser()));
}
@Operation(summary = "鍒犻櫎鍒堕�犱細璇�")
@DeleteMapping("/history/{memoryId}")
- public AjaxResult deleteSession(@PathVariable String memoryId) {
+ public R<?> deleteSession(@PathVariable String memoryId) {
aiSessionUserContext.remove(memoryId);
- return toAjax(aiChatSessionService.deleteCurrentUserSession(memoryId, SecurityUtils.getLoginUser()));
+ aiChatSessionService.deleteCurrentUserSession(memoryId, SecurityUtils.getLoginUser());
+ return R.ok();
}
}
diff --git a/src/main/java/com/ruoyi/ai/controller/PurchaseAiController.java b/src/main/java/com/ruoyi/ai/controller/PurchaseAiController.java
index 158ea61..e1e605e 100644
--- a/src/main/java/com/ruoyi/ai/controller/PurchaseAiController.java
+++ b/src/main/java/com/ruoyi/ai/controller/PurchaseAiController.java
@@ -6,17 +6,10 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-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.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import reactor.core.publisher.Flux;
@@ -49,28 +42,28 @@
@Operation(summary = "閲囪喘澶氭枃浠跺垎鏋愮‘璁ゅ鐞�")
@PostMapping("/analyze-files/confirm")
- public AjaxResult confirmAnalyzeResult(@RequestBody PurchaseAiConfirmRequest request) {
+ public R confirmAnalyzeResult(@RequestBody PurchaseAiConfirmRequest request) {
return purchaseAiService.confirmAnalyzeResult(request);
}
@Operation(summary = "閲囪喘浼氳瘽鍒楄〃")
@GetMapping("/history/sessions")
- public AjaxResult listSessions() {
+ public R listSessions() {
LoginUser loginUser = SecurityUtils.getLoginUser();
- return success(purchaseAiService.listSessions(loginUser));
+ return R.ok(purchaseAiService.listSessions(loginUser));
}
@Operation(summary = "閲囪喘浼氳瘽娑堟伅")
@GetMapping("/history/messages/{memoryId}")
- public AjaxResult listMessages(@PathVariable String memoryId) {
+ public R listMessages(@PathVariable String memoryId) {
LoginUser loginUser = SecurityUtils.getLoginUser();
- return success(purchaseAiService.listMessages(memoryId, loginUser));
+ return R.ok(purchaseAiService.listMessages(memoryId, loginUser));
}
@Operation(summary = "鍒犻櫎閲囪喘浼氳瘽")
@DeleteMapping("/history/{memoryId}")
- public AjaxResult deleteSession(@PathVariable String memoryId) {
+ public R deleteSession(@PathVariable String memoryId) {
LoginUser loginUser = SecurityUtils.getLoginUser();
- return toAjax(purchaseAiService.deleteSession(memoryId, loginUser));
+ return R.ok(purchaseAiService.deleteSession(memoryId, loginUser));
}
}
diff --git a/src/main/java/com/ruoyi/ai/controller/SalesAiController.java b/src/main/java/com/ruoyi/ai/controller/SalesAiController.java
index c3a569b..b5de9d1 100644
--- a/src/main/java/com/ruoyi/ai/controller/SalesAiController.java
+++ b/src/main/java/com/ruoyi/ai/controller/SalesAiController.java
@@ -10,7 +10,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import dev.langchain4j.data.message.AiMessage;
import dev.langchain4j.data.message.UserMessage;
import io.swagger.v3.oas.annotations.Operation;
@@ -93,21 +93,22 @@
@Operation(summary = "閿�鍞姪鎵嬩細璇濆垪琛�")
@GetMapping("/history/sessions")
- public AjaxResult listSessions() {
- return success(aiChatSessionService.listCurrentUserSessions(SecurityUtils.getLoginUser()));
+ public R<?> listSessions() {
+ return R.ok(aiChatSessionService.listCurrentUserSessions(SecurityUtils.getLoginUser()));
}
@Operation(summary = "閿�鍞姪鎵嬩細璇濇秷鎭�")
@GetMapping("/history/messages/{memoryId}")
- public AjaxResult listMessages(@PathVariable String memoryId) {
- return success(aiChatSessionService.listCurrentUserMessages(memoryId, SecurityUtils.getLoginUser()));
+ public R<?> listMessages(@PathVariable String memoryId) {
+ return R.ok(aiChatSessionService.listCurrentUserMessages(memoryId, SecurityUtils.getLoginUser()));
}
@Operation(summary = "鍒犻櫎閿�鍞姪鎵嬩細璇�")
@DeleteMapping("/history/{memoryId}")
- public AjaxResult deleteSession(@PathVariable String memoryId) {
+ public R<?> deleteSession(@PathVariable String memoryId) {
aiSessionUserContext.remove(memoryId);
- return toAjax(aiChatSessionService.deleteCurrentUserSession(memoryId, SecurityUtils.getLoginUser()));
+ aiChatSessionService.deleteCurrentUserSession(memoryId, SecurityUtils.getLoginUser());
+ return R.ok();
}
private boolean isBusinessDataIntent(String message) {
diff --git a/src/main/java/com/ruoyi/ai/controller/XiaozhiController.java b/src/main/java/com/ruoyi/ai/controller/XiaozhiController.java
index affa347..668dd31 100644
--- a/src/main/java/com/ruoyi/ai/controller/XiaozhiController.java
+++ b/src/main/java/com/ruoyi/ai/controller/XiaozhiController.java
@@ -12,19 +12,12 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import dev.langchain4j.data.message.AiMessage;
import dev.langchain4j.data.message.UserMessage;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-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.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import reactor.core.publisher.Flux;
@@ -153,21 +146,21 @@
@Operation(summary = "浼氳瘽鍒楄〃")
@GetMapping("/history/sessions")
- public AjaxResult listSessions() {
- return success(aiChatSessionService.listCurrentUserSessions(SecurityUtils.getLoginUser()));
+ public R listSessions() {
+ return R.ok(aiChatSessionService.listCurrentUserSessions(SecurityUtils.getLoginUser()));
}
@Operation(summary = "浼氳瘽娑堟伅")
@GetMapping("/history/messages/{memoryId}")
- public AjaxResult listMessages(@PathVariable String memoryId) {
- return success(aiChatSessionService.listCurrentUserMessages(memoryId, SecurityUtils.getLoginUser()));
+ public R listMessages(@PathVariable String memoryId) {
+ return R.ok(aiChatSessionService.listCurrentUserMessages(memoryId, SecurityUtils.getLoginUser()));
}
@Operation(summary = "鍒犻櫎浼氳瘽")
@DeleteMapping("/history/{memoryId}")
- public AjaxResult deleteSession(@PathVariable String memoryId) {
+ public R deleteSession(@PathVariable String memoryId) {
aiSessionUserContext.remove(memoryId);
- return toAjax(aiChatSessionService.deleteCurrentUserSession(memoryId, SecurityUtils.getLoginUser()));
+ return R.ok(aiChatSessionService.deleteCurrentUserSession(memoryId, SecurityUtils.getLoginUser()));
}
private boolean isApproveTodoBusinessIntent(String message) {
diff --git a/src/main/java/com/ruoyi/ai/service/PurchaseAiService.java b/src/main/java/com/ruoyi/ai/service/PurchaseAiService.java
index 0f24d64..616aa6c 100644
--- a/src/main/java/com/ruoyi/ai/service/PurchaseAiService.java
+++ b/src/main/java/com/ruoyi/ai/service/PurchaseAiService.java
@@ -17,7 +17,7 @@
import com.ruoyi.basic.service.StorageBlobService;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.purchase.dto.PurchaseLedgerDto;
import com.ruoyi.purchase.dto.PurchaseReturnOrderDto;
import com.ruoyi.purchase.pojo.PaymentRegistration;
@@ -26,13 +26,7 @@
import com.ruoyi.purchase.service.PurchaseReturnOrdersService;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import dev.langchain4j.data.image.Image;
-import dev.langchain4j.data.message.AiMessage;
-import dev.langchain4j.data.message.ChatMessage;
-import dev.langchain4j.data.message.Content;
-import dev.langchain4j.data.message.ImageContent;
-import dev.langchain4j.data.message.SystemMessage;
-import dev.langchain4j.data.message.TextContent;
-import dev.langchain4j.data.message.UserMessage;
+import dev.langchain4j.data.message.*;
import dev.langchain4j.model.chat.StreamingChatLanguageModel;
import dev.langchain4j.model.chat.response.ChatResponse;
import dev.langchain4j.model.chat.response.StreamingChatResponseHandler;
@@ -47,22 +41,12 @@
import java.io.InputStream;
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.util.Base64;
-import java.util.Arrays;
+import java.nio.file.Files;
import java.time.LocalDate;
import java.time.ZoneId;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.UUID;
-import java.nio.file.Files;
+import java.util.*;
@Service
public class PurchaseAiService {
@@ -209,12 +193,12 @@
.doOnError(ex -> aiChatSessionService.refreshSessionStats(finalMemoryId, loginUser));
}
- public AjaxResult confirmAnalyzeResult(PurchaseAiConfirmRequest request) {
+ public R confirmAnalyzeResult(PurchaseAiConfirmRequest request) {
if (request == null || !StringUtils.hasText(request.getBusinessType())) {
- return AjaxResult.error("businessType涓嶈兘涓虹┖");
+ return R.fail("businessType涓嶈兘涓虹┖");
}
if (request.getPayload() == null || request.getPayload().isEmpty()) {
- return AjaxResult.error("payload涓嶈兘涓虹┖");
+ return R.fail("payload涓嶈兘涓虹┖");
}
try {
@@ -223,10 +207,10 @@
case "purchase_ledger" -> processPurchaseLedger(request.getPayload());
case "payment_registration" -> processPaymentRegistration(request.getPayload());
case "purchase_return_order" -> processPurchaseReturnOrder(request.getPayload());
- default -> AjaxResult.error("鏆備笉鏀寔璇ヤ笟鍔＄被鍨�: " + businessType);
+ default -> R.fail("鏆備笉鏀寔璇ヤ笟鍔＄被鍨�: " + businessType);
};
} catch (Exception ex) {
- return AjaxResult.error(toCustomerMessage(ex));
+ return R.fail(toCustomerMessage(ex));
}
}
@@ -481,7 +465,7 @@
杈撳嚭瑕佹眰:
1. 鍙緭鍑哄悎娉� JSON锛屼笉瑕� Markdown锛屼笉瑕侀澶栬В閲娿��
2. JSON 椤跺眰瀛楁鍥哄畾涓�:
- - success: boolean
+ - ok: boolean
- businessType: purchase_ledger | payment_registration | purchase_return_order | unknown
- action: confirm_required
- description: 涓枃璇存槑
@@ -517,33 +501,33 @@
""".formatted(message, fileContent);
}
- private AjaxResult processPurchaseLedger(Map<String, Object> payload) throws Exception {
+ private R processPurchaseLedger(Map<String, Object> payload) throws Exception {
if (payload.containsKey("purchaseLedgers")) {
return processPurchaseLedgerBatch(payload);
}
Map<String, Object> normalizedPayload = normalizePurchaseLedgerMap(payload);
PurchaseLedgerDto dto = objectMapper.convertValue(normalizedPayload, PurchaseLedgerDto.class);
- AjaxResult ledgerResult = validatePurchaseLedger(dto, 0);
+ R ledgerResult = validatePurchaseLedger(dto, 0);
if (ledgerResult != null) {
return ledgerResult;
}
- AjaxResult supplierResult = fillSupplierIdByName(dto);
+ R supplierResult = fillSupplierIdByName(dto);
if (supplierResult != null) {
return supplierResult;
}
- AjaxResult productResult = validatePurchaseProducts(dto.getProductData(), 0);
+ R productResult = validatePurchaseProducts(dto.getProductData(), 0);
if (productResult != null) {
return productResult;
}
int result = purchaseLedgerService.addOrEditPurchase(dto);
- return AjaxResult.success("閲囪喘鍙拌处宸插鐞�", result);
+ return R.ok( result,"閲囪喘鍙拌处宸插鐞�");
}
- private AjaxResult processPurchaseLedgerBatch(Map<String, Object> payload) throws Exception {
+ private R processPurchaseLedgerBatch(Map<String, Object> payload) throws Exception {
List<Map<String, Object>> purchaseLedgers = toMapList(payload.get("purchaseLedgers"));
if (purchaseLedgers.isEmpty()) {
- return AjaxResult.error("purchaseLedgers涓嶈兘涓虹┖");
+ return R.fail("purchaseLedgers涓嶈兘涓虹┖");
}
List<Map<String, Object>> topLevelProductData = toMapList(payload.get("productData"));
@@ -551,11 +535,11 @@
for (int i = 0; i < purchaseLedgers.size(); i++) {
Map<String, Object> ledgerMap = normalizePurchaseLedgerMap(purchaseLedgers.get(i));
PurchaseLedgerDto dto = objectMapper.convertValue(ledgerMap, PurchaseLedgerDto.class);
- AjaxResult ledgerResult = validatePurchaseLedger(dto, i);
+ R ledgerResult = validatePurchaseLedger(dto, i);
if (ledgerResult != null) {
return ledgerResult;
}
- AjaxResult supplierResult = fillSupplierIdByName(dto);
+ R supplierResult = fillSupplierIdByName(dto);
if (supplierResult != null) {
return supplierResult;
}
@@ -565,7 +549,7 @@
products = matchProductsForLedger(ledgerMap, dto, topLevelProductData, purchaseLedgers.size() == 1);
dto.setProductData(products);
}
- AjaxResult productResult = validatePurchaseProducts(products, i);
+ R productResult = validatePurchaseProducts(products, i);
if (productResult != null) {
return productResult;
}
@@ -580,7 +564,7 @@
item.put("result", result);
results.add(item);
}
- return AjaxResult.success("閲囪喘鍙拌处宸叉壒閲忓鐞�", results);
+ return R.ok( results,"閲囪喘鍙拌处宸叉壒閲忓鐞�");
}
private List<SalesLedgerProduct> matchProductsForLedger(Map<String, Object> ledgerMap,
@@ -786,7 +770,7 @@
}
}
- private AjaxResult validatePurchaseProducts(List<SalesLedgerProduct> products, int ledgerIndex) {
+ private R validatePurchaseProducts(List<SalesLedgerProduct> products, int ledgerIndex) {
if (products == null || products.isEmpty()) {
return null;
}
@@ -794,34 +778,34 @@
SalesLedgerProduct product = products.get(i);
String prefix = "绗�" + (ledgerIndex + 1) + "涓噰璐彴璐︾殑绗�" + (i + 1) + "鏉′骇鍝�";
if (!StringUtils.hasText(product.getProductCategory())) {
- return AjaxResult.error(prefix + "缂哄皯浜у搧鍚嶇О锛岃琛ュ厖鍚庡啀纭");
+ return R.fail(prefix + "缂哄皯浜у搧鍚嶇О锛岃琛ュ厖鍚庡啀纭");
}
if (!StringUtils.hasText(product.getSpecificationModel())) {
- return AjaxResult.error(prefix + "缂哄皯瑙勬牸鍨嬪彿锛岃琛ュ厖鍚庡啀纭");
+ return R.fail(prefix + "缂哄皯瑙勬牸鍨嬪彿锛岃琛ュ厖鍚庡啀纭");
}
if (!StringUtils.hasText(product.getUnit())) {
- return AjaxResult.error(prefix + "缂哄皯鍗曚綅锛岃琛ュ厖鍚庡啀纭");
+ return R.fail(prefix + "缂哄皯鍗曚綅锛岃琛ュ厖鍚庡啀纭");
}
if (product.getQuantity() == null) {
- return AjaxResult.error(prefix + "缂哄皯鏁伴噺");
+ return R.fail(prefix + "缂哄皯鏁伴噺");
}
if (product.getTaxInclusiveUnitPrice() == null) {
- return AjaxResult.error(prefix + "缂哄皯鍚◣鍗曚环锛岃琛ュ厖鍚庡啀纭");
+ return R.fail(prefix + "缂哄皯鍚◣鍗曚环锛岃琛ュ厖鍚庡啀纭");
}
if (product.getTaxInclusiveTotalPrice() == null) {
- return AjaxResult.error(prefix + "缂哄皯鍚◣鎬讳环锛岃琛ュ厖鍚庡啀纭");
+ return R.fail(prefix + "缂哄皯鍚◣鎬讳环锛岃琛ュ厖鍚庡啀纭");
}
}
return null;
}
- private AjaxResult validatePurchaseLedger(PurchaseLedgerDto dto, int ledgerIndex) {
+ private R validatePurchaseLedger(PurchaseLedgerDto dto, int ledgerIndex) {
String prefix = "绗�" + (ledgerIndex + 1) + "涓噰璐彴璐�";
if (!StringUtils.hasText(dto.getPurchaseContractNumber())) {
- return AjaxResult.error(prefix + "缂哄皯閲囪喘鍚堝悓鍙凤紝璇疯ˉ鍏呭悗鍐嶇‘璁�");
+ return R.fail(prefix + "缂哄皯閲囪喘鍚堝悓鍙凤紝璇疯ˉ鍏呭悗鍐嶇‘璁�");
}
if (dto.getSupplierId() == null && !StringUtils.hasText(dto.getSupplierName())) {
- return AjaxResult.error(prefix + "缂哄皯渚涘簲鍟嗗悕绉帮紝璇疯ˉ鍏呭悗鍐嶇‘璁�");
+ return R.fail(prefix + "缂哄皯渚涘簲鍟嗗悕绉帮紝璇疯ˉ鍏呭悗鍐嶇‘璁�");
}
return null;
}
@@ -992,25 +976,25 @@
return "澶勭悊澶辫触锛�" + message;
}
- private AjaxResult fillSupplierIdByName(PurchaseLedgerDto dto) {
+ private R fillSupplierIdByName(PurchaseLedgerDto dto) {
if (dto.getSupplierId() != null) {
return null;
}
if (!StringUtils.hasText(dto.getSupplierName())) {
- return AjaxResult.error("渚涘簲鍟咺D涓嶈兘涓虹┖锛涙湭璇嗗埆鍒颁緵搴斿晢鍚嶇О锛屾棤娉曡嚜鍔ㄥ尮閰嶄緵搴斿晢ID");
+ return R.fail("渚涘簲鍟咺D涓嶈兘涓虹┖锛涙湭璇嗗埆鍒颁緵搴斿晢鍚嶇О锛屾棤娉曡嚜鍔ㄥ尮閰嶄緵搴斿晢ID");
}
SupplierManage supplier = supplierManageMapper.selectOne(new LambdaQueryWrapper<SupplierManage>()
.eq(SupplierManage::getSupplierName, dto.getSupplierName().trim())
.last("limit 1"));
if (supplier == null) {
- return AjaxResult.error("鏈壘鍒颁緵搴斿晢锛�" + dto.getSupplierName() + "锛岃鍏堢淮鎶や緵搴斿晢鎴栨墜鍔ㄩ�夋嫨渚涘簲鍟咺D");
+ return R.fail("鏈壘鍒颁緵搴斿晢锛�" + dto.getSupplierName() + "锛岃鍏堢淮鎶や緵搴斿晢鎴栨墜鍔ㄩ�夋嫨渚涘簲鍟咺D");
}
dto.setSupplierId(supplier.getId());
return null;
}
- private AjaxResult processPaymentRegistration(Map<String, Object> payload) {
+ private R processPaymentRegistration(Map<String, Object> payload) {
Object recordsValue = payload.get("records");
List<PaymentRegistration> records;
if (recordsValue == null) {
@@ -1020,12 +1004,12 @@
});
}
int result = paymentRegistrationService.insertPaymentRegistration(records);
- return AjaxResult.success("浠樻鐧昏宸插鐞�", result);
+ return R.ok( result,"浠樻鐧昏宸插鐞�");
}
- private AjaxResult processPurchaseReturnOrder(Map<String, Object> payload) {
+ private R processPurchaseReturnOrder(Map<String, Object> payload) {
PurchaseReturnOrderDto dto = objectMapper.convertValue(payload, PurchaseReturnOrderDto.class);
Boolean result = purchaseReturnOrdersService.add(dto);
- return AjaxResult.success("閲囪喘閫�璐у崟宸插鐞�", result);
+ return R.ok( result,"閲囪喘閫�璐у崟宸插鐞�");
}
}
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java b/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
index d0af196..cdd5e0a 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveNodeController.java
@@ -2,7 +2,8 @@
import com.ruoyi.approve.pojo.ApproveNode;
import com.ruoyi.approve.service.IApproveNodeService;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
@@ -15,7 +16,7 @@
@RestController
@RequestMapping("/approveNode")
@AllArgsConstructor
-public class ApproveNodeController {
+public class ApproveNodeController extends BaseController {
private IApproveNodeService approveNodeService;
@@ -26,8 +27,8 @@
*/
@GetMapping("/details/{id}")
@Operation(summary = "娴佺▼鐘舵�佽鎯�")
- public AjaxResult details(@PathVariable String id) {
- return AjaxResult.success(approveNodeService.details(id));
+ public R<?> details(@PathVariable String id) {
+ return R.ok(approveNodeService.details(id));
}
/**
@@ -38,9 +39,9 @@
@PostMapping("/updateApproveNode")
@Transactional(rollbackFor = Exception.class)
@Operation(summary = "瀹℃壒鑺傜偣")
- public AjaxResult updateApproveNode(@RequestBody ApproveNode approveNode) throws IOException {
+ public R<?> updateApproveNode(@RequestBody ApproveNode approveNode) throws IOException {
approveNodeService.updateApproveNode(approveNode);
- return AjaxResult.success();
+ return R.ok();
}
/**
@@ -49,9 +50,9 @@
* @return
*/
@PostMapping("/init")
- public AjaxResult init(String id) {
+ public R<?> init(String id) {
approveNodeService.initApproveNodes("",id,1L);
- return AjaxResult.success();
+ return R.ok();
}
}
diff --git a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
index ed02564..5c2c09c 100644
--- a/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
+++ b/src/main/java/com/ruoyi/approve/controller/ApproveProcessController.java
@@ -9,7 +9,9 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.project.system.domain.SysDept;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
@@ -25,7 +27,7 @@
@RequestMapping("/approveProcess")
@AllArgsConstructor
@Tag(name = "瀹℃壒")
-public class ApproveProcessController {
+public class ApproveProcessController extends BaseController {
private IApproveProcessService approveProcessService;
/**銆�
@@ -33,13 +35,13 @@
* @return
*/
@GetMapping("/getDept")
- public AjaxResult getDept() {
+ public R<?> getDept() {
Long userId = SecurityUtils.getUserId();
LoginUser user = SecurityUtils.getLoginUser();
Long[] deptIds = SecurityUtils.getDeptId();
List<SysDept> sysDeptList = approveProcessService.selectDeptListByDeptIds(deptIds);
- return AjaxResult.success(sysDeptList);
+ return R.ok(sysDeptList);
}
/**
@@ -50,13 +52,13 @@
@PostMapping("/add")
@Transactional(rollbackFor = Exception.class)
@Operation(summary = "娣诲姞瀹℃壒")
- public AjaxResult add(@RequestBody ApproveProcessVO approveProcessVO) throws Exception {
+ public R<?> add(@RequestBody ApproveProcessVO approveProcessVO) throws Exception {
if (approveProcessVO == null) {
- return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
+ return R.fail(HttpStatus.WARN,"鍙傛暟涓嶈兘涓虹┖");
}
approveProcessService.addApprove(approveProcessVO);
- return AjaxResult.success("娣诲姞鎴愬姛");
+ return R.ok(null, "娣诲姞鎴愬姛");
}
/**
@@ -66,11 +68,11 @@
*/
@GetMapping("/get")
@Operation(summary = "瀹℃壒璇︽儏")
- public AjaxResult get(ApproveGetAndUpdateVo approveGetAndUpdateVo){
+ public R<?> get(ApproveGetAndUpdateVo approveGetAndUpdateVo){
if (approveGetAndUpdateVo.getId() == null || approveGetAndUpdateVo.getId().isEmpty()) {
- return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
+ return R.fail(HttpStatus.WARN,"鍙傛暟涓嶈兘涓虹┖");
}
- return AjaxResult.success(approveProcessService.getApproveById(approveGetAndUpdateVo.getId()));
+ return R.ok(approveProcessService.getApproveById(approveGetAndUpdateVo.getId()));
}
/**
@@ -81,12 +83,12 @@
@PostMapping("/update")
@Transactional(rollbackFor = Exception.class)
@Operation(summary = "鏇存柊瀹℃壒")
- public AjaxResult update(@RequestBody ApproveGetAndUpdateVo approveGetAndUpdateVo) throws IOException {
+ public R<?> update(@RequestBody ApproveGetAndUpdateVo approveGetAndUpdateVo) throws IOException {
if (approveGetAndUpdateVo == null) {
- return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
+ return R.fail(HttpStatus.WARN,"鍙傛暟涓嶈兘涓虹┖");
}
approveProcessService.updateByApproveId(approveGetAndUpdateVo);
- return AjaxResult.success("鎿嶄綔鎴愬姛");
+ return R.ok(null, "鎿嶄綔鎴愬姛");
}
/**
* 鑾峰彇瀹℃壒鍒楄〃
@@ -94,8 +96,8 @@
*/
@GetMapping("/list")
@Operation(summary = "鑾峰彇瀹℃壒鍒楄〃")
- public AjaxResult list(Page page, ApproveProcess approveProcess) {
- return AjaxResult.success(approveProcessService.listAll(page, approveProcess));
+ public R<?> list(Page page, ApproveProcess approveProcess) {
+ return R.ok(approveProcessService.listAll(page, approveProcess));
}
/**
@@ -106,12 +108,12 @@
@DeleteMapping("/deleteIds")
@Operation(summary = "鍒犻櫎瀹℃壒")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult deleteIds(@RequestBody List<Long> ids) {
+ public R<?> deleteIds(@RequestBody List<Long> ids) {
if (ids == null || ids.size() == 0) {
- return AjaxResult.warn("鍙傛暟涓嶈兘涓虹┖");
+ return R.fail(HttpStatus.WARN,"鍙傛暟涓嶈兘涓虹┖");
}
approveProcessService.delApprove(ids);
- return AjaxResult.success("鎿嶄綔鎴愬姛");
+ return R.ok(null, "鎿嶄綔鎴愬姛");
}
@Operation(summary = "鍏嚭绠＄悊瀵煎嚭")
diff --git a/src/main/java/com/ruoyi/approve/controller/HolidaySettingsController.java b/src/main/java/com/ruoyi/approve/controller/HolidaySettingsController.java
index 97abe9f..dfe6a7d 100644
--- a/src/main/java/com/ruoyi/approve/controller/HolidaySettingsController.java
+++ b/src/main/java/com/ruoyi/approve/controller/HolidaySettingsController.java
@@ -7,7 +7,8 @@
import com.ruoyi.approve.mapper.WorkingHoursSettingMapper;
import com.ruoyi.approve.pojo.*;
import com.ruoyi.approve.service.HolidaySettingsService;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -17,7 +18,7 @@
@RestController
@RequestMapping("/holidaySettings")
@AllArgsConstructor
-public class HolidaySettingsController {
+public class HolidaySettingsController extends BaseController {
private HolidaySettingsService holidaySettingsService;
private AnnualLeaveSettingMapper annualLeaveSettingMapper;
private OvertimeSettingMapper overtimeSettingMapper;
@@ -28,70 +29,70 @@
* @return
*/
@GetMapping("/getList")
- public AjaxResult getList(@RequestParam(defaultValue = "1") long current,
+ public R<?> getList(@RequestParam(defaultValue = "1") long current,
@RequestParam(defaultValue = "50") long size, HolidaySettings holidaySettings) {
Page page = new Page(current, size);
- return AjaxResult.success(holidaySettingsService.listpage(page,holidaySettings));
+ return R.ok(holidaySettingsService.listpage(page,holidaySettings));
}
/**銆�
* 澧炴坊
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody HolidaySettings holidaySettings){
- return AjaxResult.success(holidaySettingsService.save(holidaySettings));
+ public R<?> add(@RequestBody HolidaySettings holidaySettings){
+ return R.ok(holidaySettingsService.save(holidaySettings));
}
/**
* 鏇存柊
* @return
*/
@PostMapping("/update")
- public AjaxResult update(@RequestBody HolidaySettings holidaySettings){
- return AjaxResult.success(holidaySettingsService.updateById(holidaySettings));
+ public R<?> update(@RequestBody HolidaySettings holidaySettings){
+ return R.ok(holidaySettingsService.updateById(holidaySettings));
}
/**
* 鍒犻櫎
* @return
*/
@DeleteMapping("/delete")
- public AjaxResult delete(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return AjaxResult.success(holidaySettingsService.removeByIds(ids));
+ public R<?> delete(@RequestBody List<Long> ids){
+ if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.ok(holidaySettingsService.removeByIds(ids));
}
/**銆�
* 鑾峰彇骞村亣瑙勫垯鍒楄〃
* @return
*/
@GetMapping("/getAnnualLeaveSettingList")
- public AjaxResult getAnnualLeaveSettingList(@RequestParam(defaultValue = "1") long current,
+ public R<?> getAnnualLeaveSettingList(@RequestParam(defaultValue = "1") long current,
@RequestParam(defaultValue = "50") long size, AnnualLeaveSetting annualLeaveSetting) {
Page page = new Page(current, size);
- return AjaxResult.success(annualLeaveSettingMapper.listPage(page,annualLeaveSetting));
+ return R.ok(annualLeaveSettingMapper.listPage(page,annualLeaveSetting));
}
/**銆�
* 澧炴坊骞村亣瑙勫垯
* @return
*/
@PostMapping("/addAnnualLeaveSetting")
- public AjaxResult addAnnualLeaveSetting(@RequestBody AnnualLeaveSetting annualLeaveSetting){
- return AjaxResult.success(annualLeaveSettingMapper.insert(annualLeaveSetting));
+ public R<?> addAnnualLeaveSetting(@RequestBody AnnualLeaveSetting annualLeaveSetting){
+ return R.ok(annualLeaveSettingMapper.insert(annualLeaveSetting));
}
/**銆�
* 鏇存柊骞村亣瑙勫垯
* @return
*/
@PostMapping("/updateAnnualLeaveSetting")
- public AjaxResult updateAnnualLeaveSetting(@RequestBody AnnualLeaveSetting annualLeaveSetting){
- return AjaxResult.success(annualLeaveSettingMapper.updateById(annualLeaveSetting));
+ public R<?> updateAnnualLeaveSetting(@RequestBody AnnualLeaveSetting annualLeaveSetting){
+ return R.ok(annualLeaveSettingMapper.updateById(annualLeaveSetting));
}
/**銆�
* 鍒犻櫎骞村亣瑙勫垯
* @return
*/
@DeleteMapping("/deleteAnnualLeaveSetting")
- public AjaxResult deleteAnnualLeaveSetting(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return AjaxResult.success(annualLeaveSettingMapper.deleteBatchIds(ids));
+ public R<?> deleteAnnualLeaveSetting(@RequestBody List<Long> ids){
+ if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.ok(annualLeaveSettingMapper.deleteBatchIds(ids));
}
/**銆�
@@ -99,70 +100,70 @@
* @return
*/
@GetMapping("/getOvertimeSettingList")
- public AjaxResult getOvertimeSettingList(@RequestParam(defaultValue = "1") long current,
+ public R<?> getOvertimeSettingList(@RequestParam(defaultValue = "1") long current,
@RequestParam(defaultValue = "50") long size, OvertimeSetting overtimeSetting) {
Page page = new Page(current, size);
- return AjaxResult.success(overtimeSettingMapper.listPage(page,overtimeSetting));
+ return R.ok(overtimeSettingMapper.listPage(page,overtimeSetting));
}
/**銆�
* 澧炴坊鍔犵彮瑙勫垯
* @return
*/
@PostMapping("/addOvertimeSetting")
- public AjaxResult addOvertimeSetting(@RequestBody OvertimeSetting overtimeSetting){
- return AjaxResult.success(overtimeSettingMapper.insert(overtimeSetting));
+ public R<?> addOvertimeSetting(@RequestBody OvertimeSetting overtimeSetting){
+ return R.ok(overtimeSettingMapper.insert(overtimeSetting));
}
/**銆�
* 鏇存柊鍔犵彮瑙勫垯
* @return
*/
@PostMapping("/updateOvertimeSetting")
- public AjaxResult updateOvertimeSetting(@RequestBody OvertimeSetting overtimeSetting){
- return AjaxResult.success(overtimeSettingMapper.updateById(overtimeSetting));
+ public R<?> updateOvertimeSetting(@RequestBody OvertimeSetting overtimeSetting){
+ return R.ok(overtimeSettingMapper.updateById(overtimeSetting));
}
/**銆�
* 鍒犻櫎鍔犵彮瑙勫垯
* @return
*/
@DeleteMapping("/deleteOvertimeSetting")
- public AjaxResult deleteOvertimeSetting(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return AjaxResult.success(overtimeSettingMapper.deleteBatchIds(ids));
+ public R<?> deleteOvertimeSetting(@RequestBody List<Long> ids){
+ if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.ok(overtimeSettingMapper.deleteBatchIds(ids));
}
/**銆�
* 鑾峰彇涓婄彮鏃堕棿璁剧疆-鐝埗瑙勫垯鍒楄〃
* @return
*/
@GetMapping("/getWorkingHoursSettingList")
- public AjaxResult getWorkingHoursSettingList(@RequestParam(defaultValue = "1") long current,
+ public R<?> getWorkingHoursSettingList(@RequestParam(defaultValue = "1") long current,
@RequestParam(defaultValue = "50") long size, WorkingHoursSetting workingHoursSetting) {
Page page = new Page(current, size);
- return AjaxResult.success(workingHoursSettingMapper.listPage(page,workingHoursSetting));
+ return R.ok(workingHoursSettingMapper.listPage(page,workingHoursSetting));
}
/**銆�
* 澧炴坊鐝埗瑙勫垯
* @return
*/
@PostMapping("/addWorkingHoursSetting")
- public AjaxResult addWorkingHoursSetting(@RequestBody WorkingHoursSetting workingHoursSetting){
- return AjaxResult.success(workingHoursSettingMapper.insert(workingHoursSetting));
+ public R<?> addWorkingHoursSetting(@RequestBody WorkingHoursSetting workingHoursSetting){
+ return R.ok(workingHoursSettingMapper.insert(workingHoursSetting));
}
/**銆�
* 鏇存柊鐝埗瑙勫垯
* @return
*/
@PostMapping("/updateWorkingHoursSetting")
- public AjaxResult updateWorkingHoursSetting(@RequestBody WorkingHoursSetting workingHoursSetting){
- return AjaxResult.success(workingHoursSettingMapper.updateById(workingHoursSetting));
+ public R<?> updateWorkingHoursSetting(@RequestBody WorkingHoursSetting workingHoursSetting){
+ return R.ok(workingHoursSettingMapper.updateById(workingHoursSetting));
}
/**銆�
* 鍒犻櫎鐝埗瑙勫垯
* @return
*/
@DeleteMapping("/deleteWorkingHoursSetting")
- public AjaxResult deleteWorkingHoursSetting(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return AjaxResult.success(workingHoursSettingMapper.deleteBatchIds(ids));
+ public R<?> deleteWorkingHoursSetting(@RequestBody List<Long> ids){
+ if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.ok(workingHoursSettingMapper.deleteBatchIds(ids));
}
diff --git a/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java b/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java
index 3ebb782..dd12369 100644
--- a/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java
+++ b/src/main/java/com/ruoyi/approve/controller/KnowledgeBaseController.java
@@ -5,7 +5,8 @@
import com.ruoyi.approve.pojo.KnowledgeBase;
import com.ruoyi.approve.service.KnowledgeBaseService;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
@@ -18,7 +19,7 @@
@RequestMapping("/knowledgeBase")
@AllArgsConstructor
@Tag(name = "鐭ヨ瘑搴撶鐞�")
-public class KnowledgeBaseController {
+public class KnowledgeBaseController extends BaseController {
private KnowledgeBaseService knowledgeBaseService;
/**銆�
@@ -26,35 +27,35 @@
* @return
*/
@GetMapping("/getList")
- public AjaxResult getList(@RequestParam(defaultValue = "1") long current,
+ public R<?> getList(@RequestParam(defaultValue = "1") long current,
@RequestParam(defaultValue = "10") long size, KnowledgeBase knowledgeBase) {
Page page = new Page(current, size);
- return AjaxResult.success(knowledgeBaseService.listpage(page,knowledgeBase));
+ return R.ok(knowledgeBaseService.listpage(page,knowledgeBase));
}
/**銆�
* 澧炴坊
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody KnowledgeBase knowledgeBase){
- return AjaxResult.success(knowledgeBaseService.save(knowledgeBase));
+ public R<?> add(@RequestBody KnowledgeBase knowledgeBase){
+ return R.ok(knowledgeBaseService.save(knowledgeBase));
}
/**
* 鏇存柊
* @return
*/
@PostMapping("/update")
- public AjaxResult update(@RequestBody KnowledgeBase knowledgeBase){
- return AjaxResult.success(knowledgeBaseService.updateById(knowledgeBase));
+ public R<?> update(@RequestBody KnowledgeBase knowledgeBase){
+ return R.ok(knowledgeBaseService.updateById(knowledgeBase));
}
/**
* 鍒犻櫎
* @return
*/
@DeleteMapping("/delete")
- public AjaxResult delete(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return AjaxResult.success(knowledgeBaseService.removeByIds(ids));
+ public R<?> delete(@RequestBody List<Long> ids){
+ if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.ok(knowledgeBaseService.removeByIds(ids));
}
@Operation(summary = "鐭ヨ瘑搴撶鐞嗗鍑�")
diff --git a/src/main/java/com/ruoyi/approve/controller/NotificationManagementController.java b/src/main/java/com/ruoyi/approve/controller/NotificationManagementController.java
index a1796f8..2749dcf 100644
--- a/src/main/java/com/ruoyi/approve/controller/NotificationManagementController.java
+++ b/src/main/java/com/ruoyi/approve/controller/NotificationManagementController.java
@@ -8,7 +8,8 @@
import com.ruoyi.approve.pojo.NotificationManagement;
import com.ruoyi.approve.pojo.OnlineMeeting;
import com.ruoyi.approve.service.NotificationManagementService;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -18,7 +19,7 @@
@RestController
@RequestMapping("/notificationManagement")
@AllArgsConstructor
-public class NotificationManagementController {
+public class NotificationManagementController extends BaseController {
private NotificationManagementService notificationManagementService ;
private OnlineMeetingMapper onlineMeetingMapper;
private FileSharingMapper fileSharingMapper;
@@ -27,35 +28,35 @@
* @return
*/
@GetMapping("/getList")
- public AjaxResult getList(@RequestParam(defaultValue = "1") long current,
+ public R<?> getList(@RequestParam(defaultValue = "1") long current,
@RequestParam(defaultValue = "50") long size, NotificationManagement notificationManagement) {
Page page = new Page(current, size);
- return AjaxResult.success(notificationManagementService.listpage(page,notificationManagement));
+ return R.ok(notificationManagementService.listpage(page,notificationManagement));
}
/**銆�
* 澧炴坊
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody NotificationManagement notificationManagement){
- return AjaxResult.success(notificationManagementService.save(notificationManagement));
+ public R<?> add(@RequestBody NotificationManagement notificationManagement){
+ return R.ok(notificationManagementService.save(notificationManagement));
}
/**
* 鏇存柊
* @return
*/
@PostMapping("/update")
- public AjaxResult update(@RequestBody NotificationManagement notificationManagement){
- return AjaxResult.success(notificationManagementService.updateById(notificationManagement));
+ public R<?> update(@RequestBody NotificationManagement notificationManagement){
+ return R.ok(notificationManagementService.updateById(notificationManagement));
}
/**
* 鍒犻櫎
* @return
*/
@DeleteMapping("/delete")
- public AjaxResult delete(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return AjaxResult.success(notificationManagementService.removeByIds(ids));
+ public R<?> delete(@RequestBody List<Long> ids){
+ if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.ok(notificationManagementService.removeByIds(ids));
}
/**
*鏂板浼氳
@@ -63,16 +64,16 @@
* @return
*/
@PostMapping("/addOnlineMeeting")
- public AjaxResult addOnlineMeeting(@RequestBody OnlineMeeting onlineMeeting){
- return AjaxResult.success(onlineMeetingMapper.insert(onlineMeeting));
+ public R<?> addOnlineMeeting(@RequestBody OnlineMeeting onlineMeeting){
+ return R.ok(onlineMeetingMapper.insert(onlineMeeting));
}
/**
*鏂板鏂囦欢鍏变韩
*
*/
@PostMapping("/addFileSharing")
- public AjaxResult addFileSharing(@RequestBody FileSharing fileSharing){
- return AjaxResult.success(fileSharingMapper.insert(fileSharing));
+ public R<?> addFileSharing(@RequestBody FileSharing fileSharing){
+ return R.ok(fileSharingMapper.insert(fileSharing));
}
}
diff --git a/src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java b/src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java
index 06a0f6d..1e26526 100644
--- a/src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java
+++ b/src/main/java/com/ruoyi/approve/controller/RpaProcessAutomationController.java
@@ -5,7 +5,8 @@
import com.ruoyi.approve.pojo.RpaProcessAutomation;
import com.ruoyi.approve.service.RpaProcessAutomationService;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
@@ -18,42 +19,42 @@
@RequestMapping("/rpaProcessAutomation")
@AllArgsConstructor
@Tag(name = "RPA娴佺▼鑷姩鍖�")
-public class RpaProcessAutomationController {
+public class RpaProcessAutomationController extends BaseController {
private RpaProcessAutomationService rpaProcessAutomationService;
/**銆�
* 鑾峰彇鍒楄〃
* @return
*/
@GetMapping("/getList")
- public AjaxResult getList(@RequestParam(defaultValue = "1") long current,
+ public R<?> getList(@RequestParam(defaultValue = "1") long current,
@RequestParam(defaultValue = "100") long size, RpaProcessAutomation rpaProcessAutomation) {
Page page = new Page(current, size);
- return AjaxResult.success(rpaProcessAutomationService.listpage(page,rpaProcessAutomation));
+ return R.ok(rpaProcessAutomationService.listpage(page,rpaProcessAutomation));
}
/**銆�
* 澧炴坊
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody RpaProcessAutomation rpaProcessAutomation){
- return AjaxResult.success(rpaProcessAutomationService.save(rpaProcessAutomation));
+ public R<?> add(@RequestBody RpaProcessAutomation rpaProcessAutomation){
+ return R.ok(rpaProcessAutomationService.save(rpaProcessAutomation));
}
/**
* 鏇存柊
* @return
*/
@PostMapping("/update")
- public AjaxResult update(@RequestBody RpaProcessAutomation rpaProcessAutomation){
- return AjaxResult.success(rpaProcessAutomationService.updateById(rpaProcessAutomation));
+ public R<?> update(@RequestBody RpaProcessAutomation rpaProcessAutomation){
+ return R.ok(rpaProcessAutomationService.updateById(rpaProcessAutomation));
}
/**
* 鍒犻櫎
* @return
*/
@DeleteMapping("/delete")
- public AjaxResult delete(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return AjaxResult.success(rpaProcessAutomationService.removeByIds(ids));
+ public R<?> delete(@RequestBody List<Long> ids){
+ if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.ok(rpaProcessAutomationService.removeByIds(ids));
}
@Operation(summary = "RPA娴佺▼鑷姩鍖栧鍑�")
diff --git a/src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java b/src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java
index a5dcc83..bc829fd 100644
--- a/src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java
+++ b/src/main/java/com/ruoyi/basic/controller/CustomerFollowUpController.java
@@ -11,7 +11,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -55,8 +55,8 @@
*/
@Operation(summary = "鑾峰彇瀹㈡埛璺熻繘璇︾粏淇℃伅")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Integer id) {
- return AjaxResult.success(customerFollowUpService.getFollowUpWithFiles(id));
+ public R getInfo(@PathVariable("id") Integer id) {
+ return R.ok(customerFollowUpService.getFollowUpWithFiles(id));
}
/**
@@ -65,8 +65,8 @@
@PostMapping("/add")
@Operation(summary = "鏂板瀹㈡埛璺熻繘")
@Log(title = "瀹㈡埛璺熻繘-鏂板", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody CustomerFollowUp customerFollowUp) {
- return toAjax(customerFollowUpService.insertCustomerFollowUp(customerFollowUp));
+ public R<?> add(@RequestBody CustomerFollowUp customerFollowUp) {
+ return R.ok();
}
/**
@@ -75,8 +75,8 @@
@PutMapping("/edit")
@Operation(summary = "淇敼瀹㈡埛璺熻繘")
@Log(title = "瀹㈡埛璺熻繘-淇敼", businessType = BusinessType.UPDATE)
- public AjaxResult edit(@RequestBody CustomerFollowUp customerFollowUp) {
- return toAjax(customerFollowUpService.updateCustomerFollowUp(customerFollowUp));
+ public R<?> edit(@RequestBody CustomerFollowUp customerFollowUp) {
+ return R.ok();
}
/**
@@ -85,8 +85,8 @@
@Operation(summary = "涓婁紶璺熻繘闄勪欢")
@PostMapping("/upload/{followUpId}")
@Log(title = "瀹㈡埛璺熻繘-涓婁紶闄勪欢", businessType = BusinessType.INSERT)
- public AjaxResult uploadFiles(@RequestParam("files") List<MultipartFile> files, @PathVariable Integer followUpId) {
- return AjaxResult.success(customerFollowUpService.addFollowUpFiles(files, followUpId));
+ public R uploadFiles(@RequestParam("files") List<MultipartFile> files, @PathVariable Integer followUpId) {
+ return R.ok(customerFollowUpService.addFollowUpFiles(files, followUpId));
}
/**
@@ -95,9 +95,9 @@
@Operation(summary = "涓婁紶闄勪欢(澶嶇敤)")
@PostMapping("/upload")
@Log(title = "涓婁紶闄勪欢(澶嶇敤)", businessType = BusinessType.INSERT)
- public AjaxResult uploadFiles(@RequestParam("files") List<MultipartFile> files, @RequestParam(required = false) String name) {
+ public R uploadFiles(@RequestParam("files") List<MultipartFile> files, @RequestParam(required = false) String name) {
List<CustomerFollowUpFileDto> uploadedFiles = customerFollowUpService.addFollowUpFiles(files, null);
- return AjaxResult.success(uploadedFiles);
+ return R.ok(uploadedFiles);
}
/**
@@ -105,8 +105,8 @@
*/
@Operation(summary = "鎵归噺鏌ヨ闄勪欢鍒楄〃")
@PostMapping("/file/list")
- public AjaxResult getFileList(@RequestBody List<Long> ids) {
- return AjaxResult.success(customerFollowUpService.getFollowUpFilesByIds(ids));
+ public R getFileList(@RequestBody List<Long> ids) {
+ return R.ok(customerFollowUpService.getFollowUpFilesByIds(ids));
}
/**
@@ -115,9 +115,9 @@
@Operation(summary = "鍒犻櫎璺熻繘闄勪欢")
@DeleteMapping("/file/{fileId}")
@Log(title = "瀹㈡埛璺熻繘-鍒犻櫎闄勪欢", businessType = BusinessType.DELETE)
- public AjaxResult deleteFile(@PathVariable Integer fileId) {
+ public R deleteFile(@PathVariable Integer fileId) {
customerFollowUpService.deleteFollowUpFile(fileId);
- return AjaxResult.success();
+ return R.ok();
}
/**
@@ -126,8 +126,8 @@
@Operation(summary = "鍒犻櫎瀹㈡埛璺熻繘")
@DeleteMapping("/{id}")
@Log(title = "瀹㈡埛璺熻繘-鍒犻櫎", businessType = BusinessType.DELETE)
- public AjaxResult remove(@PathVariable Integer id) {
- return toAjax(customerFollowUpService.deleteCustomerFollowUpById(id));
+ public R remove(@PathVariable Integer id) {
+ return R.ok(customerFollowUpService.deleteCustomerFollowUpById(id));
}
/**
@@ -136,8 +136,8 @@
@Operation(summary = "鏂板/鏇存柊鍥炶鎻愰啋")
@PostMapping("/return-visit")
@Log(title = "鍥炶鎻愰啋-鏂板/鏇存柊", businessType = BusinessType.UPDATE)
- public AjaxResult saveReturnVisit(@RequestBody CustomerReturnVisit customerReturnVisit) {
- return toAjax(customerReturnVisitService.saveOrUpdateReturnVisit(customerReturnVisit));
+ public R saveReturnVisit(@RequestBody CustomerReturnVisit customerReturnVisit) {
+ return R.ok(customerReturnVisitService.saveOrUpdateReturnVisit(customerReturnVisit));
}
/**
@@ -145,8 +145,8 @@
*/
@Operation(summary = "鑾峰彇鍥炶鎻愰啋璇︽儏")
@GetMapping("/return-visit/{customerId}")
- public AjaxResult getReturnVisit(@PathVariable Integer customerId) {
- return AjaxResult.success(customerReturnVisitService.getByCustomerId(customerId));
+ public R getReturnVisit(@PathVariable Integer customerId) {
+ return R.ok(customerReturnVisitService.getByCustomerId(customerId));
}
/**
@@ -155,9 +155,9 @@
@Operation(summary = "鏍囪鍥炶鎻愰啋宸茶")
@PutMapping("/return-visit/read/{id}")
@Log(title = "鍥炶鎻愰啋-鏍囪宸茶", businessType = BusinessType.UPDATE)
- public AjaxResult markAsRead(@PathVariable Long id) {
+ public R markAsRead(@PathVariable Long id) {
customerReturnVisitService.markAsRead(id);
- return AjaxResult.success();
+ return R.ok();
}
}
diff --git a/src/main/java/com/ruoyi/basic/controller/ProductController.java b/src/main/java/com/ruoyi/basic/controller/ProductController.java
index 1c5224b..5109662 100644
--- a/src/main/java/com/ruoyi/basic/controller/ProductController.java
+++ b/src/main/java/com/ruoyi/basic/controller/ProductController.java
@@ -15,7 +15,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import com.ruoyi.sales.service.ISalesLedgerProductService;
import io.swagger.v3.oas.annotations.Operation;
@@ -55,8 +55,9 @@
*/
@Log(title = "浜у搧", businessType = BusinessType.INSERT)
@PostMapping("/addOrEditProduct")
- public AjaxResult addOrEditProduct(@RequestBody ProductDto productDto) {
- return toAjax(productService.addOrEditProduct(productDto));
+ public R<?> addOrEditProduct(@RequestBody ProductDto productDto) {
+ productService.addOrEditProduct(productDto);
+ return R.ok();
}
/**
@@ -64,8 +65,9 @@
*/
@Log(title = "浜у搧瑙勬牸鍨嬪彿", businessType = BusinessType.INSERT)
@PostMapping("/addOrEditProductModel")
- public AjaxResult addOrEditProductModel(@RequestBody ProductModelDto productModelDto) {
- return toAjax(productModelService.addOrEditProductModel(productModelDto));
+ public R<?> addOrEditProductModel(@RequestBody ProductModelDto productModelDto) {
+ productModelService.addOrEditProductModel(productModelDto);
+ return R.ok();
}
/**
@@ -73,18 +75,19 @@
*/
@Log(title = "浜у搧", businessType = BusinessType.DELETE)
@DeleteMapping("/delProduct")
- public AjaxResult remove(@RequestBody Long[] ids) {
+ public R<?> remove(@RequestBody Long[] ids) {
if (ids == null || ids.length == 0) {
- return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
// 妫�鏌ユ槸鍚︽湁閿�鍞晢鍝佽褰曞叧鑱旇浜у搧
LambdaQueryWrapper<SalesLedgerProduct> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(SalesLedgerProduct::getProductId, ids);
List<SalesLedgerProduct> salesLedgerProductList = salesLedgerProductService.list(queryWrapper);
if (salesLedgerProductList.size() > 0) {
- return AjaxResult.error("璇ヤ骇鍝佸瓨鍦ㄩ攢鍞�/閲囪喘璁板綍锛屼笉鑳藉垹闄�");
+ return R.fail("璇ヤ骇鍝佸瓨鍦ㄩ攢鍞�/閲囪喘璁板綍锛屼笉鑳藉垹闄�");
}
- return toAjax(productService.delProductByIds(ids));
+ productService.delProductByIds(ids);
+ return R.ok();
}
/**
@@ -92,18 +95,19 @@
*/
@Log(title = "浜у搧瑙勬牸鍨嬪彿", businessType = BusinessType.DELETE)
@DeleteMapping("/delProductModel")
- public AjaxResult delProductModel(@RequestBody Long[] ids) {
+ public R<?> delProductModel(@RequestBody Long[] ids) {
if (ids == null || ids.length == 0) {
- return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
// 妫�鏌ユ槸鍚︽湁閿�鍞晢鍝佽褰曞叧鑱旇浜у搧瑙勬牸鍨嬪彿
LambdaQueryWrapper<SalesLedgerProduct> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(SalesLedgerProduct::getProductModelId, ids);
List<SalesLedgerProduct> salesLedgerProductList = salesLedgerProductService.list(queryWrapper);
if (salesLedgerProductList.size() > 0) {
- return AjaxResult.error("璇ヤ骇鍝佽鏍煎瀷鍙峰瓨鍦ㄩ攢鍞�/閲囪喘璁板綍锛屼笉鑳藉垹闄�");
+ return R.fail("璇ヤ骇鍝佽鏍煎瀷鍙峰瓨鍦ㄩ攢鍞�/閲囪喘璁板綍锛屼笉鑳藉垹闄�");
}
- return toAjax(productModelService.delProductModel(ids));
+ productModelService.delProductModel(ids);
+ return R.ok();
}
/**
@@ -125,7 +129,7 @@
*/
@PostMapping("/import")
@Log(title = "瀵煎叆浜у搧", businessType = BusinessType.IMPORT)
- public AjaxResult importProductModel(@RequestParam("file") MultipartFile file, Integer productId) {
+ public R<?> importProductModel(@RequestParam("file") MultipartFile file, Integer productId) {
return productModelService.importProductModel(file, productId);
}
diff --git a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
index cbd6eb4..f1a45d1 100644
--- a/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
+++ b/src/main/java/com/ruoyi/basic/controller/SupplierManageController.java
@@ -7,7 +7,6 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.domain.R;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
@@ -30,9 +29,9 @@
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody SupplierManage supplierManage) {
+ public R add(@RequestBody SupplierManage supplierManage) {
supplierService.saveSupplier(supplierManage);
- return AjaxResult.success();
+ return R.ok();
}
/**
@@ -41,12 +40,12 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult delSupplier(@RequestBody List<Integer> ids) {
+ public R delSupplier(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
supplierService.delSupplier(ids);
- return AjaxResult.success();
+ return R.ok();
}
/**
@@ -55,8 +54,8 @@
* @return
*/
@GetMapping("/{id}")
- public AjaxResult supplierDetail(@PathVariable("id") Integer id) {
- return AjaxResult.success(supplierService.supplierDetail(id));
+ public R supplierDetail(@PathVariable("id") Integer id) {
+ return R.ok(supplierService.supplierDetail(id));
}
/**
@@ -65,9 +64,9 @@
* @return
*/
@PostMapping("/update")
- public AjaxResult update(@RequestBody SupplierManage supplierManage) {
+ public R update(@RequestBody SupplierManage supplierManage) {
supplierService.supplierUpdate(supplierManage);
- return AjaxResult.success();
+ return R.ok();
}
/**
@@ -77,8 +76,8 @@
* @return
*/
@GetMapping("/listPage")
- public AjaxResult supplierListPage(Page page, SupplierManageDto supplierManageDto) {
- return AjaxResult.success(supplierService.supplierListPage(page, supplierManageDto));
+ public R supplierListPage(Page page, SupplierManageDto supplierManageDto) {
+ return R.ok(supplierService.supplierListPage(page, supplierManageDto));
}
/**
@@ -113,7 +112,7 @@
* @return
*/
@GetMapping("/getOptions")
- public AjaxResult getOptions() {
- return AjaxResult.success(supplierService.list());
+ public R getOptions() {
+ return R.ok(supplierService.list());
}
}
diff --git a/src/main/java/com/ruoyi/basic/controller/SupplierManageFileController.java b/src/main/java/com/ruoyi/basic/controller/SupplierManageFileController.java
index 2d43f65..3829aa4 100644
--- a/src/main/java/com/ruoyi/basic/controller/SupplierManageFileController.java
+++ b/src/main/java/com/ruoyi/basic/controller/SupplierManageFileController.java
@@ -3,7 +3,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.pojo.SupplierManageFile;
import com.ruoyi.basic.service.SupplierManageFileService;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -15,7 +16,7 @@
*/
@RestController
@RequestMapping("/basic/supplierManageFile")
-public class SupplierManageFileController {
+public class SupplierManageFileController extends BaseController {
@Resource
@@ -28,8 +29,8 @@
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody SupplierManageFile supplierManageFile) {
- return AjaxResult.success(supplierManageFileService.save(supplierManageFile));
+ public R<?> add(@RequestBody SupplierManageFile supplierManageFile) {
+ return R.ok(supplierManageFileService.save(supplierManageFile));
}
/**
@@ -38,12 +39,12 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult delSupplierManageFile(@RequestBody List<Integer> ids) {
+ public R<?> delSupplierManageFile(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
//鍒犻櫎妫�楠岄檮浠�
- return AjaxResult.success(supplierManageFileService.removeBatchByIds(ids));
+ return R.ok(supplierManageFileService.removeBatchByIds(ids));
}
/**
@@ -53,8 +54,8 @@
* @return
*/
@GetMapping("/listPage")
- public AjaxResult supplierManageFileListPage(Page page, SupplierManageFile supplierManageFile) {
- return AjaxResult.success(supplierManageFileService.supplierManageFileListPage(page, supplierManageFile));
+ public R<?> supplierManageFileListPage(Page page, SupplierManageFile supplierManageFile) {
+ return R.ok(supplierManageFileService.supplierManageFileListPage(page, supplierManageFile));
}
diff --git a/src/main/java/com/ruoyi/basic/service/IProductModelService.java b/src/main/java/com/ruoyi/basic/service/IProductModelService.java
index dd268d6..6b96d61 100644
--- a/src/main/java/com/ruoyi/basic/service/IProductModelService.java
+++ b/src/main/java/com/ruoyi/basic/service/IProductModelService.java
@@ -6,7 +6,7 @@
import com.ruoyi.basic.dto.ProductDto;
import com.ruoyi.basic.dto.ProductModelDto;
import com.ruoyi.basic.pojo.ProductModel;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -34,5 +34,5 @@
*/
IPage<ProductModel> modelListPage(Page page , ProductDto productDto);
- AjaxResult importProductModel(MultipartFile file, Integer productId);
+ R<?> importProductModel(MultipartFile file, Integer productId);
}
diff --git a/src/main/java/com/ruoyi/basic/service/ISupplierService.java b/src/main/java/com/ruoyi/basic/service/ISupplierService.java
index 7340bce..02b7d91 100644
--- a/src/main/java/com/ruoyi/basic/service/ISupplierService.java
+++ b/src/main/java/com/ruoyi/basic/service/ISupplierService.java
@@ -5,7 +5,6 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.basic.dto.SupplierManageDto;
import com.ruoyi.basic.pojo.SupplierManage;
-import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.domain.R;
import org.springframework.web.multipart.MultipartFile;
diff --git a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
index be34fc0..263a52a 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
@@ -17,7 +17,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.sales.dto.LossProductModelDto;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
@@ -124,14 +124,14 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public AjaxResult importProductModel(MultipartFile file, Integer productId) {
+ public R<?> importProductModel(MultipartFile file, Integer productId) {
if (productId == null) {
- return AjaxResult.error("璇峰厛閫夋嫨浜у搧鍐嶅鍏ヨ鏍煎瀷鍙�");
+ return R.fail("璇峰厛閫夋嫨浜у搧鍐嶅鍏ヨ鏍煎瀷鍙�");
}
Product product = productMapper.selectById(productId);
if (product == null) {
- return AjaxResult.error("閫夋嫨鐨勪骇鍝佷笉瀛樺湪");
+ return R.fail("閫夋嫨鐨勪骇鍝佷笉瀛樺湪");
}
try {
@@ -139,7 +139,7 @@
List<ProductModel> productModelList = productModelExcelUtil.importExcel(file.getInputStream());
if (CollectionUtils.isEmpty(productModelList)) {
- return AjaxResult.error("瀵煎叆鏁版嵁涓嶈兘涓虹┖");
+ return R.fail("瀵煎叆鏁版嵁涓嶈兘涓虹┖");
}
// 鑾峰彇褰撳墠浜у搧涓嬫墍鏈夌殑瑙勬牸鍨嬪彿鍚�
@@ -154,13 +154,13 @@
int rowNum = i + 2;
if (StringUtils.isEmpty(item.getProductCode())) {
- return AjaxResult.error("绗� " + rowNum + " 琛屽鍏ュけ璐�: [浜у搧缂栫爜] 涓嶈兘涓虹┖");
+ return R.fail("绗� " + rowNum + " 琛屽鍏ュけ璐�: [浜у搧缂栫爜] 涓嶈兘涓虹┖");
}
if (StringUtils.isEmpty(item.getModel())) {
- return AjaxResult.error("绗� " + rowNum + " 琛屽鍏ュけ璐�: [瑙勬牸鍨嬪彿] 涓嶈兘涓虹┖");
+ return R.fail("绗� " + rowNum + " 琛屽鍏ュけ璐�: [瑙勬牸鍨嬪彿] 涓嶈兘涓虹┖");
}
if (StringUtils.isEmpty(item.getUnit())) {
- return AjaxResult.error("绗� " + rowNum + " 琛屽鍏ュけ璐�: [鍗曚綅] 涓嶈兘涓虹┖");
+ return R.fail("绗� " + rowNum + " 琛屽鍏ュけ璐�: [鍗曚綅] 涓嶈兘涓虹┖");
}
// 鍘婚噸,濡傛灉宸插寘鍚鍨嬪彿,鍒欒烦杩�
@@ -180,9 +180,9 @@
}
if (skipCount == 0) {
- return AjaxResult.success(String.format("鎴愬姛瀵煎叆 %d 鏉℃暟鎹�", waitToSaveList.size()));
+ return R.ok(null, String.format("鎴愬姛瀵煎叆 %d 鏉℃暟鎹�", waitToSaveList.size()));
} else {
- return AjaxResult.success(String.format("鎴愬姛瀵煎叆 %d 鏉★紝璺宠繃宸插瓨鍦ㄦ暟鎹� %d 鏉�", waitToSaveList.size(), skipCount));
+ return R.ok(null, String.format("鎴愬姛瀵煎叆 %d 鏉★紝璺宠繃宸插瓨鍦ㄦ暟鎹� %d 鏉�", waitToSaveList.size(), skipCount));
}
} catch (Exception e) {
log.error("瀵煎叆浜у搧瑙勬牸寮傚父", e);
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java
index d622e99..8be45b5 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/DutyPlanController.java
@@ -7,7 +7,8 @@
import com.ruoyi.collaborativeApproval.pojo.RulesRegulationsManagement;
import com.ruoyi.collaborativeApproval.service.DutyPlanService;
import com.ruoyi.common.utils.excel.ExcelUtils;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,39 +21,39 @@
@RestController
@RequestMapping("/dutyPlan")
@AllArgsConstructor
-public class DutyPlanController {
+public class DutyPlanController extends BaseController {
private DutyPlanService dutyPlanService;
@GetMapping("/getList")
@Operation(summary = "鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, DutyPlanDTO dutyPlanDTO){
- return AjaxResult.success(dutyPlanService.listPage(page, dutyPlanDTO));
+ public R<?> listPage(Page page, DutyPlanDTO dutyPlanDTO){
+ return R.ok(dutyPlanService.listPage(page, dutyPlanDTO));
}
@GetMapping("/getNum")
@Operation(summary = "鑾峰彇绛夌骇鏁版嵁")
- public AjaxResult getNum(){
- return AjaxResult.success(dutyPlanService.getNum());
+ public R<?> getNum(){
+ return R.ok(dutyPlanService.getNum());
}
@PostMapping("/add")
@Operation(summary = "鏂板")
- public AjaxResult add(@RequestBody DutyPlan dutyPlan){
- return AjaxResult.success(dutyPlanService.save(dutyPlan));
+ public R<?> add(@RequestBody DutyPlan dutyPlan){
+ return R.ok(dutyPlanService.save(dutyPlan));
}
@PostMapping("/update")
@Operation(summary = "淇敼")
- public AjaxResult update(@RequestBody DutyPlan dutyPlan){
- return AjaxResult.success(dutyPlanService.updateById(dutyPlan));
+ public R<?> update(@RequestBody DutyPlan dutyPlan){
+ return R.ok(dutyPlanService.updateById(dutyPlan));
}
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎")
- public AjaxResult delete(@RequestBody List<Long> ids){
+ public R<?> delete(@RequestBody List<Long> ids){
if (CollectionUtils.isEmpty(ids)) {
throw new RuntimeException("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
- return AjaxResult.success(dutyPlanService.removeBatchByIds(ids));
+ return R.ok(dutyPlanService.removeBatchByIds(ids));
}
@PostMapping("/export")
@Operation(summary = "瀵煎嚭")
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeController.java
index ba1df00..e3ef9b6 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeController.java
@@ -9,7 +9,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.project.system.service.ISysNoticeService;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
@@ -32,27 +32,27 @@
@GetMapping("/page")
@Log(title = "鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
@Operation(summary = "鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, NoticeDTO noticeDTO){
- return AjaxResult.success(noticeService.listPage(page, noticeDTO));
+ public R<?> listPage(Page page, NoticeDTO noticeDTO){
+ return R.ok(noticeService.listPage(page, noticeDTO));
}
@PostMapping("/add")
@Log(title = "鏂板", businessType = BusinessType.INSERT)
@Operation(summary = "鏂板")
- public AjaxResult add(@RequestBody NoticeDTO noticeDTO){
+ public R<?> add(@RequestBody NoticeDTO noticeDTO){
if (noticeDTO.getStatus()==1){
//姝ｅ紡鍙戝竷閫氱煡鎵�鏈変汉鐨勬秷鎭�氱煡
sysNoticeService.simpleNoticeAll("閫氱煡鍏憡",
noticeDTO.getTitle(),
"/collaborativeApproval/noticeManagement?type="+noticeDTO.getType());
}
- return AjaxResult.success(noticeService.save(noticeDTO));
+ return R.ok(noticeService.save(noticeDTO));
}
@PutMapping("/update")
@Log(title = "淇敼", businessType = BusinessType.UPDATE)
@Operation(summary = "淇敼")
- public AjaxResult update(@RequestBody NoticeDTO noticeDTO){
+ public R<?> update(@RequestBody NoticeDTO noticeDTO){
if (ObjectUtils.isNotNull(noticeDTO.getStatus()) && noticeDTO.getStatus()==1){
Notice notice = noticeService.getById(noticeDTO.getId());
//姝ｅ紡鍙戝竷閫氱煡鎵�鏈変汉鐨勬秷鎭�氱煡
@@ -60,23 +60,23 @@
notice.getTitle(),
"/collaborativeApproval/noticeManagement?type="+notice.getType());
}
- return AjaxResult.success(noticeService.updateById(noticeDTO));
+ return R.ok(noticeService.updateById(noticeDTO));
}
@DeleteMapping("/{ids}")
@Log(title = "鍒犻櫎", businessType = BusinessType.DELETE)
@Operation(summary = "鍒犻櫎")
- public AjaxResult delete(@PathVariable("ids") List<Long> ids){
+ public R<?> delete(@PathVariable("ids") List<Long> ids){
if (CollectionUtils.isEmpty(ids)) {
throw new RuntimeException("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
- return AjaxResult.success(noticeService.removeBatchByIds(ids));
+ return R.ok(noticeService.removeBatchByIds(ids));
}
@GetMapping("/count")
@Log(title = "鑾峰彇鍏憡鏁伴噺", businessType = BusinessType.OTHER)
@Operation(summary = "鑾峰彇鍏憡鏁伴噺")
- public AjaxResult count(){
- return AjaxResult.success(noticeService.selectCount());
+ public R<?> count(){
+ return R.ok(noticeService.selectCount());
}
}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeTypeController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeTypeController.java
index dba3e77..e90d5d1 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeTypeController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeTypeController.java
@@ -5,7 +5,8 @@
import com.ruoyi.basic.pojo.SupplierManage;
import com.ruoyi.collaborativeApproval.pojo.NoticeType;
import com.ruoyi.collaborativeApproval.service.NoticeTypeService;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
@@ -24,7 +25,7 @@
@RestController
@RequestMapping("/noticeType")
@AllArgsConstructor
-public class NoticeTypeController {
+public class NoticeTypeController extends BaseController {
private NoticeTypeService noticeTypeService;
@@ -34,8 +35,8 @@
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody NoticeType noticeType) {
- return AjaxResult.success(noticeTypeService.saveOrUpdate(noticeType));
+ public R<?> add(@RequestBody NoticeType noticeType) {
+ return R.ok(noticeTypeService.saveOrUpdate(noticeType));
}
/**
@@ -44,11 +45,11 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult delNoticeType(@RequestBody List<Integer> ids) {
+ public R<?> delNoticeType(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return AjaxResult.success(noticeTypeService.removeBatchByIds(ids));
+ return R.ok(noticeTypeService.removeBatchByIds(ids));
}
/**
@@ -56,8 +57,8 @@
* @return
*/
@GetMapping("/list")
- public AjaxResult noticeTypeList() {
- return AjaxResult.success(noticeTypeService.list());
+ public R<?> noticeTypeList() {
+ return R.ok(noticeTypeService.list());
}
}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java
index 5e59117..2496515 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementController.java
@@ -8,7 +8,8 @@
import com.ruoyi.collaborativeApproval.pojo.SealApplicationManagement;
import com.ruoyi.collaborativeApproval.service.RulesRegulationsManagementService;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
@@ -23,57 +24,57 @@
@RequestMapping("/rulesRegulationsManagement")
@AllArgsConstructor
@Tag(name = "鍒跺害绠＄悊")
-public class RulesRegulationsManagementController {
+public class RulesRegulationsManagementController extends BaseController {
private RulesRegulationsManagementService rulesRegulationsManagementService;
private ReadingStatusMapper readingStatusMapper;
@GetMapping("/getList")
@Operation(summary = "鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, RulesRegulationsManagement rulesRegulationsManagement){
- return AjaxResult.success(rulesRegulationsManagementService.listPage(page, rulesRegulationsManagement));
+ public R<?> listPage(Page page, RulesRegulationsManagement rulesRegulationsManagement){
+ return R.ok(rulesRegulationsManagementService.listPage(page, rulesRegulationsManagement));
}
@PostMapping("/add")
@Operation(summary = "鏂板")
- public AjaxResult add(@RequestBody RulesRegulationsManagement rulesRegulationsManagement){
+ public R<?> add(@RequestBody RulesRegulationsManagement rulesRegulationsManagement){
rulesRegulationsManagementService.save(rulesRegulationsManagement);
- return AjaxResult.success(rulesRegulationsManagement.getId());
+ return R.ok(rulesRegulationsManagement.getId());
}
@PostMapping("/update")
@Operation(summary = "淇敼")
- public AjaxResult update(@RequestBody RulesRegulationsManagement rulesRegulationsManagement){
- return AjaxResult.success(rulesRegulationsManagementService.updateById(rulesRegulationsManagement));
+ public R<?> update(@RequestBody RulesRegulationsManagement rulesRegulationsManagement){
+ return R.ok(rulesRegulationsManagementService.updateById(rulesRegulationsManagement));
}
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎")
- public AjaxResult delete(@PathVariable("ids") List<Long> ids){
+ public R<?> delete(@PathVariable("ids") List<Long> ids){
if (CollectionUtils.isEmpty(ids)) {
throw new RuntimeException("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
- return AjaxResult.success(rulesRegulationsManagementService.removeBatchByIds(ids));
+ return R.ok(rulesRegulationsManagementService.removeBatchByIds(ids));
}
//瑙勫垯鏌ョ湅鏃舵柊澧為槄璇荤姸鎬�
@PostMapping("/addReadingStatus")
@Operation(summary = "鏂板闃呰鐘舵��")
- public AjaxResult addReadingStatus(@RequestBody ReadingStatus readingStatus){
- return AjaxResult.success(readingStatusMapper.insert(readingStatus));
+ public R<?> addReadingStatus(@RequestBody ReadingStatus readingStatus){
+ return R.ok(readingStatusMapper.insert(readingStatus));
}
@PostMapping("/updateReadingStatus")
@Operation(summary = "淇敼闃呰鐘舵��")
- public AjaxResult updateReadingStatus(@RequestBody ReadingStatus readingStatus){
- return AjaxResult.success(readingStatusMapper.updateById(readingStatus));
+ public R<?> updateReadingStatus(@RequestBody ReadingStatus readingStatus){
+ return R.ok(readingStatusMapper.updateById(readingStatus));
}
@GetMapping("/getReadingStatusList")
@Operation(summary = "鍒嗛〉鏌ヨ闃呰鐘舵��")
- public AjaxResult listPage(Page page, ReadingStatus readingStatus){
- return AjaxResult.success(readingStatusMapper.selectPage(page,new QueryWrapper<ReadingStatus>(readingStatus)));
+ public R<?> listPage(Page page, ReadingStatus readingStatus){
+ return R.ok(readingStatusMapper.selectPage(page,new QueryWrapper<ReadingStatus>(readingStatus)));
}
@GetMapping("/getReadingStatusByRuleId/{ruleId}")
@Operation(summary = "鏍规嵁鍒跺害id鏌ヨ闃呰鐘舵��")
- public AjaxResult getReadingStatusByRuleId(@PathVariable Long ruleId){
- return AjaxResult.success(readingStatusMapper.selectList(new QueryWrapper<ReadingStatus>().eq("rule_id", ruleId)));
+ public R<?> getReadingStatusByRuleId(@PathVariable Long ruleId){
+ return R.ok(readingStatusMapper.selectList(new QueryWrapper<ReadingStatus>().eq("rule_id", ruleId)));
}
@Operation(summary = "瑙勭珷鍒跺害绠＄悊瀵煎嚭")
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementFileController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementFileController.java
index 3f770f8..4d77ff7 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementFileController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/RulesRegulationsManagementFileController.java
@@ -3,7 +3,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.collaborativeApproval.pojo.RulesRegulationsManagementFile;
import com.ruoyi.collaborativeApproval.service.RulesRegulationsManagementFileService;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.quality.pojo.QualityInspectFile;
import com.ruoyi.quality.service.IQualityInspectFileService;
import org.springframework.util.CollectionUtils;
@@ -22,7 +23,7 @@
*/
@RestController
@RequestMapping("/rulesRegulationsManagementFile")
-public class RulesRegulationsManagementFileController {
+public class RulesRegulationsManagementFileController extends BaseController {
@Resource
private RulesRegulationsManagementFileService rulesRegulationsManagementFileService;
@@ -34,8 +35,8 @@
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody RulesRegulationsManagementFile rulesRegulationsManagementFile) {
- return AjaxResult.success(rulesRegulationsManagementFileService.save(rulesRegulationsManagementFile));
+ public R<?> add(@RequestBody RulesRegulationsManagementFile rulesRegulationsManagementFile) {
+ return R.ok(rulesRegulationsManagementFileService.save(rulesRegulationsManagementFile));
}
/**
@@ -44,12 +45,12 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
+ public R<?> delQualityUnqualified(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
//鍒犻櫎妫�楠岄檮浠�
- return AjaxResult.success(rulesRegulationsManagementFileService.removeBatchByIds(ids));
+ return R.ok(rulesRegulationsManagementFileService.removeBatchByIds(ids));
}
/**
@@ -59,8 +60,8 @@
* @return
*/
@GetMapping("/listPage")
- public AjaxResult listPage(Page page, RulesRegulationsManagementFile rulesRegulationsManagementFile) {
- return AjaxResult.success(rulesRegulationsManagementFileService.listPage(page, rulesRegulationsManagementFile));
+ public R<?> listPage(Page page, RulesRegulationsManagementFile rulesRegulationsManagementFile) {
+ return R.ok(rulesRegulationsManagementFileService.listPage(page, rulesRegulationsManagementFile));
}
}
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
index dc6a64e..e9e411f 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
@@ -11,7 +11,8 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.project.system.service.ISysNoticeService;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
@@ -28,20 +29,20 @@
@RestController
@RequestMapping("/sealApplicationManagement")
@Tag(name = "鐢ㄥ嵃鐢宠绠＄悊")
-public class SealApplicationManagementController {
+public class SealApplicationManagementController extends BaseController {
private SealApplicationManagementService sealApplicationManagementService;
private ISysNoticeService sysNoticeService;
private FileUtil fileUtil;
@GetMapping("/getList")
@Operation(summary = "鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, SealApplicationManagement sealApplicationManagement){
- return AjaxResult.success(sealApplicationManagementService.listPage(page,sealApplicationManagement));
+ public R<?> listPage(Page page, SealApplicationManagement sealApplicationManagement){
+ return R.ok(sealApplicationManagementService.listPage(page,sealApplicationManagement));
}
@PostMapping("/add")
@Operation(summary = "鏂板")
- public AjaxResult add(@RequestBody SealApplicationManagementDTO sealApplicationManagement){
+ public R<?> add(@RequestBody SealApplicationManagementDTO sealApplicationManagement){
sealApplicationManagementService.save(sealApplicationManagement);
// 5. 淇濆瓨閿�鍞彴璐﹂檮浠�
fileUtil.saveStorageAttachment(ApplicationTypeEnum.FILE,
@@ -54,30 +55,30 @@
+"鐢宠鏍囬锛�"+sealApplicationManagement.getTitle(),
Arrays.asList(sealApplicationManagement.getApproveUserId()),
"/collaborativeApproval/sealManagement?applicationNum="+sealApplicationManagement.getApplicationNum());
- return AjaxResult.success();
+ return R.ok();
}
@PostMapping("/update")
@Operation(summary = "淇敼")
- public AjaxResult update(@RequestBody SealApplicationManagementDTO sealApplicationManagement){
+ public R<?> update(@RequestBody SealApplicationManagementDTO sealApplicationManagement){
// 5. 淇濆瓨閿�鍞彴璐﹂檮浠�
fileUtil.saveStorageAttachment(ApplicationTypeEnum.FILE,
RecordTypeEnum.SEAL_APPLICATION_MANAGEMENT,
sealApplicationManagement.getId(),
sealApplicationManagement.getStorageBlobDTOs());
- return AjaxResult.success(sealApplicationManagementService.updateById(sealApplicationManagement));
+ return R.ok(sealApplicationManagementService.updateById(sealApplicationManagement));
}
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎")
- public AjaxResult delete(@PathVariable("ids") List<Long> ids){
+ public R<?> delete(@PathVariable("ids") List<Long> ids){
if (CollectionUtils.isEmpty(ids)) {
throw new RuntimeException("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
fileUtil.deleteStorageAttachmentsByApplicationAndRecordTypeAndRecordIds(ApplicationTypeEnum.FILE,
RecordTypeEnum.SEAL_APPLICATION_MANAGEMENT,
ids);
- return AjaxResult.success(sealApplicationManagementService.removeBatchByIds(ids));
+ return R.ok(sealApplicationManagementService.removeBatchByIds(ids));
}
@Operation(summary = "鐢ㄥ嵃鐢宠绠＄悊瀵煎嚭")
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java
index 3673208..fa72a40 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/StaffContactsPersonalController.java
@@ -4,7 +4,8 @@
import com.ruoyi.collaborativeApproval.dto.StaffContactsPersonalDTO;
import com.ruoyi.collaborativeApproval.pojo.StaffContactsPersonal;
import com.ruoyi.collaborativeApproval.service.StaffContactsPersonalService;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -12,27 +13,27 @@
@RestController
@RequestMapping("/staffContactsPersonal")
@AllArgsConstructor
-public class StaffContactsPersonalController {
+public class StaffContactsPersonalController extends BaseController {
private StaffContactsPersonalService staffContactsPersonalService;
@GetMapping("/getList")
@Operation(summary = "鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, StaffContactsPersonalDTO staffContactsPersonalDTO) {
- return AjaxResult.success(staffContactsPersonalService.listPage(page, staffContactsPersonalDTO));
+ public R<?> listPage(Page page, StaffContactsPersonalDTO staffContactsPersonalDTO) {
+ return R.ok(staffContactsPersonalService.listPage(page, staffContactsPersonalDTO));
}
@PostMapping("/add")
@Operation(summary = "鏂板")
- public AjaxResult add(@RequestBody StaffContactsPersonal staffContactsPersonal) {
- return AjaxResult.success(staffContactsPersonalService.save(staffContactsPersonal));
+ public R<?> add(@RequestBody StaffContactsPersonal staffContactsPersonal) {
+ return R.ok(staffContactsPersonalService.save(staffContactsPersonal));
}
@DeleteMapping("/delete/{id}")
@Operation(summary = "鍒犻櫎")
- public AjaxResult delete(@PathVariable("id") Long id) {
+ public R<?> delete(@PathVariable("id") Long id) {
// if (CollectionUtils.isEmpty(id)) {
// throw new RuntimeException("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
// }
- return AjaxResult.success(staffContactsPersonalService.removeById(id));
+ return R.ok(staffContactsPersonalService.removeById(id));
}
}
diff --git a/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java b/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java
index 25f91c5..ecde7dd 100644
--- a/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java
+++ b/src/main/java/com/ruoyi/compensationperformance/controller/CompensationPerformanceController.java
@@ -8,7 +8,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.staff.mapper.StaffOnJobMapper;
import com.ruoyi.staff.pojo.StaffOnJob;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -40,37 +40,37 @@
@GetMapping("/listPage")
@Log(title = "钖叕缁╂晥-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
@Operation(summary = "钖叕缁╂晥-鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, String staffName, String payDateStr) {
+ public R<?> listPage(Page page, String staffName, String payDateStr) {
IPage<CompensationPerformance> listPage = compensationPerformanceService.listPage(page, staffName, payDateStr);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
}
@PostMapping("/add")
@Log(title = "钖叕缁╂晥-娣诲姞", businessType = BusinessType.INSERT)
@Operation(summary = "钖叕缁╂晥-娣诲姞")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult add(@RequestBody CompensationPerformance compensationPerformance) {
+ public R<?> add(@RequestBody CompensationPerformance compensationPerformance) {
boolean save = compensationPerformanceService.save(compensationPerformance);
- return save ? AjaxResult.success("娣诲姞鎴愬姛") : AjaxResult.error("娣诲姞澶辫触");
+ return save ? R.ok(null, "娣诲姞鎴愬姛") : R.fail("娣诲姞澶辫触");
}
@PostMapping("/update")
@Log(title = "钖叕缁╂晥-淇敼", businessType = BusinessType.UPDATE)
@Operation(summary = "钖叕缁╂晥-淇敼")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult update(@RequestBody CompensationPerformance compensationPerformance) {
+ public R<?> update(@RequestBody CompensationPerformance compensationPerformance) {
boolean update = compensationPerformanceService.updateById(compensationPerformance);
- return update ? AjaxResult.success("淇敼鎴愬姛") : AjaxResult.error("淇敼澶辫触");
+ return update ? R.ok(null, "淇敼鎴愬姛") : R.fail("淇敼澶辫触");
}
@DeleteMapping("/delete")
@Log(title = "钖叕缁╂晥-鍒犻櫎", businessType = BusinessType.DELETE)
@Operation(summary = "钖叕缁╂晥-鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult delete(@RequestBody List<Long> ids) {
- if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ public R<?> delete(@RequestBody List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
boolean delete = compensationPerformanceService.removeBatchByIds(ids);
- return delete ? AjaxResult.success("鍒犻櫎鎴愬姛") : AjaxResult.error("鍒犻櫎澶辫触");
+ return delete ? R.ok(null, "鍒犻櫎鎴愬姛") : R.fail("鍒犻櫎澶辫触");
}
@Log(title = "瀵煎嚭钖祫绠＄悊鍒楄〃", businessType = BusinessType.EXPORT)
@@ -91,7 +91,7 @@
@Log(title = "瀵煎叆钖祫绠＄悊鍒楄〃", businessType = BusinessType.IMPORT)
@PostMapping("/importData")
- public AjaxResult importData(MultipartFile file) throws Exception {
+ public R<?> importData(MultipartFile file) throws Exception {
ExcelUtil<CompensationPerformance> util = new ExcelUtil<>(CompensationPerformance.class);
List<CompensationPerformance> list = util.importExcel(file.getInputStream());
list.forEach(item -> {
@@ -101,7 +101,7 @@
}
});
boolean b = compensationPerformanceService.saveBatch(list);
- return AjaxResult.success(b);
+ return R.ok(b);
}
diff --git a/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java b/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java
index 586ee42..5efdf5a 100644
--- a/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java
+++ b/src/main/java/com/ruoyi/customervisits/controller/CustomerVisitsController.java
@@ -8,7 +8,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
@@ -31,46 +31,46 @@
@GetMapping("/listPage")
@Log(title = "瀹㈡埛鎷滆-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
@Operation(summary = "瀹㈡埛鎷滆-鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, CustomerVisits customerVisits) {
+ public R<?> listPage(Page page, CustomerVisits customerVisits) {
IPage<CustomerVisits> listPage = customerVisitsService.listPage(page, customerVisits);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
}
@Log(title = "瀹㈡埛鎷滆-娣诲姞", businessType = BusinessType.INSERT)
@Operation(summary = "瀹㈡埛鎷滆-娣诲姞")
@PostMapping("/add")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult add(@RequestBody CustomerVisits customerVisits) {
+ public R<?> add(@RequestBody CustomerVisits customerVisits) {
boolean save = customerVisitsService.save(customerVisits);
if (save) {
- return AjaxResult.success("娣诲姞鎴愬姛");
+ return R.ok(null, "娣诲姞鎴愬姛");
}
- return AjaxResult.error("娣诲姞澶辫触");
+ return R.fail("娣诲姞澶辫触");
}
@Log(title = "瀹㈡埛鎷滆-缂栬緫", businessType = BusinessType.UPDATE)
@Operation(summary = "瀹㈡埛鎷滆-缂栬緫")
@PostMapping("update")
- public AjaxResult updateCustomerVisit(@RequestBody CustomerVisits customerVisits) {
+ public R<?> updateCustomerVisit(@RequestBody CustomerVisits customerVisits) {
boolean updateResult = customerVisitsService.updateCustomerVisit(customerVisits);
if (updateResult) {
- return AjaxResult.success("缂栬緫鎴愬姛");
+ return R.ok(null, "缂栬緫鎴愬姛");
}
- return AjaxResult.error("缂栬緫澶辫触");
+ return R.fail("缂栬緫澶辫触");
}
@Log(title = "瀹㈡埛鎷滆-鍒犻櫎", businessType = BusinessType.DELETE)
@Operation(summary = "瀹㈡埛鎷滆-鍒犻櫎")
@DeleteMapping("{customerId}")
- public AjaxResult deleteCustomerVisit(@PathVariable Integer customerId) {
+ public R<?> deleteCustomerVisit(@PathVariable Integer customerId) {
if (customerId == null) {
- return AjaxResult.error("瀹㈡埛ID涓嶈兘涓虹┖");
+ return R.fail("瀹㈡埛ID涓嶈兘涓虹┖");
}
boolean deleteResult = customerVisitsService.removeById(customerId);
if (deleteResult) {
- return AjaxResult.success("鍒犻櫎鎴愬姛");
+ return R.ok(null, "鍒犻櫎鎴愬姛");
}
- return AjaxResult.error("鍒犻櫎澶辫触");
+ return R.fail("鍒犻櫎澶辫触");
}
}
diff --git a/src/main/java/com/ruoyi/customervisits/service/CustomerVisitsService.java b/src/main/java/com/ruoyi/customervisits/service/CustomerVisitsService.java
index 1f8d1ef..0cd35cf 100644
--- a/src/main/java/com/ruoyi/customervisits/service/CustomerVisitsService.java
+++ b/src/main/java/com/ruoyi/customervisits/service/CustomerVisitsService.java
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.customervisits.pojo.CustomerVisits;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
/**
* @author :yys
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java b/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java
index 1fd1c04..ba8de8b 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceDefectRecordController.java
@@ -4,7 +4,8 @@
import com.ruoyi.device.dto.DeviceDefectRecordDto;
import com.ruoyi.device.pojo.DeviceDefectRecord;
import com.ruoyi.device.service.DeviceDefectRecordService;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
@@ -14,35 +15,35 @@
@RequestMapping("/defect")
@AllArgsConstructor
@RestController
-public class DeviceDefectRecordController {
+public class DeviceDefectRecordController extends BaseController {
private DeviceDefectRecordService deviceDefectRecordService;
@Operation(summary = "璁惧缂洪櫡璁板綍鍒楄〃")
@GetMapping("/page")
- public AjaxResult page(Page page , DeviceDefectRecordDto deviceDefectRecordDto) {
- return AjaxResult.success(deviceDefectRecordService.listPage(page,deviceDefectRecordDto));
+ public R<?> page(Page page , DeviceDefectRecordDto deviceDefectRecordDto) {
+ return R.ok(deviceDefectRecordService.listPage(page,deviceDefectRecordDto));
}
@Operation(summary = "璁惧id鏌ヨ璁惧缂洪櫡璁板綍鍒楄〃")
@GetMapping("/find/{deviceLedgerId}")
- public AjaxResult find(@PathVariable Long deviceLedgerId) {
+ public R<?> find(@PathVariable Long deviceLedgerId) {
DeviceDefectRecordDto deviceDefectRecordDto = new DeviceDefectRecordDto();
deviceDefectRecordDto.setDeviceLedgerId(deviceLedgerId);
- return AjaxResult.success(deviceDefectRecordService.listPage(new Page<>(1,-1),deviceDefectRecordDto));
+ return R.ok(deviceDefectRecordService.listPage(new Page<>(1,-1),deviceDefectRecordDto));
}
@PostMapping("/add")
@Operation(summary = "娣诲姞璁惧缂洪櫡璁板綍")
- public AjaxResult add(@RequestBody DeviceDefectRecord deviceDefectRecord) {
- return AjaxResult.success(deviceDefectRecordService.add(deviceDefectRecord));
+ public R<?> add(@RequestBody DeviceDefectRecord deviceDefectRecord) {
+ return R.ok(deviceDefectRecordService.add(deviceDefectRecord));
}
@PostMapping("/update")
@Operation(summary = "淇敼璁惧缂洪櫡璁板綍")
- public AjaxResult update(@RequestBody DeviceDefectRecord deviceDefectRecord) {
- return AjaxResult.success(deviceDefectRecordService.updateByDDR(deviceDefectRecord));
+ public R<?> update(@RequestBody DeviceDefectRecord deviceDefectRecord) {
+ return R.ok(deviceDefectRecordService.updateByDDR(deviceDefectRecord));
}
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎璁惧缂洪櫡璁板綍")
- public AjaxResult delete(@PathVariable Long id) {
- return AjaxResult.success(deviceDefectRecordService.removeById(id));
+ public R<?> delete(@PathVariable Long id) {
+ return R.ok(deviceDefectRecordService.removeById(id));
}
}
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java b/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java
index f4b807d..40c6dad 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceLedgerController.java
@@ -12,7 +12,8 @@
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.framework.aspectj.lang.annotation.Anonymous;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
@@ -28,7 +29,7 @@
@RequestMapping("/device/ledger")
@RestController
@AllArgsConstructor
-public class DeviceLedgerController {
+public class DeviceLedgerController extends BaseController {
private IDeviceLedgerService deviceLedgerService;
private DeviceLedgerMapper deviceLedgerMapper;
@@ -38,37 +39,37 @@
@Operation(summary = "璁惧鍙拌处鍒楄〃")
@GetMapping("/page")
- public AjaxResult page(Page page , DeviceLedgerDto deviceLedger) {
- return AjaxResult.success(deviceLedgerService.queryPage(page,deviceLedger));
+ public R<?> page(Page page , DeviceLedgerDto deviceLedger) {
+ return R.ok(deviceLedgerService.queryPage(page,deviceLedger));
}
@PostMapping()
@Operation(summary = "娣诲姞璁惧鍙拌处")
- public AjaxResult add(@RequestBody DeviceLedger deviceLedger) {
+ public R<?> add(@RequestBody DeviceLedger deviceLedger) {
return deviceLedgerService.saveDeviceLedger(deviceLedger);
}
@Operation(summary = "鏍规嵁id鏌ヨ璁惧鍙拌处")
@GetMapping("/{id}")
- public AjaxResult detail(@PathVariable Long id) {
- return AjaxResult.success(deviceLedgerService.getById(id));
+ public R<?> detail(@PathVariable Long id) {
+ return R.ok(deviceLedgerService.getById(id));
}
@PutMapping ()
@Operation(summary = "淇敼璁惧鍙拌处")
- public AjaxResult update(@RequestBody DeviceLedger deviceLedger) {
+ public R<?> update(@RequestBody DeviceLedger deviceLedger) {
return deviceLedgerService.updateDeviceLedger(deviceLedger);
}
@DeleteMapping("/{ids}")
@Operation(summary = "鍒犻櫎璁惧鍙拌处")
- public AjaxResult delete(@PathVariable("ids") ArrayList<Long> ids) {
+ public R<?> delete(@PathVariable("ids") ArrayList<Long> ids) {
boolean b = deviceLedgerService.removeBatchByIds(ids);
if (!b) {
- return AjaxResult.error("鍒犻櫎澶辫触");
+ return R.fail("鍒犻櫎澶辫触");
}
- return AjaxResult.success();
+ return R.ok();
}
@PostMapping("export")
@@ -86,32 +87,32 @@
@PostMapping("/import")
@Operation(summary = "瀵煎叆璁惧鍙拌处")
- public AjaxResult importData(MultipartFile file) throws IOException {
+ public R<?> importData(MultipartFile file) throws IOException {
Boolean b = deviceLedgerService.importData(file);
if (b) {
- return AjaxResult.success("瀵煎叆鎴愬姛");
+ return R.ok(null, "瀵煎叆鎴愬姛");
}
- return AjaxResult.error("瀵煎叆澶辫触");
+ return R.fail("瀵煎叆澶辫触");
}
@GetMapping("getDeviceLedger")
@Operation(summary = "鑾峰彇璁惧鍙拌处")
- public AjaxResult getDeviceLedger( ) {
- return AjaxResult.success(deviceLedgerService.list(new QueryWrapper<DeviceLedger>().lambda()
+ public R<?> getDeviceLedger( ) {
+ return R.ok(deviceLedgerService.list(new QueryWrapper<DeviceLedger>().lambda()
.select(DeviceLedger::getId, DeviceLedger::getDeviceName,DeviceLedger::getDeviceModel)));
}
@GetMapping("scanDevice")
@Operation(summary = "鑾峰彇璁惧鍙拌处")
@Anonymous
- public AjaxResult scanDevice(Long id) {
+ public R<?> scanDevice(Long id) {
List<DeviceMaintenance> list = deviceMaintenanceMapper.list1(id);
DeviceLedger deviceLedger = deviceLedgerMapper.selectById1(id);
if (list.size()>0){
deviceLedger.setUpdateTime(list.get(0).getMaintenanceActuallyTime());//鏈�鍚庣淮鎶ゆ椂闂�
}
deviceLedger.setCreateTime(deviceLedger.getUpdateTime().plusMonths(1));//涓嬫缁存姢鏃堕棿
- return AjaxResult.success(deviceLedger);
+ return R.ok(deviceLedger);
}
}
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
index e34fc37..5442195 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceController.java
@@ -7,7 +7,8 @@
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.device.service.IDeviceMaintenanceService;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
@@ -20,7 +21,7 @@
@RestController
@RequestMapping("/device/maintenance")
@AllArgsConstructor
-public class DeviceMaintenanceController {
+public class DeviceMaintenanceController extends BaseController {
private IDeviceMaintenanceService deviceMaintenanceService;
@@ -28,13 +29,13 @@
@Operation(summary = "璁惧淇濆吇鍒楄〃")
@GetMapping("/page")
- public AjaxResult page(Page page , DeviceMaintenanceDto deviceMaintenanceDto) {
- return AjaxResult.success(deviceMaintenanceService.queryPage(page,deviceMaintenanceDto));
+ public R<?> page(Page page , DeviceMaintenanceDto deviceMaintenanceDto) {
+ return R.ok(deviceMaintenanceService.queryPage(page,deviceMaintenanceDto));
}
@PostMapping()
@Operation(summary = "娣诲姞璁惧淇濆吇")
- public AjaxResult add(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
+ public R<?> add(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId());
deviceMaintenance.setDeviceName(byId.getDeviceName());
deviceMaintenance.setDeviceModel(byId.getDeviceModel());
@@ -43,13 +44,13 @@
@Operation(summary = "鏍规嵁id鏌ヨ璁惧淇濆吇")
@GetMapping("/{id}")
- public AjaxResult detail(@PathVariable Long id) {
- return AjaxResult.success(deviceMaintenanceService.detailById(id));
+ public R<?> detail(@PathVariable Long id) {
+ return R.ok(deviceMaintenanceService.detailById(id));
}
@PutMapping ()
@Operation(summary = "淇敼璁惧淇濆吇")
- public AjaxResult update(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
+ public R<?> update(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
DeviceLedger byId = deviceLedgerService.getById(deviceMaintenance.getDeviceLedgerId());
deviceMaintenance.setDeviceName(byId.getDeviceName());
deviceMaintenance.setDeviceModel(byId.getDeviceModel());
@@ -58,19 +59,19 @@
@PostMapping ("maintenance")
@Operation(summary = "淇敼璁惧淇濆吇")
- public AjaxResult maintenance(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
+ public R<?> maintenance(@RequestBody DeviceMaintenanceDto deviceMaintenance) {
return deviceMaintenanceService.updateDeviceDeviceMaintenance(deviceMaintenance);
}
@DeleteMapping("/{ids}")
@Operation(summary = "鍒犻櫎璁惧淇濆吇")
- public AjaxResult delete(@PathVariable("ids") Long[] ids) {
+ public R<?> delete(@PathVariable("ids") Long[] ids) {
boolean b = deviceMaintenanceService.removeBatchByIds(Arrays.asList(ids));
if (!b) {
- return AjaxResult.error("鍒犻櫎澶辫触");
+ return R.fail("鍒犻櫎澶辫触");
}
- return AjaxResult.success();
+ return R.ok();
}
@PostMapping("export")
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceFileController.java b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceFileController.java
index d92d334..f4e1dd4 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceFileController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceMaintenanceFileController.java
@@ -4,7 +4,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.device.pojo.DeviceMaintenanceFile;
import com.ruoyi.device.service.DeviceMaintenanceFileService;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -23,7 +24,7 @@
@RestController
@RequestMapping("/maintenanceTaskFile")
@Tag(name = "璁惧淇濆吇闄勪欢")
-public class DeviceMaintenanceFileController {
+public class DeviceMaintenanceFileController extends BaseController {
@Resource
private DeviceMaintenanceFileService deviceMaintenanceFileService;
@@ -35,8 +36,8 @@
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody DeviceMaintenanceFile deviceMaintenanceFile) {
- return AjaxResult.success(deviceMaintenanceFileService.save(deviceMaintenanceFile));
+ public R<?> add(@RequestBody DeviceMaintenanceFile deviceMaintenanceFile) {
+ return R.ok(deviceMaintenanceFileService.save(deviceMaintenanceFile));
}
/**
@@ -45,12 +46,12 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
+ public R<?> delQualityUnqualified(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
//鍒犻櫎妫�楠岄檮浠�
- return AjaxResult.success(deviceMaintenanceFileService.removeBatchByIds(ids));
+ return R.ok(deviceMaintenanceFileService.removeBatchByIds(ids));
}
/**
@@ -60,8 +61,8 @@
* @return
*/
@GetMapping("/listPage")
- public AjaxResult qualityInspectFileListPage(Page page, DeviceMaintenanceFile deviceMaintenanceFile) {
- return AjaxResult.success(deviceMaintenanceFileService.page(page, Wrappers.<DeviceMaintenanceFile>lambdaQuery().eq(DeviceMaintenanceFile::getDeviceMaintenanceId,deviceMaintenanceFile.getDeviceMaintenanceId())));
+ public R<?> qualityInspectFileListPage(Page page, DeviceMaintenanceFile deviceMaintenanceFile) {
+ return R.ok(deviceMaintenanceFileService.page(page, Wrappers.<DeviceMaintenanceFile>lambdaQuery().eq(DeviceMaintenanceFile::getDeviceMaintenanceId,deviceMaintenanceFile.getDeviceMaintenanceId())));
}
diff --git a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
index 7df7c26..1b43372 100644
--- a/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
+++ b/src/main/java/com/ruoyi/device/controller/DeviceRepairController.java
@@ -5,7 +5,8 @@
import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.service.IDeviceRepairService;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
@@ -18,54 +19,54 @@
@RequestMapping("/device/repair")
@RestController
@AllArgsConstructor
-public class DeviceRepairController {
+public class DeviceRepairController extends BaseController {
private IDeviceRepairService deviceRepairService;
@Operation(summary = "璁惧鎶ヤ慨鍒楄〃")
@GetMapping("/page")
- public AjaxResult page(Page page , DeviceRepairDto deviceRepairDto) {
- return AjaxResult.success(deviceRepairService.queryPage(page,deviceRepairDto));
+ public R<?> page(Page page , DeviceRepairDto deviceRepairDto) {
+ return R.ok(deviceRepairService.queryPage(page,deviceRepairDto));
}
@PostMapping()
@Operation(summary = "娣诲姞璁惧鎶ヤ慨")
- public AjaxResult add( @RequestBody DeviceRepairDto deviceRepairDto) {
+ public R<?> add( @RequestBody DeviceRepairDto deviceRepairDto) {
return deviceRepairService.saveDeviceRepair(deviceRepairDto);
}
@Operation(summary = "鏍规嵁id鏌ヨ璁惧鎶ヤ慨")
@GetMapping("/{id}")
- public AjaxResult detail(@PathVariable Long id) {
- return AjaxResult.success(deviceRepairService.detailById(id));
+ public R<?> detail(@PathVariable Long id) {
+ return R.ok(deviceRepairService.detailById(id));
}
@PutMapping ()
@Operation(summary = "淇敼璁惧鎶ヤ慨")
- public AjaxResult update( @RequestBody DeviceRepairDto deviceRepairDto) {
+ public R<?> update( @RequestBody DeviceRepairDto deviceRepairDto) {
return deviceRepairService.updateDeviceRepair(deviceRepairDto);
}
@PostMapping ("/repair")
@Operation(summary = "璁惧缁翠慨")
- public AjaxResult repair( @RequestBody DeviceRepairDto deviceRepairDto) {
+ public R<?> repair( @RequestBody DeviceRepairDto deviceRepairDto) {
return deviceRepairService.confirmRepair(deviceRepairDto);
}
@PostMapping ("/acceptance")
@Operation(summary = "璁惧鎶ヤ慨楠屾敹瀹℃壒")
- public AjaxResult acceptance(@RequestBody DeviceRepairDto deviceRepairDto) {
+ public R<?> acceptance(@RequestBody DeviceRepairDto deviceRepairDto) {
return deviceRepairService.approveRepairAcceptance(deviceRepairDto);
}
@DeleteMapping("/{ids}")
@Operation(summary = "鍒犻櫎璁惧鎶ヤ慨")
- public AjaxResult delete(@PathVariable("ids") Long[] ids) {
+ public R<?> delete(@PathVariable("ids") Long[] ids) {
boolean b = deviceRepairService.removeBatchByIds(Arrays.asList(ids));
if (!b) {
- return AjaxResult.error("鍒犻櫎澶辫触");
+ return R.fail("鍒犻櫎澶辫触");
}
- return AjaxResult.success();
+ return R.ok();
}
@PostMapping("export")
diff --git a/src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java b/src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java
index b6f8c27..76fefc3 100644
--- a/src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java
+++ b/src/main/java/com/ruoyi/device/controller/MaintenanceTaskController.java
@@ -6,7 +6,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
@@ -31,7 +31,7 @@
@GetMapping("/listPage")
@Operation(summary = "璁惧淇濆吇瀹氭椂浠诲姟鍒楄〃")
- public AjaxResult listPage(Page page, MaintenanceTask maintenanceTask) {
+ public R<?> listPage(Page page, MaintenanceTask maintenanceTask) {
return maintenanceTaskService.listPage(page,maintenanceTask);
}
@@ -39,21 +39,21 @@
@PostMapping("/add")
@Operation(summary = "娣诲姞璁惧淇濆吇瀹氭椂浠诲姟")
@Log(title = "璁惧淇濆吇瀹氭椂浠诲姟", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody MaintenanceTask maintenanceTask) {
+ public R<?> add(@RequestBody MaintenanceTask maintenanceTask) {
return maintenanceTaskService.add(maintenanceTask);
}
@PostMapping("/update")
@Operation(summary = "淇敼璁惧淇濆吇瀹氭椂浠诲姟")
@Log(title = "璁惧淇濆吇瀹氭椂浠诲姟", businessType = BusinessType.UPDATE)
- public AjaxResult update(@RequestBody MaintenanceTask maintenanceTask) {
+ public R<?> update(@RequestBody MaintenanceTask maintenanceTask) {
return maintenanceTaskService.updateByMaintenanceTaskId(maintenanceTask);
}
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎璁惧淇濆吇瀹氭椂浠诲姟")
@Log(title = "璁惧淇濆吇瀹氭椂浠诲姟", businessType = BusinessType.DELETE)
- public AjaxResult delete(@RequestBody List<Long> ids) {
+ public R<?> delete(@RequestBody List<Long> ids) {
return maintenanceTaskService.delete(ids);
}
diff --git a/src/main/java/com/ruoyi/device/service/IDeviceLedgerService.java b/src/main/java/com/ruoyi/device/service/IDeviceLedgerService.java
index d34ea65..a0d954e 100644
--- a/src/main/java/com/ruoyi/device/service/IDeviceLedgerService.java
+++ b/src/main/java/com/ruoyi/device/service/IDeviceLedgerService.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.device.dto.DeviceLedgerDto;
import com.ruoyi.device.pojo.DeviceLedger;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import org.springframework.web.multipart.MultipartFile;
import jakarta.servlet.http.HttpServletResponse;
@@ -14,9 +14,9 @@
public interface IDeviceLedgerService extends IService<DeviceLedger> {
IPage<DeviceLedgerDto> queryPage(Page page, DeviceLedgerDto deviceLedger);
- AjaxResult saveDeviceLedger(DeviceLedger deviceLedger);
+ R<?> saveDeviceLedger(DeviceLedger deviceLedger);
- AjaxResult updateDeviceLedger(DeviceLedger deviceLedger);
+ R<?> updateDeviceLedger(DeviceLedger deviceLedger);
void export(HttpServletResponse response, Long[] ids);
diff --git a/src/main/java/com/ruoyi/device/service/IDeviceMaintenanceService.java b/src/main/java/com/ruoyi/device/service/IDeviceMaintenanceService.java
index e5a4080..6f0077f 100644
--- a/src/main/java/com/ruoyi/device/service/IDeviceMaintenanceService.java
+++ b/src/main/java/com/ruoyi/device/service/IDeviceMaintenanceService.java
@@ -6,7 +6,7 @@
import com.ruoyi.device.dto.DeviceMaintenanceDto;
import com.ruoyi.device.pojo.DeviceMaintenance;
import com.ruoyi.device.vo.DeviceMaintenanceVo;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import jakarta.servlet.http.HttpServletResponse;
@@ -14,9 +14,9 @@
IPage<DeviceMaintenanceDto> queryPage(Page page, DeviceMaintenanceDto deviceMaintenanceDto);
- AjaxResult saveDeviceRepair(DeviceMaintenanceDto deviceMaintenance);
+ R<?> saveDeviceRepair(DeviceMaintenanceDto deviceMaintenance);
- AjaxResult updateDeviceDeviceMaintenance(DeviceMaintenanceDto deviceMaintenance);
+ R<?> updateDeviceDeviceMaintenance(DeviceMaintenanceDto deviceMaintenance);
void export(HttpServletResponse response, Long[] ids);
diff --git a/src/main/java/com/ruoyi/device/service/IDeviceRepairService.java b/src/main/java/com/ruoyi/device/service/IDeviceRepairService.java
index ae0b913..f6e112c 100644
--- a/src/main/java/com/ruoyi/device/service/IDeviceRepairService.java
+++ b/src/main/java/com/ruoyi/device/service/IDeviceRepairService.java
@@ -6,7 +6,7 @@
import com.ruoyi.device.dto.DeviceRepairDto;
import com.ruoyi.device.pojo.DeviceRepair;
import com.ruoyi.device.vo.DeviceRepairVo;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import jakarta.servlet.http.HttpServletResponse;
@@ -15,13 +15,13 @@
IPage<DeviceRepairVo> queryPage(Page page, DeviceRepairDto deviceRepairDto);
- AjaxResult saveDeviceRepair(DeviceRepairDto deviceRepairDto);
+ R<?> saveDeviceRepair(DeviceRepairDto deviceRepairDto);
- AjaxResult updateDeviceRepair(DeviceRepairDto deviceRepairDto);
+ R<?> updateDeviceRepair(DeviceRepairDto deviceRepairDto);
- AjaxResult confirmRepair(DeviceRepairDto deviceRepairDto);
+ R<?> confirmRepair(DeviceRepairDto deviceRepairDto);
- AjaxResult approveRepairAcceptance(DeviceRepairDto deviceRepairDto);
+ R<?> approveRepairAcceptance(DeviceRepairDto deviceRepairDto);
void export(HttpServletResponse response, Long[] ids);
diff --git a/src/main/java/com/ruoyi/device/service/MaintenanceTaskService.java b/src/main/java/com/ruoyi/device/service/MaintenanceTaskService.java
index 19cb6ed..3364d0a 100644
--- a/src/main/java/com/ruoyi/device/service/MaintenanceTaskService.java
+++ b/src/main/java/com/ruoyi/device/service/MaintenanceTaskService.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.device.pojo.MaintenanceTask;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import java.util.List;
@@ -12,11 +12,11 @@
* @date : 2025/12/22 14:56
*/
public interface MaintenanceTaskService extends IService<MaintenanceTask> {
- AjaxResult listPage(Page page, MaintenanceTask maintenanceTask);
+ R<?> listPage(Page page, MaintenanceTask maintenanceTask);
- AjaxResult add(MaintenanceTask maintenanceTask);
+ R<?> add(MaintenanceTask maintenanceTask);
- AjaxResult updateByMaintenanceTaskId(MaintenanceTask maintenanceTask);
+ R<?> updateByMaintenanceTaskId(MaintenanceTask maintenanceTask);
- AjaxResult delete(List<Long> ids);
+ R<?> delete(List<Long> ids);
}
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
index b4c5d65..2b9c9be 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceLedgerServiceImpl.java
@@ -13,7 +13,7 @@
import com.ruoyi.device.mapper.DeviceLedgerMapper;
import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.device.service.IDeviceLedgerService;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
import jakarta.servlet.http.HttpServletResponse;
@@ -44,25 +44,25 @@
}
@Override
- public AjaxResult saveDeviceLedger(DeviceLedger deviceLedger) {
+ public R<?> saveDeviceLedger(DeviceLedger deviceLedger) {
LambdaQueryWrapper<DeviceLedger> deviceLedgerLambdaQueryWrapper = new LambdaQueryWrapper<>();
deviceLedgerLambdaQueryWrapper.eq(DeviceLedger::getDeviceName,deviceLedger.getDeviceName());
if (this.count(deviceLedgerLambdaQueryWrapper) > 0) {
- return AjaxResult.error("璁惧鍚嶇О宸插瓨鍦�");
+ return R.fail("璁惧鍚嶇О宸插瓨鍦�");
}
boolean save = this.save(deviceLedger);
if (save){
- return AjaxResult.success();
+ return R.ok();
}
- return AjaxResult.error();
+ return R.fail();
}
@Override
- public AjaxResult updateDeviceLedger(DeviceLedger deviceLedger) {
+ public R<?> updateDeviceLedger(DeviceLedger deviceLedger) {
if (this.updateById(deviceLedger)) {
- return AjaxResult.success();
+ return R.ok();
}
- return AjaxResult.error();
+ return R.fail();
}
@Override
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
index fbf03ad..779714f 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceMaintenanceServiceImpl.java
@@ -15,7 +15,7 @@
import com.ruoyi.device.service.IDeviceMaintenanceService;
import com.ruoyi.device.vo.DeviceMaintenanceVo;
import com.ruoyi.device.vo.DeviceRepairVo;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.measuringinstrumentledger.mapper.SparePartsMapper;
import com.ruoyi.measuringinstrumentledger.pojo.SpareParts;
import com.ruoyi.measuringinstrumentledger.pojo.SparePartsRequisitionRecord;
@@ -48,19 +48,19 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public AjaxResult saveDeviceRepair(DeviceMaintenanceDto deviceMaintenance) {
+ public R<?> saveDeviceRepair(DeviceMaintenanceDto deviceMaintenance) {
boolean save = this.save(deviceMaintenance);
if (save){
// 澶勭悊鍥剧墖涓婁紶
fileUtil.saveStorageAttachmentByRecordTypeAndRecordId("file", RecordTypeEnum.DEVICE_MAINTENANCE, deviceMaintenance.getId(), deviceMaintenance.getStorageBlobDTOs());
- return AjaxResult.success();
+ return R.ok();
}
- return AjaxResult.error();
+ return R.fail();
}
@Override
@Transactional(rollbackFor = Exception.class)
- public AjaxResult updateDeviceDeviceMaintenance(DeviceMaintenanceDto deviceMaintenance) {
+ public R<?> updateDeviceDeviceMaintenance(DeviceMaintenanceDto deviceMaintenance) {
DeviceMaintenance oldDeviceMaintenance = this.getById(deviceMaintenance.getId());
// 澶勭悊澶囦欢浣跨敤鎯呭喌
if (com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(deviceMaintenance.getSparePartsUseList())) {
@@ -85,7 +85,7 @@
record.setQuantity(sparePartUse.getQuantity());
sparePartsRequisitionRecordService.save(record);
} else {
- return AjaxResult.error("澶囦欢 " + spareParts.getName() + " 鏁伴噺涓嶈冻");
+ return R.fail("澶囦欢 " + spareParts.getName() + " 鏁伴噺涓嶈冻");
}
}
}
@@ -98,9 +98,9 @@
if (this.updateById(deviceMaintenance)) {
// 澶勭悊鍥剧墖涓婁紶
fileUtil.saveStorageAttachmentByRecordTypeAndRecordId("file", RecordTypeEnum.DEVICE_MAINTENANCE, deviceMaintenance.getId(), deviceMaintenance.getStorageBlobDTOs());
- return AjaxResult.success();
+ return R.ok();
}
- return AjaxResult.error();
+ return R.fail();
}
@Override
diff --git a/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
index e5a73ac..98f0d27 100644
--- a/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/DeviceRepairServiceImpl.java
@@ -18,7 +18,7 @@
import com.ruoyi.device.service.IDeviceLedgerService;
import com.ruoyi.device.service.IDeviceRepairService;
import com.ruoyi.device.vo.DeviceRepairVo;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.measuringinstrumentledger.mapper.SparePartsMapper;
import com.ruoyi.measuringinstrumentledger.pojo.SpareParts;
import com.ruoyi.measuringinstrumentledger.pojo.SparePartsRequisitionRecord;
@@ -63,7 +63,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public AjaxResult saveDeviceRepair(DeviceRepairDto deviceRepairDto) {
+ public R<?> saveDeviceRepair(DeviceRepairDto deviceRepairDto) {
DeviceLedger byId = deviceLedgerService.getById(deviceRepairDto.getDeviceLedgerId());
deviceRepairDto.setDeviceName(byId.getDeviceName());
deviceRepairDto.setDeviceModel(byId.getDeviceModel());
@@ -74,23 +74,23 @@
if (save) {
// 澶勭悊鍥剧墖涓婁紶
fileUtil.saveStorageAttachmentByRecordTypeAndRecordId("file", RecordTypeEnum.DEVICE_REPAIR, deviceRepairDto.getId(), deviceRepairDto.getStorageBlobDTOs());
- return AjaxResult.success();
+ return R.ok();
}
- return AjaxResult.error("淇濆瓨澶辫触");
+ return R.fail("淇濆瓨澶辫触");
}
@Override
@Transactional(rollbackFor = Exception.class)
- public AjaxResult updateDeviceRepair(DeviceRepairDto deviceRepairDto) {
+ public R<?> updateDeviceRepair(DeviceRepairDto deviceRepairDto) {
DeviceRepair oldDeviceRepair = this.getById(deviceRepairDto.getId());
if (oldDeviceRepair == null) {
- return AjaxResult.error("鎶ヤ慨璁板綍涓嶅瓨鍦�");
+ return R.fail("鎶ヤ慨璁板綍涓嶅瓨鍦�");
}
if (deviceRepairDto.getStatus() != null
&& deviceRepairDto.getStatus() == STATUS_COMPLETED
&& (oldDeviceRepair.getStatus() == null
|| oldDeviceRepair.getStatus() != STATUS_COMPLETED)) {
- return AjaxResult.error("璇峰厛鎻愪氦楠屾敹瀹℃壒锛岄獙鏀堕�氳繃鍚庢墠鍙畬缁�");
+ return R.fail("璇峰厛鎻愪氦楠屾敹瀹℃壒锛岄獙鏀堕�氳繃鍚庢墠鍙畬缁�");
}
// 澶勭悊澶囦欢浣跨敤鎯呭喌
if (CollectionUtils.isNotEmpty(deviceRepairDto.getSparePartsUseList())) {
@@ -115,7 +115,7 @@
record.setQuantity(sparePartUse.getQuantity());
sparePartsRequisitionRecordService.save(record);
} else {
- return AjaxResult.error("澶囦欢 " + spareParts.getName() + " 鏁伴噺涓嶈冻");
+ return R.fail("澶囦欢 " + spareParts.getName() + " 鏁伴噺涓嶈冻");
}
}
}
@@ -142,23 +142,23 @@
if (deviceRepairDto.getStorageBlobDTOs() != null) {
fileUtil.saveStorageAttachmentByRecordTypeAndRecordId("file", RecordTypeEnum.DEVICE_REPAIR, id, deviceRepairDto.getStorageBlobDTOs());
}
- return AjaxResult.success();
+ return R.ok();
}
- return AjaxResult.error();
+ return R.fail();
}
@Override
@Transactional(rollbackFor = Exception.class)
- public AjaxResult confirmRepair(DeviceRepairDto deviceRepairDto) {
+ public R<?> confirmRepair(DeviceRepairDto deviceRepairDto) {
DeviceRepair oldDeviceRepair = this.getById(deviceRepairDto.getId());
if (oldDeviceRepair == null) {
- return AjaxResult.error("鎶ヤ慨璁板綍涓嶅瓨鍦�");
+ return R.fail("鎶ヤ慨璁板綍涓嶅瓨鍦�");
}
if (oldDeviceRepair.getStatus() != null && oldDeviceRepair.getStatus() == STATUS_COMPLETED) {
- return AjaxResult.error("璇ユ姤淇凡瀹岀粨锛屼笉鑳介噸澶嶇‘璁ょ淮淇�");
+ return R.fail("璇ユ姤淇凡瀹岀粨锛屼笉鑳介噸澶嶇‘璁ょ淮淇�");
}
if (oldDeviceRepair.getStatus() != null && oldDeviceRepair.getStatus() == STATUS_PENDING_ACCEPTANCE) {
- return AjaxResult.error("璇ユ姤淇凡鎻愪氦楠屾敹瀹℃壒");
+ return R.fail("璇ユ姤淇凡鎻愪氦楠屾敹瀹℃壒");
}
deviceRepairDto.setStatus(STATUS_PENDING_ACCEPTANCE);
return updateDeviceRepair(deviceRepairDto);
@@ -166,25 +166,25 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public AjaxResult approveRepairAcceptance(DeviceRepairDto deviceRepairDto) {
+ public R<?> approveRepairAcceptance(DeviceRepairDto deviceRepairDto) {
if (deviceRepairDto.getId() == null) {
- return AjaxResult.error("鎶ヤ慨璁板綍id涓嶈兘涓虹┖");
+ return R.fail("鎶ヤ慨璁板綍id涓嶈兘涓虹┖");
}
DeviceRepair oldDeviceRepair = this.getById(deviceRepairDto.getId());
if (oldDeviceRepair == null) {
- return AjaxResult.error("鎶ヤ慨璁板綍涓嶅瓨鍦�");
+ return R.fail("鎶ヤ慨璁板綍涓嶅瓨鍦�");
}
if (oldDeviceRepair.getStatus() == null || oldDeviceRepair.getStatus() != STATUS_PENDING_ACCEPTANCE) {
- return AjaxResult.error("璇ユ姤淇湭杩涘叆寰呴獙鏀剁姸鎬侊紝涓嶈兘瀹℃壒");
+ return R.fail("璇ユ姤淇湭杩涘叆寰呴獙鏀剁姸鎬侊紝涓嶈兘瀹℃壒");
}
if (StringUtils.isBlank(deviceRepairDto.getAcceptanceName())) {
- return AjaxResult.error("楠屾敹浜轰笉鑳戒负绌�");
+ return R.fail("楠屾敹浜轰笉鑳戒负绌�");
}
if (deviceRepairDto.getAcceptanceTime() == null) {
- return AjaxResult.error("楠屾敹鏃堕棿涓嶈兘涓虹┖");
+ return R.fail("楠屾敹鏃堕棿涓嶈兘涓虹┖");
}
if (StringUtils.isBlank(deviceRepairDto.getAcceptanceRemark())) {
- return AjaxResult.error("楠屾敹澶囨敞涓嶈兘涓虹┖");
+ return R.fail("楠屾敹澶囨敞涓嶈兘涓虹┖");
}
DeviceRepair update = new DeviceRepair();
@@ -194,9 +194,9 @@
update.setAcceptanceRemark(deviceRepairDto.getAcceptanceRemark());
update.setStatus(STATUS_COMPLETED);
if (this.updateById(update)) {
- return AjaxResult.success();
+ return R.ok();
}
- return AjaxResult.error("楠屾敹瀹℃壒澶辫触");
+ return R.fail("楠屾敹瀹℃壒澶辫触");
}
@Override
diff --git a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java b/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java
index 3aaac94..8d0caee 100644
--- a/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java
+++ b/src/main/java/com/ruoyi/device/service/impl/MaintenanceTaskServiceImpl.java
@@ -6,7 +6,8 @@
import com.ruoyi.device.mapper.MaintenanceTaskMapper;
import com.ruoyi.device.pojo.MaintenanceTask;
import com.ruoyi.device.service.MaintenanceTaskService;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.inspectiontask.pojo.TimingTask;
import com.ruoyi.inspectiontask.service.impl.TimingTaskServiceImpl;
import com.ruoyi.project.system.domain.SysUser;
@@ -33,11 +34,11 @@
private final MaintenanceTaskScheduler maintenanceTaskScheduler;
@Override
- public AjaxResult listPage(Page page, MaintenanceTask maintenanceTask) {
+ public R<?> listPage(Page page, MaintenanceTask maintenanceTask) {
Page<MaintenanceTask> taskPage = maintenanceTaskMapper.selectPage(page, null);
// 2. 濡傛灉娌℃湁鏁版嵁锛岀洿鎺ヨ繑鍥炵┖鍒嗛〉
if (taskPage.getRecords().isEmpty()) {
- return AjaxResult.success(taskPage);
+ return R.ok(taskPage);
}
// 3. 鏀堕泦鎵�鏈夐渶瑕佹煡璇㈢殑鐢ㄦ埛ID
@@ -62,11 +63,11 @@
task.setRegistrant(userNickNameMap.getOrDefault(task.getRegistrantId(), "鏈煡鐢ㄦ埛"));
}
});
- return AjaxResult.success(taskPage);
+ return R.ok(taskPage);
}
@Override
- public AjaxResult add(MaintenanceTask maintenanceTask) {
+ public R<?> add(MaintenanceTask maintenanceTask) {
maintenanceTask.setActive(true);
// 璁＄畻棣栨鎵ц鏃堕棿
TimingTask task = new TimingTask();
@@ -78,31 +79,31 @@
if (insert > 0) {
maintenanceTaskScheduler.scheduleMaintenanceTask(maintenanceTask);
}
- return AjaxResult.success("娣诲姞鎴愬姛");
+ return R.ok(null, "娣诲姞鎴愬姛");
}
@Override
- public AjaxResult updateByMaintenanceTaskId(MaintenanceTask maintenanceTask) {
+ public R<?> updateByMaintenanceTaskId(MaintenanceTask maintenanceTask) {
MaintenanceTask maintenanceTask1 = maintenanceTaskMapper.selectById(maintenanceTask.getId());
if (maintenanceTask1 == null) {
- return AjaxResult.warn("娌℃湁姝ゆ暟鎹�");
+ return R.fail(HttpStatus.WARN, "娌℃湁姝ゆ暟鎹�");
}
BeanUtils.copyProperties(maintenanceTask, maintenanceTask1);
int update = maintenanceTaskMapper.updateById(maintenanceTask1);
if (update > 0) {
maintenanceTaskScheduler.rescheduleMaintenanceTask(maintenanceTask1);
}
- return AjaxResult.success("鏇存柊鎴愬姛");
+ return R.ok(null, "鏇存柊鎴愬姛");
}
@Override
- public AjaxResult delete(List<Long> ids) {
+ public R<?> delete(List<Long> ids) {
int delete = maintenanceTaskMapper.deleteBatchIds(ids);
if (delete > 0) {
ids.forEach(id -> {
maintenanceTaskScheduler.unscheduleMaintenanceTask(id);
});
}
- return AjaxResult.success("鍒犻櫎鎴愬姛");
+ return R.ok(null, "鍒犻櫎鎴愬姛");
}
}
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java
index bba6088..c08958b 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/ElectricityConsumptionAreaController.java
@@ -8,7 +8,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
@@ -36,26 +36,26 @@
@GetMapping("/listPage")
@Operation(summary = "鐢ㄧ數鍖哄煙-鍒嗛〉鏌ヨ")
@Log(title = "鐢ㄧ數鍖哄煙-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPage(Page page, ElectricityConsumptionArea electricityConsumptionArea) {
+ public R<?> listPage(Page page, ElectricityConsumptionArea electricityConsumptionArea) {
IPage<ElectricityConsumptionArea> listPage = electricityConsumptionAreaService.listPage(page, electricityConsumptionArea);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
}
@PostMapping("/add")
@Operation(summary = "鐢ㄧ數鍖哄煙-鏂板")
@Log(title = "鐢ㄧ數鍖哄煙-鏂板", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody ElectricityConsumptionArea electricityConsumptionArea) {
+ public R<?> add(@RequestBody ElectricityConsumptionArea electricityConsumptionArea) {
boolean save = electricityConsumptionAreaService.saveOrUpdate(electricityConsumptionArea);
- return save ? AjaxResult.success() : AjaxResult.error();
+ return save ? R.ok() : R.fail();
}
@DeleteMapping("/delete")
@Operation(summary = "鐢ㄧ數鍖哄煙-鍒犻櫎")
@Log(title = "鐢ㄧ數鍖哄煙-鍒犻櫎", businessType = BusinessType.DELETE)
- public AjaxResult delete(@RequestBody List<Long> ids) {
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ public R<?> delete(@RequestBody List<Long> ids) {
+ if(CollectionUtils.isEmpty(ids)) return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
boolean remove = electricityConsumptionAreaService.removeBatchByIds(ids);
- return remove ? AjaxResult.success() : AjaxResult.error();
+ return remove ? R.ok() : R.fail();
}
}
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java
index e0409b5..e0f3ed1 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EnergyPeriodController.java
@@ -8,7 +8,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.servlet.http.HttpServletResponse;
@@ -28,42 +28,42 @@
@GetMapping("/listPage")
@Operation(summary = "鐢ㄧ數鏃舵-鍒嗛〉鏌ヨ")
@Log(title = "鐢ㄧ數鏃舵-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPage(Page page, EnergyPeriod energyPeriod) {
+ public R<?> listPage(Page page, EnergyPeriod energyPeriod) {
IPage<EnergyPeriod> listPage = energyPeriodService.listPage(page, energyPeriod);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
}
@PostMapping("/add")
@Operation(summary = "鐢ㄧ數鏃舵-鏂板")
@Log(title = "鐢ㄧ數鏃舵-鏂板", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody EnergyPeriod energyPeriod) {
+ public R<?> add(@RequestBody EnergyPeriod energyPeriod) {
boolean save = energyPeriodService.save(energyPeriod);
- return save ? AjaxResult.success() : AjaxResult.error();
+ return save ? R.ok() : R.fail();
}
@PostMapping("/addBatch")
@Operation(summary = "鐢ㄧ數鏃舵-鎵归噺鏂板")
@Log(title = "鐢ㄧ數鏃舵-鎵归噺鏂板", businessType = BusinessType.INSERT)
- public AjaxResult addBatch(@RequestBody List<EnergyPeriod> energyPeriods) {
+ public R<?> addBatch(@RequestBody List<EnergyPeriod> energyPeriods) {
boolean save = energyPeriodService.saveBatch(energyPeriods);
- return save ? AjaxResult.success() : AjaxResult.error();
+ return save ? R.ok() : R.fail();
}
@PostMapping("/update")
@Operation(summary = "鐢ㄧ數鏃舵-淇敼")
@Log(title = "鐢ㄧ數鏃舵-淇敼", businessType = BusinessType.UPDATE)
- public AjaxResult update(@RequestBody EnergyPeriod energyPeriod) {
+ public R<?> update(@RequestBody EnergyPeriod energyPeriod) {
boolean update = energyPeriodService.updateById(energyPeriod);
- return update ? AjaxResult.success() : AjaxResult.error();
+ return update ? R.ok() : R.fail();
}
@DeleteMapping("/delete")
@Operation(summary = "鐢ㄧ數鏃舵-鍒犻櫎")
@Log(title = "鐢ㄧ數鏃舵-鍒犻櫎", businessType = BusinessType.DELETE)
- public AjaxResult delete(@RequestBody List<Long> ids) {
- if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ public R<?> delete(@RequestBody List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
boolean remove = energyPeriodService.removeBatchByIds(ids);
- return remove ? AjaxResult.success() : AjaxResult.error("鍒犻櫎澶辫触");
+ return remove ? R.ok() : R.fail("鍒犻櫎澶辫触");
}
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java
index d401a99..c18d5f7 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/controller/EquipmentEnergyConsumptionController.java
@@ -12,7 +12,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
@@ -41,50 +41,50 @@
@GetMapping("/listPage")
@Operation(summary = "璁惧鑳借��-鍒嗛〉鏌ヨ")
@Log(title = "璁惧鑳借��-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPage(Page page, EquipmentEnergyConsumption equipmentEnergyConsumption) {
+ public R<?> listPage(Page page, EquipmentEnergyConsumption equipmentEnergyConsumption) {
IPage<EquipmentEnergyConsumption> listPage = equipmentEnergyConsumptionService.listPage(page, equipmentEnergyConsumption);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
}
@GetMapping("/deviceList")
@Operation(summary = "璁惧鍙拌处-鏌ヨ")
@Log(title = "璁惧鍙拌处-鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult deviceList(DeviceLedger deviceLedger) {
+ public R<?> deviceList(DeviceLedger deviceLedger) {
List<DeviceLedger> listPage = equipmentEnergyConsumptionService.deviceList(deviceLedger);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
}
@PostMapping("/add")
@Operation(summary = "璁惧鑳借��-鏂板")
@Log(title = "璁惧鑳借��-鏂板", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody EquipmentEnergyConsumption equipmentEnergyConsumption) {
+ public R<?> add(@RequestBody EquipmentEnergyConsumption equipmentEnergyConsumption) {
boolean save = equipmentEnergyConsumptionService.save(equipmentEnergyConsumption);
- return save ? AjaxResult.success() : AjaxResult.error();
+ return save ? R.ok() : R.fail();
}
@PostMapping("/addBatch")
@Operation(summary = "璁惧鑳借��-鎵归噺鏂板")
@Log(title = "璁惧鑳借��-鎵归噺鏂板", businessType = BusinessType.INSERT)
- public AjaxResult addBatch(@RequestBody List<EquipmentEnergyConsumption> list) {
+ public R<?> addBatch(@RequestBody List<EquipmentEnergyConsumption> list) {
boolean save = equipmentEnergyConsumptionService.saveBatch(list);
- return save ? AjaxResult.success() : AjaxResult.error();
+ return save ? R.ok() : R.fail();
}
@PostMapping("/update")
@Operation(summary = "璁惧鑳借��-淇敼")
@Log(title = "璁惧鑳借��-淇敼", businessType = BusinessType.UPDATE)
- public AjaxResult update(@RequestBody EquipmentEnergyConsumption equipmentEnergyConsumption) {
+ public R<?> update(@RequestBody EquipmentEnergyConsumption equipmentEnergyConsumption) {
boolean update = equipmentEnergyConsumptionService.updateById(equipmentEnergyConsumption);
- return update ? AjaxResult.success() : AjaxResult.error();
+ return update ? R.ok() : R.fail();
}
@DeleteMapping("/delete")
@Operation(summary = "璁惧鑳借��-鍒犻櫎")
@Log(title = "璁惧鑳借��-鍒犻櫎", businessType = BusinessType.DELETE)
- public AjaxResult delete(@RequestBody List<Long> ids) {
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ public R<?> delete(@RequestBody List<Long> ids) {
+ if(CollectionUtils.isEmpty(ids)) return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
boolean remove = equipmentEnergyConsumptionService.removeBatchByIds(ids);
- return remove ? AjaxResult.success() : AjaxResult.error();
+ return remove ? R.ok() : R.fail();
}
/**
@@ -93,7 +93,7 @@
@Log(title = "瀵煎叆璁惧鑳借��", businessType = BusinessType.IMPORT)
@PostMapping("/importData")
@Operation(summary = "瀵煎叆璁惧鑳借��")
- public AjaxResult importData(MultipartFile file) throws Exception {
+ public R<?> importData(MultipartFile file) throws Exception {
return equipmentEnergyConsumptionService.importData(file);
}
@@ -114,9 +114,9 @@
@GetMapping("/listPageByTrend")
@Operation(summary = "璁惧鑳借��-鑳芥簮瓒嬪娍-鍒嗛〉鏌ヨ")
@Log(title = "璁惧鑳借��-鑳芥簮瓒嬪娍-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPageByTrend(Page page, EquipmentEnergyConsumption equipmentEnergyConsumption) {
+ public R<?> listPageByTrend(Page page, EquipmentEnergyConsumption equipmentEnergyConsumption) {
IPage<EquipmentEnergyConsumption> listPage = equipmentEnergyConsumptionService.listPageByTrend(page, equipmentEnergyConsumption);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
}
/**
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/service/EquipmentEnergyConsumptionService.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/EquipmentEnergyConsumptionService.java
index 830e808..fabe267 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/service/EquipmentEnergyConsumptionService.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/EquipmentEnergyConsumptionService.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.device.pojo.DeviceLedger;
import com.ruoyi.equipmentenergyconsumption.pojo.EquipmentEnergyConsumption;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@@ -19,7 +19,7 @@
IPage<EquipmentEnergyConsumption> listPage(Page page, EquipmentEnergyConsumption equipmentEnergyConsumption);
- AjaxResult importData(MultipartFile file);
+ R<?> importData(MultipartFile file);
IPage<EquipmentEnergyConsumption> listPageByTrend(Page page, EquipmentEnergyConsumption equipmentEnergyConsumption);
diff --git a/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EquipmentEnergyConsumptionServiceImpl.java b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EquipmentEnergyConsumptionServiceImpl.java
index 486ad48..063a163 100644
--- a/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EquipmentEnergyConsumptionServiceImpl.java
+++ b/src/main/java/com/ruoyi/equipmentenergyconsumption/service/impl/EquipmentEnergyConsumptionServiceImpl.java
@@ -10,7 +10,8 @@
import com.ruoyi.equipmentenergyconsumption.mapper.EquipmentEnergyConsumptionMapper;
import com.ruoyi.equipmentenergyconsumption.pojo.EquipmentEnergyConsumption;
import com.ruoyi.equipmentenergyconsumption.service.EquipmentEnergyConsumptionService;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.framework.web.domain.R;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -41,18 +42,18 @@
}
@Override
- public AjaxResult importData(MultipartFile file) {
+ public R<?> importData(MultipartFile file) {
try {
ExcelUtil<EquipmentEnergyConsumption> util = new ExcelUtil<EquipmentEnergyConsumption>(EquipmentEnergyConsumption.class);
List<EquipmentEnergyConsumption> userList = util.importExcel(file.getInputStream());
if(CollectionUtils.isEmpty(userList)){
- return AjaxResult.warn("妯℃澘閿欒鎴栧鍏ユ暟鎹负绌�");
+ return R.fail(HttpStatus.WARN, "妯℃澘閿欒鎴栧鍏ユ暟鎹负绌�");
}
this.saveOrUpdateBatch(userList);
- return AjaxResult.success(true);
+ return R.ok(true);
}catch (Exception e){
e.printStackTrace();
- return AjaxResult.error("瀵煎叆澶辫触");
+ return R.fail("瀵煎叆澶辫触");
}
}
diff --git a/src/main/java/com/ruoyi/framework/web/controller/BaseController.java b/src/main/java/com/ruoyi/framework/web/controller/BaseController.java
index 5c6fe3e..3edde93 100644
--- a/src/main/java/com/ruoyi/framework/web/controller/BaseController.java
+++ b/src/main/java/com/ruoyi/framework/web/controller/BaseController.java
@@ -16,7 +16,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.sql.SqlUtil;
import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.framework.web.page.PageDomain;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.framework.web.page.TableSupport;
@@ -93,69 +93,69 @@
/**
* 杩斿洖鎴愬姛
*/
- public AjaxResult success()
+ public R<?> success()
{
- return AjaxResult.success();
+ return R.ok();
}
/**
* 杩斿洖鎴愬姛娑堟伅
*/
- public AjaxResult success(String message)
+ public R<?> success(String message)
{
- return AjaxResult.success(message);
+ return R.ok(null, message);
}
/**
* 杩斿洖鎴愬姛娑堟伅
*/
- public AjaxResult success(Object data)
+ public R<?> success(Object data)
{
- return AjaxResult.success(data);
+ return R.ok(data);
}
/**
* 杩斿洖澶辫触娑堟伅
*/
- public AjaxResult error()
+ public R<?> error()
{
- return AjaxResult.error();
+ return R.fail();
}
/**
* 杩斿洖澶辫触娑堟伅
*/
- public AjaxResult error(String message)
+ public R<?> error(String message)
{
- return AjaxResult.error(message);
+ return R.fail(message);
}
/**
* 杩斿洖璀﹀憡娑堟伅
*/
- public AjaxResult warn(String message)
+ public R<?> warn(String message)
{
- return AjaxResult.warn(message);
+ return R.fail(HttpStatus.WARN, message);
}
/**
* 鍝嶅簲杩斿洖缁撴灉
- *
+ *
* @param rows 褰卞搷琛屾暟
* @return 鎿嶄綔缁撴灉
*/
- protected AjaxResult toAjax(int rows)
+ protected R<?> toAjax(int rows)
{
- return rows > 0 ? AjaxResult.success() : AjaxResult.error();
+ return rows > 0 ? R.ok() : R.fail();
}
/**
* 鍝嶅簲杩斿洖缁撴灉
- *
+ *
* @param result 缁撴灉
* @return 鎿嶄綔缁撴灉
*/
- protected AjaxResult toAjax(boolean result)
+ protected R<?> toAjax(boolean result)
{
return result ? success() : error();
}
diff --git a/src/main/java/com/ruoyi/home/controller/HomeController.java b/src/main/java/com/ruoyi/home/controller/HomeController.java
index 41ae224..8ef87a5 100644
--- a/src/main/java/com/ruoyi/home/controller/HomeController.java
+++ b/src/main/java/com/ruoyi/home/controller/HomeController.java
@@ -5,12 +5,12 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.home.annotation.DefaultType;
import com.ruoyi.home.dto.*;
import com.ruoyi.home.service.HomeService;
-import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -37,288 +37,288 @@
@GetMapping("/todos")
@Log(title = "寰呭姙浜嬮」", businessType = BusinessType.OTHER)
@Operation(summary = "寰呭姙浜嬮」")
- public AjaxResult todos(ApproveProcess req) throws ParseException {
+ public R todos(ApproveProcess req) throws ParseException {
List<ApproveProcess> approveProcessList = homeService.todos();
- return AjaxResult.success(approveProcessList);
+ return R.ok(approveProcessList);
}
@GetMapping("/approveAndDeviceTodos")
@Operation(summary = "瀹℃壒鍗忓悓锛岃澶囨姤淇緟鍔炰簨椤�")
- public AjaxResult approveAndDeviceTodos(){
+ public R approveAndDeviceTodos(){
Map<String, Object> map = homeService.approveAndDeviceTodos();
- return AjaxResult.success(map);
+ return R.ok(map);
}
@GetMapping("/noticesCount")
@Operation(summary = "鏈繃鏈熺殑鍏憡鏁伴噺")
- public AjaxResult noticesCount(){
+ public R noticesCount(){
Long count = homeService.noticesCount();
- return AjaxResult.success(count);
+ return R.ok(count);
}
@GetMapping("/deptStaffDistribution")
@Operation(summary = "鍚勯儴闂ㄤ汉鍛樺垎甯�")
- public AjaxResult deptStaffDistribution() {
+ public R deptStaffDistribution() {
DeptStaffDistributionDto dto = homeService.deptStaffDistribution();
- return AjaxResult.success(dto);
+ return R.ok(dto);
}
@GetMapping("/summaryStatistics")
@Operation(summary = "鍛樺伐-瀹㈡埛-渚涘簲鍟嗘�绘暟")
- public AjaxResult summaryStatistics() {
+ public R summaryStatistics() {
HomeSummaryDto homeSummaryDto = homeService.summaryStatistics();
- return AjaxResult.success(homeSummaryDto);
+ return R.ok(homeSummaryDto);
}
/********************************************************钀ラ攢閲囪喘绫�**************************************************/
@GetMapping("/supplierPurchaseRanking")
@Operation(summary = "渚涘簲鍟嗛噰璐帓鍚�")
- public AjaxResult supplierPurchaseRanking(@DefaultType Integer type) {
+ public R supplierPurchaseRanking(@DefaultType Integer type) {
List<SupplierPurchaseRankingDto> list = homeService.supplierPurchaseRanking(type);
- return AjaxResult.success(list);
+ return R.ok(list);
}
@GetMapping("/customerRevenueAnalysis")
@Operation(summary = "瀹㈡埛钀ユ敹璐＄尞鏁板�煎垎鏋�")
- public AjaxResult customerRevenueAnalysis(Long customerId, @DefaultType Integer type) {
+ public R customerRevenueAnalysis(Long customerId, @DefaultType Integer type) {
CustomerRevenueAnalysisDto dto = homeService.customerRevenueAnalysis(customerId, type);
- return AjaxResult.success(dto);
+ return R.ok(dto);
}
@GetMapping("/customerContributionRanking")
@Operation(summary = "瀹㈡埛閲戦璐＄尞鎺掑悕")
- public AjaxResult customerContributionRanking(@DefaultType Integer type) {
+ public R customerContributionRanking(@DefaultType Integer type) {
List<CustomerContributionRankingDto> list = homeService.customerContributionRanking(type);
- return AjaxResult.success(list);
+ return R.ok(list);
}
@GetMapping("/productSalesAnalysis")
@Operation(summary = "鍚勪骇鍝侀攢鍞噾棰濆垎鏋�")
- public AjaxResult productSalesAnalysis() {
+ public R productSalesAnalysis() {
List<MapDto> list = homeService.productSalesAnalysis();
- return AjaxResult.success(list);
+ return R.ok(list);
}
@GetMapping("/rawMaterialPurchaseAmountRatio")
@Operation(summary = "鍘熸潗鏂欓噰璐噾棰濆崰姣�")
- public AjaxResult rawMaterialPurchaseAmountRatio(){
+ public R rawMaterialPurchaseAmountRatio(){
List<MapDto> list = homeService.rawMaterialPurchaseAmountRatio();
- return AjaxResult.success(list);
+ return R.ok(list);
}
@GetMapping("/business")
@Log(title = "閿�鍞�-閲囪喘-搴撳瓨鏁版嵁", businessType = BusinessType.OTHER)
@Operation(summary = "閿�鍞�-閲囪喘-搴撳瓨鏁版嵁")
- public AjaxResult business(HomeBusinessDto req) {
+ public R business(HomeBusinessDto req) {
HomeBusinessDto homeBusinessDto = homeService.business();
- return AjaxResult.success(homeBusinessDto);
+ return R.ok(homeBusinessDto);
}
@GetMapping("/analysisCustomerContractAmounts")
@Log(title = "瀹㈡埛鍚堝悓閲戦鍒嗘瀽", businessType = BusinessType.OTHER)
@Operation(summary = "瀹㈡埛鍚堝悓閲戦鍒嗘瀽")
- public AjaxResult analysisCustomerContractAmounts(AnalysisCustomerContractAmountsDto req) {
+ public R analysisCustomerContractAmounts(AnalysisCustomerContractAmountsDto req) {
AnalysisCustomerContractAmountsDto analysisCustomerContractAmounts = homeService.analysisCustomerContractAmounts();
- return AjaxResult.success(analysisCustomerContractAmounts);
+ return R.ok(analysisCustomerContractAmounts);
}
/********************************************************鐢熶骇绫�*****************************************************/
@GetMapping("/inputOutputAnalysis")
@Operation(summary = "鎶曞叆浜у嚭鍒嗘瀽")
- public AjaxResult inputOutputAnalysis(@DefaultType Integer type){
+ public R inputOutputAnalysis(@DefaultType Integer type){
List<InputOutputAnalysisDto> list = homeService.inputOutputAnalysis(type);
- return AjaxResult.success(list);
+ return R.ok(list);
}
@GetMapping("/processOutputAnalysis")
@Operation(summary = "宸ュ簭浜у嚭鍒嗘瀽")
- public AjaxResult processOutputAnalysis(@DefaultType Integer type){
+ public R processOutputAnalysis(@DefaultType Integer type){
List<MapDto> list = homeService.processOutputAnalysis(type);
- return AjaxResult.success(list);
+ return R.ok(list);
}
@GetMapping("/workOrderEfficiencyAnalysis")
@Operation(summary = "宸ュ崟鎵ц鏁堢巼鍒嗘瀽")
- public AjaxResult workOrderEfficiencyAnalysis(@DefaultType Integer type){
+ public R workOrderEfficiencyAnalysis(@DefaultType Integer type){
List<WorkOrderEfficiencyDto> list = homeService.workOrderEfficiencyAnalysis(type);
- return AjaxResult.success(list);
+ return R.ok(list);
}
@GetMapping("/productionAccountingAnalysis")
@Operation(summary = "鐢熶骇鏍哥畻鍒嗘瀽")
- public AjaxResult productionAccountingAnalysis(@DefaultType Integer type){
+ public R productionAccountingAnalysis(@DefaultType Integer type){
List<ProductionAccountingDto> list = homeService.productionAccountingAnalysis(type);
- return AjaxResult.success(list);
+ return R.ok(list);
}
@GetMapping("/orderCount")
@Operation(summary = "璁㈠崟鏁�")
- public AjaxResult orderCount(){
- return AjaxResult.success(homeService.orderCount());
+ public R orderCount(){
+ return R.ok(homeService.orderCount());
}
@GetMapping("/progressStatistics")
@Operation(summary = "鍚勭敓浜ц鍗曠殑瀹屾垚杩涘害缁熻")
- public AjaxResult progressStatistics(){
+ public R progressStatistics(){
ProductionProgressDto productionProgressDto = homeService.productionProgress();
- return AjaxResult.success(productionProgressDto);
+ return R.ok(productionProgressDto);
}
@GetMapping("/workInProcessTurnover")
@Operation(summary = "鍦ㄥ埗鍝佸懆杞儏鍐�")
- public AjaxResult workInProcessTurnover(){
+ public R workInProcessTurnover(){
ProductionTurnoverDto productionTurnoverDto = homeService.workInProcessTurnover();
- return AjaxResult.success(productionTurnoverDto);
+ return R.ok(productionTurnoverDto);
}
@GetMapping("/processDataProductionStatistics")
@Operation(summary = "宸ュ簭鏁版嵁鐢熶骇缁熻鏁版嵁")
- public AjaxResult processDataProductionStatistics(@DefaultType Integer type,@RequestParam(required = false) List<Long> processIds) {
+ public R processDataProductionStatistics(@DefaultType Integer type,@RequestParam(required = false) List<Long> processIds) {
List<processDataProductionStatisticsDto> list = homeService.processDataProductionStatistics(type, processIds);
- return AjaxResult.success(list);
+ return R.ok(list);
}
/********************************************************璐ㄩ噺绫�*****************************************************/
@GetMapping("/rawMaterialDetection")
@Operation(summary = "鍘熸潗鏂欐娴�")
- public AjaxResult rawMaterialDetection(@DefaultType Integer type){
- return AjaxResult.success(homeService.rawMaterialDetection(type));
+ public R rawMaterialDetection(@DefaultType Integer type){
+ return R.ok(homeService.rawMaterialDetection(type));
}
@GetMapping("/processDetection")
@Operation(summary = "杩囩▼妫�娴�")
- public AjaxResult processDetection(@DefaultType Integer type){
- return AjaxResult.success(homeService.processDetection(type));
+ public R processDetection(@DefaultType Integer type){
+ return R.ok(homeService.processDetection(type));
}
@GetMapping("/factoryDetection")
@Operation(summary = "鎴愬搧鍑哄巶妫�娴�")
- public AjaxResult factoryDetection(@DefaultType Integer type){
- return AjaxResult.success(homeService.factoryDetection(type));
+ public R factoryDetection(@DefaultType Integer type){
+ return R.ok(homeService.factoryDetection(type));
}
@GetMapping("/qualityInspectionCount")
@Operation(summary = "璐ㄩ噺妫�楠屾暟閲�")
- public AjaxResult qualityInspectionCount(){
+ public R qualityInspectionCount(){
QualityInspectionCountDto qualityInspectionCountDto = homeService.qualityInspectionCount();
- return AjaxResult.success(qualityInspectionCountDto);
+ return R.ok(qualityInspectionCountDto);
}
@GetMapping("/nonComplianceWarning")
@Operation(summary = "涓嶅悎鏍奸璀�")
- public AjaxResult nonComplianceWarning(){
+ public R nonComplianceWarning(){
NonComplianceWarningDto nonComplianceWarningDto = homeService.nonComplianceWarning();
- return AjaxResult.success(nonComplianceWarningDto);
+ return R.ok(nonComplianceWarningDto);
}
@GetMapping("/completedInspectionCount")
@Operation(summary = "瀹屾垚妫�楠屾暟")
- public AjaxResult completedInspectionCount(){
+ public R completedInspectionCount(){
List<CompletedInspectionCountDto> list = homeService.completedInspectionCount();
- return AjaxResult.success(list);
+ return R.ok(list);
}
@GetMapping("/unqualifiedProductRanking")
@Operation(summary = "涓嶅悎鏍间骇鍝佹帓鍚�")
- public AjaxResult unqualifiedProductRanking(){
+ public R unqualifiedProductRanking(){
List<UnqualifiedProductRankDto> list = homeService.unqualifiedProductRanking();
- return AjaxResult.success(list);
+ return R.ok(list);
}
@GetMapping("/unqualifiedProductProcessingAnalysis")
@Operation(summary = "涓嶅悎鏍兼鍝佸鐞嗗垎鏋�")
- public AjaxResult unqualifiedProductProcessingAnalysis(){
+ public R unqualifiedProductProcessingAnalysis(){
List<MapDto> list = homeService.unqualifiedProductProcessingAnalysis();
- return AjaxResult.success(list);
+ return R.ok(list);
}
@GetMapping("/qualityStatistics")
@Log(title = "璐ㄩ噺鍒嗘瀽", businessType = BusinessType.OTHER)
@Operation(summary = "璐ㄩ噺鍒嗘瀽")
- public AjaxResult qualityStatistics(QualityStatisticsDto req) {
+ public R qualityStatistics(QualityStatisticsDto req) {
QualityStatisticsDto qualityStatisticsDto = homeService.qualityStatistics();
- return AjaxResult.success(qualityStatisticsDto);
+ return R.ok(qualityStatisticsDto);
}
@GetMapping("/qualityInspectionStatistics")
@Operation(summary = "璐ㄩ噺缁熻")
- public AjaxResult qualityInspectionStatistics(@DefaultType Integer type) {
+ public R qualityInspectionStatistics(@DefaultType Integer type) {
QualityStatisticsDto dto = homeService.qualityInspectionStatistics(type);
- return AjaxResult.success(dto);
+ return R.ok(dto);
}
/********************************************************璐㈠姟绫�*****************************************************/
@GetMapping("/incomeExpenseAnalysis")
@Operation(summary = "鏀敹瀵规瘮鍒嗘瀽")
- public AjaxResult incomeExpenseAnalysis(@DefaultType Integer type) {
+ public R incomeExpenseAnalysis(@DefaultType Integer type) {
List<Map<String, Object>> result = homeService.incomeExpenseAnalysis(type);
- return AjaxResult.success(result);
+ return R.ok(result);
}
@GetMapping("/profitTrendAnalysis")
@Operation(summary = "鍒╂鼎瓒嬪娍鍒嗘瀽")
- public AjaxResult profitTrendAnalysis(){
+ public R profitTrendAnalysis(){
List<MapDto> list = homeService.profitTrendAnalysis();
- return AjaxResult.success(list);
+ return R.ok(list);
}
@GetMapping("/expenseCompositionAnalysis")
@Operation(summary = "鏋勬垚鍒嗘瀽")
- public AjaxResult expenseCompositionAnalysis(@DefaultType Integer type) {
+ public R expenseCompositionAnalysis(@DefaultType Integer type) {
List<MapDto> list = homeService.expenseCompositionAnalysis(type);
- return AjaxResult.success(list);
+ return R.ok(list);
}
@GetMapping("/monthlyIncome")
@Operation(summary = "鏈堝害鏀跺叆")
- public AjaxResult monthlyIncome(){
+ public R monthlyIncome(){
MonthlyIncomeDto dto = homeService.monthlyIncome();
- return AjaxResult.success(dto);
+ return R.ok(dto);
}
@GetMapping("/monthlyExpenditure")
@Operation(summary = "鏈堝害鏀嚭")
- public AjaxResult monthlyExpenditure(){
+ public R monthlyExpenditure(){
MonthlyExpenditureDto dto = homeService.monthlyExpenditure();
- return AjaxResult.success(dto);
+ return R.ok(dto);
}
@GetMapping("/statisticsReceivablePayable")
@Log(title = "搴旀敹搴斾粯缁熻", businessType = BusinessType.OTHER)
@Operation(summary = "搴旀敹搴斾粯缁熻")
- public AjaxResult statisticsReceivablePayable(StatisticsReceivablePayableDto req, @DefaultType Integer type ) {
+ public R statisticsReceivablePayable(StatisticsReceivablePayableDto req, @DefaultType Integer type ) {
StatisticsReceivablePayableDto statisticsReceivablePayable = homeService.statisticsReceivablePayable(type);
- return AjaxResult.success(statisticsReceivablePayable);
+ return R.ok(statisticsReceivablePayable);
}
/********************************************************浠撳偍绫�*****************************************************/
@GetMapping("/productCategoryDistribution")
@Operation(summary = "浜у搧澶х被鍒嗗竷")
- public AjaxResult productCategoryDistribution() {
+ public R productCategoryDistribution() {
ProductCategoryDistributionDto dto = homeService.productCategoryDistribution();
- return AjaxResult.success(dto);
+ return R.ok(dto);
}
@GetMapping("/salesPurchaseStorageProductCount")
@Operation(summary = "閿�鍞�-閲囪喘-鍌ㄥ瓨浜у搧鏁�")
- public AjaxResult salesPurchaseStorageProductCount(){
+ public R salesPurchaseStorageProductCount(){
List<MapDto> list = homeService.salesPurchaseStorageProductCount();
- return AjaxResult.success(list);
+ return R.ok(list);
}
@GetMapping("/productInOutAnalysis")
@Operation(summary = "浜у搧鍑哄叆搴撳垎鏋�")
- public AjaxResult productInOutAnalysis(@DefaultType Integer type){
+ public R productInOutAnalysis(@DefaultType Integer type){
List<Map<String, Object>> result = homeService.productInOutAnalysis(type);
- return AjaxResult.success(result);
+ return R.ok(result);
}
@GetMapping("/productTurnoverDays")
@Operation(summary = "浜у搧鍛ㄨ浆澶╂暟")
- public AjaxResult productTurnoverDays(){
+ public R productTurnoverDays(){
List<MapDto> list = homeService.productTurnoverDays();
- return AjaxResult.success(list);
+ return R.ok(list);
}
}
diff --git a/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java b/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
index 9b4779e..d1f325f 100644
--- a/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
+++ b/src/main/java/com/ruoyi/lavorissue/controller/LavorIssueController.java
@@ -11,7 +11,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.lavorissue.dto.StatisticsLaborIssue;
import com.ruoyi.lavorissue.mapper.LavorIssueMapper;
import com.ruoyi.lavorissue.pojo.LaborIssue;
@@ -52,24 +52,24 @@
@GetMapping("/listPage")
@Log(title = "鍔充繚鍙戞斁-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
@Operation(summary = "鍔充繚鍙戞斁-鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, LaborIssue laborIssue){
+ public R<?> listPage(Page page, LaborIssue laborIssue){
IPage<LaborIssue> listPage = laborIssueService.listPage(page, laborIssue);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
}
@GetMapping("/statisticsList")
@Log(title = "鍔充繚鍙戞斁-缁熻鏌ヨ", businessType = BusinessType.OTHER)
@Operation(summary = "鍔充繚鍙戞斁-缁熻鏌ヨ")
- public AjaxResult statisticsList(LaborIssue laborIssue){
+ public R<?> statisticsList(LaborIssue laborIssue){
List<Map<String, Object>> listPage = laborIssueService.statisticsList(laborIssue);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
}
@PostMapping("/add")
@Log(title = "鍔充繚鍙戞斁-娣诲姞", businessType = BusinessType.INSERT)
@Operation(summary = "鍔充繚鍙戞斁-娣诲姞")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult add(@RequestBody LaborIssue laborIssue){
+ public R<?> add(@RequestBody LaborIssue laborIssue){
String today = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd"));
StartAndEndDateDto dateTime = DailyRedisCounter.getDateTime();
Long approveId = lavorIssueMapper.selectCount(new LambdaQueryWrapper<LaborIssue>()
@@ -84,32 +84,32 @@
laborIssue.setOrderNo(String.format("%03d", l + 1));
}
boolean save = laborIssueService.save(laborIssue);
- return save ? AjaxResult.success() : AjaxResult.error();
+ return save ? R.ok() : R.fail();
}
@PostMapping("/update")
@Log(title = "鍔充繚鍙戞斁-淇敼", businessType = BusinessType.UPDATE)
@Operation(summary = "鍔充繚鍙戞斁-淇敼")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult update(@RequestBody LaborIssue laborIssue){
+ public R<?> update(@RequestBody LaborIssue laborIssue){
boolean update = laborIssueService.updateById(laborIssue);
- return update ? AjaxResult.success() : AjaxResult.error();
+ return update ? R.ok() : R.fail();
}
@DeleteMapping("/delete")
@Log(title = "鍔充繚鍙戞斁-鍒犻櫎", businessType = BusinessType.DELETE)
@Operation(summary = "鍔充繚鍙戞斁-鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult delete(@RequestBody List<Long> ids){
+ public R<?> delete(@RequestBody List<Long> ids){
boolean delete = laborIssueService.removeBatchByIds(ids);
- return delete ? AjaxResult.success() : AjaxResult.error();
+ return delete ? R.ok() : R.fail();
}
@GetMapping("/statistics")
@Operation(summary = "鍔充繚鍙戞斁-缁熻")
- public AjaxResult statistics(StatisticsLaborIssue req) throws Exception {
+ public R<?> statistics(StatisticsLaborIssue req) throws Exception {
StatisticsLaborIssue statisticsLaborIssue = laborIssueService.statistics(req);
- return AjaxResult.success(statisticsLaborIssue);
+ return R.ok(statisticsLaborIssue);
}
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java
index e092741..1104c15 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerController.java
@@ -6,7 +6,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.measuringinstrumentledger.dto.MeasuringInstrumentLedgerDto;
import com.ruoyi.measuringinstrumentledger.mapper.MeasuringInstrumentLedgerRecordMapper;
import com.ruoyi.measuringinstrumentledger.pojo.MeasuringInstrumentLedger;
@@ -43,9 +43,9 @@
@GetMapping("/listPage")
@Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处-鍒嗛〉鏌ヨ")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPage(Page page, MeasuringInstrumentLedger measuringInstrumentLedger) {
+ public R<?> listPage(Page page, MeasuringInstrumentLedger measuringInstrumentLedger) {
IPage<MeasuringInstrumentLedger> listPage = measuringInstrumentLedgerService.listPage(page, measuringInstrumentLedger);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
}
@@ -53,59 +53,59 @@
@Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处-鏂板")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处-鏂板", businessType = BusinessType.INSERT)
@Transactional(rollbackFor = Exception.class)
- public AjaxResult add(@RequestBody MeasuringInstrumentLedger measuringInstrumentLedger) throws IOException {
+ public R<?> add(@RequestBody MeasuringInstrumentLedger measuringInstrumentLedger) throws IOException {
boolean save = measuringInstrumentLedgerService.add(measuringInstrumentLedger);
if (save) {
- return AjaxResult.success();
+ return R.ok();
}
- return AjaxResult.error();
+ return R.fail();
}
@PostMapping("/update")
@Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处-淇敼")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处-淇敼", businessType = BusinessType.UPDATE)
@Transactional(rollbackFor = Exception.class)
- public AjaxResult update(@RequestBody MeasuringInstrumentLedger measuringInstrumentLedger) {
+ public R<?> update(@RequestBody MeasuringInstrumentLedger measuringInstrumentLedger) {
SysUser sysUser = sysUserMapper.selectUserById(measuringInstrumentLedger.getUserId());
if (sysUser == null) {
- return AjaxResult.error("鐢ㄦ埛涓嶅瓨鍦�");
+ return R.fail("鐢ㄦ埛涓嶅瓨鍦�");
}
measuringInstrumentLedger.setUserName(sysUser.getUserName());
boolean update = measuringInstrumentLedgerService.updateById(measuringInstrumentLedger);
if (update) {
- return AjaxResult.success();
+ return R.ok();
}
- return AjaxResult.error();
+ return R.fail();
}
@DeleteMapping("/delete")
@Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处-鍒犻櫎")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处-鍒犻櫎", businessType = BusinessType.DELETE)
@Transactional(rollbackFor = Exception.class)
- public AjaxResult delete(@RequestBody List<Long> ids) {
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ public R<?> delete(@RequestBody List<Long> ids) {
+ if(CollectionUtils.isEmpty(ids)) return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
for (Long id : ids) {
LambdaQueryWrapper<MeasuringInstrumentLedgerRecord> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(MeasuringInstrumentLedgerRecord::getMeasuringInstrumentLedgerId,id);
List<MeasuringInstrumentLedgerRecord> measuringInstrumentLedgerRecords = measuringInstrumentLedgerRecordMapper.selectList(queryWrapper);
if(!CollectionUtils.isEmpty(measuringInstrumentLedgerRecords)){
- return AjaxResult.error("璇峰厛鍒犻櫎閫変腑璁￠噺鍣ㄥ叿鍙拌处涓嬬殑鎵�鏈夋瀹氳褰�");
+ return R.fail("璇峰厛鍒犻櫎閫変腑璁￠噺鍣ㄥ叿鍙拌处涓嬬殑鎵�鏈夋瀹氳褰�");
}
}
boolean delete = measuringInstrumentLedgerService.removeBatchByIds(ids);
if (delete) {
- return AjaxResult.success();
+ return R.ok();
}
- return AjaxResult.error();
+ return R.fail();
}
@PostMapping("/verifying")
@Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处-妫�瀹�")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处-妫�瀹�", businessType = BusinessType.UPDATE)
@Transactional(rollbackFor = Exception.class)
- public AjaxResult verifying(@RequestBody MeasuringInstrumentLedgerDto measuringInstrumentLedger) throws IOException {
+ public R<?> verifying(@RequestBody MeasuringInstrumentLedgerDto measuringInstrumentLedger) throws IOException {
boolean update = measuringInstrumentLedgerService.verifying(measuringInstrumentLedger);
- return update ? AjaxResult.success("妫�瀹氭垚鍔�") : AjaxResult.error("妫�瀹氬け璐�");
+ return update ? R.ok(null, "妫�瀹氭垚鍔�") : R.fail("妫�瀹氬け璐�");
}
/**
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java
index 370d41d..73e756b 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/MeasuringInstrumentLedgerRecordController.java
@@ -5,7 +5,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.measuringinstrumentledger.pojo.MeasuringInstrumentLedgerRecord;
import com.ruoyi.measuringinstrumentledger.service.MeasuringInstrumentLedgerRecordService;
import io.jsonwebtoken.lang.Collections;
@@ -36,29 +36,29 @@
@GetMapping("/listPage")
@Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒嗛〉鏌ヨ")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPage(Page page, MeasuringInstrumentLedgerRecord measuringInstrumentLedgerRecord){
+ public R<?> listPage(Page page, MeasuringInstrumentLedgerRecord measuringInstrumentLedgerRecord){
IPage<MeasuringInstrumentLedgerRecord> listPage = measuringInstrumentLedgerRecordService.listPage(page, measuringInstrumentLedgerRecord);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
}
@PostMapping("/update")
@Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-淇敼")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-淇敼", businessType = BusinessType.UPDATE)
@Transactional(rollbackFor = Exception.class)
- public AjaxResult update(@RequestBody MeasuringInstrumentLedgerRecord measuringInstrumentLedgerRecord) throws IOException {
+ public R<?> update(@RequestBody MeasuringInstrumentLedgerRecord measuringInstrumentLedgerRecord) throws IOException {
boolean update = measuringInstrumentLedgerRecordService.updateMeasuringInstrumentLedgerRecord(measuringInstrumentLedgerRecord);
if (update) {
- return AjaxResult.success();
+ return R.ok();
}
- return AjaxResult.error();
+ return R.fail();
}
@DeleteMapping("/delete")
@Operation(summary = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒犻櫎")
@Log(title = "璁￠噺鍣ㄥ叿鍙拌处璁板綍-鍒犻櫎", businessType = BusinessType.DELETE)
- public AjaxResult delete(@RequestBody List<Long> ids) {
- if(Collections.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁");
- return AjaxResult.success(measuringInstrumentLedgerRecordService.removeBatchByIds(ids));
+ public R<?> delete(@RequestBody List<Long> ids) {
+ if(Collections.isEmpty(ids)) return R.fail("璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁");
+ return R.ok(measuringInstrumentLedgerRecordService.removeBatchByIds(ids));
}
/**
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsController.java b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsController.java
index 5a328c1..3d8336b 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsController.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsController.java
@@ -5,7 +5,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.measuringinstrumentledger.dto.SparePartsDto;
import com.ruoyi.measuringinstrumentledger.pojo.SpareParts;
import com.ruoyi.measuringinstrumentledger.service.SparePartsService;
@@ -21,19 +22,19 @@
@RequestMapping("/spareParts")
@Tag(name = "澶囦欢鍒嗙被鎺ュ彛")
@AllArgsConstructor
-public class SparePartsController {
+public class SparePartsController extends BaseController {
private SparePartsService sparePartsService;
@GetMapping("/getTree")
@Operation(summary = "澶囦欢鍒嗙被-鏍戠粨鏋�")
- public AjaxResult getTree(){
+ public R<?> getTree(){
List<SparePartsDto> tree = sparePartsService.getTree();
- return AjaxResult.success(tree);
+ return R.ok(tree);
}
@GetMapping("/listPage")
@Operation(summary = "澶囦欢鍒嗙被-鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, SpareParts spareParts){
+ public R<?> listPage(Page page, SpareParts spareParts){
IPage<SparePartsDto> listPage = sparePartsService.listPage(page, spareParts);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
}
// @GetMapping("/list")
// @Operation(summary = "澶囦欢鍒嗙被-鏌ヨ鎵�鏈�")
@@ -43,20 +44,20 @@
@PostMapping("/add")
@Operation(summary = "澶囦欢鍒嗙被-娣诲姞")
@Log(title = "澶囦欢鍒嗙被-娣诲姞", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody SpareParts spareParts){
- return AjaxResult.success(sparePartsService.save(spareParts));
+ public R<?> add(@RequestBody SpareParts spareParts){
+ return R.ok(sparePartsService.save(spareParts));
}
@PostMapping("/update")
@Operation(summary = "澶囦欢鍒嗙被-鏇存柊")
@Log(title = "澶囦欢鍒嗙被-鏇存柊", businessType = BusinessType.UPDATE)
- public AjaxResult update(@RequestBody SpareParts spareParts){
- return AjaxResult.success(sparePartsService.updateById(spareParts));
+ public R<?> update(@RequestBody SpareParts spareParts){
+ return R.ok(sparePartsService.updateById(spareParts));
}
@DeleteMapping("/delete/{id}")
@Operation(summary = "澶囦欢鍒嗙被-鍒犻櫎")
@Log(title = "澶囦欢鍒嗙被-鍒犻櫎", businessType = BusinessType.DELETE)
- public AjaxResult delete(@PathVariable Long id){
- return AjaxResult.success(sparePartsService.removeById(id));
+ public R<?> delete(@PathVariable Long id){
+ return R.ok(sparePartsService.removeById(id));
}
}
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsRequisitionRecordController.java b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsRequisitionRecordController.java
index 26195a4..5c93a4d 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsRequisitionRecordController.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/controller/SparePartsRequisitionRecordController.java
@@ -2,7 +2,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.measuringinstrumentledger.dto.SparePartsRequisitionRecordDto;
import com.ruoyi.measuringinstrumentledger.service.SparePartsRequisitionRecordService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -24,13 +25,13 @@
@RequestMapping("/sparePartsRequisitionRecord")
@Tag(name = "澶囦欢棰嗙敤璁板綍鎺ュ彛")
@AllArgsConstructor
-public class SparePartsRequisitionRecordController {
+public class SparePartsRequisitionRecordController extends BaseController {
private SparePartsRequisitionRecordService sparePartsRequisitionRecordService;
@GetMapping("/listPage")
@Operation(summary = "澶囦欢鍒嗙被-鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, SparePartsRequisitionRecordDto sparePartsRequisitionRecordDto){
+ public R<?> listPage(Page page, SparePartsRequisitionRecordDto sparePartsRequisitionRecordDto){
IPage<SparePartsRequisitionRecordDto> listPage = sparePartsRequisitionRecordService.listPage(page, sparePartsRequisitionRecordDto);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
}
}
diff --git a/src/main/java/com/ruoyi/officesupplies/controller/OfficeSuppliesController.java b/src/main/java/com/ruoyi/officesupplies/controller/OfficeSuppliesController.java
index 3588d6c..8347921 100644
--- a/src/main/java/com/ruoyi/officesupplies/controller/OfficeSuppliesController.java
+++ b/src/main/java/com/ruoyi/officesupplies/controller/OfficeSuppliesController.java
@@ -7,7 +7,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.officesupplies.pojo.OfficeSupplies;
import com.ruoyi.officesupplies.service.OfficeSuppliesService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -38,14 +38,14 @@
@GetMapping("/listPage")
@Operation(summary = "鍔炲叕鐗╄祫-鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, OfficeSupplies officeSupplies) {
+ public R<?> listPage(Page page, OfficeSupplies officeSupplies) {
return officeSuppliesService.listPage(page, officeSupplies);
}
@PostMapping("/add")
@Operation(summary = "鍔炲叕鐗╄祫-娣诲姞")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult add(@RequestBody OfficeSupplies officeSupplies) {
+ public R<?> add(@RequestBody OfficeSupplies officeSupplies) {
// 鎸夌収褰撳墠鏃堕棿yyyyMMdd + 褰撳ぉ鏂板鏁伴噺 + 1鐢熸垚缂栧彿
// 鑾峰彇褰撳ぉ鏂板鏁伴噺
long count = officeSuppliesService.count(new LambdaQueryWrapper<OfficeSupplies>()
@@ -55,22 +55,22 @@
officeSupplies.setCode(code);
officeSupplies.setStatus(1);
officeSupplies.setApplyTime(new Date());
- return officeSuppliesService.save(officeSupplies) ? success() : error();
+ return officeSuppliesService.save(officeSupplies) ? R.ok() : R.fail();
}
@PostMapping("/update")
@Operation(summary = "鍔炲叕鐗╄祫-淇敼")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult update(@RequestBody OfficeSupplies officeSupplies) {
- return officeSuppliesService.updateById(officeSupplies) ? success() : error();
+ public R<?> update(@RequestBody OfficeSupplies officeSupplies) {
+ return officeSuppliesService.updateById(officeSupplies) ? R.ok() : R.fail();
}
@DeleteMapping("/delete")
@Operation(summary = "鍔炲叕鐗╄祫-鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult delete(@RequestBody List<Long> ids) {
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return officeSuppliesService.removeBatchByIds(ids) ? success() : error();
+ public R<?> delete(@RequestBody List<Long> ids) {
+ if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return officeSuppliesService.removeBatchByIds(ids) ? R.ok() : R.fail();
}
/**
diff --git a/src/main/java/com/ruoyi/officesupplies/service/OfficeSuppliesService.java b/src/main/java/com/ruoyi/officesupplies/service/OfficeSuppliesService.java
index 3a521b5..4f6f9ce 100644
--- a/src/main/java/com/ruoyi/officesupplies/service/OfficeSuppliesService.java
+++ b/src/main/java/com/ruoyi/officesupplies/service/OfficeSuppliesService.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.officesupplies.pojo.OfficeSupplies;
/**
@@ -18,5 +18,5 @@
* @param officeSupplies
* @return
*/
- AjaxResult listPage(Page page, OfficeSupplies officeSupplies);
+ R<?> listPage(Page page, OfficeSupplies officeSupplies);
}
diff --git a/src/main/java/com/ruoyi/officesupplies/service/impl/OfficeSuppliesServiceImpl.java b/src/main/java/com/ruoyi/officesupplies/service/impl/OfficeSuppliesServiceImpl.java
index abdc1c7..f366b6c 100644
--- a/src/main/java/com/ruoyi/officesupplies/service/impl/OfficeSuppliesServiceImpl.java
+++ b/src/main/java/com/ruoyi/officesupplies/service/impl/OfficeSuppliesServiceImpl.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.officesupplies.mapper.OfficeSuppliesMapper;
import com.ruoyi.officesupplies.pojo.OfficeSupplies;
import com.ruoyi.officesupplies.service.OfficeSuppliesService;
@@ -23,8 +23,8 @@
private final OfficeSuppliesMapper officeSuppliesMapper;
@Override
- public AjaxResult listPage(Page page, OfficeSupplies officeSupplies) {
+ public R<?> listPage(Page page, OfficeSupplies officeSupplies) {
IPage<OfficeSupplies> list = officeSuppliesMapper.listPage(page, officeSupplies);
- return AjaxResult.success(list);
+ return R.ok(list);
}
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/GasTankWarningController.java b/src/main/java/com/ruoyi/procurementrecord/controller/GasTankWarningController.java
index ea214c2..135198f 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/GasTankWarningController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/GasTankWarningController.java
@@ -3,7 +3,8 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.procurementrecord.pojo.GasTankWarning;
import com.ruoyi.procurementrecord.service.GasTankWarningService;
import jakarta.servlet.http.HttpServletResponse;
@@ -15,28 +16,28 @@
@RestController
@RequestMapping("/gasTankWarning")
@AllArgsConstructor
-public class GasTankWarningController {
+public class GasTankWarningController extends BaseController {
private GasTankWarningService gasTankWarningService;
@GetMapping("/listPage")
- public AjaxResult listPage(Page page, GasTankWarning gasTankWarning) {
- return AjaxResult.success(gasTankWarningService.listPage(page, gasTankWarning));
+ public R<?> listPage(Page page, GasTankWarning gasTankWarning) {
+ return R.ok(gasTankWarningService.listPage(page, gasTankWarning));
}
@PostMapping("/add")
- public AjaxResult add(@RequestBody GasTankWarning gasTankWarning) {
- return AjaxResult.success(gasTankWarningService.save(gasTankWarning));
+ public R<?> add(@RequestBody GasTankWarning gasTankWarning) {
+ return R.ok(gasTankWarningService.save(gasTankWarning));
}
@PostMapping("update")
- public AjaxResult update(@RequestBody GasTankWarning gasTankWarning) {
- return AjaxResult.success(gasTankWarningService.updateById(gasTankWarning));
+ public R<?> update(@RequestBody GasTankWarning gasTankWarning) {
+ return R.ok(gasTankWarningService.updateById(gasTankWarning));
}
@DeleteMapping("delete")
- public AjaxResult delete(@RequestBody List<Long> ids) {
- if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return AjaxResult.success(gasTankWarningService.removeByIds(ids));
+ public R<?> delete(@RequestBody List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.ok(gasTankWarningService.removeByIds(ids));
}
//瀵煎嚭
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/InboundManagementController.java b/src/main/java/com/ruoyi/procurementrecord/controller/InboundManagementController.java
index 0a2919d..d78a5e1 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/InboundManagementController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/InboundManagementController.java
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.procurementrecord.pojo.InboundManagement;
import com.ruoyi.procurementrecord.service.InboundManagementService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -30,35 +30,35 @@
@GetMapping("/listPage")
@Operation(summary = "鍒拌揣绠＄悊-鏌ヨ")
- public AjaxResult listPage(Page page, InboundManagement inboundManagement) {
+ public R<?> listPage(Page page, InboundManagement inboundManagement) {
IPage<InboundManagement> result = inboundManagementService.listPage(page, inboundManagement);
- return AjaxResult.success(result);
+ return R.ok(result);
}
@PostMapping("/add")
@Operation(summary = "鍒拌揣绠＄悊-娣诲姞")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult add(@RequestBody InboundManagement inboundManagement) {
+ public R<?> add(@RequestBody InboundManagement inboundManagement) {
inboundManagement.setArrivalTime(new Date());
boolean result = inboundManagementService.save(inboundManagement);
- return result ? AjaxResult.success() : AjaxResult.error();
+ return result ? R.ok() : R.fail();
}
@PostMapping("/update")
@Operation(summary = "鍒拌揣绠＄悊-淇敼")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult update(@RequestBody InboundManagement inboundManagement) {
+ public R<?> update(@RequestBody InboundManagement inboundManagement) {
boolean result = inboundManagementService.updateById(inboundManagement);
- return result ? AjaxResult.success() : AjaxResult.error();
+ return result ? R.ok() : R.fail();
}
@DeleteMapping("/del")
@Operation(summary = "鍒拌揣绠＄悊-鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult del(@RequestBody List<Long> ids) {
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ public R<?> del(@RequestBody List<Long> ids) {
+ if(CollectionUtils.isEmpty(ids)) return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
boolean result = inboundManagementService.removeByIds(ids);
- return result ? AjaxResult.success() : AjaxResult.error();
+ return result ? R.ok() : R.fail();
}
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementExceptionRecordController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementExceptionRecordController.java
index bb14493..df8b8e2 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementExceptionRecordController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementExceptionRecordController.java
@@ -1,7 +1,7 @@
package com.ruoyi.procurementrecord.controller;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.procurementrecord.mapper.ProcurementExceptionRecordMapper;
import com.ruoyi.procurementrecord.pojo.ProcurementExceptionRecord;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -23,13 +23,13 @@
@PostMapping("/add")
@Transactional
- public AjaxResult add(@RequestBody ProcurementExceptionRecord procurementExceptionRecord) {
- return AjaxResult.success(procurementExceptionRecordMapper.insert(procurementExceptionRecord));
+ public R<?> add(@RequestBody ProcurementExceptionRecord procurementExceptionRecord) {
+ return R.ok(procurementExceptionRecordMapper.insert(procurementExceptionRecord));
}
@PostMapping("/update")
@Transactional
- public AjaxResult updatePro(@RequestBody ProcurementExceptionRecord procurementExceptionRecord) {
- return AjaxResult.success(procurementExceptionRecordMapper.updateById(procurementExceptionRecord));
+ public R<?> updatePro(@RequestBody ProcurementExceptionRecord procurementExceptionRecord) {
+ return R.ok(procurementExceptionRecordMapper.updateById(procurementExceptionRecord));
}
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java
index 1d442a9..a110a5c 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPlanController.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.procurementrecord.pojo.ProcurementPlan;
import com.ruoyi.procurementrecord.service.ProcurementPlanService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -28,30 +28,30 @@
@RequestMapping("/listPage")
@Operation(summary = "閲囪喘璁″垝-鏌ヨ")
- public AjaxResult listPage(Page page, ProcurementPlan procurementPlan){
+ public R<?> listPage(Page page, ProcurementPlan procurementPlan){
IPage<ProcurementPlan> result = procurementPlanService.listPage(page, procurementPlan);
- return AjaxResult.success(result);
+ return R.ok(result);
}
@PostMapping("/add")
@Operation(summary = "閲囪喘璁″垝-娣诲姞")
- public AjaxResult add(@RequestBody ProcurementPlan procurementPlan){
+ public R<?> add(@RequestBody ProcurementPlan procurementPlan){
boolean result = procurementPlanService.save(procurementPlan);
- return result ? AjaxResult.success() : AjaxResult.error();
+ return result ? R.ok() : R.fail();
}
@PostMapping("/update")
@Operation(summary = "閲囪喘璁″垝-淇敼")
- public AjaxResult update(@RequestBody ProcurementPlan procurementPlan){
+ public R<?> update(@RequestBody ProcurementPlan procurementPlan){
boolean result = procurementPlanService.updateById(procurementPlan);
- return result ? AjaxResult.success() : AjaxResult.error();
+ return result ? R.ok() : R.fail();
}
@DeleteMapping("/del")
@Operation(summary = "閲囪喘璁″垝-鍒犻櫎")
- public AjaxResult del(@RequestBody List<Long> ids){
+ public R<?> del(@RequestBody List<Long> ids){
boolean result = procurementPlanService.removeByIds(ids);
- return result ? AjaxResult.success() : AjaxResult.error();
+ return result ? R.ok() : R.fail();
}
/**
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPriceManagementController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPriceManagementController.java
index 678446c..35ae216 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPriceManagementController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementPriceManagementController.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.procurementrecord.pojo.ProcurementPriceManagement;
import com.ruoyi.procurementrecord.service.ProcurementPriceManagementService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -29,36 +29,36 @@
@GetMapping("/listPage")
@Operation(summary = "閲囪喘浠锋牸绠＄悊-鏌ヨ")
- public AjaxResult listPage(Page page, ProcurementPriceManagement procurementPriceManagement){
+ public R<?> listPage(Page page, ProcurementPriceManagement procurementPriceManagement){
IPage<ProcurementPriceManagement> result = procurementPriceManagementService.listPage(page, procurementPriceManagement);
- return AjaxResult.success(result);
+ return R.ok(result);
}
@PostMapping("/add")
@Operation(summary = "閲囪喘浠锋牸绠＄悊-娣诲姞")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult add(@RequestBody ProcurementPriceManagement procurementPriceManagement){
+ public R<?> add(@RequestBody ProcurementPriceManagement procurementPriceManagement){
boolean result = procurementPriceManagementService.save(procurementPriceManagement);
- return result ? AjaxResult.success() : AjaxResult.error();
+ return result ? R.ok() : R.fail();
}
@PostMapping("/update")
@Operation(summary = "閲囪喘浠锋牸绠＄悊-淇敼")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult update(@RequestBody ProcurementPriceManagement procurementPriceManagement){
+ public R<?> update(@RequestBody ProcurementPriceManagement procurementPriceManagement){
boolean result = procurementPriceManagementService.updateById(procurementPriceManagement);
- return result ? AjaxResult.success() : AjaxResult.error();
+ return result ? R.ok() : R.fail();
}
@DeleteMapping("/del")
@Operation(summary = "閲囪喘浠锋牸绠＄悊-鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult delete(@RequestBody List<Long> ids){
+ public R<?> delete(@RequestBody List<Long> ids){
if (ids == null || ids.isEmpty()) {
- return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
boolean result = procurementPriceManagementService.removeByIds(ids);
- return result ? AjaxResult.success() : AjaxResult.error();
+ return result ? R.ok() : R.fail();
}
/**
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
index 7e49990..6f16f19 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
@@ -7,7 +7,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.procurementrecord.bean.dto.*;
import com.ruoyi.procurementrecord.mapper.CustomStorageMapper;
import com.ruoyi.procurementrecord.pojo.CustomStorage;
@@ -44,139 +44,139 @@
*/
@GetMapping("/getProcurementAmount")
@Operation(summary = "閫氳繃閿�鍞骇鍝乮d鑾峰彇鍏ュ簱鏁伴噺")
- public AjaxResult getProcurementAmount(@RequestParam("salesProductId") Long salesProductId) {
- return AjaxResult.success(procurementRecordService.getProcurementAmount(salesProductId));
+ public R<?> getProcurementAmount(@RequestParam("salesProductId") Long salesProductId) {
+ return R.ok(procurementRecordService.getProcurementAmount(salesProductId));
}
@GetMapping("/productlist")
@Log(title = "閲囪喘鍏ュ簱-鍏ュ簱绠＄悊-鏂板鍏ュ簱鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult list(ProcurementDto procurementDto) {
+ public R<?> list(ProcurementDto procurementDto) {
List<ProcurementDto> result = procurementRecordService.listProcurementBySalesLedgerId(procurementDto);
- return AjaxResult.success(result);
+ return R.ok(result);
}
@PostMapping("/add")
@Log(title = "閲囪喘鍏ュ簱-鍏ュ簱绠＄悊-鏂板鍏ュ簱", businessType = BusinessType.INSERT)
@Transactional
- public AjaxResult add(@RequestBody ProcurementAddDto procurementDto) {
+ public R<?> add(@RequestBody ProcurementAddDto procurementDto) {
procurementDto.setType(1);
procurementDto.setTypeName("閲囪喘鍏ュ簱");
- return AjaxResult.success(procurementRecordService.add(procurementDto));
+ return R.ok(procurementRecordService.add(procurementDto));
}
@PostMapping("/addCustom")
@Log(title = "鑷畾涔夊叆搴�-鍏ュ簱绠＄悊-鏂板鍏ュ簱", businessType = BusinessType.INSERT)
@Transactional
- public AjaxResult addCustom(@RequestBody List<CustomStorage> customStorage) {
+ public R<?> addCustom(@RequestBody List<CustomStorage> customStorage) {
return procurementRecordService.addCustom(customStorage);
}
@PostMapping("/updateCustom")
@Log(title = "鑷畾涔夊叆搴�-鍏ュ簱绠＄悊-淇敼鍏ュ簱", businessType = BusinessType.UPDATE)
@Transactional
- public AjaxResult updateCustom(@RequestBody CustomStorage customStorage) {
+ public R<?> updateCustom(@RequestBody CustomStorage customStorage) {
return procurementRecordService.updateCustom(customStorage);
}
@Delete("/delteCustom")
@Log(title = "鑷畾涔夊叆搴�-鍏ュ簱绠＄悊-鍒犻櫎鍏ュ簱", businessType = BusinessType.DELETE)
@Transactional
- public AjaxResult deleteCustom(@RequestBody List<Long> ids) {
+ public R<?> deleteCustom(@RequestBody List<Long> ids) {
return procurementRecordService.deleteCustom(ids);
}
@PostMapping("/update")
@Log(title = "閲囪喘鍏ュ簱-鍏ュ簱绠＄悊-淇敼鍏ュ簱", businessType = BusinessType.UPDATE)
@Transactional
- public AjaxResult updatePro(@RequestBody ProcurementUpdateDto procurementDto) {
- return AjaxResult.success(procurementRecordService.updatePro(procurementDto));
+ public R<?> updatePro(@RequestBody ProcurementUpdateDto procurementDto) {
+ return R.ok(procurementRecordService.updatePro(procurementDto));
}
@PostMapping("/updateManagement")
@Log(title = "鎴愬搧鍏ュ簱-搴撳瓨鍙拌处-淇敼", businessType = BusinessType.UPDATE)
@Transactional
- public AjaxResult updateManagement(@RequestBody ProcurementManagementUpdateDto procurementDto) {
- return AjaxResult.success(procurementRecordService.updateManagement(procurementDto));
+ public R<?> updateManagement(@RequestBody ProcurementManagementUpdateDto procurementDto) {
+ return R.ok(procurementRecordService.updateManagement(procurementDto));
}
@PostMapping("/updateManagementByCustom")
@Log(title = "鑷畾涔夊叆搴�-搴撳瓨鍙拌处-淇敼", businessType = BusinessType.UPDATE)
@Transactional
- public AjaxResult updateManagementByCustom(@RequestBody ProcurementManagementUpdateDto procurementDto) {
- return AjaxResult.success(procurementRecordService.updateManagementByCustom(procurementDto));
+ public R<?> updateManagementByCustom(@RequestBody ProcurementManagementUpdateDto procurementDto) {
+ return R.ok(procurementRecordService.updateManagementByCustom(procurementDto));
}
@PostMapping("/del")
@Log(title = "閲囪喘鍏ュ簱-鍏ュ簱绠＄悊-鍒犻櫎鍏ュ簱", businessType = BusinessType.DELETE)
@Transactional
- public AjaxResult deletePro(@RequestBody ProcurementUpdateDto procurementDto) {
- return AjaxResult.success(procurementRecordService.deletePro(procurementDto));
+ public R<?> deletePro(@RequestBody ProcurementUpdateDto procurementDto) {
+ return R.ok(procurementRecordService.deletePro(procurementDto));
}
@GetMapping("/listPage")
@Log(title = "閲囪喘鍏ュ簱-鍏ュ簱绠＄悊-鍏ュ簱鏌ヨ", businessType = BusinessType.OTHER)
@Operation(summary = "鍏ュ簱鏌ヨ")
- public AjaxResult listPage(Page page, ProcurementPageDto procurementDto) {
+ public R<?> listPage(Page page, ProcurementPageDto procurementDto) {
IPage<ProcurementPageDto> result = procurementRecordService.listPage(page, procurementDto);
- return AjaxResult.success(result);
+ return R.ok(result);
}
@GetMapping("/listReport")
@Operation(summary = "鏌ヨ搴撳瓨鍥捐〃鏁版嵁")
- public AjaxResult listReport() {
- return AjaxResult.success(procurementRecordService.getReportList());
+ public R<?> listReport() {
+ return R.ok(procurementRecordService.getReportList());
}
@GetMapping("/listPageByProduction")
@Log(title = "鐢熶骇鍏ュ簱-鍏ュ簱绠＄悊-鍏ュ簱鏌ヨ", businessType = BusinessType.OTHER)
@Operation(summary = "鍏ュ簱鏌ヨ")
- public AjaxResult listPageByProduction(Page page, ProcurementPageDto procurementDto) {
+ public R<?> listPageByProduction(Page page, ProcurementPageDto procurementDto) {
IPage<ProcurementPageDto> result = procurementRecordService.listPageByProduction(page, procurementDto);
- return AjaxResult.success(result);
+ return R.ok(result);
}
@GetMapping("/listPageByProductProduction")
@Log(title = "鐢熶骇鍏ュ簱-鍏ュ簱绠＄悊-鐢熶骇鍏ュ簱鏌ヨ", businessType = BusinessType.OTHER)
@Operation(summary = "鍏ュ簱鏌ヨ")
- public AjaxResult listPageByProductProduction(Page page, ProcurementPageDto procurementDto) {
+ public R<?> listPageByProductProduction(Page page, ProcurementPageDto procurementDto) {
IPage<ProcurementPageDto> result = procurementRecordService.listPageByProductProduction(page, procurementDto);
- return AjaxResult.success(result);
+ return R.ok(result);
}
@GetMapping("/listPageByCustom")
@Log(title = "鑷畾涔夊叆搴�-鍏ュ簱绠＄悊-鍏ュ簱鏌ヨ", businessType = BusinessType.OTHER)
@Operation(summary = "鍏ュ簱鏌ヨ")
- public AjaxResult listPageByCustom(Page page, CustomStorage customStorage) {
+ public R<?> listPageByCustom(Page page, CustomStorage customStorage) {
IPage<CustomStorage> result = procurementRecordService.listPageByCustom(page, customStorage);
- return AjaxResult.success(result);
+ return R.ok(result);
}
@GetMapping("/listPageCopy")
@Log(title = "閲囪喘鍏ュ簱-搴撳瓨绠＄悊-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPageCopy(Page page, ProcurementPageDto procurementDto) {
+ public R<?> listPageCopy(Page page, ProcurementPageDto procurementDto) {
IPage<ProcurementPageDtoCopy> result = procurementRecordService.listPageCopy(page, procurementDto);
- return AjaxResult.success(result);
+ return R.ok(result);
}
@GetMapping("/listPageCopyByProduction")
@Log(title = "鐢熶骇鍏ュ簱-搴撳瓨绠＄悊-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPageCopyByProduction(Page page, ProcurementPageDto procurementDto) {
+ public R<?> listPageCopyByProduction(Page page, ProcurementPageDto procurementDto) {
IPage<ProcurementPageDtoCopy> result = procurementRecordService.listPageCopyByProduction(page, procurementDto);
- return AjaxResult.success(result);
+ return R.ok(result);
}
@GetMapping("/listPageCopyByCustom")
@Log(title = "鑷畾涔夊叆搴�-搴撳瓨绠＄悊-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPageCopyByCustom(Page page, CustomStorage customStorage) {
+ public R<?> listPageCopyByCustom(Page page, CustomStorage customStorage) {
IPage<CustomStorage> result = procurementRecordService.listPageCopyByCustom(page, customStorage);
- return AjaxResult.success(result);
+ return R.ok(result);
}
@GetMapping("/getReportList")
@Log(title = "搴撳瓨鎶ヨ〃鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult getReportList(Page page, ProcurementPageDto procurementDto) {
- return AjaxResult.success(procurementRecordService.getReportList(page, procurementDto));
+ public R<?> getReportList(Page page, ProcurementPageDto procurementDto) {
+ return R.ok(procurementRecordService.getReportList(page, procurementDto));
}
/**
@@ -244,8 +244,8 @@
@GetMapping("/listPageProductionStock")
@Log(title = "搴撳瓨绠＄悊-鎴愬搧搴撳瓨", businessType = BusinessType.OTHER)
- public AjaxResult listPageProductionStock(Page page, ProcurementPageDto procurementDto) {
+ public R<?> listPageProductionStock(Page page, ProcurementPageDto procurementDto) {
IPage<ProductModel> result = procurementRecordService.listPageProductionStock(page, procurementDto);
- return AjaxResult.success(result);
+ return R.ok(result);
}
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java
index c86d3e6..8d8e62f 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordOutController.java
@@ -6,7 +6,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.procurementrecord.bean.dto.ProcurementRecordOutAdd;
import com.ruoyi.procurementrecord.bean.dto.ProcurementRecordOutPageDto;
import com.ruoyi.procurementrecord.bean.dto.ProcurementUpdateDto;
@@ -34,42 +34,42 @@
@PostMapping("/stockout")
@Log(title = "閲囪喘鍑哄簱-鍑哄簱绠＄悊-鍑哄簱", businessType = BusinessType.INSERT)
- public AjaxResult stockout(@RequestBody ProcurementRecordOutAdd procurementRecordOutAdd) {
- return AjaxResult.success(procurementRecordOutService.stockout(procurementRecordOutAdd));
+ public R<?> stockout(@RequestBody ProcurementRecordOutAdd procurementRecordOutAdd) {
+ return R.ok(procurementRecordOutService.stockout(procurementRecordOutAdd));
}
@GetMapping("/listPage")
@Log(title = "閲囪喘鍑哄簱-鍑哄簱鍙拌处-鍑哄簱鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPage(Page page, ProcurementRecordOutPageDto procurementDto) {
+ public R<?> listPage(Page page, ProcurementRecordOutPageDto procurementDto) {
IPage<ProcurementRecordOutPageDto> result = procurementRecordOutService.listPage(page, procurementDto);
- return AjaxResult.success(result);
+ return R.ok(result);
}
@GetMapping("/listPageByProduct")
@Log(title = "鐢熶骇鍑哄簱-鍑哄簱鍙拌处-鍑哄簱鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPageByProduct(Page page, ProcurementRecordOutPageDto procurementDto) {
+ public R<?> listPageByProduct(Page page, ProcurementRecordOutPageDto procurementDto) {
IPage<ProcurementRecordOutPageDto> result = procurementRecordOutService.listPageByProduct(page, procurementDto);
- return AjaxResult.success(result);
+ return R.ok(result);
}
@GetMapping("/listPageBySemiProduct")
@Log(title = "鐢熶骇鍑哄簱-鍑哄簱鍙拌处-鍑哄簱鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPageBySemiProduct(Page page, ProcurementRecordOutPageDto procurementDto) {
+ public R<?> listPageBySemiProduct(Page page, ProcurementRecordOutPageDto procurementDto) {
IPage<ProcurementRecordOutPageDto> result = procurementRecordOutService.listPageBySemiProduct(page, procurementDto);
- return AjaxResult.success(result);
+ return R.ok(result);
}
@GetMapping("/listPageByCustom")
@Log(title = "鑷畾涔夊嚭搴�-鍑哄簱鍙拌处-鍑哄簱鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPageByCustom(Page page, ProcurementRecordOutPageDto procurementDto) {
+ public R<?> listPageByCustom(Page page, ProcurementRecordOutPageDto procurementDto) {
IPage<ProcurementRecordOutPageDto> result = procurementRecordOutService.listPageByCustom(page, procurementDto);
- return AjaxResult.success(result);
+ return R.ok(result);
}
@PostMapping("/del")
@Log(title = "閲囪喘鍑哄簱-鍑哄簱鍙拌处-鍒犻櫎鍑哄簱", businessType = BusinessType.DELETE)
- public AjaxResult deletePro(@RequestBody ProcurementUpdateDto procurementDto) {
- return AjaxResult.success(procurementRecordOutService.deletePro(procurementDto));
+ public R<?> deletePro(@RequestBody ProcurementUpdateDto procurementDto) {
+ return R.ok(procurementRecordOutService.deletePro(procurementDto));
}
/**
diff --git a/src/main/java/com/ruoyi/procurementrecord/controller/ReturnManagementController.java b/src/main/java/com/ruoyi/procurementrecord/controller/ReturnManagementController.java
index b3f31b9..f8ca338 100644
--- a/src/main/java/com/ruoyi/procurementrecord/controller/ReturnManagementController.java
+++ b/src/main/java/com/ruoyi/procurementrecord/controller/ReturnManagementController.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.procurementrecord.bean.dto.ReturnManagementDto;
import com.ruoyi.procurementrecord.bean.vo.ShippingInfoVo;
import com.ruoyi.procurementrecord.pojo.ReturnSaleProduct;
@@ -34,58 +34,58 @@
@GetMapping("/listPage")
@Operation(summary = "閿�鍞��璐�-鏌ヨ")
- public AjaxResult listPage(Page page, ReturnManagementDto returnManagement) {
+ public R<?> listPage(Page page, ReturnManagementDto returnManagement) {
IPage<ReturnManagementDto> result = returnManagementService.listPage(page, returnManagement);
- return AjaxResult.success(result);
+ return R.ok(result);
}
@PostMapping("/add")
@Operation(summary = "閿�鍞��璐�-娣诲姞")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult add(@RequestBody ReturnManagementDto returnManagementDto) {
- return returnManagementService.addReturnManagementDto(returnManagementDto) ? success() : error();
+ public R<?> add(@RequestBody ReturnManagementDto returnManagementDto) {
+ return returnManagementService.addReturnManagementDto(returnManagementDto) ? R.ok() : R.fail();
}
@PostMapping("/update")
@Operation(summary = "閿�鍞��璐�-淇敼")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult update(@RequestBody ReturnManagementDto returnManagementDto) {
- return returnManagementService.updateReturnManagementDto(returnManagementDto) ? success() : error();
+ public R<?> update(@RequestBody ReturnManagementDto returnManagementDto) {
+ return returnManagementService.updateReturnManagementDto(returnManagementDto) ? R.ok() : R.fail();
}
@Operation(summary = "閿�鍞��璐�-澶勭悊閫�璐у崟")
@GetMapping("/handle")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult handle(Long returnManagementId) {
- return returnManagementService.handle(returnManagementId) ? success() : error();
+ public R<?> handle(Long returnManagementId) {
+ return returnManagementService.handle(returnManagementId) ? R.ok() : R.fail();
}
@DeleteMapping("/del")
@Operation(summary = "閿�鍞��璐�-鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult del(@RequestBody List<Long> ids) {
- if (CollectionUtils.isEmpty(ids)) return error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ public R<?> del(@RequestBody List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
returnSaleProductService.remove(new QueryWrapper<ReturnSaleProduct>()
.lambda()
.in(ReturnSaleProduct::getReturnManagementId, ids));
boolean result = returnManagementService.removeByIds(ids);
- return result ? success() : error();
+ return result ? R.ok() : R.fail();
}
@GetMapping("/getById")
@Operation(summary = "閿�鍞��璐�-鏍规嵁id鏌ヨ")
- public AjaxResult getById(Long returnManagementId) {
+ public R<?> getById(Long returnManagementId) {
ReturnManagementDto returnManagementDto = returnManagementService.getReturnManagementDtoById(returnManagementId);
- return success(returnManagementDto);
+ return R.ok(returnManagementDto);
}
@GetMapping("/getByShippingId")
@Operation(summary = "閿�鍞��璐�-鏍规嵁鍙戣揣鍗曟煡璇㈤攢鍞鍗曚互鍙婂嚭搴撶殑浜у搧淇℃伅")
- public AjaxResult getByShippingId(Long shippingId) {
+ public R<?> getByShippingId(Long shippingId) {
ShippingInfoVo shippingInfoVo = returnManagementService.getReturnManagementDtoByShippingIdId(shippingId);
- return success(shippingInfoVo);
+ return R.ok(shippingInfoVo);
}
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/ProcurementRecordService.java b/src/main/java/com/ruoyi/procurementrecord/service/ProcurementRecordService.java
index a209cf9..b7d9cad 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/ProcurementRecordService.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/ProcurementRecordService.java
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.basic.pojo.ProductModel;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.procurementrecord.bean.dto.*;
import com.ruoyi.procurementrecord.pojo.CustomStorage;
import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
@@ -43,7 +43,7 @@
IPage<ProcurementPageDto> listPageByProduction(Page page, ProcurementPageDto procurementDto);
- AjaxResult addCustom(List<CustomStorage> customStorage);
+ R<?> addCustom(List<CustomStorage> customStorage);
IPage<CustomStorage> listPageByCustom(Page page, CustomStorage customStorage);
@@ -51,9 +51,9 @@
IPage<CustomStorage> listPageCopyByCustom(Page page, CustomStorage customStorage);
- AjaxResult updateCustom(CustomStorage customStorage);
+ R<?> updateCustom(CustomStorage customStorage);
- AjaxResult deleteCustom(List<Long> ids);
+ R<?> deleteCustom(List<Long> ids);
int updateManagementByCustom(ProcurementManagementUpdateDto procurementDto);
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
index 1d99dec..3fc8d0f 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
@@ -11,7 +11,7 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.procurementrecord.bean.dto.*;
import com.ruoyi.procurementrecord.mapper.CustomStorageMapper;
import com.ruoyi.procurementrecord.mapper.ProcurementRecordMapper;
@@ -525,10 +525,10 @@
private final CustomStorageMapper customStorageMapper;
@Override
- public AjaxResult addCustom(List<CustomStorage> customStorage) {
+ public R<?> addCustom(List<CustomStorage> customStorage) {
LoginUser loginUser = SecurityUtils.getLoginUser();
if(CollectionUtils.isEmpty(customStorage)){
- return AjaxResult.error("鏁版嵁涓嶈兘涓虹┖");
+ return R.fail("鏁版嵁涓嶈兘涓虹┖");
}
customStorage.forEach(item -> {
// 鏌ヨ閲囪喘鍏ュ簱鏁伴噺
@@ -538,7 +538,7 @@
item.setCode(OrderUtils.countTodayByCreateTime(customStorageMapper, "", "code"));
customStorageMapper.insert(item);
});
- return AjaxResult.success("鑷畾涔夊叆搴撴垚鍔�");
+ return R.ok(null, "鑷畾涔夊叆搴撴垚鍔�");
}
@Override
@@ -716,13 +716,13 @@
}
@Override
- public AjaxResult updateCustom(CustomStorage customStorage) {
- return AjaxResult.success(customStorageMapper.updateById(customStorage));
+ public R<?> updateCustom(CustomStorage customStorage) {
+ return R.ok(customStorageMapper.updateById(customStorage));
}
@Override
- public AjaxResult deleteCustom(List<Long> ids) {
- return AjaxResult.success(customStorageMapper.deleteBatchIds(ids));
+ public R<?> deleteCustom(List<Long> ids) {
+ return R.ok(customStorageMapper.deleteBatchIds(ids));
}
@Override
diff --git a/src/main/java/com/ruoyi/project/common/CaptchaController.java b/src/main/java/com/ruoyi/project/common/CaptchaController.java
index 40255cb..efa004f 100644
--- a/src/main/java/com/ruoyi/project/common/CaptchaController.java
+++ b/src/main/java/com/ruoyi/project/common/CaptchaController.java
@@ -1,98 +1,100 @@
-package com.ruoyi.project.common;
-
-import com.google.code.kaptcha.Producer;
-import com.ruoyi.common.constant.CacheConstants;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.utils.sign.Base64;
-import com.ruoyi.common.utils.uuid.IdUtils;
-import com.ruoyi.framework.redis.RedisCache;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.project.system.service.ISysConfigService;
-import jakarta.annotation.Resource;
-import jakarta.servlet.http.HttpServletResponse;
-import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.util.FastByteArrayOutputStream;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-
-/**
- * 楠岃瘉鐮佹搷浣滃鐞�
- *
- * @author ruoyi
- */
-@RestController
-@RequiredArgsConstructor
-public class CaptchaController
-{
- @Resource(name = "captchaProducer")
- private Producer captchaProducer;
-
- @Resource(name = "captchaProducerMath")
- private Producer captchaProducerMath;
-
- private final RedisCache redisCache;
-
- // 楠岃瘉鐮佺被鍨�
- @Value("${ruoyi.captchaType}")
- private String captchaType;
-
- private final ISysConfigService configService;
-
- /**
- * 鐢熸垚楠岃瘉鐮�
- */
- @GetMapping("/captchaImage")
- public AjaxResult getCode(HttpServletResponse response) throws IOException
- {
- AjaxResult ajax = AjaxResult.success();
- boolean captchaEnabled = configService.selectCaptchaEnabled();
- ajax.put("captchaEnabled", captchaEnabled);
- if (!captchaEnabled)
- {
- return ajax;
- }
-
- // 淇濆瓨楠岃瘉鐮佷俊鎭�
- String uuid = IdUtils.simpleUUID();
- String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid;
-
- String capStr = null, code = null;
- BufferedImage image = null;
-
- // 鐢熸垚楠岃瘉鐮�
- if ("math".equals(captchaType))
- {
- String capText = captchaProducerMath.createText();
- capStr = capText.substring(0, capText.lastIndexOf("@"));
- code = capText.substring(capText.lastIndexOf("@") + 1);
- image = captchaProducerMath.createImage(capStr);
- }
- else if ("char".equals(captchaType))
- {
- capStr = code = captchaProducer.createText();
- image = captchaProducer.createImage(capStr);
- }
-
- redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
- // 杞崲娴佷俊鎭啓鍑�
- FastByteArrayOutputStream os = new FastByteArrayOutputStream();
- try
- {
- ImageIO.write(image, "jpg", os);
- }
- catch (IOException e)
- {
- return AjaxResult.error(e.getMessage());
- }
-
- ajax.put("uuid", uuid);
- ajax.put("img", Base64.encode(os.toByteArray()));
- return ajax;
- }
-}
+package com.ruoyi.project.common;
+
+import com.google.code.kaptcha.Producer;
+import com.ruoyi.common.constant.CacheConstants;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.utils.sign.Base64;
+import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.framework.redis.RedisCache;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.project.system.service.ISysConfigService;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.util.FastByteArrayOutputStream;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 楠岃瘉鐮佹搷浣滃鐞�
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequiredArgsConstructor
+public class CaptchaController
+{
+ @Resource(name = "captchaProducer")
+ private Producer captchaProducer;
+
+ @Resource(name = "captchaProducerMath")
+ private Producer captchaProducerMath;
+
+ private final RedisCache redisCache;
+
+ // 楠岃瘉鐮佺被鍨�
+ @Value("${ruoyi.captchaType}")
+ private String captchaType;
+
+ private final ISysConfigService configService;
+
+ /**
+ * 鐢熸垚楠岃瘉鐮�
+ */
+ @GetMapping("/captchaImage")
+ public R<?> getCode(HttpServletResponse response) throws IOException
+ {
+ Map<String, Object> map = new HashMap<>();
+ boolean captchaEnabled = configService.selectCaptchaEnabled();
+ map.put("captchaEnabled", captchaEnabled);
+ if (!captchaEnabled)
+ {
+ return R.ok(map);
+ }
+
+ // 淇濆瓨楠岃瘉鐮佷俊鎭�
+ String uuid = IdUtils.simpleUUID();
+ String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid;
+
+ String capStr = null, code = null;
+ BufferedImage image = null;
+
+ // 鐢熸垚楠岃瘉鐮�
+ if ("math".equals(captchaType))
+ {
+ String capText = captchaProducerMath.createText();
+ capStr = capText.substring(0, capText.lastIndexOf("@"));
+ code = capText.substring(capText.lastIndexOf("@") + 1);
+ image = captchaProducerMath.createImage(capStr);
+ }
+ else if ("char".equals(captchaType))
+ {
+ capStr = code = captchaProducer.createText();
+ image = captchaProducer.createImage(capStr);
+ }
+
+ redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
+ // 杞崲娴佷俊鎭啓鍑�
+ FastByteArrayOutputStream os = new FastByteArrayOutputStream();
+ try
+ {
+ ImageIO.write(image, "jpg", os);
+ }
+ catch (IOException e)
+ {
+ return R.fail(e.getMessage());
+ }
+
+ map.put("uuid", uuid);
+ map.put("img", Base64.encode(os.toByteArray()));
+ return R.ok(map);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/project/monitor/controller/CacheController.java b/src/main/java/com/ruoyi/project/monitor/controller/CacheController.java
index 63fe76b..ab4841d 100644
--- a/src/main/java/com/ruoyi/project/monitor/controller/CacheController.java
+++ b/src/main/java/com/ruoyi/project/monitor/controller/CacheController.java
@@ -1,111 +1,112 @@
-package com.ruoyi.project.monitor.controller;
-
-import com.ruoyi.common.constant.CacheConstants;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.project.monitor.domain.SysCache;
-import lombok.AllArgsConstructor;
-import org.springframework.data.redis.core.RedisCallback;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.*;
-
-/**
- * 缂撳瓨鐩戞帶
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/monitor/cache")
-@AllArgsConstructor
-public class CacheController
-{
- private RedisTemplate<String, String> redisTemplate;
-
- private final static List<SysCache> caches = new ArrayList<SysCache>();
- {
- caches.add(new SysCache(CacheConstants.LOGIN_TOKEN_KEY, "鐢ㄦ埛淇℃伅"));
- caches.add(new SysCache(CacheConstants.SYS_CONFIG_KEY, "閰嶇疆淇℃伅"));
- caches.add(new SysCache(CacheConstants.SYS_DICT_KEY, "鏁版嵁瀛楀吀"));
- caches.add(new SysCache(CacheConstants.CAPTCHA_CODE_KEY, "楠岃瘉鐮�"));
- caches.add(new SysCache(CacheConstants.REPEAT_SUBMIT_KEY, "闃查噸鎻愪氦"));
- caches.add(new SysCache(CacheConstants.RATE_LIMIT_KEY, "闄愭祦澶勭悊"));
- caches.add(new SysCache(CacheConstants.PWD_ERR_CNT_KEY, "瀵嗙爜閿欒娆℃暟"));
- }
-
- @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
- @GetMapping()
- public AjaxResult getInfo() throws Exception
- {
- Properties info = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info());
- Properties commandStats = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info("commandstats"));
- Object dbSize = redisTemplate.execute((RedisCallback<Object>) connection -> connection.dbSize());
-
- Map<String, Object> result = new HashMap<>(3);
- result.put("info", info);
- result.put("dbSize", dbSize);
-
- List<Map<String, String>> pieList = new ArrayList<>();
- commandStats.stringPropertyNames().forEach(key -> {
- Map<String, String> data = new HashMap<>(2);
- String property = commandStats.getProperty(key);
- data.put("name", StringUtils.removeStart(key, "cmdstat_"));
- data.put("value", StringUtils.substringBetween(property, "calls=", ",usec"));
- pieList.add(data);
- });
- result.put("commandStats", pieList);
- return AjaxResult.success(result);
- }
-
- @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
- @GetMapping("/getNames")
- public AjaxResult cache()
- {
- return AjaxResult.success(caches);
- }
-
- @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
- @GetMapping("/getKeys/{cacheName}")
- public AjaxResult getCacheKeys(@PathVariable String cacheName)
- {
- Set<String> cacheKeys = redisTemplate.keys(cacheName + "*");
- return AjaxResult.success(new TreeSet<>(cacheKeys));
- }
-
- @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
- @GetMapping("/getValue/{cacheName}/{cacheKey}")
- public AjaxResult getCacheValue(@PathVariable String cacheName, @PathVariable String cacheKey)
- {
- String cacheValue = redisTemplate.opsForValue().get(cacheKey);
- SysCache sysCache = new SysCache(cacheName, cacheKey, cacheValue);
- return AjaxResult.success(sysCache);
- }
-
- @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
- @DeleteMapping("/clearCacheName/{cacheName}")
- public AjaxResult clearCacheName(@PathVariable String cacheName)
- {
- Collection<String> cacheKeys = redisTemplate.keys(cacheName + "*");
- redisTemplate.delete(cacheKeys);
- return AjaxResult.success();
- }
-
- @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
- @DeleteMapping("/clearCacheKey/{cacheKey}")
- public AjaxResult clearCacheKey(@PathVariable String cacheKey)
- {
- redisTemplate.delete(cacheKey);
- return AjaxResult.success();
- }
-
- @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
- @DeleteMapping("/clearCacheAll")
- public AjaxResult clearCacheAll()
- {
- Collection<String> cacheKeys = redisTemplate.keys("*");
- redisTemplate.delete(cacheKeys);
- return AjaxResult.success();
- }
-}
+package com.ruoyi.project.monitor.controller;
+
+import com.ruoyi.common.constant.CacheConstants;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.project.monitor.domain.SysCache;
+import lombok.AllArgsConstructor;
+import org.springframework.data.redis.core.RedisCallback;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+/**
+ * 缂撳瓨鐩戞帶
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/monitor/cache")
+@AllArgsConstructor
+public class CacheController extends BaseController
+{
+ private RedisTemplate<String, String> redisTemplate;
+
+ private final static List<SysCache> caches = new ArrayList<SysCache>();
+ {
+ caches.add(new SysCache(CacheConstants.LOGIN_TOKEN_KEY, "鐢ㄦ埛淇℃伅"));
+ caches.add(new SysCache(CacheConstants.SYS_CONFIG_KEY, "閰嶇疆淇℃伅"));
+ caches.add(new SysCache(CacheConstants.SYS_DICT_KEY, "鏁版嵁瀛楀吀"));
+ caches.add(new SysCache(CacheConstants.CAPTCHA_CODE_KEY, "楠岃瘉鐮�"));
+ caches.add(new SysCache(CacheConstants.REPEAT_SUBMIT_KEY, "闃查噸鎻愪氦"));
+ caches.add(new SysCache(CacheConstants.RATE_LIMIT_KEY, "闄愭祦澶勭悊"));
+ caches.add(new SysCache(CacheConstants.PWD_ERR_CNT_KEY, "瀵嗙爜閿欒娆℃暟"));
+ }
+
+ @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+ @GetMapping()
+ public R<?> getInfo() throws Exception
+ {
+ Properties info = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info());
+ Properties commandStats = (Properties) redisTemplate.execute((RedisCallback<Object>) connection -> connection.info("commandstats"));
+ Object dbSize = redisTemplate.execute((RedisCallback<Object>) connection -> connection.dbSize());
+
+ Map<String, Object> result = new HashMap<>(3);
+ result.put("info", info);
+ result.put("dbSize", dbSize);
+
+ List<Map<String, String>> pieList = new ArrayList<>();
+ commandStats.stringPropertyNames().forEach(key -> {
+ Map<String, String> data = new HashMap<>(2);
+ String property = commandStats.getProperty(key);
+ data.put("name", StringUtils.removeStart(key, "cmdstat_"));
+ data.put("value", StringUtils.substringBetween(property, "calls=", ",usec"));
+ pieList.add(data);
+ });
+ result.put("commandStats", pieList);
+ return R.ok(result);
+ }
+
+ @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+ @GetMapping("/getNames")
+ public R<?> cache()
+ {
+ return R.ok(caches);
+ }
+
+ @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+ @GetMapping("/getKeys/{cacheName}")
+ public R<?> getCacheKeys(@PathVariable String cacheName)
+ {
+ Set<String> cacheKeys = redisTemplate.keys(cacheName + "*");
+ return R.ok(new TreeSet<>(cacheKeys));
+ }
+
+ @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+ @GetMapping("/getValue/{cacheName}/{cacheKey}")
+ public R<?> getCacheValue(@PathVariable String cacheName, @PathVariable String cacheKey)
+ {
+ String cacheValue = redisTemplate.opsForValue().get(cacheKey);
+ SysCache sysCache = new SysCache(cacheName, cacheKey, cacheValue);
+ return R.ok(sysCache);
+ }
+
+ @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+ @DeleteMapping("/clearCacheName/{cacheName}")
+ public R<?> clearCacheName(@PathVariable String cacheName)
+ {
+ Collection<String> cacheKeys = redisTemplate.keys(cacheName + "*");
+ redisTemplate.delete(cacheKeys);
+ return R.ok();
+ }
+
+ @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+ @DeleteMapping("/clearCacheKey/{cacheKey}")
+ public R<?> clearCacheKey(@PathVariable String cacheKey)
+ {
+ redisTemplate.delete(cacheKey);
+ return R.ok();
+ }
+
+ @PreAuthorize("@ss.hasPermi('monitor:cache:list')")
+ @DeleteMapping("/clearCacheAll")
+ public R<?> clearCacheAll()
+ {
+ Collection<String> cacheKeys = redisTemplate.keys("*");
+ redisTemplate.delete(cacheKeys);
+ return R.ok();
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/project/monitor/controller/ServerController.java b/src/main/java/com/ruoyi/project/monitor/controller/ServerController.java
index 9a50b05..a2db092 100644
--- a/src/main/java/com/ruoyi/project/monitor/controller/ServerController.java
+++ b/src/main/java/com/ruoyi/project/monitor/controller/ServerController.java
@@ -1,27 +1,28 @@
-package com.ruoyi.project.monitor.controller;
-
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.domain.Server;
-
-/**
- * 鏈嶅姟鍣ㄧ洃鎺�
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/monitor/server")
-public class ServerController
-{
- @PreAuthorize("@ss.hasPermi('monitor:server:list')")
- @GetMapping()
- public AjaxResult getInfo() throws Exception
- {
- Server server = new Server();
- server.copyTo();
- return AjaxResult.success(server);
- }
-}
+package com.ruoyi.project.monitor.controller;
+
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.domain.Server;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 鏈嶅姟鍣ㄧ洃鎺�
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/monitor/server")
+public class ServerController extends BaseController
+{
+ @PreAuthorize("@ss.hasPermi('monitor:server:list')")
+ @GetMapping()
+ public R<?> getInfo() throws Exception
+ {
+ Server server = new Server();
+ server.copyTo();
+ return R.ok(server);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java b/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java
index ee2c058..9919311 100644
--- a/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java
+++ b/src/main/java/com/ruoyi/project/monitor/controller/SysJobController.java
@@ -1,186 +1,188 @@
-package com.ruoyi.project.monitor.controller;
-
-import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
-import lombok.AllArgsConstructor;
-import org.quartz.SchedulerException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.exception.job.TaskException;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.job.CronUtils;
-import com.ruoyi.common.utils.job.ScheduleUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.monitor.domain.SysJob;
-import com.ruoyi.project.monitor.service.ISysJobService;
-
-/**
- * 璋冨害浠诲姟淇℃伅鎿嶄綔澶勭悊
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/monitor/job")
-@AllArgsConstructor
-public class SysJobController extends BaseController
-{
- private ISysJobService jobService;
-
- /**
- * 鏌ヨ瀹氭椂浠诲姟鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('monitor:job:list')")
- @GetMapping("/list")
- public TableDataInfo list(SysJob sysJob)
- {
- startPage();
- List<SysJob> list = jobService.selectJobList(sysJob);
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭瀹氭椂浠诲姟鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('monitor:job:export')")
- @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, SysJob sysJob)
- {
- List<SysJob> list = jobService.selectJobList(sysJob);
- ExcelUtil<SysJob> util = new ExcelUtil<SysJob>(SysJob.class);
- util.exportExcel(response, list, "瀹氭椂浠诲姟");
- }
-
- /**
- * 鑾峰彇瀹氭椂浠诲姟璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('monitor:job:query')")
- @GetMapping(value = "/{jobId}")
- public AjaxResult getInfo(@PathVariable("jobId") Long jobId)
- {
- return success(jobService.selectJobById(jobId));
- }
-
- /**
- * 鏂板瀹氭椂浠诲姟
- */
- @PreAuthorize("@ss.hasPermi('monitor:job:add')")
- @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody SysJob job) throws SchedulerException, TaskException
- {
- if (!CronUtils.isValid(job.getCronExpression()))
- {
- return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛孋ron琛ㄨ揪寮忎笉姝ｇ‘");
- }
- else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI))
- {
- return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'rmi'璋冪敤");
- }
- else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS }))
- {
- return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'ldap(s)'璋冪敤");
- }
- else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS }))
- {
- return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'http(s)'璋冪敤");
- }
- else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR))
- {
- return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆瀛樺湪杩濊");
- }
- else if (!ScheduleUtils.whiteList(job.getInvokeTarget()))
- {
- return error("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅湪鐧藉悕鍗曞唴");
- }
- job.setCreateBy(getUsername());
- return toAjax(jobService.insertJob(job));
- }
-
- /**
- * 淇敼瀹氭椂浠诲姟
- */
- @PreAuthorize("@ss.hasPermi('monitor:job:edit')")
- @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody SysJob job) throws SchedulerException, TaskException
- {
- if (!CronUtils.isValid(job.getCronExpression()))
- {
- return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛孋ron琛ㄨ揪寮忎笉姝ｇ‘");
- }
- else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI))
- {
- return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'rmi'璋冪敤");
- }
- else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS }))
- {
- return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'ldap(s)'璋冪敤");
- }
- else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS }))
- {
- return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'http(s)'璋冪敤");
- }
- else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR))
- {
- return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆瀛樺湪杩濊");
- }
- else if (!ScheduleUtils.whiteList(job.getInvokeTarget()))
- {
- return error("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅湪鐧藉悕鍗曞唴");
- }
- job.setUpdateBy(getUsername());
- return toAjax(jobService.updateJob(job));
- }
-
- /**
- * 瀹氭椂浠诲姟鐘舵�佷慨鏀�
- */
- @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
- @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE)
- @PutMapping("/changeStatus")
- public AjaxResult changeStatus(@RequestBody SysJob job) throws SchedulerException
- {
- SysJob newJob = jobService.selectJobById(job.getJobId());
- newJob.setStatus(job.getStatus());
- return toAjax(jobService.changeStatus(newJob));
- }
-
- /**
- * 瀹氭椂浠诲姟绔嬪嵆鎵ц涓�娆�
- */
- @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
- @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE)
- @PutMapping("/run")
- public AjaxResult run(@RequestBody SysJob job) throws SchedulerException
- {
- boolean result = jobService.run(job);
- return result ? success() : error("浠诲姟涓嶅瓨鍦ㄦ垨宸茶繃鏈燂紒");
- }
-
- /**
- * 鍒犻櫎瀹氭椂浠诲姟
- */
- @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
- @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.DELETE)
- @DeleteMapping("/{jobIds}")
- public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException
- {
- jobService.deleteJobByIds(jobIds);
- return success();
- }
-}
+package com.ruoyi.project.monitor.controller;
+
+import java.util.List;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
+import org.quartz.SchedulerException;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.exception.job.TaskException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.job.CronUtils;
+import com.ruoyi.common.utils.job.ScheduleUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.monitor.domain.SysJob;
+import com.ruoyi.project.monitor.service.ISysJobService;
+
+/**
+ * 璋冨害浠诲姟淇℃伅鎿嶄綔澶勭悊
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/monitor/job")
+@AllArgsConstructor
+public class SysJobController extends BaseController
+{
+ private ISysJobService jobService;
+
+ /**
+ * 鏌ヨ瀹氭椂浠诲姟鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('monitor:job:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(SysJob sysJob)
+ {
+ startPage();
+ List<SysJob> list = jobService.selectJobList(sysJob);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭瀹氭椂浠诲姟鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('monitor:job:export')")
+ @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, SysJob sysJob)
+ {
+ List<SysJob> list = jobService.selectJobList(sysJob);
+ ExcelUtil<SysJob> util = new ExcelUtil<SysJob>(SysJob.class);
+ util.exportExcel(response, list, "瀹氭椂浠诲姟");
+ }
+
+ /**
+ * 鑾峰彇瀹氭椂浠诲姟璇︾粏淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('monitor:job:query')")
+ @GetMapping(value = "/{jobId}")
+ public R<?> getInfo(@PathVariable("jobId") Long jobId)
+ {
+ return R.ok(jobService.selectJobById(jobId));
+ }
+
+ /**
+ * 鏂板瀹氭椂浠诲姟
+ */
+ @PreAuthorize("@ss.hasPermi('monitor:job:add')")
+ @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.INSERT)
+ @PostMapping
+ public R<?> add(@RequestBody SysJob job) throws SchedulerException, TaskException
+ {
+ if (!CronUtils.isValid(job.getCronExpression()))
+ {
+ return R.fail("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛孋ron琛ㄨ揪寮忎笉姝ｇ‘");
+ }
+ else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI))
+ {
+ return R.fail("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'rmi'璋冪敤");
+ }
+ else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS }))
+ {
+ return R.fail("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'ldap(s)'璋冪敤");
+ }
+ else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS }))
+ {
+ return R.fail("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'http(s)'璋冪敤");
+ }
+ else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR))
+ {
+ return R.fail("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆瀛樺湪杩濊");
+ }
+ else if (!ScheduleUtils.whiteList(job.getInvokeTarget()))
+ {
+ return R.fail("鏂板浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅湪鐧藉悕鍗曞唴");
+ }
+ job.setCreateBy(getUsername());
+ jobService.insertJob(job);
+ return R.ok();
+ }
+
+ /**
+ * 淇敼瀹氭椂浠诲姟
+ */
+ @PreAuthorize("@ss.hasPermi('monitor:job:edit')")
+ @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public R<?> edit(@RequestBody SysJob job) throws SchedulerException, TaskException
+ {
+ if (!CronUtils.isValid(job.getCronExpression()))
+ {
+ return R.fail("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛孋ron琛ㄨ揪寮忎笉姝ｇ‘");
+ }
+ else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI))
+ {
+ return R.fail("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'rmi'璋冪敤");
+ }
+ else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS }))
+ {
+ return R.fail("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'ldap(s)'璋冪敤");
+ }
+ else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS }))
+ {
+ return R.fail("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅厑璁�'http(s)'璋冪敤");
+ }
+ else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR))
+ {
+ return R.fail("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆瀛樺湪杩濊");
+ }
+ else if (!ScheduleUtils.whiteList(job.getInvokeTarget()))
+ {
+ return R.fail("淇敼浠诲姟'" + job.getJobName() + "'澶辫触锛岀洰鏍囧瓧绗︿覆涓嶅湪鐧藉悕鍗曞唴");
+ }
+ job.setUpdateBy(getUsername());
+ jobService.updateJob(job);
+ return R.ok();
+ }
+
+ /**
+ * 瀹氭椂浠诲姟鐘舵�佷慨鏀�
+ */
+ @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
+ @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE)
+ @PutMapping("/changeStatus")
+ public R<?> changeStatus(@RequestBody SysJob job) throws SchedulerException
+ {
+ SysJob newJob = jobService.selectJobById(job.getJobId());
+ newJob.setStatus(job.getStatus());
+ jobService.changeStatus(newJob);
+ return R.ok();
+ }
+
+ /**
+ * 瀹氭椂浠诲姟绔嬪嵆鎵ц涓�娆�
+ */
+ @PreAuthorize("@ss.hasPermi('monitor:job:changeStatus')")
+ @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.UPDATE)
+ @PutMapping("/run")
+ public R<?> run(@RequestBody SysJob job) throws SchedulerException
+ {
+ boolean result = jobService.run(job);
+ return result ? R.ok() : R.fail("浠诲姟涓嶅瓨鍦ㄦ垨宸茶繃鏈燂紒");
+ }
+
+ /**
+ * 鍒犻櫎瀹氭椂浠诲姟
+ */
+ @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
+ @Log(title = "瀹氭椂浠诲姟", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{jobIds}")
+ public R<?> remove(@PathVariable Long[] jobIds) throws SchedulerException
+ {
+ jobService.deleteJobByIds(jobIds);
+ return R.ok();
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java b/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java
index 0c29d22..a15344d 100644
--- a/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java
+++ b/src/main/java/com/ruoyi/project/monitor/controller/SysJobLogController.java
@@ -1,93 +1,93 @@
-package com.ruoyi.project.monitor.controller;
-
-import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
-import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.monitor.domain.SysJobLog;
-import com.ruoyi.project.monitor.service.ISysJobLogService;
-
-/**
- * 璋冨害鏃ュ織鎿嶄綔澶勭悊
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/monitor/jobLog")
-@AllArgsConstructor
-public class SysJobLogController extends BaseController
-{
- private ISysJobLogService jobLogService;
-
- /**
- * 鏌ヨ瀹氭椂浠诲姟璋冨害鏃ュ織鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('monitor:job:list')")
- @GetMapping("/list")
- public TableDataInfo list(SysJobLog sysJobLog)
- {
- startPage();
- List<SysJobLog> list = jobLogService.selectJobLogList(sysJobLog);
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭瀹氭椂浠诲姟璋冨害鏃ュ織鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('monitor:job:export')")
- @Log(title = "浠诲姟璋冨害鏃ュ織", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, SysJobLog sysJobLog)
- {
- List<SysJobLog> list = jobLogService.selectJobLogList(sysJobLog);
- ExcelUtil<SysJobLog> util = new ExcelUtil<SysJobLog>(SysJobLog.class);
- util.exportExcel(response, list, "璋冨害鏃ュ織");
- }
-
- /**
- * 鏍规嵁璋冨害缂栧彿鑾峰彇璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('monitor:job:query')")
- @GetMapping(value = "/{jobLogId}")
- public AjaxResult getInfo(@PathVariable Long jobLogId)
- {
- return success(jobLogService.selectJobLogById(jobLogId));
- }
-
-
- /**
- * 鍒犻櫎瀹氭椂浠诲姟璋冨害鏃ュ織
- */
- @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
- @Log(title = "瀹氭椂浠诲姟璋冨害鏃ュ織", businessType = BusinessType.DELETE)
- @DeleteMapping("/{jobLogIds}")
- public AjaxResult remove(@PathVariable Long[] jobLogIds)
- {
- return toAjax(jobLogService.deleteJobLogByIds(jobLogIds));
- }
-
- /**
- * 娓呯┖瀹氭椂浠诲姟璋冨害鏃ュ織
- */
- @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
- @Log(title = "璋冨害鏃ュ織", businessType = BusinessType.CLEAN)
- @DeleteMapping("/clean")
- public AjaxResult clean()
- {
- jobLogService.cleanJobLog();
- return success();
- }
-}
+package com.ruoyi.project.monitor.controller;
+
+import java.util.List;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.monitor.domain.SysJobLog;
+import com.ruoyi.project.monitor.service.ISysJobLogService;
+import org.springframework.security.access.prepost.PreAuthorize;
+
+/**
+ * 璋冨害鏃ュ織鎿嶄綔澶勭悊
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/monitor/jobLog")
+@AllArgsConstructor
+public class SysJobLogController extends BaseController
+{
+ private ISysJobLogService jobLogService;
+
+ /**
+ * 鏌ヨ瀹氭椂浠诲姟璋冨害鏃ュ織鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('monitor:job:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(SysJobLog sysJobLog)
+ {
+ startPage();
+ List<SysJobLog> list = jobLogService.selectJobLogList(sysJobLog);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭瀹氭椂浠诲姟璋冨害鏃ュ織鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('monitor:job:export')")
+ @Log(title = "浠诲姟璋冨害鏃ュ織", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, SysJobLog sysJobLog)
+ {
+ List<SysJobLog> list = jobLogService.selectJobLogList(sysJobLog);
+ ExcelUtil<SysJobLog> util = new ExcelUtil<SysJobLog>(SysJobLog.class);
+ util.exportExcel(response, list, "璋冨害鏃ュ織");
+ }
+
+ /**
+ * 鏍规嵁璋冨害缂栧彿鑾峰彇璇︾粏淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('monitor:job:query')")
+ @GetMapping(value = "/{jobLogId}")
+ public R<?> getInfo(@PathVariable Long jobLogId)
+ {
+ return R.ok(jobLogService.selectJobLogById(jobLogId));
+ }
+
+
+ /**
+ * 鍒犻櫎瀹氭椂浠诲姟璋冨害鏃ュ織
+ */
+ @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
+ @Log(title = "瀹氭椂浠诲姟璋冨害鏃ュ織", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{jobLogIds}")
+ public R<?> remove(@PathVariable Long[] jobLogIds)
+ {
+ jobLogService.deleteJobLogByIds(jobLogIds);
+ return R.ok();
+ }
+
+ /**
+ * 娓呯┖瀹氭椂浠诲姟璋冨害鏃ュ織
+ */
+ @PreAuthorize("@ss.hasPermi('monitor:job:remove')")
+ @Log(title = "璋冨害鏃ュ織", businessType = BusinessType.CLEAN)
+ @DeleteMapping("/clean")
+ public R<?> clean()
+ {
+ jobLogService.cleanJobLog();
+ return R.ok();
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java b/src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java
index 7f5085d..fb703ef 100644
--- a/src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java
+++ b/src/main/java/com/ruoyi/project/monitor/controller/SysLogininforController.java
@@ -1,70 +1,71 @@
-package com.ruoyi.project.monitor.controller;
-
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.security.service.SysPasswordService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.monitor.domain.SysLogininfor;
-import com.ruoyi.project.monitor.service.ISysLogininforService;
-import jakarta.servlet.http.HttpServletResponse;
-import lombok.AllArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 绯荤粺璁块棶璁板綍
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/monitor/logininfor")
-@AllArgsConstructor
-public class SysLogininforController extends BaseController {
- private ISysLogininforService logininforService;
- private SysPasswordService passwordService;
-
- @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
- @GetMapping("/list")
- public TableDataInfo list(SysLogininfor logininfor) {
- startPage();
- List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
- return getDataTable(list);
- }
-
- @Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
- @PostMapping("/export")
- public void export(HttpServletResponse response, SysLogininfor logininfor) {
- List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
- ExcelUtil<SysLogininfor> util = new ExcelUtil<SysLogininfor>(SysLogininfor.class);
- util.exportExcel(response, list, "鐧诲綍鏃ュ織");
- }
-
- @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
- @Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.DELETE)
- @DeleteMapping("/{infoIds}")
- public AjaxResult remove(@PathVariable Long[] infoIds) {
- return toAjax(logininforService.deleteLogininforByIds(infoIds));
- }
-
- @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
- @Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.CLEAN)
- @DeleteMapping("/clean")
- public AjaxResult clean() {
- logininforService.cleanLogininfor();
- return success();
- }
-
- @PreAuthorize("@ss.hasPermi('monitor:logininfor:unlock')")
- @Log(title = "璐︽埛瑙ｉ攣", businessType = BusinessType.OTHER)
- @GetMapping("/unlock/{userName}")
- public AjaxResult unlock(@PathVariable("userName") String userName) {
- passwordService.clearLoginRecordCache(userName);
- return success();
- }
-}
+package com.ruoyi.project.monitor.controller;
+
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.security.service.SysPasswordService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.monitor.domain.SysLogininfor;
+import com.ruoyi.project.monitor.service.ISysLogininforService;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 绯荤粺璁块棶璁板綍
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/monitor/logininfor")
+@AllArgsConstructor
+public class SysLogininforController extends BaseController {
+ private ISysLogininforService logininforService;
+ private SysPasswordService passwordService;
+
+ @PreAuthorize("@ss.hasPermi('monitor:logininfor:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(SysLogininfor logininfor) {
+ startPage();
+ List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
+ return getDataTable(list);
+ }
+
+ @Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.EXPORT)
+ @PreAuthorize("@ss.hasPermi('monitor:logininfor:export')")
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, SysLogininfor logininfor) {
+ List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
+ ExcelUtil<SysLogininfor> util = new ExcelUtil<SysLogininfor>(SysLogininfor.class);
+ util.exportExcel(response, list, "鐧诲綍鏃ュ織");
+ }
+
+ @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
+ @Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{infoIds}")
+ public R<?> remove(@PathVariable Long[] infoIds) {
+ logininforService.deleteLogininforByIds(infoIds);
+ return R.ok();
+ }
+
+ @PreAuthorize("@ss.hasPermi('monitor:logininfor:remove')")
+ @Log(title = "鐧诲綍鏃ュ織", businessType = BusinessType.CLEAN)
+ @DeleteMapping("/clean")
+ public R<?> clean() {
+ logininforService.cleanLogininfor();
+ return R.ok();
+ }
+
+ @PreAuthorize("@ss.hasPermi('monitor:logininfor:unlock')")
+ @Log(title = "璐︽埛瑙ｉ攣", businessType = BusinessType.OTHER)
+ @GetMapping("/unlock/{userName}")
+ public R<?> unlock(@PathVariable("userName") String userName) {
+ passwordService.clearLoginRecordCache(userName);
+ return R.ok();
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/project/monitor/controller/SysOperlogController.java b/src/main/java/com/ruoyi/project/monitor/controller/SysOperlogController.java
index 81bab02..ee36e80 100644
--- a/src/main/java/com/ruoyi/project/monitor/controller/SysOperlogController.java
+++ b/src/main/java/com/ruoyi/project/monitor/controller/SysOperlogController.java
@@ -1,70 +1,70 @@
-package com.ruoyi.project.monitor.controller;
-
-import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
-import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.monitor.domain.SysOperLog;
-import com.ruoyi.project.monitor.service.ISysOperLogService;
-
-/**
- * 鎿嶄綔鏃ュ織璁板綍
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/monitor/operlog")
-@AllArgsConstructor
-public class SysOperlogController extends BaseController
-{
- private ISysOperLogService operLogService;
-
- @PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
- @GetMapping("/list")
- public TableDataInfo list(SysOperLog operLog)
- {
- startPage();
- List<SysOperLog> list = operLogService.selectOperLogList(operLog);
- return getDataTable(list);
- }
-
- @Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
- @PostMapping("/export")
- public void export(HttpServletResponse response, SysOperLog operLog)
- {
- List<SysOperLog> list = operLogService.selectOperLogList(operLog);
- ExcelUtil<SysOperLog> util = new ExcelUtil<SysOperLog>(SysOperLog.class);
- util.exportExcel(response, list, "鎿嶄綔鏃ュ織");
- }
-
- @Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.DELETE)
- @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
- @DeleteMapping("/{operIds}")
- public AjaxResult remove(@PathVariable Long[] operIds)
- {
- return toAjax(operLogService.deleteOperLogByIds(operIds));
- }
-
- @Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.CLEAN)
- @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
- @DeleteMapping("/clean")
- public AjaxResult clean()
- {
- operLogService.cleanOperLog();
- return success();
- }
-}
+package com.ruoyi.project.monitor.controller;
+
+import java.util.List;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.monitor.domain.SysOperLog;
+import com.ruoyi.project.monitor.service.ISysOperLogService;
+
+/**
+ * 鎿嶄綔鏃ュ織璁板綍
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/monitor/operlog")
+@AllArgsConstructor
+public class SysOperlogController extends BaseController
+{
+ private ISysOperLogService operLogService;
+
+ @PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(SysOperLog operLog)
+ {
+ startPage();
+ List<SysOperLog> list = operLogService.selectOperLogList(operLog);
+ return getDataTable(list);
+ }
+
+ @Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.EXPORT)
+ @PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, SysOperLog operLog)
+ {
+ List<SysOperLog> list = operLogService.selectOperLogList(operLog);
+ ExcelUtil<SysOperLog> util = new ExcelUtil<SysOperLog>(SysOperLog.class);
+ util.exportExcel(response, list, "鎿嶄綔鏃ュ織");
+ }
+
+ @Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.DELETE)
+ @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+ @DeleteMapping("/{operIds}")
+ public R<?> remove(@PathVariable Long[] operIds)
+ {
+ operLogService.deleteOperLogByIds(operIds);
+ return R.ok();
+ }
+
+ @Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.CLEAN)
+ @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+ @DeleteMapping("/clean")
+ public R<?> clean()
+ {
+ operLogService.cleanOperLog();
+ return R.ok();
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/project/monitor/controller/SysUserOnlineController.java b/src/main/java/com/ruoyi/project/monitor/controller/SysUserOnlineController.java
index aa8c824..666a6c0 100644
--- a/src/main/java/com/ruoyi/project/monitor/controller/SysUserOnlineController.java
+++ b/src/main/java/com/ruoyi/project/monitor/controller/SysUserOnlineController.java
@@ -1,83 +1,82 @@
-package com.ruoyi.project.monitor.controller;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.constant.CacheConstants;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.redis.RedisCache;
-import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.monitor.domain.SysUserOnline;
-import com.ruoyi.project.system.service.ISysUserOnlineService;
-
-/**
- * 鍦ㄧ嚎鐢ㄦ埛鐩戞帶
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/monitor/online")
-@AllArgsConstructor
-public class SysUserOnlineController extends BaseController
-{
- private ISysUserOnlineService userOnlineService;
- private RedisCache redisCache;
-
- @PreAuthorize("@ss.hasPermi('monitor:online:list')")
- @GetMapping("/list")
- public TableDataInfo list(String ipaddr, String userName)
- {
- Collection<String> keys = redisCache.keys(CacheConstants.LOGIN_TOKEN_KEY + "*");
- List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
- for (String key : keys)
- {
- LoginUser user = redisCache.getCacheObject(key);
- if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName))
- {
- userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
- }
- else if (StringUtils.isNotEmpty(ipaddr))
- {
- userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
- }
- else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser()))
- {
- userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
- }
- else
- {
- userOnlineList.add(userOnlineService.loginUserToUserOnline(user));
- }
- }
- Collections.reverse(userOnlineList);
- userOnlineList.removeAll(Collections.singleton(null));
- return getDataTable(userOnlineList);
- }
-
- /**
- * 寮洪��鐢ㄦ埛
- */
- @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
- @Log(title = "鍦ㄧ嚎鐢ㄦ埛", businessType = BusinessType.FORCE)
- @DeleteMapping("/{tokenId}")
- public AjaxResult forceLogout(@PathVariable String tokenId)
- {
- redisCache.deleteObject(CacheConstants.LOGIN_TOKEN_KEY + tokenId);
- return success();
- }
-}
+package com.ruoyi.project.monitor.controller;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import com.ruoyi.framework.web.domain.R;
+import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.constant.CacheConstants;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.redis.RedisCache;
+import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.monitor.domain.SysUserOnline;
+import com.ruoyi.project.system.service.ISysUserOnlineService;
+
+/**
+ * 鍦ㄧ嚎鐢ㄦ埛鐩戞帶
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/monitor/online")
+@AllArgsConstructor
+public class SysUserOnlineController extends BaseController
+{
+ private ISysUserOnlineService userOnlineService;
+ private RedisCache redisCache;
+
+ @PreAuthorize("@ss.hasPermi('monitor:online:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(String ipaddr, String userName)
+ {
+ Collection<String> keys = redisCache.keys(CacheConstants.LOGIN_TOKEN_KEY + "*");
+ List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
+ for (String key : keys)
+ {
+ LoginUser user = redisCache.getCacheObject(key);
+ if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName))
+ {
+ userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
+ }
+ else if (StringUtils.isNotEmpty(ipaddr))
+ {
+ userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
+ }
+ else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser()))
+ {
+ userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
+ }
+ else
+ {
+ userOnlineList.add(userOnlineService.loginUserToUserOnline(user));
+ }
+ }
+ Collections.reverse(userOnlineList);
+ userOnlineList.removeAll(Collections.singleton(null));
+ return getDataTable(userOnlineList);
+ }
+
+ /**
+ * 寮洪��鐢ㄦ埛
+ */
+ @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
+ @Log(title = "鍦ㄧ嚎鐢ㄦ埛", businessType = BusinessType.FORCE)
+ @DeleteMapping("/{tokenId}")
+ public R<?> forceLogout(@PathVariable String tokenId)
+ {
+ redisCache.deleteObject(CacheConstants.LOGIN_TOKEN_KEY + tokenId);
+ return R.ok();
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java b/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java
index a10687b..62f646d 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysConfigController.java
@@ -1,127 +1,129 @@
-package com.ruoyi.project.system.controller;
-
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.system.domain.SysConfig;
-import com.ruoyi.project.system.service.ISysConfigService;
-import jakarta.servlet.http.HttpServletResponse;
-import lombok.AllArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 鍙傛暟閰嶇疆 淇℃伅鎿嶄綔澶勭悊
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/system/config")
-@AllArgsConstructor
-public class SysConfigController extends BaseController
-{
- private ISysConfigService configService;
-
- /**
- * 鑾峰彇鍙傛暟閰嶇疆鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('system:config:list')")
- @GetMapping("/list")
- public TableDataInfo list(SysConfig config)
- {
- startPage();
- List<SysConfig> list = configService.selectConfigList(config);
- return getDataTable(list);
- }
-
- @Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:config:export')")
- @PostMapping("/export")
- public void export(HttpServletResponse response, SysConfig config)
- {
- List<SysConfig> list = configService.selectConfigList(config);
- ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
- util.exportExcel(response, list, "鍙傛暟鏁版嵁");
- }
-
- /**
- * 鏍规嵁鍙傛暟缂栧彿鑾峰彇璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('system:config:query')")
- @GetMapping(value = "/{configId}")
- public AjaxResult getInfo(@PathVariable Long configId)
- {
- return success(configService.selectConfigById(configId));
- }
-
- /**
- * 鏍规嵁鍙傛暟閿悕鏌ヨ鍙傛暟鍊�
- */
- @GetMapping(value = "/configKey/{configKey}")
- public AjaxResult getConfigKey(@PathVariable String configKey)
- {
- return success(configService.selectConfigByKey(configKey));
- }
-
- /**
- * 鏂板鍙傛暟閰嶇疆
- */
- @PreAuthorize("@ss.hasPermi('system:config:add')")
- @Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@Validated @RequestBody SysConfig config)
- {
- if (!configService.checkConfigKeyUnique(config))
- {
- return error("鏂板鍙傛暟'" + config.getConfigName() + "'澶辫触锛屽弬鏁伴敭鍚嶅凡瀛樺湪");
- }
- config.setCreateBy(getUsername());
- return toAjax(configService.insertConfig(config));
- }
-
- /**
- * 淇敼鍙傛暟閰嶇疆
- */
- @PreAuthorize("@ss.hasPermi('system:config:edit')")
- @Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@Validated @RequestBody SysConfig config)
- {
- if (!configService.checkConfigKeyUnique(config))
- {
- return error("淇敼鍙傛暟'" + config.getConfigName() + "'澶辫触锛屽弬鏁伴敭鍚嶅凡瀛樺湪");
- }
- config.setUpdateBy(getUsername());
- return toAjax(configService.updateConfig(config));
- }
-
- /**
- * 鍒犻櫎鍙傛暟閰嶇疆
- */
- @PreAuthorize("@ss.hasPermi('system:config:remove')")
- @Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.DELETE)
- @DeleteMapping("/{configIds}")
- public AjaxResult remove(@PathVariable Long[] configIds)
- {
- configService.deleteConfigByIds(configIds);
- return success();
- }
-
- /**
- * 鍒锋柊鍙傛暟缂撳瓨
- */
- @PreAuthorize("@ss.hasPermi('system:config:remove')")
- @Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.CLEAN)
- @DeleteMapping("/refreshCache")
- public AjaxResult refreshCache()
- {
- configService.resetConfigCache();
- return success();
- }
-}
+package com.ruoyi.project.system.controller;
+
+import java.util.List;
+
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.system.domain.SysConfig;
+import com.ruoyi.project.system.service.ISysConfigService;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 鍙傛暟閰嶇疆 淇℃伅鎿嶄綔澶勭悊
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/config")
+@AllArgsConstructor
+public class SysConfigController extends BaseController
+{
+ private ISysConfigService configService;
+
+ /**
+ * 鑾峰彇鍙傛暟閰嶇疆鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:config:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(SysConfig config)
+ {
+ startPage();
+ List<SysConfig> list = configService.selectConfigList(config);
+ return getDataTable(list);
+ }
+
+ @Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.EXPORT)
+ @PreAuthorize("@ss.hasPermi('system:config:export')")
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, SysConfig config)
+ {
+ List<SysConfig> list = configService.selectConfigList(config);
+ ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
+ util.exportExcel(response, list, "鍙傛暟鏁版嵁");
+ }
+
+ /**
+ * 鏍规嵁鍙傛暟缂栧彿鑾峰彇璇︾粏淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('system:config:query')")
+ @GetMapping(value = "/{configId}")
+ public R<?> getInfo(@PathVariable Long configId)
+ {
+ return R.ok(configService.selectConfigById(configId));
+ }
+
+ /**
+ * 鏍规嵁鍙傛暟閿悕鏌ヨ鍙傛暟鍊�
+ */
+ @GetMapping(value = "/configKey/{configKey}")
+ public R<?> getConfigKey(@PathVariable String configKey)
+ {
+ return R.ok(configService.selectConfigByKey(configKey));
+ }
+
+ /**
+ * 鏂板鍙傛暟閰嶇疆
+ */
+ @PreAuthorize("@ss.hasPermi('system:config:add')")
+ @Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.INSERT)
+ @PostMapping
+ public R<?> add(@Validated @RequestBody SysConfig config)
+ {
+ if (!configService.checkConfigKeyUnique(config))
+ {
+ return R.fail("鏂板鍙傛暟'" + config.getConfigName() + "'澶辫触锛屽弬鏁伴敭鍚嶅凡瀛樺湪");
+ }
+ config.setCreateBy(getUsername());
+ configService.insertConfig(config);
+ return R.ok();
+ }
+
+ /**
+ * 淇敼鍙傛暟閰嶇疆
+ */
+ @PreAuthorize("@ss.hasPermi('system:config:edit')")
+ @Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public R<?> edit(@Validated @RequestBody SysConfig config)
+ {
+ if (!configService.checkConfigKeyUnique(config))
+ {
+ return R.fail("淇敼鍙傛暟'" + config.getConfigName() + "'澶辫触锛屽弬鏁伴敭鍚嶅凡瀛樺湪");
+ }
+ config.setUpdateBy(getUsername());
+ configService.updateConfig(config);
+ return R.ok();
+ }
+
+ /**
+ * 鍒犻櫎鍙傛暟閰嶇疆
+ */
+ @PreAuthorize("@ss.hasPermi('system:config:remove')")
+ @Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{configIds}")
+ public R<?> remove(@PathVariable Long[] configIds)
+ {
+ configService.deleteConfigByIds(configIds);
+ return R.ok();
+ }
+
+ /**
+ * 鍒锋柊鍙傛暟缂撳瓨
+ */
+ @PreAuthorize("@ss.hasPermi('system:config:remove')")
+ @Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.CLEAN)
+ @DeleteMapping("/refreshCache")
+ public R<?> refreshCache()
+ {
+ configService.resetConfigCache();
+ return R.ok();
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java b/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java
index f61e42f..bb0da7b 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysDeptController.java
@@ -1,134 +1,137 @@
-package com.ruoyi.project.system.controller;
-
-import java.util.List;
-
-import lombok.AllArgsConstructor;
-import org.apache.commons.lang3.ArrayUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.project.system.domain.SysDept;
-import com.ruoyi.project.system.service.ISysDeptService;
-
-/**
- * 閮ㄩ棬淇℃伅
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/system/dept")
-@AllArgsConstructor
-public class SysDeptController extends BaseController
-{
- private ISysDeptService deptService;
-
- /**
- * 鑾峰彇閮ㄩ棬鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('system:dept:list')")
- @GetMapping("/list")
- public AjaxResult list(SysDept dept)
- {
- List<SysDept> depts = deptService.selectDeptList(dept);
- return success(depts);
- }
-
- /**
- * 鏌ヨ閮ㄩ棬鍒楄〃锛堟帓闄よ妭鐐癸級
- */
- @PreAuthorize("@ss.hasPermi('system:dept:list')")
- @GetMapping("/list/exclude/{deptId}")
- public AjaxResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
- {
- List<SysDept> depts = deptService.selectDeptList(new SysDept());
- depts.removeIf(d -> d.getDeptId().intValue() == deptId || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""));
- return success(depts);
- }
-
- /**
- * 鏍规嵁閮ㄩ棬缂栧彿鑾峰彇璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('system:dept:query')")
- @GetMapping(value = "/{deptId}")
- public AjaxResult getInfo(@PathVariable Long deptId)
- {
- deptService.checkDeptDataScope(deptId);
- return success(deptService.selectDeptById(deptId));
- }
-
- /**
- * 鏂板閮ㄩ棬
- */
- @PreAuthorize("@ss.hasPermi('system:dept:add')")
- @Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@Validated @RequestBody SysDept dept)
- {
- if (!deptService.checkDeptNameUnique(dept))
- {
- return error("鏂板閮ㄩ棬'" + dept.getDeptName() + "'澶辫触锛岄儴闂ㄥ悕绉板凡瀛樺湪");
- }
- dept.setCreateBy(getUsername());
- return toAjax(deptService.insertDept(dept));
- }
-
- /**
- * 淇敼閮ㄩ棬
- */
- @PreAuthorize("@ss.hasPermi('system:dept:edit')")
- @Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@Validated @RequestBody SysDept dept)
- {
- Long deptId = dept.getDeptId();
- deptService.checkDeptDataScope(deptId);
- if (!deptService.checkDeptNameUnique(dept))
- {
- return error("淇敼閮ㄩ棬'" + dept.getDeptName() + "'澶辫触锛岄儴闂ㄥ悕绉板凡瀛樺湪");
- }
- else if (dept.getParentId().equals(deptId))
- {
- return error("淇敼閮ㄩ棬'" + dept.getDeptName() + "'澶辫触锛屼笂绾ч儴闂ㄤ笉鑳芥槸鑷繁");
- }
- else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0)
- {
- return error("璇ラ儴闂ㄥ寘鍚湭鍋滅敤鐨勫瓙閮ㄩ棬锛�");
- }
- dept.setUpdateBy(getUsername());
- return toAjax(deptService.updateDept(dept));
- }
-
- /**
- * 鍒犻櫎閮ㄩ棬
- */
- @PreAuthorize("@ss.hasPermi('system:dept:remove')")
- @Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.DELETE)
- @DeleteMapping("/{deptId}")
- public AjaxResult remove(@PathVariable Long deptId)
- {
- if (deptService.hasChildByDeptId(deptId))
- {
- return warn("瀛樺湪涓嬬骇閮ㄩ棬,涓嶅厑璁稿垹闄�");
- }
- if (deptService.checkDeptExistUser(deptId))
- {
- return warn("閮ㄩ棬瀛樺湪鐢ㄦ埛,涓嶅厑璁稿垹闄�");
- }
- deptService.checkDeptDataScope(deptId);
- return toAjax(deptService.deleteDeptById(deptId));
- }
-}
+package com.ruoyi.project.system.controller;
+
+import java.util.List;
+
+import com.ruoyi.common.constant.HttpStatus;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.project.system.domain.SysDept;
+import com.ruoyi.project.system.service.ISysDeptService;
+
+/**
+ * 閮ㄩ棬淇℃伅
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/dept")
+@AllArgsConstructor
+public class SysDeptController extends BaseController
+{
+ private ISysDeptService deptService;
+
+ /**
+ * 鑾峰彇閮ㄩ棬鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:dept:list')")
+ @GetMapping("/list")
+ public R<?> list(SysDept dept)
+ {
+ List<SysDept> depts = deptService.selectDeptList(dept);
+ return R.ok(depts);
+ }
+
+ /**
+ * 鏌ヨ閮ㄩ棬鍒楄〃锛堟帓闄よ妭鐐癸級
+ */
+ @PreAuthorize("@ss.hasPermi('system:dept:list')")
+ @GetMapping("/list/exclude/{deptId}")
+ public R<?> excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
+ {
+ List<SysDept> depts = deptService.selectDeptList(new SysDept());
+ depts.removeIf(d -> d.getDeptId().intValue() == deptId || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""));
+ return R.ok(depts);
+ }
+
+ /**
+ * 鏍规嵁閮ㄩ棬缂栧彿鑾峰彇璇︾粏淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('system:dept:query')")
+ @GetMapping(value = "/{deptId}")
+ public R<?> getInfo(@PathVariable Long deptId)
+ {
+ deptService.checkDeptDataScope(deptId);
+ return R.ok(deptService.selectDeptById(deptId));
+ }
+
+ /**
+ * 鏂板閮ㄩ棬
+ */
+ @PreAuthorize("@ss.hasPermi('system:dept:add')")
+ @Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.INSERT)
+ @PostMapping
+ public R<?> add(@Validated @RequestBody SysDept dept)
+ {
+ if (!deptService.checkDeptNameUnique(dept))
+ {
+ return R.fail("鏂板閮ㄩ棬'" + dept.getDeptName() + "'澶辫触锛岄儴闂ㄥ悕绉板凡瀛樺湪");
+ }
+ dept.setCreateBy(getUsername());
+ deptService.insertDept(dept);
+ return R.ok();
+ }
+
+ /**
+ * 淇敼閮ㄩ棬
+ */
+ @PreAuthorize("@ss.hasPermi('system:dept:edit')")
+ @Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public R<?> edit(@Validated @RequestBody SysDept dept)
+ {
+ Long deptId = dept.getDeptId();
+ deptService.checkDeptDataScope(deptId);
+ if (!deptService.checkDeptNameUnique(dept))
+ {
+ return R.fail("淇敼閮ㄩ棬'" + dept.getDeptName() + "'澶辫触锛岄儴闂ㄥ悕绉板凡瀛樺湪");
+ }
+ else if (dept.getParentId().equals(deptId))
+ {
+ return R.fail("淇敼閮ㄩ棬'" + dept.getDeptName() + "'澶辫触锛屼笂绾ч儴闂ㄤ笉鑳芥槸鑷繁");
+ }
+ else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus()) && deptService.selectNormalChildrenDeptById(deptId) > 0)
+ {
+ return R.fail("璇ラ儴闂ㄥ寘鍚湭鍋滅敤鐨勫瓙閮ㄩ棬锛�");
+ }
+ dept.setUpdateBy(getUsername());
+ deptService.updateDept(dept);
+ return R.ok();
+ }
+
+ /**
+ * 鍒犻櫎閮ㄩ棬
+ */
+ @PreAuthorize("@ss.hasPermi('system:dept:remove')")
+ @Log(title = "閮ㄩ棬绠＄悊", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{deptId}")
+ public R<?> remove(@PathVariable Long deptId)
+ {
+ if (deptService.hasChildByDeptId(deptId))
+ {
+ return R.fail(HttpStatus.WARN, "瀛樺湪涓嬬骇閮ㄩ棬,涓嶅厑璁稿垹闄�");
+ }
+ if (deptService.checkDeptExistUser(deptId))
+ {
+ return R.fail(HttpStatus.WARN, "閮ㄩ棬瀛樺湪鐢ㄦ埛,涓嶅厑璁稿垹闄�");
+ }
+ deptService.checkDeptDataScope(deptId);
+ deptService.deleteDeptById(deptId);
+ return R.ok();
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java b/src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java
index 58cb4c1..66220e5 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysDictDataController.java
@@ -1,120 +1,121 @@
-package com.ruoyi.project.system.controller;
-
-import java.util.ArrayList;
-import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
-import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.system.domain.SysDictData;
-import com.ruoyi.project.system.service.ISysDictDataService;
-import com.ruoyi.project.system.service.ISysDictTypeService;
-
-/**
- * 鏁版嵁瀛楀吀淇℃伅
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/system/dict/data")
-@AllArgsConstructor
-public class SysDictDataController extends BaseController
-{
- private ISysDictDataService dictDataService;
- private ISysDictTypeService dictTypeService;
-
- @PreAuthorize("@ss.hasPermi('system:dict:list')")
- @GetMapping("/list")
- public TableDataInfo list(SysDictData dictData)
- {
- startPage();
- List<SysDictData> list = dictDataService.selectDictDataList(dictData);
- return getDataTable(list);
- }
-
- @Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:dict:export')")
- @PostMapping("/export")
- public void export(HttpServletResponse response, SysDictData dictData)
- {
- List<SysDictData> list = dictDataService.selectDictDataList(dictData);
- ExcelUtil<SysDictData> util = new ExcelUtil<SysDictData>(SysDictData.class);
- util.exportExcel(response, list, "瀛楀吀鏁版嵁");
- }
-
- /**
- * 鏌ヨ瀛楀吀鏁版嵁璇︾粏
- */
- @PreAuthorize("@ss.hasPermi('system:dict:query')")
- @GetMapping(value = "/{dictCode}")
- public AjaxResult getInfo(@PathVariable Long dictCode)
- {
- return success(dictDataService.selectDictDataById(dictCode));
- }
-
- /**
- * 鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁淇℃伅
- */
- @GetMapping(value = "/type/{dictType}")
- public AjaxResult dictType(@PathVariable String dictType)
- {
- List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
- if (StringUtils.isNull(data))
- {
- data = new ArrayList<SysDictData>();
- }
- return success(data);
- }
-
- /**
- * 鏂板瀛楀吀绫诲瀷
- */
- @PreAuthorize("@ss.hasPermi('system:dict:add')")
- @Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@Validated @RequestBody SysDictData dict)
- {
- dict.setCreateBy(getUsername());
- return toAjax(dictDataService.insertDictData(dict));
- }
-
- /**
- * 淇敼淇濆瓨瀛楀吀绫诲瀷
- */
- @PreAuthorize("@ss.hasPermi('system:dict:edit')")
- @Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@Validated @RequestBody SysDictData dict)
- {
- dict.setUpdateBy(getUsername());
- return toAjax(dictDataService.updateDictData(dict));
- }
-
- /**
- * 鍒犻櫎瀛楀吀绫诲瀷
- */
- @PreAuthorize("@ss.hasPermi('system:dict:remove')")
- @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.DELETE)
- @DeleteMapping("/{dictCodes}")
- public AjaxResult remove(@PathVariable Long[] dictCodes)
- {
- dictDataService.deleteDictDataByIds(dictCodes);
- return success();
- }
-}
+package com.ruoyi.project.system.controller;
+
+import java.util.ArrayList;
+import java.util.List;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.system.domain.SysDictData;
+import com.ruoyi.project.system.service.ISysDictDataService;
+import com.ruoyi.project.system.service.ISysDictTypeService;
+
+/**
+ * 鏁版嵁瀛楀吀淇℃伅
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/dict/data")
+@AllArgsConstructor
+public class SysDictDataController extends BaseController
+{
+ private ISysDictDataService dictDataService;
+ private ISysDictTypeService dictTypeService;
+
+ @PreAuthorize("@ss.hasPermi('system:dict:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(SysDictData dictData)
+ {
+ startPage();
+ List<SysDictData> list = dictDataService.selectDictDataList(dictData);
+ return getDataTable(list);
+ }
+
+ @Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.EXPORT)
+ @PreAuthorize("@ss.hasPermi('system:dict:export')")
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, SysDictData dictData)
+ {
+ List<SysDictData> list = dictDataService.selectDictDataList(dictData);
+ ExcelUtil<SysDictData> util = new ExcelUtil<SysDictData>(SysDictData.class);
+ util.exportExcel(response, list, "瀛楀吀鏁版嵁");
+ }
+
+ /**
+ * 鏌ヨ瀛楀吀鏁版嵁璇︾粏
+ */
+ @PreAuthorize("@ss.hasPermi('system:dict:query')")
+ @GetMapping(value = "/{dictCode}")
+ public R<?> getInfo(@PathVariable Long dictCode)
+ {
+ return R.ok(dictDataService.selectDictDataById(dictCode));
+ }
+
+ /**
+ * 鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁淇℃伅
+ */
+ @GetMapping(value = "/type/{dictType}")
+ public R<?> dictType(@PathVariable String dictType)
+ {
+ List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
+ if (StringUtils.isNull(data))
+ {
+ data = new ArrayList<SysDictData>();
+ }
+ return R.ok(data);
+ }
+
+ /**
+ * 鏂板瀛楀吀绫诲瀷
+ */
+ @PreAuthorize("@ss.hasPermi('system:dict:add')")
+ @Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.INSERT)
+ @PostMapping
+ public R<?> add(@Validated @RequestBody SysDictData dict)
+ {
+ dict.setCreateBy(getUsername());
+ dictDataService.insertDictData(dict);
+ return R.ok();
+ }
+
+ /**
+ * 淇敼淇濆瓨瀛楀吀绫诲瀷
+ */
+ @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+ @Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public R<?> edit(@Validated @RequestBody SysDictData dict)
+ {
+ dict.setUpdateBy(getUsername());
+ dictDataService.updateDictData(dict);
+ return R.ok();
+ }
+
+ /**
+ * 鍒犻櫎瀛楀吀绫诲瀷
+ */
+ @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+ @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{dictCodes}")
+ public R<?> remove(@PathVariable Long[] dictCodes)
+ {
+ dictDataService.deleteDictDataByIds(dictCodes);
+ return R.ok();
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java b/src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java
index f1a026f..4415c0c 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysDictTypeController.java
@@ -1,132 +1,133 @@
-package com.ruoyi.project.system.controller;
-
-import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
-import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.system.domain.SysDictType;
-import com.ruoyi.project.system.service.ISysDictTypeService;
-
-/**
- * 鏁版嵁瀛楀吀淇℃伅
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/system/dict/type")
-@AllArgsConstructor
-public class SysDictTypeController extends BaseController
-{
- private ISysDictTypeService dictTypeService;
-
- @PreAuthorize("@ss.hasPermi('system:dict:list')")
- @GetMapping("/list")
- public TableDataInfo list(SysDictType dictType)
- {
- startPage();
- List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
- return getDataTable(list);
- }
-
- @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:dict:export')")
- @PostMapping("/export")
- public void export(HttpServletResponse response, SysDictType dictType)
- {
- List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
- ExcelUtil<SysDictType> util = new ExcelUtil<SysDictType>(SysDictType.class);
- util.exportExcel(response, list, "瀛楀吀绫诲瀷");
- }
-
- /**
- * 鏌ヨ瀛楀吀绫诲瀷璇︾粏
- */
- @PreAuthorize("@ss.hasPermi('system:dict:query')")
- @GetMapping(value = "/{dictId}")
- public AjaxResult getInfo(@PathVariable Long dictId)
- {
- return success(dictTypeService.selectDictTypeById(dictId));
- }
-
- /**
- * 鏂板瀛楀吀绫诲瀷
- */
- @PreAuthorize("@ss.hasPermi('system:dict:add')")
- @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@Validated @RequestBody SysDictType dict)
- {
- if (!dictTypeService.checkDictTypeUnique(dict))
- {
- return error("鏂板瀛楀吀'" + dict.getDictName() + "'澶辫触锛屽瓧鍏哥被鍨嬪凡瀛樺湪");
- }
- dict.setCreateBy(getUsername());
- return toAjax(dictTypeService.insertDictType(dict));
- }
-
- /**
- * 淇敼瀛楀吀绫诲瀷
- */
- @PreAuthorize("@ss.hasPermi('system:dict:edit')")
- @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@Validated @RequestBody SysDictType dict)
- {
- if (!dictTypeService.checkDictTypeUnique(dict))
- {
- return error("淇敼瀛楀吀'" + dict.getDictName() + "'澶辫触锛屽瓧鍏哥被鍨嬪凡瀛樺湪");
- }
- dict.setUpdateBy(getUsername());
- return toAjax(dictTypeService.updateDictType(dict));
- }
-
- /**
- * 鍒犻櫎瀛楀吀绫诲瀷
- */
- @PreAuthorize("@ss.hasPermi('system:dict:remove')")
- @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.DELETE)
- @DeleteMapping("/{dictIds}")
- public AjaxResult remove(@PathVariable Long[] dictIds)
- {
- dictTypeService.deleteDictTypeByIds(dictIds);
- return success();
- }
-
- /**
- * 鍒锋柊瀛楀吀缂撳瓨
- */
- @PreAuthorize("@ss.hasPermi('system:dict:remove')")
- @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.CLEAN)
- @DeleteMapping("/refreshCache")
- public AjaxResult refreshCache()
- {
- dictTypeService.resetDictCache();
- return success();
- }
-
- /**
- * 鑾峰彇瀛楀吀閫夋嫨妗嗗垪琛�
- */
- @GetMapping("/optionselect")
- public AjaxResult optionselect()
- {
- List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
- return success(dictTypes);
- }
-}
+package com.ruoyi.project.system.controller;
+
+import java.util.List;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.system.domain.SysDictType;
+import com.ruoyi.project.system.service.ISysDictTypeService;
+
+/**
+ * 鏁版嵁瀛楀吀淇℃伅
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/dict/type")
+@AllArgsConstructor
+public class SysDictTypeController extends BaseController
+{
+ private ISysDictTypeService dictTypeService;
+
+ @PreAuthorize("@ss.hasPermi('system:dict:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(SysDictType dictType)
+ {
+ startPage();
+ List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
+ return getDataTable(list);
+ }
+
+ @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.EXPORT)
+ @PreAuthorize("@ss.hasPermi('system:dict:export')")
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, SysDictType dictType)
+ {
+ List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
+ ExcelUtil<SysDictType> util = new ExcelUtil<SysDictType>(SysDictType.class);
+ util.exportExcel(response, list, "瀛楀吀绫诲瀷");
+ }
+
+ /**
+ * 鏌ヨ瀛楀吀绫诲瀷璇︾粏
+ */
+ @PreAuthorize("@ss.hasPermi('system:dict:query')")
+ @GetMapping(value = "/{dictId}")
+ public R<?> getInfo(@PathVariable Long dictId)
+ {
+ return R.ok(dictTypeService.selectDictTypeById(dictId));
+ }
+
+ /**
+ * 鏂板瀛楀吀绫诲瀷
+ */
+ @PreAuthorize("@ss.hasPermi('system:dict:add')")
+ @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.INSERT)
+ @PostMapping
+ public R<?> add(@Validated @RequestBody SysDictType dict)
+ {
+ if (!dictTypeService.checkDictTypeUnique(dict))
+ {
+ return R.fail("鏂板瀛楀吀'" + dict.getDictName() + "'澶辫触锛屽瓧鍏哥被鍨嬪凡瀛樺湪");
+ }
+ dict.setCreateBy(getUsername());
+ dictTypeService.insertDictType(dict);
+ return R.ok();
+ }
+
+ /**
+ * 淇敼瀛楀吀绫诲瀷
+ */
+ @PreAuthorize("@ss.hasPermi('system:dict:edit')")
+ @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public R<?> edit(@Validated @RequestBody SysDictType dict)
+ {
+ if (!dictTypeService.checkDictTypeUnique(dict))
+ {
+ return R.fail("淇敼瀛楀吀'" + dict.getDictName() + "'澶辫触锛屽瓧鍏哥被鍨嬪凡瀛樺湪");
+ }
+ dict.setUpdateBy(getUsername());
+ dictTypeService.updateDictType(dict);
+ return R.ok();
+ }
+
+ /**
+ * 鍒犻櫎瀛楀吀绫诲瀷
+ */
+ @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+ @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{dictIds}")
+ public R<?> remove(@PathVariable Long[] dictIds)
+ {
+ dictTypeService.deleteDictTypeByIds(dictIds);
+ return R.ok();
+ }
+
+ /**
+ * 鍒锋柊瀛楀吀缂撳瓨
+ */
+ @PreAuthorize("@ss.hasPermi('system:dict:remove')")
+ @Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.CLEAN)
+ @DeleteMapping("/refreshCache")
+ public R<?> refreshCache()
+ {
+ dictTypeService.resetDictCache();
+ return R.ok();
+ }
+
+ /**
+ * 鑾峰彇瀛楀吀閫夋嫨妗嗗垪琛�
+ */
+ @GetMapping("/optionselect")
+ public R<?> optionselect()
+ {
+ List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
+ return R.ok(dictTypes);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java b/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
index e5c5bfa..55f3caf 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
@@ -1,155 +1,156 @@
-package com.ruoyi.project.system.controller;
-
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.framework.security.LoginBody;
-import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.security.service.SysLoginService;
-import com.ruoyi.framework.security.service.SysPermissionService;
-import com.ruoyi.framework.security.service.TokenService;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.project.system.domain.SysDept;
-import com.ruoyi.project.system.domain.SysMenu;
-import com.ruoyi.project.system.domain.SysUser;
-import com.ruoyi.project.system.domain.vo.SysUserDeptVo;
-import com.ruoyi.project.system.mapper.SysDeptMapper;
-import com.ruoyi.project.system.service.ISysMenuService;
-import com.ruoyi.project.system.service.ISysUserDeptService;
-import com.ruoyi.project.system.service.ISysUserService;
-import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-/**
- * 鐧诲綍楠岃瘉
- *
- * @author ruoyi
- */
-@RestController
-@AllArgsConstructor
-public class SysLoginController
-{
- private SysLoginService loginService;
- private ISysMenuService menuService;
- private SysPermissionService permissionService;
- private TokenService tokenService;
- private ISysUserDeptService userDeptService;
- private ISysUserService userService;
- private SysDeptMapper sysDeptMapper;
-
- /**
- * 鐧诲綍鏂规硶
- *
- * @param loginBody 鐧诲綍淇℃伅
- * @return 缁撴灉
- */
- @PostMapping("/login")
- public AjaxResult login(@RequestBody LoginBody loginBody)
- {
- AjaxResult ajax = AjaxResult.success();
- // 鐢熸垚浠ょ墝
- String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
- loginBody.getUuid());
- ajax.put(Constants.TOKEN, token);
- return ajax;
- }
-
- /**
- * 鑾峰彇鐢ㄦ埛淇℃伅
- *
- * @return 鐢ㄦ埛淇℃伅
- */
- @GetMapping("/getInfo")
- public AjaxResult getInfo()
- {
- LoginUser loginUser = SecurityUtils.getLoginUser();
- SysUser user = loginUser.getUser();
- // 鑾峰彇褰撳墠鐧诲綍鍏徃
- Long tenantId = loginUser.getTenantId();
- if(null != tenantId){
- user.setTenantId(tenantId);
- SysDept sysDept = sysDeptMapper.selectDeptById(tenantId.longValue());
- if(!ObjectUtils.isEmpty(sysDept)){
- user.setCurrentFactoryName(sysDept.getDeptName());
- }
- }
- // 瑙掕壊闆嗗悎
- Set<String> roles = permissionService.getRolePermission(user);
- // 鏉冮檺闆嗗悎
- Set<String> permissions = permissionService.getMenuPermission(user);
- if (!loginUser.getPermissions().equals(permissions))
- {
- loginUser.setPermissions(permissions);
- tokenService.refreshToken(loginUser);
- }
- AjaxResult ajax = AjaxResult.success();
- ajax.put("user", user);
- ajax.put("aiEnabled", loginUser.getAiEnabled());
- ajax.put("roles", roles);
- ajax.put("permissions", permissions);
- return ajax;
- }
-
- /**
- * 鑾峰彇璺敱淇℃伅
- *
- * @return 璺敱淇℃伅
- */
- @GetMapping("getRouters")
- public AjaxResult getRouters()
- {
- Long userId = SecurityUtils.getUserId();
- List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
- return AjaxResult.success(menuService.buildMenus(menus));
- }
-
- @PostMapping("/loginCheck")
- public AjaxResult loginCheck(@RequestBody LoginBody loginBody)
- {
- try {
- Long userId = loginService.loginCheck(loginBody.getUsername(), loginBody.getPassword());
- return AjaxResult.success(userId);
- }catch (Exception e) {
- return AjaxResult.error(e.getMessage());
- }
- }
-
- @GetMapping("/userLoginFacotryList")
- public AjaxResult userLoginFacotryList(SysUserDeptVo sysUserDeptVo){
- List<SysUserDeptVo> sysUserDeptVoList = userDeptService.userLoginFacotryList(sysUserDeptVo);
- Map<Long, SysUserDeptVo> map = sysUserDeptVoList.stream()
- .collect(Collectors.toMap(
- SysUserDeptVo::getDeptId,
- item -> item,
- (existing, replacement) -> existing // 濡傛灉閲嶅锛屼繚鐣欑涓�涓�
- ));
- List<SysUserDeptVo> uniqueList = new ArrayList<>(map.values());
- return AjaxResult.success(uniqueList);
- }
-
- /**
- * 閫夋嫨鍏徃鐧诲綍
- *
- * @param loginBody 鐧诲綍淇℃伅
- * @return 缁撴灉
- */
- @PostMapping("/loginCheckFactory")
- public AjaxResult loginCheckFactory(@RequestBody LoginBody loginBody)
- {
- AjaxResult ajax = AjaxResult.success();
- // 鐢熸垚浠ょ墝
- String token = loginService.loginCheckFactory(loginBody.getUsername(), loginBody.getPassword(),loginBody.getFactoryId());
- ajax.put(Constants.TOKEN, token);
- return ajax;
- }
-}
+package com.ruoyi.project.system.controller;
+
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.framework.security.LoginBody;
+import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.framework.security.service.SysLoginService;
+import com.ruoyi.framework.security.service.SysPermissionService;
+import com.ruoyi.framework.security.service.TokenService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.project.system.domain.SysDept;
+import com.ruoyi.project.system.domain.SysMenu;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.domain.vo.SysUserDeptVo;
+import com.ruoyi.project.system.mapper.SysDeptMapper;
+import com.ruoyi.project.system.service.ISysMenuService;
+import com.ruoyi.project.system.service.ISysUserDeptService;
+import com.ruoyi.project.system.service.ISysUserService;
+import lombok.AllArgsConstructor;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * 鐧诲綍楠岃瘉
+ *
+ * @author ruoyi
+ */
+@RestController
+@AllArgsConstructor
+public class SysLoginController extends BaseController
+{
+ private SysLoginService loginService;
+ private ISysMenuService menuService;
+ private SysPermissionService permissionService;
+ private TokenService tokenService;
+ private ISysUserDeptService userDeptService;
+ private ISysUserService userService;
+ private SysDeptMapper sysDeptMapper;
+
+ /**
+ * 鐧诲綍鏂规硶
+ *
+ * @param loginBody 鐧诲綍淇℃伅
+ * @return 缁撴灉
+ */
+ @PostMapping("/login")
+ public R<?> login(@RequestBody LoginBody loginBody)
+ {
+ // 鐢熸垚浠ょ墝
+ String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
+ loginBody.getUuid());
+ Map<String, Object> map = new HashMap<>();
+ map.put(Constants.TOKEN, token);
+ return R.ok(map);
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛淇℃伅
+ *
+ * @return 鐢ㄦ埛淇℃伅
+ */
+ @GetMapping("/getInfo")
+ public R<?> getInfo()
+ {
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ SysUser user = loginUser.getUser();
+ // 鑾峰彇褰撳墠鐧诲綍鍏徃
+ Long tenantId = loginUser.getTenantId();
+ if(null != tenantId){
+ user.setTenantId(tenantId);
+ SysDept sysDept = sysDeptMapper.selectDeptById(tenantId.longValue());
+ if(!ObjectUtils.isEmpty(sysDept)){
+ user.setCurrentFactoryName(sysDept.getDeptName());
+ }
+ }
+ // 瑙掕壊闆嗗悎
+ Set<String> roles = permissionService.getRolePermission(user);
+ // 鏉冮檺闆嗗悎
+ Set<String> permissions = permissionService.getMenuPermission(user);
+ if (!loginUser.getPermissions().equals(permissions))
+ {
+ loginUser.setPermissions(permissions);
+ tokenService.refreshToken(loginUser);
+ }
+ Map<String, Object> map = new HashMap<>();
+ map.put("user", user);
+ map.put("aiEnabled", loginUser.getAiEnabled());
+ map.put("roles", roles);
+ map.put("permissions", permissions);
+ return R.ok(map);
+ }
+
+ /**
+ * 鑾峰彇璺敱淇℃伅
+ *
+ * @return 璺敱淇℃伅
+ */
+ @GetMapping("getRouters")
+ public R<?> getRouters()
+ {
+ Long userId = SecurityUtils.getUserId();
+ List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
+ return R.ok(menuService.buildMenus(menus));
+ }
+
+ @PostMapping("/loginCheck")
+ public R<?> loginCheck(@RequestBody LoginBody loginBody)
+ {
+ try {
+ Long userId = loginService.loginCheck(loginBody.getUsername(), loginBody.getPassword());
+ return R.ok(userId);
+ }catch (Exception e) {
+ return R.fail(e.getMessage());
+ }
+ }
+
+ @GetMapping("/userLoginFacotryList")
+ public R<?> userLoginFacotryList(SysUserDeptVo sysUserDeptVo){
+ List<SysUserDeptVo> sysUserDeptVoList = userDeptService.userLoginFacotryList(sysUserDeptVo);
+ Map<Long, SysUserDeptVo> map = sysUserDeptVoList.stream()
+ .collect(Collectors.toMap(
+ SysUserDeptVo::getDeptId,
+ item -> item,
+ (existing, replacement) -> existing // 濡傛灉閲嶅锛屼繚鐣欑涓�涓�
+ ));
+ List<SysUserDeptVo> uniqueList = new ArrayList<>(map.values());
+ return R.ok(uniqueList);
+ }
+
+ /**
+ * 閫夋嫨鍏徃鐧诲綍
+ *
+ * @param loginBody 鐧诲綍淇℃伅
+ * @return 缁撴灉
+ */
+ @PostMapping("/loginCheckFactory")
+ public R<?> loginCheckFactory(@RequestBody LoginBody loginBody)
+ {
+ // 鐢熸垚浠ょ墝
+ String token = loginService.loginCheckFactory(loginBody.getUsername(), loginBody.getPassword(),loginBody.getFactoryId());
+ Map<String, Object> map = new HashMap<>();
+ map.put(Constants.TOKEN, token);
+ return R.ok(map);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java b/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java
index 865e8a4..285dc69 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java
@@ -1,136 +1,142 @@
-package com.ruoyi.project.system.controller;
-
-import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.project.system.domain.SysMenu;
-import com.ruoyi.project.system.service.ISysMenuService;
-import lombok.AllArgsConstructor;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 鑿滃崟淇℃伅
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/system/menu")
-@AllArgsConstructor
-public class SysMenuController extends BaseController
-{
- private ISysMenuService menuService;
-
- /**
- * 鑾峰彇鑿滃崟鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('system:menu:list')")
- @GetMapping("/list")
- public AjaxResult list(SysMenu menu)
- {
- List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
- return success(menus);
- }
-
- /**
- * 鏍规嵁鑿滃崟缂栧彿鑾峰彇璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('system:menu:query')")
- @GetMapping(value = "/{menuId}")
- public AjaxResult getInfo(@PathVariable Long menuId)
- {
- return success(menuService.selectMenuById(menuId));
- }
-
- /**
- * 鑾峰彇鑿滃崟涓嬫媺鏍戝垪琛�
- */
- @GetMapping("/treeselect")
- public AjaxResult treeselect(SysMenu menu)
- {
- List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
- return success(menuService.buildMenuTreeSelect(menus));
- }
-
- /**
- * 鍔犺浇瀵瑰簲瑙掕壊鑿滃崟鍒楄〃鏍�
- */
- @GetMapping(value = "/roleMenuTreeselect/{roleId}")
- public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
- {
- List<SysMenu> menus = menuService.selectMenuList(getUserId());
- AjaxResult ajax = AjaxResult.success();
- ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
- ajax.put("menus", menuService.buildMenuTreeSelect(menus));
- return ajax;
- }
-
- /**
- * 鏂板鑿滃崟
- */
- @PreAuthorize("@ss.hasPermi('system:menu:add')")
- @Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@Validated @RequestBody SysMenu menu)
- {
- if (!menuService.checkMenuNameUnique(menu))
- {
- return error("鏂板鑿滃崟'" + menu.getMenuName() + "'澶辫触锛岃彍鍗曞悕绉板凡瀛樺湪");
- }
- else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
- {
- return error("鏂板鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屽湴鍧�蹇呴』浠ttp(s)://寮�澶�");
- }
- menu.setCreateBy(getUsername());
- return toAjax(menuService.insertMenu(menu));
- }
-
- /**
- * 淇敼鑿滃崟
- */
- @PreAuthorize("@ss.hasPermi('system:menu:edit')")
- @Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@Validated @RequestBody SysMenu menu)
- {
- if (!menuService.checkMenuNameUnique(menu))
- {
- return error("淇敼鑿滃崟'" + menu.getMenuName() + "'澶辫触锛岃彍鍗曞悕绉板凡瀛樺湪");
- }
- else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
- {
- return error("淇敼鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屽湴鍧�蹇呴』浠ttp(s)://寮�澶�");
- }
- else if (menu.getMenuId().equals(menu.getParentId()))
- {
- return error("淇敼鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屼笂绾ц彍鍗曚笉鑳介�夋嫨鑷繁");
- }
- menu.setUpdateBy(getUsername());
- return toAjax(menuService.updateMenu(menu));
- }
-
- /**
- * 鍒犻櫎鑿滃崟
- */
- @PreAuthorize("@ss.hasPermi('system:menu:remove')")
- @Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.DELETE)
- @DeleteMapping("/{menuId}")
- public AjaxResult remove(@PathVariable("menuId") Long menuId)
- {
- if (menuService.hasChildByMenuId(menuId))
- {
- return warn("瀛樺湪瀛愯彍鍗�,涓嶅厑璁稿垹闄�");
- }
- if (menuService.checkMenuExistRole(menuId))
- {
- return warn("鑿滃崟宸插垎閰�,涓嶅厑璁稿垹闄�");
- }
- return toAjax(menuService.deleteMenuById(menuId));
- }
+package com.ruoyi.project.system.controller;
+
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.project.system.domain.SysMenu;
+import com.ruoyi.project.system.service.ISysMenuService;
+import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 鑿滃崟淇℃伅
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/menu")
+@AllArgsConstructor
+public class SysMenuController extends BaseController
+{
+ private ISysMenuService menuService;
+
+ /**
+ * 鑾峰彇鑿滃崟鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:menu:list')")
+ @GetMapping("/list")
+ public R<?> list(SysMenu menu)
+ {
+ List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
+ return R.ok(menus);
+ }
+
+ /**
+ * 鏍规嵁鑿滃崟缂栧彿鑾峰彇璇︾粏淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('system:menu:query')")
+ @GetMapping(value = "/{menuId}")
+ public R<?> getInfo(@PathVariable Long menuId)
+ {
+ return R.ok(menuService.selectMenuById(menuId));
+ }
+
+ /**
+ * 鑾峰彇鑿滃崟涓嬫媺鏍戝垪琛�
+ */
+ @GetMapping("/treeselect")
+ public R<?> treeselect(SysMenu menu)
+ {
+ List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
+ return R.ok(menuService.buildMenuTreeSelect(menus));
+ }
+
+ /**
+ * 鍔犺浇瀵瑰簲瑙掕壊鑿滃崟鍒楄〃鏍�
+ */
+ @GetMapping(value = "/roleMenuTreeselect/{roleId}")
+ public R<?> roleMenuTreeselect(@PathVariable("roleId") Long roleId)
+ {
+ List<SysMenu> menus = menuService.selectMenuList(getUserId());
+ Map<String, Object> map = new HashMap<>();
+ map.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
+ map.put("menus", menuService.buildMenuTreeSelect(menus));
+ return R.ok(map);
+ }
+
+ /**
+ * 鏂板鑿滃崟
+ */
+ @PreAuthorize("@ss.hasPermi('system:menu:add')")
+ @Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.INSERT)
+ @PostMapping
+ public R<?> add(@Validated @RequestBody SysMenu menu)
+ {
+ if (!menuService.checkMenuNameUnique(menu))
+ {
+ return R.fail("鏂板鑿滃崟'" + menu.getMenuName() + "'澶辫触锛岃彍鍗曞悕绉板凡瀛樺湪");
+ }
+ else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
+ {
+ return R.fail("鏂板鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屽湴鍧�蹇呴』浠ttp(s)://寮�澶�");
+ }
+ menu.setCreateBy(getUsername());
+ menuService.insertMenu(menu);
+ return R.ok();
+ }
+
+ /**
+ * 淇敼鑿滃崟
+ */
+ @PreAuthorize("@ss.hasPermi('system:menu:edit')")
+ @Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public R<?> edit(@Validated @RequestBody SysMenu menu)
+ {
+ if (!menuService.checkMenuNameUnique(menu))
+ {
+ return R.fail("淇敼鑿滃崟'" + menu.getMenuName() + "'澶辫触锛岃彍鍗曞悕绉板凡瀛樺湪");
+ }
+ else if (UserConstants.YES_FRAME.equals(menu.getIsFrame()) && !StringUtils.ishttp(menu.getPath()))
+ {
+ return R.fail("淇敼鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屽湴鍧�蹇呴』浠ttp(s)://寮�澶�");
+ }
+ else if (menu.getMenuId().equals(menu.getParentId()))
+ {
+ return R.fail("淇敼鑿滃崟'" + menu.getMenuName() + "'澶辫触锛屼笂绾ц彍鍗曚笉鑳介�夋嫨鑷繁");
+ }
+ menu.setUpdateBy(getUsername());
+ menuService.updateMenu(menu);
+ return R.ok();
+ }
+
+ /**
+ * 鍒犻櫎鑿滃崟
+ */
+ @PreAuthorize("@ss.hasPermi('system:menu:remove')")
+ @Log(title = "鑿滃崟绠＄悊", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{menuId}")
+ public R<?> remove(@PathVariable("menuId") Long menuId)
+ {
+ if (menuService.hasChildByMenuId(menuId))
+ {
+ return R.fail(HttpStatus.WARN, "瀛樺湪瀛愯彍鍗�,涓嶅厑璁稿垹闄�");
+ }
+ if (menuService.checkMenuExistRole(menuId))
+ {
+ return R.fail(HttpStatus.WARN, "鑿滃崟宸插垎閰�,涓嶅厑璁稿垹闄�");
+ }
+ menuService.deleteMenuById(menuId);
+ return R.ok();
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java b/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java
index 5aa3413..40458bf 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java
@@ -1,96 +1,99 @@
-package com.ruoyi.project.system.controller;
-
-import java.util.List;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.R;
-import io.swagger.v3.oas.annotations.Operation;
-import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.system.domain.SysNotice;
-import com.ruoyi.project.system.service.ISysNoticeService;
-
-/**
- * 鍏憡 淇℃伅鎿嶄綔澶勭悊
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/system/notice")
-@AllArgsConstructor
-public class SysNoticeController extends BaseController {
- private ISysNoticeService noticeService;
-
- /**
- * 鑾峰彇閫氱煡鍏憡鍒楄〃
- */
- @GetMapping("/list")
- public R<IPage<SysNotice>> list(SysNotice notice, Page page) {
- IPage<SysNotice> list = noticeService.selectNoticeList(notice, page);
- return R.ok(list);
- }
-
- /**
- * 鑾峰彇鏈鏁伴噺
- */
- @GetMapping("/getCount")
- public R getCount(Long consigneeId) {
- return R.ok(noticeService.getCount(consigneeId));
- }
-
- /**
- * 鏍规嵁閫氱煡鍏憡缂栧彿鑾峰彇璇︾粏淇℃伅
- */
- @GetMapping(value = "/{noticeId}")
- public AjaxResult getInfo(@PathVariable Long noticeId) {
- return success(noticeService.selectNoticeById(noticeId));
- }
-
- /**
- * 鏂板閫氱煡鍏憡
- */
- @PostMapping
- public AjaxResult add(@Validated @RequestBody SysNotice notice) {
- return toAjax(noticeService.insertNotice(notice));
- }
-
- /**
- * 淇敼閫氱煡鍏憡
- */
- @PutMapping
- public AjaxResult edit(@Validated @RequestBody SysNotice notice) {
- return toAjax(noticeService.updateNotice(notice));
- }
-
- /**
- * 鍒犻櫎閫氱煡鍏憡
- */
- @DeleteMapping("/{noticeIds}")
- public AjaxResult remove(@PathVariable Long[] noticeIds) {
- return toAjax(noticeService.deleteNoticeByIds(noticeIds));
- }
-
- /**
- * 涓�閿凡璇�
- */
- @PostMapping("/readAll")
- public AjaxResult readAll() {
- return toAjax(noticeService.readAll());
- }
-
- @PostMapping("appReadNotice")
- @Operation(summary = "绉诲姩绔牴鎹秷鎭疘D杩涜宸茶")
- public AjaxResult appReadNotice(@RequestParam("noticeId") Long noticeId) {
- boolean result = noticeService.appReadNotice(noticeId);
- return toAjax(result);
- }
-}
+package com.ruoyi.project.system.controller;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.web.domain.R;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.system.domain.SysNotice;
+import com.ruoyi.project.system.service.ISysNoticeService;
+
+/**
+ * 鍏憡 淇℃伅鎿嶄綔澶勭悊
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/notice")
+@AllArgsConstructor
+public class SysNoticeController extends BaseController {
+ private ISysNoticeService noticeService;
+
+ /**
+ * 鑾峰彇閫氱煡鍏憡鍒楄〃
+ */
+ @GetMapping("/list")
+ public R<IPage<SysNotice>> list(SysNotice notice, Page page) {
+ IPage<SysNotice> list = noticeService.selectNoticeList(notice, page);
+ return R.ok(list);
+ }
+
+ /**
+ * 鑾峰彇鏈鏁伴噺
+ */
+ @GetMapping("/getCount")
+ public R getCount(Long consigneeId) {
+ return R.ok(noticeService.getCount(consigneeId));
+ }
+
+ /**
+ * 鏍规嵁閫氱煡鍏憡缂栧彿鑾峰彇璇︾粏淇℃伅
+ */
+ @GetMapping(value = "/{noticeId}")
+ public R<?> getInfo(@PathVariable Long noticeId) {
+ return R.ok(noticeService.selectNoticeById(noticeId));
+ }
+
+ /**
+ * 鏂板閫氱煡鍏憡
+ */
+ @PostMapping
+ public R<?> add(@Validated @RequestBody SysNotice notice) {
+ noticeService.insertNotice(notice);
+ return R.ok();
+ }
+
+ /**
+ * 淇敼閫氱煡鍏憡
+ */
+ @PutMapping
+ public R<?> edit(@Validated @RequestBody SysNotice notice) {
+ noticeService.updateNotice(notice);
+ return R.ok();
+ }
+
+ /**
+ * 鍒犻櫎閫氱煡鍏憡
+ */
+ @DeleteMapping("/{noticeIds}")
+ public R<?> remove(@PathVariable Long[] noticeIds) {
+ noticeService.deleteNoticeByIds(noticeIds);
+ return R.ok();
+ }
+
+ /**
+ * 涓�閿凡璇�
+ */
+ @PostMapping("/readAll")
+ public R<?> readAll() {
+ noticeService.readAll();
+ return R.ok();
+ }
+
+ @PostMapping("appReadNotice")
+ @Operation(summary = "绉诲姩绔牴鎹秷鎭疘D杩涜宸茶")
+ public R<?> appReadNotice(@RequestParam("noticeId") Long noticeId) {
+ noticeService.appReadNotice(noticeId);
+ return R.ok();
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysPostController.java b/src/main/java/com/ruoyi/project/system/controller/SysPostController.java
index a4776c4..652ab30 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysPostController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysPostController.java
@@ -1,133 +1,135 @@
-package com.ruoyi.project.system.controller;
-
-import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
-import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.system.domain.SysPost;
-import com.ruoyi.project.system.service.ISysPostService;
-
-/**
- * 宀椾綅淇℃伅鎿嶄綔澶勭悊
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/system/post")
-@AllArgsConstructor
-public class SysPostController extends BaseController
-{
- private ISysPostService postService;
-
- /**
- * 鑾峰彇宀椾綅鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('system:post:list')")
- @GetMapping("/list")
- public TableDataInfo list(SysPost post)
- {
- startPage();
- List<SysPost> list = postService.selectPostList(post);
- return getDataTable(list);
- }
- /**
- * 瀵煎嚭宀椾綅鍒楄〃
- */
-
- @Log(title = "宀椾綅绠＄悊", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:post:export')")
- @PostMapping("/export")
- public void export(HttpServletResponse response, SysPost post)
- {
- List<SysPost> list = postService.selectPostList(post);
- ExcelUtil<SysPost> util = new ExcelUtil<SysPost>(SysPost.class);
- util.exportExcel(response, list, "宀椾綅鏁版嵁");
- }
-
- /**
- * 鏍规嵁宀椾綅缂栧彿鑾峰彇璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('system:post:query')")
- @GetMapping(value = "/{postId}")
- public AjaxResult getInfo(@PathVariable Long postId)
- {
- return success(postService.selectPostById(postId));
- }
-
- /**
- * 鏂板宀椾綅
- */
- @PreAuthorize("@ss.hasPermi('system:post:add')")
- @Log(title = "宀椾綅绠＄悊", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@Validated @RequestBody SysPost post)
- {
- if (!postService.checkPostNameUnique(post))
- {
- return error("鏂板宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶅悕绉板凡瀛樺湪");
- }
- else if (!postService.checkPostCodeUnique(post))
- {
- return error("鏂板宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶇紪鐮佸凡瀛樺湪");
- }
- post.setCreateBy(getUsername());
- return toAjax(postService.insertPost(post));
- }
-
- /**
- * 淇敼宀椾綅
- */
- @PreAuthorize("@ss.hasPermi('system:post:edit')")
- @Log(title = "宀椾綅绠＄悊", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@Validated @RequestBody SysPost post)
- {
- if (!postService.checkPostNameUnique(post))
- {
- return error("淇敼宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶅悕绉板凡瀛樺湪");
- }
- else if (!postService.checkPostCodeUnique(post))
- {
- return error("淇敼宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶇紪鐮佸凡瀛樺湪");
- }
- post.setUpdateBy(getUsername());
- return toAjax(postService.updatePost(post));
- }
-
- /**
- * 鍒犻櫎宀椾綅
- */
- @PreAuthorize("@ss.hasPermi('system:post:remove')")
- @Log(title = "宀椾綅绠＄悊", businessType = BusinessType.DELETE)
- @DeleteMapping("/{postIds}")
- public AjaxResult remove(@PathVariable Long[] postIds)
- {
- return toAjax(postService.deletePostByIds(postIds));
- }
-
- /**
- * 鑾峰彇宀椾綅閫夋嫨妗嗗垪琛�
- */
- @GetMapping("/optionselect")
- public AjaxResult optionselect()
- {
- List<SysPost> posts = postService.selectPostAll();
- return success(posts);
- }
-}
+package com.ruoyi.project.system.controller;
+
+import java.util.List;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.system.domain.SysPost;
+import com.ruoyi.project.system.service.ISysPostService;
+
+/**
+ * 宀椾綅淇℃伅鎿嶄綔澶勭悊
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/post")
+@AllArgsConstructor
+public class SysPostController extends BaseController
+{
+ private ISysPostService postService;
+
+ /**
+ * 鑾峰彇宀椾綅鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:post:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(SysPost post)
+ {
+ startPage();
+ List<SysPost> list = postService.selectPostList(post);
+ return getDataTable(list);
+ }
+ /**
+ * 瀵煎嚭宀椾綅鍒楄〃
+ */
+
+ @Log(title = "宀椾綅绠＄悊", businessType = BusinessType.EXPORT)
+ @PreAuthorize("@ss.hasPermi('system:post:export')")
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, SysPost post)
+ {
+ List<SysPost> list = postService.selectPostList(post);
+ ExcelUtil<SysPost> util = new ExcelUtil<SysPost>(SysPost.class);
+ util.exportExcel(response, list, "宀椾綅鏁版嵁");
+ }
+
+ /**
+ * 鏍规嵁宀椾綅缂栧彿鑾峰彇璇︾粏淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('system:post:query')")
+ @GetMapping(value = "/{postId}")
+ public R<?> getInfo(@PathVariable Long postId)
+ {
+ return R.ok(postService.selectPostById(postId));
+ }
+
+ /**
+ * 鏂板宀椾綅
+ */
+ @PreAuthorize("@ss.hasPermi('system:post:add')")
+ @Log(title = "宀椾綅绠＄悊", businessType = BusinessType.INSERT)
+ @PostMapping
+ public R<?> add(@Validated @RequestBody SysPost post)
+ {
+ if (!postService.checkPostNameUnique(post))
+ {
+ return R.fail("鏂板宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶅悕绉板凡瀛樺湪");
+ }
+ else if (!postService.checkPostCodeUnique(post))
+ {
+ return R.fail("鏂板宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶇紪鐮佸凡瀛樺湪");
+ }
+ post.setCreateBy(getUsername());
+ postService.insertPost(post);
+ return R.ok();
+ }
+
+ /**
+ * 淇敼宀椾綅
+ */
+ @PreAuthorize("@ss.hasPermi('system:post:edit')")
+ @Log(title = "宀椾綅绠＄悊", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public R<?> edit(@Validated @RequestBody SysPost post)
+ {
+ if (!postService.checkPostNameUnique(post))
+ {
+ return R.fail("淇敼宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶅悕绉板凡瀛樺湪");
+ }
+ else if (!postService.checkPostCodeUnique(post))
+ {
+ return R.fail("淇敼宀椾綅'" + post.getPostName() + "'澶辫触锛屽矖浣嶇紪鐮佸凡瀛樺湪");
+ }
+ post.setUpdateBy(getUsername());
+ postService.updatePost(post);
+ return R.ok();
+ }
+
+ /**
+ * 鍒犻櫎宀椾綅
+ */
+ @PreAuthorize("@ss.hasPermi('system:post:remove')")
+ @Log(title = "宀椾綅绠＄悊", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{postIds}")
+ public R<?> remove(@PathVariable Long[] postIds)
+ {
+ postService.deletePostByIds(postIds);
+ return R.ok();
+ }
+
+ /**
+ * 鑾峰彇宀椾綅閫夋嫨妗嗗垪琛�
+ */
+ @GetMapping("/optionselect")
+ public R<?> optionselect()
+ {
+ List<SysPost> posts = postService.selectPostAll();
+ return R.ok(posts);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java b/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java
index 62f6db5..dcc6fe2 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysProfileController.java
@@ -1,133 +1,135 @@
-package com.ruoyi.project.system.controller;
-
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.file.FileUploadUtils;
-import com.ruoyi.common.utils.file.MimeTypeUtils;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.config.RuoYiConfig;
-import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.security.service.TokenService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.project.system.domain.SysUser;
-import com.ruoyi.project.system.service.ISysUserService;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.Map;
-
-/**
- * 涓汉淇℃伅 涓氬姟澶勭悊
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/system/user/profile")
-@AllArgsConstructor
-public class SysProfileController extends BaseController
-{
- private ISysUserService userService;
- private TokenService tokenService;
-
- /**
- * 涓汉淇℃伅
- */
- @GetMapping
- public AjaxResult profile()
- {
- LoginUser loginUser = getLoginUser();
- SysUser user = loginUser.getUser();
- AjaxResult ajax = AjaxResult.success(user);
- ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
- ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
- return ajax;
- }
-
- /**
- * 淇敼鐢ㄦ埛
- */
- @Log(title = "涓汉淇℃伅", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult updateProfile(@RequestBody SysUser user)
- {
- LoginUser loginUser = getLoginUser();
- SysUser currentUser = loginUser.getUser();
- currentUser.setNickName(user.getNickName());
- currentUser.setEmail(user.getEmail());
- currentUser.setPhonenumber(user.getPhonenumber());
- currentUser.setSex(user.getSex());
- if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(currentUser))
- {
- return error("淇敼鐢ㄦ埛'" + loginUser.getUsername() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪");
- }
- if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(currentUser))
- {
- return error("淇敼鐢ㄦ埛'" + loginUser.getUsername() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
- }
- if (userService.updateUserProfile(currentUser) > 0)
- {
- // 鏇存柊缂撳瓨鐢ㄦ埛淇℃伅
- tokenService.setLoginUser(loginUser);
- return success();
- }
- return error("淇敼涓汉淇℃伅寮傚父锛岃鑱旂郴绠＄悊鍛�");
- }
-
- /**
- * 閲嶇疆瀵嗙爜
- */
- @Log(title = "涓汉淇℃伅", businessType = BusinessType.UPDATE)
- @PutMapping("/updatePwd")
- public AjaxResult updatePwd(@RequestBody Map<String, String> params)
- {
- String oldPassword = params.get("oldPassword");
- String newPassword = params.get("newPassword");
- LoginUser loginUser = getLoginUser();
- String userName = loginUser.getUsername();
- String password = loginUser.getPassword();
- if (!SecurityUtils.matchesPassword(oldPassword, password))
- {
- return error("淇敼瀵嗙爜澶辫触锛屾棫瀵嗙爜閿欒");
- }
- if (SecurityUtils.matchesPassword(newPassword, password))
- {
- return error("鏂板瘑鐮佷笉鑳戒笌鏃у瘑鐮佺浉鍚�");
- }
- newPassword = SecurityUtils.encryptPassword(newPassword);
- if (userService.resetUserPwd(userName, newPassword) > 0)
- {
- // 鏇存柊缂撳瓨鐢ㄦ埛瀵嗙爜
- loginUser.getUser().setPassword(newPassword);
- tokenService.setLoginUser(loginUser);
- return success();
- }
- return error("淇敼瀵嗙爜寮傚父锛岃鑱旂郴绠＄悊鍛�");
- }
-
- /**
- * 澶村儚涓婁紶
- */
- @Log(title = "鐢ㄦ埛澶村儚", businessType = BusinessType.UPDATE)
- @PostMapping("/avatar")
- public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file) throws Exception
- {
- if (!file.isEmpty())
- {
- LoginUser loginUser = getLoginUser();
- String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION);
- if (userService.updateUserAvatar(loginUser.getUsername(), avatar))
- {
- AjaxResult ajax = AjaxResult.success();
- ajax.put("imgUrl", avatar);
- // 鏇存柊缂撳瓨鐢ㄦ埛澶村儚
- loginUser.getUser().setAvatar(avatar);
- tokenService.setLoginUser(loginUser);
- return ajax;
- }
- }
- return error("涓婁紶鍥剧墖寮傚父锛岃鑱旂郴绠＄悊鍛�");
- }
-}
+package com.ruoyi.project.system.controller;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.file.FileUploadUtils;
+import com.ruoyi.common.utils.file.MimeTypeUtils;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.config.RuoYiConfig;
+import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.framework.security.service.TokenService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysUserService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 涓汉淇℃伅 涓氬姟澶勭悊
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/user/profile")
+@AllArgsConstructor
+public class SysProfileController extends BaseController
+{
+ private ISysUserService userService;
+ private TokenService tokenService;
+
+ /**
+ * 涓汉淇℃伅
+ */
+ @GetMapping
+ public R<?> profile()
+ {
+ LoginUser loginUser = getLoginUser();
+ SysUser user = loginUser.getUser();
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", user);
+ map.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
+ map.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
+ return R.ok(map);
+ }
+
+ /**
+ * 淇敼鐢ㄦ埛
+ */
+ @Log(title = "涓汉淇℃伅", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public R<?> updateProfile(@RequestBody SysUser user)
+ {
+ LoginUser loginUser = getLoginUser();
+ SysUser currentUser = loginUser.getUser();
+ currentUser.setNickName(user.getNickName());
+ currentUser.setEmail(user.getEmail());
+ currentUser.setPhonenumber(user.getPhonenumber());
+ currentUser.setSex(user.getSex());
+ if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(currentUser))
+ {
+ return R.fail("淇敼鐢ㄦ埛'" + loginUser.getUsername() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪");
+ }
+ if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(currentUser))
+ {
+ return R.fail("淇敼鐢ㄦ埛'" + loginUser.getUsername() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
+ }
+ if (userService.updateUserProfile(currentUser) > 0)
+ {
+ // 鏇存柊缂撳瓨鐢ㄦ埛淇℃伅
+ tokenService.setLoginUser(loginUser);
+ return R.ok();
+ }
+ return R.fail("淇敼涓汉淇℃伅寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ }
+
+ /**
+ * 閲嶇疆瀵嗙爜
+ */
+ @Log(title = "涓汉淇℃伅", businessType = BusinessType.UPDATE)
+ @PutMapping("/updatePwd")
+ public R<?> updatePwd(@RequestBody Map<String, String> params)
+ {
+ String oldPassword = params.get("oldPassword");
+ String newPassword = params.get("newPassword");
+ LoginUser loginUser = getLoginUser();
+ String userName = loginUser.getUsername();
+ String password = loginUser.getPassword();
+ if (!SecurityUtils.matchesPassword(oldPassword, password))
+ {
+ return R.fail("淇敼瀵嗙爜澶辫触锛屾棫瀵嗙爜閿欒");
+ }
+ if (SecurityUtils.matchesPassword(newPassword, password))
+ {
+ return R.fail("鏂板瘑鐮佷笉鑳戒笌鏃у瘑鐮佺浉鍚�");
+ }
+ newPassword = SecurityUtils.encryptPassword(newPassword);
+ if (userService.resetUserPwd(userName, newPassword) > 0)
+ {
+ // 鏇存柊缂撳瓨鐢ㄦ埛瀵嗙爜
+ loginUser.getUser().setPassword(newPassword);
+ tokenService.setLoginUser(loginUser);
+ return R.ok();
+ }
+ return R.fail("淇敼瀵嗙爜寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ }
+
+ /**
+ * 澶村儚涓婁紶
+ */
+ @Log(title = "鐢ㄦ埛澶村儚", businessType = BusinessType.UPDATE)
+ @PostMapping("/avatar")
+ public R<?> avatar(@RequestParam("avatarfile") MultipartFile file) throws Exception
+ {
+ if (!file.isEmpty())
+ {
+ LoginUser loginUser = getLoginUser();
+ String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file, MimeTypeUtils.IMAGE_EXTENSION);
+ if (userService.updateUserAvatar(loginUser.getUsername(), avatar))
+ {
+ // 鏇存柊缂撳瓨鐢ㄦ埛澶村儚
+ loginUser.getUser().setAvatar(avatar);
+ tokenService.setLoginUser(loginUser);
+ Map<String, Object> map = new HashMap<>();
+ map.put("imgUrl", avatar);
+ return R.ok(map);
+ }
+ }
+ return R.fail("涓婁紶鍥剧墖寮傚父锛岃鑱旂郴绠＄悊鍛�");
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysRegisterController.java b/src/main/java/com/ruoyi/project/system/controller/SysRegisterController.java
index ca7baf5..ef7cb05 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysRegisterController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysRegisterController.java
@@ -1,33 +1,33 @@
-package com.ruoyi.project.system.controller;
-
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.security.RegisterBody;
-import com.ruoyi.framework.security.service.SysRegisterService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.project.system.service.ISysConfigService;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 娉ㄥ唽楠岃瘉
- *
- * @author ruoyi
- */
-@RestController
-@AllArgsConstructor
-public class SysRegisterController extends BaseController {
- private SysRegisterService registerService;
- private ISysConfigService configService;
-
- @PostMapping("/register")
- public AjaxResult register(@RequestBody RegisterBody user) {
- if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) {
- return error("褰撳墠绯荤粺娌℃湁寮�鍚敞鍐屽姛鑳斤紒");
- }
- String msg = registerService.register(user);
- return StringUtils.isEmpty(msg) ? success() : error(msg);
- }
-}
+package com.ruoyi.project.system.controller;
+
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.security.RegisterBody;
+import com.ruoyi.framework.security.service.SysRegisterService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.project.system.service.ISysConfigService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 娉ㄥ唽楠岃瘉
+ *
+ * @author ruoyi
+ */
+@RestController
+@AllArgsConstructor
+public class SysRegisterController extends BaseController {
+ private SysRegisterService registerService;
+ private ISysConfigService configService;
+
+ @PostMapping("/register")
+ public R<?> register(@RequestBody RegisterBody user) {
+ if (!("true".equals(configService.selectConfigByKey("sys.account.registerUser")))) {
+ return R.fail("褰撳墠绯荤粺娌℃湁寮�鍚敞鍐屽姛鑳斤紒");
+ }
+ String msg = registerService.register(user);
+ return StringUtils.isEmpty(msg) ? R.ok() : R.fail(msg);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java b/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java
index 3b05811..650a3e3 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysRoleController.java
@@ -1,255 +1,265 @@
-package com.ruoyi.project.system.controller;
-
-import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
-import lombok.AllArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.security.service.SysPermissionService;
-import com.ruoyi.framework.security.service.TokenService;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.system.domain.SysDept;
-import com.ruoyi.project.system.domain.SysRole;
-import com.ruoyi.project.system.domain.SysUser;
-import com.ruoyi.project.system.domain.SysUserRole;
-import com.ruoyi.project.system.service.ISysDeptService;
-import com.ruoyi.project.system.service.ISysRoleService;
-import com.ruoyi.project.system.service.ISysUserService;
-
-/**
- * 瑙掕壊淇℃伅
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/system/role")
-@AllArgsConstructor
-public class SysRoleController extends BaseController
-{
- private ISysRoleService roleService;
- private TokenService tokenService;
- private SysPermissionService permissionService;
- private ISysUserService userService;
- private ISysDeptService deptService;
-
- @PreAuthorize("@ss.hasPermi('system:role:list')")
- @GetMapping("/list")
- public TableDataInfo list(SysRole role)
- {
- startPage();
- List<SysRole> list = roleService.selectRoleList(role);
- return getDataTable(list);
- }
-
- @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:role:export')")
- @PostMapping("/export")
- public void export(HttpServletResponse response, SysRole role)
- {
- List<SysRole> list = roleService.selectRoleList(role);
- ExcelUtil<SysRole> util = new ExcelUtil<SysRole>(SysRole.class);
- util.exportExcel(response, list, "瑙掕壊鏁版嵁");
- }
-
- /**
- * 鏍规嵁瑙掕壊缂栧彿鑾峰彇璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('system:role:query')")
- @GetMapping(value = "/{roleId}")
- public AjaxResult getInfo(@PathVariable Long roleId)
- {
- roleService.checkRoleDataScope(roleId);
- return success(roleService.selectRoleById(roleId));
- }
-
- /**
- * 鏂板瑙掕壊
- */
- @PreAuthorize("@ss.hasPermi('system:role:add')")
- @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@Validated @RequestBody SysRole role)
- {
- if (!roleService.checkRoleNameUnique(role))
- {
- return error("鏂板瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹插悕绉板凡瀛樺湪");
- }
- else if (!roleService.checkRoleKeyUnique(role))
- {
- return error("鏂板瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹叉潈闄愬凡瀛樺湪");
- }
- role.setCreateBy(getUsername());
- return toAjax(roleService.insertRole(role));
-
- }
-
- /**
- * 淇敼淇濆瓨瑙掕壊
- */
- @PreAuthorize("@ss.hasPermi('system:role:edit')")
- @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@Validated @RequestBody SysRole role)
- {
- roleService.checkRoleAllowed(role);
- roleService.checkRoleDataScope(role.getRoleId());
- if (!roleService.checkRoleNameUnique(role))
- {
- return error("淇敼瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹插悕绉板凡瀛樺湪");
- }
- else if (!roleService.checkRoleKeyUnique(role))
- {
- return error("淇敼瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹叉潈闄愬凡瀛樺湪");
- }
- role.setUpdateBy(getUsername());
-
- if (roleService.updateRole(role) > 0)
- {
- // 鏇存柊缂撳瓨鐢ㄦ埛鏉冮檺
- LoginUser loginUser = getLoginUser();
- if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
- {
- loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
- loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
- tokenService.setLoginUser(loginUser);
- }
- return success();
- }
- return error("淇敼瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
-
- /**
- * 淇敼淇濆瓨鏁版嵁鏉冮檺
- */
- @PreAuthorize("@ss.hasPermi('system:role:edit')")
- @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
- @PutMapping("/dataScope")
- public AjaxResult dataScope(@RequestBody SysRole role)
- {
- roleService.checkRoleAllowed(role);
- roleService.checkRoleDataScope(role.getRoleId());
- return toAjax(roleService.authDataScope(role));
- }
-
- /**
- * 鐘舵�佷慨鏀�
- */
- @PreAuthorize("@ss.hasPermi('system:role:edit')")
- @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
- @PutMapping("/changeStatus")
- public AjaxResult changeStatus(@RequestBody SysRole role)
- {
- roleService.checkRoleAllowed(role);
- roleService.checkRoleDataScope(role.getRoleId());
- role.setUpdateBy(getUsername());
- return toAjax(roleService.updateRoleStatus(role));
- }
-
- /**
- * 鍒犻櫎瑙掕壊
- */
- @PreAuthorize("@ss.hasPermi('system:role:remove')")
- @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.DELETE)
- @DeleteMapping("/{roleIds}")
- public AjaxResult remove(@PathVariable Long[] roleIds)
- {
- return toAjax(roleService.deleteRoleByIds(roleIds));
- }
-
- /**
- * 鑾峰彇瑙掕壊閫夋嫨妗嗗垪琛�
- */
- @PreAuthorize("@ss.hasPermi('system:role:query')")
- @GetMapping("/optionselect")
- public AjaxResult optionselect()
- {
- return success(roleService.selectRoleAll());
- }
-
- /**
- * 鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪琛�
- */
- @PreAuthorize("@ss.hasPermi('system:role:list')")
- @GetMapping("/authUser/allocatedList")
- public TableDataInfo allocatedList(SysUser user)
- {
- startPage();
- List<SysUser> list = userService.selectAllocatedList(user);
- return getDataTable(list);
- }
-
- /**
- * 鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪琛�
- */
- @PreAuthorize("@ss.hasPermi('system:role:list')")
- @GetMapping("/authUser/unallocatedList")
- public TableDataInfo unallocatedList(SysUser user)
- {
- startPage();
- List<SysUser> list = userService.selectUnallocatedList(user);
- return getDataTable(list);
- }
-
- /**
- * 鍙栨秷鎺堟潈鐢ㄦ埛
- */
- @PreAuthorize("@ss.hasPermi('system:role:edit')")
- @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT)
- @PutMapping("/authUser/cancel")
- public AjaxResult cancelAuthUser(@RequestBody SysUserRole userRole)
- {
- return toAjax(roleService.deleteAuthUser(userRole));
- }
-
- /**
- * 鎵归噺鍙栨秷鎺堟潈鐢ㄦ埛
- */
- @PreAuthorize("@ss.hasPermi('system:role:edit')")
- @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT)
- @PutMapping("/authUser/cancelAll")
- public AjaxResult cancelAuthUserAll(Long roleId, Long[] userIds)
- {
- return toAjax(roleService.deleteAuthUsers(roleId, userIds));
- }
-
- /**
- * 鎵归噺閫夋嫨鐢ㄦ埛鎺堟潈
- */
- @PreAuthorize("@ss.hasPermi('system:role:edit')")
- @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT)
- @PutMapping("/authUser/selectAll")
- public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds)
- {
- roleService.checkRoleDataScope(roleId);
- return toAjax(roleService.insertAuthUsers(roleId, userIds));
- }
-
- /**
- * 鑾峰彇瀵瑰簲瑙掕壊閮ㄩ棬鏍戝垪琛�
- */
- @PreAuthorize("@ss.hasPermi('system:role:query')")
- @GetMapping(value = "/deptTree/{roleId}")
- public AjaxResult deptTree(@PathVariable("roleId") Long roleId)
- {
- AjaxResult ajax = AjaxResult.success();
- ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
- ajax.put("depts", deptService.selectDeptTreeList(new SysDept()));
- return ajax;
- }
-}
+package com.ruoyi.project.system.controller;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import jakarta.servlet.http.HttpServletResponse;
+
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.project.system.domain.vo.SysUserDeptVo;
+import com.ruoyi.project.system.mapper.SysUserMapper;
+import com.ruoyi.project.system.service.*;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.framework.security.service.SysPermissionService;
+import com.ruoyi.framework.security.service.TokenService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.system.domain.SysDept;
+import com.ruoyi.project.system.domain.SysRole;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.domain.SysUserRole;
+
+/**
+ * 瑙掕壊淇℃伅
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/role")
+@AllArgsConstructor
+public class SysRoleController extends BaseController
+{
+ private ISysRoleService roleService;
+ private TokenService tokenService;
+ private SysPermissionService permissionService;
+ private ISysUserService userService;
+ private ISysDeptService deptService;
+
+ @PreAuthorize("@ss.hasPermi('system:role:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(SysRole role)
+ {
+ startPage();
+ List<SysRole> list = roleService.selectRoleList(role);
+ return getDataTable(list);
+ }
+
+ @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.EXPORT)
+ @PreAuthorize("@ss.hasPermi('system:role:export')")
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, SysRole role)
+ {
+ List<SysRole> list = roleService.selectRoleList(role);
+ ExcelUtil<SysRole> util = new ExcelUtil<SysRole>(SysRole.class);
+ util.exportExcel(response, list, "瑙掕壊鏁版嵁");
+ }
+
+ /**
+ * 鏍规嵁瑙掕壊缂栧彿鑾峰彇璇︾粏淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('system:role:query')")
+ @GetMapping(value = "/{roleId}")
+ public R<?> getInfo(@PathVariable Long roleId)
+ {
+ roleService.checkRoleDataScope(roleId);
+ return R.ok(roleService.selectRoleById(roleId));
+ }
+
+ /**
+ * 鏂板瑙掕壊
+ */
+ @PreAuthorize("@ss.hasPermi('system:role:add')")
+ @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.INSERT)
+ @PostMapping
+ public R<?> add(@Validated @RequestBody SysRole role)
+ {
+ if (!roleService.checkRoleNameUnique(role))
+ {
+ return R.fail("鏂板瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹插悕绉板凡瀛樺湪");
+ }
+ else if (!roleService.checkRoleKeyUnique(role))
+ {
+ return R.fail("鏂板瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹叉潈闄愬凡瀛樺湪");
+ }
+ role.setCreateBy(getUsername());
+ roleService.insertRole(role);
+ return R.ok();
+
+ }
+
+ /**
+ * 淇敼淇濆瓨瑙掕壊
+ */
+ @PreAuthorize("@ss.hasPermi('system:role:edit')")
+ @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public R<?> edit(@Validated @RequestBody SysRole role)
+ {
+ roleService.checkRoleAllowed(role);
+ roleService.checkRoleDataScope(role.getRoleId());
+ if (!roleService.checkRoleNameUnique(role))
+ {
+ return R.fail("淇敼瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹插悕绉板凡瀛樺湪");
+ }
+ else if (!roleService.checkRoleKeyUnique(role))
+ {
+ return R.fail("淇敼瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑹叉潈闄愬凡瀛樺湪");
+ }
+ role.setUpdateBy(getUsername());
+
+ if (roleService.updateRole(role) > 0)
+ {
+ // 鏇存柊缂撳瓨鐢ㄦ埛鏉冮檺
+ LoginUser loginUser = getLoginUser();
+ if (StringUtils.isNotNull(loginUser.getUser()) && !loginUser.getUser().isAdmin())
+ {
+ loginUser.setUser(userService.selectUserByUserName(loginUser.getUser().getUserName()));
+ loginUser.setPermissions(permissionService.getMenuPermission(loginUser.getUser()));
+ tokenService.setLoginUser(loginUser);
+ }
+ return R.ok();
+ }
+ return R.fail("淇敼瑙掕壊'" + role.getRoleName() + "'澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+
+ /**
+ * 淇敼淇濆瓨鏁版嵁鏉冮檺
+ */
+ @PreAuthorize("@ss.hasPermi('system:role:edit')")
+ @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
+ @PutMapping("/dataScope")
+ public R<?> dataScope(@RequestBody SysRole role)
+ {
+ roleService.checkRoleAllowed(role);
+ roleService.checkRoleDataScope(role.getRoleId());
+ roleService.authDataScope(role);
+ return R.ok();
+ }
+
+ /**
+ * 鐘舵�佷慨鏀�
+ */
+ @PreAuthorize("@ss.hasPermi('system:role:edit')")
+ @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.UPDATE)
+ @PutMapping("/changeStatus")
+ public R<?> changeStatus(@RequestBody SysRole role)
+ {
+ roleService.checkRoleAllowed(role);
+ roleService.checkRoleDataScope(role.getRoleId());
+ role.setUpdateBy(getUsername());
+ roleService.updateRoleStatus(role);
+ return R.ok();
+ }
+
+ /**
+ * 鍒犻櫎瑙掕壊
+ */
+ @PreAuthorize("@ss.hasPermi('system:role:remove')")
+ @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{roleIds}")
+ public R<?> remove(@PathVariable Long[] roleIds)
+ {
+ roleService.deleteRoleByIds(roleIds);
+ return R.ok();
+ }
+
+ /**
+ * 鑾峰彇瑙掕壊閫夋嫨妗嗗垪琛�
+ */
+ @PreAuthorize("@ss.hasPermi('system:role:query')")
+ @GetMapping("/optionselect")
+ public R<?> optionselect()
+ {
+ return R.ok(roleService.selectRoleAll());
+ }
+
+ /**
+ * 鏌ヨ宸插垎閰嶇敤鎴疯鑹插垪琛�
+ */
+ @PreAuthorize("@ss.hasPermi('system:role:list')")
+ @GetMapping("/authUser/allocatedList")
+ public TableDataInfo allocatedList(SysUser user)
+ {
+ startPage();
+ List<SysUser> list = userService.selectAllocatedList(user);
+ return getDataTable(list);
+ }
+
+ /**
+ * 鏌ヨ鏈垎閰嶇敤鎴疯鑹插垪琛�
+ */
+ @PreAuthorize("@ss.hasPermi('system:role:list')")
+ @GetMapping("/authUser/unallocatedList")
+ public TableDataInfo unallocatedList(SysUser user)
+ {
+ startPage();
+ List<SysUser> list = userService.selectUnallocatedList(user);
+ return getDataTable(list);
+ }
+
+ /**
+ * 鍙栨秷鎺堟潈鐢ㄦ埛
+ */
+ @PreAuthorize("@ss.hasPermi('system:role:edit')")
+ @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT)
+ @PutMapping("/authUser/cancel")
+ public R<?> cancelAuthUser(@RequestBody SysUserRole userRole)
+ {
+ roleService.deleteAuthUser(userRole);
+ return R.ok();
+ }
+
+ /**
+ * 鎵归噺鍙栨秷鎺堟潈鐢ㄦ埛
+ */
+ @PreAuthorize("@ss.hasPermi('system:role:edit')")
+ @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT)
+ @PutMapping("/authUser/cancelAll")
+ public R<?> cancelAuthUserAll(Long roleId, Long[] userIds)
+ {
+ roleService.deleteAuthUsers(roleId, userIds);
+ return R.ok();
+ }
+
+ /**
+ * 鎵归噺閫夋嫨鐢ㄦ埛鎺堟潈
+ */
+ @PreAuthorize("@ss.hasPermi('system:role:edit')")
+ @Log(title = "瑙掕壊绠＄悊", businessType = BusinessType.GRANT)
+ @PutMapping("/authUser/selectAll")
+ public R<?> selectAuthUserAll(Long roleId, Long[] userIds)
+ {
+ roleService.checkRoleDataScope(roleId);
+ roleService.insertAuthUsers(roleId, userIds);
+ return R.ok();
+ }
+
+ /**
+ * 鑾峰彇瀵瑰簲瑙掕壊閮ㄩ棬鏍戝垪琛�
+ */
+ @PreAuthorize("@ss.hasPermi('system:role:query')")
+ @GetMapping(value = "/deptTree/{roleId}")
+ public R<?> deptTree(@PathVariable("roleId") Long roleId)
+ {
+ Map<String, Object> map = new HashMap<>();
+ map.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
+ map.put("depts", deptService.selectDeptTreeList(new SysDept()));
+ return R.ok(map);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysUserClientController.java b/src/main/java/com/ruoyi/project/system/controller/SysUserClientController.java
index cb921a0..f6a2732 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysUserClientController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysUserClientController.java
@@ -2,15 +2,13 @@
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.project.system.domain.GetuiConfig;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.project.system.domain.SysUserClient;
import com.ruoyi.project.system.service.SysUserClientService;
import com.ruoyi.common.utils.SecurityUtils;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
-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;
@@ -36,10 +34,10 @@
*/
@PostMapping("/addOrUpdateClientId")
@Operation(summary = "娣诲姞/鏇存柊鐢ㄦ埛cid")
- public AjaxResult addOrUpdateClientId(@RequestBody SysUserClient sysUserClient) {
+ public R<?> addOrUpdateClientId(@RequestBody SysUserClient sysUserClient) {
Long userId = SecurityUtils.getUserId();
sysUserClient.setUserId(userId);
boolean result = sysUserClientService.addOrUpdateClientId(sysUserClient);
- return result ? success() : error("璁惧缁戝畾澶辫触");
+ return result ? R.ok() : R.fail("璁惧缁戝畾澶辫触");
}
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysUserController.java b/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
index 332d6b5..84f9214 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysUserController.java
@@ -1,292 +1,285 @@
-package com.ruoyi.project.system.controller;
-
-import java.util.List;
-import java.util.stream.Collectors;
-import jakarta.servlet.http.HttpServletResponse;
-
-import com.ruoyi.project.system.domain.vo.SysUserDeptVo;
-import com.ruoyi.project.system.mapper.SysUserMapper;
-import com.ruoyi.project.system.service.*;
-import lombok.AllArgsConstructor;
-import org.apache.commons.lang3.ArrayUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.system.domain.SysDept;
-import com.ruoyi.project.system.domain.SysRole;
-import com.ruoyi.project.system.domain.SysUser;
-
-/**
- * 鐢ㄦ埛淇℃伅
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/system/user")
-@AllArgsConstructor
-public class SysUserController extends BaseController
-{
- private ISysUserService userService;
- private ISysRoleService roleService;
- private ISysDeptService deptService;
- private ISysPostService postService;
- private ISysUserDeptService userDeptService;
-
- /**
- * 鑾峰彇鐢ㄦ埛鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('system:user:list')")
- @GetMapping("/list")
- public TableDataInfo list(SysUser user)
- {
- startPage();
- List<SysUser> list = userService.selectUserList(user);
- return getDataTable(list);
- }
-
- /**
- * 鑾峰彇鐢ㄦ埛鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('system:user:list')")
- @GetMapping("/listAll")
- public AjaxResult listAll(SysUser user)
- {
- List<SysUser> list = userService.selectUserList(user);
- return AjaxResult.success(list);
- }
-
- @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:user:export')")
- @PostMapping("/export")
- public void export(HttpServletResponse response, SysUser user)
- {
- List<SysUser> list = userService.selectUserList(user);
- ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
- util.exportExcel(response, list, "鐢ㄦ埛鏁版嵁");
- }
-
- @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.IMPORT)
- @PreAuthorize("@ss.hasPermi('system:user:import')")
- @PostMapping("/importData")
- public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
- {
- ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
- List<SysUser> userList = util.importExcel(file.getInputStream());
- String operName = getUsername();
- String message = userService.importUser(userList, updateSupport, operName);
- return success(message);
- }
-
- @PostMapping("/importTemplate")
- public void importTemplate(HttpServletResponse response)
- {
- ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
- util.importTemplateExcel(response, "鐢ㄦ埛鏁版嵁");
- }
-
- /**
- * 鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('system:user:query')")
- @GetMapping(value = { "/", "/{userId}" })
- public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
- {
- AjaxResult ajax = AjaxResult.success();
- if (StringUtils.isNotNull(userId))
- {
- userService.checkUserDataScope(userId);
- SysUser sysUser = userService.selectUserById(userId);
- ajax.put(AjaxResult.DATA_TAG, sysUser);
- ajax.put("postIds", postService.selectPostListByUserId(userId));
- ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
- }
- List<SysRole> roles = roleService.selectRoleAll();
- ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
- ajax.put("posts", postService.selectPostAll());
- SysUserDeptVo sysUserDeptVo = new SysUserDeptVo();
- sysUserDeptVo.setUserId(userId);
- List<SysUserDeptVo> sysUserDeptVos = userDeptService.userLoginFacotryList(sysUserDeptVo);
- ajax.put("deptIds",sysUserDeptVos.stream().map(SysUserDeptVo::getDeptId).collect(Collectors.toList()));
- return ajax;
- }
-
- /**
- * 鏂板鐢ㄦ埛
- */
- @PreAuthorize("@ss.hasPermi('system:user:add')")
- @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@Validated @RequestBody SysUser user)
- {
- roleService.checkRoleDataScope(user.getRoleIds());
- if (!userService.checkUserNameUnique(user))
- {
- return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
- }
- else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
- {
- return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪");
- }
- else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
- {
- return error("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
- }
- user.setCreateBy(getUsername());
- user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
- user.setTenantId(user.getDeptId());
- return toAjax(userService.insertUser(user));
- }
-
- /**
- * 淇敼鐢ㄦ埛
- */
- @PreAuthorize("@ss.hasPermi('system:user:edit')")
- @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@Validated @RequestBody SysUser user)
- {
- userService.checkUserAllowed(user);
- userService.checkUserDataScope(user.getUserId());
- roleService.checkRoleDataScope(user.getRoleIds());
- if (!userService.checkUserNameUnique(user))
- {
- return error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
- }
- else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
- {
- return error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪");
- }
- else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
- {
- return error("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
- }
- user.setUpdateBy(getUsername());
- userService.bindUserDept(user);
- return toAjax(userService.updateUser(user));
- }
-
- /**
- * 鍒犻櫎鐢ㄦ埛
- */
- @PreAuthorize("@ss.hasPermi('system:user:remove')")
- @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.DELETE)
- @DeleteMapping("/{userIds}")
- public AjaxResult remove(@PathVariable Long[] userIds)
- {
- if (ArrayUtils.contains(userIds, getUserId()))
- {
- return error("褰撳墠鐢ㄦ埛涓嶈兘鍒犻櫎");
- }
- return toAjax(userService.deleteUserByIds(userIds));
- }
-
- /**
- * 閲嶇疆瀵嗙爜
- */
- @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
- @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
- @PutMapping("/resetPwd")
- public AjaxResult resetPwd(@RequestBody SysUser user)
- {
- userService.checkUserAllowed(user);
- userService.checkUserDataScope(user.getUserId());
- user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
- user.setUpdateBy(getUsername());
- return toAjax(userService.resetPwd(user));
- }
-
- /**
- * 鐘舵�佷慨鏀�
- */
- @PreAuthorize("@ss.hasPermi('system:user:edit')")
- @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
- @PutMapping("/changeStatus")
- public AjaxResult changeStatus(@RequestBody SysUser user)
- {
- userService.checkUserAllowed(user);
- userService.checkUserDataScope(user.getUserId());
- user.setUpdateBy(getUsername());
- return toAjax(userService.updateUserStatus(user));
- }
-
- /**
- * 鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇鎺堟潈瑙掕壊
- */
- @PreAuthorize("@ss.hasPermi('system:user:query')")
- @GetMapping("/authRole/{userId}")
- public AjaxResult authRole(@PathVariable("userId") Long userId)
- {
- AjaxResult ajax = AjaxResult.success();
- SysUser user = userService.selectUserById(userId);
- List<SysRole> roles = roleService.selectRolesByUserId(userId);
- ajax.put("user", user);
- ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
- return ajax;
- }
-
- /**
- * 鐢ㄦ埛鎺堟潈瑙掕壊
- */
- @PreAuthorize("@ss.hasPermi('system:user:edit')")
- @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.GRANT)
- @PutMapping("/authRole")
- public AjaxResult insertAuthRole(Long userId, Long[] roleIds)
- {
- userService.checkUserDataScope(userId);
- roleService.checkRoleDataScope(roleIds);
- userService.insertUserAuth(userId, roleIds);
- return success();
- }
-
- /**
- * 鑾峰彇閮ㄩ棬鏍戝垪琛�
- */
- @PreAuthorize("@ss.hasPermi('system:user:list')")
- @GetMapping("/deptTree")
- public AjaxResult deptTree(SysDept dept)
- {
- return success(deptService.selectDeptTreeList(dept));
- }
-
- /**
- * 涓嶅垎椤电敤鎴锋煡璇�
- * @param user
- * @return
- */
- @GetMapping("/userListNoPage")
- public AjaxResult userListNoPage(SysUser user){
- List<SysUser> sysUserList = userService.userListNoPage(user);
- return AjaxResult.success(sysUserList);
- }
-
- /**
- * 鏌ヨ褰撳墠鐢ㄦ埛鍏徃涓嬫墍鏈夌敤鎴�
- * @param user
- * @return
- */
- @GetMapping("/userListNoPageByTenantId")
- public AjaxResult userListNoPageByTenantId(SysUser user){
- //鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
- SysUser loginUser = SecurityUtils.getLoginUser().getUser();
- user.setTenantId(loginUser.getTenantId());
- List<SysUser> sysUserList = userService.userListNoPage(user);
- return AjaxResult.success(sysUserList);
- }
-}
+package com.ruoyi.project.system.controller;
+
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.system.domain.SysDept;
+import com.ruoyi.project.system.domain.SysRole;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.domain.vo.SysUserDeptVo;
+import com.ruoyi.project.system.service.*;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 鐢ㄦ埛淇℃伅
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/user")
+@AllArgsConstructor
+public class SysUserController extends BaseController
+{
+ private ISysUserService userService;
+ private ISysRoleService roleService;
+ private ISysDeptService deptService;
+ private ISysPostService postService;
+ private ISysUserDeptService userDeptService;
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:user:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(SysUser user)
+ {
+ startPage();
+ List<SysUser> list = userService.selectUserList(user);
+ return getDataTable(list);
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('system:user:list')")
+ @GetMapping("/listAll")
+ public R<?> listAll(SysUser user)
+ {
+ List<SysUser> list = userService.selectUserList(user);
+ return R.ok(list);
+ }
+
+ @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.EXPORT)
+ @PreAuthorize("@ss.hasPermi('system:user:export')")
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, SysUser user)
+ {
+ List<SysUser> list = userService.selectUserList(user);
+ ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+ util.exportExcel(response, list, "鐢ㄦ埛鏁版嵁");
+ }
+
+ @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.IMPORT)
+ @PreAuthorize("@ss.hasPermi('system:user:import')")
+ @PostMapping("/importData")
+ public R<?> importData(MultipartFile file, boolean updateSupport) throws Exception
+ {
+ ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+ List<SysUser> userList = util.importExcel(file.getInputStream());
+ String operName = getUsername();
+ String message = userService.importUser(userList, updateSupport, operName);
+ return R.ok(null, message);
+ }
+
+ @PostMapping("/importTemplate")
+ public void importTemplate(HttpServletResponse response)
+ {
+ ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+ util.importTemplateExcel(response, "鐢ㄦ埛鏁版嵁");
+ }
+
+ /**
+ * 鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇璇︾粏淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('system:user:query')")
+ @GetMapping(value = { "/", "/{userId}" })
+ public R<?> getInfo(@PathVariable(value = "userId", required = false) Long userId)
+ {
+ Map<String, Object> map = new HashMap<>();
+ if (StringUtils.isNotNull(userId))
+ {
+ userService.checkUserDataScope(userId);
+ SysUser sysUser = userService.selectUserById(userId);
+ map.put("data", sysUser);
+ map.put("postIds", postService.selectPostListByUserId(userId));
+ map.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
+ }
+ List<SysRole> roles = roleService.selectRoleAll();
+ map.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+ map.put("posts", postService.selectPostAll());
+ SysUserDeptVo sysUserDeptVo = new SysUserDeptVo();
+ sysUserDeptVo.setUserId(userId);
+ List<SysUserDeptVo> sysUserDeptVos = userDeptService.userLoginFacotryList(sysUserDeptVo);
+ map.put("deptIds",sysUserDeptVos.stream().map(SysUserDeptVo::getDeptId).collect(Collectors.toList()));
+ return R.ok(map);
+ }
+
+ /**
+ * 鏂板鐢ㄦ埛
+ */
+ @PreAuthorize("@ss.hasPermi('system:user:add')")
+ @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.INSERT)
+ @PostMapping
+ public R<?> add(@Validated @RequestBody SysUser user)
+ {
+ roleService.checkRoleDataScope(user.getRoleIds());
+ if (!userService.checkUserNameUnique(user))
+ {
+ return R.fail("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
+ }
+ else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
+ {
+ return R.fail("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪");
+ }
+ else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
+ {
+ return R.fail("鏂板鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
+ }
+ user.setCreateBy(getUsername());
+ user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+ user.setTenantId(user.getDeptId());
+ return R.ok(userService.insertUser(user));
+ }
+
+ /**
+ * 淇敼鐢ㄦ埛
+ */
+ @PreAuthorize("@ss.hasPermi('system:user:edit')")
+ @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public R<?> edit(@Validated @RequestBody SysUser user)
+ {
+ userService.checkUserAllowed(user);
+ userService.checkUserDataScope(user.getUserId());
+ roleService.checkRoleDataScope(user.getRoleIds());
+ if (!userService.checkUserNameUnique(user))
+ {
+ return R.fail("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
+ }
+ else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
+ {
+ return R.fail("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛屾墜鏈哄彿鐮佸凡瀛樺湪");
+ }
+ else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user))
+ {
+ return R.fail("淇敼鐢ㄦ埛'" + user.getUserName() + "'澶辫触锛岄偖绠辫处鍙峰凡瀛樺湪");
+ }
+ user.setUpdateBy(getUsername());
+ userService.bindUserDept(user);
+ return R.ok(userService.updateUser(user));
+ }
+
+ /**
+ * 鍒犻櫎鐢ㄦ埛
+ */
+ @PreAuthorize("@ss.hasPermi('system:user:remove')")
+ @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{userIds}")
+ public R<?> remove(@PathVariable Long[] userIds)
+ {
+ if (ArrayUtils.contains(userIds, getUserId()))
+ {
+ return R.fail("褰撳墠鐢ㄦ埛涓嶈兘鍒犻櫎");
+ }
+ return R.ok(userService.deleteUserByIds(userIds)) ;
+ }
+
+ /**
+ * 閲嶇疆瀵嗙爜
+ */
+ @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
+ @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
+ @PutMapping("/resetPwd")
+ public R<?> resetPwd(@RequestBody SysUser user)
+ {
+ userService.checkUserAllowed(user);
+ userService.checkUserDataScope(user.getUserId());
+ user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+ user.setUpdateBy(getUsername());
+ return R.ok(userService.resetPwd(user));
+ }
+
+ /**
+ * 鐘舵�佷慨鏀�
+ */
+ @PreAuthorize("@ss.hasPermi('system:user:edit')")
+ @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.UPDATE)
+ @PutMapping("/changeStatus")
+ public R<?> changeStatus(@RequestBody SysUser user)
+ {
+ userService.checkUserAllowed(user);
+ userService.checkUserDataScope(user.getUserId());
+ user.setUpdateBy(getUsername());
+ return R.ok(userService.updateUserStatus(user)) ;
+ }
+
+ /**
+ * 鏍规嵁鐢ㄦ埛缂栧彿鑾峰彇鎺堟潈瑙掕壊
+ */
+ @PreAuthorize("@ss.hasPermi('system:user:query')")
+ @GetMapping("/authRole/{userId}")
+ public R<?> authRole(@PathVariable("userId") Long userId)
+ {
+ SysUser user = userService.selectUserById(userId);
+ List<SysRole> roles = roleService.selectRolesByUserId(userId);
+ Map<String, Object> map = new HashMap<>();
+ map.put("user", user);
+ map.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+ return R.ok(map);
+ }
+
+ /**
+ * 鐢ㄦ埛鎺堟潈瑙掕壊
+ */
+ @PreAuthorize("@ss.hasPermi('system:user:edit')")
+ @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.GRANT)
+ @PutMapping("/authRole")
+ public R<?> insertAuthRole(Long userId, Long[] roleIds)
+ {
+ userService.checkUserDataScope(userId);
+ roleService.checkRoleDataScope(roleIds);
+ userService.insertUserAuth(userId, roleIds);
+ return R.ok();
+ }
+
+ /**
+ * 鑾峰彇閮ㄩ棬鏍戝垪琛�
+ */
+ @PreAuthorize("@ss.hasPermi('system:user:list')")
+ @GetMapping("/deptTree")
+ public R<?> deptTree(SysDept dept)
+ {
+ return R.ok(deptService.selectDeptTreeList(dept));
+ }
+
+ /**
+ * 涓嶅垎椤电敤鎴锋煡璇�
+ * @param user
+ * @return
+ */
+ @GetMapping("/userListNoPage")
+ public R<?> userListNoPage(SysUser user){
+ List<SysUser> sysUserList = userService.userListNoPage(user);
+ return R.ok(sysUserList);
+ }
+
+ /**
+ * 鏌ヨ褰撳墠鐢ㄦ埛鍏徃涓嬫墍鏈夌敤鎴�
+ * @param user
+ * @return
+ */
+ @GetMapping("/userListNoPageByTenantId")
+ public R<?> userListNoPageByTenantId(SysUser user){
+ //鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
+ SysUser loginUser = SecurityUtils.getLoginUser().getUser();
+ user.setTenantId(loginUser.getTenantId());
+ List<SysUser> sysUserList = userService.userListNoPage(user);
+ return R.ok(sysUserList);
+ }
+}
diff --git a/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java b/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
index ec16cea..6b5a544 100644
--- a/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
+++ b/src/main/java/com/ruoyi/project/tool/gen/controller/GenController.java
@@ -1,255 +1,255 @@
-package com.ruoyi.project.tool.gen.controller;
-
-import com.alibaba.druid.DbType;
-import com.alibaba.druid.sql.SQLUtils;
-import com.alibaba.druid.sql.ast.SQLStatement;
-import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.sql.SqlUtil;
-import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.config.GenConfig;
-import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.tool.gen.domain.GenTable;
-import com.ruoyi.project.tool.gen.domain.GenTableColumn;
-import com.ruoyi.project.tool.gen.service.IGenTableColumnService;
-import com.ruoyi.project.tool.gen.service.IGenTableService;
-import jakarta.servlet.http.HttpServletResponse;
-import lombok.AllArgsConstructor;
-import org.apache.commons.io.IOUtils;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 浠ｇ爜鐢熸垚 鎿嶄綔澶勭悊
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/tool/gen")
-@AllArgsConstructor
-public class GenController extends BaseController
-{
- private IGenTableService genTableService;
- private IGenTableColumnService genTableColumnService;
-
- /**
- * 鏌ヨ浠ｇ爜鐢熸垚鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('tool:gen:list')")
- @GetMapping("/list")
- public TableDataInfo genList(GenTable genTable)
- {
- startPage();
- List<GenTable> list = genTableService.selectGenTableList(genTable);
- return getDataTable(list);
- }
-
- /**
- * 鑾峰彇浠ｇ爜鐢熸垚淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('tool:gen:query')")
- @GetMapping(value = "/{talbleId}")
- public AjaxResult getInfo(@PathVariable Long talbleId)
- {
- GenTable table = genTableService.selectGenTableById(talbleId);
- List<GenTable> tables = genTableService.selectGenTableAll();
- List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(talbleId);
- Map<String, Object> map = new HashMap<String, Object>();
- map.put("info", table);
- map.put("rows", list);
- map.put("tables", tables);
- return success(map);
- }
-
- /**
- * 鏌ヨ鏁版嵁搴撳垪琛�
- */
- @PreAuthorize("@ss.hasPermi('tool:gen:list')")
- @GetMapping("/db/list")
- public TableDataInfo dataList(GenTable genTable)
- {
- startPage();
- List<GenTable> list = genTableService.selectDbTableList(genTable);
- return getDataTable(list);
- }
-
- /**
- * 鏌ヨ鏁版嵁琛ㄥ瓧娈靛垪琛�
- */
- @PreAuthorize("@ss.hasPermi('tool:gen:list')")
- @GetMapping(value = "/column/{tableId}")
- public TableDataInfo columnList(Long tableId)
- {
- TableDataInfo dataInfo = new TableDataInfo();
- List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(tableId);
- dataInfo.setRows(list);
- dataInfo.setTotal(list.size());
- return dataInfo;
- }
-
- /**
- * 瀵煎叆琛ㄧ粨鏋勶紙淇濆瓨锛�
- */
- @PreAuthorize("@ss.hasPermi('tool:gen:import')")
- @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.IMPORT)
- @PostMapping("/importTable")
- public AjaxResult importTableSave(String tables)
- {
- String[] tableNames = Convert.toStrArray(tables);
- // 鏌ヨ琛ㄤ俊鎭�
- List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames);
- genTableService.importGenTable(tableList, SecurityUtils.getUsername());
- return success();
- }
-
- /**
- * 鍒涘缓琛ㄧ粨鏋勶紙淇濆瓨锛�
- */
- @PreAuthorize("@ss.hasRole('admin')")
- @Log(title = "鍒涘缓琛�", businessType = BusinessType.OTHER)
- @PostMapping("/createTable")
- public AjaxResult createTableSave(String sql)
- {
- try
- {
- SqlUtil.filterKeyword(sql);
- List<SQLStatement> sqlStatements = SQLUtils.parseStatements(sql, DbType.mysql);
- List<String> tableNames = new ArrayList<>();
- for (SQLStatement sqlStatement : sqlStatements)
- {
- if (sqlStatement instanceof MySqlCreateTableStatement)
- {
- MySqlCreateTableStatement createTableStatement = (MySqlCreateTableStatement) sqlStatement;
- if (genTableService.createTable(createTableStatement.toString()))
- {
- String tableName = createTableStatement.getTableName().replaceAll("`", "");
- tableNames.add(tableName);
- }
- }
- }
- List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames.toArray(new String[tableNames.size()]));
- String operName = SecurityUtils.getUsername();
- genTableService.importGenTable(tableList, operName);
- return AjaxResult.success();
- }
- catch (Exception e)
- {
- logger.error(e.getMessage(), e);
- return AjaxResult.error("鍒涘缓琛ㄧ粨鏋勫紓甯�");
- }
- }
-
- /**
- * 淇敼淇濆瓨浠ｇ爜鐢熸垚涓氬姟
- */
- @PreAuthorize("@ss.hasPermi('tool:gen:edit')")
- @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult editSave(@Validated @RequestBody GenTable genTable)
- {
- genTableService.validateEdit(genTable);
- genTableService.updateGenTable(genTable);
- return success();
- }
-
- /**
- * 鍒犻櫎浠ｇ爜鐢熸垚
- */
- @PreAuthorize("@ss.hasPermi('tool:gen:remove')")
- @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.DELETE)
- @DeleteMapping("/{tableIds}")
- public AjaxResult remove(@PathVariable Long[] tableIds)
- {
- genTableService.deleteGenTableByIds(tableIds);
- return success();
- }
-
- /**
- * 棰勮浠ｇ爜
- */
- @PreAuthorize("@ss.hasPermi('tool:gen:preview')")
- @GetMapping("/preview/{tableId}")
- public AjaxResult preview(@PathVariable("tableId") Long tableId) throws IOException
- {
- Map<String, String> dataMap = genTableService.previewCode(tableId);
- return success(dataMap);
- }
-
- /**
- * 鐢熸垚浠ｇ爜锛堜笅杞芥柟寮忥級
- */
- @PreAuthorize("@ss.hasPermi('tool:gen:code')")
- @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
- @GetMapping("/download/{tableName}")
- public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException
- {
- byte[] data = genTableService.downloadCode(tableName);
- genCode(response, data);
- }
-
- /**
- * 鐢熸垚浠ｇ爜锛堣嚜瀹氫箟璺緞锛�
- */
- @PreAuthorize("@ss.hasPermi('tool:gen:code')")
- @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
- @GetMapping("/genCode/{tableName}")
- public AjaxResult genCode(@PathVariable("tableName") String tableName)
- {
- if (!GenConfig.isAllowOverwrite())
- {
- return AjaxResult.error("銆愮郴缁熼璁俱�戜笉鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦�");
- }
- genTableService.generatorCode(tableName);
- return success();
- }
-
- /**
- * 鍚屾鏁版嵁搴�
- */
- @PreAuthorize("@ss.hasPermi('tool:gen:edit')")
- @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.UPDATE)
- @GetMapping("/synchDb/{tableName}")
- public AjaxResult synchDb(@PathVariable("tableName") String tableName)
- {
- genTableService.synchDb(tableName);
- return success();
- }
-
- /**
- * 鎵归噺鐢熸垚浠ｇ爜
- */
- @PreAuthorize("@ss.hasPermi('tool:gen:code')")
- @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
- @GetMapping("/batchGenCode")
- public void batchGenCode(HttpServletResponse response, String tables) throws IOException
- {
- String[] tableNames = Convert.toStrArray(tables);
- byte[] data = genTableService.downloadCode(tableNames);
- genCode(response, data);
- }
-
- /**
- * 鐢熸垚zip鏂囦欢
- */
- private void genCode(HttpServletResponse response, byte[] data) throws IOException
- {
- response.reset();
- response.addHeader("Access-Control-Allow-Origin", "*");
- response.addHeader("Access-Control-Expose-Headers", "Content-Disposition");
- response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\"");
- response.addHeader("Content-Length", "" + data.length);
- response.setContentType("application/octet-stream; charset=UTF-8");
- IOUtils.write(data, response.getOutputStream());
- }
+package com.ruoyi.project.tool.gen.controller;
+
+import com.alibaba.druid.DbType;
+import com.alibaba.druid.sql.SQLUtils;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement;
+import com.ruoyi.common.core.text.Convert;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.sql.SqlUtil;
+import com.ruoyi.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.config.GenConfig;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.tool.gen.domain.GenTable;
+import com.ruoyi.project.tool.gen.domain.GenTableColumn;
+import com.ruoyi.project.tool.gen.service.IGenTableColumnService;
+import com.ruoyi.project.tool.gen.service.IGenTableService;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.AllArgsConstructor;
+import org.apache.commons.io.IOUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 浠ｇ爜鐢熸垚 鎿嶄綔澶勭悊
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/tool/gen")
+@AllArgsConstructor
+public class GenController extends BaseController
+{
+ private IGenTableService genTableService;
+ private IGenTableColumnService genTableColumnService;
+
+ /**
+ * 鏌ヨ浠ｇ爜鐢熸垚鍒楄〃
+ */
+ @PreAuthorize("@ss.hasPermi('tool:gen:list')")
+ @GetMapping("/list")
+ public TableDataInfo genList(GenTable genTable)
+ {
+ startPage();
+ List<GenTable> list = genTableService.selectGenTableList(genTable);
+ return getDataTable(list);
+ }
+
+ /**
+ * 鑾峰彇浠ｇ爜鐢熸垚淇℃伅
+ */
+ @PreAuthorize("@ss.hasPermi('tool:gen:query')")
+ @GetMapping(value = "/{talbleId}")
+ public R<?> getInfo(@PathVariable Long talbleId)
+ {
+ GenTable table = genTableService.selectGenTableById(talbleId);
+ List<GenTable> tables = genTableService.selectGenTableAll();
+ List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(talbleId);
+ Map<String, Object> map = new HashMap<String, Object>();
+ map.put("info", table);
+ map.put("rows", list);
+ map.put("tables", tables);
+ return R.ok(map);
+ }
+
+ /**
+ * 鏌ヨ鏁版嵁搴撳垪琛�
+ */
+ @PreAuthorize("@ss.hasPermi('tool:gen:list')")
+ @GetMapping("/db/list")
+ public TableDataInfo dataList(GenTable genTable)
+ {
+ startPage();
+ List<GenTable> list = genTableService.selectDbTableList(genTable);
+ return getDataTable(list);
+ }
+
+ /**
+ * 鏌ヨ鏁版嵁琛ㄥ瓧娈靛垪琛�
+ */
+ @PreAuthorize("@ss.hasPermi('tool:gen:list')")
+ @GetMapping(value = "/column/{tableId}")
+ public TableDataInfo columnList(Long tableId)
+ {
+ TableDataInfo dataInfo = new TableDataInfo();
+ List<GenTableColumn> list = genTableColumnService.selectGenTableColumnListByTableId(tableId);
+ dataInfo.setRows(list);
+ dataInfo.setTotal(list.size());
+ return dataInfo;
+ }
+
+ /**
+ * 瀵煎叆琛ㄧ粨鏋勶紙淇濆瓨锛�
+ */
+ @PreAuthorize("@ss.hasPermi('tool:gen:import')")
+ @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.IMPORT)
+ @PostMapping("/importTable")
+ public R<?> importTableSave(String tables)
+ {
+ String[] tableNames = Convert.toStrArray(tables);
+ // 鏌ヨ琛ㄤ俊鎭�
+ List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames);
+ genTableService.importGenTable(tableList, SecurityUtils.getUsername());
+ return R.ok();
+ }
+
+ /**
+ * 鍒涘缓琛ㄧ粨鏋勶紙淇濆瓨锛�
+ */
+ @PreAuthorize("@ss.hasRole('admin')")
+ @Log(title = "鍒涘缓琛�", businessType = BusinessType.OTHER)
+ @PostMapping("/createTable")
+ public R<?> createTableSave(String sql)
+ {
+ try
+ {
+ SqlUtil.filterKeyword(sql);
+ List<SQLStatement> sqlStatements = SQLUtils.parseStatements(sql, DbType.mysql);
+ List<String> tableNames = new ArrayList<>();
+ for (SQLStatement sqlStatement : sqlStatements)
+ {
+ if (sqlStatement instanceof MySqlCreateTableStatement)
+ {
+ MySqlCreateTableStatement createTableStatement = (MySqlCreateTableStatement) sqlStatement;
+ if (genTableService.createTable(createTableStatement.toString()))
+ {
+ String tableName = createTableStatement.getTableName().replaceAll("`", "");
+ tableNames.add(tableName);
+ }
+ }
+ }
+ List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames.toArray(new String[tableNames.size()]));
+ String operName = SecurityUtils.getUsername();
+ genTableService.importGenTable(tableList, operName);
+ return R.ok();
+ }
+ catch (Exception e)
+ {
+ logger.error(e.getMessage(), e);
+ return R.fail("鍒涘缓琛ㄧ粨鏋勫紓甯�");
+ }
+ }
+
+ /**
+ * 淇敼淇濆瓨浠ｇ爜鐢熸垚涓氬姟
+ */
+ @PreAuthorize("@ss.hasPermi('tool:gen:edit')")
+ @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public R<?> editSave(@Validated @RequestBody GenTable genTable)
+ {
+ genTableService.validateEdit(genTable);
+ genTableService.updateGenTable(genTable);
+ return R.ok();
+ }
+
+ /**
+ * 鍒犻櫎浠ｇ爜鐢熸垚
+ */
+ @PreAuthorize("@ss.hasPermi('tool:gen:remove')")
+ @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{tableIds}")
+ public R<?> remove(@PathVariable Long[] tableIds)
+ {
+ genTableService.deleteGenTableByIds(tableIds);
+ return R.ok();
+ }
+
+ /**
+ * 棰勮浠ｇ爜
+ */
+ @PreAuthorize("@ss.hasPermi('tool:gen:preview')")
+ @GetMapping("/preview/{tableId}")
+ public R<?> preview(@PathVariable("tableId") Long tableId) throws IOException
+ {
+ Map<String, String> dataMap = genTableService.previewCode(tableId);
+ return R.ok(dataMap);
+ }
+
+ /**
+ * 鐢熸垚浠ｇ爜锛堜笅杞芥柟寮忥級
+ */
+ @PreAuthorize("@ss.hasPermi('tool:gen:code')")
+ @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
+ @GetMapping("/download/{tableName}")
+ public void download(HttpServletResponse response, @PathVariable("tableName") String tableName) throws IOException
+ {
+ byte[] data = genTableService.downloadCode(tableName);
+ genCode(response, data);
+ }
+
+ /**
+ * 鐢熸垚浠ｇ爜锛堣嚜瀹氫箟璺緞锛�
+ */
+ @PreAuthorize("@ss.hasPermi('tool:gen:code')")
+ @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
+ @GetMapping("/genCode/{tableName}")
+ public R<?> genCode(@PathVariable("tableName") String tableName)
+ {
+ if (!GenConfig.isAllowOverwrite())
+ {
+ return R.fail("銆愮郴缁熼璁俱�戜笉鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦�");
+ }
+ genTableService.generatorCode(tableName);
+ return R.ok();
+ }
+
+ /**
+ * 鍚屾鏁版嵁搴�
+ */
+ @PreAuthorize("@ss.hasPermi('tool:gen:edit')")
+ @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.UPDATE)
+ @GetMapping("/synchDb/{tableName}")
+ public R<?> synchDb(@PathVariable("tableName") String tableName)
+ {
+ genTableService.synchDb(tableName);
+ return R.ok();
+ }
+
+ /**
+ * 鎵归噺鐢熸垚浠ｇ爜
+ */
+ @PreAuthorize("@ss.hasPermi('tool:gen:code')")
+ @Log(title = "浠ｇ爜鐢熸垚", businessType = BusinessType.GENCODE)
+ @GetMapping("/batchGenCode")
+ public void batchGenCode(HttpServletResponse response, String tables) throws IOException
+ {
+ String[] tableNames = Convert.toStrArray(tables);
+ byte[] data = genTableService.downloadCode(tableNames);
+ genCode(response, data);
+ }
+
+ /**
+ * 鐢熸垚zip鏂囦欢
+ */
+ private void genCode(HttpServletResponse response, byte[] data) throws IOException
+ {
+ response.reset();
+ response.addHeader("Access-Control-Allow-Origin", "*");
+ response.addHeader("Access-Control-Expose-Headers", "Content-Disposition");
+ response.setHeader("Content-Disposition", "attachment; filename=\"ruoyi.zip\"");
+ response.addHeader("Content-Length", "" + data.length);
+ response.setContentType("application/octet-stream; charset=UTF-8");
+ IOUtils.write(data, response.getOutputStream());
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/ruoyi/projectManagement/controller/InfoController.java b/src/main/java/com/ruoyi/projectManagement/controller/InfoController.java
index 56baf0f..1acbd65 100644
--- a/src/main/java/com/ruoyi/projectManagement/controller/InfoController.java
+++ b/src/main/java/com/ruoyi/projectManagement/controller/InfoController.java
@@ -1,6 +1,7 @@
package com.ruoyi.projectManagement.controller;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.projectManagement.dto.InfoStageDto;
import com.ruoyi.projectManagement.dto.UpdateStateInfo;
import com.ruoyi.projectManagement.service.InfoService;
@@ -24,63 +25,63 @@
@RequestMapping("/projectManagement/info")
@Tag(name = "椤圭洰绠＄悊淇℃伅琛�(椤圭洰绠＄悊绫诲瀷)")
@RequiredArgsConstructor
-public class InfoController {
+public class InfoController extends BaseController {
private final InfoService infoService;
private final InfoStageHandleService infoStageHandleService;
@PostMapping("/save")
@Operation(summary = "淇濆瓨")
- public AjaxResult save(@RequestBody @Valid SaveInfoVo saveInfoVo) {
+ public R<?> save(@RequestBody @Valid SaveInfoVo saveInfoVo) {
infoService.save(saveInfoVo);
- return AjaxResult.success();
+ return R.ok();
}
@PostMapping("/updateStatus")
@Operation(summary = "淇敼鐘舵��")
- public AjaxResult updateStatus(@RequestBody @Valid UpdateStateInfo updateStateInfo){
+ public R<?> updateStatus(@RequestBody @Valid UpdateStateInfo updateStateInfo){
infoService.updateStatus(updateStateInfo);
- return AjaxResult.success();
+ return R.ok();
}
@PostMapping("/delete/{id}")
@Operation(summary = "鍒犻櫎")
- public AjaxResult delete(@PathVariable Long id) {
+ public R<?> delete(@PathVariable Long id) {
infoService.deleteInfo(id);
- return AjaxResult.success();
+ return R.ok();
}
@PostMapping("/listPage")
@Operation(summary = "鍒嗛〉鍒楄〃")
- public AjaxResult listPage(@RequestBody @Valid SearchInfoVo vo) {
- return AjaxResult.success(infoService.searchListInfo(vo));
+ public R<?> listPage(@RequestBody @Valid SearchInfoVo vo) {
+ return R.ok(infoService.searchListInfo(vo));
}
@PostMapping("/{id}")
@Operation(summary = "璇︽儏")
- public AjaxResult getInfoById(@PathVariable Long id) {
- return AjaxResult.success(infoService.getInfoById(id));
+ public R<?> getInfoById(@PathVariable Long id) {
+ return R.ok(infoService.getInfoById(id));
}
@PostMapping("/saveStage")
@Operation(summary = "淇濆瓨闃舵")
- public AjaxResult saveStage(@RequestBody @Valid SaveInfoStageVo dto) {
+ public R<?> saveStage(@RequestBody @Valid SaveInfoStageVo dto) {
infoStageHandleService.save(dto);
- return AjaxResult.success();
+ return R.ok();
}
@PostMapping("/listStage/{id}")
@Operation(summary = "鍒楄〃闃舵")
- public AjaxResult listStage(@PathVariable Long id) {
- return AjaxResult.success(infoStageHandleService.getListVoByInfoId(id));
+ public R<?> listStage(@PathVariable Long id) {
+ return R.ok(infoStageHandleService.getListVoByInfoId(id));
}
@PostMapping("/deleteStage/{id}")
@Operation(summary = "鍒犻櫎闃舵")
- public AjaxResult deleteStage(@PathVariable Long id) {
+ public R<?> deleteStage(@PathVariable Long id) {
infoStageHandleService.deleteById(id);
- return AjaxResult.success();
+ return R.ok();
}
diff --git a/src/main/java/com/ruoyi/projectManagement/controller/PlanController.java b/src/main/java/com/ruoyi/projectManagement/controller/PlanController.java
index c8b982c..5ec8191 100644
--- a/src/main/java/com/ruoyi/projectManagement/controller/PlanController.java
+++ b/src/main/java/com/ruoyi/projectManagement/controller/PlanController.java
@@ -1,6 +1,7 @@
package com.ruoyi.projectManagement.controller;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.projectManagement.service.PlanService;
import com.ruoyi.projectManagement.vo.SavePlanNodeVo;
import com.ruoyi.projectManagement.vo.SavePlanVo;
@@ -22,28 +23,28 @@
@RequestMapping("/projectManagement/plan")
@Tag(name = "椤圭洰绠＄悊璁″垝琛�(椤圭洰绠＄悊绫诲瀷)")
@RequiredArgsConstructor
-public class PlanController {
+public class PlanController extends BaseController {
private final PlanService planService;
@PostMapping("/save")
@Operation(summary = "淇濆瓨")
- public AjaxResult save(@RequestBody @Valid SavePlanVo savePlanVo) {
+ public R<?> save(@RequestBody @Valid SavePlanVo savePlanVo) {
planService.savePlan(savePlanVo);
- return AjaxResult.success();
+ return R.ok();
}
@PostMapping("/delete/{id}")
@Operation(summary = "鍒犻櫎")
- public AjaxResult delete(@PathVariable Long id) {
+ public R<?> delete(@PathVariable Long id) {
planService.deletePlan(id);
- return AjaxResult.success();
+ return R.ok();
}
@PostMapping("/listPage")
@Operation(summary = "鍒嗛〉鍒楄〃")
- public AjaxResult listPage(@RequestBody SearchPlanVo searchPlanVo) {
- return AjaxResult.success(planService.searchPlan(searchPlanVo));
+ public R<?> listPage(@RequestBody SearchPlanVo searchPlanVo) {
+ return R.ok(planService.searchPlan(searchPlanVo));
}
}
diff --git a/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java b/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
index 8adcf8d..93fadf7 100644
--- a/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
+++ b/src/main/java/com/ruoyi/projectManagement/controller/RolesController.java
@@ -4,7 +4,8 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.OrderUtils;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.projectManagement.dto.RoleDto;
import com.ruoyi.projectManagement.mapper.RolesMapper;
import com.ruoyi.projectManagement.pojo.Roles;
@@ -20,41 +21,41 @@
@AllArgsConstructor
@RequestMapping("/projectManagement/roles")
@Tag(name = "")
-public class RolesController {
+public class RolesController extends BaseController {
private RolesService rolesservice;
private RolesMapper rolesMapper;
@GetMapping("/listPage")
@Operation(summary = "鍒嗛〉鏌ヨ鎵�鏈�")
- public AjaxResult listPage(Page<Roles> page, Roles roles) {
- return AjaxResult.success(rolesservice.listPage(page, roles));
+ public R<?> listPage(Page<Roles> page, Roles roles) {
+ return R.ok(rolesservice.listPage(page, roles));
}
@PostMapping("/add")
@Operation(summary = "鏂板")
- public AjaxResult add(@RequestBody RoleDto roleDto) {
+ public R<?> add(@RequestBody RoleDto roleDto) {
if (roleDto.getIsDefaultNo()) {
roleDto.setNo(OrderUtils.countTodayByCreateTime(rolesMapper, "XMJS","no"));
}
- return AjaxResult.success(rolesservice.save(roleDto));
+ return R.ok(rolesservice.save(roleDto));
}
@PostMapping("/update")
@Operation(summary = "淇敼")
- public AjaxResult update(@RequestBody Roles roles) {
- return AjaxResult.success(rolesservice.updateById(roles));
+ public R<?> update(@RequestBody Roles roles) {
+ return R.ok(rolesservice.updateById(roles));
}
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎")
- public AjaxResult delete(@RequestBody List<Long> ids) {
- if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return AjaxResult.success(rolesservice.removeBatchByIds(ids));
+ public R<?> delete(@RequestBody List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.ok(rolesservice.removeBatchByIds(ids));
}
@PostMapping("/listSimpleRole")
- public AjaxResult listSimpleRole() {
- return AjaxResult.success(rolesservice.listSimpleRole());
+ public R<?> listSimpleRole() {
+ return R.ok(rolesservice.listSimpleRole());
}
}
diff --git a/src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java b/src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java
index 813fb44..047863c 100644
--- a/src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/AccountingReportController.java
@@ -5,7 +5,8 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.purchase.dto.InvoicePurchaseReportDto;
import com.ruoyi.purchase.dto.VatDto;
import com.ruoyi.purchase.pojo.InvoicePurchase;
@@ -27,15 +28,15 @@
@Tag(name = "閲囪喘鎶ヨ〃")
@RequestMapping("/purchase/report")
@AllArgsConstructor
-public class AccountingReportController {
+public class AccountingReportController extends BaseController {
private IInvoicePurchaseService invoicePurchaseService;
@GetMapping("/list")
@Log(title = "閲囪喘鎶ヨ〃-椤圭洰鍒╂鼎", businessType = BusinessType.OTHER)
- public AjaxResult list(Page page, InvoicePurchaseReportDto invoicePurchaseReportDto) {
+ public R<?> list(Page page, InvoicePurchaseReportDto invoicePurchaseReportDto) {
IPage<InvoicePurchaseReportDto> result =invoicePurchaseService.listPurchaseReport(page, invoicePurchaseReportDto);
- return AjaxResult.success(result);
+ return R.ok(result);
}
@Log(title = "閲囪喘鎶ヨ〃-椤圭洰鍒╂鼎瀵煎嚭", businessType = BusinessType.EXPORT)
@@ -51,9 +52,9 @@
@Log(title = "閲囪喘鎶ヨ〃-澧炲�肩◣姣斿", businessType = BusinessType.OTHER)
@GetMapping("/listVat")
- public AjaxResult listVat(Page page,String month) {
+ public R<?> listVat(Page page,String month) {
IPage<VatDto> result = invoicePurchaseService.listVat(page, month);
- return AjaxResult.success(result);
+ return R.ok(result);
}
@Log(title = "閲囪喘鎶ヨ〃-澧炲�肩◣姣斿", businessType = BusinessType.EXPORT)
diff --git a/src/main/java/com/ruoyi/purchase/controller/InvoicePurchaseController.java b/src/main/java/com/ruoyi/purchase/controller/InvoicePurchaseController.java
index afd9213..5bf43bf 100644
--- a/src/main/java/com/ruoyi/purchase/controller/InvoicePurchaseController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/InvoicePurchaseController.java
@@ -4,7 +4,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.purchase.dto.InvoicePurchaseDto;
import com.ruoyi.purchase.pojo.InvoicePurchase;
@@ -66,8 +66,9 @@
*/
@Log(title = "鍙戠エ淇℃伅", businessType = BusinessType.INSERT)
@PostMapping("/addOrUpdateInvoice")
- public AjaxResult addOrUpdateInvoice(@RequestBody InvoicePurchaseDto invoicePurchaseDto) throws IOException {
- return toAjax(invoicePurchaseService.addOrUpdateInvoice(invoicePurchaseDto));
+ public R<?> addOrUpdateInvoice(@RequestBody InvoicePurchaseDto invoicePurchaseDto) throws IOException {
+ invoicePurchaseService.addOrUpdateInvoice(invoicePurchaseDto);
+ return R.ok();
}
/**
@@ -75,8 +76,9 @@
*/
@Log(title = "鍙戠エ淇℃伅", businessType = BusinessType.DELETE)
@DeleteMapping("/delInvoice")
- public AjaxResult remove(@RequestBody Long[] ids) {
- return toAjax(invoicePurchaseService.delInvoice(ids));
+ public R<?> remove(@RequestBody Long[] ids) {
+ invoicePurchaseService.delInvoice(ids);
+ return R.ok();
}
}
diff --git a/src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java b/src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java
index 289110c..9019c61 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PaymentRegistrationController.java
@@ -6,7 +6,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.purchase.dto.PaymentHistoryRecordVo;
import com.ruoyi.purchase.dto.PaymentLedgerDto;
@@ -62,8 +62,8 @@
* 鑾峰彇浠樻鐧昏璇︾粏淇℃伅
*/
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id) {
- return success(paymentRegistrationService.selectPaymentRegistrationById(id));
+ public R<?> getInfo(@PathVariable("id") Long id) {
+ return R.ok(paymentRegistrationService.selectPaymentRegistrationById(id));
}
/**
@@ -72,8 +72,9 @@
@Log(title = "浠樻鐧昏", businessType = BusinessType.INSERT)
@PostMapping
@Transactional(rollbackFor = Exception.class)
- public AjaxResult add(@RequestBody List<PaymentRegistration> paymentRegistration) {
- return toAjax(paymentRegistrationService.insertPaymentRegistration(paymentRegistration));
+ public R<?> add(@RequestBody List<PaymentRegistration> paymentRegistration) {
+ paymentRegistrationService.insertPaymentRegistration(paymentRegistration);
+ return R.ok();
}
/**
@@ -82,8 +83,9 @@
@Log(title = "浠樻鐧昏", businessType = BusinessType.UPDATE)
@PutMapping
@Transactional(rollbackFor = Exception.class)
- public AjaxResult edit(@RequestBody PaymentRegistration paymentRegistration) {
- return toAjax(paymentRegistrationService.updatePaymentRegistration(paymentRegistration));
+ public R<?> edit(@RequestBody PaymentRegistration paymentRegistration) {
+ paymentRegistrationService.updatePaymentRegistration(paymentRegistration);
+ return R.ok();
}
/**
@@ -91,8 +93,9 @@
*/
@Log(title = "浠樻鐧昏", businessType = BusinessType.DELETE)
@DeleteMapping("/del")
- public AjaxResult remove(@RequestBody Long[] ids) {
- return toAjax(paymentRegistrationService.deletePaymentRegistrationByIds(ids));
+ public R<?> remove(@RequestBody Long[] ids) {
+ paymentRegistrationService.deletePaymentRegistrationByIds(ids);
+ return R.ok();
}
/**
@@ -100,51 +103,52 @@
*/
@Log(title = "浠樻鐧昏", businessType = BusinessType.DELETE)
@DeleteMapping("/delete")
- public AjaxResult delete(@RequestBody Long[] ids) {
- return toAjax(paymentRegistrationService.delete(ids));
+ public R<?> delete(@RequestBody Long[] ids) {
+ paymentRegistrationService.delete(ids);
+ return R.ok();
}
/**
* 鑾峰彇浠樻鐧昏璇︾粏淇℃伅
*/
@GetMapping(value = "/byPurchaseId/{id}")
- public AjaxResult getPurchaseInfo(@PathVariable("id") Long id) {
- return success(paymentRegistrationService.selectPaymentRegistrationByPurchaseId(id));
+ public R<?> getPurchaseInfo(@PathVariable("id") Long id) {
+ return R.ok(paymentRegistrationService.selectPaymentRegistrationByPurchaseId(id));
}
/**
* 鑾峰彇浠樻鐧昏璇︾粏淇℃伅
*/
@GetMapping(value = "/paymentLedgerList")
- public AjaxResult paymentLedgerList(PaymentLedgerDto paymentLedgerDto, Page page,
+ public R<?> paymentLedgerList(PaymentLedgerDto paymentLedgerDto, Page page,
Integer detailPageNum,
Integer detailPageSize) {
IPage<Map<String, Object>> mapIPage = paymentRegistrationService.selectPaymentLedgerList(paymentLedgerDto, page, detailPageNum, detailPageSize);
- return success(mapIPage);
+ return R.ok(mapIPage);
}
/**
* 渚涘簲鍟嗗線鏉ュ垎椤垫帴鍙�
*/
@GetMapping("/supplierNameListPage")
- public AjaxResult supplierNameListPage(PaymentLedgerDto paymentLedgerDto, Page page){
- return success(paymentRegistrationService.supplierNameListPage(page,paymentLedgerDto));
+ public R<?> supplierNameListPage(PaymentLedgerDto paymentLedgerDto, Page page){
+ return R.ok(paymentRegistrationService.supplierNameListPage(page,paymentLedgerDto));
}
/**
* 渚涘簲鍟嗗線鏉ュ垎椤垫帴鍙�
*/
@GetMapping("/supplierNameListPageDetails")
- public AjaxResult supplierNameListPageDetails(PaymentLedgerDto paymentLedgerDto){
- return success(paymentRegistrationService.supplierNameListPageDetails(paymentLedgerDto));
+ public R<?> supplierNameListPageDetails(PaymentLedgerDto paymentLedgerDto){
+ return R.ok(paymentRegistrationService.supplierNameListPageDetails(paymentLedgerDto));
}
/**
* 鑾峰彇鏈湀搴斾粯淇℃伅
*/
@GetMapping(value = "/paymentMonthList")
- public AjaxResult paymentMonthList() {
- return success(paymentRegistrationService.paymentMonthList());
+ public R<?> paymentMonthList() {
+ return R.ok(paymentRegistrationService.paymentMonthList());
}
/**
@@ -166,9 +170,9 @@
* @return
*/
@GetMapping("/getPaymentRecordList/{supplierId}")
- public AjaxResult getPaymentRecordList(@PathVariable Long supplierId) {
+ public R<?> getPaymentRecordList(@PathVariable Long supplierId) {
List<PaymentHistoryRecordVo> paymentRecordList = paymentRegistrationService.getPaymentRecordList(supplierId);
- return success(paymentRecordList);
+ return R.ok(paymentRecordList);
}
/**
diff --git a/src/main/java/com/ruoyi/purchase/controller/ProcurementBusinessSummaryController.java b/src/main/java/com/ruoyi/purchase/controller/ProcurementBusinessSummaryController.java
index cbdee81..949ca95 100644
--- a/src/main/java/com/ruoyi/purchase/controller/ProcurementBusinessSummaryController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/ProcurementBusinessSummaryController.java
@@ -6,7 +6,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.purchase.dto.ProcurementBusinessSummaryDto;
import com.ruoyi.purchase.service.impl.ProcurementBusinessSummaryServiceImpl;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -31,8 +31,8 @@
private ProcurementBusinessSummaryServiceImpl procurementBusinessSummaryService;
@GetMapping("/listPage")
- public AjaxResult listPage(Page page, ProcurementBusinessSummaryDto procurementBusinessSummaryDto) {
- return AjaxResult.success(procurementBusinessSummaryService.listPage(page, procurementBusinessSummaryDto));
+ public R<?> listPage(Page page, ProcurementBusinessSummaryDto procurementBusinessSummaryDto) {
+ return R.ok(procurementBusinessSummaryService.listPage(page, procurementBusinessSummaryDto));
}
/**
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
index 3290499..ebbd718 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerController.java
@@ -8,7 +8,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.purchase.dto.PurchaseLedgerDto;
import com.ruoyi.purchase.mapper.PurchaseLedgerTemplateMapper;
@@ -67,7 +67,7 @@
@Log(title = "瀵煎叆閲囪喘鍙拌处", businessType = BusinessType.INSERT)
@PostMapping("/import")
@Operation(summary = "瀵煎叆閲囪喘鍙拌处")
- public AjaxResult importData(@RequestParam("file")
+ public R<?> importData(@RequestParam("file")
@ApiParam(value = "Excel鏂囦欢", required = true)
MultipartFile file) {
return purchaseLedgerService.importData(file);
@@ -151,8 +151,9 @@
*/
@Log(title = "閲囪喘鍙拌处", businessType = BusinessType.INSERT)
@PostMapping("/addOrEditPurchase")
- public AjaxResult addOrEditPurchase(@RequestBody PurchaseLedgerDto purchaseLedgerDto) throws Exception {
- return toAjax(purchaseLedgerService.addOrEditPurchase(purchaseLedgerDto));
+ public R<?> addOrEditPurchase(@RequestBody PurchaseLedgerDto purchaseLedgerDto) throws Exception {
+ purchaseLedgerService.addOrEditPurchase(purchaseLedgerDto);
+ return R.ok();
}
/**
@@ -160,7 +161,7 @@
*/
@Operation(summary = "/鏌ヨ閲囪喘妯℃澘")
@GetMapping("/getPurchaseTemplateList")
- public AjaxResult getPurchaseTemplateList() {
+ public R<?> getPurchaseTemplateList() {
List<PurchaseLedgerTemplate> purchaseLedgers = purchaseLedgerTemplateMapper.selectList(null);
purchaseLedgers.forEach(purchaseLedgerDto1 -> {
LambdaQueryWrapper<SalesLedgerProductTemplate> queryWrapper = new LambdaQueryWrapper<>();
@@ -171,14 +172,15 @@
purchaseLedgerDto1.setProductList(list);
}
});
- return AjaxResult.success(purchaseLedgers);
+ return R.ok(purchaseLedgers);
}
/**
* 淇敼閲囪喘鍙拌处瀹℃壒鐘舵��
*/
@PostMapping("/updateApprovalStatus")
- public AjaxResult addOrEditPurchase(@RequestBody PurchaseLedger purchaseLedger){
- return toAjax(purchaseLedgerService.updateById(purchaseLedger));
+ public R<?> addOrEditPurchase(@RequestBody PurchaseLedger purchaseLedger){
+ purchaseLedgerService.updateById(purchaseLedger);
+ return R.ok();
}
/**
* 鏌ヨ閲囪喘鍙拌处鍜屼骇鍝佺埗瀛愬垪琛�
@@ -201,8 +203,9 @@
*/
@Log(title = "閲囪喘鍙拌处", businessType = BusinessType.DELETE)
@DeleteMapping("/delPurchase")
- public AjaxResult remove(@RequestBody Long[] ids) {
- return toAjax(purchaseLedgerService.deletePurchaseLedgerByIds(ids));
+ public R<?> remove(@RequestBody Long[] ids) {
+ purchaseLedgerService.deletePurchaseLedgerByIds(ids);
+ return R.ok();
}
/**
@@ -218,8 +221,8 @@
* 鏍规嵁閿�鍞悎鍚屾煡璇骇鍝佷俊鎭�
*/
@GetMapping("/getProductBySalesNo")
- public AjaxResult getProductBySalesNo(Long id) {
- return AjaxResult.success(purchaseLedgerService.getProductBySalesNo(id));
+ public R<?> getProductBySalesNo(Long id) {
+ return R.ok(purchaseLedgerService.getProductBySalesNo(id));
}
/**
@@ -234,8 +237,8 @@
* 鏍规嵁id鏌ヨ閲囪喘鍚堝悓鍙�
*/
@GetMapping("/getPurchaseNoById")
- public AjaxResult getPurchaseNoById(Long id) {
- return AjaxResult.success(purchaseLedgerService.getPurchaseNoById(id));
+ public R<?> getPurchaseNoById(Long id) {
+ return R.ok(purchaseLedgerService.getPurchaseNoById(id));
}
/**
@@ -250,22 +253,22 @@
* 鏍规嵁閲囪喘鍚堝悓鍙锋煡璇骇鍝�
*/
@GetMapping("/getInfo")
- public AjaxResult getInfo(PurchaseLedgerDto purchaseLedgerDto) {
- return AjaxResult.success(purchaseLedgerService.getInfo(purchaseLedgerDto));
+ public R<?> getInfo(PurchaseLedgerDto purchaseLedgerDto) {
+ return R.ok(purchaseLedgerService.getInfo(purchaseLedgerDto));
}
/**
* 鏌ヨ閲囪喘鍙拌处鍒楄〃
*/
@GetMapping("/listPage")
- public AjaxResult listPage(Page page, PurchaseLedgerDto purchaseLedger) {
- return AjaxResult.success(purchaseLedgerService.selectPurchaseLedgerListPage(page, purchaseLedger));
+ public R<?> listPage(Page page, PurchaseLedgerDto purchaseLedger) {
+ return R.ok(purchaseLedgerService.selectPurchaseLedgerListPage(page, purchaseLedger));
}
@Operation(summary = "鐢熸垚閲囪喘搴忓垪鍙�")
@GetMapping("/createPurchaseNo")
@Log(title = "鐢熸垚閲囪喘搴忓垪鍙�", businessType = BusinessType.OTHER)
- public AjaxResult createPurchaseNo() {
- return AjaxResult.success("鐢熸垚鎴愬姛",purchaseLedgerService.getPurchaseNo());
+ public R<?> createPurchaseNo() {
+ return R.ok(purchaseLedgerService.getPurchaseNo(), "鐢熸垚鎴愬姛");
}
}
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerTemplateController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerTemplateController.java
index 3b3c97f..996970d 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerTemplateController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseLedgerTemplateController.java
@@ -4,7 +4,8 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.purchase.dto.PurchaseLedgerDto;
import com.ruoyi.purchase.mapper.PurchaseLedgerTemplateMapper;
import com.ruoyi.purchase.mapper.SalesLedgerProductTemplateMapper;
@@ -31,7 +32,7 @@
@RequestMapping("/purchaseLedgerTemplate")
@Tag(name = "閲囪喘鍙拌处妯℃澘")
@AllArgsConstructor
-public class PurchaseLedgerTemplateController {
+public class PurchaseLedgerTemplateController extends BaseController {
private PurchaseLedgerTemplateMapper purchaseLedgerTemplateMapper;
private SalesLedgerProductTemplateMapper salesLedgerProductTemplateMapper;
@@ -39,7 +40,7 @@
@PostMapping("/add")
@Log(title = "娣诲姞閲囪喘鍙拌处妯℃澘", businessType = BusinessType.INSERT)
@Operation(summary = "娣诲姞閲囪喘鍙拌处妯℃澘")
- public AjaxResult add(@RequestBody PurchaseLedgerDto purchaseLedgerDto) {
+ public R<?> add(@RequestBody PurchaseLedgerDto purchaseLedgerDto) {
// 閲囪喘妯℃澘
if(StringUtils.isNotEmpty(purchaseLedgerDto.getTemplateName())){
// 妯℃澘鍚嶇О涓嶈兘閲嶅锛屾湁閲嶅灏变笉闇�瑕佹柊澧炰簡
@@ -63,24 +64,24 @@
});
}
}
- return AjaxResult.success();
+ return R.ok();
}
@DeleteMapping("/delete")
@Log(title = "閲囪喘鍙拌处妯℃澘", businessType = BusinessType.DELETE)
@Operation(summary = "鍒犻櫎閲囪喘鍙拌处妯℃澘")
- public AjaxResult delete(@RequestBody List<Long> id) {
- if(CollectionUtils.isEmpty(id)) return AjaxResult.error("璇烽�夋嫨瑕佸垹闄ょ殑閲囪喘鍙拌处妯℃澘");
+ public R<?> delete(@RequestBody List<Long> id) {
+ if(CollectionUtils.isEmpty(id)) return R.fail("璇烽�夋嫨瑕佸垹闄ょ殑閲囪喘鍙拌处妯℃澘");
int result = purchaseLedgerTemplateMapper.deleteBatchIds(id);
salesLedgerProductTemplateMapper.delete(new LambdaQueryWrapper<SalesLedgerProductTemplate>()
.in(SalesLedgerProductTemplate::getSalesLedgerId, id));
- return AjaxResult.success(result);
+ return R.ok(result);
}
@PostMapping("/update")
@Log(title = "淇敼閲囪喘鍙拌处妯℃澘", businessType = BusinessType.UPDATE)
@Operation(summary = "淇敼閲囪喘鍙拌处妯℃澘")
- public AjaxResult update(@RequestBody PurchaseLedgerDto purchaseLedgerDto) {
+ public R<?> update(@RequestBody PurchaseLedgerDto purchaseLedgerDto) {
// 妯℃澘鍚嶇О涓嶈兘閲嶅锛屾湁閲嶅灏变笉闇�瑕佹柊澧炰簡
PurchaseLedgerTemplate purchaseLedgerTemplate = purchaseLedgerTemplateMapper
.selectOne(new LambdaQueryWrapper<PurchaseLedgerTemplate>()
@@ -102,7 +103,7 @@
salesLedgerProductTemplateMapper.insert(salesLedgerProductTemplate);
});
}
- return AjaxResult.success();
+ return R.ok();
}
}
diff --git a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
index bb669b6..f1fb4e8 100644
--- a/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/PurchaseReturnOrdersController.java
@@ -4,7 +4,8 @@
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.purchase.dto.PurchaseReturnOrderDto;
import com.ruoyi.purchase.mapper.PurchaseReturnOrdersMapper;
import com.ruoyi.purchase.service.PurchaseReturnOrdersService;
@@ -28,43 +29,43 @@
@RequestMapping("/purchaseReturnOrders")
@Tag(name = "閲囪喘閫�璐у崟")
@AllArgsConstructor
-public class PurchaseReturnOrdersController {
+public class PurchaseReturnOrdersController extends BaseController {
private PurchaseReturnOrdersService purchaseReturnOrdersService;
private PurchaseReturnOrdersMapper purchaseReturnOrdersMapper;
@GetMapping("/listPage")
- public AjaxResult listPage(Page page, PurchaseReturnOrderDto purchaseReturnOrderDto) {
- return AjaxResult.success(purchaseReturnOrdersService.listPage(page, purchaseReturnOrderDto));
+ public R<?> listPage(Page page, PurchaseReturnOrderDto purchaseReturnOrderDto) {
+ return R.ok(purchaseReturnOrdersService.listPage(page, purchaseReturnOrderDto));
}
// 鏂板
@Log(title = "閲囪喘閫�璐у崟", businessType = BusinessType.INSERT)
@PostMapping("/add")
- public AjaxResult add(@RequestBody PurchaseReturnOrderDto purchaseReturnOrderDto) throws Exception {
+ public R<?> add(@RequestBody PurchaseReturnOrderDto purchaseReturnOrderDto) throws Exception {
if (purchaseReturnOrderDto.getIsDefaultNo()) {
purchaseReturnOrderDto.setNo(OrderUtils.countTodayByCreateTime(purchaseReturnOrdersMapper, "CGTL", "no"));
}
- return AjaxResult.success(purchaseReturnOrdersService.add(purchaseReturnOrderDto));
+ return R.ok(purchaseReturnOrdersService.add(purchaseReturnOrderDto));
}
@GetMapping("/selectById/{id}")
- public AjaxResult selectById(@PathVariable Long id) {
- return AjaxResult.success(purchaseReturnOrdersService.getPurchaseReturnOrderDtoById(id));
+ public R<?> selectById(@PathVariable Long id) {
+ return R.ok(purchaseReturnOrdersService.getPurchaseReturnOrderDtoById(id));
}
@PostMapping("/deleteById/{id}")
- public AjaxResult deleteById(@PathVariable Long id) {
+ public R<?> deleteById(@PathVariable Long id) {
purchaseReturnOrdersService.deleteById(id);
- return AjaxResult.success();
+ return R.ok();
}
@GetMapping("/getByPurchaseLedgerId")
@Operation(summary = "閲囪喘閫�璐�-鏍规嵁閲囪喘璁㈠崟id鏌ヨ閲囪喘璁㈠崟瀵瑰簲鐨勫叆搴撲骇鍝佷俊鎭�")
- public AjaxResult getByPurchaseLedgerId(Long purchaseLedgerId) {
+ public R<?> getByPurchaseLedgerId(Long purchaseLedgerId) {
List<PurchaseStockInProductVo> purchaseStockInProductVos = purchaseReturnOrdersService.getByPurchaseLedgerId(purchaseLedgerId);
- return AjaxResult.success(purchaseStockInProductVos);
+ return R.ok(purchaseStockInProductVos);
}
diff --git a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
index db628af..ceeba52 100644
--- a/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
+++ b/src/main/java/com/ruoyi/purchase/controller/TicketRegistrationController.java
@@ -6,7 +6,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.purchase.dto.PaymentRegistrationDto;
import com.ruoyi.purchase.dto.ProductRecordDto;
@@ -70,23 +70,24 @@
@Operation(summary = "鏍规嵁id鏌ヨ浠樻娴佹按")
@GetMapping("/getPaymentRegistrationById")
- public AjaxResult getPaymentRegistrationById(Long id) {
+ public R<?> getPaymentRegistrationById(Long id) {
PaymentRegistration byId = paymentRegistrationService.getById(id);
- return AjaxResult.success(byId);
+ return R.ok(byId);
}
@Operation(summary = "淇敼浠樻娴佹按")
@PutMapping("/updatePaymentRegistration")
@Log(title = "淇敼浠樻娴佹按", businessType = BusinessType.UPDATE)
- public AjaxResult updatePaymentRegistration(@RequestBody PaymentRegistration paymentRegistratio) {
- return AjaxResult.success(paymentRegistrationService.updatePaymentRegistration(paymentRegistratio));
+ public R<?> updatePaymentRegistration(@RequestBody PaymentRegistration paymentRegistratio) {
+ return R.ok(paymentRegistrationService.updatePaymentRegistration(paymentRegistratio));
}
@Operation(summary = "鍒犻櫎浠樻娴佹按")
@DeleteMapping("/delPaymentRegistration")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult delPaymentRegistration(@RequestBody List<Long> id) {
- return toAjax(paymentRegistrationService.delPaymentRegistration(id));
+ public R<?> delPaymentRegistration(@RequestBody List<Long> id) {
+ paymentRegistrationService.delPaymentRegistration(id);
+ return R.ok();
}
/**
@@ -126,26 +127,26 @@
@Log(title = "鏉ョエ鐧昏", businessType = BusinessType.INSERT)
@PostMapping("/addOrUpdateRegistration")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult addOrUpdateRegistration(@RequestBody List<TicketRegistrationDto> ticketRegistrationDto) throws IOException {
- if(CollectionUtils.isEmpty(ticketRegistrationDto)) return AjaxResult.error("璇烽�夋嫨瑕佷繚瀛樼殑璁板綍");
+ public R<?> addOrUpdateRegistration(@RequestBody List<TicketRegistrationDto> ticketRegistrationDto) throws IOException {
+ if(CollectionUtils.isEmpty(ticketRegistrationDto)) return R.fail("璇烽�夋嫨瑕佷繚瀛樼殑璁板綍");
for (TicketRegistrationDto ticketRegistrationDto1 : ticketRegistrationDto) {
ticketRegistrationService.addOrUpdateRegistration(ticketRegistrationDto1);
}
- return toAjax(1);
+ return R.ok();
}
@PostMapping("/getProductRecordById")
- public AjaxResult getProductRecordById(@RequestBody ProductRecordDto productRecordDto) {
+ public R<?> getProductRecordById(@RequestBody ProductRecordDto productRecordDto) {
if (productRecordDto.getId() == null) {
- return AjaxResult.error("鍙傛暟閿欒");
+ return R.fail("鍙傛暟閿欒");
}
- return AjaxResult.success(productRecordService.getProductRecordById(productRecordDto));
+ return R.ok(productRecordService.getProductRecordById(productRecordDto));
}
@Schema(description = "淇敼鏉ョエ鐧昏")
@PostMapping("/updateRegistration")
- public AjaxResult updateRegistration(@RequestBody ProductRecordDto productRecordDto) {
+ public R<?> updateRegistration(@RequestBody ProductRecordDto productRecordDto) {
return productRecordService.updateRecord(productRecordDto);
}
@@ -156,8 +157,9 @@
@Log(title = "鍒犻櫎鏉ョエ鐧昏(鏉ョエ鍙拌处)", businessType = BusinessType.DELETE)
@DeleteMapping("/delRegistration")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult delRegistration(@RequestBody Long[] ids) {
- return toAjax(ticketRegistrationService.delRegistration(ids));
+ public R<?> delRegistration(@RequestBody Long[] ids) {
+ ticketRegistrationService.delRegistration(ids);
+ return R.ok();
}
/**
@@ -173,18 +175,18 @@
* 鍒嗛〉鏌ヨ浜у搧淇℃伅寮�绁ㄨ褰曞垪琛�
*/
@GetMapping("/productRecordPage")
- public AjaxResult productRecordPage(Page page, TicketRegistrationDto ticketRegistrationDto) {
+ public R<?> productRecordPage(Page page, TicketRegistrationDto ticketRegistrationDto) {
IPage<ProductRecordDto> list = productRecordService.productRecordPage(page,ticketRegistrationDto);
- return AjaxResult.success(list);
+ return R.ok(list);
}
/**
* 鏌ヨ鍙戠エ鍙�
*/
@GetMapping("/getTicketNo")
- public AjaxResult getTicketNo(TicketRegistrationDto ticketRegistrationDto) {
- return AjaxResult.success(ticketRegistrationService.getTicketNo(ticketRegistrationDto));
+ public R<?> getTicketNo(TicketRegistrationDto ticketRegistrationDto) {
+ return R.ok(ticketRegistrationService.getTicketNo(ticketRegistrationDto));
}
/**
@@ -197,8 +199,8 @@
@Schema(description = "鏍规嵁id鏌ヨ鏉ユ紓鐧昏")
@GetMapping("/getPuargeById")
- public AjaxResult getPuargeById(Long id) {
- return AjaxResult.success(ticketRegistrationService.getPuargeById( id));
+ public R<?> getPuargeById(Long id) {
+ return R.ok(ticketRegistrationService.getPuargeById( id));
}
diff --git a/src/main/java/com/ruoyi/purchase/service/IProductRecordService.java b/src/main/java/com/ruoyi/purchase/service/IProductRecordService.java
index 3ab3d32..6048e5c 100644
--- a/src/main/java/com/ruoyi/purchase/service/IProductRecordService.java
+++ b/src/main/java/com/ruoyi/purchase/service/IProductRecordService.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.purchase.dto.ProductRecordDto;
import com.ruoyi.purchase.dto.TicketRegistrationDto;
import com.ruoyi.purchase.pojo.ProductRecord;
@@ -22,7 +22,7 @@
IPage<ProductRecordDto> productRecordPage(Page page, TicketRegistrationDto ticketRegistrationDto);
- AjaxResult updateRecord(ProductRecordDto productRecordDto);
+ R<?> updateRecord(ProductRecordDto productRecordDto);
ProductRecordDto getProductRecordById(ProductRecordDto productRecordDto);
}
diff --git a/src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java b/src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java
index d09050e..be515e6 100644
--- a/src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java
+++ b/src/main/java/com/ruoyi/purchase/service/IPurchaseLedgerService.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.purchase.dto.PurchaseLedgerDto;
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
@@ -44,7 +44,7 @@
String getPurchaseNo();
- AjaxResult importData(MultipartFile file);
+ R<?> importData(MultipartFile file);
PurchaseLedgerDto getPurchaseByCode(PurchaseLedgerDto purchaseLedgerDto);
}
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java
index 961e759..1cee7de 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/ProductRecordServiceImpl.java
@@ -6,7 +6,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.enums.FileNameType;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.purchase.dto.ProductRecordDto;
import com.ruoyi.purchase.dto.TicketRegistrationDto;
import com.ruoyi.purchase.mapper.ProductRecordMapper;
@@ -67,9 +67,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public AjaxResult updateRecord(ProductRecordDto productRecordDto) {
+ public R<?> updateRecord(ProductRecordDto productRecordDto) {
ProductRecord productRecord = productRecordMapper.selectById(productRecordDto.getId());
- if (productRecord == null) return AjaxResult.error("璁板綍涓嶅瓨鍦�");
+ if (productRecord == null) return R.fail("璁板綍涓嶅瓨鍦�");
// 鏇存柊浜у搧鍙拌处
SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(productRecord.getSaleLedgerProjectId());
@@ -110,7 +110,7 @@
productRecord.setFutureTicketsAmount(productRecord.getFutureTickets().multiply(productRecord.getTaxInclusiveUnitPrice()));
productRecordMapper.updateById(productRecord);
- return AjaxResult.success("淇敼鎴愬姛");
+ return R.ok(null, "淇敼鎴愬姛");
}
@Override
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
index cdf80f9..e7cff23 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -24,7 +24,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.other.mapper.TempFileMapper;
import com.ruoyi.procurementrecord.mapper.ProcurementRecordMapper;
import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
@@ -534,18 +534,18 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public AjaxResult importData(MultipartFile file) {
+ public R<?> importData(MultipartFile file) {
LoginUser loginUser = SecurityUtils.getLoginUser();
try {
InputStream inputStream = file.getInputStream();
ExcelUtil<PurchaseLedgerImportDto> salesLedgerImportDtoExcelUtil = new ExcelUtil<>(PurchaseLedgerImportDto.class);
Map<String, List<PurchaseLedgerImportDto>> stringListMap = salesLedgerImportDtoExcelUtil.importExcelMultiSheet(Arrays.asList("閲囪喘鍙拌处鏁版嵁", "閲囪喘浜у搧鏁版嵁"), inputStream, 0);
- if (CollectionUtils.isEmpty(stringListMap)) return AjaxResult.error("閲囪喘琛ㄦ牸涓虹┖锛�");
+ if (CollectionUtils.isEmpty(stringListMap)) return R.fail("閲囪喘琛ㄦ牸涓虹┖锛�");
// 涓氬姟灞傚悎骞�
List<PurchaseLedgerImportDto> salesLedgerImportDtoList = stringListMap.get("閲囪喘鍙拌处鏁版嵁");
- if (CollectionUtils.isEmpty(salesLedgerImportDtoList)) return AjaxResult.error("閲囪喘鍙拌处鏁版嵁涓虹┖锛�");
+ if (CollectionUtils.isEmpty(salesLedgerImportDtoList)) return R.fail("閲囪喘鍙拌处鏁版嵁涓虹┖锛�");
List<PurchaseLedgerImportDto> salesLedgerProductImportDtoList = stringListMap.get("閲囪喘浜у搧鏁版嵁");
- if (CollectionUtils.isEmpty(salesLedgerProductImportDtoList)) return AjaxResult.error("閲囪喘浜у搧鏁版嵁涓虹┖锛�");
+ if (CollectionUtils.isEmpty(salesLedgerProductImportDtoList)) return R.fail("閲囪喘浜у搧鏁版嵁涓虹┖锛�");
// 渚涘簲鍟嗘暟鎹�
List<SupplierManage> customers = supplierManageMapper.selectList(new LambdaQueryWrapper<SupplierManage>().in(SupplierManage::getSupplierName,
salesLedgerImportDtoList.stream().map(PurchaseLedgerImportDto::getSupplierName).collect(Collectors.toList())));
@@ -640,11 +640,11 @@
addApproveByPurchase(loginUser,salesLedger);
}
- return AjaxResult.success("瀵煎叆鎴愬姛");
+ return R.ok(null, "瀵煎叆鎴愬姛");
} catch (Exception e) {
e.printStackTrace();
}
- return AjaxResult.success("瀵煎叆澶辫触");
+ return R.ok(null, "瀵煎叆澶辫触");
}
@Override
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
index fcaceb6..0319071 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityInspectController.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.quality.dto.QualityInspectDto;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityInspectFile;
@@ -37,8 +37,8 @@
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody QualityInspectDto qualityInspectDto) {
- return AjaxResult.success(qualityInspectService.add(qualityInspectDto));
+ public R<?> add(@RequestBody QualityInspectDto qualityInspectDto) {
+ return R.ok(qualityInspectService.add(qualityInspectDto));
}
/**
@@ -48,9 +48,9 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult delQualityInspect(@RequestBody List<Integer> ids) {
+ public R<?> delQualityInspect(@RequestBody List<Integer> ids) {
if (CollectionUtils.isEmpty(ids)) {
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
//濡傛灉宸茬粡鎻愪氦灏变笉鍏佽鍒犻櫎
List<QualityInspect> qualityInspects = qualityInspectService.listByIds(ids);
@@ -66,7 +66,7 @@
qualityInspectFileService.remove(Wrappers.<QualityInspectFile>lambdaQuery()
.in(QualityInspectFile::getInspectId, ids));
//鍒犻櫎妫�楠屽崟
- return AjaxResult.success(qualityInspectService.removeBatchByIds(ids));
+ return R.ok(qualityInspectService.removeBatchByIds(ids));
}
/**
@@ -76,8 +76,8 @@
* @return
*/
@GetMapping("/{id}")
- public AjaxResult QualityInspectDetail(@PathVariable("id") Integer id) {
- return AjaxResult.success(qualityInspectService.getDetailById(id));
+ public R<?> QualityInspectDetail(@PathVariable("id") Integer id) {
+ return R.ok(qualityInspectService.getDetailById(id));
}
/**
@@ -87,8 +87,8 @@
* @return
*/
@PostMapping("/update")
- public AjaxResult update(@RequestBody QualityInspectDto qualityInspectDto) {
- return AjaxResult.success(qualityInspectService.updateQualityInspect(qualityInspectDto));
+ public R<?> update(@RequestBody QualityInspectDto qualityInspectDto) {
+ return R.ok(qualityInspectService.updateQualityInspect(qualityInspectDto));
}
/**
@@ -99,8 +99,8 @@
* @return
*/
@GetMapping("/listPage")
- public AjaxResult qualityInspectListPage(Page page, QualityInspectDto qualityInspect) {
- return AjaxResult.success(qualityInspectService.qualityInspectListPage(page, qualityInspect));
+ public R<?> qualityInspectListPage(Page page, QualityInspectDto qualityInspect) {
+ return R.ok(qualityInspectService.qualityInspectListPage(page, qualityInspect));
}
/**
@@ -121,8 +121,8 @@
* @return
*/
@PostMapping("/submit")
- public AjaxResult submit(@RequestBody QualityInspect qualityInspect) {
- return AjaxResult.success(qualityInspectService.submit(qualityInspect));
+ public R<?> submit(@RequestBody QualityInspect qualityInspect) {
+ return R.ok(qualityInspectService.submit(qualityInspect));
}
/**
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityInspectFileController.java b/src/main/java/com/ruoyi/quality/controller/QualityInspectFileController.java
index bc5df62..f32d87b 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityInspectFileController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityInspectFileController.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityInspectFile;
import com.ruoyi.quality.pojo.QualityInspectParam;
@@ -34,8 +34,8 @@
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody QualityInspectFile qualityInspectFile) {
- return AjaxResult.success(qualityInspectFileService.save(qualityInspectFile));
+ public R<?> add(@RequestBody QualityInspectFile qualityInspectFile) {
+ return R.ok(qualityInspectFileService.save(qualityInspectFile));
}
/**
@@ -44,12 +44,12 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
+ public R<?> delQualityUnqualified(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
//鍒犻櫎妫�楠岄檮浠�
- return AjaxResult.success(qualityInspectFileService.removeBatchByIds(ids));
+ return R.ok(qualityInspectFileService.removeBatchByIds(ids));
}
/**
@@ -59,8 +59,8 @@
* @return
*/
@GetMapping("/listPage")
- public AjaxResult qualityInspectFileListPage(Page page, QualityInspectFile qualityInspectFile) {
- return AjaxResult.success(qualityInspectFileService.qualityInspectFileListPage(page, qualityInspectFile));
+ public R<?> qualityInspectFileListPage(Page page, QualityInspectFile qualityInspectFile) {
+ return R.ok(qualityInspectFileService.qualityInspectFileListPage(page, qualityInspectFile));
}
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityInspectParamController.java b/src/main/java/com/ruoyi/quality/controller/QualityInspectParamController.java
index 263b201..b408be6 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityInspectParamController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityInspectParamController.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityInspectFile;
import com.ruoyi.quality.pojo.QualityInspectParam;
@@ -32,8 +32,8 @@
* @return
*/
@GetMapping("/{inspectId}")
- public AjaxResult QualityInspectParamDetail(@PathVariable("inspectId") Integer inspectId) {
- return AjaxResult.success(qualityInspectParamService.qualityInspectParamDetail(inspectId));
+ public R<?> QualityInspectParamDetail(@PathVariable("inspectId") Integer inspectId) {
+ return R.ok(qualityInspectParamService.qualityInspectParamDetail(inspectId));
}
@@ -43,8 +43,8 @@
* @return
*/
@PostMapping("/update")
- public AjaxResult update(@RequestBody List<QualityInspectParam> qualityInspectParams) {
- return AjaxResult.success(qualityInspectParamService.updateBatchById(qualityInspectParams));
+ public R<?> update(@RequestBody List<QualityInspectParam> qualityInspectParams) {
+ return R.ok(qualityInspectParamService.updateBatchById(qualityInspectParams));
}
/**
@@ -53,11 +53,11 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
+ public R<?> delQualityUnqualified(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return AjaxResult.success(qualityInspectParamService.removeBatchByIds(ids));
+ return R.ok(qualityInspectParamService.removeBatchByIds(ids));
}
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityReportController.java b/src/main/java/com/ruoyi/quality/controller/QualityReportController.java
index 4d005b0..9b1aaf4 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityReportController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityReportController.java
@@ -1,6 +1,6 @@
package com.ruoyi.quality.controller;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.quality.service.QualityReportService;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -30,8 +30,8 @@
*/
@Operation(summary = "鑾峰彇妫�楠岀粺璁℃暟鎹�")
@GetMapping("/getInspectStatistics")
- public AjaxResult getInspectStatistics() {
- return AjaxResult.success(qualityReportService.getInspectStatistics());
+ public R<?> getInspectStatistics() {
+ return R.ok(qualityReportService.getInspectStatistics());
}
/**
@@ -39,8 +39,8 @@
*/
@Operation(summary = "鑾峰彇鍚堟牸鐜囩粺璁℃暟鎹�")
@GetMapping("/getPassRateStatistics")
- public AjaxResult getPassRateStatistics() {
- return AjaxResult.success(qualityReportService.getPassRateStatistics());
+ public R<?> getPassRateStatistics() {
+ return R.ok(qualityReportService.getPassRateStatistics());
}
/**
@@ -48,8 +48,8 @@
*/
@Operation(summary = "鑾峰彇鏈堝害鍚堟牸鐜囩粺璁℃暟鎹�")
@GetMapping("/getMonthlyPassRateStatistics")
- public AjaxResult getMonthlyPassRateStatistics(@RequestParam("year") String year) {
- return AjaxResult.success(qualityReportService.getMonthlyPassRateStatistics(year));
+ public R<?> getMonthlyPassRateStatistics(@RequestParam("year") String year) {
+ return R.ok(qualityReportService.getMonthlyPassRateStatistics(year));
}
/**
@@ -57,8 +57,8 @@
*/
@Operation(summary = "鑾峰彇骞村害鎬诲悎鏍肩巼缁熻鏁版嵁")
@GetMapping("/getYearlyPassRateStatistics")
- public AjaxResult getYearlyPassRateStatistics(@RequestParam("year") String year) {
- return AjaxResult.success(qualityReportService.getYearlyPassRateStatistics(year));
+ public R<?> getYearlyPassRateStatistics(@RequestParam("year") String year) {
+ return R.ok(qualityReportService.getYearlyPassRateStatistics(year));
}
/**
@@ -66,8 +66,8 @@
*/
@Operation(summary = "鑾峰彇鏈堝害瀹屾垚鏄庣粏鏁版嵁")
@GetMapping("/getMonthlyCompletionDetails")
- public AjaxResult getMonthlyCompletionDetails(@RequestParam("year") String year) {
- return AjaxResult.success(qualityReportService.getMonthlyCompletionDetails(year));
+ public R<?> getMonthlyCompletionDetails(@RequestParam("year") String year) {
+ return R.ok(qualityReportService.getMonthlyCompletionDetails(year));
}
/**
@@ -75,8 +75,8 @@
*/
@Operation(summary = "鑾峰彇鐑偣妫�娴嬫寚鏍囩粺璁�")
@GetMapping("/getTopParameters")
- public AjaxResult getTopParameters(@RequestParam("modelType") Integer modelType) {
- return AjaxResult.success(qualityReportService.getTopParameters(modelType));
+ public R<?> getTopParameters(@RequestParam("modelType") Integer modelType) {
+ return R.ok(qualityReportService.getTopParameters(modelType));
}
}
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardBindingController.java b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardBindingController.java
index 539f3f7..c34f3ee 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardBindingController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardBindingController.java
@@ -1,6 +1,6 @@
package com.ruoyi.quality.controller;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.quality.pojo.QualityTestStandardBinding;
import com.ruoyi.quality.service.QualityTestStandardBindingService;
import lombok.AllArgsConstructor;
@@ -31,8 +31,8 @@
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody List<QualityTestStandardBinding> qualityTestStandardBindings) {
- return AjaxResult.success(qualityTestStandardBindingService.add(qualityTestStandardBindings));
+ public R<?> add(@RequestBody List<QualityTestStandardBinding> qualityTestStandardBindings) {
+ return R.ok(qualityTestStandardBindingService.add(qualityTestStandardBindings));
}
/**
@@ -42,11 +42,11 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult delQualityTestStandard(@RequestBody List<Integer> ids) {
+ public R<?> delQualityTestStandard(@RequestBody List<Integer> ids) {
if (CollectionUtils.isEmpty(ids)) {
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return AjaxResult.success(qualityTestStandardBindingService.removeBatchByIds(ids));
+ return R.ok(qualityTestStandardBindingService.removeBatchByIds(ids));
}
/**
@@ -55,8 +55,8 @@
* @return
*/
@GetMapping("/list")
- public AjaxResult listBinding(Long testStandardId) {
- return AjaxResult.success(qualityTestStandardBindingService.listBinding(testStandardId));
+ public R<?> listBinding(Long testStandardId) {
+ return R.ok(qualityTestStandardBindingService.listBinding(testStandardId));
}
}
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
index a61ffed..42aa2ea 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardController.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.quality.pojo.QualityTestStandard;
import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.quality.service.IQualityTestStandardService;
@@ -39,8 +39,8 @@
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody QualityTestStandard qualityTestStandard) {
- return AjaxResult.success(qualityTestStandardService.save(qualityTestStandard));
+ public R<?> add(@RequestBody QualityTestStandard qualityTestStandard) {
+ return R.ok(qualityTestStandardService.save(qualityTestStandard));
}
/**
@@ -49,11 +49,11 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult delQualityTestStandard(@RequestBody List<Integer> ids) {
+ public R<?> delQualityTestStandard(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return AjaxResult.success(qualityTestStandardService.delQualityTestStandard(ids));
+ return R.ok(qualityTestStandardService.delQualityTestStandard(ids));
}
/**
@@ -62,8 +62,8 @@
* @return
*/
@PostMapping("/update")
- public AjaxResult update(@RequestBody QualityTestStandard qualityTestStandard) {
- return AjaxResult.success(qualityTestStandardService.updateById(qualityTestStandard));
+ public R<?> update(@RequestBody QualityTestStandard qualityTestStandard) {
+ return R.ok(qualityTestStandardService.updateById(qualityTestStandard));
}
/**
@@ -73,8 +73,8 @@
* @return
*/
@GetMapping("/listPage")
- public AjaxResult qualityTestStandardListPage(Page page, QualityTestStandard qualityTestStandard) {
- return AjaxResult.success(qualityTestStandardService.qualityTestStandardListPage(page, qualityTestStandard));
+ public R<?> qualityTestStandardListPage(Page page, QualityTestStandard qualityTestStandard) {
+ return R.ok(qualityTestStandardService.qualityTestStandardListPage(page, qualityTestStandard));
}
/**
@@ -83,8 +83,8 @@
* @return
*/
@PostMapping("/copyParam")
- public AjaxResult copyParam(@RequestBody QualityTestStandard qualityTestStandard) {
- return AjaxResult.success(qualityTestStandardService.copyParam(qualityTestStandard));
+ public R<?> copyParam(@RequestBody QualityTestStandard qualityTestStandard) {
+ return R.ok(qualityTestStandardService.copyParam(qualityTestStandard));
}
/**
@@ -93,8 +93,8 @@
* @return
*/
@PostMapping("/qualityTestStandardAudit")
- public AjaxResult qualityTestStandardAudit(@RequestBody List<QualityTestStandard> qualityTestStandards) {
- return AjaxResult.success(qualityTestStandardService.updateBatchById(qualityTestStandards));
+ public R<?> qualityTestStandardAudit(@RequestBody List<QualityTestStandard> qualityTestStandards) {
+ return R.ok(qualityTestStandardService.updateBatchById(qualityTestStandards));
}
/**
@@ -102,8 +102,8 @@
* @return
*/
@GetMapping("/getQualityTestStandardByProductId")
- public AjaxResult getQualityTestStandardByProductId(@Nonnull Long productId, @Nonnull Integer inspectType, String process) {
- return AjaxResult.success(qualityTestStandardService.getQualityTestStandardByProductId(productId,inspectType,process));
+ public R<?> getQualityTestStandardByProductId(@Nonnull Long productId, @Nonnull Integer inspectType, String process) {
+ return R.ok(qualityTestStandardService.getQualityTestStandardByProductId(productId,inspectType,process));
}
/**
@@ -111,8 +111,8 @@
* @return
*/
@GetMapping("/getQualityTestStandardParamByTestStandardId")
- public AjaxResult getQualityTestStandardParamByTestStandardId(Long testStandardId) {
- return AjaxResult.success(qualityTestStandardParamService.list(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId, testStandardId)));
+ public R<?> getQualityTestStandardParamByTestStandardId(Long testStandardId) {
+ return R.ok(qualityTestStandardParamService.list(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId, testStandardId)));
}
}
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardParamController.java b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardParamController.java
index e5c883c..44dc0cd 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityTestStandardParamController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityTestStandardParamController.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.quality.pojo.QualityTestStandard;
import com.ruoyi.quality.pojo.QualityTestStandardParam;
import com.ruoyi.quality.service.QualityTestStandardParamService;
@@ -34,8 +34,8 @@
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody QualityTestStandardParam qualityTestStandardParam) {
- return AjaxResult.success(qualityTestStandardParamService.save(qualityTestStandardParam));
+ public R<?> add(@RequestBody QualityTestStandardParam qualityTestStandardParam) {
+ return R.ok(qualityTestStandardParamService.save(qualityTestStandardParam));
}
/**
@@ -44,11 +44,11 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult delQualityTestStandard(@RequestBody List<Integer> ids) {
+ public R<?> delQualityTestStandard(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return AjaxResult.success(qualityTestStandardParamService.removeBatchByIds(ids));
+ return R.ok(qualityTestStandardParamService.removeBatchByIds(ids));
}
/**
@@ -57,8 +57,8 @@
* @return
*/
@PostMapping("/update")
- public AjaxResult update(@RequestBody QualityTestStandardParam qualityTestStandardParam) {
- return AjaxResult.success(qualityTestStandardParamService.updateById(qualityTestStandardParam));
+ public R<?> update(@RequestBody QualityTestStandardParam qualityTestStandardParam) {
+ return R.ok(qualityTestStandardParamService.updateById(qualityTestStandardParam));
}
/**
@@ -66,8 +66,8 @@
* @return
*/
@GetMapping("/list")
- public AjaxResult list(Long testStandardId) {
- return AjaxResult.success(qualityTestStandardParamService.list(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId,testStandardId)));
+ public R<?> list(Long testStandardId) {
+ return R.ok(qualityTestStandardParamService.list(Wrappers.<QualityTestStandardParam>lambdaQuery().eq(QualityTestStandardParam::getTestStandardId,testStandardId)));
}
}
diff --git a/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java b/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
index 3b20f82..33c6005 100644
--- a/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
+++ b/src/main/java/com/ruoyi/quality/controller/QualityUnqualifiedController.java
@@ -1,7 +1,7 @@
package com.ruoyi.quality.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.quality.pojo.QualityUnqualified;
import com.ruoyi.quality.service.IQualityUnqualifiedService;
import org.springframework.util.CollectionUtils;
@@ -28,9 +28,9 @@
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody QualityUnqualified qualityUnqualified) {
+ public R<?> add(@RequestBody QualityUnqualified qualityUnqualified) {
qualityUnqualified.setInspectState(0);
- return AjaxResult.success(qualityUnqualifiedService.save(qualityUnqualified));
+ return R.ok(qualityUnqualifiedService.save(qualityUnqualified));
}
/**
@@ -39,13 +39,13 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult delQualityUnqualified(@RequestBody List<Integer> ids) {
+ public R<?> delQualityUnqualified(@RequestBody List<Integer> ids) {
qualityUnqualifiedService.listByIds(ids).stream().forEach(qualityUnqualified -> {
if (qualityUnqualified.getInspectState()==1){
throw new RuntimeException("璇ヤ笉鍚堟牸鏁版嵁宸茬粡澶勭悊鏃犳硶鍒犻櫎!");
}
});
- return AjaxResult.success(qualityUnqualifiedService.removeBatchByIds(ids));
+ return R.ok(qualityUnqualifiedService.removeBatchByIds(ids));
}
/**
@@ -54,8 +54,8 @@
* @return
*/
@GetMapping("/{id}")
- public AjaxResult QualityUnqualifiedDetail(@PathVariable("id") Integer id) {
- return AjaxResult.success(qualityUnqualifiedService.getUnqualified(id));
+ public R<?> QualityUnqualifiedDetail(@PathVariable("id") Integer id) {
+ return R.ok(qualityUnqualifiedService.getUnqualified(id));
}
/**
@@ -64,8 +64,8 @@
* @return
*/
@PostMapping("/update")
- public AjaxResult update(@RequestBody QualityUnqualified qualityUnqualified) {
- return AjaxResult.success(qualityUnqualifiedService.updateById(qualityUnqualified));
+ public R<?> update(@RequestBody QualityUnqualified qualityUnqualified) {
+ return R.ok(qualityUnqualifiedService.updateById(qualityUnqualified));
}
/**
@@ -75,8 +75,8 @@
* @return
*/
@GetMapping("/listPage")
- public AjaxResult qualityUnqualifiedListPage(Page page, QualityUnqualified qualityUnqualified) {
- return AjaxResult.success(qualityUnqualifiedService.qualityUnqualifiedListPage(page, qualityUnqualified));
+ public R<?> qualityUnqualifiedListPage(Page page, QualityUnqualified qualityUnqualified) {
+ return R.ok(qualityUnqualifiedService.qualityUnqualifiedListPage(page, qualityUnqualified));
}
/**
@@ -95,8 +95,8 @@
* @return
*/
@PostMapping("/deal")
- public AjaxResult deal(@RequestBody QualityUnqualified qualityUnqualified) {
- return AjaxResult.success(qualityUnqualifiedService.deal(qualityUnqualified));
+ public R<?> deal(@RequestBody QualityUnqualified qualityUnqualified) {
+ return R.ok(qualityUnqualifiedService.deal(qualityUnqualified));
}
diff --git a/src/main/java/com/ruoyi/sales/controller/CommonFileController.java b/src/main/java/com/ruoyi/sales/controller/CommonFileController.java
index 37266a8..c97a55a 100644
--- a/src/main/java/com/ruoyi/sales/controller/CommonFileController.java
+++ b/src/main/java/com/ruoyi/sales/controller/CommonFileController.java
@@ -3,7 +3,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.sales.service.ICommonFileService;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.DeleteMapping;
@@ -26,11 +26,12 @@
*/
@Log(title = "闄勪欢鍒犻櫎", businessType = BusinessType.DELETE)
@DeleteMapping("/delCommonFile")
- public AjaxResult delCommonFile(@RequestBody Long[] ids) {
+ public R<?> delCommonFile(@RequestBody Long[] ids) {
if (ids == null || ids.length == 0) {
- return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
- return toAjax(commonFileService.delCommonFileByIds(ids));
+ commonFileService.delCommonFileByIds(ids);
+ return R.ok();
}
public void migrateTempFilesToFormal(Long businessId, List<String> tempFileIds) throws IOException{
diff --git a/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java b/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java
index 0559ff8..3b4f493 100644
--- a/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java
@@ -3,7 +3,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.dto.InvoiceRegistrationProductDto;
import com.ruoyi.sales.mapper.InvoiceLedgerFileMapper;
@@ -20,7 +21,7 @@
@RestController
@RequestMapping("/invoiceLedger")
@AllArgsConstructor
-public class InvoiceLedgerController {
+public class InvoiceLedgerController extends BaseController {
private InvoiceLedgerService invoiceLedgerService;
private InvoiceLedgerFileMapper invoiceLedgerFileMapper;
@@ -31,9 +32,9 @@
* @return
*/
@PostMapping("/saveOrUpdate")
- public AjaxResult invoiceLedgerSaveOrUpdate(@RequestBody InvoiceRegistrationProductDto productDto) {
+ public R<?> invoiceLedgerSaveOrUpdate(@RequestBody InvoiceRegistrationProductDto productDto) {
invoiceLedgerService.invoiceLedgerSaveOrUpdate(productDto);
- return AjaxResult.success();
+ return R.ok();
}
/**
@@ -42,9 +43,9 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult invoiceLedgerDel(@RequestBody List<Integer> ids) {
+ public R<?> invoiceLedgerDel(@RequestBody List<Integer> ids) {
invoiceLedgerService.invoiceLedgerDel(ids);
- return AjaxResult.success();
+ return R.ok();
}
/**
@@ -54,8 +55,8 @@
* @return
*/
@GetMapping("/page")
- public AjaxResult invoiceLedgerPage(Page page, InvoiceLedgerDto invoiceLedgerDto) {
- return AjaxResult.success(invoiceLedgerService.invoiceLedgerPage(page, invoiceLedgerDto));
+ public R<?> invoiceLedgerPage(Page page, InvoiceLedgerDto invoiceLedgerDto) {
+ return R.ok(invoiceLedgerService.invoiceLedgerPage(page, invoiceLedgerDto));
}
/**
@@ -64,8 +65,8 @@
* @return
*/
@GetMapping("/fileList")
- public AjaxResult invoiceLedgerFileList(Integer invoiceLedgerId) {
- return AjaxResult.success(invoiceLedgerService.invoiceLedgerFileList(invoiceLedgerId));
+ public R<?> invoiceLedgerFileList(Integer invoiceLedgerId) {
+ return R.ok(invoiceLedgerService.invoiceLedgerFileList(invoiceLedgerId));
}
/**
@@ -73,10 +74,10 @@
*/
@DeleteMapping("/delFile")
@Log(title = "寮�绁ㄥ彴璐�", businessType = BusinessType.DELETE)
- public AjaxResult invoiceLedgerDelFile(@RequestBody List<Integer> ids) {
- if(Collections.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨瑕佸垹闄ょ殑鏂囦欢");
+ public R<?> invoiceLedgerDelFile(@RequestBody List<Integer> ids) {
+ if(Collections.isEmpty(ids)) return R.fail("璇烽�夋嫨瑕佸垹闄ょ殑鏂囦欢");
invoiceLedgerFileMapper.deleteBatchIds(ids);
- return AjaxResult.success();
+ return R.ok();
}
@@ -87,11 +88,11 @@
* @return
*/
@PostMapping("/uploadFile")
- public AjaxResult invoiceLedgerUploadFile(MultipartFile file) {
+ public R<?> invoiceLedgerUploadFile(MultipartFile file) {
try {
- return AjaxResult.success(invoiceLedgerService.invoiceLedgerUploadFile(file));
+ return R.ok(invoiceLedgerService.invoiceLedgerUploadFile(file));
}catch (Exception e) {
- return AjaxResult.error(e.getMessage());
+ return R.fail(e.getMessage());
}
}
@@ -112,8 +113,8 @@
* @return
*/
@GetMapping("/info")
- public AjaxResult invoiceLedgerInfo(Integer id) {
- return AjaxResult.success(invoiceLedgerService.invoiceLedgerDetail(id));
+ public R<?> invoiceLedgerInfo(Integer id) {
+ return R.ok(invoiceLedgerService.invoiceLedgerDetail(id));
}
/**
@@ -122,12 +123,12 @@
* @return
*/
@PostMapping("/commitFile")
- public AjaxResult invoiceLedgerCommitFile(@RequestBody InvoiceLedgerDto invoiceLedgerDto) {
+ public R<?> invoiceLedgerCommitFile(@RequestBody InvoiceLedgerDto invoiceLedgerDto) {
try {
invoiceLedgerService.invoiceLedgerCommitFile(invoiceLedgerDto);
- return AjaxResult.success();
+ return R.ok();
}catch (Exception e) {
- return AjaxResult.error(e.getMessage());
+ return R.fail(e.getMessage());
}
}
@@ -137,8 +138,8 @@
* @return
*/
@GetMapping("/list")
- public AjaxResult invoiceLedgerList(InvoiceLedgerDto invoiceLedgerDto) {
- return AjaxResult.success(invoiceLedgerService.invoiceLedgerList(invoiceLedgerDto));
+ public R<?> invoiceLedgerList(InvoiceLedgerDto invoiceLedgerDto) {
+ return R.ok(invoiceLedgerService.invoiceLedgerList(invoiceLedgerDto));
}
/**
@@ -148,20 +149,20 @@
* @return
*/
@GetMapping("/salesAccount")
- public AjaxResult invoiceLedgerSalesAccount(Page page, InvoiceLedgerDto invoiceLedgerDto) {
- return AjaxResult.success(invoiceLedgerService.invoiceLedgerSalesAccount(page,invoiceLedgerDto));
+ public R<?> invoiceLedgerSalesAccount(Page page, InvoiceLedgerDto invoiceLedgerDto) {
+ return R.ok(invoiceLedgerService.invoiceLedgerSalesAccount(page,invoiceLedgerDto));
}
/**
* 鏈湀寮�绁ㄩ噾棰�
*/
@GetMapping("/getInvoiceAmount")
- public AjaxResult getInvoiceAmount() {
+ public R<?> getInvoiceAmount() {
try {
BigDecimal amount = invoiceLedgerService.getInvoiceAmount();
- return AjaxResult.success(amount != null ? amount : BigDecimal.ZERO);
+ return R.ok(amount != null ? amount : BigDecimal.ZERO);
} catch (Exception e) {
- return AjaxResult.error("鑾峰彇寮�绁ㄩ噾棰濆け璐ワ細" + e.getMessage());
+ return R.fail("鑾峰彇寮�绁ㄩ噾棰濆け璐ワ細" + e.getMessage());
}
}
@@ -172,9 +173,9 @@
* @return
*/
@GetMapping("/registrationProductPage")
- public AjaxResult registrationProductPage(Page page, InvoiceRegistrationProductDto registrationProductDto) {
+ public R<?> registrationProductPage(Page page, InvoiceRegistrationProductDto registrationProductDto) {
- return AjaxResult.success(invoiceLedgerService.registrationProductPage(page,registrationProductDto));
+ return R.ok(invoiceLedgerService.registrationProductPage(page,registrationProductDto));
}
/**
@@ -183,8 +184,8 @@
* @return
*/
@GetMapping("/invoiceLedgerProductInfo")
- public AjaxResult invoiceLedgerProductDetail(Integer id) {
- return AjaxResult.success(invoiceLedgerService.invoiceLedgerProductDetail(id));
+ public R<?> invoiceLedgerProductDetail(Integer id) {
+ return R.ok(invoiceLedgerService.invoiceLedgerProductDetail(id));
}
/**
@@ -193,12 +194,12 @@
* @return
*/
@DeleteMapping("delInvoiceLedger/{invoiceRegistrationProductId}")
- public AjaxResult delInvoiceLedger(@PathVariable Integer invoiceRegistrationProductId) {
+ public R<?> delInvoiceLedger(@PathVariable Integer invoiceRegistrationProductId) {
try {
invoiceLedgerService.delInvoiceLedger(invoiceRegistrationProductId);
- return AjaxResult.success();
+ return R.ok();
}catch (Exception e) {
- return AjaxResult.error(e.getMessage());
+ return R.fail(e.getMessage());
}
}
diff --git a/src/main/java/com/ruoyi/sales/controller/InvoiceRegistrationController.java b/src/main/java/com/ruoyi/sales/controller/InvoiceRegistrationController.java
index 8ea6c11..09447b1 100644
--- a/src/main/java/com/ruoyi/sales/controller/InvoiceRegistrationController.java
+++ b/src/main/java/com/ruoyi/sales/controller/InvoiceRegistrationController.java
@@ -2,7 +2,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.sales.dto.InvoiceRegistrationDto;
import com.ruoyi.sales.dto.InvoiceRegistrationProductDto;
import com.ruoyi.sales.dto.SalesLedgerDto;
@@ -18,7 +19,7 @@
@RestController
@RequestMapping("/invoiceRegistration")
@AllArgsConstructor
-public class InvoiceRegistrationController {
+public class InvoiceRegistrationController extends BaseController {
private InvoiceRegistrationService invoiceRegistrationService;
@@ -30,13 +31,13 @@
@PostMapping("/save")
@Log(title = "寮�绁ㄧ櫥璁�", businessType = com.ruoyi.framework.aspectj.lang.enums.BusinessType.INSERT)
@Transactional(rollbackFor = Exception.class)
- public AjaxResult invoiceRegistrationSave(@RequestBody List<SalesLedgerDto> salesLedgerDto) {
- if(Collections.isEmpty(salesLedgerDto)) return AjaxResult.error("璇烽�夋嫨瑕佷繚瀛樼殑璁板綍");
+ public R<?> invoiceRegistrationSave(@RequestBody List<SalesLedgerDto> salesLedgerDto) {
+ if(Collections.isEmpty(salesLedgerDto)) return R.fail("璇烽�夋嫨瑕佷繚瀛樼殑璁板綍");
salesLedgerDto.forEach(item ->{
invoiceRegistrationService.invoiceRegistrationSave(item);
});
- return AjaxResult.success();
+ return R.ok();
}
/**
@@ -45,9 +46,9 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult invoiceRegistrationDel(@RequestBody List<Integer> ids) {
+ public R<?> invoiceRegistrationDel(@RequestBody List<Integer> ids) {
invoiceRegistrationService.invoiceRegistrationDel(ids);
- return AjaxResult.success();
+ return R.ok();
}
/**
@@ -56,9 +57,9 @@
* @return
*/
@PostMapping("/update")
- public AjaxResult invoiceRegistrationUpdate(@RequestBody InvoiceRegistrationDto invoiceRegistrationDto) {
+ public R<?> invoiceRegistrationUpdate(@RequestBody InvoiceRegistrationDto invoiceRegistrationDto) {
invoiceRegistrationService.invoiceRegistrationUpdate(invoiceRegistrationDto);
- return AjaxResult.success();
+ return R.ok();
}
/**
@@ -68,8 +69,8 @@
* @return
*/
@GetMapping("/listPage")
- public AjaxResult invoiceRegistrationListPage(Page page, InvoiceRegistrationDto invoiceRegistrationDto) {
- return AjaxResult.success(invoiceRegistrationService.invoiceRegistrationListPage(page, invoiceRegistrationDto));
+ public R<?> invoiceRegistrationListPage(Page page, InvoiceRegistrationDto invoiceRegistrationDto) {
+ return R.ok(invoiceRegistrationService.invoiceRegistrationListPage(page, invoiceRegistrationDto));
}
/**
@@ -78,8 +79,8 @@
* @return
*/
@GetMapping("/productList")
- public AjaxResult invoiceRegistrationProductList(InvoiceRegistrationProductDto invoiceRegistrationProductDto) {
- return AjaxResult.success(invoiceRegistrationService.invoiceRegistrationProductList(invoiceRegistrationProductDto));
+ public R<?> invoiceRegistrationProductList(InvoiceRegistrationProductDto invoiceRegistrationProductDto) {
+ return R.ok(invoiceRegistrationService.invoiceRegistrationProductList(invoiceRegistrationProductDto));
}
/**
@@ -88,8 +89,8 @@
* @return
*/
@GetMapping("/detail")
- public AjaxResult invoiceRegistrationDetail(Integer id) {
- return AjaxResult.success(invoiceRegistrationService.invoiceRegistrationDetail(id));
+ public R<?> invoiceRegistrationDetail(Integer id) {
+ return R.ok(invoiceRegistrationService.invoiceRegistrationDetail(id));
}
/**
diff --git a/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java b/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java
index 8ad4f02..5f58c0d 100644
--- a/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java
+++ b/src/main/java/com/ruoyi/sales/controller/MetricStatisticsController.java
@@ -1,7 +1,7 @@
package com.ruoyi.sales.controller;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.sales.dto.StatisticsTableDto;
import com.ruoyi.sales.service.impl.MetricStatisticsServiceImpl;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -25,13 +25,13 @@
@Operation(summary = "澶撮儴鎬昏")
@GetMapping("/total")
- public AjaxResult total() {
+ public R<?> total() {
return metricStatisticsService.total();
}
@Operation(summary = "缁熻琛�")
@GetMapping("/statisticsTable")
- public AjaxResult statisticsTable(StatisticsTableDto statisticsTableDto) {
+ public R<?> statisticsTable(StatisticsTableDto statisticsTableDto) {
return metricStatisticsService.statisticsTable(statisticsTableDto);
}
diff --git a/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java b/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
index f88a0e6..ce70940 100644
--- a/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
+++ b/src/main/java/com/ruoyi/sales/controller/PaymentShippingController.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.sales.mapper.PaymentShippingMapper;
import com.ruoyi.sales.pojo.PaymentShipping;
import com.ruoyi.sales.service.PaymentShippingService;
@@ -32,37 +32,37 @@
@GetMapping("/listPage")
@Operation(summary = "鍒嗛〉鏌ヨ鏀粯涓庡彂璐т俊鎭�")
- public AjaxResult listPage(Page page, PaymentShipping paymentShipping) {
+ public R<?> listPage(Page page, PaymentShipping paymentShipping) {
IPage<PaymentShipping> listPage = paymentShippingService.listPage(page, paymentShipping);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
}
@PostMapping("/add")
@Operation(summary = "娣诲姞鏀粯涓庡彂璐т俊鎭�")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult add(@RequestBody PaymentShipping paymentShipping) {
+ public R<?> add(@RequestBody PaymentShipping paymentShipping) {
String ord = OrderUtils.countTodayByCreateTime(paymentShippingMapper, "ORD","order_no");
paymentShipping.setOrderNo(ord);
boolean save = paymentShippingService.save(paymentShipping);
- return save ? success() : error();
+ return save ? R.ok() : R.fail();
}
@PostMapping("/update")
@Operation(summary = "淇敼鏀粯涓庡彂璐т俊鎭�")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult update(@RequestBody PaymentShipping paymentShipping) {
+ public R<?> update(@RequestBody PaymentShipping paymentShipping) {
boolean update = paymentShippingService.updateById(paymentShipping);
- return update ? success() : error();
+ return update ? R.ok() : R.fail();
}
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎鏀粯涓庡彂璐т俊鎭�")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult delete(@RequestBody List<Long> ids){
+ public R<?> delete(@RequestBody List<Long> ids){
if (CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
- return AjaxResult.success(paymentShippingService.removeByIds(ids));
+ return R.ok(paymentShippingService.removeByIds(ids));
}
}
diff --git a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
index 5512a8d..7d91849 100644
--- a/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ReceiptPaymentController.java
@@ -7,7 +7,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.sales.dto.InvoiceLedgerDto;
import com.ruoyi.sales.dto.ReceiptPaymentDto;
@@ -39,9 +39,9 @@
* @return
*/
@PostMapping("/saveOrUpdate")
- public AjaxResult receiptPaymentSaveOrUpdate (@RequestBody List<ReceiptPayment> receiptPayment) {
+ public R<?> receiptPaymentSaveOrUpdate (@RequestBody List<ReceiptPayment> receiptPayment) {
receiptPaymentService.receiptPaymentSaveOrUpdate(receiptPayment);
- return AjaxResult.success();
+ return R.ok();
}
/**
@@ -51,8 +51,8 @@
*/
@PostMapping("/update")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult receiptPaymentUpdate (@RequestBody ReceiptPayment receiptPayment) {
- return AjaxResult.success(receiptPaymentService.receiptPaymentUpdate(receiptPayment));
+ public R<?> receiptPaymentUpdate (@RequestBody ReceiptPayment receiptPayment) {
+ return R.ok(receiptPaymentService.receiptPaymentUpdate(receiptPayment));
}
/**
@@ -62,8 +62,8 @@
*/
@DeleteMapping("/del")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult receiptPaymentDel (@RequestBody List<Integer> ids) {
- return AjaxResult.success(receiptPaymentService.receiptPaymentDel(ids));
+ public R<?> receiptPaymentDel (@RequestBody List<Integer> ids) {
+ return R.ok(receiptPaymentService.receiptPaymentDel(ids));
}
/**
@@ -72,8 +72,8 @@
* @return
*/
@GetMapping("/customerInteractions")
- public AjaxResult customerInteractions (InvoiceLedgerDto receiptPaymentDto) {
- return AjaxResult.success(receiptPaymentService.customerInteractions(receiptPaymentDto));
+ public R<?> customerInteractions (InvoiceLedgerDto receiptPaymentDto) {
+ return R.ok(receiptPaymentService.customerInteractions(receiptPaymentDto));
}
/**
@@ -82,20 +82,20 @@
* @return
*/
@GetMapping("/info")
- public AjaxResult receiptPaymentInfo (Integer id) {
- return AjaxResult.success(receiptPaymentService.receiptPaymentInfo(id));
+ public R<?> receiptPaymentInfo (Integer id) {
+ return R.ok(receiptPaymentService.receiptPaymentInfo(id));
}
/**
* 鏈湀鍥炴閲戦
*/
@GetMapping("/getReceiptAmount")
- public AjaxResult getReceiptAmount() {
+ public R<?> getReceiptAmount() {
try {
BigDecimal receiptAmount = receiptPaymentService.getReceiptAmount();
- return AjaxResult.success(receiptAmount != null ? receiptAmount : BigDecimal.ZERO);
+ return R.ok(receiptAmount != null ? receiptAmount : BigDecimal.ZERO);
} catch (Exception e) {
- return AjaxResult.error("鑾峰彇鍥炴閲戦澶辫触锛�" + e.getMessage());
+ return R.fail("鑾峰彇鍥炴閲戦澶辫触锛�" + e.getMessage());
}
}
@@ -106,8 +106,8 @@
* @return
*/
@GetMapping("/bindInvoiceNoRegPage")
- public AjaxResult bindInvoiceNoRegPage(Page page, ReceiptPaymentDto receiptPaymentDto) {
- return AjaxResult.success(receiptPaymentService.bindInvoiceNoRegPage(page,receiptPaymentDto));
+ public R<?> bindInvoiceNoRegPage(Page page, ReceiptPaymentDto receiptPaymentDto) {
+ return R.ok(receiptPaymentService.bindInvoiceNoRegPage(page,receiptPaymentDto));
}
@Schema(description = "瀵煎嚭鍥炴鐧昏")
@@ -131,16 +131,16 @@
* @return
*/
@GetMapping("/invoiceInfo")
- public AjaxResult invoiceInfo (Integer id) {
- return AjaxResult.success(receiptPaymentService.invoiceInfo(id));
+ public R<?> invoiceInfo (Integer id) {
+ return R.ok(receiptPaymentService.invoiceInfo(id));
}
/**
* 鏈湀搴旀敹,鍥炴閲戦
*/
@GetMapping("/getAmountMouth")
- public AjaxResult getAmountMouth() {
- return AjaxResult.success(receiptPaymentService.getAmountMouth());
+ public R<?> getAmountMouth() {
+ return R.ok(receiptPaymentService.getAmountMouth());
}
/**
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
index ceb3702..dfca752 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -10,7 +10,6 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.framework.web.page.TableDataInfo;
import com.ruoyi.sales.dto.InvoiceLedgerDto;
@@ -67,7 +66,7 @@
@Log(title = "瀵煎叆閿�鍞彴璐�", businessType = BusinessType.INSERT)
@PostMapping("/import")
@Operation(summary = "瀵煎叆閿�鍞彴璐�")
- public AjaxResult importData(@RequestParam("file")
+ public R<?> importData(@RequestParam("file")
@ApiParam(value = "Excel鏂囦欢", required = true)
MultipartFile file) {
return salesLedgerService.importData(file);
@@ -183,8 +182,9 @@
*/
@Log(title = "閿�鍞彴璐�", businessType = BusinessType.INSERT)
@PostMapping("/addOrUpdateSalesLedger")
- public AjaxResult add(@RequestBody SalesLedgerDto salesLedgerDto) {
- return toAjax(salesLedgerService.addOrUpdateSalesLedger(salesLedgerDto));
+ public R<?> add(@RequestBody SalesLedgerDto salesLedgerDto) {
+ salesLedgerService.addOrUpdateSalesLedger(salesLedgerDto);
+ return R.ok();
}
/**
@@ -192,11 +192,12 @@
*/
@Log(title = "閿�鍞彴璐�", businessType = BusinessType.DELETE)
@DeleteMapping("/delLedger")
- public AjaxResult remove(@RequestBody Long[] ids) {
+ public R<?> remove(@RequestBody Long[] ids) {
if (ids == null || ids.length == 0) {
- return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
- return toAjax(salesLedgerService.deleteSalesLedgerByIds(ids));
+ salesLedgerService.deleteSalesLedgerByIds(ids);
+ return R.ok();
}
/**
@@ -206,9 +207,9 @@
* @return
*/
@GetMapping("/listNoPage")
- public AjaxResult listNoPage(SalesLedgerDto salesLedgerDto) {
+ public R<?> listNoPage(SalesLedgerDto salesLedgerDto) {
List<SalesLedger> list = salesLedgerService.selectSalesLedgerList(salesLedgerDto);
- return AjaxResult.success(list);
+ return R.ok(list);
}
/**
@@ -216,23 +217,24 @@
*/
@Log(title = "閿�鍞彴璐﹂檮浠跺垹闄�", businessType = BusinessType.DELETE)
@DeleteMapping("/delLedgerFile")
- public AjaxResult delLedgerFile(@RequestBody Long[] ids) {
+ public R<?> delLedgerFile(@RequestBody Long[] ids) {
if (ids == null || ids.length == 0) {
- return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
- return toAjax(commonFileService.deleteSalesLedgerByIds(ids));
+ commonFileService.deleteSalesLedgerByIds(ids);
+ return R.ok();
}
/**
* 鏈湀閿�鍞悎鍚岄噾棰�
*/
@GetMapping("/getContractAmount")
- public AjaxResult getContractAmount() {
+ public R<?> getContractAmount() {
try {
BigDecimal contractAmount = salesLedgerService.getContractAmount();
- return AjaxResult.success(contractAmount != null ? contractAmount : BigDecimal.ZERO);
+ return R.ok(contractAmount != null ? contractAmount : BigDecimal.ZERO);
} catch (Exception e) {
- return AjaxResult.error("鑾峰彇鍚堝悓閲戦澶辫触锛�" + e.getMessage());
+ return R.fail("鑾峰彇鍚堝悓閲戦澶辫触锛�" + e.getMessage());
}
}
@@ -240,16 +242,16 @@
* 瀹㈡埛鍚堝悓閲戦TOP5缁熻
*/
@GetMapping("/getTopFiveList")
- public AjaxResult getTopFiveList() {
- return AjaxResult.success(salesLedgerService.getTopFiveList());
+ public R<?> getTopFiveList() {
+ return R.ok(salesLedgerService.getTopFiveList());
}
/**
* 杩戝崐骞村紑绁�,鍥炴閲戦
*/
@GetMapping("/getAmountHalfYear")
- public AjaxResult getAmountHalfYear(@RequestParam(value = "type",defaultValue = "1") Integer type) {
- return AjaxResult.success(salesLedgerService.getAmountHalfYear(type));
+ public R<?> getAmountHalfYear(@RequestParam(value = "type",defaultValue = "1") Integer type) {
+ return R.ok(salesLedgerService.getAmountHalfYear(type));
}
/**
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
index 9485919..f487aea 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesLedgerProductController.java
@@ -7,7 +7,6 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.procurementrecord.service.ProcurementRecordService;
import com.ruoyi.procurementrecord.utils.StockUtils;
@@ -46,9 +45,9 @@
* 鍥炴鐧昏鍒嗛〉鏌ヨ
*/
@GetMapping("/listPageSalesLedger")
- public AjaxResult listPage(Page page, SalesLedgerProductDto salesLedgerProduct) {
+ public R<?> listPageSalesLedger(Page page, SalesLedgerProductDto salesLedgerProduct) {
IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPage(page,salesLedgerProduct);
- return AjaxResult.success(list);
+ return R.ok(list);
}
@@ -56,9 +55,9 @@
* 浠樻鐧昏鍒嗛〉鏌ヨ
*/
@GetMapping("/listPagePurchaseLedger")
- public AjaxResult listPagePurchaseLedger(Page page, SalesLedgerProductDto salesLedgerProduct) {
+ public R<?> listPagePurchaseLedger(Page page, SalesLedgerProductDto salesLedgerProduct) {
IPage<SalesLedgerProductDto> list = salesLedgerProductService.listPagePurchaseLedger(page,salesLedgerProduct);
- return AjaxResult.success(list);
+ return R.ok(list);
}
@@ -66,10 +65,10 @@
* 鏌ヨ浜у搧淇℃伅鍒楄〃
*/
@GetMapping("/list")
- public AjaxResult list(SalesLedgerProduct salesLedgerProduct) {
+ public R<?> list(SalesLedgerProduct salesLedgerProduct) {
List<SalesLedgerProduct> list = salesLedgerProductService.selectSalesLedgerProductList(salesLedgerProduct);
if (CollUtil.isEmpty(list)) {
- return AjaxResult.success(list);
+ return R.ok(list);
}
List<Long> productIds = list.stream().map(SalesLedgerProduct::getProductModelId).collect(Collectors.toList());
List<SimpleReturnOrderGroupDto> groupListByProductIds = purchaseReturnOrderProductsMapper.getReturnOrderGroupListByProductIds(productIds);
@@ -94,7 +93,7 @@
item.setReturnQuality(returnQuality);
item.setAvailableQuality(item.getQuantity().subtract(returnQuality));
});
- return AjaxResult.success(list);
+ return R.ok(list);
}
/**
@@ -113,9 +112,9 @@
* 鑾峰彇浜у搧淇℃伅璇︾粏淇℃伅
*/
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
+ public R<?> getInfo(@PathVariable("id") Long id)
{
- return success(salesLedgerProductService.selectSalesLedgerProductById(id));
+ return R.ok(salesLedgerProductService.selectSalesLedgerProductById(id));
}
/**
@@ -123,9 +122,10 @@
*/
@Log(title = "浜у搧淇℃伅", businessType = BusinessType.INSERT)
@PostMapping ("/addOrUpdateSalesLedgerProduct")
- public AjaxResult add(@RequestBody SalesLedgerProduct salesLedgerProduct)
+ public R<?> add(@RequestBody SalesLedgerProduct salesLedgerProduct)
{
- return toAjax(salesLedgerProductService.addOrUpdateSalesLedgerProduct(salesLedgerProduct));
+ salesLedgerProductService.addOrUpdateSalesLedgerProduct(salesLedgerProduct);
+ return R.ok();
}
/**
@@ -133,12 +133,13 @@
*/
@Log(title = "浜у搧淇℃伅", businessType = BusinessType.DELETE)
@DeleteMapping("/delProduct")
- public AjaxResult remove(@RequestBody Long[] ids)
+ public R<?> remove(@RequestBody Long[] ids)
{
if (ids == null || ids.length == 0) {
- return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
- return toAjax(salesLedgerProductService.deleteSalesLedgerProductByIds(ids));
+ salesLedgerProductService.deleteSalesLedgerProductByIds(ids);
+ return R.ok();
}
//鏍规嵁浜у搧id鑾峰彇bom鍒ゆ柇搴撳瓨鏄惁鍏呰冻
diff --git a/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java b/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java
index f9251f8..a9d8f75 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalesQuotationController.java
@@ -3,7 +3,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.sales.dto.SalesQuotationDto;
import com.ruoyi.sales.service.SalesQuotationService;
import jakarta.servlet.http.HttpServletResponse;
@@ -13,11 +14,11 @@
@RestController
@RequestMapping("/sales/quotation")
@AllArgsConstructor
-public class SalesQuotationController {
+public class SalesQuotationController extends BaseController {
private final SalesQuotationService salesQuotationService;
@GetMapping("/list")
- public AjaxResult getList(Page page, SalesQuotationDto salesQuotationDto) {
- return AjaxResult.success(salesQuotationService.listPage(page, salesQuotationDto));
+ public R<?> getList(Page page, SalesQuotationDto salesQuotationDto) {
+ return R.ok(salesQuotationService.listPage(page, salesQuotationDto));
}
@@ -32,15 +33,15 @@
@PostMapping("/add")
- public AjaxResult add(@RequestBody SalesQuotationDto salesQuotationDto) {
- return AjaxResult.success(salesQuotationService.add(salesQuotationDto));
+ public R<?> add(@RequestBody SalesQuotationDto salesQuotationDto) {
+ return R.ok(salesQuotationService.add(salesQuotationDto));
}
@PostMapping("/update")
- public AjaxResult update(@RequestBody SalesQuotationDto salesQuotationDto) {
- return AjaxResult.success(salesQuotationService.edit(salesQuotationDto));
+ public R<?> update(@RequestBody SalesQuotationDto salesQuotationDto) {
+ return R.ok(salesQuotationService.edit(salesQuotationDto));
}
@DeleteMapping("/delete")
- public AjaxResult delete(@RequestBody Long id) {
- return AjaxResult.success(salesQuotationService.delete(id));
+ public R<?> delete(@RequestBody Long id) {
+ return R.ok(salesQuotationService.delete(id));
}
}
diff --git a/src/main/java/com/ruoyi/sales/controller/SalespersonManagementController.java b/src/main/java/com/ruoyi/sales/controller/SalespersonManagementController.java
index 5f64f8c..0ced35c 100644
--- a/src/main/java/com/ruoyi/sales/controller/SalespersonManagementController.java
+++ b/src/main/java/com/ruoyi/sales/controller/SalespersonManagementController.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.sales.pojo.SalespersonManagement;
import com.ruoyi.sales.service.SalespersonManagementService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -28,36 +28,36 @@
@GetMapping("/listPage")
@Operation(summary = "鍒嗛〉鏌ヨ涓氬姟鍛樹俊鎭�")
- public AjaxResult listPage(Page page, SalespersonManagement salespersonManagement) {
+ public R<?> listPage(Page page, SalespersonManagement salespersonManagement) {
IPage<SalespersonManagement> listPage = salespersonManagementService.listPage(page, salespersonManagement);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
}
@PostMapping("/add")
@Operation(summary = "娣诲姞涓氬姟鍛樹俊鎭�")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult add(@RequestBody SalespersonManagement salespersonManagement) {
+ public R<?> add(@RequestBody SalespersonManagement salespersonManagement) {
boolean save = salespersonManagementService.save(salespersonManagement);
- return save ? AjaxResult.success() : AjaxResult.error();
+ return save ? R.ok() : R.fail();
}
@PostMapping("/update")
@Operation(summary = "淇敼涓氬姟鍛樹俊鎭�")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult update(@RequestBody SalespersonManagement salespersonManagement) {
+ public R<?> update(@RequestBody SalespersonManagement salespersonManagement) {
boolean update = salespersonManagementService.updateById(salespersonManagement);
- return update ? AjaxResult.success() : AjaxResult.error();
+ return update ? R.ok() : R.fail();
}
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎涓氬姟鍛樹俊鎭�")
@Transactional(rollbackFor = Exception.class)
- public AjaxResult delete(@RequestBody List<Long> ids) {
+ public R<?> delete(@RequestBody List<Long> ids) {
if (ids == null || ids.isEmpty()) {
- return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
}
boolean delete = salespersonManagementService.removeByIds(ids);
- return delete ? AjaxResult.success() : AjaxResult.error();
+ return delete ? R.ok() : R.fail();
}
}
diff --git a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
index f707b5b..9ca9b3a 100644
--- a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
@@ -11,7 +11,6 @@
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.sales.dto.ShippingInfoDto;
import com.ruoyi.sales.mapper.ShippingInfoMapper;
@@ -45,16 +44,16 @@
@GetMapping("/listPage")
@Operation(summary = "鍙戣揣淇℃伅鍒楄〃")
- public AjaxResult listPage(Page page, ShippingInfo req) {
+ public R<?> listPage(Page page, ShippingInfo req) {
IPage<ShippingInfoDto> listPage = shippingInfoService.listPage(page,req);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
}
@PostMapping("/add")
@Operation(summary = "娣诲姞鍙戣揣淇℃伅")
@Transactional(rollbackFor = Exception.class)
@Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody ShippingInfoDto req) throws Exception {
+ public R<?> add(@RequestBody ShippingInfoDto req) throws Exception {
LoginUser loginUser = SecurityUtils.getLoginUser();
String sh = OrderUtils.countTodayByCreateTime(shippingInfoMapper, "SH","shipping_no");
// 鍙戣揣瀹℃壒
@@ -70,37 +69,37 @@
req.setShippingNo(sh);
req.setStatus("寰呭鏍�");
boolean save = shippingInfoService.add(req);
- return save ? AjaxResult.success() : AjaxResult.error();
+ return save ? R.ok() : R.fail();
}
@Operation(summary = "鍙戣揣鎵ｅ簱瀛�")
@PostMapping("/deductStock")
@Transactional(rollbackFor = Exception.class)
@Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.UPDATE)
- public AjaxResult deductStock(@RequestBody ShippingInfoDto req) throws IOException {
- return shippingInfoService.deductStock( req) ? AjaxResult.success() : AjaxResult.error();
+ public R<?> deductStock(@RequestBody ShippingInfoDto req) throws IOException {
+ return shippingInfoService.deductStock( req) ? R.ok() : R.fail();
}
@PostMapping("/update")
@Operation(summary = "淇敼鍙戣揣淇℃伅")
@Transactional(rollbackFor = Exception.class)
@Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.UPDATE)
- public AjaxResult update(@RequestBody ShippingInfo req) {
+ public R<?> update(@RequestBody ShippingInfo req) {
ShippingInfo byId = shippingInfoService.getById(req.getId());
if (byId == null) {
- return AjaxResult.error("鍙戣揣淇℃伅涓嶅瓨鍦�");
+ return R.fail("鍙戣揣淇℃伅涓嶅瓨鍦�");
}
boolean update = shippingInfoService.updateById(req);
- return update ? AjaxResult.success() : AjaxResult.error();
+ return update ? R.ok() : R.fail();
}
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎鍙戣揣淇℃伅")
@Transactional(rollbackFor = Exception.class)
@Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.DELETE)
- public AjaxResult delete(@RequestBody List<Long> ids) {
+ public R<?> delete(@RequestBody List<Long> ids) {
- return shippingInfoService.delete(ids) ? AjaxResult.success("鍒犻櫎鎴愬姛") : AjaxResult.error("鍒犻櫎澶辫触");
+ return shippingInfoService.delete(ids) ? R.ok("鍒犻櫎鎴愬姛") : R.fail("鍒犻櫎澶辫触");
}
/**
@@ -117,8 +116,8 @@
@GetMapping("/getByCustomerName")
@Operation(summary = "閫氳繃瀹㈡埛鍚嶇О鏌ヨ鍏宠仈鐨勫彂璐у崟鍙�")
- public AjaxResult getByCustomerName(String customerName) {
- return AjaxResult.success(shippingInfoService.getShippingInfoByCustomerName(customerName));
+ public R<?> getByCustomerName(String customerName) {
+ return R.ok(shippingInfoService.getShippingInfoByCustomerName(customerName));
}
@GetMapping("/getDateil/{id}")
diff --git a/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java b/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java
index 539e67c..ecfed4a 100644
--- a/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java
+++ b/src/main/java/com/ruoyi/sales/service/ISalesLedgerService.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.aftersalesservice.pojo.AfterSalesService;
import com.ruoyi.common.enums.SaleEnum;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.sales.dto.LossProductModelDto;
import com.ruoyi.sales.dto.MonthlyAmountDto;
import com.ruoyi.sales.dto.SalesLedgerDto;
@@ -50,7 +50,7 @@
IPage<SalesLedgerVo> selectSalesLedgerListPage(Page page, SalesLedgerDto salesLedgerDto);
- AjaxResult importData(MultipartFile file);
+ R<?> importData(MultipartFile file);
List<LossProductModelDto> getSalesLedgerWithProductsLoss(Long salesLedgerId);
diff --git a/src/main/java/com/ruoyi/sales/service/impl/MetricStatisticsServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/MetricStatisticsServiceImpl.java
index 1ff7fa1..22b9b66 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/MetricStatisticsServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/MetricStatisticsServiceImpl.java
@@ -2,7 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.sales.dto.SalesTrendDto;
import com.ruoyi.sales.dto.StatisticsTableDto;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
@@ -32,9 +32,9 @@
private final SalesLedgerProductMapper salesLedgerProductMapper;
private final ShippingInfoMapper shippingInfoMapper;
- public AjaxResult total() {
+ public R<?> total() {
List<SalesLedger> salesLedgers = salesLedgerMapper.selectList(null);
- if(CollectionUtils.isEmpty(salesLedgers)) return AjaxResult.success(salesLedgers);
+ if(CollectionUtils.isEmpty(salesLedgers)) return R.ok(salesLedgers);
Map<String, Object> map = new HashMap<>();
// 閿�鍞
map.put("contractAmountTotal", salesLedgers.stream().map(SalesLedger::getContractAmount).reduce(BigDecimal.ZERO, BigDecimal::add));
@@ -44,16 +44,16 @@
List<SalesLedgerProduct> salesLedgerProducts = salesLedgerProductMapper.selectList(new LambdaQueryWrapper<SalesLedgerProduct>()
.eq(SalesLedgerProduct::getType, 1));
map.put("shipRate", "0%");
- if(CollectionUtils.isEmpty(salesLedgerProducts)) return AjaxResult.success(map);
+ if(CollectionUtils.isEmpty(salesLedgerProducts)) return R.ok(map);
// 鍙戣揣鏁伴噺
long count = shippingInfoMapper.selectCount(new LambdaQueryWrapper<ShippingInfo>()
.in(ShippingInfo::getSalesLedgerProductId, salesLedgerProducts.stream().map(SalesLedgerProduct::getId).collect(Collectors.toList()))
.eq(ShippingInfo::getStatus,"宸插彂璐�"));
map.put("shipRate", String.format("%.2f", count * 100.0 / salesLedgerProducts.size()) + "%");
- return AjaxResult.success(map);
+ return R.ok(map);
}
- public AjaxResult statisticsTable(StatisticsTableDto statisticsTableDto) {
+ public R<?> statisticsTable(StatisticsTableDto statisticsTableDto) {
Map<String, Object> map = new HashMap<>();
Calendar calendar = Calendar.getInstance();
@@ -123,6 +123,6 @@
map.put("orderCountList", orderCountList);
map.put("salesAmountList", salesAmountList);
map.put("shippingRateList", shippingRateList);
- return AjaxResult.success(map);
+ return R.ok(map);
}
}
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index 05b1ea7..58a0aed 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -26,10 +26,11 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.other.mapper.TempFileMapper;
-import com.ruoyi.other.pojo.TempFile;
-import com.ruoyi.production.mapper.*;
+import com.ruoyi.production.mapper.ProductionProductInputMapper;
+import com.ruoyi.production.mapper.ProductionProductMainMapper;
+import com.ruoyi.production.mapper.ProductionProductOutputMapper;
import com.ruoyi.production.service.ProductionProductMainService;
import com.ruoyi.project.system.domain.SysDept;
import com.ruoyi.project.system.domain.SysUser;
@@ -45,7 +46,6 @@
import com.ruoyi.sales.vo.SalesLedgerVo;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.io.FilenameUtils;
import org.jetbrains.annotations.Nullable;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -56,15 +56,10 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
-import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Field;
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.YearMonth;
@@ -336,18 +331,18 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public AjaxResult importData(MultipartFile file) {
+ public R<?> importData(MultipartFile file) {
LoginUser loginUser = SecurityUtils.getLoginUser();
try {
InputStream inputStream = file.getInputStream();
ExcelUtil<SalesLedgerImportDto> salesLedgerImportDtoExcelUtil = new ExcelUtil<>(SalesLedgerImportDto.class);
Map<String, List<SalesLedgerImportDto>> stringListMap = salesLedgerImportDtoExcelUtil.importExcelMultiSheet(Arrays.asList("閿�鍞彴璐︽暟鎹�", "閿�鍞骇鍝佹暟鎹�"), inputStream, 0);
- if (CollectionUtils.isEmpty(stringListMap)) return AjaxResult.error("閿�鍞〃鏍间负绌猴紒");
+ if (CollectionUtils.isEmpty(stringListMap)) return R.fail("閿�鍞〃鏍间负绌猴紒");
// 涓氬姟灞傚悎骞�
List<SalesLedgerImportDto> salesLedgerImportDtoList = stringListMap.get("閿�鍞彴璐︽暟鎹�");
- if (CollectionUtils.isEmpty(salesLedgerImportDtoList)) return AjaxResult.error("閿�鍞彴璐︽暟鎹负绌猴紒");
+ if (CollectionUtils.isEmpty(salesLedgerImportDtoList)) return R.fail("閿�鍞彴璐︽暟鎹负绌猴紒");
List<SalesLedgerImportDto> salesLedgerProductImportDtoList = stringListMap.get("閿�鍞骇鍝佹暟鎹�");
- if (CollectionUtils.isEmpty(salesLedgerProductImportDtoList)) return AjaxResult.error("閿�鍞骇鍝佹暟鎹负绌猴紒");
+ if (CollectionUtils.isEmpty(salesLedgerProductImportDtoList)) return R.fail("閿�鍞骇鍝佹暟鎹负绌猴紒");
// 瀹㈡埛鏁版嵁 - 鍙傝�� listPage 鏌ヨ绉佹捣瀹㈡埛锛坱ype = 0锛�
// type = 0锛堢娴峰鎴凤級鎴栬�� type = 1锛堝叕娴峰鎴凤級涓斿凡琚垎閰嶏紝骞朵笖鏄嚜宸遍鐢ㄣ�佽嚜宸卞垱寤烘垨鑰呭叡浜粰鑷繁鐨勫鎴�
Long loginUserId = loginUser.getUser().getUserId();
@@ -449,10 +444,10 @@
}
}
- return AjaxResult.success("瀵煎叆鎴愬姛");
+ return R.ok(null, "瀵煎叆鎴愬姛");
} catch (Exception e) {
e.printStackTrace();
- return AjaxResult.error("瀵煎叆澶辫触锛�" + e.getMessage());
+ return R.fail("瀵煎叆澶辫触锛�" + e.getMessage());
}
}
diff --git a/src/main/java/com/ruoyi/staff/controller/AnalyticsController.java b/src/main/java/com/ruoyi/staff/controller/AnalyticsController.java
index 2522550..3a23ce7 100644
--- a/src/main/java/com/ruoyi/staff/controller/AnalyticsController.java
+++ b/src/main/java/com/ruoyi/staff/controller/AnalyticsController.java
@@ -1,6 +1,7 @@
package com.ruoyi.staff.controller;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.staff.service.AnalyticsService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -10,23 +11,23 @@
@RestController
@RequestMapping("/staff/analytics")
-public class AnalyticsController {
+public class AnalyticsController extends BaseController {
@Resource
private AnalyticsService analyticsService;
@GetMapping("/reason")
- public AjaxResult staffLeaveReasonAnalytics() {
- return AjaxResult.success(analyticsService.staffLeaveReasonAnalytics());
+ public R<?> staffLeaveReasonAnalytics() {
+ return R.ok(analyticsService.staffLeaveReasonAnalytics());
}
@GetMapping("/monthly_turnover_rate")
- public AjaxResult getMonthlyTurnoverRateFor12Months() {
- return AjaxResult.success(analyticsService.getMonthlyTurnoverRateFor12Months());
+ public R<?> getMonthlyTurnoverRateFor12Months() {
+ return R.ok(analyticsService.getMonthlyTurnoverRateFor12Months());
}
@GetMapping("/total_statistic")
- public AjaxResult getTotalStatistic() {
- return AjaxResult.success(analyticsService.getTotalStatistic());
+ public R<?> getTotalStatistic() {
+ return R.ok(analyticsService.getTotalStatistic());
}
}
diff --git a/src/main/java/com/ruoyi/staff/controller/BankController.java b/src/main/java/com/ruoyi/staff/controller/BankController.java
index 1e9aa1f..372998e 100644
--- a/src/main/java/com/ruoyi/staff/controller/BankController.java
+++ b/src/main/java/com/ruoyi/staff/controller/BankController.java
@@ -2,7 +2,8 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.staff.pojo.Bank;
import com.ruoyi.staff.service.BankService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -25,37 +26,37 @@
@RestController
@RequestMapping("/bank")
@AllArgsConstructor
-public class BankController {
+public class BankController extends BaseController {
private BankService bankService;
@GetMapping("/list")
- public AjaxResult list() {
- return AjaxResult.success(bankService.list());
+ public R<?> list() {
+ return R.ok(bankService.list());
}
@PostMapping("/add")
@Operation(summary = "鏂板閾惰绠＄悊琛�")
@Transactional(rollbackFor = Exception.class)
@Log(title = "閾惰绠＄悊琛�", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody Bank bank) {
- return AjaxResult.success(bankService.save(bank));
+ public R<?> add(@RequestBody Bank bank) {
+ return R.ok(bankService.save(bank));
}
@PostMapping("/update")
@Operation(summary = "鏇存柊閾惰绠＄悊琛�")
@Transactional(rollbackFor = Exception.class)
@Log(title = "閾惰绠＄悊琛�", businessType = BusinessType.UPDATE)
- public AjaxResult update(@RequestBody Bank bank) {
- return AjaxResult.success(bankService.updateById(bank));
+ public R<?> update(@RequestBody Bank bank) {
+ return R.ok(bankService.updateById(bank));
}
@DeleteMapping("/delete")
@Operation(summary = "鍒犻櫎閾惰绠＄悊琛�")
@Transactional(rollbackFor = Exception.class)
@Log(title = "閾惰绠＄悊琛�", businessType = BusinessType.DELETE)
- public AjaxResult delete(@RequestBody List<Long> ids) {
- return AjaxResult.success(bankService.removeBatchByIds(ids));
+ public R<?> delete(@RequestBody List<Long> ids) {
+ return R.ok(bankService.removeBatchByIds(ids));
}
}
diff --git a/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java b/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java
index 6498ef9..62d430c 100644
--- a/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java
+++ b/src/main/java/com/ruoyi/staff/controller/HolidayApplicationController.java
@@ -1,7 +1,8 @@
package com.ruoyi.staff.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.staff.pojo.HolidayApplication;
import com.ruoyi.staff.service.HolidayApplicationService;
import lombok.AllArgsConstructor;
@@ -10,35 +11,35 @@
@RestController
@RequestMapping("/staff/holidayApplication")
@AllArgsConstructor
-public class HolidayApplicationController {
+public class HolidayApplicationController extends BaseController {
private HolidayApplicationService holidayApplicationService;
/**
* 璇峰亣鐢宠鍒嗛〉鏌ヨ
*/
@GetMapping("/listPage")
- public AjaxResult listPage(Page page, HolidayApplication holidayApplication){
- return AjaxResult.success(holidayApplicationService.listPage(page, holidayApplication));
+ public R<?> listPage(Page page, HolidayApplication holidayApplication){
+ return R.ok(holidayApplicationService.listPage(page, holidayApplication));
}
/**
* 鏂板璇峰亣鐢宠
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody HolidayApplication holidayApplication){
- return AjaxResult.success(holidayApplicationService.save(holidayApplication));
+ public R<?> add(@RequestBody HolidayApplication holidayApplication){
+ return R.ok(holidayApplicationService.save(holidayApplication));
}
/**
* 淇敼璇峰亣鐢宠
*/
@PostMapping("/update")
- public AjaxResult update(@RequestBody HolidayApplication holidayApplication){
- return AjaxResult.success(holidayApplicationService.updateById(holidayApplication));
+ public R<?> update(@RequestBody HolidayApplication holidayApplication){
+ return R.ok(holidayApplicationService.updateById(holidayApplication));
}
/**
* 鍒犻櫎璇峰亣鐢宠
*/
@DeleteMapping("/delete/{id}")
- public AjaxResult delete(@PathVariable("id") Long id){
- return AjaxResult.success(holidayApplicationService.removeById(id));
+ public R<?> delete(@PathVariable("id") Long id){
+ return R.ok(holidayApplicationService.removeById(id));
}
}
diff --git a/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java b/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java
index 37902fa..95f3105 100644
--- a/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java
+++ b/src/main/java/com/ruoyi/staff/controller/PersonalAttendanceRecordsController.java
@@ -1,7 +1,8 @@
package com.ruoyi.staff.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.staff.dto.PersonalAttendanceRecordsDto;
import com.ruoyi.staff.pojo.PersonalAttendanceRecords;
import com.ruoyi.staff.service.PersonalAttendanceRecordsService;
@@ -23,26 +24,26 @@
@RestController
@RequestMapping("/personalAttendanceRecords")
@Tag(name = "浜哄憳鎵撳崱绛惧埌")
-public class PersonalAttendanceRecordsController {
+public class PersonalAttendanceRecordsController extends BaseController {
@Resource
private PersonalAttendanceRecordsService personalAttendanceRecordsService;
@Operation(summary = "鏂板鎵撳崱绛惧埌")
@PostMapping("")
- public AjaxResult add(@RequestBody PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
- return AjaxResult.success(personalAttendanceRecordsService.add(personalAttendanceRecordsDto));
+ public R<?> add(@RequestBody PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
+ return R.ok(personalAttendanceRecordsService.add(personalAttendanceRecordsDto));
}
@Operation(summary = "鍒嗛〉鏌ヨ鎵撳崱绛惧埌")
@GetMapping("/listPage")
- public AjaxResult listPage(Page page, PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
- return AjaxResult.success(personalAttendanceRecordsService.listPage(page, personalAttendanceRecordsDto));
+ public R<?> listPage(Page page, PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
+ return R.ok(personalAttendanceRecordsService.listPage(page, personalAttendanceRecordsDto));
}
@Operation(summary = "鑾峰彇褰撳墠浜虹殑鑰冨嫟鐩稿叧鏁版嵁")
@GetMapping("/today")
- public AjaxResult todayInfo(PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
- return AjaxResult.success(personalAttendanceRecordsService.todayInfo(personalAttendanceRecordsDto));
+ public R<?> todayInfo(PersonalAttendanceRecordsDto personalAttendanceRecordsDto){
+ return R.ok(personalAttendanceRecordsService.todayInfo(personalAttendanceRecordsDto));
}
@Operation(summary = "瀵煎嚭鎵撳崱绛惧埌")
diff --git a/src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java b/src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java
index fd97213..4abb319 100644
--- a/src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java
+++ b/src/main/java/com/ruoyi/staff/controller/SchemeApplicableStaffController.java
@@ -4,7 +4,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.staff.pojo.SchemeApplicableStaff;
import com.ruoyi.staff.service.SchemeApplicableStaffService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -34,7 +34,7 @@
@GetMapping("/listPage")
@Operation(summary = "鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, SchemeApplicableStaff schemeApplicableStaff) {
+ public R<?> listPage(Page page, SchemeApplicableStaff schemeApplicableStaff) {
return schemeApplicableStaffService.listPage(page,schemeApplicableStaff);
}
@@ -42,7 +42,7 @@
@Operation(summary = "娣诲姞")
@Transactional(rollbackFor = Exception.class)
@Log(title = "绀句繚鏂规閫傜敤浜哄憳琛�", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody SchemeApplicableStaff schemeApplicableStaff) {
+ public R<?> add(@RequestBody SchemeApplicableStaff schemeApplicableStaff) {
return schemeApplicableStaffService.add(schemeApplicableStaff);
}
@@ -50,7 +50,7 @@
@Operation(summary = "淇敼")
@Transactional(rollbackFor = Exception.class)
@Log(title = "绀句繚鏂规閫傜敤浜哄憳琛�", businessType = BusinessType.UPDATE)
- public AjaxResult updateSchemeApplicableStaff(@RequestBody SchemeApplicableStaff schemeApplicableStaff) {
+ public R<?> updateSchemeApplicableStaff(@RequestBody SchemeApplicableStaff schemeApplicableStaff) {
return schemeApplicableStaffService.updateSchemeApplicableStaff(schemeApplicableStaff);
}
@@ -58,7 +58,7 @@
@Operation(summary = "鍒犻櫎")
@Transactional(rollbackFor = Exception.class)
@Log(title = "绀句繚鏂规閫傜敤浜哄憳琛�", businessType = BusinessType.DELETE)
- public AjaxResult delete(@RequestBody List<Long> ids) {
+ public R<?> delete(@RequestBody List<Long> ids) {
return schemeApplicableStaffService.delete(ids);
}
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffContractController.java b/src/main/java/com/ruoyi/staff/controller/StaffContractController.java
index 17cdaf6..59908ba 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffContractController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffContractController.java
@@ -1,7 +1,8 @@
package com.ruoyi.staff.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.staff.pojo.StaffContract;
import com.ruoyi.staff.service.StaffContractService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -15,7 +16,7 @@
@RestController
@RequestMapping("/staff/staffContract")
@Tag(name = "鍛樺伐鍙拌处/鍚堝悓绠＄悊")
-public class StaffContractController {
+public class StaffContractController extends BaseController {
@Resource
private StaffContractService staffContractService;
@@ -28,7 +29,7 @@
* @return
*/
@GetMapping("/listPage")
- public AjaxResult staffContractListPage(Page page, StaffContract staffContract) {
- return AjaxResult.success(staffContractService.staffContractListPage(page, staffContract));
+ public R<?> staffContractListPage(Page page, StaffContract staffContract) {
+ return R.ok(staffContractService.staffContractListPage(page, staffContract));
}
}
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java b/src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java
index 64a35d9..585a249 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffLeaveController.java
@@ -1,7 +1,8 @@
package com.ruoyi.staff.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.staff.dto.StaffLeaveDto;
import com.ruoyi.staff.service.StaffLeaveService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -18,7 +19,7 @@
@RestController
@RequestMapping("/staff/staffLeave")
@Tag(name = "鍛樺伐绂昏亴")
-public class StaffLeaveController {
+public class StaffLeaveController extends BaseController {
@Resource
private StaffLeaveService staffLeaveService;
/**
@@ -28,8 +29,8 @@
* @return
*/
@GetMapping("/listPage")
- public AjaxResult staffLeaveListPage(Page page, StaffLeaveDto staffLeaveDto) {
- return AjaxResult.success(staffLeaveService.staffLeaveListPage(page, staffLeaveDto));
+ public R<?> staffLeaveListPage(Page page, StaffLeaveDto staffLeaveDto) {
+ return R.ok(staffLeaveService.staffLeaveListPage(page, staffLeaveDto));
}
/**
@@ -38,8 +39,8 @@
* @return
*/
@PostMapping("")
- public AjaxResult add(@RequestBody StaffLeaveDto staffLeaveDto) {
- return AjaxResult.success(staffLeaveService.add(staffLeaveDto));
+ public R<?> add(@RequestBody StaffLeaveDto staffLeaveDto) {
+ return R.ok(staffLeaveService.add(staffLeaveDto));
}
/**
@@ -49,8 +50,8 @@
* @return
*/
@PutMapping("/{id}")
- public AjaxResult update(@PathVariable("id") Long id, @RequestBody StaffLeaveDto staffLeaveDto) {
- return AjaxResult.success(staffLeaveService.update(id, staffLeaveDto));
+ public R<?> update(@PathVariable("id") Long id, @RequestBody StaffLeaveDto staffLeaveDto) {
+ return R.ok(staffLeaveService.update(id, staffLeaveDto));
}
/**
@@ -59,11 +60,11 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult del(@RequestBody List<Integer> ids) {
+ public R<?> del(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return AjaxResult.success(staffLeaveService.del(ids));
+ return R.ok(staffLeaveService.del(ids));
}
/**
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
index ab27019..2bb6cd7 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffOnJobController.java
@@ -4,7 +4,8 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.staff.dto.StaffOnJobDto;
import com.ruoyi.staff.dto.StaffOnJobExcelDto;
import com.ruoyi.staff.pojo.StaffContract;
@@ -26,7 +27,7 @@
@RestController
@RequestMapping("/staff/staffOnJob")
@Tag(name = "鍛樺伐鍙拌处")
-public class StaffOnJobController {
+public class StaffOnJobController extends BaseController {
@Resource
private IStaffOnJobService staffOnJobService;
@@ -39,8 +40,8 @@
* @return
*/
@GetMapping("/listPage")
- public AjaxResult staffOnJobListPage(Page page, StaffOnJob staffOnJob) {
- return AjaxResult.success(staffOnJobService.staffOnJobListPage(page, staffOnJob));
+ public R<?> staffOnJobListPage(Page page, StaffOnJob staffOnJob) {
+ return R.ok(staffOnJobService.staffOnJobListPage(page, staffOnJob));
}
/**
@@ -48,8 +49,8 @@
* @return
*/
@GetMapping("/list")
- public AjaxResult staffOnJobList(StaffOnJob staffOnJob) {
- return AjaxResult.success(staffOnJobService.staffOnJobList(staffOnJob));
+ public R<?> staffOnJobList(StaffOnJob staffOnJob) {
+ return R.ok(staffOnJobService.staffOnJobList(staffOnJob));
}
/**
@@ -58,8 +59,8 @@
* @return
*/
@PostMapping("")
- public AjaxResult add(@RequestBody StaffOnJobDto staffOnJob) {
- return AjaxResult.success(staffOnJobService.add(staffOnJob));
+ public R<?> add(@RequestBody StaffOnJobDto staffOnJob) {
+ return R.ok(staffOnJobService.add(staffOnJob));
}
/**
@@ -68,8 +69,8 @@
* @return
*/
@PutMapping("/{id}")
- public AjaxResult update(@PathVariable("id") Long id, @RequestBody StaffOnJobDto staffOnJobDto) {
- return AjaxResult.success(staffOnJobService.update(id, staffOnJobDto));
+ public R<?> update(@PathVariable("id") Long id, @RequestBody StaffOnJobDto staffOnJobDto) {
+ return R.ok(staffOnJobService.update(id, staffOnJobDto));
}
/**
@@ -78,11 +79,11 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult delStaffOnJobs(@RequestBody List<Integer> ids) {
+ public R<?> delStaffOnJobs(@RequestBody List<Integer> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return AjaxResult.success(staffOnJobService.delStaffOnJobs(ids));
+ return R.ok(staffOnJobService.delStaffOnJobs(ids));
}
/**
@@ -91,8 +92,8 @@
* @return
*/
@GetMapping("/{id}")
- public AjaxResult staffOnJobDetail(@PathVariable("id") Long id) {
- return AjaxResult.success(staffOnJobService.staffOnJobDetail(id));
+ public R<?> staffOnJobDetail(@PathVariable("id") Long id) {
+ return R.ok(staffOnJobService.staffOnJobDetail(id));
}
/**
@@ -102,8 +103,8 @@
* @return
*/
@PostMapping("/renewContract/{id}")
- public AjaxResult renewContract(@PathVariable Long id, @RequestBody StaffContract staffContract) {
- return AjaxResult.success(staffOnJobService.renewContract(id, staffContract));
+ public R<?> renewContract(@PathVariable Long id, @RequestBody StaffContract staffContract) {
+ return R.ok(staffOnJobService.renewContract(id, staffContract));
}
@Operation(summary = "涓嬭浇妯℃澘")
@@ -118,12 +119,12 @@
*/
@PostMapping("/import")
@Log(title = "鍦ㄨ亴鍛樺伐瀵煎叆", businessType = BusinessType.IMPORT)
- public AjaxResult importData(@RequestPart("file") MultipartFile file) {
+ public R<?> importData(@RequestPart("file") MultipartFile file) {
Boolean b = staffOnJobService.importData(file);
if (b) {
- return AjaxResult.success("瀵煎叆鎴愬姛");
+ return R.ok(null, "瀵煎叆鎴愬姛");
}
- return AjaxResult.error("瀵煎叆澶辫触");
+ return R.fail("瀵煎叆澶辫触");
}
/**
@@ -143,8 +144,8 @@
*/
@PostMapping("/exportCopy")
@Operation(summary = "word妯℃澘鍚堝悓鍦ㄨ亴鍛樺伐瀵煎嚭")
- public AjaxResult exportCopy(HttpServletResponse response,@RequestBody StaffOnJob staffOnJob) throws Exception{
- return AjaxResult.success(staffOnJobService.exportCopy(response, staffOnJob));
+ public R<?> exportCopy(HttpServletResponse response,@RequestBody StaffOnJob staffOnJob) throws Exception{
+ return R.ok(staffOnJobService.exportCopy(response, staffOnJob));
}
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java b/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
index 569ca1c..dfc0d67 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffSalaryMainController.java
@@ -3,7 +3,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.staff.dto.CalculateSalaryDto;
import com.ruoyi.staff.pojo.StaffSalaryMain;
import com.ruoyi.staff.service.StaffSalaryMainService;
@@ -27,19 +28,19 @@
@RestController
@RequestMapping("/staffSalaryMain")
@AllArgsConstructor
-public class StaffSalaryMainController {
+public class StaffSalaryMainController extends BaseController {
private StaffSalaryMainService staffSalaryMainService;
@GetMapping("/listPage")
@Operation(summary = "鍛樺伐宸ヨ祫涓昏〃鍒嗛〉鏌ヨ")
- public AjaxResult listPage(Page page, StaffSalaryMain staffSalaryMain) {
+ public R<?> listPage(Page page, StaffSalaryMain staffSalaryMain) {
return staffSalaryMainService.listPage(page, staffSalaryMain);
}
@Operation(summary = "閫氳繃閮ㄩ棬ids鑾峰彇鐢ㄦ埛淇℃伅璁＄畻姣忎釜鍛樺伐鐨勫伐璧�")
@PostMapping("/calculateSalary")
- public AjaxResult calculateSalary(@RequestBody CalculateSalaryDto calculateSalaryDto) {
+ public R<?> calculateSalary(@RequestBody CalculateSalaryDto calculateSalaryDto) {
return staffSalaryMainService.calculateSalary(calculateSalaryDto);
}
@@ -47,7 +48,7 @@
@Operation(summary = "鏂板缓宸ヨ祫琛�")
@Log(title = "鏂板缓宸ヨ祫琛�", businessType = BusinessType.INSERT)
@Transactional(rollbackFor = Exception.class)
- public AjaxResult add(@RequestBody StaffSalaryMain staffSalaryMain) {
+ public R<?> add(@RequestBody StaffSalaryMain staffSalaryMain) {
return staffSalaryMainService.add(staffSalaryMain);
}
@@ -55,7 +56,7 @@
@Operation(summary = "淇敼宸ヨ祫琛�")
@Log(title = "淇敼宸ヨ祫琛�", businessType = BusinessType.UPDATE)
@Transactional(rollbackFor = Exception.class)
- public AjaxResult updateStaffSalaryMain(@RequestBody StaffSalaryMain staffSalaryMain) {
+ public R<?> updateStaffSalaryMain(@RequestBody StaffSalaryMain staffSalaryMain) {
return staffSalaryMainService.updateStaffSalaryMain(staffSalaryMain);
}
@@ -63,7 +64,7 @@
@Operation(summary = "鍒犻櫎宸ヨ祫琛�")
@Log(title = "鍒犻櫎宸ヨ祫琛�", businessType = BusinessType.DELETE)
@Transactional(rollbackFor = Exception.class)
- public AjaxResult delete(@RequestBody List<Long> ids) {
+ public R<?> delete(@RequestBody List<Long> ids) {
return staffSalaryMainService.delete(ids);
}
diff --git a/src/main/java/com/ruoyi/staff/controller/StaffSchedulingController.java b/src/main/java/com/ruoyi/staff/controller/StaffSchedulingController.java
index d195e9c..a49809a 100644
--- a/src/main/java/com/ruoyi/staff/controller/StaffSchedulingController.java
+++ b/src/main/java/com/ruoyi/staff/controller/StaffSchedulingController.java
@@ -5,7 +5,8 @@
import com.ruoyi.compensationperformance.pojo.CompensationPerformance;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.staff.dto.SaveStaffSchedulingDto;
import com.ruoyi.staff.dto.StaffSchedulingDto;
import com.ruoyi.staff.service.StaffSchedulingService;
@@ -26,39 +27,39 @@
@RestController
@RequestMapping("/staff/staffScheduling")
@RequiredArgsConstructor
-public class StaffSchedulingController {
+public class StaffSchedulingController extends BaseController {
private final StaffSchedulingService staffSchedulingService;
@PostMapping("/listPage")
- public AjaxResult listPage(@RequestBody SearchSchedulingVo vo){
- return AjaxResult.success(staffSchedulingService.listPage(vo));
+ public R<?> listPage(@RequestBody SearchSchedulingVo vo){
+ return R.ok(staffSchedulingService.listPage(vo));
}
@PostMapping("/save")
- public AjaxResult save(@RequestBody @Validated SaveStaffSchedulingDto saveStaffSchedulingDto){
+ public R<?> save(@RequestBody @Validated SaveStaffSchedulingDto saveStaffSchedulingDto){
staffSchedulingService.saveStaffScheduling(saveStaffSchedulingDto);
- return AjaxResult.success();
+ return R.ok();
}
@DeleteMapping("/delByIds")
- public AjaxResult delByIds(@RequestBody List<Integer> ids){
+ public R<?> delByIds(@RequestBody List<Integer> ids){
staffSchedulingService.removeByIds(ids);
- return AjaxResult.success();
+ return R.ok();
}
@DeleteMapping("/del/{id}")
- public AjaxResult del(@PathVariable("id") Integer id){
+ public R<?> del(@PathVariable("id") Integer id){
staffSchedulingService.removeById(id);
- return AjaxResult.success();
+ return R.ok();
}
/**
* 鑾峰彇褰撳墠鐢ㄦ埛鏈�鏂版帓鐝褰�
*/
@GetMapping("/getCurrentUserLatestScheduling")
- public AjaxResult getCurrentUserLatestScheduling(){
- return AjaxResult.success(staffSchedulingService.getCurrentUserLatestScheduling());
+ public R<?> getCurrentUserLatestScheduling(){
+ return R.ok(staffSchedulingService.getCurrentUserLatestScheduling());
}
@Log(title = "瀵煎嚭浜哄憳鎺掔彮鍒楄〃", businessType = BusinessType.EXPORT)
diff --git a/src/main/java/com/ruoyi/staff/service/SchemeApplicableStaffService.java b/src/main/java/com/ruoyi/staff/service/SchemeApplicableStaffService.java
index da9a2d7..9d7e610 100644
--- a/src/main/java/com/ruoyi/staff/service/SchemeApplicableStaffService.java
+++ b/src/main/java/com/ruoyi/staff/service/SchemeApplicableStaffService.java
@@ -1,7 +1,7 @@
package com.ruoyi.staff.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.staff.pojo.SchemeApplicableStaff;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -17,11 +17,11 @@
*/
public interface SchemeApplicableStaffService extends IService<SchemeApplicableStaff> {
- AjaxResult listPage(Page page, SchemeApplicableStaff schemeApplicableStaff);
+ R<?> listPage(Page page, SchemeApplicableStaff schemeApplicableStaff);
- AjaxResult add(SchemeApplicableStaff schemeApplicableStaff);
+ R<?> add(SchemeApplicableStaff schemeApplicableStaff);
- AjaxResult updateSchemeApplicableStaff(SchemeApplicableStaff schemeApplicableStaff);
+ R<?> updateSchemeApplicableStaff(SchemeApplicableStaff schemeApplicableStaff);
- AjaxResult delete(List<Long> ids);
+ R<?> delete(List<Long> ids);
}
diff --git a/src/main/java/com/ruoyi/staff/service/StaffSalaryMainService.java b/src/main/java/com/ruoyi/staff/service/StaffSalaryMainService.java
index 1794e43..2003e68 100644
--- a/src/main/java/com/ruoyi/staff/service/StaffSalaryMainService.java
+++ b/src/main/java/com/ruoyi/staff/service/StaffSalaryMainService.java
@@ -1,7 +1,7 @@
package com.ruoyi.staff.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.staff.dto.CalculateSalaryDto;
import com.ruoyi.staff.pojo.StaffSalaryMain;
import com.baomidou.mybatisplus.extension.service.IService;
@@ -18,13 +18,13 @@
*/
public interface StaffSalaryMainService extends IService<StaffSalaryMain> {
- AjaxResult listPage(Page page, StaffSalaryMain staffSalaryMain);
+ R listPage(Page page, StaffSalaryMain staffSalaryMain);
- AjaxResult add(StaffSalaryMain staffSalaryMain);
+ R<?> add(StaffSalaryMain staffSalaryMain);
- AjaxResult updateStaffSalaryMain(StaffSalaryMain staffSalaryMain);
+ R<?> updateStaffSalaryMain(StaffSalaryMain staffSalaryMain);
- AjaxResult delete(List<Long> ids);
+ R<?> delete(List<Long> ids);
- AjaxResult calculateSalary(CalculateSalaryDto calculateSalaryDto);
+ R<?> calculateSalary(CalculateSalaryDto calculateSalaryDto);
}
diff --git a/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java
index bd61ca3..d57a25e 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/SchemeApplicableStaffServiceImpl.java
@@ -4,7 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.production.bean.dto.UserAccountDto;
import com.ruoyi.production.bean.dto.UserProductionAccountingDto;
import com.ruoyi.production.service.SalesLedgerProductionAccountingService;
@@ -52,7 +52,7 @@
@Override
- public AjaxResult listPage(Page page, SchemeApplicableStaff schemeApplicableStaff) {
+ public R<?> listPage(Page page, SchemeApplicableStaff schemeApplicableStaff) {
LambdaQueryWrapper<SchemeApplicableStaff> schemeApplicableStaffLambdaQueryWrapper = new LambdaQueryWrapper<>();
if(schemeApplicableStaff != null){
if(StringUtils.isNotEmpty(schemeApplicableStaff.getTitle())){
@@ -62,7 +62,7 @@
Page<SchemeApplicableStaff> page1 = schemeApplicableStaffMapper.selectPage(page, schemeApplicableStaffLambdaQueryWrapper);
List<Long> collect = page1.getRecords().stream().map(SchemeApplicableStaff::getId).collect(Collectors.toList());
if(CollectionUtils.isEmpty(collect)){
- return AjaxResult.success(page1);
+ return R.ok(page1);
}
List<SchemeInsuranceDetail> schemeInsuranceDetails = schemeInsuranceDetailMapper
.selectList(new LambdaQueryWrapper<SchemeInsuranceDetail>()
@@ -82,7 +82,7 @@
item.setDeptNames(sysDepts.stream().map(SysDept::getDeptName).collect(Collectors.joining(",")));
}
});
- return AjaxResult.success(page1);
+ return R.ok(page1);
}
public void setSchemeApplicableStaffUserInfo(SchemeApplicableStaff schemeApplicableStaff) {
@@ -103,12 +103,12 @@
}
@Override
- public AjaxResult add(SchemeApplicableStaff schemeApplicableStaff) {
+ public R<?> add(SchemeApplicableStaff schemeApplicableStaff) {
if(schemeApplicableStaff == null){
- return AjaxResult.error("鍙傛暟閿欒");
+ return R.fail("鍙傛暟閿欒");
}
if(CollectionUtils.isEmpty(schemeApplicableStaff.getSchemeInsuranceDetailList())){
- return AjaxResult.error("璇烽�夋嫨鏂规鏄庣粏");
+ return R.fail("璇烽�夋嫨鏂规鏄庣粏");
}
setSchemeApplicableStaffUserInfo(schemeApplicableStaff); //鏍规嵁閮ㄩ棬璁剧疆鐢ㄦ埛淇℃伅
int insert = schemeApplicableStaffMapper.insert(schemeApplicableStaff);
@@ -116,13 +116,13 @@
item.setSchemeId(schemeApplicableStaff.getId());
schemeInsuranceDetailMapper.insert(item);
});
- return AjaxResult.success(insert);
+ return R.ok(insert);
}
@Override
- public AjaxResult updateSchemeApplicableStaff(SchemeApplicableStaff schemeApplicableStaff) {
+ public R<?> updateSchemeApplicableStaff(SchemeApplicableStaff schemeApplicableStaff) {
if(schemeApplicableStaff == null){
- return AjaxResult.error("鍙傛暟閿欒");
+ return R.fail("鍙傛暟閿欒");
}
setSchemeApplicableStaffUserInfo(schemeApplicableStaff); //鏍规嵁閮ㄩ棬璁剧疆鐢ㄦ埛淇℃伅
int update = schemeApplicableStaffMapper.updateById(schemeApplicableStaff);
@@ -133,18 +133,18 @@
item.setSchemeId(schemeApplicableStaff.getId());
schemeInsuranceDetailMapper.insert(item);
});
- return AjaxResult.success(update);
+ return R.ok(update);
}
@Override
- public AjaxResult delete(List<Long> ids) {
+ public R<?> delete(List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) {
- return AjaxResult.error("鍙傛暟閿欒");
+ return R.fail("鍙傛暟閿欒");
}
int delete = schemeApplicableStaffMapper.deleteBatchIds(ids);
schemeInsuranceDetailMapper.delete(new LambdaQueryWrapper<SchemeInsuranceDetail>()
.in(SchemeInsuranceDetail::getSchemeId, ids));
- return AjaxResult.success(delete);
+ return R.ok(delete);
}
/**
diff --git a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
index a6d4500..d6eac65 100644
--- a/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/staff/service/impl/StaffSalaryMainServiceImpl.java
@@ -7,7 +7,7 @@
import com.ruoyi.account.pojo.AccountExpense;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.project.system.mapper.SysUserDeptMapper;
import com.ruoyi.staff.dto.CalculateSalaryDto;
import com.ruoyi.staff.mapper.StaffLeaveMapper;
@@ -48,7 +48,7 @@
private final AccountExpenseMapper accountExpenseMapper;
@Override
- public AjaxResult listPage(Page page, StaffSalaryMain staffSalaryMain) {
+ public R<?> listPage(Page page, StaffSalaryMain staffSalaryMain) {
LambdaQueryWrapper<StaffSalaryMain> staffSalaryMainLambdaQueryWrapper = new LambdaQueryWrapper<>();
if(staffSalaryMain != null){
if(StringUtils.isNotEmpty(staffSalaryMain.getSalaryTitle())){
@@ -66,31 +66,31 @@
List<StaffSalaryDetail> staffSalaryDetailList = staffSalaryDetailMapper.selectList(new LambdaQueryWrapper<StaffSalaryDetail>().eq(StaffSalaryDetail::getMainId, main.getId()));
main.setStaffSalaryDetailList(staffSalaryDetailList);
});
- return AjaxResult.success(page1);
+ return R.ok(page1);
}
@Override
- public AjaxResult add(StaffSalaryMain staffSalaryMain) {
+ public R<?> add(StaffSalaryMain staffSalaryMain) {
staffSalaryMainMapper.insert(staffSalaryMain);
staffSalaryMain.getStaffSalaryDetailList().forEach(detail -> {
detail.setMainId(staffSalaryMain.getId());
});
staffSalaryDetailService.saveBatch(staffSalaryMain.getStaffSalaryDetailList());
- return AjaxResult.success("鏂板鎴愬姛");
+ return R.ok(null, "鏂板鎴愬姛");
}
@Override
- public AjaxResult updateStaffSalaryMain(StaffSalaryMain staffSalaryMain) {
+ public R<?> updateStaffSalaryMain(StaffSalaryMain staffSalaryMain) {
if(staffSalaryMain == null){
- return AjaxResult.error("鍙傛暟閿欒");
+ return R.fail("鍙傛暟閿欒");
}
StaffSalaryMain staffSalaryMain1 = staffSalaryMainMapper.selectById(staffSalaryMain.getId());
if(staffSalaryMain1 == null){
- return AjaxResult.error("鍙傛暟閿欒");
+ return R.fail("鍙傛暟閿欒");
}
// 寰呭鏍镐笉鍙紪杈�
// if(staffSalaryMain1.getStatus() > 3){
-// return AjaxResult.error("寰呭鏍镐笉鍙紪杈�");
+// return R.fail("寰呭鏍镐笉鍙紪杈�");
// }
staffSalaryMainMapper.updateById(staffSalaryMain);
if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(staffSalaryMain.getStaffSalaryDetailList())){
@@ -115,27 +115,27 @@
accountExpense.setInputTime(new Date());
accountExpenseMapper.insert(accountExpense);
}
- return AjaxResult.success("淇敼鎴愬姛");
+ return R.ok(null, "淇敼鎴愬姛");
}
@Override
- public AjaxResult delete(List<Long> ids) {
+ public R<?> delete(List<Long> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("鍙傛暟閿欒");
+ return R.fail("鍙傛暟閿欒");
}
staffSalaryMainMapper.deleteBatchIds(ids);
staffSalaryDetailMapper.delete(new LambdaQueryWrapper<StaffSalaryDetail>().in(StaffSalaryDetail::getMainId, ids));
- return AjaxResult.success("鍒犻櫎鎴愬姛");
+ return R.ok(null, "鍒犻櫎鎴愬姛");
}
@Override
- public AjaxResult calculateSalary(CalculateSalaryDto calculateSalaryDto) {
+ public R<?> calculateSalary(CalculateSalaryDto calculateSalaryDto) {
if(CollectionUtils.isEmpty(calculateSalaryDto.getIds())){
- return AjaxResult.error("鍙傛暟閿欒");
+ return R.fail("鍙傛暟閿欒");
}
List<Map<String, Object>> longs = setSchemeApplicableStaffUserInfo(calculateSalaryDto.getIds()); // 閫氳繃閮ㄩ棬ids鑾峰彇鐢ㄦ埛淇℃伅
if(CollectionUtils.isEmpty(longs)){
- return AjaxResult.error("鏃犲憳宸�");
+ return R.fail("鏃犲憳宸�");
}
List<Map<String, Object>> mapList = new ArrayList<>();
for (Map<String, Object> id : longs) {
@@ -151,7 +151,7 @@
schemeApplicableStaffService.calculateByEmployeeId((Integer) id.get("id"),id,calculateSalaryDto.getDate());
mapList.add(id);
}
- return AjaxResult.success(mapList);
+ return R.ok(mapList);
}
public List<Map<String, Object>> setSchemeApplicableStaffUserInfo(List<Long> ids) {
diff --git a/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java b/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java
index 1887b27..f26bc5f 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockInRecordController.java
@@ -4,7 +4,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.stock.dto.StockInRecordDto;
import com.ruoyi.stock.service.StockInRecordService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -20,37 +21,37 @@
@Tag(name = "鍏ュ簱")
@RequestMapping("/stockInRecord")
@RequiredArgsConstructor
-public class StockInRecordController {
+public class StockInRecordController extends BaseController {
private final StockInRecordService stockInRecordService;
@GetMapping("/listPage")
@Log(title = "鐢熶骇鍏ュ簱-鍏ュ簱绠＄悊-鍒楄〃", businessType = BusinessType.OTHER)
@Operation(summary = "鍏ュ簱绠＄悊鍒楄〃")
- public AjaxResult listPage(Page page, StockInRecordDto stockInRecordDto) {
+ public R<?> listPage(Page page, StockInRecordDto stockInRecordDto) {
IPage<StockInRecordDto> result = stockInRecordService.listPage(page, stockInRecordDto);
- return AjaxResult.success(result);
+ return R.ok(result);
}
@DeleteMapping("")
@Log(title = "鍏ュ簱绠＄悊-鍒犻櫎鍏ュ簱", businessType = BusinessType.DELETE)
- public AjaxResult delete(@RequestBody List<Long> ids) {
+ public R<?> delete(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return AjaxResult.success(stockInRecordService.batchDelete(ids));
+ return R.ok(stockInRecordService.batchDelete(ids));
}
@DeleteMapping("/pending")
@Log(title = "鍏ュ簱绠＄悊-鍒犻櫎寰呭鎵瑰叆搴�", businessType = BusinessType.DELETE)
@Operation(summary = "鍒犻櫎寰呭鎵圭殑鍏ュ簱璁板綍")
- public AjaxResult deletePending(@RequestBody List<Long> ids) {
+ public R<?> deletePending(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return AjaxResult.success(stockInRecordService.batchDeletePending(ids));
+ return R.ok(stockInRecordService.batchDeletePending(ids));
}
@PostMapping("/exportStockInRecord")
@@ -62,12 +63,12 @@
@PostMapping("/approve")
@Log(title = "鍏ュ簱绠＄悊-瀹℃壒鍏ュ簱", businessType = BusinessType.UPDATE)
@Operation(summary = "鎵归噺瀹℃壒鍏ュ簱璁板綍")
- public AjaxResult approve(@RequestBody StockInRecordDto approveDto) {
+ public R<?> approve(@RequestBody StockInRecordDto approveDto) {
if(CollectionUtils.isEmpty(approveDto.getIds())){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
stockInRecordService.batchApprove(approveDto.getIds(), approveDto.getApprovalStatus());
- return AjaxResult.success();
+ return R.ok();
}
}
diff --git a/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java b/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java
index 7351890..c99458b 100644
--- a/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java
+++ b/src/main/java/com/ruoyi/stock/controller/StockOutRecordController.java
@@ -4,16 +4,16 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.stock.dto.StockOutRecordDto;
import com.ruoyi.stock.service.StockOutRecordService;
-import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
-import jakarta.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -34,40 +34,40 @@
@GetMapping("/listPage")
@Log(title = "鐢熶骇鍑哄簱-鍑哄簱绠＄悊-鍒楄〃", businessType = BusinessType.OTHER)
@Operation(summary = "鍑哄簱绠＄悊鍒楄〃")
- public AjaxResult listPage(Page page, StockOutRecordDto stockOutRecordDto) {
+ public R listPage(Page page, StockOutRecordDto stockOutRecordDto) {
IPage<StockOutRecordDto> result = stockOutRecordService.listPage(page, stockOutRecordDto);
- return AjaxResult.success(result);
+ return R.ok(result);
}
@PostMapping("")
@Log(title = "鍑哄簱绠＄悊-鏂板鍑哄簱", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody StockOutRecordDto stockOutRecordDto) {
- return AjaxResult.success(stockOutRecordService.add(stockOutRecordDto));
+ public R add(@RequestBody StockOutRecordDto stockOutRecordDto) {
+ return R.ok(stockOutRecordService.add(stockOutRecordDto));
}
@PutMapping("/{id}")
@Log(title = "鍑哄簱绠＄悊-鏇存柊鍑哄簱", businessType = BusinessType.UPDATE)
- public AjaxResult update(@PathVariable("id") Long id, @RequestBody StockOutRecordDto stockOutRecordDto) {
- return AjaxResult.success(stockOutRecordService.update(id, stockOutRecordDto));
+ public R update(@PathVariable("id") Long id, @RequestBody StockOutRecordDto stockOutRecordDto) {
+ return R.ok(stockOutRecordService.update(id, stockOutRecordDto));
}
@DeleteMapping("")
@Log(title = "鍑哄簱绠＄悊-鍒犻櫎鍑哄簱", businessType = BusinessType.DELETE)
- public AjaxResult delete(@RequestBody List<Long> ids) {
+ public R delete(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return AjaxResult.success(stockOutRecordService.batchDelete(ids));
+ return R.ok(stockOutRecordService.batchDelete(ids));
}
@DeleteMapping("/pending")
@Log(title = "鍑哄簱绠＄悊-鍒犻櫎寰呭鎵瑰嚭搴�", businessType = BusinessType.DELETE)
@Operation(summary = "鍒犻櫎寰呭鎵圭殑鍑哄簱璁板綍")
- public AjaxResult deletePending(@RequestBody List<Long> ids) {
+ public R deletePending(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
- return AjaxResult.success(stockOutRecordService.batchDeletePending(ids));
+ return R.ok(stockOutRecordService.batchDeletePending(ids));
}
@PostMapping("/exportStockOutRecord")
@@ -79,12 +79,12 @@
@PostMapping("/approve")
@Log(title = "鍑哄簱绠＄悊-瀹℃壒鍑哄簱", businessType = BusinessType.UPDATE)
@Operation(summary = "鎵归噺瀹℃壒鍑哄簱璁板綍")
- public AjaxResult approve(@RequestBody StockOutRecordDto approveDto) {
+ public R approve(@RequestBody StockOutRecordDto approveDto) {
if(CollectionUtils.isEmpty(approveDto.getIds())){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
stockOutRecordService.batchApprove(approveDto.getIds(), approveDto.getApprovalStatus());
- return AjaxResult.success();
+ return R.ok();
}
}
diff --git a/src/main/java/com/ruoyi/technology/controller/TechnologyOperationParamController.java b/src/main/java/com/ruoyi/technology/controller/TechnologyOperationParamController.java
index 061a50c..2932068 100644
--- a/src/main/java/com/ruoyi/technology/controller/TechnologyOperationParamController.java
+++ b/src/main/java/com/ruoyi/technology/controller/TechnologyOperationParamController.java
@@ -2,7 +2,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.technology.bean.dto.TechnologyOperationParamDto;
import com.ruoyi.technology.bean.vo.TechnologyOperationParamVo;
@@ -19,7 +19,7 @@
@RequestMapping("/technologyOperationParam")
@Tag(name = "宸ュ簭鍙傛暟")
@RequiredArgsConstructor
-public class TechnologyOperationParamController {
+public class TechnologyOperationParamController extends BaseController {
private final TechnologyOperationParamService technologyOperationParamService;
@@ -38,7 +38,7 @@
@DeleteMapping("/batchDelete/{id}")
@Log(title = "Delete technology operation param", businessType = BusinessType.DELETE)
@Operation(summary = "鍒犻櫎宸ュ簭鍙傛暟")
- public AjaxResult batchDelete(@PathVariable("id") Long id) {
- return AjaxResult.success(technologyOperationParamService.batchDelete(id));
+ public R<?> batchDelete(@PathVariable("id") Long id) {
+ return R.ok(technologyOperationParamService.batchDelete(id));
}
}
diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java
index 7b51803..a02f8bd 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentClassificationController.java
@@ -3,7 +3,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.warehouse.pojo.DocumentClassification;
import com.ruoyi.warehouse.service.DocumentClassificationService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -23,30 +23,30 @@
//鏍戠粨鏋�
@GetMapping("/getList")
- public AjaxResult getList() {
- return AjaxResult.success(documentClassificationService.selectDocumentClassificationList());
+ public R<?> getList() {
+ return R.ok(documentClassificationService.selectDocumentClassificationList());
}
@PostMapping("/add")
@Operation(summary = "鏂囨。鍒嗙被-娣诲姞")
@Log(title = "鏂囨。鍒嗙被-娣诲姞", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody DocumentClassification documentClassification) {
- return AjaxResult.success(documentClassificationService.save(documentClassification));
+ public R<?> add(@RequestBody DocumentClassification documentClassification) {
+ return R.ok(documentClassificationService.save(documentClassification));
}
@PutMapping("/update")
@Operation(summary = "鏂囨。鍒嗙被-鏇存柊")
@Log(title = "鏂囨。鍒嗙被-鏇存柊", businessType = BusinessType.UPDATE)
- public AjaxResult update(@RequestBody DocumentClassification documentClassification) {
- return AjaxResult.success(documentClassificationService.updateById(documentClassification));
+ public R<?> update(@RequestBody DocumentClassification documentClassification) {
+ return R.ok(documentClassificationService.updateById(documentClassification));
}
@DeleteMapping("/delete")
@Operation(summary = "鏂囨。鍒嗙被鍒犻櫎")
@Log(title = "鏂囨。鍒嗙被鍒犻櫎", businessType = BusinessType.DELETE)
- public AjaxResult delete(@RequestBody List<Long> ids) {
- if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return AjaxResult.success(documentClassificationService.deleteByIds(ids));
+ public R<?> delete(@RequestBody List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.ok(documentClassificationService.deleteByIds(ids));
}
}
diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
index 2a1c966..cb51df9 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentationBorrowManagementController.java
@@ -4,7 +4,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.warehouse.mapper.DocumentationReturnManagementMapper;
import com.ruoyi.warehouse.pojo.DocumentationBorrowManagement;
import com.ruoyi.warehouse.pojo.DocumentationReturnManagement;
@@ -30,64 +30,64 @@
@GetMapping("/listPage")
@Operation(summary = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒嗛〉鏌ヨ")
@Log(title = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPage(Page page, DocumentationBorrowManagement documentationBorrowManagement) {
- return AjaxResult.success(documentationBorrowManagementService.listPage(page, documentationBorrowManagement));
+ public R<?> listPage(Page page, DocumentationBorrowManagement documentationBorrowManagement) {
+ return R.ok(documentationBorrowManagementService.listPage(page, documentationBorrowManagement));
}
@GetMapping("/list")
@Operation(summary = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鏌ヨ")
@Log(title = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult list() {
- return AjaxResult.success(documentationBorrowManagementService.listAll());
+ public R<?> list() {
+ return R.ok(documentationBorrowManagementService.listAll());
}
@GetMapping("/listPageReturn")
@Operation(summary = "鏂囨。鍊熼槄绠＄悊-褰掕繕鍒嗛〉鏌ヨ")
@Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPageReturn(Page page, DocumentationReturnManagement documentationReturnManagement) {
- return AjaxResult.success(documentationReturnManagementMapper.listPage(page, documentationReturnManagement));
+ public R<?> listPageReturn(Page page, DocumentationReturnManagement documentationReturnManagement) {
+ return R.ok(documentationReturnManagementMapper.listPage(page, documentationReturnManagement));
}
@GetMapping("/getByDocumentationId/{id}")
@Operation(summary = "鏍规嵁涔︾睄id鏌ヨ鍊熼槄璁板綍")
@Log(title = "鏍规嵁涔︾睄id鏌ヨ鍊熼槄璁板綍", businessType = BusinessType.OTHER)
- public AjaxResult getByDocumentationId(@PathVariable Long id) {
- return AjaxResult.success(documentationBorrowManagementService.selectByDocumentationId(id));
+ public R<?> getByDocumentationId(@PathVariable Long id) {
+ return R.ok(documentationBorrowManagementService.selectByDocumentationId(id));
}
@PostMapping("/add")
@Operation(summary = "鏂囨。鍊熼槄绠＄悊-鍊熼槄")
@Log(title = "鏂囨。鍊熼槄绠＄悊-鍊熼槄", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody DocumentationBorrowManagement documentationBorrowManagement) {
- return AjaxResult.success(documentationBorrowManagementService.add(documentationBorrowManagement));
+ public R<?> add(@RequestBody DocumentationBorrowManagement documentationBorrowManagement) {
+ return R.ok(documentationBorrowManagementService.add(documentationBorrowManagement));
}
@PutMapping("/revent")
@Operation(summary = "鏂囨。鍊熼槄绠＄悊-褰掕繕")
@Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕", businessType = BusinessType.UPDATE)
- public AjaxResult revent(@RequestBody DocumentationReturnManagement documentationReturnManagement) {
- return AjaxResult.success(documentationBorrowManagementService.reventdbm(documentationReturnManagement));
+ public R<?> revent(@RequestBody DocumentationReturnManagement documentationReturnManagement) {
+ return R.ok(documentationBorrowManagementService.reventdbm(documentationReturnManagement));
}
@PutMapping("/update")
@Operation(summary = "鏂囨。鍊熼槄绠＄悊-鏇存柊")
@Log(title = "鏂囨。鍊熼槄绠＄悊-鏇存柊", businessType = BusinessType.UPDATE)
- public AjaxResult update(@RequestBody DocumentationBorrowManagement documentationBorrowManagement) {
- return AjaxResult.success(documentationBorrowManagementService.updateById(documentationBorrowManagement));
+ public R<?> update(@RequestBody DocumentationBorrowManagement documentationBorrowManagement) {
+ return R.ok(documentationBorrowManagementService.updateById(documentationBorrowManagement));
}
@PutMapping("/reventUpdate")
@Operation(summary = "鏂囨。鍊熼槄绠＄悊-褰掕繕鏇存柊")
@Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕鏇存柊", businessType = BusinessType.UPDATE)
- public AjaxResult reventupdate(@RequestBody DocumentationReturnManagement documentationReturnManagement) {
- return AjaxResult.success(documentationReturnManagementMapper.updateById(documentationReturnManagement));
+ public R<?> reventupdate(@RequestBody DocumentationReturnManagement documentationReturnManagement) {
+ return R.ok(documentationReturnManagementMapper.updateById(documentationReturnManagement));
}
@DeleteMapping ("/delete")
@Operation(summary = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒犻櫎")
@Log(title = "鏂囨。鍊熼槄绠＄悊-鍊熼槄鍒犻櫎", businessType = BusinessType.DELETE)
- public AjaxResult delete(@RequestBody List<Long> ids) {
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return AjaxResult.success(documentationBorrowManagementService.deleteByIds(ids));
+ public R<?> delete(@RequestBody List<Long> ids) {
+ if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.ok(documentationBorrowManagementService.deleteByIds(ids));
}
@DeleteMapping ("/reventDelete")
@Operation(summary = "鏂囨。鍊熼槄绠＄悊-褰掕繕鍒犻櫎")
@Log(title = "鏂囨。鍊熼槄绠＄悊-褰掕繕鍒犻櫎", businessType = BusinessType.DELETE)
- public AjaxResult reventdelete(@RequestBody List<Long> ids) {
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return AjaxResult.success(documentationBorrowManagementService.reventDeleteByIds(ids));
+ public R<?> reventdelete(@RequestBody List<Long> ids) {
+ if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.ok(documentationBorrowManagementService.reventDeleteByIds(ids));
}
@PostMapping("/export")
@Operation(summary = "鏂囨。鍊熼槄绠＄悊-鍊熼槄瀵煎嚭")
diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java
index 427396b..614c62e 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentationController.java
@@ -6,7 +6,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.warehouse.dto.DocumentationDto;
import com.ruoyi.warehouse.pojo.Documentation;
import com.ruoyi.warehouse.service.DocumentationService;
@@ -30,39 +30,39 @@
@GetMapping("/listPage")
@Operation(summary = "鏂囨。淇℃伅琛�-鍒嗛〉鏌ヨ")
@Log(title = "鏂囨。淇℃伅琛�-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPage(Page page, Documentation documentation) {
+ public R<?> listPage(Page page, Documentation documentation) {
IPage<DocumentationDto> list = documentationService.listPage(page, documentation);
- return AjaxResult.success(list);
+ return R.ok(list);
}
@GetMapping("/list")
@Operation(summary = "鏂囨。淇℃伅琛ㄦ煡璇�")
@Log(title = "鏂囨。淇℃伅琛ㄦ煡璇�", businessType = BusinessType.OTHER)
- public AjaxResult list() {
+ public R<?> list() {
List<DocumentationDto> list = documentationService.listAll();
- return AjaxResult.success(list);
+ return R.ok(list);
}
@PostMapping("/add")
@Operation(summary = "鏂囨。淇℃伅琛�-娣诲姞")
@Log(title = "鏂囨。淇℃伅琛�-娣诲姞", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody Documentation documentation) {
- return AjaxResult.success(documentationService.save(documentation));
+ public R<?> add(@RequestBody Documentation documentation) {
+ return R.ok(documentationService.save(documentation));
}
@PutMapping("/update")
@Operation(summary = "鏂囨。淇℃伅琛�-鏇存柊")
@Log(title = "鏂囨。淇℃伅琛�-鏇存柊", businessType = BusinessType.UPDATE)
- public AjaxResult update(@RequestBody Documentation documentation) {
- return AjaxResult.success(documentationService.updateById(documentation));
+ public R<?> update(@RequestBody Documentation documentation) {
+ return R.ok(documentationService.updateById(documentation));
}
@DeleteMapping("/delete")
@Operation(summary = "鏂囨。淇℃伅琛�-鍒犻櫎")
@Log(title = "鏂囨。淇℃伅琛�-鍒犻櫎", businessType = BusinessType.DELETE)
- public AjaxResult delete(@RequestBody List<Long> ids) {
- if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return AjaxResult.success(documentationService.deleteByIds(ids));
+ public R<?> delete(@RequestBody List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.ok(documentationService.deleteByIds(ids));
}
@PostMapping("/export")
@@ -74,24 +74,24 @@
@Operation(summary = "鏂囨。淇℃伅琛�-缁熻")
@GetMapping("/overview")
- public AjaxResult getOverviewStatistics() {
+ public R<?> getOverviewStatistics() {
Map<String, Object> result = new HashMap<>();
result.put("totalDocsCount", documentationService.getTotalDocsCount());
result.put("categoryNumCount", documentationService.getCategoryNumCount());
result.put("borrowedDocsCount", documentationService.getBorrowedDocsCount());
result.put("monthlyAddedDocsCount", documentationService.getMonthlyAddedDocsCount());
- return AjaxResult.success(result);
+ return R.ok(result);
}
@Operation(summary = "鏂囨。淇℃伅琛�-鍒嗙被缁熻")
@GetMapping("/category")
- public AjaxResult getCategoryDistribution() {
- return AjaxResult.success(documentationService.getCategoryDistribution());
+ public R<?> getCategoryDistribution() {
+ return R.ok(documentationService.getCategoryDistribution());
}
@Operation(summary = "鏂囨。淇℃伅琛�-鐘舵�佺粺璁�")
@GetMapping("/status")
- public AjaxResult getStatusDistribution() {
- return AjaxResult.success(documentationService.getStatusDistribution());
+ public R<?> getStatusDistribution() {
+ return R.ok(documentationService.getStatusDistribution());
}
}
diff --git a/src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java b/src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java
index 9c8517e..6ec0e54 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/DocumentationFileController.java
@@ -3,7 +3,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.account.pojo.AccountFile;
import com.ruoyi.account.service.AccountFileService;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.warehouse.pojo.DocumentationFile;
import com.ruoyi.warehouse.service.DocumentationFileService;
import org.springframework.util.CollectionUtils;
@@ -17,7 +18,7 @@
*/
@RestController
@RequestMapping("/documentation/documentationFile")
-public class DocumentationFileController {
+public class DocumentationFileController extends BaseController {
@Resource
@@ -29,8 +30,8 @@
* @return
*/
@PostMapping("/add")
- public AjaxResult add(@RequestBody DocumentationFile documentationFile) {
- return AjaxResult.success(documentationFileService.save(documentationFile));
+ public R<?> add(@RequestBody DocumentationFile documentationFile) {
+ return R.ok(documentationFileService.save(documentationFile));
}
/**
@@ -39,12 +40,12 @@
* @return
*/
@DeleteMapping("/del")
- public AjaxResult delDocumentationFile(@RequestBody List<Long> ids) {
+ public R<?> delDocumentationFile(@RequestBody List<Long> ids) {
if(CollectionUtils.isEmpty(ids)){
- return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
}
//鍒犻櫎妫�楠岄檮浠�
- return AjaxResult.success(documentationFileService.removeBatchByIds(ids));
+ return R.ok(documentationFileService.removeBatchByIds(ids));
}
/**
@@ -54,8 +55,8 @@
* @return
*/
@GetMapping("/listPage")
- public AjaxResult documentationFileListPage(DocumentationFile documentationFile) {
- return AjaxResult.success(documentationFileService.documentationFileListPage( documentationFile));
+ public R<?> documentationFileListPage(DocumentationFile documentationFile) {
+ return R.ok(documentationFileService.documentationFileListPage( documentationFile));
}
diff --git a/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java b/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
index 7d80dd1..f8b6f96 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/WarehouseController.java
@@ -4,7 +4,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.warehouse.pojo.Warehouse;
import com.ruoyi.warehouse.service.WarehouseService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -25,36 +25,36 @@
@GetMapping("/tree")
@Operation(summary = "浠撳簱-鏌ヨ鏍�")
@Log(title = "浠撳簱-鏌ヨ鏍�", businessType = BusinessType.OTHER)
- public AjaxResult listTree() {
- return AjaxResult.success(warehouseService.findListTree());
+ public R<?> listTree() {
+ return R.ok(warehouseService.findListTree());
}
@GetMapping("/list")
@Operation(summary = "浠撳簱-鏌ヨ")
@Log(title = "浠撳簱-鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult list(Warehouse warehouse) {
- return AjaxResult.success(warehouseService.findList(warehouse));
+ public R<?> list(Warehouse warehouse) {
+ return R.ok(warehouseService.findList(warehouse));
}
@PostMapping("/add")
@Operation(summary = "浠撳簱-娣诲姞")
@Log(title = "浠撳簱-娣诲姞", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody Warehouse warehouse) {
- return AjaxResult.success(warehouseService.save(warehouse));
+ public R<?> add(@RequestBody Warehouse warehouse) {
+ return R.ok(warehouseService.save(warehouse));
}
@PutMapping("/update")
@Operation(summary = "浠撳簱-鏇存柊")
@Log(title = "浠撳簱-鏇存柊", businessType = BusinessType.UPDATE)
- public AjaxResult update(@RequestBody Warehouse warehouse) {
- return AjaxResult.success(warehouseService.updateById(warehouse));
+ public R<?> update(@RequestBody Warehouse warehouse) {
+ return R.ok(warehouseService.updateById(warehouse));
}
@DeleteMapping("/delete")
@Operation(summary = "浠撳簱-鍒犻櫎")
@Log(title = "浠撳簱-鍒犻櫎", businessType = BusinessType.DELETE)
- public AjaxResult delete(@RequestBody List<Long> ids) {
- if (CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return AjaxResult.success(warehouseService.deleteByIds(ids));
+ public R<?> delete(@RequestBody List<Long> ids) {
+ if (CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.ok(warehouseService.deleteByIds(ids));
}
}
diff --git a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
index 5aebb76..644cea9 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesController.java
@@ -4,7 +4,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.warehouse.dto.WarehouseGoodsShelvesDto;
import com.ruoyi.warehouse.pojo.WarehouseGoodsShelves;
import com.ruoyi.warehouse.service.WarehouseGoodsShelvesService;
@@ -25,27 +25,27 @@
@GetMapping("/listById")
@Operation(summary = "鍟嗗搧璐ф灦-鏌ヨ")
@Log(title = "鍟嗗搧璐ф灦-鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listById(WarehouseGoodsShelves warehouseGoodsShelves) {
+ public R<?> listById(WarehouseGoodsShelves warehouseGoodsShelves) {
List<WarehouseGoodsShelvesDto> list = warehouseGoodsShelvesService.findList(warehouseGoodsShelves);
- return AjaxResult.success(list);
+ return R.ok(list);
}
@PostMapping("/add")
@Operation(summary = "鍟嗗搧璐ф灦-娣诲姞")
@Log(title = "鍟嗗搧璐ф灦-娣诲姞", businessType = BusinessType.INSERT)
- public AjaxResult add(@RequestBody WarehouseGoodsShelves warehouseGoodsShelves) {
- return AjaxResult.success(warehouseGoodsShelvesService.add(warehouseGoodsShelves));
+ public R<?> add(@RequestBody WarehouseGoodsShelves warehouseGoodsShelves) {
+ return R.ok(warehouseGoodsShelvesService.add(warehouseGoodsShelves));
}
@PutMapping("/update")
@Operation(summary = "鍟嗗搧璐ф灦-鏇存柊")
@Log(title = "鍟嗗搧璐ф灦-鏇存柊", businessType = BusinessType.UPDATE)
- public AjaxResult update(@RequestBody WarehouseGoodsShelves warehouseGoodsShelves) {
- return AjaxResult.success(warehouseGoodsShelvesService.updateRowcolById(warehouseGoodsShelves));
+ public R<?> update(@RequestBody WarehouseGoodsShelves warehouseGoodsShelves) {
+ return R.ok(warehouseGoodsShelvesService.updateRowcolById(warehouseGoodsShelves));
}
@DeleteMapping("/delete")
@Operation(summary = "鍟嗗搧璐ф灦-鍒犻櫎")
@Log(title = "鍟嗗搧璐ф灦-鍒犻櫎", businessType = BusinessType.DELETE)
- public AjaxResult delete(@RequestBody List<Long> ids) {
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
- return AjaxResult.success(warehouseGoodsShelvesService.deleteByIds(ids));
+ public R<?> delete(@RequestBody List<Long> ids) {
+ if(CollectionUtils.isEmpty(ids)) return R.fail("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
+ return R.ok(warehouseGoodsShelvesService.deleteByIds(ids));
}
}
diff --git a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesRowcolController.java b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesRowcolController.java
index ed3ed06..f9a4666 100644
--- a/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesRowcolController.java
+++ b/src/main/java/com/ruoyi/warehouse/controller/WarehouseGoodsShelvesRowcolController.java
@@ -3,7 +3,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.warehouse.dto.WarehouseGoodsShelvesRowcolDto;
import com.ruoyi.warehouse.pojo.WarehouseGoodsShelvesRowcol;
import com.ruoyi.warehouse.service.WarehouseGoodsShelvesRowcolService;
@@ -26,10 +26,10 @@
@GetMapping("/list")
@Operation(summary = "鍟嗗搧璐ф灦琛屽垪-鏌ヨ")
@Log(title = "鍟嗗搧璐ф灦琛屽垪-鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult list(WarehouseGoodsShelvesRowcol warehouseGoodsShelvesRowcol) {
+ public R<?> list(WarehouseGoodsShelvesRowcol warehouseGoodsShelvesRowcol) {
List<WarehouseGoodsShelvesRowcolDto> list = warehouseGoodsShelvesRowcolService.getList(warehouseGoodsShelvesRowcol);
- return AjaxResult.success(list);
+ return R.ok(list);
}
}
diff --git a/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java b/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java
index be3933b..b22de49 100644
--- a/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java
+++ b/src/main/java/com/ruoyi/waterrecord/controller/WaterRecordController.java
@@ -6,7 +6,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.waterrecord.pojo.WaterRecord;
import com.ruoyi.waterrecord.service.WaterRecordService;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -35,34 +35,34 @@
@GetMapping("/listPage")
@Log(title = "鐢ㄦ按绠＄悊-鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- public AjaxResult listPage(Page page, WaterRecord waterRecord){
+ public R<?> listPage(Page page, WaterRecord waterRecord){
IPage<WaterRecord> listPage = waterRecordService.listPage(page, waterRecord);
- return AjaxResult.success(listPage);
+ return R.ok(listPage);
}
@PostMapping("/add")
@Log(title = "鐢ㄦ按绠＄悊-鏂板", businessType = BusinessType.INSERT)
@Transactional(rollbackFor = Exception.class)
- public AjaxResult add(@RequestBody WaterRecord waterRecord){
+ public R<?> add(@RequestBody WaterRecord waterRecord){
boolean save = waterRecordService.save(waterRecord);
- return save ? AjaxResult.success() : AjaxResult.error();
+ return save ? R.ok() : R.fail();
}
@PostMapping("/update")
@Log(title = "鐢ㄦ按绠＄悊-淇敼", businessType = BusinessType.UPDATE)
@Transactional(rollbackFor = Exception.class)
- public AjaxResult update(@RequestBody WaterRecord waterRecord){
+ public R<?> update(@RequestBody WaterRecord waterRecord){
boolean update = waterRecordService.updateById(waterRecord);
- return update ? AjaxResult.success() : AjaxResult.error();
+ return update ? R.ok() : R.fail();
}
@DeleteMapping("/delete")
@Log(title = "鐢ㄦ按绠＄悊-鍒犻櫎", businessType = BusinessType.DELETE)
@Transactional(rollbackFor = Exception.class)
- public AjaxResult delete(@RequestBody List<Long> ids){
- if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
+ public R<?> delete(@RequestBody List<Long> ids){
+ if(CollectionUtils.isEmpty(ids)) return R.fail("璇烽�夋嫨鑷冲皯涓�鏉℃暟鎹�");
boolean delete = waterRecordService.removeBatchByIds(ids);
- return delete ? AjaxResult.success() : AjaxResult.error();
+ return delete ? R.ok() : R.fail();
}
/**
@@ -71,7 +71,7 @@
@Log(title = "瀵煎叆鐢ㄦ按绠＄悊", businessType = BusinessType.IMPORT)
@PostMapping("/importData")
@Operation(summary = "瀵煎叆鐢ㄦ按绠＄悊")
- public AjaxResult importData(MultipartFile file) throws Exception {
+ public R<?> importData(MultipartFile file) throws Exception {
return waterRecordService.importData(file);
}
diff --git a/src/main/java/com/ruoyi/waterrecord/service/WaterRecordService.java b/src/main/java/com/ruoyi/waterrecord/service/WaterRecordService.java
index 775fb25..879610c 100644
--- a/src/main/java/com/ruoyi/waterrecord/service/WaterRecordService.java
+++ b/src/main/java/com/ruoyi/waterrecord/service/WaterRecordService.java
@@ -3,7 +3,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.waterrecord.pojo.WaterRecord;
import org.springframework.web.multipart.MultipartFile;
@@ -21,5 +21,5 @@
*/
IPage<WaterRecord> listPage(Page page, WaterRecord waterRecord);
- AjaxResult importData(MultipartFile file);
+ R<?> importData(MultipartFile file);
}
diff --git a/src/main/java/com/ruoyi/waterrecord/service/impl/WaterRecordServiceImpl.java b/src/main/java/com/ruoyi/waterrecord/service/impl/WaterRecordServiceImpl.java
index 09604bc..b1c32b4 100644
--- a/src/main/java/com/ruoyi/waterrecord/service/impl/WaterRecordServiceImpl.java
+++ b/src/main/java/com/ruoyi/waterrecord/service/impl/WaterRecordServiceImpl.java
@@ -4,7 +4,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.framework.web.domain.R;
import com.ruoyi.waterrecord.mapper.WaterRecordMapper;
import com.ruoyi.waterrecord.pojo.WaterRecord;
import com.ruoyi.waterrecord.service.WaterRecordService;
@@ -34,18 +35,18 @@
}
@Override
- public AjaxResult importData(MultipartFile file) {
+ public R<?> importData(MultipartFile file) {
try {
ExcelUtil<WaterRecord> util = new ExcelUtil<WaterRecord>(WaterRecord.class);
List<WaterRecord> userList = util.importExcel(file.getInputStream());
if(CollectionUtils.isEmpty(userList)){
- return AjaxResult.warn("妯℃澘閿欒鎴栧鍏ユ暟鎹负绌�");
+ return R.fail(HttpStatus.WARN, "妯℃澘閿欒鎴栧鍏ユ暟鎹负绌�");
}
this.saveOrUpdateBatch(userList);
- return AjaxResult.success(true);
+ return R.ok(true);
}catch (Exception e){
e.printStackTrace();
- return AjaxResult.error("瀵煎叆澶辫触");
+ return R.fail("瀵煎叆澶辫触");
}
}
}
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 6d34f6b..883f2aa 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -7,7 +7,7 @@
# 鐗堟潈骞翠唤
copyrightYear: 2025
# 鏂囦欢璺緞 绀轰緥锛� Windows閰嶇疆D:/ruoyi/uploadPath锛孡inux閰嶇疆 /home/ruoyi/uploadPath锛�
- profile: D:/ruoyi/uploadPath
+ profile: /Users/mac/project/product-inventory-management/file
# 鑾峰彇ip鍦板潃寮�鍏�
addressEnabled: false
@@ -28,7 +28,7 @@
# 寮�鍙戠幆澧冮厤缃�
server:
# 鏈嶅姟鍣ㄧ殑HTTP绔彛锛岄粯璁や负8080
- port: 7006
+ port: 9009
servlet:
# 搴旂敤鐨勮闂矾寰�
context-path: /
@@ -57,7 +57,7 @@
accessKey: admin
secretKey: 12345678
preview-expiry: 24 # 棰勮鍦板潃榛樿24灏忔椂
- default-bucket: uploadPath
+ default-bucket: jxc
# 鐢ㄦ埛閰嶇疆
user:
password:
@@ -74,9 +74,9 @@
druid:
# 涓诲簱鏁版嵁婧�
master:
- url: jdbc:mysql://localhost:3306/product-inventory-management-new-pro?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://1.15.17.182:9999/product-inventory-management-new-pro?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: root
- password: 123456
+ password: xd@123456..
# 浠庡簱鏁版嵁婧�
slave:
# 浠庢暟鎹簮寮�鍏�/榛樿鍏抽棴
@@ -201,7 +201,7 @@
token:
# 浠ょ墝鑷畾涔夋爣璇�
header: Authorization
- # 浠ょ墝瀵嗛挜
+ # 浠ょ墝瀵嗛挜 鏂扮増jwt瀵嗛挜闀垮害蹇呴』64浣嶄互涓�
secret: xpAVjhCjQDaDB7mjPAzMDSbQWXNu2zYkTdDNUsPMS5Xx8QMmQVYN7n74eZrYJxDJ
# 浠ょ墝鏈夋晥鏈燂紙榛樿30鍒嗛挓锛�
expireTime: 450
@@ -254,18 +254,19 @@
# 鏄惁鍏佽鐢熸垚鏂囦欢瑕嗙洊鍒版湰鍦帮紙鑷畾涔夎矾寰勶級锛岄粯璁や笉鍏佽
allowOverwrite: false
+
+knowledge:
+ one: D:\鏂扮枂澶х綏绱犱紒涓氫骇鍝佷綋绯昏鏄庢枃妗�.md
+
# 鏂囦欢涓婁紶閰嶇疆
file:
- temp-dir: D:/ruoyi/temp/uploads # 涓存椂鐩綍 鍚庢湡鍒犻櫎
- upload-dir: D:/ruoyi/prod/uploads # 姝ｅ紡鐩綍 鍚庢湡鍒犻櫎
- path: D:/ruoyi/prod/uploads # 涓婁紶鐩綍
+ temp-dir: /Users/mac/project/product-inventory-management/file/temp/uploads
+ upload-dir: /Users/mac/project/product-inventory-management/file/prod/uploads
+ path: /Users/mac/project/product-inventory-management/download/uploads # 涓婁紶鐩綍
urlPrefix: /common # 閾炬帴鍓嶇紑
- domain: http://127.0.0.1:7006 # 鍩熷悕鍓嶇紑
+ domain: http://127.0.0.1:9009 # 鍩熷悕鍓嶇紑
expired: 120 # 杩囨湡鏃堕棿(鍗曚綅:鍒嗛挓)
useLimit: 10 # 浣跨敤娆℃暟
compress: true # 鏄惁鍘嬬缉
needCompressSize: 10MB # 鍘嬬缉闃堝��
compressQuality: 0.5 # 鍘嬬缉璐ㄩ噺(0.0-1.0)
-knowledge:
- one: D:\鏂扮枂澶х綏绱犱紒涓氫骇鍝佷綋绯昏鏄庢枃妗�.md
-
--
Gitblit v1.9.3