BJ_FS / urbanops

Commit 535b6f6235665255a16c64f14a33a68a0a5706dc

Authored by 王彪总
1 parent 27d3aea4

docs(flowpathidea): 修正流程事件服务注释中的空格问题 

- 调整了 DispatchService 接口注释中“Service”前的空格，确保格式统一- 保持代码注释风格的一致性与可读性
Inline Side-by-side
Showing 2 changed files with 24 additions and 67 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/device/CameraRecorderController.java
  View file @535b6f6
1 package com.zteits.urbanops.module.garden.controller.admin.device; 1 package com.zteits.urbanops.module.garden.controller.admin.device;
2 2
3 import com.zteits.urbanops.framework.common.pojo.CommonResult; 3 import com.zteits.urbanops.framework.common.pojo.CommonResult;
  4 +import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
  5 +import com.zteits.urbanops.module.garden.service.device.CameraRecorderHelper;
  6 +import com.zteits.urbanops.module.garden.controller.admin.device.vo.RecordFileListReq;
4 import io.swagger.v3.oas.annotations.Operation; 7 import io.swagger.v3.oas.annotations.Operation;
5 import io.swagger.v3.oas.annotations.tags.Tag; 8 import io.swagger.v3.oas.annotations.tags.Tag;
  9 +import jakarta.annotation.Resource;
  10 +import jakarta.validation.Valid;
6 import org.springframework.web.bind.annotation.*; 11 import org.springframework.web.bind.annotation.*;
7 12
8 -import java.util.Collections;  
9 -import java.util.Map;  
10 -  
11 -import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;  
12 -  
13 @Tag(name = "管理后台 - 执法记录仪") 13 @Tag(name = "管理后台 - 执法记录仪")
14 @RestController 14 @RestController
15 @RequestMapping("/camera/recorder") 15 @RequestMapping("/camera/recorder")
16 public class CameraRecorderController { 16 public class CameraRecorderController {
17 17
  18 + @Resource
  19 + private CameraRecorderHelper cameraRecorderHelper;
  20 +
18 @GetMapping("/device/page") 21 @GetMapping("/device/page")
19 @Operation(summary = "设备-分页查询") 22 @Operation(summary = "设备-分页查询")
20 - public CommonResult<Map<String,Object>> devicePage(@RequestParam(value = "device_name", required = false) String deviceName,  
21 - @RequestParam(value = "enter_id", required = false) Integer enterId,  
22 - @RequestParam(value = "group_id", required = false) Integer groupId,  
23 - @RequestParam("page") Integer page,  
24 - @RequestParam("pageSize") Integer pageSize) {  
25 - return success(Collections.emptyMap()); 23 + public CommonResult<Object> devicePage(@RequestParam(value = "device_name", required = false) String deviceName,
  24 + @RequestParam(value = "enter_id", required = false) Integer enterId,
  25 + @RequestParam(value = "group_id", required = false) Integer groupId,
  26 + @RequestParam("page") Integer page,
  27 + @RequestParam("pageSize") Integer pageSize) {
  28 + Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();
  29 + return cameraRecorderHelper.devicePage(deviceName, enterId, groupId, page, pageSize, companyId);
26 } 30 }
27 31
28 @PostMapping("/device/recordFileList") 32 @PostMapping("/device/recordFileList")
29 @Operation(summary = "设备-设备执法记录信息") 33 @Operation(summary = "设备-设备执法记录信息")
30 - public CommonResult<Map<String,Object>> deviceRecordFileList(@RequestBody Map<String,Object> req) {  
31 - return success(Collections.emptyMap()); 34 + public CommonResult<Object> deviceRecordFileList(@Valid @RequestBody RecordFileListReq req) {
  35 + Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();
  36 + return cameraRecorderHelper.recordFileList(req, companyId);
32 } 37 }
33 38
34 @GetMapping("/group/group_list") 39 @GetMapping("/group/group_list")
35 @Operation(summary = "调度组-分页") 40 @Operation(summary = "调度组-分页")
36 - public CommonResult<Map<String,Object>> groupList(@RequestParam(value = "group_name", required = false) String groupName,  
37 - @RequestParam("page") Integer page,  
38 - @RequestParam("pageSize") Integer pageSize) {  
39 - return success(Collections.emptyMap()); 41 + public CommonResult<Object> groupList(@RequestParam(value = "group_name", required = false) String groupName,
  42 + @RequestParam("page") Integer page,
  43 + @RequestParam("pageSize") Integer pageSize) {
  44 + Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();
  45 + return cameraRecorderHelper.groupList(groupName, page, pageSize, companyId);
40 } 46 }
41 -}  
42 \ No newline at end of file 47 \ No newline at end of file
  48 +}
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/device/CameraRecorderOldController.java deleted
View file @27d3aea
1 -package com.zteits.urbanops.module.garden.controller.admin.device;  
2 -  
3 -import com.zteits.urbanops.framework.common.pojo.CommonResult;  
4 -import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;  
5 -import com.zteits.urbanops.module.garden.service.device.CameraRecorderHelper;  
6 -import com.zteits.urbanops.module.garden.controller.admin.device.vo.RecordFileListReq;  
7 -import io.swagger.v3.oas.annotations.Operation;  
8 -import io.swagger.v3.oas.annotations.tags.Tag;  
9 -import jakarta.annotation.Resource;  
10 -import jakarta.validation.Valid;  
11 -import org.springframework.web.bind.annotation.*;  
12 -  
13 -import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;  
14 -  
15 -@Tag(name = "管理后台 - 执法记录仪")  
16 -@RestController  
17 -@RequestMapping("/camera/recorder")  
18 -public class CameraRecorderOldController {  
19 -  
20 - @Resource  
21 - private CameraRecorderHelper cameraRecorderHelper;  
22 -  
23 - @GetMapping("/device/page")  
24 - @Operation(summary = "设备-分页查询")  
25 - public CommonResult<Object> devicePage(@RequestParam(value = "device_name", required = false) String deviceName,  
26 - @RequestParam(value = "enter_id", required = false) Integer enterId,  
27 - @RequestParam(value = "group_id", required = false) Integer groupId,  
28 - @RequestParam("page") Integer page,  
29 - @RequestParam("pageSize") Integer pageSize) {  
30 - Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();  
31 - return cameraRecorderHelper.devicePage(deviceName, enterId, groupId, page, pageSize, companyId);  
32 - }  
33 -  
34 - @PostMapping("/device/recordFileList")  
35 - @Operation(summary = "设备-设备执法记录信息")  
36 - public CommonResult<Object> deviceRecordFileList(@Valid @RequestBody RecordFileListReq req) {  
37 - Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();  
38 - return cameraRecorderHelper.recordFileList(req, companyId);  
39 - }  
40 -  
41 - @GetMapping("/group/group_list")  
42 - @Operation(summary = "调度组-分页")  
43 - public CommonResult<Object> groupList(@RequestParam(value = "group_name", required = false) String groupName,  
44 - @RequestParam("page") Integer page,  
45 - @RequestParam("pageSize") Integer pageSize) {  
46 - Long companyId = SecurityFrameworkUtils.getLoginUserDeptId();  
47 - return cameraRecorderHelper.groupList(groupName, page, pageSize, companyId);  
48 - }  
49 -}  
50 \ No newline at end of file 0 \ No newline at end of file