整理代码

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

+package com.makeit.module.controller.children.org;
+
+
+import com.makeit.common.dto.BaseIdDTO;
+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.global.annotation.Action;
+import com.makeit.service.platform.auth.PlatOrgService;
+import com.makeit.vo.platform.auth.PlatOrgQueryDTO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Api(tags = "子女端-组织")
+@RestController
+@RequestMapping("/children/plat/org")
+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){
+        platOrgService.edit(tntDept);
+        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){
+        platOrgService.del(baseIdDTO.getId());
+        return ApiResponseUtils.success();
+    }
+
+    @ApiOperation("当前账号的权限级别树")
+    @PostMapping("belongToScopeTree")
+    public ApiResponseEntity<List<PlatOrg>> belongToScopeTree(@RequestBody PlatOrg param){
+        return ApiResponseUtils.success(platOrgService.belongToOrgTree(param));
+    }
+
+    @ApiOperation("启用|禁用")
+    @PostMapping("enable")
+    public ApiResponseEntity<Void> enable(@RequestBody PlatOrg param){
+        platOrgService.enable(param);
+        return ApiResponseUtils.success();
+    }
+
+}
+

server-module/src/main/java/com/makeit/module/controller/wechat/alarm/PlatAlarmRecordWechatController.java

@@ -8,7 +8,7 @@ import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseUtils;
 import com.makeit.dto.platform.alarm.PlatAlarmRecordQueryDTO;
 import com.makeit.service.platform.alarm.PlatAlarmRecordService;
-import com.makeit.utils.user.wechat.WechatUserUtil;
+import com.makeit.utils.user.common.CommonUserUtil;
 import com.makeit.vo.platform.alarm.PlatAlarmRecordVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -30,7 +30,7 @@ public class PlatAlarmRecordWechatController {
     @PostMapping("page")
     public ApiResponseEntity<PageVO<PlatAlarmRecordVO>> page(@RequestBody PageReqDTO<PlatAlarmRecordQueryDTO> dto) {
         //小程序告警记录只看到发给自己的告警
-        String userId = WechatUserUtil.getUserId();
+        String userId = CommonUserUtil.getUserId();
         PlatAlarmRecordQueryDTO data = dto.getData();
         data.setNotifyUser(userId);
         return ApiResponseUtils.success(platAlarmRecordService.page(dto));

server-service/src/main/java/com/makeit/entity/platform/device/PlatDevice.java

@@ -72,5 +72,8 @@ public class PlatDevice extends BaseBusEntity {
     @ApiModelProperty(value = "设备类型 0-呼吸心率雷达 1-空间人体雷达 2-跌倒检测雷达")
     private String category;
 
+    private LocalDateTime startDate;
+    private LocalDateTime endDate;
+
 
 }

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

@@ -56,5 +56,5 @@ public interface PlatAlarmRecordService extends IService<PlatAlarmRecord> {
 
     PlatAlarmRecord createPlatAlarmRecord(PlatAlarmCheckDTO platAlarmCheckDTO);
 
-    PlatAlarmCheckDTO getElderListByDeviceId(PlatAlarmCheckDTO platAlarmCheckDTO);
+    void getElderListByDeviceId(PlatAlarmCheckDTO platAlarmCheckDTO);
 }

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

@@ -255,6 +255,9 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
             platUserList.addAll(platUsers);
         } else {
             String notifyUser = alarmConfig.getNotifyUser();
+            if(StringUtils.isBlank(notifyUser)){
+                throw new BusinessException("告警内部人员未配置,告警配置id:"+alarmConfig.getId());
+            }
             String[] userArray = notifyUser.split(",");
             List<PlatUser> platUsers = platUserService.listByIds(Arrays.asList(userArray));
             platUserList.addAll(platUsers);
@@ -322,23 +325,25 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
 
 
     @Override
-    public PlatAlarmCheckDTO getElderListByDeviceId(PlatAlarmCheckDTO platAlarmCheckDTO) {
+    public void getElderListByDeviceId(PlatAlarmCheckDTO platAlarmCheckDTO) {
         PlatDevice platDevice = platAlarmCheckDTO.getPlatDevice();
         LambdaQueryWrapper<PlatRoomBedDevice> roomBedDeviceLambdaQueryWrapper = new LambdaQueryWrapper<>();
         roomBedDeviceLambdaQueryWrapper.eq(PlatRoomBedDevice::getDeviceId, platDevice.getId());
         PlatRoomBedDevice platRoomBedDevice = platRoomBedDeviceService.getOne(roomBedDeviceLambdaQueryWrapper, false);
+        if(platRoomBedDevice==null){
+            throw  new BusinessException("设备没绑定房间:"+platDevice.getId());
+        }
         PlatRoom platRoom = platRoomService.getById(platRoomBedDevice.getRoomId());
         platAlarmCheckDTO.setPlatRoom(platRoom);
-        if (platRoomBedDevice == null) {
-            return platAlarmCheckDTO;
-        }
         String bedId = platRoomBedDevice.getBedId();
         if (StringUtils.isNotBlank(bedId)) {
             LambdaQueryWrapper<PlatElder> elderLambdaQueryWrapper = new LambdaQueryWrapper<>();
             elderLambdaQueryWrapper.eq(PlatElder::getBedId, bedId);
             List<PlatElder> list = platElderService.list(elderLambdaQueryWrapper);
             platAlarmCheckDTO.setPlatElderList(list);
-            return platAlarmCheckDTO;
+            if(CollectionUtils.isEmpty(list)){
+                throw new BusinessException("床位没人");
+            }
         }
 
         String roomId = platRoomBedDevice.getRoomId();
@@ -347,9 +352,10 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
             elderLambdaQueryWrapper.eq(PlatElder::getRoomId, roomId);
             List<PlatElder> list = platElderService.list(elderLambdaQueryWrapper);
             platAlarmCheckDTO.setPlatElderList(list);
-            return platAlarmCheckDTO;
+            if(CollectionUtils.isEmpty(list)) {
+                throw new BusinessException("房间没人");
+            }
         }
-        return platAlarmCheckDTO;
     }
 
     private String replaceParam(String oriContent,List<String> param) {

server-service/src/main/java/com/makeit/vo/platform/device/PlatDeviceListVO.java

@@ -70,5 +70,8 @@ public class PlatDeviceListVO extends BaseTenantDTO {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createDate;
 
+    private LocalDateTime startDate;
+    private LocalDateTime endDate;
+
 
 }

server-service/src/main/java/com/makeit/vo/platform/device/PlatDeviceViewVO.java

@@ -2,7 +2,6 @@ package com.makeit.vo.platform.device;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.makeit.common.dto.BaseTenantDTO;
-import com.makeit.common.entity.BaseBusEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -101,5 +100,8 @@ public class PlatDeviceViewVO extends BaseTenantDTO {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createDate;
 
+    private LocalDateTime startDate;
+    private LocalDateTime endDate;
+
 
 }