预警日志新增字段学院提交

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

@@ -118,13 +118,18 @@ public class WarningNoticeLogDto {
     @ApiModelProperty("是否处理（0 未处理，1已处理）")
     private Integer dispose;
 
-
     @ApiModelProperty("位置状态（0离位 1在位）")
     private Integer locationState;
 
     @ApiModelProperty("信标标签")
     private String beaconTag;
 
+    @ApiModelProperty("学院Id")
+    private Long collegeId;
+
+    @ApiModelProperty("学院名称")
+    private String collegeName;
+
     @ApiModelProperty("创建人名称")
     private String createName;
 

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/DbUsageRecordController.java

@@ -111,7 +111,7 @@ public class DbUsageRecordController extends AbstractController {
         //气瓶编号 气瓶名称 实验室名称
         if (StringUtils.isNotBlank(dbUsageRecordBo.getSearchValue())) {
             queryWrapper.and(wrapper ->{
-                wrapper.like(DbUsageRecord::getGasName, dbUsageRecordBo.getSearchValue()).or().like(DbUsageRecord::getSubjectName, dbUsageRecordBo.getSearchValue());
+                wrapper.like(DbUsageRecord::getGasName, dbUsageRecordBo.getSearchValue()).or().like(DbUsageRecord::getOperator, dbUsageRecordBo.getSearchValue());
             });
         }
         if (Objects.nonNull(dbUsageRecordBo.getCollegeId())) {

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

@@ -193,6 +193,8 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
                     warningNoticeLogDto.setFloorId(i.getFloorId());
                     warningNoticeLogDto.setFloorName(i.getFloorName());
                     warningNoticeLogDto.setRoomNum(i.getRoomNumber());
+                    warningNoticeLogDto.setCollegeId(i.getDeptId());
+                    warningNoticeLogDto.setCollegeName(i.getCollegeName());
                     userIds.append(i.getSafeUserId()).append(",").append(i.getAdminId());
                     phones.append(i.getAdminPhone()).append(",").append(i.getSafeUserPhone());
                 }
@@ -485,6 +487,8 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
             warningNoticeLogDto.setFloorId(i.getFloorId());
             warningNoticeLogDto.setFloorName(i.getFloorName());
             warningNoticeLogDto.setRoomNum(i.getRoomNumber());
+            warningNoticeLogDto.setCollegeId(i.getDeptId());
+            warningNoticeLogDto.setCollegeName(i.getCollegeName());
             userIds.append(i.getSafeUserId()).append(",").append(i.getAdminId());
             phones.append(i.getAdminPhone()).append(",").append(i.getSafeUserPhone());
         }
@@ -627,6 +631,8 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
                 warningNoticeLogDto.setFloorId(i.getFloorId());
                 warningNoticeLogDto.setFloorName(i.getFloorName());
                 warningNoticeLogDto.setRoomNum(i.getRoomNumber());
+                warningNoticeLogDto.setCollegeId(i.getDeptId());
+                warningNoticeLogDto.setCollegeName(i.getCollegeName());
                 userIdStr.append(i.getSafeUserId()).append(",").append(i.getAdminId());
                 phones.append(i.getAdminPhone()).append(",").append(i.getSafeUserPhone());
             }

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

@@ -415,6 +415,8 @@ public class HxpStockServiceImpl implements IHxpStockService {
                 warningNoticeLogDto.setFloorId(i.getFloorId());
                 warningNoticeLogDto.setFloorName(i.getFloorName());
                 warningNoticeLogDto.setRoomNum(i.getRoomNumber());
+                warningNoticeLogDto.setCollegeId(i.getDeptId());
+                warningNoticeLogDto.setCollegeName(i.getCollegeName());
                 userIdStr.append(i.getSafeUserId()).append(",").append(i.getAdminId());
                 phones.append(i.getAdminPhone()).append(",").append(i.getSafeUserPhone());
             }
@@ -912,6 +914,8 @@ public class HxpStockServiceImpl implements IHxpStockService {
                 warningNoticeLogDto.setFloorId(i.getFloorId());
                 warningNoticeLogDto.setFloorName(i.getFloorName());
                 warningNoticeLogDto.setRoomNum(i.getRoomNumber());
+                warningNoticeLogDto.setCollegeId(i.getDeptId());
+                warningNoticeLogDto.setCollegeName(i.getCollegeName());
                 userIdStr.append(i.getSafeUserId()).append(",").append(i.getAdminId());
                 phones.append(i.getAdminPhone()).append(",").append(i.getSafeUserPhone());
             }
@@ -971,6 +975,8 @@ public class HxpStockServiceImpl implements IHxpStockService {
                 warningNoticeLogDto.setFloorId(i.getFloorId());
                 warningNoticeLogDto.setFloorName(i.getFloorName());
                 warningNoticeLogDto.setRoomNum(i.getRoomNumber());
+                warningNoticeLogDto.setCollegeId(i.getDeptId());
+                warningNoticeLogDto.setCollegeName(i.getCollegeName());
                 userIdStr.append(i.getSafeUserId()).append(",").append(i.getAdminId());
                 phones.append(i.getAdminPhone()).append(",").append(i.getSafeUserPhone());
             }
@@ -1088,6 +1094,8 @@ public class HxpStockServiceImpl implements IHxpStockService {
                     warningNoticeLogDto.setFloorId(i.getFloorId());
                     warningNoticeLogDto.setFloorName(i.getFloorName());
                     warningNoticeLogDto.setRoomNum(i.getRoomNumber());
+                    warningNoticeLogDto.setCollegeId(i.getDeptId());
+                    warningNoticeLogDto.setCollegeName(i.getCollegeName());
                     userIdStr.append(i.getSafeUserId()).append(",").append(i.getAdminId());
                     phones.append(i.getAdminPhone()).append(",").append(i.getSafeUserPhone());
                 }

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

@@ -53,6 +53,12 @@ public class WarningNoticeLog extends Model<WarningNoticeLog> {
     @ApiModelProperty("实验室名称")
     private String subName;
 
+    @ApiModelProperty("学院Id")
+    private Long collegeId;
+
+    @ApiModelProperty("学院名称")
+    private String collegeName;
+
     @ApiModelProperty("楼层Id")
     private Long floorId;
 

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

@@ -246,6 +246,8 @@ public class LabMessageContentServiceImpl implements ILabMessageContentService {
         warningNoticeLog.setFloorId(subject.getFloorId());
         warningNoticeLog.setFloorName(subject.getFloorName());
         warningNoticeLog.setRoomNum(subject.getRoom());
+        warningNoticeLog.setCollegeId(subject.getDeptId());
+        warningNoticeLog.setCollegeName(subject.getDeptName());
         warningNoticeLog.setWarningType(4);
         warningNoticeLog.setWarningWay("2,4");
         //TODO 语音播报通知

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

@@ -12,6 +12,8 @@
         <result column="warning_way" property="warningWay" />
         <result column="sub_id" property="subId" />
         <result column="sub_name" property="subName" />
+        <result column="college_id" property="collegeId" />
+        <result column="college_name" property="collegeName" />
         <result column="build_name" property="buildName" />
         <result column="floor_name" property="floorName" />
         <result column="room_num" property="roomNum" />