chujinwang
/
chushangcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.项目管理下载功能 

2.项目管理模块完成
This commit is contained in:
Chujinwang 2024-06-27 17:57:38 +08:00
parent 93120f3778
commit 4ca32d2341
5 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/dto/ProjectDTO.java
View File

@ -28,9 +28,9 @@ public class ProjectDTO {
/**
* 项目合同
*/
@NotNull(message = "项目合同不能为空", groups = Create.class)
@Null(message = "项目合同不能为空", groups = Update.class)
@Valid
// @NotNull(message = "项目合同不能为空", groups = Create.class)
// @Null(message = "项目合同不能为空", groups = Update.class)
// @Valid
private ContractDTO contract;
/**

1
chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProject.java
View File

@ -93,6 +93,7 @@ public class WrkProject extends BaseEntity {
*/
@TableField(value = "project_effect")
@DictFormat(dictType = "project_effect")
@Condition(name = "project_effect", type = Condition.ConditionType.eq)
private Integer projectEffect;
/**

2
chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProjectContract.java
View File

@ -39,7 +39,7 @@ public class WrkProjectContract extends BaseEntity {
private Long projectId;
/**
* 备注
* 备注字段充当上传合同的fid字段
*/
@TableField(value = "remark")
private String remark;

1
chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/service/WrkProjectService.java
View File

@ -53,6 +53,7 @@ public class WrkProjectService extends ServiceImpl<WrkProjectMapper, WrkProject>
recordList.forEach(item->{
WrkProjectContract wrkProjectContract = contractService.queryListByProjectIds(item.getProjectId());
if(null != wrkProjectContract){
item.setRemark(wrkProjectContract.getRemark());
item.setContractStartTime(wrkProjectContract.getContractStartTime());
item.setContractEndTime(wrkProjectContract.getContractEndTime());
item.setContractUrl(wrkProjectContract.getContractUrl());

16
chushang-modules/chushang-module-oss/oss-service/src/main/java/com/chushang/oss/service/FileSourceService.java
View File

@ -246,11 +246,23 @@ public class FileSourceService
FileSourceInfo fileSourceInfo = new FileSourceInfo();
fileSourceInfo.setUploadIp(ip);
fileSourceInfo.setFid(fid);
fileSourceInfo.setMd5(md5);
Tika t = new Tika();
String mimetype = null;
try {
mimetype = t.detect(file.getBytes());
if (fName.indexOf(".") < 0) {//如果文件名字没有后缀
String ext = MimeTypes.getDefaultMimeTypes().forName(mimetype).getExtension();
fName += ext;
}
} catch (IOException ignore) {
} catch (MimeTypeException e) {
log.error("文件后缀识别失败");
}
fileSourceInfo.setName(fName);
fileSourceInfo.setSize(length);
fileSourceInfo.setPath("contract/"+fName);
fileSourceInfo.setMd5(md5);
fileSourceInfo.setMimeType("image/jpeg");
fileSourceInfo.setMimeType(mimetype);
String upload = ossService.upload(file.getInputStream(), fileSourceInfo);
fileSourceInfo.setRealPath(upload);
save(fileSourceInfo);