化学品修改

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

@@ -127,9 +127,9 @@ public class HxpAlarmRecordServiceImpl implements IHxpAlarmRecordService {
         if(oldAlarmRecord == null){
             throw new ServiceException("参数无效，请刷新重试！");
         }
-        if(oldAlarmRecord.getAlarmMode() != 3){
-            throw new ServiceException("类型不符，操作失败！");
-        }
+//        if(oldAlarmRecord.getAlarmMode() != 3){
+//            throw new ServiceException("类型不符，操作失败！");
+//        }
         hxpAlarmRecord.setHandlingTime(DateUtils.getNowDate());
         hxpAlarmRecord.setHandlingUserId(SecurityUtils.getUserId());
         int count = hxpAlarmRecordMapper.updateHxpAlarmRecord(hxpAlarmRecord);

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

@@ -310,7 +310,7 @@ public class LabSubjectManagerService {
                         Map <String,String> alarmUpMap = new HashMap<>();
                         alarmUpMap.put("id",a.get("id"));
                         alarmUpMap.put("handlingUserId",SecurityUtils.getUserId()+"");
-                        alarmUpMap.put("handlingContent","手动关闭智能声光报警");
+                        alarmUpMap.put("handlingContent","关闭智能声光报警");
                         remoteChemicalAlarmService.updateStatus(alarmUpMap);
 //                        if(!updateAlarm.getData()){
 //                            logger.error("智能声光报警日志处理失败，报警设备编号："+labHardwareVO.getHardwareNum());