Merge branch 'dev' of http://git.xmmakeit.com/huangjiay/iot-platform-server into dev

saas-module/src/main/java/com/makeit/controller/plat/PlatRoleController.java

@@ -49,14 +49,14 @@ public class PlatRoleController {
     @Autowired
     private PlatUserService platUserService;
 
-    @Action(module = "平台端-角色", name = "分页列表", code = "tnt:role:page")
+    @Action(module = "平台端-角色", name = "分页列表", code = "plat:role:page")
     @ApiOperation("分页列表")
     @PostMapping("page")
     public ApiResponseEntity<PageVO<PlatRoleDTOVO>> page(@RequestBody PageReqDTO<PlatRoleDTOVO> page) {
         return ApiResponseUtils.success(platRoleService.page(page));
     }
 
-    @Action(module = "平台端-角色", name = "列表", code = "tnt:role:list")
+    @Action(module = "平台端-角色", name = "列表", code = "plat:role:list")
     @ApiOperation("列表")
     @PostMapping("list")
     public ApiResponseEntity<List<PlatRoleDTOVO>> list(@RequestBody PlatRoleDTOVO dto) {
@@ -75,14 +75,14 @@ public class PlatRoleController {
         return ApiResponseUtils.success(platRoleService.list(dto));
     }
 
-    @Action(module = "平台端-角色", name = "新增", code = "tnt:role:add")
+    @Action(module = "平台端-角色", name = "新增", code = "plat:role:add")
     @ApiOperation("新增")
     @PostMapping("add")
     public ApiResponseEntity<String> add(@Validated @RequestBody PlatRoleDTOVO dto) {
         return ApiResponseUtils.success(platRoleService.add(dto));
     }
 
-    @Action(module = "平台端-角色", name = "编辑", code = "tnt:role:edit")
+    @Action(module = "平台端-角色", name = "编辑", code = "plat:role:edit")
     @ApiOperation("编辑")
     @PostMapping("edit")
     public ApiResponseEntity<Void> edit(@Validated @RequestBody PlatRoleDTOVO dto) {
@@ -90,14 +90,14 @@ public class PlatRoleController {
         return ApiResponseUtils.success();
     }
 
-    @Action(module = "平台端-角色", name = "详情", code = "tnt:role:view")
+    @Action(module = "平台端-角色", name = "详情", code = "plat:role:view")
     @ApiOperation("详情")
     @PostMapping("view")
     public ApiResponseEntity<PlatRoleDTOVO> view(@RequestBody BaseIdDTO dto) {
         return ApiResponseUtils.success(platRoleService.view(dto.getId()));
     }
 
-    @Action(module = "平台端-角色", name = "删除", code = "tnt:role:del")
+    @Action(module = "平台端-角色", name = "删除", code = "plat:role:del")
     @ApiOperation("删除")
     @PostMapping("del")
     public ApiResponseEntity<Void> del(@RequestBody BaseIdDTO dto) {
@@ -105,7 +105,7 @@ public class PlatRoleController {
         return ApiResponseUtils.success();
     }
 
-    @Action(module = "平台端-角色", name = "改变状态", code = "tnt:role:changeStatus")
+    @Action(module = "平台端-角色", name = "改变状态", code = "plat:role:changeStatus")
     @ApiOperation("改变状态")
     @PostMapping("changeStatus")
     public ApiResponseEntity<Void> changeStatus(@RequestBody StatusDTO dto) {
@@ -113,7 +113,7 @@ public class PlatRoleController {
         return ApiResponseUtils.success();
     }
 
-    @Action(module = "平台端-角色", name = "分配用户", code = "tnt:role:assignUserList")
+    @Action(module = "平台端-角色", name = "分配用户", code = "plat:role:assignUserList")
     @ApiOperation("分配用户")
     @PostMapping("assignUserList")
     public ApiResponseEntity<Void> assignUserList(@RequestBody List<PlatUserRoleDTO> userRoleDTOList) {//参数要不要是一个对象里 有一个数组
@@ -121,7 +121,7 @@ public class PlatRoleController {
         return ApiResponseUtils.success();
     }
 
-    @Action(module = "平台端-角色", name = "删除分配用户", code = "tnt:role:removeAssignUserList")
+    @Action(module = "平台端-角色", name = "删除分配用户", code = "plat:role:removeAssignUserList")
     @ApiOperation("删除分配用户")
     @PostMapping("removeAssignUserList")
     public ApiResponseEntity<Void> removeAssignUserList(@RequestBody List<PlatUserRoleDTO> userRoleDTOList) {
@@ -129,7 +129,7 @@ public class PlatRoleController {
         return ApiResponseUtils.success();
     }
 
-    @Action(module = "平台端-角色", name = "分配菜单", code = "tnt:role:assignMenuList")
+    @Action(module = "平台端-角色", name = "分配菜单", code = "plat:role:assignMenuList")
     @ApiOperation("分配菜单")
     @Deprecated
     @PostMapping("assignMenuList")
@@ -138,7 +138,7 @@ public class PlatRoleController {
         return ApiResponseUtils.success();
     }
 
-    @Action(module = "平台端-角色", name = "获取分配菜单", code = "tnt:role:getAssignMenuList")
+    @Action(module = "平台端-角色", name = "获取分配菜单", code = "plat:role:getAssignMenuList")
     @ApiOperation("获取分配菜单")
     @PostMapping("getAssignMenuList")
     public ApiResponseEntity<List<PlatRoleMenu>> getAssignMenuList(@RequestBody BaseIdDTO baseIdDTO) {
@@ -151,7 +151,7 @@ public class PlatRoleController {
         return ApiResponseUtils.success(platUserService.getHotelList(deptDTO.getOrgId()));
     }
 
-    @Action(module = "平台端-角色", name = "分配管理权限", code = "tnt:role:assignDeptList")
+    @Action(module = "平台端-角色", name = "分配管理权限", code = "plat:role:assignDeptList")
     @ApiOperation("分配管理权限")
     @PostMapping("assignDeptList")
     public ApiResponseEntity<Void> assignDeptList(@RequestBody PlatRoleDeptDTOVO roleDeptDTO) {
@@ -159,14 +159,14 @@ public class PlatRoleController {
         return ApiResponseUtils.success();
     }
 
-    @Action(module = "平台端-角色", name = "获取分配管理权限", code = "tnt:role:getDeptListByRoleId")
+    @Action(module = "平台端-角色", name = "获取分配管理权限", code = "plat:role:getDeptListByRoleId")
     @ApiOperation("获取分配管理权限")
     @PostMapping("getDeptListByRoleId")
     public ApiResponseEntity<List<PlatRoleOrg>> getDeptListByRoleId(@RequestBody BaseIdDTO baseIdDTO) {
         return ApiResponseUtils.success(platRoleService.getDeptListByRoleId(baseIdDTO.getId()));
     }
 
-    @Action(module = "平台端-角色", name = "复制角色及关联", code = "tnt:role:copyRole")
+    @Action(module = "平台端-角色", name = "复制角色及关联", code = "plat:role:copyRole")
     @ApiOperation("复制角色及关联")
     @PostMapping("copyRole")
     public ApiResponseEntity<Void> copyRole(@RequestBody BaseIdDTO baseIdDTO) {

server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmConfigServiceImpl.java

@@ -91,7 +91,8 @@ public class PlatAlarmConfigServiceImpl extends ServiceImpl<PlatAlarmConfigMappe
 
         updateById(alarmConfig);
 
-        alarmConfigUtil.put(alarmConfig);
+        PlatAlarmConfig entity = getById(dto.getId());
+        alarmConfigUtil.put(entity);
 
 
     }
@@ -102,7 +103,8 @@ public class PlatAlarmConfigServiceImpl extends ServiceImpl<PlatAlarmConfigMappe
         PlatAlarmConfig alarmConfig = BeanDtoVoUtils.convert(dto, PlatAlarmConfig.class);
         updateById(alarmConfig);
 
-        alarmConfigUtil.put(alarmConfig);
+        PlatAlarmConfig entity = getById(dto.getId());
+        alarmConfigUtil.put(entity);
 
     }