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

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

@@ -3,6 +3,7 @@ package com.makeit.utils.msg.sender;
 import com.makeit.utils.msg.SendTypeEnum;
 import com.makeit.utils.msg.SendTypeEnum;
 import com.makeit.utils.msg.dto.MsgSendDTO;
 import com.makeit.utils.msg.dto.MsgSendDTO;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.JavaMailSender;
@@ -10,6 +11,8 @@ import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 
 
 import javax.mail.internet.MimeMessage;
 import javax.mail.internet.MimeMessage;
+import java.util.Collection;
+import java.util.Objects;
 
 
 @Component
 @Component
 @Slf4j
 @Slf4j
@@ -35,7 +38,12 @@ public class MailMsgSender implements IMsgSender {
             MimeMessage message = mailSender.createMimeMessage();
             MimeMessage message = mailSender.createMimeMessage();
             MimeMessageHelper helper = new MimeMessageHelper(message, true);
             MimeMessageHelper helper = new MimeMessageHelper(message, true);
             helper.setFrom(from);
             helper.setFrom(from);
-            helper.setTo(msgDTO.getEmailSet().toArray(new String[msgDTO.getReceiverList().size()]));
+            Collection<String> emailSet = msgDTO.getEmailSet();
+            emailSet.removeIf(Objects::isNull);
+            if(CollectionUtils.isEmpty(emailSet)){
+                return;
+            }
+            helper.setTo(emailSet.toArray(new String[emailSet.size()]));
             helper.setSubject(msgDTO.getSubject());
             helper.setSubject(msgDTO.getSubject());
             helper.setText(msgDTO.getOriContent(), false);
             helper.setText(msgDTO.getOriContent(), false);
             mailSender.send(message);
             mailSender.send(message);

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

@@ -36,5 +36,12 @@ public class PlatAlarmRecordChildrenController {
     public ApiResponseEntity<PlatAlarmRecordVO> view(@RequestBody BaseIdDTO dto) {
     public ApiResponseEntity<PlatAlarmRecordVO> view(@RequestBody BaseIdDTO dto) {
         return ApiResponseUtils.success(platAlarmRecordService.view(dto.getId()));
         return ApiResponseUtils.success(platAlarmRecordService.view(dto.getId()));
     }
     }
+
+    @ApiOperation("已读")
+    @PostMapping("read")
+    public ApiResponseEntity<Void> read(@RequestBody BaseIdDTO dto) {
+        platAlarmRecordService.read(dto.getId());
+        return ApiResponseUtils.success();
+    }
 }
 }
 
 

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

@@ -86,6 +86,9 @@ public class PlatAlarmRecord extends BaseBusEntity {
     @ApiModelProperty("区域名称")
     @ApiModelProperty("区域名称")
     private String regionName;
     private String regionName;
 
 
+    @ApiModelProperty(value = "0-未读 1-已读")
+    private String readFlag;
+
 
 
 }
 }
 
 

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

@@ -61,4 +61,6 @@ public interface PlatAlarmRecordService extends IService<PlatAlarmRecord> {
     void getElderListByDeviceId(PlatAlarmCheckDTO platAlarmCheckDTO);
     void getElderListByDeviceId(PlatAlarmCheckDTO platAlarmCheckDTO);
 
 
     void dealAlarm(BaseIdDTO dto);
     void dealAlarm(BaseIdDTO dto);
+
+    void read(String id);
 }
 }

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 com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.makeit.common.dto.BaseIdDTO;
 import com.makeit.common.dto.BaseIdDTO;
@@ -352,6 +354,8 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
         platAlarmRecord.setRemark(platAlarmCheckDTO.getRemark());
         platAlarmRecord.setRemark(platAlarmCheckDTO.getRemark());
         platAlarmRecord.setAbnormalValue(platAlarmCheckDTO.getAbnormalValue());
         platAlarmRecord.setAbnormalValue(platAlarmCheckDTO.getAbnormalValue());
         platAlarmRecord.setRegionName(platElder.getRegionName());
         platAlarmRecord.setRegionName(platElder.getRegionName());
+
+        platAlarmRecord.setReadFlag(CommonEnum.NO.getValue());
         return platAlarmRecord;
         return platAlarmRecord;
     }
     }
 
 
@@ -459,4 +463,13 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
         platAlarmRecord.setDealDate(LocalDateTime.now());
         platAlarmRecord.setDealDate(LocalDateTime.now());
         updateById(platAlarmRecord);
         updateById(platAlarmRecord);
     }
     }
+
+    @Override
+    @Transactional
+    public void read(String id) {
+        LambdaUpdateWrapper<PlatAlarmRecord> recordLambdaUpdateWrapper = Wrappers.lambdaUpdate(PlatAlarmRecord.class)
+                .eq(BaseEntity::getId, id)
+                .set(PlatAlarmRecord::getReadFlag, CommonEnum.YES.getValue());
+        update(recordLambdaUpdateWrapper);
+    }
 }
 }

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

@@ -59,5 +59,8 @@ public class PlatAlarmRecordVO extends BaseTenantDTO {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createDate;
     private LocalDateTime createDate;
 
 
+    @ApiModelProperty(value = "0-未读 1-已读")
+    private String readFlag;
+
 
 
 }
 }