新增采集器管理,版本列表管理,创建版本号,更新管理包

segment2.0
linrf 2 years ago
parent 07f177f891
commit 4a5c8971ca

@ -1,14 +1,22 @@
package com.docus.server.controller;
import cn.hutool.core.util.StrUtil;
import com.docus.core.util.Func;
import com.docus.infrastructure.web.exception.ApiException;
import com.docus.infrastructure.web.exception.ExceptionCode;
import com.docus.infrastructure.web.request.SearchDTO;
import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.api.scheduling.management.SchCollectorVersionFileApi;
import com.docus.server.dto.scheduling.management.schcollectorversionfile.AddSchCollectorVersionFileDTO;
import com.docus.server.dto.scheduling.management.schcollectorversionfile.DeleteSchCollectorVersionFileDTO;
import com.docus.server.dto.scheduling.management.schcollectorversionfile.EditSchCollectorVersionFileDTO;
import com.docus.server.entity.scheduling.management.SchCollectorVersion;
import com.docus.server.service.ISchCollectorVersionFileService;
import com.docus.server.service.ISchCollectorVersionService;
import com.docus.server.vo.scheduling.management.schcollectorversionfile.SchCollectorVersionFileVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
@ -19,9 +27,12 @@ import javax.annotation.Resource;
* @since 2023-07-15
*/
@RestController
@Slf4j
public class SchCollectorVersionFileController implements SchCollectorVersionFileApi {
@Resource
private ISchCollectorVersionFileService iSchCollectorVersionFileService;
@Resource
private ISchCollectorVersionService iSchCollectorVersionService;
/**
*
@ -48,10 +59,33 @@ public class SchCollectorVersionFileController implements SchCollectorVersionFil
/**
*
*
* @param addSchCollectorVersionFileDTO
* @param addDTO
* @return
*/
@Override
public boolean add(AddSchCollectorVersionFileDTO addDTO, MultipartFile[] multipartFiles) throws Exception {
if (fileValid(multipartFiles, addDTO)) {
throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "请选择文件和填写上传文件信息!");
}
SchCollectorVersion schCollectorVersion = iSchCollectorVersionService.findByVersion(addDTO.getCollectorId(), addDTO.getCollectorVersionNo());
if (null != schCollectorVersion) {
throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "当前采集器版本号已存在!");
}
iSchCollectorVersionFileService.addVersionAndFile(addDTO, multipartFiles);
return true;
}
private boolean fileValid(MultipartFile[] multipartFiles, AddSchCollectorVersionFileDTO addSchCollectorVersionFileDTO) {
return multipartFiles == null
|| multipartFiles.length == 0
|| StrUtil.isBlank(addSchCollectorVersionFileDTO.getCollectorVersionNo())
|| Func.isEmpty(addSchCollectorVersionFileDTO.getCollectorId());
}
public boolean add(AddSchCollectorVersionFileDTO addSchCollectorVersionFileDTO) {
return iSchCollectorVersionFileService.add(addSchCollectorVersionFileDTO);
}

@ -1,12 +1,10 @@
package com.docus.server.convert;
import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.entity.scheduling.management.SchCollector;
import com.docus.server.dto.scheduling.management.schcollector.AddSchCollectorDTO;
import com.docus.server.dto.scheduling.management.schcollector.EditSchCollectorDTO;
import com.docus.server.dto.scheduling.management.schcollector.DeleteSchCollectorDTO;
import com.docus.server.entity.scheduling.management.SchCollector;
import com.docus.server.vo.scheduling.management.schcollector.SchCollectorVO;
import org.mapstruct.Mapper;
import org.mapstruct.Mappings;
import org.mapstruct.factory.Mappers;
@ -44,5 +42,6 @@ public interface SchCollectorConvert {
@Mappings({})
PageResult<SchCollectorVO> convertVO(PageResult<SchCollector> pageResult);
}

@ -54,4 +54,13 @@ public interface ISchCollectorVersionDao extends IBaseDao<SchCollectorVersion> {
*/
PageResult<SchCollectorVersion> search(SearchDTO searchDTO);
/**
* id
*
* @param collectorId id
* @param collectorVersionNo
* @return SchCollectorVersion
*/
SchCollectorVersion findByVersion(Long collectorId, String collectorVersionNo);
}

@ -2,6 +2,7 @@ package com.docus.server.infrastructure.dao.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.docus.core.util.Func;
import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl;
import com.docus.infrastructure.web.request.SearchDTO;
import com.docus.infrastructure.web.response.PageResult;
@ -86,15 +87,12 @@ public class SchCollectorDaoImpl extends BaseDaoImpl<SchCollectorMapper, SchColl
Date endTime = searchDTO.getEndTime();
query.le(SchCollector::getCreateTime, endTime);
}
//关键字比较多个列or
//if (!StringUtils.isEmpty(searchDTO.getKeyword())) {
//单个列用like
//query. like(SchCollector::getxxx, searchDTO.getKeyword());
//多个列用like
//query. and(sub -> sub.like(SchCollector::getxx1, searchDTO.getKeyword())
// оr(). like(SchCollector::getXX2, searchDTO.getKeyword()))
//);
//}
Object collectorId = searchDTO.getParams("collectorId");
if (Func.isNotEmpty(collectorId)) {
query.eq(SchCollector::getCollectorId, collectorId);
}
//默认createTime倒序排序
query.orderByDesc(SchCollector::getCreateTime);
List<SchCollector> list = super.find(query);

