diff --git a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java index a19e0d8..c8b7a39 100644 --- a/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java +++ b/flossom-modules/flossom-mini-program/src/main/java/com/flossom/miniProgram/service/impl/WxInstrumentServiceImpl.java @@ -432,24 +432,23 @@ public class WxInstrumentServiceImpl implements IWxInstrumentService { List wxModeList = wxModeMapper.selectListByInstrumentId(instrumentId); for (WxMode wxMode : wxModeList) { // 判断每个模式是否加锁 + WxModeRet wxModeRet = new WxModeRet(); WxModeTag wxModeTag = new WxModeTag(); wxModeTag.setModeId(wxMode.getId()); List wxModeTagList = wxModeTagMapper.selectWxModeTagList(wxModeTag); + BeanUtils.copyProperties(wxMode, wxModeRet); + wxModeRet.setModeTime(LocalTime.of(0, wxMode.getModeTime())); + Boolean isLock = false; if (wxModeTagList != null && wxModeTagList.size() > 0) { List modeTagList = wxModeTagList.stream().map(WxModeTag::getTagId).collect(Collectors.toList()); if (userTagIdList == null || userTagIdList.size() == 0 || !userTagIdList.containsAll(modeTagList)) { - WxModeRet wxModeRet = new WxModeRet(); - BeanUtils.copyProperties(wxMode, wxModeRet); wxModeRet.setLock(true); - wxModeRetList.add(wxModeRet); - continue; + isLock = true; } } - WxModeRet wxModeRet = new WxModeRet(); - BeanUtils.copyProperties(wxMode, wxModeRet); - wxModeRet.setLock(false); - wxModeRet.setModeTime(LocalTime.of(0, 10)); - + if (!isLock) { + wxModeRet.setLock(false); + } // 查询 模式组合 WxModeCombineInfo query = new WxModeCombineInfo(); query.setModeId(wxMode.getId()); diff --git a/flossom-ui/src/views/system/mode/index.vue b/flossom-ui/src/views/system/mode/index.vue index f89b339..c48ea16 100644 --- a/flossom-ui/src/views/system/mode/index.vue +++ b/flossom-ui/src/views/system/mode/index.vue @@ -291,6 +291,8 @@ list-type="picture-card" :on-preview="handlePreviewFile" :on-success="uploadServiceSuccess" + :before-upload="limitGifFileType" + accept=".GIF,.gif" > @@ -309,6 +311,8 @@ list-type="picture-card" :on-preview="handlePreviewFile" :on-success="uploadServiceSuccess" + :before-upload="limitGifFileType" + accept=".GIF,.gif" > @@ -728,6 +732,26 @@ export default { handlePreview(file) { console.log(file); }, + limitGifFileType(file) { + const imageType = ['image/gif', 'image/GIF'] + let isVideo = imageType.includes(file.type) + // 检验文件格式 + if (!isVideo) { + this.$message.error(`图片格式错误!`) + return false + } + // 校检文件大小 + let fileSize = 5; + if (fileSize) { + let isLt = file.size / 1024 / 1024 < fileSize + if (!isLt) { + this.$message.error(`上传文件大小不能超过 ${fileSize} MB!`) + return false + } + } + return true; + + }, limitImageFileType(file) { const imageType = ['image/jpeg', 'image/jpg', 'image/png', 'image/svg'] let isVideo = imageType.includes(file.type) @@ -746,7 +770,6 @@ export default { } } return true; - }, limitVideFileType(file) { const videoType = ['video/mp4','video/avi','video/mov','video/rmvb','video/rm','video/flv','video/3gp']