diff --git a/src/main/java/com/gunshi/project/xyt/model/BroadcastStation.java b/src/main/java/com/gunshi/project/xyt/model/BroadcastStation.java index 302ecd0..dca4e46 100644 --- a/src/main/java/com/gunshi/project/xyt/model/BroadcastStation.java +++ b/src/main/java/com/gunshi/project/xyt/model/BroadcastStation.java @@ -55,4 +55,12 @@ public class BroadcastStation implements Serializable { @Schema(description="排序") private Integer orderIndex; + /** + * 独立密码 + */ + @TableField(value="ctrl_pass") + @Schema(description="独立密码") + @Size(max = 16,message = "独立密码最大长度要小于 16") + private String ctrlPass; + } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/model/BroadcastWarn.java b/src/main/java/com/gunshi/project/xyt/model/BroadcastWarn.java index 2546157..af52f24 100644 --- a/src/main/java/com/gunshi/project/xyt/model/BroadcastWarn.java +++ b/src/main/java/com/gunshi/project/xyt/model/BroadcastWarn.java @@ -89,4 +89,11 @@ public class BroadcastWarn implements Serializable { @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") private Date createTime; + /** + * 密码 + */ + @TableField(exist = false) + @Schema(description="密码") + private String ctrlPass; + } \ No newline at end of file diff --git a/src/main/java/com/gunshi/project/xyt/service/BroadcastWarnService.java b/src/main/java/com/gunshi/project/xyt/service/BroadcastWarnService.java index 90ea16c..f97670c 100644 --- a/src/main/java/com/gunshi/project/xyt/service/BroadcastWarnService.java +++ b/src/main/java/com/gunshi/project/xyt/service/BroadcastWarnService.java @@ -4,10 +4,13 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gunshi.project.xyt.entity.so.BroadcastWarnPageSo; +import com.gunshi.project.xyt.mapper.BroadcastStationMapper; import com.gunshi.project.xyt.mapper.BroadcastWarnMapper; +import com.gunshi.project.xyt.model.BroadcastStation; import com.gunshi.project.xyt.model.BroadcastWarn; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -25,13 +28,20 @@ import java.util.stream.Collectors; @Transactional(rollbackFor = Exception.class) public class BroadcastWarnService extends ServiceImpl { + @Autowired + private BroadcastStationMapper stationMapper; public Page pageQuery(BroadcastWarnPageSo page) { return this.baseMapper.pageQuery(page.getPageSo().toPage(),page); } public Boolean saveData(BroadcastWarn dto) { + String ctrlPass = dto.getCtrlPass(); List stationIds = dto.getStationIds(); + BroadcastStation broadcastStation = stationMapper.selectById(stationIds.get(0)); + if(!ctrlPass.equals(broadcastStation.getCtrlPass())){ + throw new IllegalArgumentException("密码不正确"); + } List list = stationIds.stream().map(stationId->{ BroadcastWarn warn = new BroadcastWarn(); BeanUtils.copyProperties(dto,warn);