Merge commit '54b0945297be935e13f6da7109729cdbfe8e5905' into pro

zd-modules/zd-bottle-parent/zd-bottle/src/main/java/com/zd/bottle/controller/AlarmRecordController.java

@@ -78,7 +78,7 @@ public class AlarmRecordController extends BaseController<AlarmRecord> {
         List<AlarmRecordVo> recordVos = TransferUtils.transferList(list, AlarmRecordVo.class);
         if (!recordVos.isEmpty()) {
             alarmRecordService.getRecordInfo(recordVos);
-            recordVos.forEach(r -> r.setCurrentPressureValue(r.getCurrentPressure().toPlainString() + "MPa"));
+            recordVos.forEach(r -> r.setCurrentPressureValue(r.getCurrentPressure()==null?"":r.getCurrentPressure()+"MPa"));
         }
 
         util.exportExcel(response, recordVos, "报警记录数据");

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

@@ -10,10 +10,7 @@ import com.zd.algorithm.api.alarm.entity.SendTypes;
 import com.zd.algorithm.api.alarm.feign.RemoteAlarmService;
 import com.zd.algorithm.api.forward.feign.RemoteForwardService;
 import com.zd.algorithm.api.rfid.feign.RemoteRfidService;
-import com.zd.bottle.domain.AlarmRecord;
-import com.zd.bottle.domain.BottleStorage;
-import com.zd.bottle.domain.RfidTag;
-import com.zd.bottle.domain.UsegasApply;
+import com.zd.bottle.domain.*;
 import com.zd.bottle.mapper.AlarmRecordMapper;
 import com.zd.bottle.properties.AlarmProperties;
 import com.zd.bottle.service.AlarmRecordService;
@@ -121,6 +118,15 @@ public class AlarmRecordServiceImpl extends ServiceImpl<AlarmRecordMapper, Alarm
         String endTime = alarmRecord.getEndTime();
         queryWrapper.apply(StringUtils.hasLength(startTime), "DATE_FORMAT(alarm_time,'%Y-%m-%d') >=date_format('" + startTime + "','%Y-%m-%d')")
                 .apply(StringUtils.hasLength(startTime), "DATE_FORMAT(alarm_time,'%Y-%m-%d') <=date_format('" + endTime + "','%Y-%m-%d')");
+        String searchValue = alarmRecord.getSearchValue();
+        if (StringUtils.hasLength(searchValue)) {
+            queryWrapper.like(AlarmRecord::getElectronicTag, searchValue);
+        }
+
+        List<Long> ids = alarmRecord.getIds();
+        if (ids != null && !ids.isEmpty()) {
+            queryWrapper.in(AlarmRecord::getId, ids);
+        }
         return list(queryWrapper);
     }
 

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);
     }
 
@@ -978,17 +985,26 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                 R deviceList = remoteSpeakService.getDeviceList(1, 100, floorId, subjectId);
                 log.info("远程调用喇叭列表返回内容： deviceList={}", JSON.toJSONString(deviceList));
                 if (deviceList.getCode() == 200) {
+                    log.info("调用喇叭1");
                     List<Map<String, Object>> mapList = (List<Map<String, Object>>) deviceList.getData();
+                    log.info("调用喇叭2={}",JSON.toJSONString(mapList));
                     for (Map<String, Object> map : mapList) {
                         if (StringUtils.isNotNull(map.get("deviceSn")) && StringUtils.isNotNull(map.get("port"))) {
+                            log.info("调用喇叭3");
                             List<PlayVo> playVoList = new ArrayList<>();
                             PlayVo playVo = new PlayVo();
+                            log.info("调用喇叭4");
                             playVo.setSn(map.get("deviceSn") + "");
+                            log.info("调用喇叭5");
                             playVo.setDeviceIp(map.get("deviceIp") + "");
+                            log.info("调用喇叭6");
                             playVo.setPort(Integer.parseInt(map.get("port") + ""));
+                            log.info("调用喇叭7");
                             ParamVo paramVo = new ParamVo();
                             paramVo.setVol(Integer.parseInt(map.get("deviceVol").toString()));
+                            log.info("调用喇叭8");
                             playVo.setParams(paramVo);
+                            log.info("调用喇叭9");
                             playVoList.add(playVo);
                             log.info("远程调用喇叭播放音乐！url={},playVoList={}", audioSyntheses.get(0).getNewMusicUrl(), JSON.toJSONString(playVoList));
                             R r = remoteSpeakService.textParseUrlAppIps(audioSyntheses.get(0).getNewMusicUrl(), playVoList);
@@ -1004,7 +1020,7 @@ public class LabRiskPlanServiceImpl extends ServiceImpl<LabRiskPlanMapper, LabRi
                 log.info("合成音乐列表为空，此预案不触发音乐！riskPlanId={}", riskPlanId);
             }
         } catch (Exception e) {
-            log.error("开启喇叭失败！！！！！:" + e);
+            log.info("开启喇叭失败！={}",e);
         }
     }
 

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

@@ -3,7 +3,6 @@ package com.zd.laboratory.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.zd.chemical.api.fegin.RemoteChemicalAlarmService;
@@ -19,10 +18,8 @@ import com.zd.laboratory.api.vo.HardwareCVO;
 import com.zd.laboratory.api.vo.LabSubClassVO;
 import com.zd.laboratory.api.vo.SenseValVO;
 import com.zd.laboratory.config.HardwareFunctionStatusConfig;
-import com.zd.laboratory.domain.LabSubject;
 import com.zd.laboratory.domain.*;
 import com.zd.laboratory.domain.dto.LabSubListQuery;
-import com.zd.laboratory.domain.vo.LabSubjectVO;
 import com.zd.laboratory.domain.vo.*;
 import com.zd.laboratory.mapper.*;
 import com.zd.laboratory.mqtt.entiy.EquipmentStatus;
@@ -147,12 +144,15 @@ public class LabSubjectManagerService {
         if (labHardware.getBit() == null) {
             logger.error("硬件不存在或未关联继电器！id：{},名称:{}", labHardware.getId(), labHardware.getName());
             return ResultData.fail(StrUtil.format("未关联继电器位！id：{}，名称：{}", labHardware.getId(), labHardware.getName()));
-
         }
         if(labHardware.getIsPcfire() == 1){
             logger.error("一键灭火设备不进行开关操作！");
             return ResultData.fail("一键灭火设备不进行开关操作！");
         }
+        if(labHardware.getType().equals(HardwareTypeEnum.AI_VENTILATION) && labHardware.getPcType() == 1){
+            logger.error("通风橱设备不进行开关操作！");
+            return ResultData.fail("通风橱设备不进行开关操作！");
+        }
 
         //新老继电器调用方法
         Symbol.command command = null;