Merge commit 'fbbbd81c0cdefb7e4f5719eec23e1c215757d3ca' into suda

zd-modules/zd-chemical/src/main/resources/mapper/chemical/HxpAlarmRecordMapper.xml

@@ -71,6 +71,8 @@
         (SELECT ur.nick_name FROM sys_user ur WHERE ur.user_id = ard.handling_user_id) handlingUserName,
         CASE WHEN ard.handling_status = 1 THEN '待处理' ELSE '已处理' END operate,
         st.admin_id,
+        ( SELECT GROUP_CONCAT(ur.nick_name) FROM sys_user ur WHERE FIND_IN_SET(ur.user_id,st.safe_user_id)) safeUserNames,
+	    ( SELECT ur.nick_name FROM sys_user ur WHERE ur.user_id = st.admin_id ) adminNames,
         ard.handling_status handlingStatus,st.safe_user_id safeUserId,ard.alarm_mode alarmModeStatus,
         concat(TIMESTAMPDIFF(MINUTE, ard.alarm_time, ard.handling_time),'分',TIMESTAMPDIFF(SECOND, ard.alarm_time, ard.handling_time)%60,'秒') alarmDuration
         FROM hxp_alarm_record ard

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

@@ -765,7 +765,9 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                 log.info("录制视频结束返回结果打印={}", JSON.toJSONString(r));
                 if (r.getCode() == HttpStatus.SUCCESS) {
                     com.alibaba.fastjson.JSONObject jsonObject = com.alibaba.fastjson.JSONObject.parseObject(JSON.toJSONString(r.getData()));
-                    recordVideo = jsonObject.getString("data");
+                    if(jsonObject.getInteger("code") == HttpStatus.SUCCESS){
+                        recordVideo = jsonObject.getString("data");
+                    }
                 } else {
                     log.info("结束录制视频失败！");
                 }
@@ -776,7 +778,12 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
             log.error("远程调用结束录制视频接口失败！{}", e);
         }
         //更新风险概要  recordVideo - 视频记录存放地址
-        String handlePerson = tokenService.getLoginUser().getNickName();
+        String handlePerson = "";
+        if(!Objects.isNull(tokenService.getLoginUser())){
+            handlePerson = tokenService.getLoginUser().getNickName();
+        }else {
+            handlePerson = "SYSTEM";
+        }
         labRiskPlanAbnormalDescService.updateLabRiskPlanAbnormalDesc(groupId, handlePerson, recordVideo);
     }