Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

项目集成华为obs查看波形文件

Browse Source
This commit is contained in:
hongawen
2023-03-06 19:05:09 +08:00
parent c2c3fd9fd6
commit 280dfbad29
6 changed files with 191 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pqs-process/process-boot/pom.xml
View File

@@ -114,6 +114,12 @@
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
<!--华为obs工具包-->
<dependency>
<groupId>com.njcn</groupId>
<artifactId>huawei-obs-springboot-starter</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<build>

132
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/LoadTypeUserManageServiceImpl.java
View File

@@ -4,8 +4,12 @@ import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.njcn.common.config.GeneralInfo;
import com.njcn.common.pojo.constant.GeneralConstant;
import com.njcn.common.pojo.constant.OssPath;
import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.device.pms.api.DistributionMonitorClient;
import com.njcn.huawei.obs.util.OBSUtil;
import com.njcn.minio.bo.MinIoUploadResDTO;
import com.njcn.minio.config.MinIoProperties;
import com.njcn.minio.utils.MinIoUtils;
@@ -60,16 +64,22 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
@Resource
private MinIoUtils minIoUtils;
@Resource
private GeneralInfo generalInfo;
@Resource
private OBSUtil obsUtil;
@Resource
private MinIoProperties minIoProperties;
/**
* 干扰源用户分页查询
*
* @param loadTypeUserSearchParam
* @return
*/
@Override
public Page<RLoadTypeUserManageVO> getLoadTypeUserList(LoadTypeUserSearchParam loadTypeUserSearchParam){
public Page<RLoadTypeUserManageVO> getLoadTypeUserList(LoadTypeUserSearchParam loadTypeUserSearchParam) {
Page<RLoadTypeUserManageVO> page = new Page<>(loadTypeUserSearchParam.getPageNum(), loadTypeUserSearchParam.getPageSize());
Page<RLoadTypeUserManageVO> loadTypeUserPage = loadTypeUserManageMapper.getLoadTypeUserPage(page, loadTypeUserSearchParam);
@@ -90,6 +100,7 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
/**
* 根据id查询干扰源用户
*
* @param id
* @return
*/
@@ -99,11 +110,11 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
RLoadTypeUserManageVO rLoadTypeUserManageVO = new RLoadTypeUserManageVO();
BeanUtils.copyProperties(rLoadTypeUserManage, rLoadTypeUserManageVO);
//文件
if (rLoadTypeUserManageVO.getIFilePath() != null){
if (rLoadTypeUserManageVO.getIFilePath() != null) {
String iFile = minIoUtils.getObjectUrl(minIoProperties.getBucket(), rLoadTypeUserManageVO.getIFilePath(), 7 * 24 * 60 * 60);
rLoadTypeUserManageVO.setIFile(iFile);
}
if (rLoadTypeUserManageVO.getAFilePath() != null){
if (rLoadTypeUserManageVO.getAFilePath() != null) {
String aFile = minIoUtils.getObjectUrl(minIoProperties.getBucket(), rLoadTypeUserManageVO.getAFilePath(), 7 * 24 * 60 * 60);
rLoadTypeUserManageVO.setIFile(aFile);
}
@@ -112,6 +123,7 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
/**
* 新增干扰源用户
*
* @param loadTypeUserParam
* @return
*/
@@ -130,6 +142,7 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
/**
* 上传干扰源用户入网报告
*
* @param loadTypeUserIUploadParam
* @return
*/
@@ -138,19 +151,25 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
RLoadTypeUserManage rLoadTypeUserManage = new RLoadTypeUserManage();
BeanUtils.copyProperties(loadTypeUserIUploadParam, rLoadTypeUserManage);
MultipartFile multipartFile = loadTypeUserIUploadParam.getFile();
//文件上传到Minio服务器，存入文件名
if(loadTypeUserIUploadParam.getFile() != null){
MinIoUploadResDTO minIoUploadResDTO = fileToMinio(loadTypeUserIUploadParam.getFile());
rLoadTypeUserManage.setIFilePath(minIoUploadResDTO.getMinFileName());
if (Objects.nonNull(multipartFile)) {
if (generalInfo.getBusinessFileStorage() == GeneralConstant.HUAWEI_OBS) {
String fileName = OssPath.LOAD_TYPE_USER + minIoUtils.minFileName(multipartFile.getOriginalFilename());
obsUtil.multiFileUpload(multipartFile, fileName);
rLoadTypeUserManage.setIFilePath(fileName);
} else {
MinIoUploadResDTO minIoUploadResDTO = fileToMinio(loadTypeUserIUploadParam.getFile(), OssPath.LOAD_TYPE_USER);
rLoadTypeUserManage.setIFilePath(minIoUploadResDTO.getMinFileName());
}
rLoadTypeUserManage.setIUploadTime(new Date());
}
//提交：待审核/保存：新建
DictData dictData;
if(Objects.equals(Param.LOAD_TYPE_USER_SUBMIT,loadTypeUserIUploadParam.getStatus())){
if (Objects.equals(Param.LOAD_TYPE_USER_SUBMIT, loadTypeUserIUploadParam.getStatus())) {
dictData = dicDataFeignClient.getDicDataByCode(DicDataEnum.AUDIT.getCode()).getData();
}else{
} else {
dictData = dicDataFeignClient.getDicDataByCode(DicDataEnum.NEWLY.getCode()).getData();
}
rLoadTypeUserManage.setIStatus(dictData.getId());
@@ -162,6 +181,7 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
/**
* 关联营销用户
*
* @param
* @return
*/
@@ -176,13 +196,14 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
/**
* 查询所有干扰源用户（与营销系统关联）
*
* @param loadTypeUserSearchParam
* @return
*/
@Override
public Page<RLoadTypeUserManageVO> getLoadTypeRelationList(LoadTypeUserSearchParam loadTypeUserSearchParam) {
Page<RLoadTypeUserManageVO> page = new Page<>(loadTypeUserSearchParam.getPageNum(), loadTypeUserSearchParam.getPageSize());
Page<RLoadTypeUserManageVO> loadTypeUserPage = loadTypeUserManageMapper.getLoadTypeRelationPage(page,loadTypeUserSearchParam);
Page<RLoadTypeUserManageVO> loadTypeUserPage = loadTypeUserManageMapper.getLoadTypeRelationPage(page, loadTypeUserSearchParam);
//部门处理：根据部门code取名称
List<RLoadTypeUserManageVO> list = loadTypeUserPage.getRecords();
@@ -205,10 +226,10 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
* @param file 文件
* @return 成功标记
*/
private MinIoUploadResDTO fileToMinio(MultipartFile file) {
private MinIoUploadResDTO fileToMinio(MultipartFile file, String dir) {
try {
//把名称存入数据
MinIoUploadResDTO upload = minIoUtils.upload(file, minIoProperties.getBucket(), "loadTypeUser/");
MinIoUploadResDTO upload = minIoUtils.upload(file, minIoProperties.getBucket(), dir);
return upload;
} catch (Exception e) {
throw new BusinessException(ProcessResponseEnum.UPLOAD_FILE_ERROR);
@@ -217,6 +238,7 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
/**
* 上传干扰源用户入网报告
*
* @param loadTypeUserAUploadParam
* @return
*/
@@ -225,19 +247,25 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
RLoadTypeUserManage rLoadTypeUserManage = new RLoadTypeUserManage();
BeanUtils.copyProperties(loadTypeUserAUploadParam, rLoadTypeUserManage);
//文件上传到Minio服务器，存入文件名
if(loadTypeUserAUploadParam.getFile() != null){
MinIoUploadResDTO minIoUploadResDTO = fileToMinio(loadTypeUserAUploadParam.getFile());
rLoadTypeUserManage.setAFilePath(minIoUploadResDTO.getMinFileName());
MultipartFile multipartFile = loadTypeUserAUploadParam.getFile();
//文件上传到文件服务器，存入文件名
if (Objects.nonNull(multipartFile)) {
if (generalInfo.getBusinessFileStorage() == GeneralConstant.HUAWEI_OBS) {
String fileName = OssPath.LOAD_TYPE_USER + minIoUtils.minFileName(multipartFile.getOriginalFilename());
obsUtil.multiFileUpload(multipartFile, fileName);
rLoadTypeUserManage.setIFilePath(fileName);
} else {
MinIoUploadResDTO minIoUploadResDTO = fileToMinio(loadTypeUserAUploadParam.getFile(), OssPath.LOAD_TYPE_USER);
rLoadTypeUserManage.setAFilePath(minIoUploadResDTO.getMinFileName());
}
rLoadTypeUserManage.setAUploadTime(new Date());
}
//提交：待审核/保存：新建
DictData dictData;
if(Objects.equals(Param.LOAD_TYPE_USER_SUBMIT,loadTypeUserAUploadParam.getStatus())){
if (Objects.equals(Param.LOAD_TYPE_USER_SUBMIT, loadTypeUserAUploadParam.getStatus())) {
dictData = dicDataFeignClient.getDicDataByCode(DicDataEnum.AUDIT.getCode()).getData();
}else{
} else {
dictData = dicDataFeignClient.getDicDataByCode(DicDataEnum.NEWLY.getCode()).getData();
}
rLoadTypeUserManage.setAStatus(dictData.getId());
@@ -248,13 +276,14 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
/**
* 导出未建档干扰源用户管理信息
*
* @param list
* @return
*/
@Override
public List<LoadTypeUserExcel> exportLoadTypeUserList(List<String> list) {
//数据处理
LambdaQueryWrapper<RLoadTypeUserManage> queryWrapper = new LambdaQueryWrapper<> ();
LambdaQueryWrapper<RLoadTypeUserManage> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(RLoadTypeUserManage::getId, list);
List<RLoadTypeUserManage> rLoadTypeUserManages = loadTypeUserManageMapper.selectList(queryWrapper);
//1、部门数据
@@ -271,25 +300,25 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
List<LoadTypeUserExcel> resultList = rLoadTypeUserManages.stream().map(item -> {
LoadTypeUserExcel loadTypeUserExcel = new LoadTypeUserExcel();
if (item.getUserName() != null){
if (item.getUserName() != null) {
loadTypeUserExcel.setUserName(item.getUserName());
}
if (item.getRecordTime() != null){
if (item.getRecordTime() != null) {
loadTypeUserExcel.setRecordTime(item.getRecordTime());
}
if (item.getAIsFileUpload() != null){
if (item.getAIsFileUpload() != null) {
loadTypeUserExcel.setIIsFileUpload(item.getIIsFileUpload() == 0 ? "否" : "是"); //实测报告是否上传
}
if (item.getOrgNo() != null){
if (item.getOrgNo() != null) {
loadTypeUserExcel.setOrgName(pvTerminalTreeVOMap.get(item.getOrgNo()).getName()); //单位
}
if (item.getLoadType() != null){
if (item.getLoadType() != null) {
loadTypeUserExcel.setLoadTypeName(loadTypeMap.get(item.getLoadType()).getName()); //入网报告状态
}
if (item.getIStatus() != null){
if (item.getIStatus() != null) {
loadTypeUserExcel.setIStatusName(iStatusMap.get(item.getIStatus()).getName()); //入网报告状态
}
if (item.getAIsFileUpload() != null){
if (item.getAIsFileUpload() != null) {
loadTypeUserExcel.setIIsFileUpload(item.getIIsFileUpload() == 0 ? "否" : "是"); //实测报告是否上传
}
return loadTypeUserExcel;
@@ -300,13 +329,14 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
/**
* 导出干扰源用户常态化管理信息
*
* @param list
* @return
*/
@Override
public List<LoadTypeRelationExcel> exportLoadTypeRelationList(List<String> list) {
//数据处理
LambdaQueryWrapper<RLoadTypeUserManage> queryWrapper = new LambdaQueryWrapper<> ();
LambdaQueryWrapper<RLoadTypeUserManage> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(RLoadTypeUserManage::getId, list);
List<RLoadTypeUserManage> rLoadTypeUserManages = loadTypeUserManageMapper.selectList(queryWrapper);
//1、部门数据
@@ -323,19 +353,19 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
List<LoadTypeRelationExcel> resultList = rLoadTypeUserManages.stream().map(item -> {
LoadTypeRelationExcel loadTypeRelationExcel = new LoadTypeRelationExcel();
if (item.getOrgNo() != null){
if (item.getOrgNo() != null) {
loadTypeRelationExcel.setOrgName(pvTerminalTreeVOMap.get(item.getOrgNo()).getName());
}
if (item.getLoadType() != null){
if (item.getLoadType() != null) {
loadTypeRelationExcel.setLoadTypeName(loadTypeMap.get(item.getLoadType()).getName());
}
if (item.getUserName() != null){
if (item.getUserName() != null) {
loadTypeRelationExcel.setUserName(item.getUserName());
}
if (item.getRelationUserName() != null){
if (item.getRelationUserName() != null) {
loadTypeRelationExcel.setRelationUserName(item.getRelationUserName());
}
if (item.getAStatus() != null){
if (item.getAStatus() != null) {
loadTypeRelationExcel.setAStatusName(aStatusMap.get(item.getIStatus()).getName());
}
return loadTypeRelationExcel;
@@ -355,17 +385,17 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
@Override
public Boolean checkLoadTypeUserI(LoadTypeUserCheckParam loadTypeUserCheckParam) {
boolean result = true;
UpdateWrapper<RLoadTypeUserManage> updateWrapper = new UpdateWrapper ();
updateWrapper.eq ("id", loadTypeUserCheckParam.getId ());
updateWrapper.set ("i_check_comment", loadTypeUserCheckParam.getCheckComment ());
updateWrapper.set ("i_check_person",loadTypeUserCheckParam.getCheckPerson ());
UpdateWrapper<RLoadTypeUserManage> updateWrapper = new UpdateWrapper();
updateWrapper.eq("id", loadTypeUserCheckParam.getId());
updateWrapper.set("i_check_comment", loadTypeUserCheckParam.getCheckComment());
updateWrapper.set("i_check_person", loadTypeUserCheckParam.getCheckPerson());
DictData fail = dicDataFeignClient.getDicDataByCode (DicDataEnum.FAIL.getCode ( )).getData ( );
DictData finish = dicDataFeignClient.getDicDataByCode(DicDataEnum.SUCCESS.getCode()).getData();
DictData fail = dicDataFeignClient.getDicDataByCode(DicDataEnum.FAIL.getCode()).getData();
DictData finish = dicDataFeignClient.getDicDataByCode(DicDataEnum.SUCCESS.getCode()).getData();
updateWrapper.set ("i_status", Objects.equals ("1", loadTypeUserCheckParam.getCheckResult ())?finish.getId ():fail.getId ());
int i= loadTypeUserManageMapper.update (null,updateWrapper);
result = i==1;
updateWrapper.set("i_status", Objects.equals("1", loadTypeUserCheckParam.getCheckResult()) ? finish.getId() : fail.getId());
int i = loadTypeUserManageMapper.update(null, updateWrapper);
result = i == 1;
return result;
}
@@ -380,17 +410,17 @@ public class LoadTypeUserManageServiceImpl implements LoadTypeUserManageService
@Override
public Boolean checkLoadTypeUserA(LoadTypeUserCheckParam loadTypeUserCheckParam) {
boolean result = true;
UpdateWrapper<RLoadTypeUserManage> updateWrapper = new UpdateWrapper ();
updateWrapper.eq ("id", loadTypeUserCheckParam.getId ());
updateWrapper.set ("a_check_comment", loadTypeUserCheckParam.getCheckComment ());
updateWrapper.set ("a_check_person",loadTypeUserCheckParam.getCheckPerson ());
UpdateWrapper<RLoadTypeUserManage> updateWrapper = new UpdateWrapper();
updateWrapper.eq("id", loadTypeUserCheckParam.getId());
updateWrapper.set("a_check_comment", loadTypeUserCheckParam.getCheckComment());
updateWrapper.set("a_check_person", loadTypeUserCheckParam.getCheckPerson());
DictData fail = dicDataFeignClient.getDicDataByCode (DicDataEnum.FAIL.getCode ( )).getData ( );
DictData finish = dicDataFeignClient.getDicDataByCode(DicDataEnum.SUCCESS.getCode()).getData();
DictData fail = dicDataFeignClient.getDicDataByCode(DicDataEnum.FAIL.getCode()).getData();
DictData finish = dicDataFeignClient.getDicDataByCode(DicDataEnum.SUCCESS.getCode()).getData();
updateWrapper.set ("a_status", Objects.equals ("1", loadTypeUserCheckParam.getCheckResult ())?finish.getId ():fail.getId ());
int i= loadTypeUserManageMapper.update (null,updateWrapper);
result = i==1;
updateWrapper.set("a_status", Objects.equals("1", loadTypeUserCheckParam.getCheckResult()) ? finish.getId() : fail.getId());
int i = loadTypeUserManageMapper.update(null, updateWrapper);
result = i == 1;
return result;
}
}