@ -2,6 +2,7 @@ package com.docus.server.infrastructure.dao.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.docus.core.util.Func;
import com.docus.infrastructure.core.db.dao.impl.BaseDaoImpl;
import com.docus.infrastructure.web.request.SearchDTO;
import com.docus.infrastructure.web.response.PageResult;
@ -86,19 +87,31 @@ public class SchCollectorVersionDaoImpl extends BaseDaoImpl<SchCollectorVersionM
Date endTime = searchDTO.getEndTime();
query.le(SchCollectorVersion::getCreateTime, endTime);
}
//关键字比较多个列or
//if (!StringUtils.isEmpty(searchDTO.getKeyword())) {
//单个列用like
//query. like(SchCollectorVersion::getxxx, searchDTO.getKeyword());
//多个列用like
//query. and(sub -> sub.like(SchCollectorVersion::getxx1, searchDTO.getKeyword())
// оr(). like(SchCollectorVersion::getXX2, searchDTO.getKeyword()))
//);
//}
Object collectorId = searchDTO.getParams("collectorId");
if (Func.isNotEmpty(collectorId)) {
query.eq(SchCollectorVersion::getCollectorId, collectorId);
}
//默认createTime倒序排序
query.orderByDesc(SchCollectorVersion::getCreateTime);
List<SchCollectorVersion> list = super.find(query);
return new PageResult<>(list);
}
@Override
public SchCollectorVersion findByVersion(Long collectorId, String collectorVersionNo) {
LambdaQueryWrapper<SchCollectorVersion> query = Wrappers.lambdaQuery();
if (Func.isNotEmpty(collectorId)) {
query.ge(SchCollectorVersion::getCollectorId, collectorId);
}
if (Func.isNotBlank(collectorVersionNo)) {
query.le(SchCollectorVersion::getCollectVersion, collectorVersionNo);
}
return super.findOne(query);
}
}

@ -0,0 +1,15 @@
package com.docus.server.service;
import com.docus.server.vo.scheduling.management.schcollectorversionfile.UploadFileVO;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
public interface IFileUploadService {
List<UploadFileVO> uploadFile(MultipartFile[] multipartFiles, String pathKey) throws Exception;
void downloadFile(HttpServletResponse response);
}

@ -6,6 +6,7 @@ import com.docus.server.dto.scheduling.management.schcollectorversionfile.AddSch
import com.docus.server.dto.scheduling.management.schcollectorversionfile.DeleteSchCollectorVersionFileDTO;
import com.docus.server.dto.scheduling.management.schcollectorversionfile.EditSchCollectorVersionFileDTO;
import com.docus.server.vo.scheduling.management.schcollectorversionfile.SchCollectorVersionFileVO;
import org.springframework.web.multipart.MultipartFile;
/**
*
@ -53,4 +54,9 @@ public interface ISchCollectorVersionFileService {
* @return
*/
PageResult<SchCollectorVersionFileVO> search(SearchDTO searchDTO);
/**
*
*/
void addVersionAndFile(AddSchCollectorVersionFileDTO addSchCollectorVersionFileDTO, MultipartFile[] multipartFiles) throws Exception;
}

@ -5,6 +5,7 @@ import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.dto.scheduling.management.schcollectorversion.AddSchCollectorVersionDTO;
import com.docus.server.dto.scheduling.management.schcollectorversion.DeleteSchCollectorVersionDTO;
import com.docus.server.dto.scheduling.management.schcollectorversion.EditSchCollectorVersionDTO;
import com.docus.server.entity.scheduling.management.SchCollectorVersion;
import com.docus.server.vo.scheduling.management.schcollectorversion.SchCollectorVersionVO;
/**
@ -53,4 +54,12 @@ public interface ISchCollectorVersionService {
* @return
*/
PageResult<SchCollectorVersionVO> search(SearchDTO searchDTO);
/**
*
* @param collectorId
* @param collectorVersionNo
* @return
*/
SchCollectorVersion findByVersion(Long collectorId, String collectorVersionNo);
}

@ -5,8 +5,12 @@ import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.dto.scheduling.management.schsystemparams.AddSchSystemParamsDTO;
import com.docus.server.dto.scheduling.management.schsystemparams.DeleteSchSystemParamsDTO;
import com.docus.server.dto.scheduling.management.schsystemparams.EditSchSystemParamsDTO;
import com.docus.server.entity.scheduling.management.SchSystemParams;
import com.docus.server.vo.scheduling.management.schsystemparams.SchSystemParamsVO;
import java.util.List;
import java.util.Map;
/**
*
*
@ -53,4 +57,13 @@ public interface ISchSystemParamsService {
* @return
*/
PageResult<SchSystemParamsVO> search(SearchDTO searchDTO);
/**
* id
*
* @param paramValueIds ids
* @return Map<String, SchSystemParams>
*/
Map<String, SchSystemParams> find(List<Long> paramValueIds);
}

@ -0,0 +1,132 @@
package com.docus.server.service.impl;
import cn.hutool.core.util.StrUtil;
import com.docus.core.util.Func;
import com.docus.infrastructure.web.exception.ApiException;
import com.docus.infrastructure.web.exception.ExceptionCode;
import com.docus.server.service.IFileUploadService;
import com.docus.server.vo.scheduling.management.schcollectorversionfile.UploadFileVO;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.net.URLEncoder;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
@Service
public class FileUploadServiceImpl implements IFileUploadService {
@Value("${file.uploadFolder:D://docus/}")
private String saveFilePath;
private static final String COLLECTOR_PACKAGES = "collector_packages";
private static DateTimeFormatter ymdDtf = DateTimeFormatter.ofPattern("yyyyMMdd");
@Override
public List<UploadFileVO> uploadFile(MultipartFile[] multipartFiles, String pathKey) throws Exception {
if (Func.isBlank(pathKey)) {
pathKey = COLLECTOR_PACKAGES;
}
List<UploadFileVO> uploadFileVOList = new ArrayList<>();
for (MultipartFile multipartFile : multipartFiles) {
if (multipartFile.isEmpty()) {
throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "上传失败,请选择文件!");
}
String originalFilename = multipartFile.getOriginalFilename();
if (StrUtil.isBlank(originalFilename)) {
throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "未找到原文件文件名!");
}
if (!originalFilename.contains(".")) {
throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "原文件名未识别到后缀!");
}
uploadFileVOList.add(actionUploadFile(multipartFile, pathKey));
}
return uploadFileVOList;
}
private UploadFileVO actionUploadFile(MultipartFile multipartFile, String pathKey) throws Exception {
String todayFormat = ymdDtf.format(LocalDateTime.now());
String path = pathKey + "/" + todayFormat + "/" + UUID.randomUUID().toString() + "/";
File fileDir = new File(saveFilePath + path);
if (!fileDir.exists()) {
fileDir.mkdirs();
}
String fileName = path + multipartFile.getOriginalFilename();
File dest = new File(saveFilePath + fileName);
multipartFile.transferTo(dest);
UploadFileVO uploadFileVO = new UploadFileVO();
uploadFileVO.setFileName(multipartFile.getOriginalFilename());
uploadFileVO.setFileSize(multipartFile.getSize());
uploadFileVO.setFileTitle(multipartFile.getName());
uploadFileVO.setFileType(multipartFile.getContentType());
uploadFileVO.setFilePath(fileName);
return uploadFileVO;
}
@Override
public void downloadFile(HttpServletResponse response) {
try {
//获取要下载的文件
File file = new File("file_path");
//设置响应的内容类型为二进制流,即文件类型
response.setContentType("application/octet-stream");
//设置文件名
response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(file.getName(), "UTF-8"));
//创建输入流
FileInputStream inputStream = new FileInputStream(file);
BufferedInputStream buffInputStream = new BufferedInputStream(inputStream);
//创建输出流
ServletOutputStream outputStream = response.getOutputStream();
BufferedOutputStream buffOutputStream = new BufferedOutputStream(outputStream);
//循环读取数据并写入到响应输出流中
byte[] buffer = new byte[1024];
int len = -1;
while ((len = buffInputStream.read(buffer)) != -1) {
buffOutputStream.write(buffer, 0, len);
}
//关闭流
buffOutputStream.flush();
buffOutputStream.close();
outputStream.flush();
outputStream.close();
buffInputStream.close();
inputStream.close();
} catch (Exception e) {
e.printStackTrace();
}
}
}

