ClientApps/CN_Gather
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
caozehui
2025-07-01 10:47:59 +08:00
parent a5791ef76b
commit f19a467300
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
detection/src/main/java/com/njcn/gather/report/pojo/enums/ReportResponseEnum.java
View File

@@ -20,11 +20,11 @@ public enum ReportResponseEnum {
REPORT_TEMPLATE_NOT_EXIST("A012009", "报告模板缺失，请联系管理员！"), REPORT_TEMPLATE_NOT_EXIST("A012009", "报告模板缺失，请联系管理员！"),
NO_CHECK_DATA("A012010", "没有检测数据，无法生成报告！"), NO_CHECK_DATA("A012010", "没有检测数据，无法生成报告！"),
FILE_RENAME_FAILED("A012011", "文件重命名失败"), FILE_RENAME_FAILED("A012011", "文件重命名失败"),
REPORT_NAME_PATTERN_ERROR("A012012","报告名称格式错误，可包含中文、字母、数字、中划线、点号、空格，长度不能超过32个字符"), REPORT_NAME_PATTERN_ERROR("A012012", "报告名称格式错误，可包含中文、字母、数字、中划线、点号、空格，长度不能超过32个字符"),
REPORT_VERSION_PATTERN_ERROR("A012013","报告版本号格式错误，可包含中文、字母、数字、中划线、点号、空格，长度不能超过32个字符"), REPORT_VERSION_PATTERN_ERROR("A012013", "报告版本号格式错误，可包含中文、字母、数字、中划线、点号、空格，长度不能超过32个字符"),
FILE_SIZE_ERROR("A012014","文件大小不能超过5MB" ), FILE_SIZE_ERROR("A012014", "文件大小不能超过5MB"),
GENERATE_REPORT_ERROR("A012015","生成报告失败"), GENERATE_REPORT_ERROR("A012015", "生成报告失败"),
; FTP_CONNECTION_FAILED("A012016", "FTP连接失败，无法将二维码文件上传至装置");
private String code; private String code;
private String message; private String message;

4
detection/src/main/java/com/njcn/gather/report/service/impl/PqReportServiceImpl.java
View File

@@ -726,11 +726,13 @@ public class PqReportServiceImpl extends ServiceImpl<PqReportMapper, PqReport> i
data.set("password", devPsd); data.set("password", devPsd);
data.set("port", devPort); data.set("port", devPort);
data.set("path", "ftp://" + devIp + devPath); data.set("path", "ftp://" + devIp + devPath);
} else { } else if (testFTPConnection(cloudUrl, gcDevPort, gcDevName, gcDevPsd)) {
data.set("name", gcDevName); data.set("name", gcDevName);
data.set("password", gcDevPsd); data.set("password", gcDevPsd);
data.set("port", gcDevPort); data.set("port", gcDevPort);
data.set("path", "ftp://" + devIp + gcDevPath); data.set("path", "ftp://" + devIp + gcDevPath);
} else {
throw new BusinessException(ReportResponseEnum.FTP_CONNECTION_FAILED);
} }
data.set("file", base64String); data.set("file", base64String);
sendFileMsg.setData(data.toString()); sendFileMsg.setData(data.toString());