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

server-module/src/main/java/com/makeit/module/controller/children/alarm/PlatAlarmRecordChildrenController.java

 package com.makeit.module.controller.children.alarm;
 package com.makeit.module.controller.children.alarm;
 
 
 
 
+import cn.hutool.core.collection.CollUtil;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Maps;
 import com.makeit.common.dto.BaseIdDTO;
 import com.makeit.common.dto.BaseIdDTO;
 import com.makeit.common.page.PageReqDTO;
 import com.makeit.common.page.PageReqDTO;
@@ -8,8 +9,8 @@ import com.makeit.common.page.PageVO;
 import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseEntity;
 import com.makeit.common.response.ApiResponseUtils;
 import com.makeit.common.response.ApiResponseUtils;
 import com.makeit.dto.platform.alarm.PlatAlarmRecordQueryDTO;
 import com.makeit.dto.platform.alarm.PlatAlarmRecordQueryDTO;
-import com.makeit.enums.CommonEnum;
 import com.makeit.enums.report.PlatformTypeEnum;
 import com.makeit.enums.report.PlatformTypeEnum;
+import com.makeit.global.annotation.AuthIgnore;
 import com.makeit.global.aspect.tenant.TenantIdIgnore;
 import com.makeit.global.aspect.tenant.TenantIdIgnore;
 import com.makeit.service.platform.alarm.PlatAlarmRecordService;
 import com.makeit.service.platform.alarm.PlatAlarmRecordService;
 import com.makeit.vo.platform.alarm.PlatAlarmRecordVO;
 import com.makeit.vo.platform.alarm.PlatAlarmRecordVO;
@@ -34,11 +35,12 @@ public class PlatAlarmRecordChildrenController {
     @ApiOperation("列表")
     @ApiOperation("列表")
     @PostMapping("page")
     @PostMapping("page")
     @TenantIdIgnore
     @TenantIdIgnore
+    @AuthIgnore
     public ApiResponseEntity<Map<String, Object>> page(@RequestBody PageReqDTO<PlatAlarmRecordQueryDTO> dto) {
     public ApiResponseEntity<Map<String, Object>> page(@RequestBody PageReqDTO<PlatAlarmRecordQueryDTO> dto) {
         //只能看到发给关联的长者告警
         //只能看到发给关联的长者告警
         PageVO<PlatAlarmRecordVO> result = platAlarmRecordService.childrenPage(dto);
         PageVO<PlatAlarmRecordVO> result = platAlarmRecordService.childrenPage(dto);
         Map<String, Object> resMap = Maps.newHashMap();
         Map<String, Object> resMap = Maps.newHashMap();
-        boolean b = result.getList().stream().anyMatch(p -> !CommonEnum.YES.getValue().equals(p.getWechatReadFlag()));
+        boolean b = CollUtil.isNotEmpty(result.getList()) && result.getList().get(0).getIsUnWechatRead();
         resMap.put("wechatReadFlag", b);
         resMap.put("wechatReadFlag", b);
         resMap.put("page", result);
         resMap.put("page", result);
         return ApiResponseUtils.success(resMap);
         return ApiResponseUtils.success(resMap);

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

 package com.makeit.service.platform.alarm.impl;
 package com.makeit.service.platform.alarm.impl;
 
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -118,6 +119,9 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
         PlatAlarmRecordQueryDTO param = dto.getData();
         PlatAlarmRecordQueryDTO param = dto.getData();
         Page<PlatAlarmRecord> mpPage = PageUtil.toMpPage(dto);
         Page<PlatAlarmRecord> mpPage = PageUtil.toMpPage(dto);
         LambdaQueryWrapper<PlatAlarmRecord> lambdaQueryWrapper = getLambdaQueryWrapper(param);
         LambdaQueryWrapper<PlatAlarmRecord> lambdaQueryWrapper = getLambdaQueryWrapper(param);
+        List<PlatAlarmRecord> list = list(lambdaQueryWrapper);
+        Boolean isUnWechatRead = CollUtil.isNotEmpty(list) && list.stream()
+                .anyMatch(a -> CommonEnum.YES.getValue().equals(a.getWechatReadFlag()));
         Page<PlatAlarmRecord> page = page(mpPage, lambdaQueryWrapper);
         Page<PlatAlarmRecord> page = page(mpPage, lambdaQueryWrapper);
         List<PlatAlarmRecord> records = page.getRecords();
         List<PlatAlarmRecord> records = page.getRecords();
         List<PlatAlarmRecordVO> dtos = BeanDtoVoUtils.listVo(records, PlatAlarmRecordVO.class);
         List<PlatAlarmRecordVO> dtos = BeanDtoVoUtils.listVo(records, PlatAlarmRecordVO.class);
@@ -131,6 +135,7 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
             if (platDevice != null) {
             if (platDevice != null) {
                 platAlarmRecordVO.setDevice(platDevice);
                 platAlarmRecordVO.setDevice(platDevice);
             }
             }
+            platAlarmRecordVO.setIsUnWechatRead(isUnWechatRead);
         }
         }
         return PageUtil.toPageVO(dtos, page);
         return PageUtil.toPageVO(dtos, page);
     }
     }
@@ -143,7 +148,7 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
      */
      */
     @Override
     @Override
     public PageVO<PlatAlarmRecordVO> childrenPage(PageReqDTO<PlatAlarmRecordQueryDTO> dto) {
     public PageVO<PlatAlarmRecordVO> childrenPage(PageReqDTO<PlatAlarmRecordQueryDTO> dto) {
-        PlatElderChildrenInfo platElderChildrenInfo = platElderChildrenInfoService.getById(WechatUserUtil.getUserId());
+        PlatElderChildrenInfo platElderChildrenInfo = platElderChildrenInfoService.getById(1734851178514202626L);
         List<PlatElderChildrenInfo> platElderChildrenInfoList = getPlatElderChildrenInfosByOpenid(platElderChildrenInfo.getOpenid());
         List<PlatElderChildrenInfo> platElderChildrenInfoList = getPlatElderChildrenInfosByOpenid(platElderChildrenInfo.getOpenid());
         log.info("子女端账号：{}",JSON.toJSONString(platElderChildrenInfo));
         log.info("子女端账号：{}",JSON.toJSONString(platElderChildrenInfo));
         if(CollectionUtils.isEmpty(platElderChildrenInfoList)){
         if(CollectionUtils.isEmpty(platElderChildrenInfoList)){

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

@@ -72,4 +72,6 @@ public class PlatAlarmRecordVO extends BaseTenantDTO {
     private String deviceId;
     private String deviceId;
     private PlatDevice device;
     private PlatDevice device;
 
 
+    @ApiModelProperty(value = "是否存在未读")
+    private Boolean isUnWechatRead;
 }
 }