yaowang
/
kn-vordm
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glj-代码提交

This commit is contained in:
glj 2023-04-20 14:20:52 +08:00
parent 836a19065c
commit 7a42e21897
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/OtherData.java
View File

@ -21,4 +21,6 @@ public class OtherData{
private String remark; private String remark;
private Long disasterId; private Long disasterId;
private Integer visualFlag;
} }

1
kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/DisasterInfoMapper.xml
View File

@ -77,6 +77,7 @@
<if test="id != null and id != ''"> <if test="id != null and id != ''">
di.id = #{id} di.id = #{id}
</if> </if>
and gmdr.STATUS != 2
</where> </where>
</select> </select>

8
kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/OtherDataServiceImpl.java
View File

@ -5,9 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.kening.vordm.entity.EntityData; import com.kening.vordm.entity.EntityData;
import com.kening.vordm.entity.OtherData; import com.kening.vordm.entity.OtherData;
import com.kening.vordm.mapper.DataUploadMapper;
import com.kening.vordm.mapper.OtherDataMapper; import com.kening.vordm.mapper.OtherDataMapper;
import com.kening.vordm.service.DataUploadService;
import com.kening.vordm.service.OtherDataService; import com.kening.vordm.service.OtherDataService;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -25,6 +23,7 @@ import java.util.Map;
/** /**
* 管理员用户实现类 * 管理员用户实现类
*
* @author liyuchen * @author liyuchen
*/ */
@Slf4j @Slf4j
@ -51,6 +50,7 @@ public class OtherDataServiceImpl extends ServiceImpl<OtherDataMapper, EntityDat
/** /**
* 分页列表查询 * 分页列表查询
*
* @param page * @param page
* @param params * @param params
* @return * @return
@ -63,6 +63,7 @@ public class OtherDataServiceImpl extends ServiceImpl<OtherDataMapper, EntityDat
/** /**
* 根据角色名称获取角色id * 根据角色名称获取角色id
*
* @param roleName * @param roleName
* @return * @return
*/ */
@ -73,13 +74,13 @@ public class OtherDataServiceImpl extends ServiceImpl<OtherDataMapper, EntityDat
/** /**
* 上传数据 * 上传数据
*
* @param OtherData * @param OtherData
* @return * @return
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean uploadData(OtherData OtherData) { public boolean uploadData(OtherData OtherData) {
log.info("上传数据:{}",OtherData);
//路径拼接 //路径拼接
List<String> link = new ArrayList<>(); List<String> link = new ArrayList<>();
//文件大小 //文件大小
@ -106,6 +107,7 @@ public class OtherDataServiceImpl extends ServiceImpl<OtherDataMapper, EntityDat
entityData.setUploaderId(AuthUtil.getUserId()); entityData.setUploaderId(AuthUtil.getUserId());
entityData.setManagerId(AuthUtil.getUserId()); entityData.setManagerId(AuthUtil.getUserId());
entityData.setReviewTime(new Date()); entityData.setReviewTime(new Date());
entityData.setVisualFlag(OtherData.getVisualFlag());
return save(entityData); return save(entityData);
} }
} }

4
kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/PictureInfoServiceImpl.java
View File

@ -1,8 +1,6 @@
package com.kening.vordm.service.impl; package com.kening.vordm.service.impl;
import com.alibaba.nacos.common.utils.StringUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.kening.vordm.entity.EntityData;
import com.kening.vordm.entity.OtherData; import com.kening.vordm.entity.OtherData;
import com.kening.vordm.entity.PictureInfo; import com.kening.vordm.entity.PictureInfo;
import com.kening.vordm.mapper.PictureInfoMapper; import com.kening.vordm.mapper.PictureInfoMapper;
@ -11,12 +9,10 @@ import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springblade.core.oss.MinioTemplate; import org.springblade.core.oss.MinioTemplate;
import org.springblade.core.oss.model.BladeFile; import org.springblade.core.oss.model.BladeFile;
import org.springblade.core.secure.utils.AuthUtil;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**