From 1750abd11320f8d09ffe1580b7467dba87c86c89 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 10 十二月 2025 14:40:25 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/DeviceMaintenanceController.java | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/DeviceMaintenanceController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/DeviceMaintenanceController.java
index 68d768e..6ed2503 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/DeviceMaintenanceController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/DeviceMaintenanceController.java
@@ -1,5 +1,6 @@
package com.example.erp.controller.pp;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.exception.ServiceException;
@@ -9,6 +10,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.sql.Date;
import java.util.Map;
@RestController
@@ -20,10 +22,11 @@
DeviceMaintenanceService deviceMaintenanceService;
@ApiOperation("璁惧鏂板鎺ュ彛")
+ @SaCheckPermission("addMachine.add")
@PostMapping("/saveMachine")
public Result saveTeamGroup( @RequestBody Map<String,Object> object){
if(deviceMaintenanceService.saveMachineSv(object)){
- return Result.seccess();
+ return Result.success();
}else {
throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
@@ -32,14 +35,15 @@
@ApiOperation("鏌ヨ涓嬫媺妗嗘暟鎹帴鍙�")
@PostMapping ("/selectData")
public Result selectData() {
- return Result.seccess(deviceMaintenanceService.selectDataSv());
+ return Result.success(deviceMaintenanceService.selectDataSv());
}
@ApiOperation("淇濆吇缁翠慨鏂板鎺ュ彛")
+ @SaCheckPermission("addMaintenanceAndRepair.add")
@PostMapping("/saveMaintenanceAndRepair")
public Result saveMaintenanceAndRepair( @RequestBody Map<String,Object> object){
if(deviceMaintenanceService.saveMaintenanceAndRepairSv(object)){
- return Result.seccess();
+ return Result.success();
}else {
throw new ServiceException(Constants.Code_500,"淇濆瓨澶辫触");
@@ -47,21 +51,47 @@
}
@ApiOperation("鏌ヨ缁翠慨淇濆吇鏁版嵁鎺ュ彛")
- @PostMapping ("/selectMaintenance")
- public Result selectMaintenance() {
- return Result.seccess(deviceMaintenanceService.selectMaintenanceSv());
+ @PostMapping ("/selectMaintenance/{selectTime1}/{selectTime2}")
+ public Result selectMaintenance(
+ @PathVariable Date selectTime1,
+ @PathVariable Date selectTime2
+ ) {
+ return Result.success(deviceMaintenanceService.selectMaintenanceSv(selectTime1,selectTime2));
}
@ApiOperation("鍒犻櫎缁翠慨淇濆吇璁板綍鎺ュ彛")
+ @SaCheckPermission("maintenanceAndRepair.delete")
@PostMapping("/deleteMaintenance/{id}")
public Result deleteMaintenance(@PathVariable String id){
if(deviceMaintenanceService.deleteMaintenanceSv(id)){
- return Result.seccess();
+ return Result.success();
}else {
throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触锛�");
}
}
+ @ApiOperation("鏌ヨ璁惧绠＄悊鎺ュ彛")
+ @SaCheckPermission("selectMachine.search")
+ @PostMapping ("/selectMachine")
+ public Result selectMachine() {
+ return Result.success(deviceMaintenanceService.selectMachineSv());
+ }
+
+ @ApiOperation("鏍规嵁Id鏌ヨ瀵瑰簲鏁版嵁鎺ュ彛")
+ @PostMapping ("/openSelectId/{id}")
+ public Result openSelectId(
+ @PathVariable String id){
+ return Result.success(deviceMaintenanceService.openSelectIdSv(id));
+
+ }
+
+ @ApiOperation("璁惧淇濆吇缁翠慨淇敼鎺ュ彛")
+ @PostMapping("/updateMaintenance")
+ public Result deleteOrderWork(
+ @RequestBody Map<String,Object> object
+ ){
+ return Result.success(deviceMaintenanceService.updateMaintenance(object));
+ }
}
--
Gitblit v1.8.0