BJ_FS / urbanops

Commit 8502855c2a37939dadfb9060d16c2ad6d7dc6c5e

Authored by wangqian
2 parents fbf2cff7 ef25690f

Merge remote-tracking branch 'origin/dev' into dev

Inline Side-by-side
Showing 3 changed files with 6 additions and 4 deletions
sql/dis-check-menu.sql
  View file @8502855
@@ -32,7 +32,7 @@ DEALLOCATE PREPARE stmt; @@ -32,7 +32,7 @@ DEALLOCATE PREPARE stmt;
32 INSERT INTO system_menu 32 INSERT INTO system_menu
33 (name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted) 33 (name, permission, type, sort, parent_id, path, icon, component, component_name, status, visible, keep_alive, always_show, creator, create_time, updater, update_time, deleted)
34 VALUES 34 VALUES
35 -('dis核对', '', 2, 1, 5698, 'disCheck', 'ep:view', 'fence/dis-check/index', 'DisCheck', 0, 1, 0, 1, '1', NOW(), '1', NOW(), 0); 35 +('gis数据核对', '', 2, 1, 5698, 'disCheck', 'ep:view', 'fence/dis-check/index', 'DisCheck', 0, 1, 0, 1, '1', NOW(), '1', NOW(), 0);
36 36
37 -- 2. 获取上一步插入的菜单ID，用于后续按钮权限插入 37 -- 2. 获取上一步插入的菜单ID，用于后续按钮权限插入
38 SET @dis_check_menu_id = LAST_INSERT_ID(); 38 SET @dis_check_menu_id = LAST_INSERT_ID();
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/deviceuser/DeviceUserController.java
  View file @8502855
@@ -45,7 +45,7 @@ public class DeviceUserController { @@ -45,7 +45,7 @@ public class DeviceUserController {
45 return success(deviceUserService.createDeviceUser(createReqVO)); 45 return success(deviceUserService.createDeviceUser(createReqVO));
46 } 46 }
47 47
48 - @PutMapping("/update/device") 48 + @PostMapping("/update/device")
49 @Operation(summary = "更新设备用户关系") 49 @Operation(summary = "更新设备用户关系")
50 //@PreAuthorize("@ss.hasPermission('garden:device-user:update')") 50 //@PreAuthorize("@ss.hasPermission('garden:device-user:update')")
51 public CommonResult<Boolean> updateDevice(@Valid @RequestBody DeviceUserUpdateReqVO updateReqVO) { 51 public CommonResult<Boolean> updateDevice(@Valid @RequestBody DeviceUserUpdateReqVO updateReqVO) {
@@ -119,4 +119,4 @@ public class DeviceUserController { @@ -119,4 +119,4 @@ public class DeviceUserController {
119 119
120 120
121 121
122 -}  
123 \ No newline at end of file 122 \ No newline at end of file
  123 +}
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/gis/GisRoadController.java
  View file @8502855
@@ -67,7 +67,7 @@ public class GisRoadController { @@ -67,7 +67,7 @@ public class GisRoadController {
67 @PreAuthorize("@ss.hasPermission('garden:gis-road:export')") 67 @PreAuthorize("@ss.hasPermission('garden:gis-road:export')")
68 @ApiAccessLog(operateType = EXPORT) 68 @ApiAccessLog(operateType = EXPORT)
69 public void exportGisRoadExcel(@Valid GisRoadPageReqVO pageReqVO, 69 public void exportGisRoadExcel(@Valid GisRoadPageReqVO pageReqVO,
70 - HttpServletResponse response) throws IOException { 70 + HttpServletResponse response) throws IOException {
71 pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); 71 pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
72 List<GisRoadRespVO> list = gisRoadService.getGisRoadPage(pageReqVO).getList(); 72 List<GisRoadRespVO> list = gisRoadService.getGisRoadPage(pageReqVO).getList();
73 List<GisRoadExportVO> exportList = new ArrayList<>(); 73 List<GisRoadExportVO> exportList = new ArrayList<>();
@@ -125,3 +125,5 @@ public class GisRoadController { @@ -125,3 +125,5 @@ public class GisRoadController {
125 } 125 }
126 126
127 } 127 }
  128 +
  129 +