XW-AIOT/aiot-platform-cloud
4
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of http://124.222.218.198:3000/XW-AIOT/aiot-platform-cloud into feature/cleaning-inspection

Browse Source
This commit is contained in:
lzh
2026-03-18 23:03:44 +08:00
parent 01e9a556ab 92a51adcea
commit 5ce1561437
6 changed files with 215 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
viewsh-module-ops/viewsh-module-ops-server/src/main/java/com/viewsh/module/ops/controller/admin/security/SecurityOrderController.java
View File

@@ -94,7 +94,7 @@ public class SecurityOrderController {
@Operation(summary = "误报标记", description = "将安保工单标记为误报并完成")
@PreAuthorize("@ss.hasPermission('ops:security-order:complete')")
public CommonResult<Boolean> falseAlarmOrder(@Valid @RequestBody SecurityOrderIdReqVO reqVO) {
securityOrderService.falseAlarmOrder(reqVO.getOrderId(), SecurityFrameworkUtils.getLoginUserId());
securityOrderService.falseAlarmOrder(reqVO.getOrderId());
return success(true);
}

2
viewsh-module-ops/viewsh-module-ops-server/src/main/java/com/viewsh/module/ops/controller/open/security/SecurityOrderOpenController.java
View File

@@ -99,7 +99,7 @@ public class SecurityOrderOpenController {
@ApiSignature
@PermitAll
public CommonResult<Boolean> falseAlarmOrder(@Valid @RequestBody SecurityOrderIdReqVO reqVO) {
securityOrderService.falseAlarmOrder(reqVO.getOrderId(), null);
securityOrderService.falseAlarmOrder(reqVO.getOrderId());
return success(true);
}