@ -1,5 +1,11 @@
package com.docus.server.service.impl;
import com.docus.core.util.Func;
import com.docus.core.util.ListUtils;
import com.docus.core.util.property.Setters;
import com.docus.infrastructure.redis.service.IdService;
import com.docus.infrastructure.web.exception.ApiException;
import com.docus.infrastructure.web.exception.ExceptionCode;
import com.docus.infrastructure.web.request.SearchDTO;
import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.convert.SchCollectorConvert;
@ -7,12 +13,17 @@ import com.docus.server.dto.scheduling.management.schcollector.AddSchCollectorDT
import com.docus.server.dto.scheduling.management.schcollector.DeleteSchCollectorDTO;
import com.docus.server.dto.scheduling.management.schcollector.EditSchCollectorDTO;
import com.docus.server.entity.scheduling.management.SchCollector;
import com.docus.server.entity.scheduling.management.SchSystemParams;
import com.docus.server.infrastructure.dao.ISchCollectorDao;
import com.docus.server.service.ISchCollectorService;
import com.docus.server.service.ISchSystemParamsService;
import com.docus.server.vo.scheduling.management.schcollector.SchCollectorVO;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.util.Date;
import java.util.Map;
/**
*
@ -24,6 +35,10 @@ import javax.annotation.Resource;
public class SchCollectorServiceImpl implements ISchCollectorService {
@Resource
private ISchCollectorDao iSchCollectorDao;
@Resource
private ISchSystemParamsService iSchSystemParamsService;
@Resource
private IdService idService;
/**
*
@ -44,7 +59,22 @@ public class SchCollectorServiceImpl implements ISchCollectorService {
*/
@Override
public PageResult<SchCollectorVO> search(SearchDTO searchDTO) {
return SchCollectorConvert.INSTANCE.convertVO(iSchCollectorDao.search(searchDTO));
PageResult<SchCollectorVO> result = SchCollectorConvert.INSTANCE.convertVO(iSchCollectorDao.search(searchDTO));
if (CollectionUtils.isEmpty(result.getList())) {
return new PageResult<>();
}
Map<String, SchSystemParams> map = iSchSystemParamsService.find(ListUtils.distinctSelect(result.getList(), SchCollectorVO::getCollectorId));
Setters.<SchCollectorVO>instance().list(result.getList()).cycleSetProperties(p -> {
String collectorId = String.valueOf(p.getCollectorId());
if (map.containsKey(collectorId)) {
p.setCollectorName(map.get(collectorId).getParamName());
}
});
return result;
}
/**
@ -55,7 +85,17 @@ public class SchCollectorServiceImpl implements ISchCollectorService {
*/
@Override
public boolean add(AddSchCollectorDTO addSchCollectorDTO) {
Long collectorId = addSchCollectorDTO.getCollectorId();
SchCollector schCollectorDO = iSchCollectorDao.findOneBy("collectorId", collectorId);
if (Func.notNull(schCollectorDO)) {
throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "采集器类型已经存在");
}
SchCollector schCollector = SchCollectorConvert.INSTANCE.convertDO(addSchCollectorDTO);
schCollector.setId(idService.getDateSeq());
return iSchCollectorDao.add(schCollector);
}
@ -67,7 +107,19 @@ public class SchCollectorServiceImpl implements ISchCollectorService {
*/
@Override
public boolean edit(EditSchCollectorDTO editSchCollectorDTO) {
SchCollector schCollector = SchCollectorConvert.INSTANCE.convertDO(editSchCollectorDTO);
Long id = editSchCollectorDTO.getId();
SchCollector schCollector = iSchCollectorDao.findById(id);
if (Func.isNull(schCollector)) {
throw new ApiException(ExceptionCode.ParamIllegal.getCode(), "采集器不存在,无法更新");
}
schCollector.setCollectLanguage(editSchCollectorDTO.getCollectLanguage());
schCollector.setStartMode(editSchCollectorDTO.getStartMode());
schCollector.setTaskTimeout(editSchCollectorDTO.getTaskTimeout());
schCollector.setUpdateTime(new Date());
return iSchCollectorDao.edit(schCollector);
}

@ -1,18 +1,28 @@
package com.docus.server.service.impl;
import com.docus.infrastructure.redis.service.IdService;
import com.docus.infrastructure.web.request.SearchDTO;
import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.convert.SchCollectorVersionFileConvert;
import com.docus.server.dto.scheduling.management.schcollectorversionfile.AddSchCollectorVersionFileDTO;
import com.docus.server.dto.scheduling.management.schcollectorversionfile.DeleteSchCollectorVersionFileDTO;
import com.docus.server.dto.scheduling.management.schcollectorversionfile.EditSchCollectorVersionFileDTO;
import com.docus.server.entity.scheduling.management.SchCollectorVersion;
import com.docus.server.entity.scheduling.management.SchCollectorVersionFile;
import com.docus.server.enums.CancelEnum;
import com.docus.server.infrastructure.dao.ISchCollectorVersionDao;
import com.docus.server.infrastructure.dao.ISchCollectorVersionFileDao;
import com.docus.server.service.IFileUploadService;
import com.docus.server.service.ISchCollectorVersionFileService;
import com.docus.server.vo.scheduling.management.schcollectorversionfile.SchCollectorVersionFileVO;
import com.docus.server.vo.scheduling.management.schcollectorversionfile.UploadFileVO;
import com.google.common.collect.Lists;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import java.util.List;
/**
*
@ -24,6 +34,12 @@ import javax.annotation.Resource;
public class SchCollectorVersionFileServiceImpl implements ISchCollectorVersionFileService {
@Resource
private ISchCollectorVersionFileDao iSchCollectorVersionFileDao;
@Resource
private ISchCollectorVersionDao iSchCollectorVersionDao;
@Resource
private IdService idService;
@Resource
private IFileUploadService iFileUploadService;
/**
*
@ -47,6 +63,36 @@ public class SchCollectorVersionFileServiceImpl implements ISchCollectorVersionF
return SchCollectorVersionFileConvert.INSTANCE.convertVO(iSchCollectorVersionFileDao.search(searchDTO));
}
@Transactional(rollbackFor = Exception.class)
@Override
public void addVersionAndFile(AddSchCollectorVersionFileDTO addDTO, MultipartFile[] multipartFiles) throws Exception {
List<UploadFileVO> uploadFileVOList = iFileUploadService.uploadFile(multipartFiles, null);
SchCollectorVersion schCollectorVersion = new SchCollectorVersion();
schCollectorVersion.setId(idService.getDateSeq());
schCollectorVersion.setCollectorId(addDTO.getCollectorId());
schCollectorVersion.setCollectVersion(addDTO.getCollectorVersionNo());
iSchCollectorVersionDao.save(schCollectorVersion);
List<SchCollectorVersionFile> schCollectorVersionFiles = Lists.newArrayList();
uploadFileVOList.forEach(p -> {
SchCollectorVersionFile schCollectorVersionFile = new SchCollectorVersionFile();
schCollectorVersionFile.setId(idService.getDateSeq());
schCollectorVersionFile.setCollectorId(addDTO.getCollectorId());
schCollectorVersionFile.setCollectorVersionId(schCollectorVersion.getId());
schCollectorVersionFile.setFileTitle(p.getFileTitle());
schCollectorVersionFile.setFilePath(p.getFilePath());
schCollectorVersionFile.setFileName(p.getFileName());
schCollectorVersionFile.setFileSize(p.getFileSize());
schCollectorVersionFile.setFileType(p.getFileType());
schCollectorVersionFile.setState(CancelEnum.NO_CANCEL);
schCollectorVersionFiles.add(schCollectorVersionFile);
});
iSchCollectorVersionFileDao.saveBatch(schCollectorVersionFiles, 500);
}
/**
*
*

@ -1,5 +1,8 @@
package com.docus.server.service.impl;
import com.docus.core.util.ListUtils;
import com.docus.core.util.property.Setters;
import com.docus.infrastructure.redis.service.IdService;
import com.docus.infrastructure.web.request.SearchDTO;
import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.convert.SchCollectorVersionConvert;
@ -7,12 +10,16 @@ import com.docus.server.dto.scheduling.management.schcollectorversion.AddSchColl
import com.docus.server.dto.scheduling.management.schcollectorversion.DeleteSchCollectorVersionDTO;
import com.docus.server.dto.scheduling.management.schcollectorversion.EditSchCollectorVersionDTO;
import com.docus.server.entity.scheduling.management.SchCollectorVersion;
import com.docus.server.entity.scheduling.management.SchSystemParams;
import com.docus.server.infrastructure.dao.ISchCollectorVersionDao;
import com.docus.server.service.ISchCollectorVersionService;
import com.docus.server.service.ISchSystemParamsService;
import com.docus.server.vo.scheduling.management.schcollectorversion.SchCollectorVersionVO;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
import java.util.Map;
/**
*
@ -24,6 +31,10 @@ import javax.annotation.Resource;
public class SchCollectorVersionServiceImpl implements ISchCollectorVersionService {
@Resource
private ISchCollectorVersionDao iSchCollectorVersionDao;
@Resource
private ISchSystemParamsService iSchSystemParamsService;
@Resource
private IdService idService;
/**
*
@ -44,7 +55,28 @@ public class SchCollectorVersionServiceImpl implements ISchCollectorVersionServi
*/
@Override
public PageResult<SchCollectorVersionVO> search(SearchDTO searchDTO) {
return SchCollectorVersionConvert.INSTANCE.convertVO(iSchCollectorVersionDao.search(searchDTO));
PageResult<SchCollectorVersionVO> result = SchCollectorVersionConvert.INSTANCE.convertVO(iSchCollectorVersionDao.search(searchDTO));
if (CollectionUtils.isEmpty(result.getList())) {
return new PageResult<>();
}
Map<String, SchSystemParams> map = iSchSystemParamsService.find(ListUtils.distinctSelect(result.getList(), SchCollectorVersionVO::getCollectorId));
Setters.<SchCollectorVersionVO>instance().list(result.getList()).cycleSetProperties(p -> {
String collectorId = String.valueOf(p.getCollectorId());
if (map.containsKey(collectorId)) {
p.setCollectorName(map.get(collectorId).getParamName());
}
});
return result;
}
@Override
public SchCollectorVersion findByVersion(Long collectorId, String collectorVersionNo) {
return iSchCollectorVersionDao.findByVersion(collectorId, collectorVersionNo);
}
/**
@ -56,6 +88,7 @@ public class SchCollectorVersionServiceImpl implements ISchCollectorVersionServi
@Override
public boolean add(AddSchCollectorVersionDTO addSchCollectorVersionDTO) {
SchCollectorVersion schCollectorVersion = SchCollectorVersionConvert.INSTANCE.convertDO(addSchCollectorVersionDTO);
schCollectorVersion.setId(idService.getDateSeq());
return iSchCollectorVersionDao.add(schCollectorVersion);
}

@ -1,5 +1,6 @@
package com.docus.server.service.impl;
import com.docus.core.util.ListUtils;
import com.docus.infrastructure.web.request.SearchDTO;
import com.docus.infrastructure.web.response.PageResult;
import com.docus.server.convert.SchSystemParamsConvert;
@ -13,6 +14,8 @@ import com.docus.server.vo.scheduling.management.schsystemparams.SchSystemParams
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
/**
*
@ -81,5 +84,12 @@ public class SchSystemParamsServiceImpl implements ISchSystemParamsService {
public int delete(DeleteSchSystemParamsDTO deleteSchSystemParamsDTO) {
return iSchSystemParamsDao.delete(deleteSchSystemParamsDTO.getIds());
}
@Override
public Map<String, SchSystemParams> find(List<Long> paramValueIds) {
List<SchSystemParams> schSystemParams = iSchSystemParamsDao.findBy("paramValue", paramValueIds);
return ListUtils.toMap(schSystemParams, SchSystemParams::getParamValue);
}
}

@ -17,6 +17,10 @@ spring:
password: docus702
driver-class-name: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
type: com.alibaba.druid.pool.DruidDataSource
servlet:
multipart:
max-file-size: 100MB
max-request-size: 200MB
redis:
host: redis.docus.cn
password: JSdocus@702
@ -48,9 +52,12 @@ mybatis-plus:
netty:
server:
port: 9012
port: 65535
boss-thread-count: 1
worker-thread-count: 20
reader-idle-time-seconds: 30
writer-idle-time-seconds: 0
all-idle-time-seconds: 0
all-idle-time-seconds: 0
file:
uploadFolder: D://docus/

@ -8,7 +8,7 @@
<id column="id" property="id"/>
<result column="collector_version_id" property="collectorVersionId"/>
<result column="collect_language" property="collectLanguage"/>
<result column="collect_type" property="collectType"/>
<result column="collector_id" property="collectorId"/>
<result column="start_mode" property="startMode"/>
<result column="task_timeout" property="taskTimeout"/>
<result column="create_time" property="createTime"/>
@ -17,7 +17,7 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, collector_version_id, collect_language, collect_type, start_mode, task_timeout, create_time, update_time
id, collector_version_id, collect_language, collector_id, start_mode, task_timeout, create_time, update_time
</sql>
</mapper>

@ -9,7 +9,7 @@
<result column="collector_version_id" property="collectorVersionId"/>
<result column="collector_id" property="collectorId"/>
<result column="file_title" property="fileTitle"/>
<result column="image_path" property="imagePath"/>
<result column="file_path" property="filePath"/>
<result column="file_name" property="fileName"/>
<result column="file_size" property="fileSize"/>
<result column="file_type" property="fileType"/>
@ -20,7 +20,7 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
id, collector_version_id, collector_id, file_title, image_path, file_name, file_size, file_type, state, create_time, update_time
id, collector_version_id, collector_id, file_title, file_path, file_name, file_size, file_type, state, create_time, update_time
</sql>
</mapper>

@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
* @author AutoGenerator
* @since 2023-07-15
*/
@Api(value = "采集器异常日志任务管理接口", tags = "采集器异常日志任务管理接口")
@Api(value = "采集器异常日志接口", tags = "采集器异常日志接口")
@FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchCollectErrorLogApi")
@RequestMapping("/sch/collectErrorLog")
public interface SchCollectErrorLogApi {

@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
* @author AutoGenerator
* @since 2023-07-15
*/
@Api(value = "采集记录表任务管理接口", tags = "采集记录表任务管理接口")
@Api(value = "采集记录表管理接口", tags = "采集记录表管理接口")
@FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchCollectRecordApi")
@RequestMapping("/sch/collectRecord")
public interface SchCollectRecordApi {

@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
* @author AutoGenerator
* @since 2023-07-15
*/
@Api(value = "采集记录表重试表任务管理接口", tags = "采集记录表重试表任务管理接口")
@Api(value = "采集记录表重试表管理接口", tags = "采集记录表重试表管理接口")
@FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchCollectRecordRetryLogApi")
@RequestMapping("/sch/collectRecordRetryLog")
public interface SchCollectRecordRetryLogApi {

@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
* @author AutoGenerator
* @since 2023-07-15
*/
@Api(value = "采集器管理任务管理接口", tags = "采集器管理任务管理接口")
@Api(value = "采集器管理接口", tags = "采集器管理接口")
@FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchCollectorApi")
@RequestMapping("/sch/collector")
public interface SchCollectorApi {

@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
* @author AutoGenerator
* @since 2023-07-15
*/
@Api(value = "采集器配置任务管理接口", tags = "采集器配置任务管理接口")
@Api(value = "采集器配置管理接口", tags = "采集器配置管理接口")
@FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchCollectorConfigApi")
@RequestMapping("/sch/collectorConfig")
public interface SchCollectorConfigApi {

@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
* @author AutoGenerator
* @since 2023-07-15
*/
@Api(value = "采集器版本列表管理任务管理接口", tags = "采集器版本列表管理任务管理接口")
@Api(value = "采集器版本列表管理接口", tags = "采集器版本列表管理接口")
@FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchCollectorVersionApi")
@RequestMapping("/sch/collectorVersion")
public interface SchCollectorVersionApi {

@ -7,8 +7,11 @@ import com.docus.server.dto.scheduling.management.schcollectorversionfile.Delete
import com.docus.server.dto.scheduling.management.schcollectorversionfile.EditSchCollectorVersionFileDTO;
import com.docus.server.vo.scheduling.management.schcollectorversionfile.SchCollectorVersionFileVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
@ -16,6 +19,8 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.multipart.MultipartFile;
/**
@ -24,7 +29,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
* @author AutoGenerator
* @since 2023-07-15
*/
@Api(value = "采集器版本列表更新包管理任务管理接口", tags = "采集器版本列表更新包管理任务管理接口")
@Api(value = "采集器版本列表更新包管理接口", tags = "采集器版本列表更新包管理接口")
@FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchCollectorVersionFileApi")
@RequestMapping("/sch/collectorVersionFile")
public interface SchCollectorVersionFileApi {
@ -57,7 +62,10 @@ public interface SchCollectorVersionFileApi {
*/
@ApiOperation("新增")
@PostMapping("/add")
boolean add(@RequestBody AddSchCollectorVersionFileDTO addSchCollectorVersionFileDTO);
@ApiImplicitParams({
@ApiImplicitParam(name = "files", value = "文件", required = true, dataTypeClass = MultipartFile.class)
})
boolean add(@Validated AddSchCollectorVersionFileDTO addSchCollectorVersionFileDTO, @RequestPart("files") MultipartFile[] multipartFiles) throws Exception;
/**
*

@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
* @author AutoGenerator
* @since 2023-07-15
*/
@Api(value = "采集器版本更新日志管理任务管理接口", tags = "采集器版本更新日志管理任务管理接口")
@Api(value = "采集器版本更新日志管理接口", tags = "采集器版本更新日志管理接口")
@FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchCollectorVersionLogApi")
@RequestMapping("/sch/collectorVersionLog")
public interface SchCollectorVersionLogApi {

@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
* @author AutoGenerator
* @since 2023-07-15
*/
@Api(value = "采集调度器操作日志任务管理接口", tags = "采集调度器操作日志任务管理接口")
@Api(value = "采集调度器操作日志接口", tags = "采集调度器操作日志接口")
@FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchOperationLogApi")
@RequestMapping("/sch/operationLog")
public interface SchOperationLogApi {

@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
* @author AutoGenerator
* @since 2023-07-15
*/
@Api(value = "系统参数表任务管理接口", tags = "系统参数表任务管理接口")
@Api(value = "系统参数表管理接口", tags = "系统参数表管理接口")
@FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchSystemParamsApi")
@RequestMapping("/sch/systemParams")
public interface SchSystemParamsApi {

@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
* @author AutoGenerator
* @since 2023-07-15
*/
@Api(value = "执行管理器任务管理接口", tags = "执行管理器任务管理接口")
@Api(value = "执行管理器管理接口", tags = "执行管理器管理接口")
@FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchTerminatorApi")
@RequestMapping("/sch/terminator")
public interface SchTerminatorApi {

@ -24,7 +24,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
* @author AutoGenerator
* @since 2023-07-15
*/
@Api(value = "虚拟机使用情况任务管理接口", tags = "虚拟机使用情况任务管理接口")
@Api(value = "虚拟机使用情况管理接口", tags = "虚拟机使用情况管理接口")
@FeignClient(value = "collector-scheduling-management", contextId = "collector-scheduling-management.SchVirtualLogApi")
@RequestMapping("/sch/virtualLog")
public interface SchVirtualLogApi {

@ -3,36 +3,27 @@ package com.docus.server.dto.scheduling.management.schcollector;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.docus.server.enums.*;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
*
* AddDTO
*
* @author AutoGenerator
* @since 2023-07-15
*/
* AddDTO
*
* @author AutoGenerator
* @since 2023-07-15
*/
@Data
@ApiModel(value="AddSchCollectorDTO对象", description="采集器管理")
@ApiModel(value = "AddSchCollectorDTO对象", description = "采集器管理")
public class AddSchCollectorDTO implements Serializable {
@ApiModelProperty(value = "主键采集器id")
private Long id;
@ApiModelProperty(value = "采集器id")
@ApiModelProperty(value = "采集器版本id")
private Long collectorVersionId;
@ApiModelProperty(value = "采集语言")
private String collectLanguage;
@ApiModelProperty(value = "采集器类型")
private CollectTypeEnum collectType;
@ApiModelProperty(value = "采集器id")
private Long collectorId;
@ApiModelProperty(value = "启动方式")
private String startMode;
@ -40,11 +31,5 @@ public class AddSchCollectorDTO implements Serializable {
@ApiModelProperty(value = "采集器任务超时时间")
private Long taskTimeout;
@ApiModelProperty(value = "入库时间")
private LocalDateTime createTime;
@ApiModelProperty(value = "入库更新时间")
private LocalDateTime updateTime;
}

@ -3,48 +3,30 @@ package com.docus.server.dto.scheduling.management.schcollector;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.docus.server.enums.*;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
*
* EditDTO
*
* @author AutoGenerator
* @since 2023-07-15
*/
* EditDTO
*
* @author AutoGenerator
* @since 2023-07-15
*/
@Data
@ApiModel(value="EditSchCollectorDTO对象", description="采集器管理")
@ApiModel(value = "EditSchCollectorDTO对象", description = "采集器管理")
public class EditSchCollectorDTO implements Serializable {
@ApiModelProperty(value = "主键采集器id")
private Long id;
@ApiModelProperty(value = "采集器id")
private Long collectorVersionId;
@ApiModelProperty(value = "采集语言")
private String collectLanguage;
@ApiModelProperty(value = "采集器类型")
private CollectTypeEnum collectType;
@ApiModelProperty(value = "启动方式")
private String startMode;
@ApiModelProperty(value = "采集器任务超时时间")
private Long taskTimeout;
@ApiModelProperty(value = "入库时间")
private LocalDateTime createTime;
@ApiModelProperty(value = "入库更新时间")
private LocalDateTime updateTime;
}

@ -1,25 +1,21 @@
package com.docus.server.dto.scheduling.management.schcollectorversion;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.docus.server.enums.*;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
/**
*
* AddDTO
*
* @author AutoGenerator
* @since 2023-07-15
*/
* AddDTO
*
* @author AutoGenerator
* @since 2023-07-15
*/
@Data
@ApiModel(value="AddSchCollectorVersionDTO对象", description="采集器版本列表管理")
@ApiModel(value = "AddSchCollectorVersionDTO对象", description = "采集器版本列表管理")
public class AddSchCollectorVersionDTO implements Serializable {
@ApiModelProperty(value = "主键")
@ -32,10 +28,12 @@ public class AddSchCollectorVersionDTO implements Serializable {
private String collectVersion;
@ApiModelProperty(value = "入库时间")
private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty(value = "入库更新时间")
private LocalDateTime updateTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
}

@ -1,15 +1,12 @@
package com.docus.server.dto.scheduling.management.schcollectorversion;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.docus.server.enums.*;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
/**
*
@ -32,10 +29,12 @@ public class EditSchCollectorVersionDTO implements Serializable {
private String collectVersion;
@ApiModelProperty(value = "入库时间")
private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty(value = "入库更新时间")
private LocalDateTime updateTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
}

@ -3,57 +3,27 @@ package com.docus.server.dto.scheduling.management.schcollectorversionfile;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.docus.server.enums.*;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
*
* AddDTO
*
* @author AutoGenerator
* @since 2023-07-15
*/
* AddDTO
*
* @author AutoGenerator
* @since 2023-07-15
*/
@Data
@ApiModel(value="AddSchCollectorVersionFileDTO对象", description="采集器版本列表更新包管理")
@ApiModel(value = "AddSchCollectorVersionFileDTO对象", description = "采集器版本列表更新包管理")
public class AddSchCollectorVersionFileDTO implements Serializable {
@ApiModelProperty(value = "主键")
private Long id;
@ApiModelProperty(value = "采集器管理版本id")
private Long collectorVersionId;
@NotNull(message = "采集器管理版本号不能为空")
@ApiModelProperty(value = "采集器管理版本号")
private String collectorVersionNo;
@NotNull(message = "采集器管理id不能为空")
@ApiModelProperty(value = "采集器管理id")
private Long collectorId;
@ApiModelProperty(value = "文件标题")
private String fileTitle;
@ApiModelProperty(value = "文件目录 单纯文件夹路径不带文件名F:\\嘉时\\新建文件夹\\")
private String imagePath;
@ApiModelProperty(value = "文件名称")
private String fileName;
@ApiModelProperty(value = "文件大小")
private Integer fileSize;
@ApiModelProperty(value = "文件类型")
private String fileType;
@ApiModelProperty(value = "是否作废 10否")
private Integer state;
@ApiModelProperty(value = "入库时间")
private LocalDateTime createTime;
@ApiModelProperty(value = "入库更新时间")
private LocalDateTime updateTime;
}

@ -1,25 +1,22 @@
package com.docus.server.dto.scheduling.management.schcollectorversionfile;
import com.docus.server.enums.CancelEnum;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.docus.server.enums.*;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
/**
*
* EditDTO
*
* @author AutoGenerator
* @since 2023-07-15
*/
* EditDTO
*
* @author AutoGenerator
* @since 2023-07-15
*/
@Data
@ApiModel(value="EditSchCollectorVersionFileDTO对象", description="采集器版本列表更新包管理")
@ApiModel(value = "EditSchCollectorVersionFileDTO对象", description = "采集器版本列表更新包管理")
public class EditSchCollectorVersionFileDTO implements Serializable {
@ApiModelProperty(value = "主键")
@ -35,7 +32,7 @@ public class EditSchCollectorVersionFileDTO implements Serializable {
private String fileTitle;
@ApiModelProperty(value = "文件目录 单纯文件夹路径不带文件名F:\\嘉时\\新建文件夹\\")
private String imagePath;
private String filePath;
@ApiModelProperty(value = "文件名称")
private String fileName;
@ -47,13 +44,15 @@ public class EditSchCollectorVersionFileDTO implements Serializable {
private String fileType;
@ApiModelProperty(value = "是否作废 10否")
private Integer state;
private CancelEnum state;
@ApiModelProperty(value = "入库时间")
private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty(value = "入库更新时间")
private LocalDateTime updateTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
}

@ -1,30 +1,28 @@
package com.docus.server.entity.scheduling.management;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.docus.server.enums.*;
import java.io.Serializable;
import java.util.Date;
/**
*
*
*
* @author AutoGenerator
* @since 2023-07-15
*/
*
*
* @author AutoGenerator
* @since 2023-07-15
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("sch_collector")
@ApiModel(value="SchCollector对象", description="采集器管理")
@ApiModel(value = "SchCollector对象", description = "采集器管理")
public class SchCollector implements Serializable {
@ApiModelProperty(value = "主键采集器id")
@ -39,9 +37,9 @@ public class SchCollector implements Serializable {
@TableField("collect_language")
private String collectLanguage;
@ApiModelProperty(value = "采集器类型")
@TableField("collect_type")
private CollectTypeEnum collectType;
@ApiModelProperty(value = "采集器id")
@TableField("collector_id")
private Long collectorId;
@ApiModelProperty(value = "启动方式")
@TableField("start_mode")
@ -53,11 +51,13 @@ public class SchCollector implements Serializable {
@ApiModelProperty(value = "入库时间")
@TableField("create_time")
private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty(value = "入库更新时间")
@TableField("update_time")
private LocalDateTime updateTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
}

@ -1,30 +1,28 @@
package com.docus.server.entity.scheduling.management;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.docus.server.enums.*;
import java.io.Serializable;
import java.util.Date;
/**
*
*
*
* @author AutoGenerator
* @since 2023-07-15
*/
*
*
* @author AutoGenerator
* @since 2023-07-15
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("sch_collector_version")
@ApiModel(value="SchCollectorVersion对象", description="采集器版本列表管理")
@ApiModel(value = "SchCollectorVersion对象", description = "采集器版本列表管理")
public class SchCollectorVersion implements Serializable {
@ApiModelProperty(value = "主键")
@ -41,11 +39,12 @@ public class SchCollectorVersion implements Serializable {
@ApiModelProperty(value = "入库时间")
@TableField("create_time")
private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty(value = "入库更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField("update_time")
private LocalDateTime updateTime;
private Date updateTime;
}

@ -1,30 +1,29 @@
package com.docus.server.entity.scheduling.management;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.docus.server.enums.CancelEnum;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.docus.server.enums.*;
import java.io.Serializable;
import java.util.Date;
/**
*
*
*
* @author AutoGenerator
* @since 2023-07-15
*/
*
*
* @author AutoGenerator
* @since 2023-07-15
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("sch_collector_version_file")
@ApiModel(value="SchCollectorVersionFile对象", description="采集器版本列表更新包管理")
@ApiModel(value = "SchCollectorVersionFile对象", description = "采集器版本列表更新包管理")
public class SchCollectorVersionFile implements Serializable {
@ApiModelProperty(value = "主键")
@ -44,8 +43,8 @@ public class SchCollectorVersionFile implements Serializable {
private String fileTitle;
@ApiModelProperty(value = "文件目录 单纯文件夹路径不带文件名F:\\嘉时\\新建文件夹\\")
@TableField("image_path")
private String imagePath;
@TableField("file_path")
private String filePath;
@ApiModelProperty(value = "文件名称")
@TableField("file_name")
@ -53,7 +52,7 @@ public class SchCollectorVersionFile implements Serializable {
@ApiModelProperty(value = "文件大小")
@TableField("file_size")
private Integer fileSize;
private Long fileSize;
@ApiModelProperty(value = "文件类型")
@TableField("file_type")
@ -61,15 +60,16 @@ public class SchCollectorVersionFile implements Serializable {
@ApiModelProperty(value = "是否作废 10否")
@TableField("state")
private Integer state;
private CancelEnum state;
@ApiModelProperty(value = "入库时间")
@TableField("create_time")
private LocalDateTime createTime;
@ApiModelProperty(value = "入库时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty(value = "入库更新时间")
@TableField("update_time")
private LocalDateTime updateTime;
@ApiModelProperty(value = "入库更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
}

@ -0,0 +1,29 @@
package com.docus.server.enums;
import com.docus.infrastructure.core.db.enums.IIntegerEnum;
public enum CancelEnum implements IIntegerEnum {
NO_CANCEL(0, "不作废"),
CANCEL(1, "作废");
private Integer value;
private String display;
CancelEnum(Integer value, String display) {
this.value = value;
this.display = display;
}
@Override
public Integer getValue() {
return value;
}
@Override
public String getDisplay() {
return display;
}
}

@ -1,38 +1,37 @@
package com.docus.server.vo.scheduling.management.schcollector;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.docus.server.enums.*;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
/**
*
* VO
*
* @author AutoGenerator
* @since 2023-07-15
*/
* VO
*
* @author AutoGenerator
* @since 2023-07-15
*/
@Data
@ApiModel(value="SchCollectorVO对象", description="采集器管理")
@ApiModel(value = "SchCollectorVO对象", description = "采集器管理")
public class SchCollectorVO implements Serializable {
@ApiModelProperty(value = "主键采集器id")
private Long id;
@ApiModelProperty(value = "采集器id")
@ApiModelProperty(value = "采集器版本id")
private Long collectorVersionId;
@ApiModelProperty(value = "采集语言")
private String collectLanguage;
@ApiModelProperty(value = "采集器id")
private Long collectorId;
@ApiModelProperty(value = "采集器类型")
private CollectTypeEnum collectType;
private String collectorName;
@ApiModelProperty(value = "启动方式")
private String startMode;
@ -41,10 +40,12 @@ public class SchCollectorVO implements Serializable {
private Long taskTimeout;
@ApiModelProperty(value = "入库时间")
private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty(value = "入库更新时间")
private LocalDateTime updateTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
}

@ -1,25 +1,21 @@
package com.docus.server.vo.scheduling.management.schcollectorversion;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.docus.server.enums.*;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
/**
*
* VO
*
* @author AutoGenerator
* @since 2023-07-15
*/
* VO
*
* @author AutoGenerator
* @since 2023-07-15
*/
@Data
@ApiModel(value="SchCollectorVersionVO对象", description="采集器版本列表管理")
@ApiModel(value = "SchCollectorVersionVO对象", description = "采集器版本列表管理")
public class SchCollectorVersionVO implements Serializable {
@ApiModelProperty(value = "主键")
@ -28,14 +24,18 @@ public class SchCollectorVersionVO implements Serializable {
@ApiModelProperty(value = "采集器管理id")
private Long collectorId;
@ApiModelProperty(value = "采集器类型")
private String collectorName;
@ApiModelProperty(value = "版本号")
private String collectVersion;
@ApiModelProperty(value = "入库时间")
private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty(value = "入库更新时间")
private LocalDateTime updateTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
}

@ -1,25 +1,22 @@
package com.docus.server.vo.scheduling.management.schcollectorversionfile;
import com.docus.server.enums.CancelEnum;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.docus.server.enums.*;
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
/**
*
* VO
*
* @author AutoGenerator
* @since 2023-07-15
*/
* VO
*
* @author AutoGenerator
* @since 2023-07-15
*/
@Data
@ApiModel(value="SchCollectorVersionFileVO对象", description="采集器版本列表更新包管理")
@ApiModel(value = "SchCollectorVersionFileVO对象", description = "采集器版本列表更新包管理")
public class SchCollectorVersionFileVO implements Serializable {
@ApiModelProperty(value = "主键")
@ -35,7 +32,7 @@ public class SchCollectorVersionFileVO implements Serializable {
private String fileTitle;
@ApiModelProperty(value = "文件目录 单纯文件夹路径不带文件名F:\\嘉时\\新建文件夹\\")
private String imagePath;
private String filePath;
@ApiModelProperty(value = "文件名称")
private String fileName;
@ -47,13 +44,15 @@ public class SchCollectorVersionFileVO implements Serializable {
private String fileType;
@ApiModelProperty(value = "是否作废 10否")
private Integer state;
private CancelEnum state;
@ApiModelProperty(value = "入库时间")
private LocalDateTime createTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
@ApiModelProperty(value = "入库更新时间")
private LocalDateTime updateTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date updateTime;
}

@ -0,0 +1,32 @@
package com.docus.server.vo.scheduling.management.schcollectorversionfile;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
@ApiModel(value = "UploadFileVO对象", description = "UploadFileVO")
public class UploadFileVO {
@ApiModelProperty(value = "文件标题")
@TableField("file_title")
private String fileTitle;
@ApiModelProperty(value = "文件目录 单纯文件夹路径不带文件名F:\\嘉时\\新建文件夹\\")
@TableField("file_path")
private String filePath;
@ApiModelProperty(value = "文件名称")
@TableField("file_name")
private String fileName;
@ApiModelProperty(value = "文件大小")
@TableField("file_size")
private Long fileSize;
@ApiModelProperty(value = "文件类型")
@TableField("file_type")
private String fileType;
}
Loading…
Cancel
Save