修改预警日志查询

zd-api/zd-laboratory-api/src/main/java/com/zd/laboratory/api/dto/WarningNoticeLogDto.java

@@ -38,7 +38,7 @@ public class WarningNoticeLogDto {
     @ApiModelProperty("预警下级类型（1违规带离，2超时未归还，3即将过期 4已过期）")
     private Integer warningSubType;
 
-    @ApiModelProperty("预警方式(1系统通知 2短信通知 3声光报警)")
+    @ApiModelProperty("预警方式(1系统通知 2短信通知 3声光报警 4语音播报)")
     private String warningWay;
 
     @ApiModelProperty("实验室id")
@@ -72,7 +72,7 @@ public class WarningNoticeLogDto {
     private String specification;
 
     @ApiModelProperty("申领人")
-    private String apply;
+    private String applyUser;
 
     @ApiModelProperty("申领时间")
     private LocalDateTime applyTime;

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/impl/AlarmRecordServiceImpl.java

@@ -475,7 +475,7 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
             warningNoticeLogDto.setWarningType(3);
             warningNoticeLogDto.setWarningSubType(2);
             warningNoticeLogDto.setWarningContent("气瓶超时未归还");
-            warningNoticeLogDto.setApply(QpUseRecord.getContacts());
+            warningNoticeLogDto.setApplyUser(QpUseRecord.getContacts());
             warningNoticeLogDto.setApplyTime(LocalDateTimeUtil.of(QpUseRecord.getUseTime()));
             warningNoticeLogDto.setHolder(qpBottleStorageVO.getStorageUser());
             warningNoticeLogDto.setDeposit(qpBottleStorageVO.getLocation());
@@ -522,7 +522,7 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
                 }
                 Long logId = (Long) resultData.getData();
 
-                String text = "【实验室安全系统】"+warningNoticeLogDto.getSubName()+"-"+warningNoticeLogDto.getApply()+"领用"+warningNoticeLogDto.getName()+"气瓶超时未归还，领用时间："+LocalDateTimeUtil.format(LocalDateTime.now(), "yyyy-MM-dd HH:mm:ss")+",请尽快确认。";
+                String text = "【实验室安全系统】"+warningNoticeLogDto.getSubName()+"-"+warningNoticeLogDto.getApplyUser()+"领用"+warningNoticeLogDto.getName()+"气瓶超时未归还，领用时间："+LocalDateTimeUtil.format(LocalDateTime.now(), "yyyy-MM-dd HH:mm:ss")+",请尽快确认。";
                 if (timeout.contains("1")) {
                     //系统通知
                     LabMessageContent labMessageContent = new LabMessageContent();

zd-modules/zd-chemical/src/main/java/com/zd/chemical/service/impl/HxpStockServiceImpl.java

@@ -1008,7 +1008,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
                 warningNoticeLogDto.setApplyTime(LocalDateTimeUtil.of(hxpUserecord.getCollectTime()));
                 R<SysUser> userInfo = remoteUserService.getUserInfoByUserId(hxpUserecord.getUserId(), SecurityConstants.INNER);
                 if(HttpStatus.SUCCESS == userInfo.getCode()){
-                    warningNoticeLogDto.setApply(userInfo.getData().getNickName());
+                    warningNoticeLogDto.setApplyUser(userInfo.getData().getNickName());
                 }
                 warningNoticeLogDto.setSpecification(hxpChemicalJoinCabinet.getChemicalAmount() + hxpChemicalJoinCabinet.getChemicalAmountUnit());
 
@@ -1040,7 +1040,7 @@ public class HxpStockServiceImpl implements IHxpStockService {
                         logger.info("化学品超时未归还保存日志成功！");
                     }
                     Long logId = (Long) result.getData();
-                    String text ="【实验室安全系统】"+warningNoticeLogDto.getSubName()+"-"+warningNoticeLogDto.getApply()+"领用"+warningNoticeLogDto.getName()+"超时未归还，领用时间："+LocalDateTimeUtil.format(LocalDateTime.now(), "yyyy-MM-dd HH:mm:ss") +",请尽快确认。";
+                    String text ="【实验室安全系统】"+warningNoticeLogDto.getSubName()+"-"+warningNoticeLogDto.getApplyUser()+"领用"+warningNoticeLogDto.getName()+"超时未归还，领用时间："+LocalDateTimeUtil.format(LocalDateTime.now(), "yyyy-MM-dd HH:mm:ss") +",请尽快确认。";
                     if (timeout.contains("1")) {
                         //系统通知
                         LabMessageContent labMessageContent = new LabMessageContent();

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/WarningNoticeLogController.java

@@ -17,6 +17,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalTime;
 import java.util.List;
 
 /**
@@ -70,10 +71,10 @@ public class WarningNoticeLogController extends AbstractController {
             queryWrapper.ne(WarningNoticeLog::getWarningType, 4);
         }
         if(queryWarningLogParam.getWarningStartTime() != null && queryWarningLogParam.getWarningEndTime() != null){
-            queryWrapper.between(WarningNoticeLog::getWarningTime, queryWarningLogParam.getWarningStartTime(),queryWarningLogParam.getWarningEndTime());
+            queryWrapper.between(WarningNoticeLog::getWarningTime, queryWarningLogParam.getWarningStartTime().atStartOfDay(),queryWarningLogParam.getWarningEndTime().atTime(LocalTime.MAX));
         }
         if(StringUtils.isNotBlank(queryWarningLogParam.getWarningWay())){
-            queryWrapper.in(WarningNoticeLog::getWarningWay, queryWarningLogParam.getWarningWay());
+            queryWrapper.like(WarningNoticeLog::getWarningWay, queryWarningLogParam.getWarningWay());
         }
         queryWrapper.eq(WarningNoticeLog::getIsDeleted,Boolean.FALSE);
         queryWrapper.orderByDesc(WarningNoticeLog::getId);

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/WarningNoticeLog.java

@@ -78,7 +78,7 @@ public class WarningNoticeLog extends Model<WarningNoticeLog> {
     private String specification;
 
     @ApiModelProperty("申领人")
-    private String apply;
+    private String applyUser;
 
     @ApiModelProperty("申领时间")
     private LocalDateTime applyTime;

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/dto/QueryWarningLogParam.java

@@ -3,8 +3,9 @@ package com.zd.laboratory.domain.dto;
 import com.zd.model.page.PageQuery;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 
 /**
  * @Description 查询报警记录入参
@@ -21,9 +22,11 @@ public class QueryWarningLogParam extends PageQuery {
     private String warningWay;
 
     @ApiModelProperty("预警开始时间")
-    private LocalDateTime warningStartTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate warningStartTime;
 
     @ApiModelProperty("预警结束时间")
-    private LocalDateTime warningEndTime;
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private LocalDate warningEndTime;
 
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/domain/vo/WarningNoticeLogVO.java

@@ -73,7 +73,7 @@ public class WarningNoticeLogVO {
     @ApiModelProperty("规格")
     private String specification;
     @ApiModelProperty("申领人")
-    private String apply;
+    private String applyUser;
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty("申领时间")

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/event/RedisExpiredPhotographListener.java

@@ -241,7 +241,7 @@ public class RedisExpiredPhotographListener extends KeyExpirationEventMessageLis
                             }
                             long l2 = noticeCount % warningConfig.getVoiceNotcie();
                             if (warningConfig.getVoiceNotcie() != null && l2 == 0) {
-                                warningWay.append("3,");
+                                warningWay.append("4,");
                                 warningNoticeLogDto2.setVoiceBroadcast(1);
                                 log.info("打开喇叭-远程调用查询喇叭列表，实验室id={}", warningNoticeLog.getSubId());
                                 Integer count = labSparseHardwareService.selectSpeakerCount();

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/impl/LabMessageContentServiceImpl.java

@@ -247,7 +247,7 @@ public class LabMessageContentServiceImpl implements ILabMessageContentService {
         warningNoticeLog.setFloorName(subject.getFloorName());
         warningNoticeLog.setRoomNum(subject.getRoom());
         warningNoticeLog.setWarningType(4);
-        warningNoticeLog.setWarningWay("2,3");
+        warningNoticeLog.setWarningWay("2,4");
         //TODO 语音播报通知
         warningNoticeLog.setVoiceBroadcast(1);
         String riskPlanName = "";
@@ -283,30 +283,8 @@ public class LabMessageContentServiceImpl implements ILabMessageContentService {
             logger.error("获取urlScheme失败！");
         }
 
-//        String format = StrUtil.format(smsFormat, deptName, subject.getName(), StrUtil.isBlank(labRiskPlanLevel.getMessage()) ? labRiskPlanLevel.getRiskName() : labRiskPlanLevel.getMessage());
-//        String format = StrUtil.format(smsFormatString, labRiskPlanLevel.getTopName(), labRiskPlanLevel.getRiskName(), StrUtil.isBlank(labRiskPlanLevel.getMessage()) ? "" : labRiskPlanLevel.getMessage());
         String format = StrUtil.format(smsFormatString2, labRiskPlanLevel.getTopName(), labRiskPlanLevel.getRiskName());
         logger.info("new format = {}",format);
-//        String phone = null;
-//        String userids = null;
-//        try {
-//            userids = getDoingUserId(subject);
-//            if (StrUtil.isNotBlank(userids)) {
-//                 userids = getDoingUserId(subject);
-//                R<List<String>> phoneByUserIDS = remoteUserService.getPhoneByUserIDS(userids);
-//                if (phoneByUserIDS.getCode() == 200 && CollUtil.isNotEmpty(phoneByUserIDS.getData())) {
-//                    phone = phoneByUserIDS.getData().stream()
-//                            .collect(Collectors.joining(","));
-//
-//                }
-//
-//            }
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            logger.error("获取实验室内部短信发送人出错");
-//        }
-        //获取人员电话信息
-//        List<UserPhoneInfo> userPhoneInfoList = getUserPhoneInfos(subject);
         //获取人员电话信息
         List<UserPhoneInfo> userPhoneInfos = labSubjectService.selectAdminAndSafeAdminById(subject.getId());
         String[] strings = Stream.of(new String[]{subject.getAdminPhone(), subject.getSafeUserPhone()})
@@ -331,10 +309,6 @@ public class LabMessageContentServiceImpl implements ILabMessageContentService {
                 alarmEntrty.setUserPhoneInfo(userPhoneInfos);
                 alarmEntrty.setLogId(logId);
                 remoteAlarmService.send(alarmEntrty);
-//                MessageBody messageBody = new MessageBody();
-//                messageBody.setData(alarmEntrty);
-//                messageBody.setMessageId(logId);
-//                commonSend.send(MqttConstants.TOPIC_ALERT + labRiskPlanLevel.getRiskPlanId() + "/" + subject.getId(), messageBody, SendMode.DISTINCT);
                 logger.info("发送短信打电话消息推送完成！topic={},msg={}",MqttConstants.TOPIC_ALERT + labRiskPlanLevel.getRiskPlanId() + "/" + subject.getId(),JSON.toJSONString(alarmEntrty));
                 try {
                     if (subject.getAdminId() != null) {

zd-modules/zd-modules-laboratory/src/main/resources/mapper/laboratory/WarningNoticeLogMapper.xml

@@ -19,8 +19,8 @@
         <result column="name" property="name" />
         <result column="margin" property="margin" />
         <result column="specification" property="specification" />
-        <result column="apply" property="apply" />
-        <result column="applyTime" property="applyTime" />
+        <result column="apply_user" property="applyUser" />
+        <result column="apply_time" property="applyTime" />
         <result column="deposit" property="deposit" />
         <result column="record_video" property="recordVideo" />
         <result column="record_photo" property="recordPhoto" />
@@ -43,7 +43,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, key_id, warning_content, warning_type, warning_sub_type, warning_way, sub_id, sub_name, build_name, floor_name, room_num, warning_time, name, margin, specification, apply, applyTime, deposit, record_video, record_photo, risk_duration, responder, indoor_user, start_time, end_time, expiration_time, entry_time, holder, create_name, create_by, create_time, update_name, update_by, update_time, is_deleted
+        id, key_id, warning_content, warning_type, warning_sub_type, warning_way, sub_id, sub_name, build_name, floor_name, room_num, warning_time, name, margin, specification, apply_user, apply_time, deposit, record_video, record_photo, risk_duration, responder, indoor_user, start_time, end_time, expiration_time, entry_time, holder, create_name, create_by, create_time, update_name, update_by, update_time, is_deleted
     </sql>
 
 </mapper>