From 52f15a571a64570cdca22c9ba197cd964281faac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=B0=8F=E6=9E=97?= <320730042@qq.com> Date: Fri, 9 Aug 2024 16:04:11 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9D=83=E9=99=90=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bellmann/controller/DeviceStaticController.java | 2 ++ .../bellmann/controller/DeviceTypeVerController.java | 10 ++++++++++ .../bellmann/controller/OperateTask2Controller.java | 2 ++ .../com/bellmann/controller/OrderInfoController.java | 1 + .../com/bellmann/controller/TypeVerExtController.java | 2 ++ .../bellmann/service/impl/DeviceStaticServiceImpl.java | 7 +++++-- 6 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/bellmann/controller/DeviceStaticController.java b/src/main/java/com/bellmann/controller/DeviceStaticController.java index da83ce1..48a7f56 100644 --- a/src/main/java/com/bellmann/controller/DeviceStaticController.java +++ b/src/main/java/com/bellmann/controller/DeviceStaticController.java @@ -22,6 +22,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -133,6 +134,7 @@ public class DeviceStaticController { @GetMapping("/remote/check-dev-online/{devId}") @Operation(summary = "远程操作-查询设备状态") + @PreAuthorize("@ss.hasPerm('remote:detail:device:online')") @PreventDuplicateSubmit public Result checkDevOnline(@PathVariable Long devId) { Long count = remoteOperateTaskService.sendTaskByDevId(devId, SecurityUtils.getUsername(), RemoteOperateMsgEnum.TOUCH_DEVICE.getValue()); diff --git a/src/main/java/com/bellmann/controller/DeviceTypeVerController.java b/src/main/java/com/bellmann/controller/DeviceTypeVerController.java index 6bd2431..a7c4819 100644 --- a/src/main/java/com/bellmann/controller/DeviceTypeVerController.java +++ b/src/main/java/com/bellmann/controller/DeviceTypeVerController.java @@ -17,6 +17,7 @@ import com.bellmann.service.DeviceTypeVerService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -39,6 +40,7 @@ public class DeviceTypeVerController { } @Operation(summary = "审核设备类型版本") + @PreAuthorize("@ss.hasPerm('device:type:ver:status')") @PutMapping("/audit-soft-state/{typeAndVerId}") public Result updateTypeAndVersionState(@PathVariable @Valid @NotNull(message = "设备类型软件版本ID为空") Long typeAndVerId){ return deviceTypeVerService.updateTypeAndVersionState(typeAndVerId); @@ -47,12 +49,14 @@ public class DeviceTypeVerController { @Operation(summary = "审核最新软件版本") @PutMapping("/audit-new-soft-state/{typeAndVerId}") + @PreAuthorize("@ss.hasPerm('device:type:soft:ver:audit')") public Result updateTypeNewSoftState( @PathVariable @Valid @NotNull(message = "设备类型软件版本ID为空") Long typeAndVerId){ return deviceTypeVerService.updateTypeNewSoftState(typeAndVerId); } @Operation(summary = "复制设备类型软件版本信息") + @PreAuthorize("@ss.hasPerm('device:type:ver:copy')") @PutMapping("/audit-new-soft-state/{typeAndVerId}/{devTypeId}") public Result copySoftVerToOtherOui( @PathVariable @Valid @NotNull(message = "设备类型软件版本ID为空") Long typeAndVerId, @@ -63,12 +67,14 @@ public class DeviceTypeVerController { } @Operation(summary = "删除设备类型软件版本") + @PreAuthorize("@ss.hasPerm('device:type:ver:delete')") @DeleteMapping("/delete-device-type/{typeAndVerId}") public Result deleteDeviceTypeVersionById( @PathVariable @Valid @NotNull(message = "设备类型软件版本ID为空") Long typeAndVerId){ return deviceTypeVerService.deleteDeviceTypeVersionById(typeAndVerId); } @Operation(summary = "删除软件版本文件") + @PreAuthorize("@ss.hasPerm('device:type:ver:delete:file')") @DeleteMapping("/delete-device-ver-file/{typeAndVerId}/{fileId}") public Result deleteDeviceTypeVersionFile( @PathVariable @Valid @NotNull(message = "设备类型软件版本ID为空") Long typeAndVerId, @@ -83,12 +89,14 @@ public class DeviceTypeVerController { } @Operation(summary = "修改设备类型软件版本信息 ") @PostMapping("/edit-dev-type-ver-form") + @PreAuthorize("@ss.hasPerm('device:type:ver:update:info')") public Result editDevTypeVerForm(@RequestBody DeviceTypeVerForm deviceTypeVerForm){ int rows = deviceTypeVerService.editDevTypeVerForm(deviceTypeVerForm); return Result.success(rows); } @Operation(summary = "新增厂商配置文件信息") @PostMapping("/add-vendor-profile") + @PreAuthorize("@ss.hasPerm('device:type:ver:add:profile')") public Result addVendorProfile(@RequestBody VendorProfileForm form){ return deviceTypeVerService.addVendorProfile(form); } @@ -101,6 +109,7 @@ public class DeviceTypeVerController { } @Operation(summary = "删除厂商配置文件信息") + @PreAuthorize("@ss.hasPerm('device:type:ver:delete:profile')") @DeleteMapping("/delete-vendor-profile/{fileId}/{typeAndVerId}") public Result deleteVendorProfile(@PathVariable Long fileId, @PathVariable Long typeAndVerId){ int rows = deviceTypeVerService.deleteVendorProfile(fileId,typeAndVerId); @@ -121,6 +130,7 @@ public class DeviceTypeVerController { } @Operation(summary = "更新软件版本系统管理域数据") @PostMapping("/edit-ver-domain/{typeAndVerId}") + @PreAuthorize("@ss.hasPerm('device:type:ver:add:domain')") public Result editVerDomain(@PathVariable Long typeAndVerId,@RequestBody List list){ int rows = deviceTypeVerService.editVerDomain(typeAndVerId,list); return Result.success(rows); diff --git a/src/main/java/com/bellmann/controller/OperateTask2Controller.java b/src/main/java/com/bellmann/controller/OperateTask2Controller.java index 0247830..ee8035a 100644 --- a/src/main/java/com/bellmann/controller/OperateTask2Controller.java +++ b/src/main/java/com/bellmann/controller/OperateTask2Controller.java @@ -8,6 +8,7 @@ import com.bellmann.service.OperateTask2Service; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; /** @@ -27,6 +28,7 @@ public class OperateTask2Controller { private final OperateTask2Service operateTask2Service; @PostMapping("/page/{devId}") + @PreAuthorize("@ss.hasPerm('remote:detail:task:list')") @Operation(summary = "远程操作-设备任务列表") public PageResult page(@PathVariable Long devId, @RequestBody BasePageQuery query){ return operateTask2Service.page(devId,query); diff --git a/src/main/java/com/bellmann/controller/OrderInfoController.java b/src/main/java/com/bellmann/controller/OrderInfoController.java index eaa80c3..df25367 100644 --- a/src/main/java/com/bellmann/controller/OrderInfoController.java +++ b/src/main/java/com/bellmann/controller/OrderInfoController.java @@ -78,6 +78,7 @@ public class OrderInfoController { } @PostMapping("device-order/page") + @PreAuthorize("@ss.hasPerm('family:operate:order:execute')") @Operation(summary = "设备工单表格分页") public PageResult deviceOrderPage(@RequestBody DeviceOrderQuery query){ diff --git a/src/main/java/com/bellmann/controller/TypeVerExtController.java b/src/main/java/com/bellmann/controller/TypeVerExtController.java index 1d78869..eb35cea 100644 --- a/src/main/java/com/bellmann/controller/TypeVerExtController.java +++ b/src/main/java/com/bellmann/controller/TypeVerExtController.java @@ -7,6 +7,7 @@ import com.bellmann.service.TypeVerExtService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; @Tag(name = "13.设备能力信息接口") @@ -26,6 +27,7 @@ public class TypeVerExtController { } @Operation(summary = "修改设备能力信息表单接口") @PostMapping("/edit") + @PreAuthorize("@ss.hasPerm('device:type:ver:update:capability')") public Result editCapabilityForm(@RequestBody CapabilityForm form){ return typeVerExtService.editCapabilityForm(form); } diff --git a/src/main/java/com/bellmann/service/impl/DeviceStaticServiceImpl.java b/src/main/java/com/bellmann/service/impl/DeviceStaticServiceImpl.java index 5378a64..1ee1ad7 100644 --- a/src/main/java/com/bellmann/service/impl/DeviceStaticServiceImpl.java +++ b/src/main/java/com/bellmann/service/impl/DeviceStaticServiceImpl.java @@ -498,7 +498,6 @@ public class DeviceStaticServiceImpl implements DeviceStaticService { argsStruct[0].argsName = "SERVICE_VERSION"; argsStruct[0].argsValue = serviceVerName; argsStruct[0].operTaskId = Utils.LONG_NULL; - log.info("service-version: {}", serviceVerName); DeviceServiceArgs deviceServiceArgs = new DeviceServiceArgs(); for (int i = 0; i < args.size(); i++) { deviceServiceArgs = args.get(i); @@ -1239,7 +1238,11 @@ public class DeviceStaticServiceImpl implements DeviceStaticService { if (result!=0){ throw new BusinessException(ResultCode.OAM_INTERFACE_ERROR); } - return parseTreeOption(task2DetailStructHolder.value.operTask.operTaskId); + List> optionTrees = parseTreeOption(task2DetailStructHolder.value.operTask.operTaskId); + optionTrees.forEach(obj->{ + obj.setValue(StringUtilsConstants.STRING_BLANK); + }); + return optionTrees; }