新增接口返回id

saas-module/src/main/java/com/makeit/controller/saas/SaasMenuController.java

@@ -64,9 +64,9 @@ public class SaasMenuController {
     @Action(module = "saas端-菜单", name = "新增", code = "plat:menu:add")
     @ApiOperation("新增")
     @PostMapping("add")
-    public ApiResponseEntity<?> add(@Validated @RequestBody SaasMenuDTOVO dto) {
-        platMenuService.add(dto);
-        return ApiResponseUtils.success();
+    public ApiResponseEntity<String> add(@Validated @RequestBody SaasMenuDTOVO dto) {
+        String id = platMenuService.add(dto);
+        return ApiResponseUtils.success(id);
     }
 
     @Action(module = "saas端-菜单", name = "编辑", code = "plat:menu:edit")

saas-module/src/main/java/com/makeit/controller/saas/SaasPlatMenuController.java

@@ -65,9 +65,9 @@ public class SaasPlatMenuController {
     @Action(module = "saas端-租户资源管理(菜单)", name = "新增", code = "saas:plat:menu:add")
     @ApiOperation("新增")
     @PostMapping("add")
-    public ApiResponseEntity<?> add(@Validated @RequestBody PlatMenuDTOVO dto){
-        platMenuService.add(dto);
-        return ApiResponseUtils.success();
+    public ApiResponseEntity<String> add(@Validated @RequestBody PlatMenuDTOVO dto){
+        String add = platMenuService.add(dto);
+        return ApiResponseUtils.success(add);
     }
 
     @Action(module = "saas端-租户资源管理(菜单)", name = "编辑", code = "saas:plat:menu:edit")

saas-module/src/main/java/com/makeit/controller/saas/SaasPlatUserController.java

@@ -68,9 +68,9 @@ public class SaasPlatUserController {
     @Action(module = "saas端-租户账号", name = "新增", code = "saas.plat.user.add")
     @ApiOperation("新增")
     @PostMapping("add")
-    public ApiResponseEntity<?> add(@Validated @RequestBody PlatUserDTOVO dto){
-        platUserService.add(dto);
-        return ApiResponseUtils.success();
+    public ApiResponseEntity<String> add(@Validated @RequestBody PlatUserDTOVO dto){
+        String add = platUserService.add(dto);
+        return ApiResponseUtils.success(add);
     }
 
     @Action(module = "saas端-租户账号", name = "编辑", code = "saas.plat.user.edit")

saas-module/src/main/java/com/makeit/controller/saas/SaasPrivacyConfigController.java

@@ -33,9 +33,9 @@ public class SaasPrivacyConfigController {
 	//@PlatOperationLogger
 	@ApiOperation(value = "新增隐私政策-关于我们", notes = "")
     @PostMapping("/add")
-    public ApiResponseEntity<?> add(@Validated @RequestBody SaasPrivacyConfigDTO saasPrivacyConfigDTO){
-		saasPrivacyConfigService.add(saasPrivacyConfigDTO);
-        return ApiResponseUtils.success();
+    public ApiResponseEntity<String> add(@Validated @RequestBody SaasPrivacyConfigDTO saasPrivacyConfigDTO){
+        String add = saasPrivacyConfigService.add(saasPrivacyConfigDTO);
+        return ApiResponseUtils.success(add);
     }
 
     @Action(module = "saas端-隐私政策-关于我们", name = "详情", code = "saas.sys.privacyConfig.view")

saas-module/src/main/java/com/makeit/controller/saas/SaasRoleController.java

@@ -63,9 +63,9 @@ public class SaasRoleController {
     @Action(module = "saas端-角色", name = "新增", code = "saas:role:add")
     @ApiOperation("新增")
     @PostMapping("add")
-    public ApiResponseEntity<?> add(@Validated @RequestBody SaasRoleDTOVO dto){
-        saasRoleService.add(dto);
-        return ApiResponseUtils.success();
+    public ApiResponseEntity<String> add(@Validated @RequestBody SaasRoleDTOVO dto){
+        String add = saasRoleService.add(dto);
+        return ApiResponseUtils.success(add);
     }
 
     @Action(module = "saas端-角色", name = "编辑", code = "saas:role:edit")

saas-module/src/main/java/com/makeit/controller/saas/SaasUserController.java

@@ -74,9 +74,9 @@ public class SaasUserController {
     @Action(module = "saas端-用户", name = "新增", code = "saas:user:add")
     @ApiOperation("新增")
     @PostMapping("add")
-    public ApiResponseEntity<?> add(@Validated @RequestBody SaasUserDTOVO dto){
-        saasUserService.add(dto);
-        return ApiResponseUtils.success();
+    public ApiResponseEntity<String> add(@Validated @RequestBody SaasUserDTOVO dto){
+        String add = saasUserService.add(dto);
+        return ApiResponseUtils.success(add);
     }
 
     @Action(module = "saas端-用户", name = "编辑", code = "saas:user:edit")

server-common/src/main/java/com/makeit/module/admin/dto/plat/PlatTenantDTOVO.java

@@ -48,7 +48,7 @@ public class PlatTenantDTOVO extends BaseIdDTO {
     @ApiModelProperty(value = "租户管理员用户名")
     private String userName;
 
-    @ApiModelProperty(value = "告警渠道")
+    @ApiModelProperty(value = "告警渠道 1-短信 2-邮件 3-语音短信 4-云龄工单 5-晶奇工单")
     private String alertChannel;
 
     @ApiModelProperty(value = "菜单id集合")

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

+package com.makeit.module.controller.wechat.alarm;
+
+
+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.dto.platform.alarm.PlatAlarmRecordQueryDTO;
+import com.makeit.service.platform.alarm.PlatAlarmRecordService;
+import com.makeit.vo.platform.alarm.PlatAlarmRecordVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+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;
+
+@Api(tags = "子女端小程序-告警记录")
+@RestController
+@RequestMapping("/children/alarm-record")
+public class ChildrenAlarmRecordController {
+
+    @Autowired
+    private PlatAlarmRecordService platAlarmRecordService;
+
+    @ApiOperation("列表")
+    @PostMapping("page")
+    public ApiResponseEntity<PageVO<PlatAlarmRecordVO>> page(@RequestBody PageReqDTO<PlatAlarmRecordQueryDTO> dto) {
+        //todo 只能看到发给关联的长者告警
+        return ApiResponseUtils.success(platAlarmRecordService.page(dto));
+    }
+    @ApiOperation("查看")
+    @PostMapping("view")
+    public ApiResponseEntity<PlatAlarmRecordVO> view(@RequestBody BaseIdDTO dto) {
+        return ApiResponseUtils.success(platAlarmRecordService.view(dto.getId()));
+    }
+}
+

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

@@ -10,6 +10,7 @@ import com.makeit.dto.platform.alarm.PlatAlarmRecordQueryDTO;
 import com.makeit.service.platform.alarm.PlatAlarmRecordService;
 import com.makeit.utils.msg.dto.MsgDTO;
 import com.makeit.utils.msg.sender.MailMsgSender;
+import com.makeit.utils.user.wechat.WechatUserUtil;
 import com.makeit.vo.platform.alarm.PlatAlarmRecordVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -32,6 +33,10 @@ public class WechatPlatAlarmRecordController {
     @ApiOperation("列表")
     @PostMapping("page")
     public ApiResponseEntity<PageVO<PlatAlarmRecordVO>> page(@RequestBody PageReqDTO<PlatAlarmRecordQueryDTO> dto) {
+        //小程序告警记录只看到发给自己的告警
+        String userId = WechatUserUtil.getUserId();
+        PlatAlarmRecordQueryDTO data = dto.getData();
+        data.setNotifyUser(userId);
         return ApiResponseUtils.success(platAlarmRecordService.page(dto));
     }
     @ApiOperation("查看")

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

@@ -51,6 +51,9 @@ public class PlatAlarmRecordQueryDTO extends BaseTenantDTO {
     @ApiModelProperty(value = "告警类型 数据字典 1 长者跌倒 2 呼吸异常 3 心率异常 4 行为异常")
     private String alarmType;
 
+    //告警接收人id
+    private String notifyUser;
+
 
 
 }

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

@@ -54,10 +54,27 @@ public class PlatAlarmRecord extends BaseBusEntity {
      */
     private LocalDateTime dealDate;
 
+    /**
+     * 组织id
+     */
     private String orgId;
 
+    /**
+     * 通知人员，逗号拼接
+     */
+    private String notifyUser;
+
+    /**
+     * 设备id
+     */
     private String deviceId;
 
+    /**
+     * 老人id,逗号拼接
+     */
+    private String elderIds;
+
+
 }
 
 

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

@@ -44,13 +44,13 @@ import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 /**
-* @author lixl
-* @description 针对表【plat_alarm_record(告警记录)】的数据库操作Service实现
-* @createDate 2023-09-06 14:26:05
-*/
+ * @author lixl
+ * @description 针对表【plat_alarm_record(告警记录)】的数据库操作Service实现
+ * @createDate 2023-09-06 14:26:05
+ */
 @Service
 public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMapper, PlatAlarmRecord>
-implements PlatAlarmRecordService{
+        implements PlatAlarmRecordService {
     @Autowired
     private PlatAlarmConfigService platAlarmConfigService;
     @Autowired
@@ -72,31 +72,32 @@ implements PlatAlarmRecordService{
         List<PlatAlarmRecord> records = page.getRecords();
         List<PlatAlarmRecordVO> dtos = BeanDtoVoUtils.listVo(records, PlatAlarmRecordVO.class);
 
-        JoinUtil.join(dtos,platAlarmConfigService,PlatAlarmRecordVO::getAlarmId,BaseEntity::getId,(t,m)->{
+        JoinUtil.join(dtos, platAlarmConfigService, PlatAlarmRecordVO::getAlarmId, BaseEntity::getId, (t, m) -> {
             t.setNotifyRelation(m.getNotifyRelation());
         });
 
-        return PageUtil.toPageVO(dtos,page);
+        return PageUtil.toPageVO(dtos, page);
     }
 
     private LambdaQueryWrapper<PlatAlarmRecord> getLambdaQueryWrapper(PlatAlarmRecordQueryDTO param) {
-       return new LambdaQueryWrapper<PlatAlarmRecord>().ge(Objects.nonNull(param.getCreateDateFrom()), BaseEntity::getCreateDate, param.getCreateDateFrom())
-                .le(Objects.nonNull(param.getCreateDateTo()),BaseEntity::getCreateDate, param.getCreateDateTo())
-                .eq(StringUtils.isNotBlank(param.getAlarmType()),PlatAlarmRecord::getAlarmType, param.getAlarmType())
-                .eq(StringUtils.isNotBlank(param.getStatus()),PlatAlarmRecord::getStatus, param.getStatus())
-                .eq(StringUtils.isNotBlank(param.getDealUser()),PlatAlarmRecord::getDealUser, param.getDealUser())
-                .ge(Objects.nonNull(param.getDealDateFrom()),PlatAlarmRecord::getDealDate, param.getDealDateFrom())
-                .le(Objects.nonNull(param.getDealDateTo()),PlatAlarmRecord::getDealDate, param.getDealDateTo())
-                .eq(StringUtils.isNotBlank(param.getOrgId()),PlatAlarmRecord::getOrgId, param.getOrgId())
+        return new LambdaQueryWrapper<PlatAlarmRecord>().ge(Objects.nonNull(param.getCreateDateFrom()), BaseEntity::getCreateDate, param.getCreateDateFrom())
+                .le(Objects.nonNull(param.getCreateDateTo()), BaseEntity::getCreateDate, param.getCreateDateTo())
+                .eq(StringUtils.isNotBlank(param.getAlarmType()), PlatAlarmRecord::getAlarmType, param.getAlarmType())
+                .eq(StringUtils.isNotBlank(param.getStatus()), PlatAlarmRecord::getStatus, param.getStatus())
+                .eq(StringUtils.isNotBlank(param.getDealUser()), PlatAlarmRecord::getDealUser, param.getDealUser())
+                .ge(Objects.nonNull(param.getDealDateFrom()), PlatAlarmRecord::getDealDate, param.getDealDateFrom())
+                .le(Objects.nonNull(param.getDealDateTo()), PlatAlarmRecord::getDealDate, param.getDealDateTo())
+                .eq(StringUtils.isNotBlank(param.getOrgId()), PlatAlarmRecord::getOrgId, param.getOrgId())
+                .apply(StringUtils.isNotBlank(param.getNotifyUser()), "find_in_set('" + param.getNotifyUser() + "',notify_user)")
                 .orderByDesc(BaseEntity::getCreateDate)
-        ;
+                ;
     }
 
     @Override
     public PlatAlarmRecordVO view(String recordId) {
         PlatAlarmRecord platAlarmRecord = getById(recordId);
         PlatAlarmRecordVO vo = BeanDtoVoUtils.convert(platAlarmRecord, PlatAlarmRecordVO.class);
-        JoinUtil.join(Arrays.asList(vo),platAlarmConfigService,PlatAlarmRecordVO::getAlarmId,BaseEntity::getId,(t,m)->{
+        JoinUtil.join(Arrays.asList(vo), platAlarmConfigService, PlatAlarmRecordVO::getAlarmId, BaseEntity::getId, (t, m) -> {
             t.setNotifyRelation(m.getNotifyRelation());
         });
         return vo;
@@ -129,7 +130,7 @@ implements PlatAlarmRecordService{
 
         //绑定房间的设备要通知 全部长者的家属
         //绑定床位的设备要通知对应的长者的家属
-        if(platRoomBedDevice == null){
+        if (platRoomBedDevice == null) {
             throw new BusinessException(CodeMessageEnum.PLATFORM_ERROR_ALARM_NOT_FOUND_SPACE);
         }
         String bedId = platRoomBedDevice.getBedId();
@@ -137,7 +138,7 @@ implements PlatAlarmRecordService{
         LambdaQueryWrapper<PlatElder> elderLambdaQueryWrapper = new LambdaQueryWrapper<PlatElder>().eq(StringUtils.isNotBlank(bedId), PlatElder::getBedId, bedId)
                 .eq(PlatElder::getRoomId, roomId);
         List<PlatElder> elderList = platElderService.list(elderLambdaQueryWrapper);
-        if(CollectionUtils.isEmpty(elderList)){
+        if (CollectionUtils.isEmpty(elderList)) {
             throw new BusinessException(CodeMessageEnum.PLATFORM_ERROR_ALARM_NOT_FOUND_ELDER);
         }
         Set<String> elderIdSet = elderList.stream().map(BaseEntity::getId).collect(Collectors.toSet());
@@ -145,12 +146,12 @@ implements PlatAlarmRecordService{
         Set<String> phoneList = relations.stream().map(PlatElderSocialRelation::getPhone).collect(Collectors.toSet());
         String notifyChannel = platAlarmConfig.getNotifyChannel();
         String[] split = notifyChannel.split(",");
-        List<String> notifyChannelList = Arrays.asList(SendTypeEnum.SMS.getValue(), SendTypeEnum.VOICE_SMS.getValue(),SendTypeEnum.CHILD_WECHAT.getValue());
+        List<String> notifyChannelList = Arrays.asList(SendTypeEnum.SMS.getValue(), SendTypeEnum.VOICE_SMS.getValue(), SendTypeEnum.CHILD_WECHAT.getValue());
         Set<String> sendTypeList = Stream.of(split).filter(vo -> notifyChannelList.contains(vo)).collect(Collectors.toSet());
 
-        for (String  sendType: sendTypeList) {
+        for (String sendType : sendTypeList) {
             SendTypeEnum sendTypeEnum = SendTypeEnum.getByValue(sendType);
-            msgUtil.send(sendTypeEnum,phoneList,platAlarmRecord.getContent());
+            msgUtil.send(sendTypeEnum, phoneList, platAlarmRecord.getContent());
         }
 
         platAlarmRecord.setNoticeStatus(CommonEnum.YES.getValue());

server-service/src/main/java/com/makeit/service/platform/auth/PlatUserService.java

@@ -32,7 +32,7 @@ public interface PlatUserService extends IService<PlatUser> {
 
     List<PlatUserDTOVO> listTenant(PlatUserQueryDTO dto);
 
-    void add(PlatUserDTOVO dto);
+    String add(PlatUserDTOVO dto);
 
     void edit(PlatUserDTOVO dto);
 

server-service/src/main/java/com/makeit/service/platform/auth/impl/PlatUserServiceImpl.java

@@ -235,7 +235,7 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
 
     @Transactional
     @Override
-    public void add(PlatUserDTOVO dto) {
+    public String add(PlatUserDTOVO dto) {
         check(dto);
         PlatUser user = BeanDtoVoUtils.convert(dto, PlatUser.class);
         user.setIsTenant(CommonEnum.YES.getValue());
@@ -247,6 +247,7 @@ public class PlatUserServiceImpl extends ServiceImpl<PlatUserMapper, PlatUser>
         user.setAccount(dto.getMobile());
         save(user);
         dto.setId(user.getId());
+        return user.getId();
     }
 
 

server-service/src/main/java/com/makeit/service/saas/PlatMenuService.java

@@ -19,7 +19,7 @@ public interface PlatMenuService extends IService<PlatMenu> {
 
     List<PlatMenuDTOVO> tree(PlatMenuQueryDTO dto);
 
-    void add(PlatMenuDTOVO dto);
+    String add(PlatMenuDTOVO dto);
 
     void edit(PlatMenuDTOVO dto);
 

server-service/src/main/java/com/makeit/service/saas/SaasMenuService.java

@@ -20,7 +20,7 @@ public interface SaasMenuService extends IService<SaasMenu> {
 
     List<SaasMenuDTOVO> tree(SaasMenuQueryDTO dto);
 
-    void add(SaasMenuDTOVO dto);
+    String add(SaasMenuDTOVO dto);
 
     void edit(SaasMenuDTOVO dto);
 

server-service/src/main/java/com/makeit/service/saas/SaasPrivacyConfigService.java

@@ -14,7 +14,7 @@ public interface SaasPrivacyConfigService extends IService<SaasPrivacyConfig> {
      *
      * @param saasPrivacyConfigDTO
      */
-     void add(SaasPrivacyConfigDTO saasPrivacyConfigDTO);
+     String add(SaasPrivacyConfigDTO saasPrivacyConfigDTO);
 
     /**
      *

server-service/src/main/java/com/makeit/service/saas/SaasRoleService.java

@@ -22,7 +22,7 @@ public interface SaasRoleService extends IService<SaasRole> {
 
     PageVO<SaasRoleDTOVO> page(PageReqDTO<SaasRoleDTOVO> dto);
 
-    void add(SaasRoleDTOVO dto);
+    String add(SaasRoleDTOVO dto);
 
     void edit(SaasRoleDTOVO dto);
 

server-service/src/main/java/com/makeit/service/saas/SaasUserService.java

@@ -26,7 +26,7 @@ public interface SaasUserService extends IService<SaasUser> {
 
     List<SaasUserDTOVO> listNoSuperAdmin(SaasUserQueryDTO dto);
 
-    void add(SaasUserDTOVO dto);
+    String add(SaasUserDTOVO dto);
 
     void edit(SaasUserDTOVO dto);
 

server-service/src/main/java/com/makeit/service/saas/impl/PlatMenuServiceImpl.java

@@ -125,9 +125,11 @@ implements PlatMenuService {
 
     @Transactional
     @Override
-    public void add(PlatMenuDTOVO dto) {
+    public String add(PlatMenuDTOVO dto) {
         checkCode(dto);
-        save(BeanDtoVoUtils.convert(dto, PlatMenu.class));
+        PlatMenu platMenu = BeanDtoVoUtils.convert(dto, PlatMenu.class);
+        save(platMenu);
+        return platMenu.getId();
     }
 
     @Transactional

server-service/src/main/java/com/makeit/service/saas/impl/SaasMenuServiceImpl.java

@@ -127,9 +127,11 @@ public class SaasMenuServiceImpl extends ServiceImpl<SaasMenuMapper, SaasMenu> i
 
     @Transactional
     @Override
-    public void add(SaasMenuDTOVO dto) {
+    public String add(SaasMenuDTOVO dto) {
         checkCode(dto);
-        save(BeanDtoVoUtils.convert(dto, SaasMenu.class));
+        SaasMenu saasMenu = BeanDtoVoUtils.convert(dto, SaasMenu.class);
+        save(saasMenu);
+        return saasMenu.getId();
     }
 
     @Transactional

server-service/src/main/java/com/makeit/service/saas/impl/SaasPrivacyConfigServiceImpl.java

@@ -20,13 +20,15 @@ public class SaasPrivacyConfigServiceImpl extends ServiceImpl<SaasPrivacyConfigM
 implements SaasPrivacyConfigService{
     @Override
     @Transactional
-    public void add(SaasPrivacyConfigDTO saasPrivacyConfigDTO) {
+    public String add(SaasPrivacyConfigDTO saasPrivacyConfigDTO) {
 
         LambdaQueryWrapper<SaasPrivacyConfig> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(SaasPrivacyConfig::getCategory, saasPrivacyConfigDTO.getCategory());
         this.remove(queryWrapper);
 
-        this.save(BeanDtoVoUtils.convert(saasPrivacyConfigDTO, SaasPrivacyConfig.class));
+        SaasPrivacyConfig saasPrivacyConfig = BeanDtoVoUtils.convert(saasPrivacyConfigDTO, SaasPrivacyConfig.class);
+        this.save(saasPrivacyConfig);
+        return saasPrivacyConfig.getId();
     }
 
 

server-service/src/main/java/com/makeit/service/saas/impl/SaasRoleServiceImpl.java

@@ -101,11 +101,12 @@ implements SaasRoleService{
 
     @Transactional
     @Override
-    public void add(SaasRoleDTOVO dto) {
+    public String add(SaasRoleDTOVO dto) {
         check(dto);
         SaasRole saasRole = BeanDtoVoUtils.convert(dto, SaasRole.class);
         save(saasRole);
         assignMenuList(saasRole.getId(),dto.getMenuIdList());
+        return saasRole.getId();
     }
 
     @Transactional

server-service/src/main/java/com/makeit/service/saas/impl/SaasUserServiceImpl.java

@@ -230,7 +230,7 @@ implements SaasUserService{
 
     @Transactional
     @Override
-    public void add(SaasUserDTOVO dto) {
+    public String add(SaasUserDTOVO dto) {
         check(dto);
         SaasUser user = BeanDtoVoUtils.convert(dto, SaasUser.class);
 
@@ -242,6 +242,8 @@ implements SaasUserService{
         save(user);
         dto.setId(user.getId());
         setRoleList(dto);
+
+        return user.getId();
     }
 
     @Transactional