sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交diamagnetic

dev_xds
姜玉琦 2024-04-24 09:54:34 +08:00
parent 9cf1d824c7
commit 7be144b0da
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/MultipartFileUtils.java
View File

@ -23,7 +23,7 @@ public class MultipartFileUtils {
byte[] bytes = Base64.getDecoder().decode(parts[1]); byte[] bytes = Base64.getDecoder().decode(parts[1]);
return new MockMultipartFile("file","file."+contentType.split("/")[1], contentType, bytes); return new MockMultipartFile("file","file."+contentType.split("/")[1], contentType, bytes);
}else{ }else{
//默认格式为pdf //默认格式为jpeg
String contentType = "image/jpeg"; String contentType = "image/jpeg";
byte[] bytes = Base64.getDecoder().decode(base64); byte[] bytes = Base64.getDecoder().decode(base64);
return new MockMultipartFile("file", "file"+contentType.split("/")[1], contentType, bytes); return new MockMultipartFile("file", "file"+contentType.split("/")[1], contentType, bytes);

5
ruoyi-ui/src/views/base/magDetail/magDetailDrawer.vue
View File

@ -65,7 +65,7 @@
></el-image> ></el-image>
</div> </div>
</div> </div>
<FileUpload @input="doImageInput" v-model="form.imageUrl" :fileSize="5" :limit="5" <FileUpload @input="doImageInput" v-model="form.imageUrl" :fileSize="5" :limit="20"
:fileType="['png', 'jpg', 'jpeg']" /> :fileType="['png', 'jpg', 'jpeg']" />
</el-form-item> </el-form-item>
<el-form-item label="" prop="content" class="fi-editor"> <el-form-item label="" prop="content" class="fi-editor">
@ -313,9 +313,10 @@ export default {
display: none; display: none;
} }
.img-list{ .img-list{
display: flex; display: block;
.img-item{ .img-item{
position: relative; position: relative;
display: inline-block;
margin-right: 8px; margin-right: 8px;
&:hover{ &:hover{
.img-item-del{ .img-item-del{

5
yanzhu-jh/src/main/java/com/yanzhu/jh/video/service/impl/SurProjectVideoConfigServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.yanzhu.jh.video.service.impl;
import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.enums.PublicStateEnum; import com.ruoyi.common.enums.PublicStateEnum;
import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DictUtils;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysDictDataService; import com.ruoyi.system.service.ISysDictDataService;
@ -236,9 +237,7 @@ public class SurProjectVideoConfigServiceImpl implements ISurProjectVideoConfigS
@Override @Override
public List<Map<String, Object>> selectGroupCountVideoConfig(Map<String, Object> map){ public List<Map<String, Object>> selectGroupCountVideoConfig(Map<String, Object> map){
List<SurProjectVideoConfig> list = surProjectVideoConfigMapper.selectSurProjectVideoConfigByGroupCountParams(map); List<SurProjectVideoConfig> list = surProjectVideoConfigMapper.selectSurProjectVideoConfigByGroupCountParams(map);
SysDictData dictData = new SysDictData(); List<SysDictData> dictlist = DictUtils.getDictCache("aibox_alarm_type");
dictData.setDictType("aibox_alarm_type");
List<SysDictData> dictlist = sysDictDataService.selectDictDataList(dictData);
List<Map<String, Object>> dataList = new ArrayList<>(); List<Map<String, Object>> dataList = new ArrayList<>();
for(SysDictData dict : dictlist){ for(SysDictData dict : dictlist){
Map<String, Object> dataMap = new HashMap<>(); Map<String, Object> dataMap = new HashMap<>();