2022-1-13 修改在线人员头像校验空。

zd-model/src/main/java/com/zd/model/enums/WarnMessageTypeEnum.java

@@ -12,6 +12,7 @@ public enum WarnMessageTypeEnum implements BaseEnum<Integer> {
 
     voice(0, "语音" ),
     SMS(1, "短信" ),
+    PHONE(2, "电话" ),
     ;
 
     WarnMessageTypeEnum(Integer code, String name) {

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/controller/bigview/BigViewController.java

@@ -241,6 +241,28 @@ public class BigViewController extends BaseController {
 
 
     /**
+     * 查询风险分组内消息推送记录
+     *
+     * @return
+     */
+    @ApiOperation("查询风险分组内消息推送记录")
+    @GetMapping("/{group}/warn/getRiskLog")
+    public  List<LabWarnPushMessageListVO> getRiskLog(@PathVariable("group") Long groupId) {
+        List<LabWarnPushMessageVO> labWarnPushMessageVOS = warnPushMessageService.selectLabRiskLogList(groupId);
+
+        return Optional.ofNullable(labWarnPushMessageVOS)
+                .orElseGet(Collections::emptyList)
+                .stream()
+                .map(a->{
+                    LabWarnPushMessageListVO warnPushMessageVO = new LabWarnPushMessageListVO();
+                    BeanUtils.copyProperties(a,warnPushMessageVO);
+                    return warnPushMessageVO;
+                })
+                .collect(Collectors.toList());
+    }
+
+
+    /**
      * 安全隐患统计 柱状图2.4需求
      */
     @ApiOperation("安全隐患统计信息")

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

@@ -30,6 +30,9 @@ public class LabWarnPushMessageListVO
     @ApiModelProperty("实验室名称")
     private String subName;
 
+    @ApiModelProperty("创建时间格式化")
+    private String createTimeStr;
+
     @ApiModelProperty(value = "人员属性0：负责人1：内部人员")
     private WarnUserAttrEnum userAttributes;
 
@@ -40,7 +43,7 @@ public class LabWarnPushMessageListVO
         {
             return subName;
         }
-        if(WarnMessageTypeEnum.SMS.equals(pushType))
+        if(WarnMessageTypeEnum.SMS.equals(pushType)||WarnMessageTypeEnum.PHONE.equals(pushType))
         {
             return StrUtil.format("{}-{}",userAttributes.getName(), Optional.ofNullable(recipientName).orElseGet(()->StrUtil.EMPTY)) ;
         }
@@ -91,4 +94,12 @@ public class LabWarnPushMessageListVO
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
+
+    public String getCreateTimeStr() {
+        return createTimeStr;
+    }
+
+    public void setCreateTimeStr(String createTimeStr) {
+        this.createTimeStr = createTimeStr;
+    }
 }

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

@@ -20,6 +20,9 @@ public class LabWarnPushMessageVO extends LabWarnPushMessage
     @ApiModelProperty("实验室名称")
     private String subName;
 
+    @ApiModelProperty("创建时间格式化")
+    private String createTimeStr;
+
     public String getRecipientName() {
         return recipientName;
     }
@@ -35,4 +38,12 @@ public class LabWarnPushMessageVO extends LabWarnPushMessage
     public void setSubName(String subName) {
         this.subName = subName;
     }
+
+    public String getCreateTimeStr() {
+        return createTimeStr;
+    }
+
+    public void setCreateTimeStr(String createTimeStr) {
+        this.createTimeStr = createTimeStr;
+    }
 }

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/mapper/LabWarnPushMessageMapper.java

@@ -6,15 +6,15 @@ import com.zd.laboratory.domain.vo.LabWarnPushMessageVO;
 
 /**
  * 预警推送消息Mapper接口
- * 
+ *
  * @author zhoupan
  * @date 2021-10-06
  */
-public interface LabWarnPushMessageMapper 
+public interface LabWarnPushMessageMapper
 {
     /**
      * 查询预警推送消息
-     * 
+     *
      * @param id 预警推送消息主键
      * @return 预警推送消息
      */
@@ -22,7 +22,7 @@ public interface LabWarnPushMessageMapper
 
     /**
      * 查询预警推送消息列表
-     * 
+     *
      * @param labWarnPushMessage 预警推送消息
      * @return 预警推送消息集合
      */
@@ -36,8 +36,15 @@ public interface LabWarnPushMessageMapper
     public List<LabWarnPushMessageVO> selectLabWarnPushMessageVOList(Long riskGroup);
 
     /**
+     * 查询预警推送消息列表VO
+     *
+     * @return 预警推送消息集合
+     */
+    public List<LabWarnPushMessageVO> selectLabRiskLogVOList(Long riskGroup);
+
+    /**
      * 新增预警推送消息
-     * 
+     *
      * @param labWarnPushMessage 预警推送消息
      * @return 结果
      */
@@ -45,7 +52,7 @@ public interface LabWarnPushMessageMapper
 
     /**
      * 修改预警推送消息
-     * 
+     *
      * @param labWarnPushMessage 预警推送消息
      * @return 结果
      */
@@ -53,7 +60,7 @@ public interface LabWarnPushMessageMapper
 
     /**
      * 删除预警推送消息
-     * 
+     *
      * @param id 预警推送消息主键
      * @return 结果
      */
@@ -61,7 +68,7 @@ public interface LabWarnPushMessageMapper
 
     /**
      * 批量删除预警推送消息
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/onemachine/controller/OneMachineController.java

@@ -353,7 +353,7 @@ public class OneMachineController extends BaseController {
                 url=fileConfigUtils.getRemoteUrl()+sysUser.getAvatar();
             }*/
             //通过配置动态加载域名
-            if(StringUtils.isNotNull(sysUser.getAvatar())){
+            if(sysUser.getAvatar()!=null && !"".equals(sysUser.getAvatar())){
                 url = fileConfigUtils.getFileDomainApp() + sysUser.getAvatar();
                 url= UrlFormatUtils.getHttpsORHttpUrl(url);
                 logger.error("url:"+url);

zd-modules/zd-modules-laboratory/src/main/java/com/zd/laboratory/service/ILabWarnPushMessageService.java

@@ -25,6 +25,15 @@ public interface ILabWarnPushMessageService
      */
     public List<LabWarnPushMessageVO> selectLabWarnPushMessageList(Long riskGroup);
 
+
+    /**
+     * 查询预警推送消息列表
+     *
+     * @param riskGroup 风险分组ID
+     * @return 预警推送消息集合
+     */
+    public List<LabWarnPushMessageVO> selectLabRiskLogList(Long riskGroup);
+
     /**
      * 新增预警推送消息
      *

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

@@ -44,6 +44,13 @@ public class LabWarnPushMessageServiceImpl implements ILabWarnPushMessageService
         return labWarnPushMessageMapper.selectLabWarnPushMessageVOList(riskGroup);
     }
 
+    @Override
+    public List <LabWarnPushMessageVO> selectLabRiskLogList(Long riskGroup) {
+        LabWarnPushMessage labWarnPushMessage = new LabWarnPushMessage();
+        labWarnPushMessage.setRiskGroup(riskGroup);
+        return labWarnPushMessageMapper.selectLabRiskLogVOList(riskGroup);
+    }
+
     /**
      * 新增预警推送消息
      *

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

@@ -46,11 +46,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where   t.risk_group = #{id}
         order by t.create_time desc
     </select>
+
+    <select id="selectLabRiskLogVOList"  resultType="com.zd.laboratory.domain.vo.LabWarnPushMessageVO">
+        SELECT xx.* FROM (
+        SELECT l.id,l.`group_id` risk_group,ls.name sub_name,DATE_FORMAT(l.`create_time`,'%Y-%m-%d %H:%i') createTimeStr,0 push_type,NULL recipient_name,0 user_attributes FROM lab_risk_plan_abnormal_log l
+        LEFT JOIN lab_subject AS ls ON ls.id=l.`subject_id`
+        WHERE l.`risk_status`=5
+        UNION ALL
+        SELECT l.id,l.`group_id` risk_group,ls.name sub_name,DATE_FORMAT(l.`create_time`,'%Y-%m-%d %H:%i') createTimeStr,1 push_type,CONCAT(su.nick_name,'(实验室负责人)',',',(
+        SELECT GROUP_CONCAT(su.`nick_name`) FROM sys_user AS su WHERE FIND_IN_SET(su.user_id, ls.`safe_user_id`)
+        ),'(实验室安全责任人)') recipient_name,0 user_attributes FROM lab_risk_plan_abnormal_log l
+        LEFT JOIN lab_subject AS ls ON ls.id=l.`subject_id`
+        LEFT JOIN sys_user AS su ON su.user_id = ls.`admin_id`
+        WHERE l.`risk_status`=4 AND l.group_id = #{id}
+        UNION ALL
+        SELECT l.id,l.`group_id` risk_group,ls.name sub_name,DATE_FORMAT(l.`create_time`,'%Y-%m-%d %H:%i') createTimeStr,2 push_type,CONCAT(su.nick_name,'(实验室负责人)',',',(
+        SELECT GROUP_CONCAT(su.`nick_name`) FROM sys_user AS su WHERE FIND_IN_SET(su.user_id, ls.`safe_user_id`)
+        ),'(实验室安全责任人)') recipient_name,0 user_attributes
+        FROM lab_risk_plan_abnormal_log l
+        LEFT JOIN lab_subject AS ls ON ls.id=l.`subject_id`
+        LEFT JOIN sys_user AS su ON su.user_id = ls.`admin_id`
+        WHERE l.`risk_status`=5  AND l.group_id = #{id}
+        )xx
+        WHERE xx.risk_group = #{id}
+    </select>
     <select id="selectLabWarnPushMessageById"  resultMap="LabWarnPushMessageResult">
         <include refid="selectLabWarnPushMessageVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertLabWarnPushMessage" parameterType="com.zd.laboratory.domain.LabWarnPushMessage" useGeneratedKeys="true" keyProperty="id">
         insert into lab_warn_push_message
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -103,9 +127,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteLabWarnPushMessageByIds">
-        delete from lab_warn_push_message where id in 
+        delete from lab_warn_push_message where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-</mapper>
+</mapper>