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

server-common/src/main/java/com/makeit/module/iot/vo/HeaderInfo.java

@@ -17,7 +17,7 @@ public class HeaderInfo {
 
 
     @Data
-    public class Bind {
+    public static class Bind {
         private String id;
         private String type;
     }

server-common/src/main/java/com/makeit/utils/msg/sender/MailMsgSender.java

@@ -39,6 +39,7 @@ public class MailMsgSender implements IMsgSender {
             helper.setSubject(msgDTO.getSubject());
             helper.setText(msgDTO.getOriContent(), false);
             mailSender.send(message);
+            log.info("发送邮箱成功");
         } catch (Exception e) {
             log.error("发送邮箱异常：",msgDTO,e);
         }

server-common/src/main/java/com/makeit/utils/msg/sender/SmsVoiceSender.java

@@ -76,6 +76,7 @@ public class SmsVoiceSender implements IMsgSender{
                 log.error("发送语音短信失败："+jsonObject.get("status_code"));
                 throw new BusinessException((String) jsonObject.get("status_code"));
             }
+            log.info("发送语音短信成功");
         }catch (Exception e){
             log.error("发送语音异常：",msgDTO,e);
         }

server-module/src/main/java/com/makeit/module/controller/children/org/PlatOrgChildrenController.java

@@ -7,7 +7,6 @@ import com.makeit.common.page.PageVO;
 import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseUtils;
 import com.makeit.entity.platform.auth.PlatOrg;
-import com.makeit.global.annotation.Action;
 import com.makeit.service.platform.auth.PlatOrgService;
 import com.makeit.vo.platform.auth.PlatOrgQueryDTO;
 import io.swagger.annotations.Api;
@@ -29,28 +28,24 @@ public class PlatOrgChildrenController {
     @Autowired
     private PlatOrgService platOrgService;
 
-    @Action(module = "子女端小程序-组织", name = "分页列表", code = "plat:org:page")
     @ApiOperation("树形列表")
     @PostMapping("page")
     public ApiResponseEntity<PageVO<PlatOrg>> page(@RequestBody PageReqDTO<PlatOrgQueryDTO> pageReqDTO){
         return ApiResponseUtils.success(platOrgService.page(pageReqDTO));
     }
 
-    @Action(module = "子女端小程序-组织", name = "不分页列表", code = "plat:org:list")
     @ApiOperation("树形列表")
     @PostMapping("list")
     public ApiResponseEntity<List<PlatOrg>> list(@RequestBody PlatOrgQueryDTO platOrgQueryDTO){
         return ApiResponseUtils.success(platOrgService.subOrgList(platOrgQueryDTO));
     }
 
-    @Action(module = "子女端小程序-组织", name = "新增", code = "plat:org:add")
     @ApiOperation("新增")
     @PostMapping("add")
     public ApiResponseEntity<String> add(@Validated @RequestBody PlatOrg tntDept){
         return ApiResponseUtils.success(platOrgService.add(tntDept));
     }
 
-    @Action(module = "子女端小程序-组织", name = "编辑", code = "plat:org:edit")
     @ApiOperation("编辑")
     @PostMapping("edit")
     public ApiResponseEntity<Void> edit(@Validated @RequestBody PlatOrg tntDept){
@@ -58,14 +53,12 @@ public class PlatOrgChildrenController {
         return ApiResponseUtils.success();
     }
 
-    @Action(module = "平台端-组织", name = "详情", code = "plat:org:view")
     @ApiOperation("详情")
     @PostMapping("view")
     public ApiResponseEntity<PlatOrg> view(@RequestBody BaseIdDTO baseIdDTO){
         return ApiResponseUtils.success(platOrgService.view(baseIdDTO.getId()));
     }
 
-    @Action(module = "平台端-组织", name = "删除", code = "plat:org:del")
     @ApiOperation("删除")
     @PostMapping("del")
     public ApiResponseEntity<PlatOrg> del(@RequestBody BaseIdDTO baseIdDTO){

server-module/src/main/java/com/makeit/module/controller/children/tenant/PlatTenantChildrenController.java

@@ -6,12 +6,15 @@ import com.makeit.common.page.PageReqDTO;
 import com.makeit.common.page.PageVO;
 import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseUtils;
+import com.makeit.entity.platform.auth.PlatOrg;
 import com.makeit.entity.saas.PlatTenant;
 import com.makeit.global.annotation.AuthIgnore;
 import com.makeit.module.admin.dto.plat.PlatTenantDTOVO;
 import com.makeit.module.admin.vo.plat.PlatTenantVO;
+import com.makeit.service.platform.auth.PlatOrgService;
 import com.makeit.service.saas.PlatTenantService;
 import com.makeit.service.saas.SaasOperationLogService;
+import com.makeit.vo.platform.auth.PlatOrgQueryDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,11 +42,13 @@ public class PlatTenantChildrenController {
     private PlatTenantService platTenantService;
     @Autowired
     private SaasOperationLogService saasOperationLogService;
+    @Autowired
+    private PlatOrgService platOrgService;
 
     @ApiOperation("分页列表")
     @PostMapping("page")
-    public ApiResponseEntity<PageVO<PlatTenantVO>> page(@RequestBody PageReqDTO<PlatTenantVO> page){
-        return ApiResponseUtils.success(platTenantService.page(page));
+    public ApiResponseEntity<PageVO<PlatOrg>> page(@RequestBody PageReqDTO<PlatOrgQueryDTO> pageReqDTO){
+        return ApiResponseUtils.success(platOrgService.page(pageReqDTO));
     }
 
     @ApiOperation("列表")

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

@@ -20,7 +20,6 @@ import com.makeit.entity.platform.space.PlatRegionSetting;
 import com.makeit.entity.platform.space.PlatRoom;
 import com.makeit.entity.platform.space.PlatRoomBedDevice;
 import com.makeit.enums.CommonEnum;
-import com.makeit.enums.platform.device.PlatDeviceEnum;
 import com.makeit.exception.BusinessException;
 import com.makeit.global.aspect.tenant.TenantIdIgnore;
 import com.makeit.mapper.platform.alarm.PlatAlarmRecordMapper;
@@ -370,7 +369,7 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
             throw  new BusinessException("设备没绑定房间:"+platDevice.getId());
         }
 
-        if(StringUtils.equals(platDevice.getCategory(), PlatDeviceEnum.CategoryEnum.SPACE.getValue())) {
+        if(StringUtils.isNotBlank(platRoomBedDevice.getRoomId())) {
             PlatRoom platRoom = platRoomService.getById(platRoomBedDevice.getRoomId());
             platAlarmCheckDTO.setPlatRoom(platRoom);